From e3f8ed5cefcae3df9179f7b1198bf8026918653e Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Thu, 4 Feb 2016 17:51:12 +0000
Subject: [PATCH 0001/1431] doc: fix git lfs workaround for using http instead
 of https

the url should only point to `info/lfs` instead of `info/lfs/batch/objects`
---
 doc/workflow/lfs/manage_large_binaries_with_git_lfs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index b59e92cb317..596478bf3cd 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -104,7 +104,7 @@ To prevent this from happening, set the lfs url in project Git config:
 
 ```bash
 
-git config --add lfs.url "http://gitlab.example.com/group/project.git/info/lfs/objects/batch"
+git config --add lfs.url "http://gitlab.example.com/group/project.git/info/lfs"
 ```
 
 ### Credentials are always required when pushing an object

From 33520f1f699502740e67682b17ccd9432b6e693b Mon Sep 17 00:00:00 2001
From: a-tal <github@talsma.ca>
Date: Fri, 26 Feb 2016 20:49:50 -0800
Subject: [PATCH 0002/1431] fix example urls for (de)associating runners to
 projects

---
 doc/api/runners.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/runners.md b/doc/api/runners.md
index cc6c6b7cb2f..ddfa298f79d 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -275,7 +275,7 @@ POST /projects/:id/runners
 | `runner_id` | integer | yes      | The ID of a runner  |
 
 ```
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/project/9/runners" -F "runner_id=9"
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/9/runners" -F "runner_id=9"
 ```
 
 Example response:
@@ -306,7 +306,7 @@ DELETE /projects/:id/runners/:runner_id
 | `runner_id` | integer | yes      | The ID of a runner  |
 
 ```
-curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/project/9/runners/9"
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/9/runners/9"
 ```
 
 Example response:

From 6a0ea605e8b48deacbb4e93f7bb1d9b9abd2f7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20Emin=20=C4=B0NA=C3=87?= <mehmetemininac@gmail.com>
Date: Wed, 16 Mar 2016 03:16:25 +0200
Subject: [PATCH 0003/1431] Change deprecated usage of rendering without
 response body

`render nothing: true` has been deprecated.
For more information see [pr](https://github.com/rails/rails/pull/20336)
---
 app/controllers/admin/abuse_reports_controller.rb         | 2 +-
 app/controllers/admin/broadcast_messages_controller.rb    | 2 +-
 app/controllers/admin/keys_controller.rb                  | 2 +-
 app/controllers/admin/spam_logs_controller.rb             | 2 +-
 app/controllers/admin/users_controller.rb                 | 2 +-
 app/controllers/concerns/toggle_subscription_action.rb    | 2 +-
 app/controllers/dashboard/todos_controller.rb             | 4 ++--
 app/controllers/groups/group_members_controller.rb        | 2 +-
 app/controllers/profiles/emails_controller.rb             | 2 +-
 app/controllers/profiles/keys_controller.rb               | 2 +-
 app/controllers/projects/milestones_controller.rb         | 2 +-
 app/controllers/projects/notes_controller.rb              | 4 ++--
 app/controllers/projects/project_members_controller.rb    | 4 ++--
 app/controllers/projects/protected_branches_controller.rb | 2 +-
 spec/controllers/projects/raw_controller_spec.rb          | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/controllers/admin/abuse_reports_controller.rb b/app/controllers/admin/abuse_reports_controller.rb
index 2463cfa87be..76fc10bcc10 100644
--- a/app/controllers/admin/abuse_reports_controller.rb
+++ b/app/controllers/admin/abuse_reports_controller.rb
@@ -9,6 +9,6 @@ class Admin::AbuseReportsController < Admin::ApplicationController
     abuse_report.remove_user if params[:remove_user]
     abuse_report.destroy
 
-    render nothing: true
+    head :ok
   end
 end
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb
index fc342924987..82055006ac0 100644
--- a/app/controllers/admin/broadcast_messages_controller.rb
+++ b/app/controllers/admin/broadcast_messages_controller.rb
@@ -32,7 +32,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
 
     respond_to do |format|
       format.html { redirect_back_or_default(default: { action: 'index' }) }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb
index cb33fdd9763..054bb52b696 100644
--- a/app/controllers/admin/keys_controller.rb
+++ b/app/controllers/admin/keys_controller.rb
@@ -6,7 +6,7 @@ class Admin::KeysController < Admin::ApplicationController
 
     respond_to do |format|
       format.html
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/admin/spam_logs_controller.rb b/app/controllers/admin/spam_logs_controller.rb
index 377e9741e5f..3a2f0185315 100644
--- a/app/controllers/admin/spam_logs_controller.rb
+++ b/app/controllers/admin/spam_logs_controller.rb
@@ -11,7 +11,7 @@ class Admin::SpamLogsController < Admin::ApplicationController
       redirect_to admin_spam_logs_path, notice: "User #{spam_log.user.username} was successfully removed."
     else
       spam_log.destroy
-      render nothing: true
+      head :ok
     end
   end
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 87f4fb455b8..39c0c22f9b6 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -135,7 +135,7 @@ class Admin::UsersController < Admin::ApplicationController
 
     respond_to do |format|
       format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/concerns/toggle_subscription_action.rb b/app/controllers/concerns/toggle_subscription_action.rb
index 8a43c0b93c4..9e3b9be2ff4 100644
--- a/app/controllers/concerns/toggle_subscription_action.rb
+++ b/app/controllers/concerns/toggle_subscription_action.rb
@@ -6,7 +6,7 @@ module ToggleSubscriptionAction
 
     subscribable_resource.toggle_subscription(current_user)
 
-    render nothing: true
+    head :ok
   end
 
   private
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index 43cf8fa71af..d8ba51294cf 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -10,7 +10,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to dashboard_todos_path, notice: 'Todo was successfully marked as done.' }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
@@ -19,7 +19,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to dashboard_todos_path, notice: 'All todos were marked as done.' }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 0e902c4bb43..68f70120894 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -43,7 +43,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to group_group_members_path(@group), notice: 'User was successfully removed from group.' }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 0ede9b8e21b..1c24c4db993 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -24,7 +24,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to profile_emails_url }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index b88c080352b..9906493666a 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -27,7 +27,7 @@ class Profiles::KeysController < Profiles::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to profile_keys_url }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index da46731d945..6579f4f8c89 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -68,7 +68,7 @@ class Projects::MilestonesController < Projects::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to namespace_project_milestones_path }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 1b9dd568043..d91ab1cee1d 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -44,7 +44,7 @@ class Projects::NotesController < Projects::ApplicationController
     end
 
     respond_to do |format|
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
@@ -53,7 +53,7 @@ class Projects::NotesController < Projects::ApplicationController
     note.update_attribute(:attachment, nil)
 
     respond_to do |format|
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index e7bddc4a6f1..b150e9ef029 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -55,7 +55,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       format.html do
         redirect_to namespace_project_project_members_path(@project.namespace, @project)
       end
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
@@ -81,7 +81,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
 
       respond_to do |format|
         format.html { redirect_to dashboard_projects_path, notice: "You left the project." }
-        format.js { render nothing: true }
+        format.js { head :ok }
       end
     else
       if current_user == @project.owner
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index e49259c34b6..efa7bf14d0f 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -39,7 +39,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
 
     respond_to do |format|
       format.html { redirect_to namespace_project_protected_branches_path }
-      format.js { render nothing: true }
+      format.js { head :ok }
     end
   end
 
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index 1caa476d37d..fb29274c687 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -42,7 +42,7 @@ describe Projects::RawController do
         before do
           public_project.lfs_objects << lfs_object
           allow_any_instance_of(LfsObjectUploader).to receive(:exists?).and_return(true)
-          allow(controller).to receive(:send_file) { controller.render nothing: true }
+          allow(controller).to receive(:send_file) { controller.head :ok }
         end
 
         it 'serves the file' do

From 19a5e7c95e91baca58836ad3ae189190c9ba4ca2 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 23 Mar 2016 14:04:09 +0100
Subject: [PATCH 0004/1431] Test Grack::Auth via a request spec

---
 .../git_http_spec.rb}                         | 167 ++++++++----------
 1 file changed, 74 insertions(+), 93 deletions(-)
 rename spec/{lib/gitlab/backend/grack_auth_spec.rb => requests/git_http_spec.rb} (57%)

diff --git a/spec/lib/gitlab/backend/grack_auth_spec.rb b/spec/requests/git_http_spec.rb
similarity index 57%
rename from spec/lib/gitlab/backend/grack_auth_spec.rb
rename to spec/requests/git_http_spec.rb
index cd26dca0998..7e274b4209b 100644
--- a/spec/lib/gitlab/backend/grack_auth_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -1,83 +1,60 @@
 require "spec_helper"
 
-describe Grack::Auth, lib: true do
+describe 'Git HTTP requests', lib: true do
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 
-  let(:app)   { lambda { |env| [200, {}, "Success!"] } }
-  let!(:auth) { Grack::Auth.new(app) }
-  let(:env) do
-    {
-      'rack.input'     => '',
-      'REQUEST_METHOD' => 'GET',
-      'QUERY_STRING'   => 'service=git-upload-pack'
-    }
-  end
-  let(:status) { auth.call(env).first }
-
   describe "#call" do
     context "when the project doesn't exist" do
-      before do
-        env["PATH_INFO"] = "doesnt/exist.git"
-      end
-
       context "when no authentication is provided" do
         it "responds with status 401" do
-          expect(status).to eq(401)
+          clone_get '/doesnt/exist.git/info/refs'
+
+          expect(response.status).to eq(401)
         end
       end
 
       context "when username and password are provided" do
         context "when authentication fails" do
-          before do
-            env["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials(user.username, "nope")
-          end
-
           it "responds with status 401" do
-            expect(status).to eq(401)
+            clone_get '/doesnt/exist.git/info/refs', user: user.username, password: "nope"
+
+            expect(response.status).to eq(401)
           end
         end
 
         context "when authentication succeeds" do
-          before do
-            env["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials(user.username, user.password)
-          end
-
           it "responds with status 404" do
-            expect(status).to eq(404)
+            clone_get '/doesnt/exist.git/info/refs', user: user.username, password: user.password
+
+            expect(response.status).to eq(404)
           end
         end
       end
     end
 
     context "when the Wiki for a project exists" do
-      before do
-        @wiki = ProjectWiki.new(project)
-        env["PATH_INFO"] = "#{@wiki.repository.path_with_namespace}.git/info/refs"
-        project.update_attribute(:visibility_level, Project::PUBLIC)
-      end
-
       it "responds with the right project" do
-        response = auth.call(env)
-        json_body = ActiveSupport::JSON.decode(response[2][0])
+        wiki = ProjectWiki.new(project)
+        project.update_attribute(:visibility_level, Project::PUBLIC)
 
-        expect(response.first).to eq(200)
-        expect(json_body['RepoPath']).to include(@wiki.repository.path_with_namespace)
+        clone_get "/#{wiki.repository.path_with_namespace}.git/info/refs"
+        json_body = ActiveSupport::JSON.decode(response.body)
+
+        expect(response.status).to eq(200)
+        expect(json_body['RepoPath']).to include(wiki.repository.path_with_namespace)
       end
     end
 
     context "when the project exists" do
-      before do
-        env["PATH_INFO"] = project.path_with_namespace + ".git"
-      end
+      let(:path) { clone_path(project) }
 
       context "when the project is public" do
-        before do
-          project.update_attribute(:visibility_level, Project::PUBLIC)
-        end
-
         it "responds with status 200" do
-          expect(status).to eq(200)
+          project.update_attribute(:visibility_level, Project::PUBLIC)
+          clone_get path
+
+          expect(response.status).to eq(200)
         end
       end
 
@@ -88,85 +65,74 @@ describe Grack::Auth, lib: true do
 
         context "when no authentication is provided" do
           it "responds with status 401" do
-            expect(status).to eq(401)
+            clone_get path
+
+            expect(response.status).to eq(401)
           end
         end
 
         context "when username and password are provided" do
           context "when authentication fails" do
-            before do
-              env["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials(user.username, "nope")
-            end
-
             it "responds with status 401" do
-              expect(status).to eq(401)
+              clone_get path, user: user.username, password: 'nope'
+
+              expect(response.status).to eq(401)
             end
 
             context "when the user is IP banned" do
-              before do
+              it "responds with status 401" do
                 expect(Rack::Attack::Allow2Ban).to receive(:filter).and_return(true)
                 allow_any_instance_of(Rack::Request).to receive(:ip).and_return('1.2.3.4')
-              end
 
-              it "responds with status 401" do
-                expect(status).to eq(401)
+                clone_get path, user: user.username, password: 'nope'
+
+                expect(response.status).to eq(401)
               end
             end
           end
 
           context "when authentication succeeds" do
-            before do
-              env["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials(user.username, user.password)
-            end
-
             context "when the user has access to the project" do
               before do
                 project.team << [user, :master]
               end
 
               context "when the user is blocked" do
-                before do
+                it "responds with status 404" do
                   user.block
                   project.team << [user, :master]
-                end
 
-                it "responds with status 404" do
-                  expect(status).to eq(404)
+                  clone_get path, user: user.username, password: user.password
+
+                  expect(response.status).to eq(404)
                 end
               end
 
               context "when the user isn't blocked" do
-                before do
-                  expect(Rack::Attack::Allow2Ban).to receive(:reset)
-                end
-
                 it "responds with status 200" do
-                  expect(status).to eq(200)
+                  expect(Rack::Attack::Allow2Ban).to receive(:reset)
+
+                  clone_get path, user: user.username, password: user.password
+
+                  expect(response.status).to eq(200)
                 end
               end
 
               context "when blank password attempts follow a valid login" do
-                let(:options) { Gitlab.config.rack_attack.git_basic_auth }
-                let(:maxretry) { options[:maxretry] - 1 }
-                let(:ip) { '1.2.3.4' }
-
-                before do
-                  allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip)
-                  Rack::Attack::Allow2Ban.reset(ip, options)
-                end
-
-                after do
-                  Rack::Attack::Allow2Ban.reset(ip, options)
-                end
-
                 def attempt_login(include_password)
                   password = include_password ? user.password : ""
-                  env["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials(user.username, password)
-                  Grack::Auth.new(app)
-                  auth.call(env).first
+                  clone_get path, user: user.username, password: password
+                  response.status
                 end
 
                 it "repeated attempts followed by successful attempt" do
+                  options = Gitlab.config.rack_attack.git_basic_auth
+                  maxretry = options[:maxretry] - 1
+                  ip = '1.2.3.4'
+
+                  allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip)
+                  Rack::Attack::Allow2Ban.reset(ip, options)
+
                   maxretry.times.each do
                     expect(attempt_login(false)).to eq(401)
                   end
@@ -177,33 +143,48 @@ describe Grack::Auth, lib: true do
                   maxretry.times.each do
                     expect(attempt_login(false)).to eq(401)
                   end
+
+                  Rack::Attack::Allow2Ban.reset(ip, options)
                 end
               end
             end
 
             context "when the user doesn't have access to the project" do
               it "responds with status 404" do
-                expect(status).to eq(404)
+                clone_get path, user: user.username, password: user.password
+
+                expect(response.status).to eq(404)
               end
             end
           end
         end
 
         context "when a gitlab ci token is provided" do
-          let(:token) { "123" }
-          let(:project) { FactoryGirl.create :empty_project }
-
-          before do
+          it "responds with status 200" do
+            token = "123"
+            project = FactoryGirl.create :empty_project
             project.update_attributes(runners_token: token, builds_enabled: true)
 
-            env["HTTP_AUTHORIZATION"] = ActionController::HttpAuthentication::Basic.encode_credentials("gitlab-ci-token", token)
-          end
+            clone_get clone_path(project), user: 'gitlab-ci-token', password: token
 
-          it "responds with status 200" do
-            expect(status).to eq(200)
+            expect(response.status).to eq(200)
           end
         end
       end
     end
   end
+
+  def clone_get(url, user: nil, password: nil)
+    if user && password
+      env = { 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password) }
+    else
+      env = {}
+    end
+
+    get url, { 'service' => 'git-upload-pack' }, env
+  end
+
+  def clone_path(project)
+    "/#{project.path_with_namespace}.git/info/refs"
+  end
 end

From 55f5a68f092cc64ae4782c0d7fbbf1d3d1ce6284 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 23 Mar 2016 18:34:16 +0100
Subject: [PATCH 0005/1431] Get Grack::Auth tests to pass

---
 .../projects/application_controller.rb        |  22 ++-
 .../projects/git_http_controller.rb           | 167 ++++++++++++++++++
 config/routes.rb                              |  10 +-
 3 files changed, 191 insertions(+), 8 deletions(-)
 create mode 100644 app/controllers/projects/git_http_controller.rb

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 657ee94cfd7..5f5dc1adadf 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -10,9 +10,6 @@ class Projects::ApplicationController < ApplicationController
 
   def project
     unless @project
-      namespace = params[:namespace_id]
-      id = params[:project_id] || params[:id]
-
       # Redirect from
       #   localhost/group/project.git
       # to
@@ -23,8 +20,7 @@ class Projects::ApplicationController < ApplicationController
         return
       end
 
-      project_path = "#{namespace}/#{id}"
-      @project = Project.find_with_namespace(project_path)
+      @project = find_project
 
       if @project && can?(current_user, :read_project, @project)
         if @project.path_with_namespace != project_path
@@ -44,6 +40,22 @@ class Projects::ApplicationController < ApplicationController
     @project
   end
 
+  def id
+    params[:project_id] || params[:id]
+  end
+  
+  def namespace
+    params[:namespace_id]
+  end
+  
+  def project_path
+    "#{namespace}/#{id}"
+  end
+  
+  def find_project
+    Project.find_with_namespace(project_path)
+  end
+
   def repository
     @repository ||= project.repository
   end
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
new file mode 100644
index 00000000000..129e87dbf13
--- /dev/null
+++ b/app/controllers/projects/git_http_controller.rb
@@ -0,0 +1,167 @@
+class Projects::GitHttpController < Projects::ApplicationController
+  skip_before_action :repository
+  before_action :authenticate_user
+  before_action :project_found?
+    
+  def git_rpc
+    if upload_pack? && upload_pack_allowed?
+      render_ok and return
+    end
+    
+    render_not_found
+  end
+  
+  %i{info_refs git_receive_pack git_upload_pack}.each do |method|
+    alias_method method, :git_rpc
+  end
+
+  private
+
+  def authenticate_user
+    return if project && project.public? && upload_pack?
+
+    authenticate_or_request_with_http_basic do |login, password|
+      return @ci = true if ci_request?(login, password)
+
+      @user = Gitlab::Auth.new.find(login, password)
+      @user ||= oauth_access_token_check(login, password)
+      rate_limit_ip!(login, @user)
+    end
+  end
+
+  def project_found?
+    render_not_found if project.nil?
+  end
+
+  def ci_request?(login, password)
+    matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
+
+    if project && matched_login.present? && upload_pack?
+      underscored_service = matched_login['s'].underscore
+
+      if underscored_service == 'gitlab_ci'
+        return project && project.valid_build_token?(password)
+      elsif Service.available_services_names.include?(underscored_service)
+        service_method = "#{underscored_service}_service"
+        service = project.send(service_method)
+
+        return service && service.activated? && service.valid_token?(password)
+      end
+    end
+
+    false
+  end
+
+  def oauth_access_token_check(login, password)
+    if login == "oauth2" && upload_pack? && password.present?
+      token = Doorkeeper::AccessToken.by_token(password)
+      token && token.accessible? && User.find_by(id: token.resource_owner_id)
+    end
+  end
+  
+  def rate_limit_ip!(login, user)
+    # If the user authenticated successfully, we reset the auth failure count
+    # from Rack::Attack for that IP. A client may attempt to authenticate
+    # with a username and blank password first, and only after it receives
+    # a 401 error does it present a password. Resetting the count prevents
+    # false positives from occurring.
+    #
+    # Otherwise, we let Rack::Attack know there was a failed authentication
+    # attempt from this IP. This information is stored in the Rails cache
+    # (Redis) and will be used by the Rack::Attack middleware to decide
+    # whether to block requests from this IP.
+
+    config = Gitlab.config.rack_attack.git_basic_auth
+    return user unless config.enabled
+
+    if user
+      # A successful login will reset the auth failure count from this IP
+      Rack::Attack::Allow2Ban.reset(request.ip, config)
+    else
+      banned = Rack::Attack::Allow2Ban.filter(request.ip, config) do
+        # Unless the IP is whitelisted, return true so that Allow2Ban
+        # increments the counter (stored in Rails.cache) for the IP
+        if config.ip_whitelist.include?(request.ip)
+          false
+        else
+          true
+        end
+      end
+
+      if banned
+        Rails.logger.info "IP #{request.ip} failed to login " \
+          "as #{login} but has been temporarily banned from Git auth"
+      end
+    end
+    
+    user
+  end
+
+  def project
+    return @project if defined?(@project)
+    @project = find_project
+  end
+
+  def id
+    id = params[:project_id]
+    return if id.nil?
+    
+    if id.end_with?('.wiki.git')
+      id.slice(0, id.length - 9)
+    elsif id.end_with?('.git')
+      id.slice(0, id.length - 4)
+    end
+  end
+
+  def repo_path
+    @repo_path ||= begin
+      if params[:project_id].end_with?('.wiki.git')
+        project.wiki.wiki.path
+      else
+        repository.path_to_repo
+      end
+    end
+  end
+
+  def upload_pack?
+    if action_name == 'info_refs'
+      params[:service] == 'git-upload-pack'
+    else
+      action_name == 'git_upload_pack'
+    end
+  end
+
+  def render_ok
+    render json: {
+      'GL_ID' => Gitlab::ShellEnv.gl_id(@user),
+      'RepoPath' => repo_path,
+    }
+  end
+  
+  def render_not_found
+    render text: 'Not Found', status: :not_found
+  end
+
+  def ci?
+    !!@ci
+  end
+  
+  def user
+    @user
+  end
+  
+  def upload_pack_allowed?
+    if !Gitlab.config.gitlab_shell.upload_pack
+      false
+    elsif ci?
+      true
+    elsif user
+      Gitlab::GitAccess.new(user, project).download_access_check.allowed?
+    elsif project.public?
+      # Allow clone/fetch for public projects
+      true
+    else
+      false
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 4a3c23b7c1c..47ab1a89b8d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -59,9 +59,6 @@ Rails.application.routes.draw do
     mount Sidekiq::Web, at: '/admin/sidekiq', as: :sidekiq
   end
 
-  # Enable Grack support
-  mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post, :put]
-
   # Help
   get 'help'                  => 'help#index'
   get 'help/:category/:file'  => 'help#show', as: :help_page, constraints: { category: /.*/, file: /[^\/\.]+/ }
@@ -426,6 +423,13 @@ Rails.application.routes.draw do
       end
 
       scope module: :projects do
+        # Git HTTP clients ('git clone' etc.)
+        scope constraints: { format: /(git|wiki\.git)/ } do
+          get '/info/refs', to: 'git_http#info_refs', only: :get
+          get '/git-upload-pack', to: 'git_http#git_upload_pack', only: :post
+          get '/git-receive-pack', to: 'git_http#git_receive_pack', only: :post
+        end
+
         # Blob routes:
         get '/new/*id', to: 'blob#new', constraints: { id: /.+/ }, as: 'new_blob'
         post '/create/*id', to: 'blob#create', constraints: { id: /.+/ }, as: 'create_blob'

From 8f3e86d72c16294c8bcec8c9a3af86ec99d66ee8 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 14:53:20 +0100
Subject: [PATCH 0006/1431] Keep Grack::Auth in the routes for LFS only

---
 config/routes.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/routes.rb b/config/routes.rb
index 47ab1a89b8d..021eab89c2a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -59,6 +59,9 @@ Rails.application.routes.draw do
     mount Sidekiq::Web, at: '/admin/sidekiq', as: :sidekiq
   end
 
+  # Enable Grack support (for LFS only)
+  mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\/(info\/lfs|gitlab-lfs)/.match(request.path_info) }, via: [:get, :post, :put]
+
   # Help
   get 'help'                  => 'help#index'
   get 'help/:category/:file'  => 'help#show', as: :help_page, constraints: { category: /.*/, file: /[^\/\.]+/ }

From 31bc876b7b34fa1785be022e9cffdc601f2192d7 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 16:14:09 +0100
Subject: [PATCH 0007/1431] Test both GET and POST for git-upload-pack

---
 config/routes.rb               |   4 +-
 spec/requests/git_http_spec.rb | 112 ++++++++++++++++++++-------------
 2 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 021eab89c2a..eace7516e91 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -429,8 +429,8 @@ Rails.application.routes.draw do
         # Git HTTP clients ('git clone' etc.)
         scope constraints: { format: /(git|wiki\.git)/ } do
           get '/info/refs', to: 'git_http#info_refs', only: :get
-          get '/git-upload-pack', to: 'git_http#git_upload_pack', only: :post
-          get '/git-receive-pack', to: 'git_http#git_receive_pack', only: :post
+          post '/git-upload-pack', to: 'git_http#git_upload_pack', only: :post
+          post '/git-receive-pack', to: 'git_http#git_receive_pack', only: :post
         end
 
         # Blob routes:
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 7e274b4209b..ef0b83fd475 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -8,26 +8,26 @@ describe 'Git HTTP requests', lib: true do
     context "when the project doesn't exist" do
       context "when no authentication is provided" do
         it "responds with status 401" do
-          clone_get '/doesnt/exist.git/info/refs'
-
-          expect(response.status).to eq(401)
+          download('doesnt/exist.git') do |response|
+            expect(response.status).to eq(401)
+          end
         end
       end
 
       context "when username and password are provided" do
         context "when authentication fails" do
           it "responds with status 401" do
-            clone_get '/doesnt/exist.git/info/refs', user: user.username, password: "nope"
-
-            expect(response.status).to eq(401)
+            download('doesnt/exist.git', user: user.username, password: "nope") do |response|
+              expect(response.status).to eq(401)
+            end
           end
         end
 
         context "when authentication succeeds" do
           it "responds with status 404" do
-            clone_get '/doesnt/exist.git/info/refs', user: user.username, password: user.password
-
-            expect(response.status).to eq(404)
+            download('/doesnt/exist.git', user: user.username, password: user.password) do |response|
+              expect(response.status).to eq(404)
+            end
           end
         end
       end
@@ -38,23 +38,25 @@ describe 'Git HTTP requests', lib: true do
         wiki = ProjectWiki.new(project)
         project.update_attribute(:visibility_level, Project::PUBLIC)
 
-        clone_get "/#{wiki.repository.path_with_namespace}.git/info/refs"
-        json_body = ActiveSupport::JSON.decode(response.body)
-
-        expect(response.status).to eq(200)
-        expect(json_body['RepoPath']).to include(wiki.repository.path_with_namespace)
+        download("/#{wiki.repository.path_with_namespace}.git") do |response|
+          json_body = ActiveSupport::JSON.decode(response.body)
+  
+          expect(response.status).to eq(200)
+          expect(json_body['RepoPath']).to include(wiki.repository.path_with_namespace)
+        end
       end
     end
 
     context "when the project exists" do
-      let(:path) { clone_path(project) }
+      let(:path) { "#{project.path_with_namespace}.git" }
+      let(:env) { {} }
 
       context "when the project is public" do
         it "responds with status 200" do
           project.update_attribute(:visibility_level, Project::PUBLIC)
-          clone_get path
-
-          expect(response.status).to eq(200)
+          download(path, env) do |response|
+            expect(response.status).to eq(200)
+          end
         end
       end
 
@@ -65,33 +67,37 @@ describe 'Git HTTP requests', lib: true do
 
         context "when no authentication is provided" do
           it "responds with status 401" do
-            clone_get path
-
-            expect(response.status).to eq(401)
+            download(path, env) do |response|
+              expect(response.status).to eq(401)
+            end
           end
         end
 
         context "when username and password are provided" do
+          let(:env) { { user: user.username, password: 'nope' } }
+          
           context "when authentication fails" do
             it "responds with status 401" do
-              clone_get path, user: user.username, password: 'nope'
-
-              expect(response.status).to eq(401)
+              download(path, env) do |response|
+                expect(response.status).to eq(401)
+              end
             end
 
             context "when the user is IP banned" do
               it "responds with status 401" do
                 expect(Rack::Attack::Allow2Ban).to receive(:filter).and_return(true)
                 allow_any_instance_of(Rack::Request).to receive(:ip).and_return('1.2.3.4')
-
-                clone_get path, user: user.username, password: 'nope'
-
+                
+                clone_get(path, env)
+              
                 expect(response.status).to eq(401)
               end
             end
           end
 
           context "when authentication succeeds" do
+            let(:env) { { user: user.username, password: user.password } }
+            
             context "when the user has access to the project" do
               before do
                 project.team << [user, :master]
@@ -102,18 +108,18 @@ describe 'Git HTTP requests', lib: true do
                   user.block
                   project.team << [user, :master]
 
-                  clone_get path, user: user.username, password: user.password
-
-                  expect(response.status).to eq(404)
+                  download(path, env) do |response|
+                    expect(response.status).to eq(404)
+                  end
                 end
               end
 
               context "when the user isn't blocked" do
                 it "responds with status 200" do
                   expect(Rack::Attack::Allow2Ban).to receive(:reset)
-
-                  clone_get path, user: user.username, password: user.password
-
+                  
+                  clone_get(path, env)
+                  
                   expect(response.status).to eq(200)
                 end
               end
@@ -151,9 +157,9 @@ describe 'Git HTTP requests', lib: true do
 
             context "when the user doesn't have access to the project" do
               it "responds with status 404" do
-                clone_get path, user: user.username, password: user.password
-
-                expect(response.status).to eq(404)
+                download(path, user: user.username, password: user.password) do |response|
+                  expect(response.status).to eq(404)
+                end
               end
             end
           end
@@ -165,7 +171,7 @@ describe 'Git HTTP requests', lib: true do
             project = FactoryGirl.create :empty_project
             project.update_attributes(runners_token: token, builds_enabled: true)
 
-            clone_get clone_path(project), user: 'gitlab-ci-token', password: token
+            clone_get "#{project.path_with_namespace}.git", user: 'gitlab-ci-token', password: token
 
             expect(response.status).to eq(200)
           end
@@ -174,17 +180,33 @@ describe 'Git HTTP requests', lib: true do
     end
   end
 
-  def clone_get(url, user: nil, password: nil)
-    if user && password
-      env = { 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password) }
-    else
-      env = {}
-    end
-
-    get url, { 'service' => 'git-upload-pack' }, env
+  def clone_get(project, options={})
+    get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password))
+  end
+  
+  def clone_post(project, options={})
+    post "/#{project}/git-upload-pack", {}, auth_env(*options.values_at(:user, :password))
   end
 
   def clone_path(project)
     "/#{project.path_with_namespace}.git/info/refs"
   end
+
+  def download(project, user: nil, password: nil)
+    args = [project, {user: user, password: password}]
+
+    clone_get *args
+    yield response
+    
+    clone_post *args
+    yield response
+  end
+  
+  def auth_env(user, password)
+    if user && password
+      { 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password) }
+    else
+      {}
+    end
+  end
 end

From 0f8fe93c26f00eac14cbc33e9ed2e2260b7014cc Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 16:21:19 +0100
Subject: [PATCH 0008/1431] Whitespace, remove unused method

---
 spec/requests/git_http_spec.rb | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index ef0b83fd475..1e3f3f3e617 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -40,7 +40,7 @@ describe 'Git HTTP requests', lib: true do
 
         download("/#{wiki.repository.path_with_namespace}.git") do |response|
           json_body = ActiveSupport::JSON.decode(response.body)
-  
+
           expect(response.status).to eq(200)
           expect(json_body['RepoPath']).to include(wiki.repository.path_with_namespace)
         end
@@ -75,7 +75,7 @@ describe 'Git HTTP requests', lib: true do
 
         context "when username and password are provided" do
           let(:env) { { user: user.username, password: 'nope' } }
-          
+
           context "when authentication fails" do
             it "responds with status 401" do
               download(path, env) do |response|
@@ -87,9 +87,9 @@ describe 'Git HTTP requests', lib: true do
               it "responds with status 401" do
                 expect(Rack::Attack::Allow2Ban).to receive(:filter).and_return(true)
                 allow_any_instance_of(Rack::Request).to receive(:ip).and_return('1.2.3.4')
-                
+
                 clone_get(path, env)
-              
+
                 expect(response.status).to eq(401)
               end
             end
@@ -97,7 +97,7 @@ describe 'Git HTTP requests', lib: true do
 
           context "when authentication succeeds" do
             let(:env) { { user: user.username, password: user.password } }
-            
+
             context "when the user has access to the project" do
               before do
                 project.team << [user, :master]
@@ -117,9 +117,9 @@ describe 'Git HTTP requests', lib: true do
               context "when the user isn't blocked" do
                 it "responds with status 200" do
                   expect(Rack::Attack::Allow2Ban).to receive(:reset)
-                  
+
                   clone_get(path, env)
-                  
+
                   expect(response.status).to eq(200)
                 end
               end
@@ -183,25 +183,21 @@ describe 'Git HTTP requests', lib: true do
   def clone_get(project, options={})
     get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password))
   end
-  
+
   def clone_post(project, options={})
     post "/#{project}/git-upload-pack", {}, auth_env(*options.values_at(:user, :password))
   end
 
-  def clone_path(project)
-    "/#{project.path_with_namespace}.git/info/refs"
-  end
-
   def download(project, user: nil, password: nil)
     args = [project, {user: user, password: password}]
 
     clone_get *args
     yield response
-    
+
     clone_post *args
     yield response
   end
-  
+
   def auth_env(user, password)
     if user && password
       { 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password) }

From 1433068ad951045a3440d58b86e9489001ff3774 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 16:28:18 +0100
Subject: [PATCH 0009/1431] Remove useles only:

---
 config/routes.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index eace7516e91..40c149abda2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -428,9 +428,9 @@ Rails.application.routes.draw do
       scope module: :projects do
         # Git HTTP clients ('git clone' etc.)
         scope constraints: { format: /(git|wiki\.git)/ } do
-          get '/info/refs', to: 'git_http#info_refs', only: :get
-          post '/git-upload-pack', to: 'git_http#git_upload_pack', only: :post
-          post '/git-receive-pack', to: 'git_http#git_receive_pack', only: :post
+          get '/info/refs', to: 'git_http#info_refs'
+          post '/git-upload-pack', to: 'git_http#git_upload_pack'
+          post '/git-receive-pack', to: 'git_http#git_receive_pack'
         end
 
         # Blob routes:

From aae577f92141f3ec973b4dd362452502274147f5 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 17:34:56 +0100
Subject: [PATCH 0010/1431] Add test for gitlab_shell.upload_pack config
 setting

---
 spec/requests/git_http_spec.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 1e3f3f3e617..3a6a9b7a70d 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -52,12 +52,25 @@ describe 'Git HTTP requests', lib: true do
       let(:env) { {} }
 
       context "when the project is public" do
-        it "responds with status 200" do
+        before do
           project.update_attribute(:visibility_level, Project::PUBLIC)
+        end
+        
+        it "responds with status 200" do
           download(path, env) do |response|
             expect(response.status).to eq(200)
           end
         end
+        
+        context 'but git-upload-pack is disabled' do
+          it "responds with status 404" do
+            allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
+
+            download(path, env) do |response|
+              expect(response.status).to eq(404)
+            end
+          end
+        end
       end
 
       context "when the project is private" do

From ccf5b21f28d41e10de450e31d6e8855d1ee2f81e Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 17:38:30 +0100
Subject: [PATCH 0011/1431] Remove useless "describe"

---
 spec/requests/git_http_spec.rb | 351 ++++++++++++++++-----------------
 1 file changed, 174 insertions(+), 177 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 3a6a9b7a70d..a26b986aeb0 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -4,195 +4,192 @@ describe 'Git HTTP requests', lib: true do
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 
-  describe "#call" do
-    context "when the project doesn't exist" do
-      context "when no authentication is provided" do
+  context "when the project doesn't exist" do
+    context "when no authentication is provided" do
+      it "responds with status 401" do
+        download('doesnt/exist.git') do |response|
+          expect(response.status).to eq(401)
+        end
+      end
+    end
+
+    context "when username and password are provided" do
+      context "when authentication fails" do
         it "responds with status 401" do
-          download('doesnt/exist.git') do |response|
+          download('doesnt/exist.git', user: user.username, password: "nope") do |response|
             expect(response.status).to eq(401)
           end
         end
       end
 
-      context "when username and password are provided" do
-        context "when authentication fails" do
-          it "responds with status 401" do
-            download('doesnt/exist.git', user: user.username, password: "nope") do |response|
-              expect(response.status).to eq(401)
-            end
-          end
-        end
-
-        context "when authentication succeeds" do
-          it "responds with status 404" do
-            download('/doesnt/exist.git', user: user.username, password: user.password) do |response|
-              expect(response.status).to eq(404)
-            end
-          end
-        end
-      end
-    end
-
-    context "when the Wiki for a project exists" do
-      it "responds with the right project" do
-        wiki = ProjectWiki.new(project)
-        project.update_attribute(:visibility_level, Project::PUBLIC)
-
-        download("/#{wiki.repository.path_with_namespace}.git") do |response|
-          json_body = ActiveSupport::JSON.decode(response.body)
-
-          expect(response.status).to eq(200)
-          expect(json_body['RepoPath']).to include(wiki.repository.path_with_namespace)
-        end
-      end
-    end
-
-    context "when the project exists" do
-      let(:path) { "#{project.path_with_namespace}.git" }
-      let(:env) { {} }
-
-      context "when the project is public" do
-        before do
-          project.update_attribute(:visibility_level, Project::PUBLIC)
-        end
-        
-        it "responds with status 200" do
-          download(path, env) do |response|
-            expect(response.status).to eq(200)
-          end
-        end
-        
-        context 'but git-upload-pack is disabled' do
-          it "responds with status 404" do
-            allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
-
-            download(path, env) do |response|
-              expect(response.status).to eq(404)
-            end
-          end
-        end
-      end
-
-      context "when the project is private" do
-        before do
-          project.update_attribute(:visibility_level, Project::PRIVATE)
-        end
-
-        context "when no authentication is provided" do
-          it "responds with status 401" do
-            download(path, env) do |response|
-              expect(response.status).to eq(401)
-            end
-          end
-        end
-
-        context "when username and password are provided" do
-          let(:env) { { user: user.username, password: 'nope' } }
-
-          context "when authentication fails" do
-            it "responds with status 401" do
-              download(path, env) do |response|
-                expect(response.status).to eq(401)
-              end
-            end
-
-            context "when the user is IP banned" do
-              it "responds with status 401" do
-                expect(Rack::Attack::Allow2Ban).to receive(:filter).and_return(true)
-                allow_any_instance_of(Rack::Request).to receive(:ip).and_return('1.2.3.4')
-
-                clone_get(path, env)
-
-                expect(response.status).to eq(401)
-              end
-            end
-          end
-
-          context "when authentication succeeds" do
-            let(:env) { { user: user.username, password: user.password } }
-
-            context "when the user has access to the project" do
-              before do
-                project.team << [user, :master]
-              end
-
-              context "when the user is blocked" do
-                it "responds with status 404" do
-                  user.block
-                  project.team << [user, :master]
-
-                  download(path, env) do |response|
-                    expect(response.status).to eq(404)
-                  end
-                end
-              end
-
-              context "when the user isn't blocked" do
-                it "responds with status 200" do
-                  expect(Rack::Attack::Allow2Ban).to receive(:reset)
-
-                  clone_get(path, env)
-
-                  expect(response.status).to eq(200)
-                end
-              end
-
-              context "when blank password attempts follow a valid login" do
-                def attempt_login(include_password)
-                  password = include_password ? user.password : ""
-                  clone_get path, user: user.username, password: password
-                  response.status
-                end
-
-                it "repeated attempts followed by successful attempt" do
-                  options = Gitlab.config.rack_attack.git_basic_auth
-                  maxretry = options[:maxretry] - 1
-                  ip = '1.2.3.4'
-
-                  allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip)
-                  Rack::Attack::Allow2Ban.reset(ip, options)
-
-                  maxretry.times.each do
-                    expect(attempt_login(false)).to eq(401)
-                  end
-
-                  expect(attempt_login(true)).to eq(200)
-                  expect(Rack::Attack::Allow2Ban.banned?(ip)).to be_falsey
-
-                  maxretry.times.each do
-                    expect(attempt_login(false)).to eq(401)
-                  end
-
-                  Rack::Attack::Allow2Ban.reset(ip, options)
-                end
-              end
-            end
-
-            context "when the user doesn't have access to the project" do
-              it "responds with status 404" do
-                download(path, user: user.username, password: user.password) do |response|
-                  expect(response.status).to eq(404)
-                end
-              end
-            end
-          end
-        end
-
-        context "when a gitlab ci token is provided" do
-          it "responds with status 200" do
-            token = "123"
-            project = FactoryGirl.create :empty_project
-            project.update_attributes(runners_token: token, builds_enabled: true)
-
-            clone_get "#{project.path_with_namespace}.git", user: 'gitlab-ci-token', password: token
-
-            expect(response.status).to eq(200)
+      context "when authentication succeeds" do
+        it "responds with status 404" do
+          download('/doesnt/exist.git', user: user.username, password: user.password) do |response|
+            expect(response.status).to eq(404)
           end
         end
       end
     end
   end
 
+  context "when the Wiki for a project exists" do
+    it "responds with the right project" do
+      wiki = ProjectWiki.new(project)
+      project.update_attribute(:visibility_level, Project::PUBLIC)
+
+      download("/#{wiki.repository.path_with_namespace}.git") do |response|
+        json_body = ActiveSupport::JSON.decode(response.body)
+
+        expect(response.status).to eq(200)
+        expect(json_body['RepoPath']).to include(wiki.repository.path_with_namespace)
+      end
+    end
+  end
+
+  context "when the project exists" do
+    let(:path) { "#{project.path_with_namespace}.git" }
+    let(:env) { {} }
+
+    context "when the project is public" do
+      before do
+        project.update_attribute(:visibility_level, Project::PUBLIC)
+      end
+      
+      it "responds with status 200" do
+        download(path, env) do |response|
+          expect(response.status).to eq(200)
+        end
+      end
+      
+      context 'but git-upload-pack is disabled' do
+        it "responds with status 404" do
+          allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
+
+          download(path, env) do |response|
+            expect(response.status).to eq(404)
+          end
+        end
+      end
+    end
+
+    context "when the project is private" do
+      before do
+        project.update_attribute(:visibility_level, Project::PRIVATE)
+      end
+
+      context "when no authentication is provided" do
+        it "responds with status 401" do
+          download(path, env) do |response|
+            expect(response.status).to eq(401)
+          end
+        end
+      end
+
+      context "when username and password are provided" do
+        let(:env) { { user: user.username, password: 'nope' } }
+
+        context "when authentication fails" do
+          it "responds with status 401" do
+            download(path, env) do |response|
+              expect(response.status).to eq(401)
+            end
+          end
+
+          context "when the user is IP banned" do
+            it "responds with status 401" do
+              expect(Rack::Attack::Allow2Ban).to receive(:filter).and_return(true)
+              allow_any_instance_of(Rack::Request).to receive(:ip).and_return('1.2.3.4')
+
+              clone_get(path, env)
+
+              expect(response.status).to eq(401)
+            end
+          end
+        end
+
+        context "when authentication succeeds" do
+          let(:env) { { user: user.username, password: user.password } }
+
+          context "when the user has access to the project" do
+            before do
+              project.team << [user, :master]
+            end
+
+            context "when the user is blocked" do
+              it "responds with status 404" do
+                user.block
+                project.team << [user, :master]
+
+                download(path, env) do |response|
+                  expect(response.status).to eq(404)
+                end
+              end
+            end
+
+            context "when the user isn't blocked" do
+              it "responds with status 200" do
+                expect(Rack::Attack::Allow2Ban).to receive(:reset)
+
+                clone_get(path, env)
+
+                expect(response.status).to eq(200)
+              end
+            end
+
+            context "when blank password attempts follow a valid login" do
+              def attempt_login(include_password)
+                password = include_password ? user.password : ""
+                clone_get path, user: user.username, password: password
+                response.status
+              end
+
+              it "repeated attempts followed by successful attempt" do
+                options = Gitlab.config.rack_attack.git_basic_auth
+                maxretry = options[:maxretry] - 1
+                ip = '1.2.3.4'
+
+                allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip)
+                Rack::Attack::Allow2Ban.reset(ip, options)
+
+                maxretry.times.each do
+                  expect(attempt_login(false)).to eq(401)
+                end
+
+                expect(attempt_login(true)).to eq(200)
+                expect(Rack::Attack::Allow2Ban.banned?(ip)).to be_falsey
+
+                maxretry.times.each do
+                  expect(attempt_login(false)).to eq(401)
+                end
+
+                Rack::Attack::Allow2Ban.reset(ip, options)
+              end
+            end
+          end
+
+          context "when the user doesn't have access to the project" do
+            it "responds with status 404" do
+              download(path, user: user.username, password: user.password) do |response|
+                expect(response.status).to eq(404)
+              end
+            end
+          end
+        end
+      end
+
+      context "when a gitlab ci token is provided" do
+        it "responds with status 200" do
+          token = "123"
+          project = FactoryGirl.create :empty_project
+          project.update_attributes(runners_token: token, builds_enabled: true)
+
+          clone_get "#{project.path_with_namespace}.git", user: 'gitlab-ci-token', password: token
+
+          expect(response.status).to eq(200)
+        end
+      end
+    end
+  end
   def clone_get(project, options={})
     get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password))
   end

From 57145483fc41cc73b7b41005ebac90779f817b5e Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 17:44:10 +0100
Subject: [PATCH 0012/1431] Spec Www-Authenticate

---
 spec/requests/git_http_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index a26b986aeb0..967e0ab6e74 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -4,6 +4,12 @@ describe 'Git HTTP requests', lib: true do
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 
+  it "gives WWW-Authenticate hints" do
+    clone_get('doesnt/exist.git')
+
+    expect(response.header['WWW-Authenticate']).to start_with('Basic ')
+  end
+
   context "when the project doesn't exist" do
     context "when no authentication is provided" do
       it "responds with status 401" do

From 5f3708418ab71c47c6fffe63b1fac03c0e7c889f Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 17:44:13 +0100
Subject: [PATCH 0013/1431] Whitespace!

---
 spec/requests/git_http_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 967e0ab6e74..c1aad48ad04 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -60,13 +60,13 @@ describe 'Git HTTP requests', lib: true do
       before do
         project.update_attribute(:visibility_level, Project::PUBLIC)
       end
-      
+
       it "responds with status 200" do
         download(path, env) do |response|
           expect(response.status).to eq(200)
         end
       end
-      
+
       context 'but git-upload-pack is disabled' do
         it "responds with status 404" do
           allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)

From 5fe06d7365f5552904add8027309d6216954793e Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 24 Mar 2016 18:58:29 +0100
Subject: [PATCH 0014/1431] Add some upload specs

---
 .../projects/git_http_controller.rb           | 40 +++++++++---
 spec/requests/git_http_spec.rb                | 63 ++++++++++++++++++-
 2 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 129e87dbf13..a26ab736115 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -5,10 +5,12 @@ class Projects::GitHttpController < Projects::ApplicationController
     
   def git_rpc
     if upload_pack? && upload_pack_allowed?
-      render_ok and return
+      render_ok
+    elsif receive_pack? && receive_pack_allowed?
+      render_ok
+    else
+      render_not_found
     end
-    
-    render_not_found
   end
   
   %i{info_refs git_receive_pack git_upload_pack}.each do |method|
@@ -30,7 +32,7 @@ class Projects::GitHttpController < Projects::ApplicationController
   end
 
   def project_found?
-    render_not_found if project.nil?
+    render_not_found if project.blank?
   end
 
   def ci_request?(login, password)
@@ -124,13 +126,21 @@ class Projects::GitHttpController < Projects::ApplicationController
   end
 
   def upload_pack?
-    if action_name == 'info_refs'
-      params[:service] == 'git-upload-pack'
-    else
-      action_name == 'git_upload_pack'
-    end
+    rpc == 'git-upload-pack'
   end
 
+  def receive_pack?
+    rpc == 'git-receive-pack'
+  end
+
+  def rpc
+    if action_name == 'info_refs'
+      params[:service]
+    else
+      action_name.gsub('_', '-')
+    end
+  end
+    
   def render_ok
     render json: {
       'GL_ID' => Gitlab::ShellEnv.gl_id(@user),
@@ -164,4 +174,16 @@ class Projects::GitHttpController < Projects::ApplicationController
       false
     end
   end
+
+  def receive_pack_allowed?
+    if !Gitlab.config.gitlab_shell.receive_pack
+      false
+    elsif user
+      # Skip user authorization on upload request.
+      # It will be done by the pre-receive hook in the repository.
+      true
+    else
+      false
+    end
+  end
 end
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index c1aad48ad04..1fa14cadc0f 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -61,12 +61,38 @@ describe 'Git HTTP requests', lib: true do
         project.update_attribute(:visibility_level, Project::PUBLIC)
       end
 
-      it "responds with status 200" do
+      it "downloads get status 200" do
         download(path, env) do |response|
           expect(response.status).to eq(200)
         end
       end
 
+      it "uploads get status 401" do
+        upload(path, env) do |response|
+          expect(response.status).to eq(401)
+        end
+      end
+      
+      context "with correct credentials" do
+        let(:env) { { user: user.username, password: user.password } }
+
+        it "uploads get status 200 (because Git hooks do the real check)" do
+          upload(path, env) do |response|
+            expect(response.status).to eq(200)
+          end
+        end
+        
+        context 'but git-receive-pack is disabled' do
+          it "responds with status 404" do
+            allow(Gitlab.config.gitlab_shell).to receive(:receive_pack).and_return(false)
+  
+            upload(path, env) do |response|
+              expect(response.status).to eq(404)
+            end
+          end
+        end
+      end
+
       context 'but git-upload-pack is disabled' do
         it "responds with status 404" do
           allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
@@ -133,13 +159,19 @@ describe 'Git HTTP requests', lib: true do
             end
 
             context "when the user isn't blocked" do
-              it "responds with status 200" do
+              it "downloads status 200" do
                 expect(Rack::Attack::Allow2Ban).to receive(:reset)
 
                 clone_get(path, env)
 
                 expect(response.status).to eq(200)
               end
+              
+              it "uploads get status 200" do
+                upload(path, env) do |response|
+                  expect(response.status).to eq(200)
+                end      
+              end
             end
 
             context "when blank password attempts follow a valid login" do
@@ -174,11 +206,17 @@ describe 'Git HTTP requests', lib: true do
           end
 
           context "when the user doesn't have access to the project" do
-            it "responds with status 404" do
+            it "downloads get status 404" do
               download(path, user: user.username, password: user.password) do |response|
                 expect(response.status).to eq(404)
               end
             end
+            
+            it "uploads get status 200 (because Git hooks do the real check)" do
+              upload(path, user: user.username, password: user.password) do |response|
+                expect(response.status).to eq(200)
+              end
+            end
           end
         end
       end
@@ -196,6 +234,7 @@ describe 'Git HTTP requests', lib: true do
       end
     end
   end
+
   def clone_get(project, options={})
     get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password))
   end
@@ -204,6 +243,14 @@ describe 'Git HTTP requests', lib: true do
     post "/#{project}/git-upload-pack", {}, auth_env(*options.values_at(:user, :password))
   end
 
+  def push_get(project, options={})
+    get "/#{project}/info/refs", { service: 'git-receive-pack' }, auth_env(*options.values_at(:user, :password))
+  end
+
+  def push_post(project, options={})
+    post "/#{project}/git-receive-pack", {}, auth_env(*options.values_at(:user, :password))
+  end
+
   def download(project, user: nil, password: nil)
     args = [project, {user: user, password: password}]
 
@@ -214,6 +261,16 @@ describe 'Git HTTP requests', lib: true do
     yield response
   end
 
+  def upload(project, user: nil, password: nil)
+    args = [project, {user: user, password: password}]
+
+    push_get *args
+    yield response
+
+    push_post *args
+    yield response
+  end
+
   def auth_env(user, password)
     if user && password
       { 'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(user, password) }

From 1824fb0603c798ec467ea3529570031e7dbb2986 Mon Sep 17 00:00:00 2001
From: Florian <gitlab.com@the-compiler.org>
Date: Tue, 5 Apr 2016 15:20:58 +0000
Subject: [PATCH 0015/1431] Fix broken link in CI quickstart docs

The space between the [label] and the (link) caused it to be interpreted literally.
---
 doc/ci/quick_start/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 9aba4326e11..aae9ccae1d3 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -212,8 +212,8 @@ If you want to receive e-mail notifications about the result status of the
 builds, you should explicitly enable the **Builds Emails** service under your
 project's settings.
 
-For more information read the [Builds emails service documentation]
-(../../project_services/builds_emails.md).
+For more information read the
+[Builds emails service documentation](../../project_services/builds_emails.md).
 
 ## Builds badge
 

From ac4d3dc5ccba32e026250ab48fe7f29bcf4ddd97 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 17:23:16 +0200
Subject: [PATCH 0016/1431] Rubocop

---
 spec/requests/git_http_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 1fa14cadc0f..5d41d973083 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -252,7 +252,7 @@ describe 'Git HTTP requests', lib: true do
   end
 
   def download(project, user: nil, password: nil)
-    args = [project, {user: user, password: password}]
+    args = [project, { user: user, password: password }]
 
     clone_get *args
     yield response
@@ -262,7 +262,7 @@ describe 'Git HTTP requests', lib: true do
   end
 
   def upload(project, user: nil, password: nil)
-    args = [project, {user: user, password: password}]
+    args = [project, { user: user, password: password }]
 
     push_get *args
     yield response

From 6cc6d9730a234c2cc27869f9b9388ab61de9c460 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 17:27:52 +0200
Subject: [PATCH 0017/1431] Delete dead code

---
 lib/gitlab/backend/grack_auth.rb | 53 +-------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index cdcaae8094c..e2363b91265 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -36,10 +36,7 @@ module Grack
       lfs_response = Gitlab::Lfs::Router.new(project, @user, @request).try_call
       return lfs_response unless lfs_response.nil?
 
-      if project && authorized_request?
-        # Tell gitlab-workhorse the request is OK, and what the GL_ID is
-        render_grack_auth_ok
-      elsif @user.nil? && !@ci
+      if @user.nil? && !@ci
         unauthorized
       else
         render_not_found
@@ -141,36 +138,6 @@ module Grack
       user
     end
 
-    def authorized_request?
-      return true if @ci
-
-      case git_cmd
-      when *Gitlab::GitAccess::DOWNLOAD_COMMANDS
-        if !Gitlab.config.gitlab_shell.upload_pack
-          false
-        elsif user
-          Gitlab::GitAccess.new(user, project).download_access_check.allowed?
-        elsif project.public?
-          # Allow clone/fetch for public projects
-          true
-        else
-          false
-        end
-      when *Gitlab::GitAccess::PUSH_COMMANDS
-        if !Gitlab.config.gitlab_shell.receive_pack
-          false
-        elsif user
-          # Skip user authorization on upload request.
-          # It will be done by the pre-receive hook in the repository.
-          true
-        else
-          false
-        end
-      else
-        false
-      end
-    end
-
     def git_cmd
       if @request.get?
         @request.params['service']
@@ -197,24 +164,6 @@ module Grack
       end
     end
 
-    def render_grack_auth_ok
-      repo_path =
-        if @request.path_info =~ /^([\w\.\/-]+)\.wiki\.git/
-          ProjectWiki.new(project).repository.path_to_repo
-        else
-          project.repository.path_to_repo
-        end
-
-      [
-        200,
-        { "Content-Type" => "application/json" },
-        [JSON.dump({
-          'GL_ID' => Gitlab::ShellEnv.gl_id(@user),
-          'RepoPath' => repo_path,
-        })]
-      ]
-    end
-
     def render_not_found
       [404, { "Content-Type" => "text/plain" }, ["Not Found"]]
     end

From 91226c200151461b21e85cc8c85a103c93d6a17f Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 17:52:12 +0200
Subject: [PATCH 0018/1431] Move workhorse protocol code into lib

---
 app/controllers/projects/git_http_controller.rb | 13 +++++--------
 lib/gitlab/workhorse.rb                         |  7 +++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index a26ab736115..6dd7a683b0e 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -115,12 +115,12 @@ class Projects::GitHttpController < Projects::ApplicationController
     end
   end
 
-  def repo_path
-    @repo_path ||= begin
+  def repository
+    @repository ||= begin
       if params[:project_id].end_with?('.wiki.git')
-        project.wiki.wiki.path
+        project.wiki.repository
       else
-        repository.path_to_repo
+        project.repository
       end
     end
   end
@@ -142,10 +142,7 @@ class Projects::GitHttpController < Projects::ApplicationController
   end
     
   def render_ok
-    render json: {
-      'GL_ID' => Gitlab::ShellEnv.gl_id(@user),
-      'RepoPath' => repo_path,
-    }
+    render json: Gitlab::Workhorse.git_http_ok(repository, user)
   end
   
   def render_not_found
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index c3ddd4c2680..5b2982e4994 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -6,6 +6,13 @@ module Gitlab
     SEND_DATA_HEADER = 'Gitlab-Workhorse-Send-Data'
 
     class << self
+      def git_http_ok(repository, user)
+        {
+          'GL_ID' => Gitlab::ShellEnv.gl_id(user),
+          'RepoPath' => repository.path_to_repo,
+        }
+      end
+
       def send_git_blob(repository, blob)
         params = {
           'RepoPath' => repository.path_to_repo,

From ccb29955c9d7de69d99fe91425d6246cc723def4 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 18:58:19 +0200
Subject: [PATCH 0019/1431] More tests, better descriptions

---
 spec/requests/git_http_spec.rb | 41 +++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 5d41d973083..8b217684911 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -12,7 +12,7 @@ describe 'Git HTTP requests', lib: true do
 
   context "when the project doesn't exist" do
     context "when no authentication is provided" do
-      it "responds with status 401" do
+      it "responds with status 401 (no project existence information leak)" do
         download('doesnt/exist.git') do |response|
           expect(response.status).to eq(401)
         end
@@ -72,7 +72,7 @@ describe 'Git HTTP requests', lib: true do
           expect(response.status).to eq(401)
         end
       end
-      
+
       context "with correct credentials" do
         let(:env) { { user: user.username, password: user.password } }
 
@@ -81,11 +81,11 @@ describe 'Git HTTP requests', lib: true do
             expect(response.status).to eq(200)
           end
         end
-        
+
         context 'but git-receive-pack is disabled' do
           it "responds with status 404" do
             allow(Gitlab.config.gitlab_shell).to receive(:receive_pack).and_return(false)
-  
+
             upload(path, env) do |response|
               expect(response.status).to eq(404)
             end
@@ -110,11 +110,17 @@ describe 'Git HTTP requests', lib: true do
       end
 
       context "when no authentication is provided" do
-        it "responds with status 401" do
+        it "responds with status 401 to downloads" do
           download(path, env) do |response|
             expect(response.status).to eq(401)
           end
         end
+
+        it "responds with status 401 to uploads" do
+          upload(path, env) do |response|
+            expect(response.status).to eq(401)
+          end
+        end
       end
 
       context "when username and password are provided" do
@@ -159,18 +165,18 @@ describe 'Git HTTP requests', lib: true do
             end
 
             context "when the user isn't blocked" do
-              it "downloads status 200" do
+              it "downloads get status 200" do
                 expect(Rack::Attack::Allow2Ban).to receive(:reset)
 
                 clone_get(path, env)
 
                 expect(response.status).to eq(200)
               end
-              
+
               it "uploads get status 200" do
                 upload(path, env) do |response|
                   expect(response.status).to eq(200)
-                end      
+                end
               end
             end
 
@@ -211,7 +217,7 @@ describe 'Git HTTP requests', lib: true do
                 expect(response.status).to eq(404)
               end
             end
-            
+
             it "uploads get status 200 (because Git hooks do the real check)" do
               upload(path, user: user.username, password: user.password) do |response|
                 expect(response.status).to eq(200)
@@ -222,15 +228,24 @@ describe 'Git HTTP requests', lib: true do
       end
 
       context "when a gitlab ci token is provided" do
-        it "responds with status 200" do
-          token = "123"
-          project = FactoryGirl.create :empty_project
-          project.update_attributes(runners_token: token, builds_enabled: true)
+        let(:token) { 123 }
+        let(:project) { FactoryGirl.create :empty_project }
 
+        before do
+          project.update_attributes(runners_token: token, builds_enabled: true)
+        end
+
+        it "downloads get status 200" do
           clone_get "#{project.path_with_namespace}.git", user: 'gitlab-ci-token', password: token
 
           expect(response.status).to eq(200)
         end
+
+        it "uploads get status 401 (no project existence information leak)" do
+          push_get "#{project.path_with_namespace}.git", user: 'gitlab-ci-token', password: token
+
+          expect(response.status).to eq(401)
+        end
       end
     end
   end

From ab9dfa8fd681ac558cf988aa2cdb5bd69feea757 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 19:25:47 +0200
Subject: [PATCH 0020/1431] Clarify intentions

---
 app/controllers/projects/git_http_controller.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 6dd7a683b0e..11e17510cb9 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -108,11 +108,14 @@ class Projects::GitHttpController < Projects::ApplicationController
     id = params[:project_id]
     return if id.nil?
     
-    if id.end_with?('.wiki.git')
-      id.slice(0, id.length - 9)
-    elsif id.end_with?('.git')
-      id.slice(0, id.length - 4)
+    %w{.wiki.git .git}.each do |suffix|
+      # Be careful to only remove the suffix from the end of 'id'.
+      # Accidentally removing it from the middle is how security
+      # vulnerabilities happen!
+      return id.slice(0, id.length - suffix.length) if id.end_with?(suffix)
     end
+
+    nil
   end
 
   def repository

From 35266de2f0e91ac73995ab8ced1bbcb12e35f773 Mon Sep 17 00:00:00 2001
From: Chris McKnight <cmckni3@gmail.com>
Date: Wed, 6 Jan 2016 11:20:52 -0600
Subject: [PATCH 0021/1431] Updates git lfs initialize command

---
 doc/workflow/lfs/manage_large_binaries_with_git_lfs.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index ba91685a20b..83db44c10b1 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -44,7 +44,7 @@ check it into your Git repository:
 
 ```bash
 git clone git@gitlab.example.com:group/project.git
-git lfs init                          # initialize the Git LFS project project
+git lfs install                       # initialize the Git LFS project project
 git lfs track "*.iso"                 # select the file extensions that you want to treat as large files
 ```
 
@@ -152,4 +152,4 @@ If you are using OS X you can use `osxkeychain` to store and encrypt your creden
 For Windows, you can use `wincred` or Microsoft's [Git Credential Manager for Windows](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases).
 
 More details about various methods of storing the user credentials can be found
-on [Git Credential Storage documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage).
\ No newline at end of file
+on [Git Credential Storage documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage).

From e4d9d4e55b67ab04e46ee3f72c5496f91687a205 Mon Sep 17 00:00:00 2001
From: "P.S.V.R" <pmq2001@gmail.com>
Date: Mon, 11 Apr 2016 16:45:00 +0800
Subject: [PATCH 0022/1431] fix #15127 ActiveJob::DeserializationError thrown

send_devise_notification pre-maturely enqueued the task when the user instance
has not yet been committed into the database, causing a record-not-found in the
other sidekiq process.

devise-async has already been taking care of asynchronous mail sending, we just
need to run it inside queue `mailers` instead of `mailer` to enable it.
---
 app/models/user.rb                  | 5 -----
 config/initializers/devise_async.rb | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2b0bee2099f..531dc9a5aed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -845,11 +845,6 @@ class User < ActiveRecord::Base
                             other.select(:id)])
   end
 
-  # Added according to https://github.com/plataformatec/devise/blob/7df57d5081f9884849ca15e4fde179ef164a575f/README.md#activejob-integration
-  def send_devise_notification(notification, *args)
-    devise_mailer.send(notification, self, *args).deliver_later
-  end
-
   def ensure_external_user_rights
     return unless self.external?
 
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index 05a1852cdbd..fa602cbe554 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1 +1,2 @@
 Devise::Async.backend = :sidekiq
+Devise::Async.queue = :mailers

From e84c155f092600b90be291f0f7bb649811fa53fb Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 12 Apr 2016 16:16:39 +0200
Subject: [PATCH 0023/1431] WIP

---
 .../projects/pipelines_controller.rb          | 102 ++++++++++++++++++
 app/models/ability.rb                         |   7 +-
 app/views/layouts/nav/_project.html.haml      |   7 ++
 .../projects/ci/commits/_commit.html.haml     |  73 +++++++++++++
 .../ci_commits/_header_title.html.haml        |   1 +
 app/views/projects/ci_commits/index.html.haml |  65 +++++++++++
 app/views/projects/ci_commits/new.html.haml   |  25 +++++
 config/routes.rb                              |   7 ++
 8 files changed, 286 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index e69de29bb2d..764c8cc9cca 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -0,0 +1,102 @@
+class Projects::PipelineController < Projects::ApplicationController
+  before_action :ci_commit, except: [:index, :new, :create]
+  before_action :authorize_read_pipeline!
+  before_action :authorize_create_pipeline!, only: [:new, :create]
+  before_action :authorize_update_pipeline!, only: [:retry, :cancel]
+  layout 'project'
+
+  def index
+    @scope = params[:scope]
+    @all_commits = project.ci_commits
+    @commits = @all_commits.order(id: :desc)
+    @commits =
+      case @scope
+      when 'latest'
+        @commits
+      when 'running'
+        @commits.running_or_pending
+      when 'branches'
+        refs = project.repository.branches.map(&:name)
+        ids = @all_commits.where(ref: refs).group(:ref).select('max(id)')
+        @commits.where(id: ids)
+      when 'tags'
+        refs = project.repository.tags.map(&:name)
+        ids = @all_commits.where(ref: refs).group(:ref).select('max(id)')
+        @commits.where(id: ids)
+      else
+        @commits
+      end
+    @commits = @commits.page(params[:page]).per(30)
+  end
+
+  def new
+  end
+
+  def create
+    ref_names = project.repository.ref_names
+    unless ref_names.include?(params[:ref])
+      @error = 'Reference not found'
+      render action: 'new'
+      return
+    end
+
+    commit = project.commit(params[:ref])
+    unless commit
+      @error = 'Commit not found'
+      render action: 'new'
+      return
+    end
+
+    ci_commit = project.ci_commit(commit.id, params[:ref])
+    if ci_commit
+      @error = 'Pipeline already created'
+      render action: 'new'
+      return
+    end
+
+    # Skip creating ci_commit when no gitlab-ci.yml is found
+    commit = project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
+    unless commit.config_processor
+      @error = commit.yaml_errors || 'Missing .gitlab-ci.yml file'
+      render action: 'new'
+      return
+    end
+
+    Ci::Commit.transaction do
+      commit.save!
+      commit.create_builds(params[:ref], false, current_user)
+    end
+
+    redirect_to builds_namespace_project_commit_path(project.namespace, project, commit.id)
+  end
+
+  def show
+    @commit = @ci_commit.commit
+    @builds = @ci_commit.builds
+    @statuses = @ci_commit.statuses
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def retry
+    ci_commit.builds.latest.failed.select(&:retryable?).each(&:retry)
+
+    redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
+  end
+
+  def cancel
+    ci_commit.builds.running_or_pending.each(&:cancel)
+
+    redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
+  end
+
+  def retry_builds
+  end
+  private
+
+  def ci_commit
+    @ci_commit ||= project.ci_commits.find_by!(id: params[:id])
+  end
+end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index c0bf6def7c5..ec5ac54c277 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -195,6 +195,7 @@ class Ability
         :admin_label,
         :read_commit_status,
         :read_build,
+        :read_pipeline,
       ]
     end
 
@@ -206,6 +207,8 @@ class Ability
         :update_commit_status,
         :create_build,
         :update_build,
+        :create_pipeline,
+        :update_pipeline,
         :create_merge_request,
         :create_wiki,
         :push_code
@@ -234,7 +237,8 @@ class Ability
         :admin_wiki,
         :admin_project,
         :admin_commit_status,
-        :admin_build
+        :admin_build,
+        :admin_pipeline
       ]
     end
 
@@ -277,6 +281,7 @@ class Ability
 
       unless project.builds_enabled
         rules += named_abilities('build')
+        rules += named_abilities('pipeline')
       end
 
       rules
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 86b46e8c75e..fcce1b1dc98 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -39,6 +39,13 @@
           Commits
 
   - if project_nav_tab? :builds
+    = nav_link(controller: %w(ci_commits)) do
+      = link_to project_ci_commits_path(@project), title: 'Pipelines', class: 'shortcuts-builds' do
+        = icon('ship fw')
+        %span
+          Pipelines
+          %span.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count(:all))
+
     = nav_link(controller: %w(builds)) do
       = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
         = icon('cubes fw')
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index e69de29bb2d..29efcc9cfdd 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -0,0 +1,73 @@
+- status = commit.status
+%tr.commit
+  %td.commit-link
+    = link_to namespace_project_commit_url(@project.namespace, @project, commit), class: "ci-status ci-#{status}" do
+      = ci_icon_for_status(status)
+      %strong ##{commit.id}
+
+  %td
+    %div
+      - if commit.ref
+        = link_to commit.ref, namespace_project_commits_path(@project.namespace, @project, commit.ref)
+      &nbsp;
+      - if commit.tag?
+        %span.label.label-primary tag
+      - if commit.branch?
+        %span.label.label-primary branch
+      - if commit.trigger_requests.any?
+        %span.label.label-primary triggered
+      - if commit.yaml_errors.present?
+        %span.label.label-danger.has-tooltip(title="#{commit.yaml_errors}") yaml invalid
+      - if commit.builds.any?(&:stuck?)
+        %span.label.label-warning stuck
+
+      - if commit_data = commit.commit_data
+        = render 'projects/branches/commit', commit: commit_data, project: @project
+      - else
+        %p
+          Cant find HEAD commit for this branch
+
+    - stages.each do |stage|
+      %td
+        - status = commit.statuses.latest.where(stage: stage).status
+        %span.has-tooltip(title="#{status || "missing"}"){class: "ci-status-icon-#{status || "skipped"}"}
+          = ci_icon_for_status(status || "missing")
+        -#- if status
+        -#  = ci_status_with_icon(status)
+        -#- else
+        -#  = ci_status_with_icon('missing')
+
+  %td
+    - if commit.started_at && commit.finished_at
+      %p
+        #{duration_in_words(commit.finished_at, commit.started_at)}
+    - if commit.finished_at
+      %p
+        #{time_ago_with_tooltip(commit.finished_at)}
+
+  %td.content
+    .controls.hidden-xs.pull-right
+      - artifacts = commit.builds.latest.select { |status| status.artifacts? }
+      - if artifacts.present?
+        .dropdown.inline
+          %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+            = icon('download')
+            %b.caret
+          %ul.dropdown-menu.dropdown-menu-align-right
+            - artifacts.each do |build|
+              %li
+                = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
+                  %i.fa.fa-download
+                  %span #{build.name}
+        &nbsp;
+
+      - if can?(current_user, :update_pipeline, @project)
+        - if commit.retryable?
+          = link_to retry_namespace_project_ci_commit_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
+            = icon("repeat")
+
+        &nbsp;
+
+        - if commit.active?
+          = link_to cancel_namespace_project_ci_commit_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
+            = icon("remove cred")
diff --git a/app/views/projects/ci_commits/_header_title.html.haml b/app/views/projects/ci_commits/_header_title.html.haml
index e69de29bb2d..27c125ca40f 100644
--- a/app/views/projects/ci_commits/_header_title.html.haml
+++ b/app/views/projects/ci_commits/_header_title.html.haml
@@ -0,0 +1 @@
+- header_title project_title(@project, "Pipelines", project_ci_commits_path(@project))
diff --git a/app/views/projects/ci_commits/index.html.haml b/app/views/projects/ci_commits/index.html.haml
index e69de29bb2d..0347c220382 100644
--- a/app/views/projects/ci_commits/index.html.haml
+++ b/app/views/projects/ci_commits/index.html.haml
@@ -0,0 +1,65 @@
+- page_title "Pipelines"
+= render "header_title"
+
+.top-area
+  %ul.nav-links
+    %li{class: ('active' if @scope.nil?)}
+      = link_to project_ci_commits_path(@project) do
+        All
+        %span.badge.js-totalbuilds-count
+          = number_with_delimiter(@all_commits.count(:id))
+
+    %li{class: ('active' if @scope == 'branches')}
+      = link_to project_ci_commits_path(@project, scope: :branches) do
+        Branches
+        %span.badge.js-running-count
+          = number_with_delimiter(@all_commits.running_or_pending.count(:id))
+
+    %li{class: ('active' if @scope == 'tags')}
+      = link_to project_ci_commits_path(@project, scope: :tags) do
+        Tags
+        %span.badge.js-running-count
+          = number_with_delimiter(@all_commits.running_or_pending.count(:id))
+
+    %li{class: ('active' if @scope == 'running')}
+      = link_to project_ci_commits_path(@project, scope: :running) do
+        Failed
+        %span.badge.js-running-count
+          = number_with_delimiter(@all_commits.running_or_pending.count(:id))
+
+  .nav-controls
+    - if can? current_user, :create_pipeline, @project
+      = link_to new_namespace_project_ci_commit_path(@project.namespace, @project), class: 'btn btn-create' do
+        = icon('plus')
+        New
+
+    - if can?(current_user, :update_build, @project)
+      - unless @repository.gitlab_ci_yml
+        = link_to 'Get started with Pipelines', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+
+      = link_to ci_lint_path, class: 'btn btn-default' do
+        = icon('wrench')
+        %span CI Lint
+
+.gray-content-block
+  Pipelines for #{(@scope || 'changes')} on this project
+
+%ul.content-list
+  - stages = @commits.stages
+  - if @commits.blank?
+    %li
+      .nothing-here-block No pipelines to show
+  - else
+    .table-holder
+      %table.table.builds
+        %tbody
+          %th Pipeline ID
+          %th Commit
+          - @commits.stages.each do |stage|
+            %th
+              = stage.titleize
+          %th
+          %th
+        = render @commits.includes(:statuses).includes(:builds), commit_sha: true, stage: true, allow_retry: true, stages: stages
+
+    = paginate @commits, theme: 'gitlab'
diff --git a/app/views/projects/ci_commits/new.html.haml b/app/views/projects/ci_commits/new.html.haml
index e69de29bb2d..e9a22bbb157 100644
--- a/app/views/projects/ci_commits/new.html.haml
+++ b/app/views/projects/ci_commits/new.html.haml
@@ -0,0 +1,25 @@
+- page_title "New Pipeline"
+= render "header_title"
+
+- if @error
+  .alert.alert-danger
+    %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
+    = @error
+%h3.page-title
+  New Pipeline
+%hr
+
+= form_tag namespace_project_ci_commits_path, method: :post, id: "new-pipeline-form", class: "form-horizontal js-create-branch-form js-requires-input" do
+  .form-group
+    = label_tag :ref, 'Create for', class: 'control-label'
+    .col-sm-10
+      = text_field_tag :ref, params[:ref] || @project.default_branch, required: true, tabindex: 2, class: 'form-control'
+      .help-block Existing branch name, tag
+  .form-actions
+    = button_tag 'Create pipeline', class: 'btn btn-create', tabindex: 3
+    = link_to 'Cancel', namespace_project_ci_commits_path(@project.namespace, @project), class: 'btn btn-cancel'
+
+:javascript
+  var availableRefs = #{@project.repository.ref_names.to_json};
+
+  new NewBranchForm($('.js-create-branch-form'), availableRefs)
diff --git a/config/routes.rb b/config/routes.rb
index 842fbb99843..841b3f26272 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -654,6 +654,13 @@ Rails.application.routes.draw do
         resource :variables, only: [:show, :update]
         resources :triggers, only: [:index, :create, :destroy]
 
+        resources :pipelines, only: [:index, :new, :create] do
+          member do
+            post :cancel
+            post :retry
+          end
+        end
+
         resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
           collection do
             post :cancel_all

From 406a796f76824e18f4dca2d29c41dcc3d2e4d457 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 12 Apr 2016 19:57:22 +0200
Subject: [PATCH 0024/1431] Make Pipeline view work

---
 app/assets/stylesheets/framework/tables.scss  | 19 +++++++++++++++++
 .../projects/pipelines_controller.rb          |  2 +-
 app/helpers/ci_status_helper.rb               |  2 +-
 app/helpers/gitlab_routing_helper.rb          |  2 +-
 app/models/ci/commit.rb                       |  4 ++++
 app/views/layouts/nav/_project.html.haml      |  2 +-
 .../projects/ci/commits/_commit.html.haml     | 21 +++++++++----------
 .../ci_commits/_header_title.html.haml        |  1 -
 .../pipelines/_header_title.html.haml         |  1 +
 .../{ci_commits => pipelines}/index.html.haml | 14 ++++++-------
 .../{ci_commits => pipelines}/new.html.haml   |  4 ++--
 spec/models/project_spec.rb                   |  2 +-
 12 files changed, 48 insertions(+), 26 deletions(-)
 delete mode 100644 app/views/projects/ci_commits/_header_title.html.haml
 create mode 100644 app/views/projects/pipelines/_header_title.html.haml
 rename app/views/projects/{ci_commits => pipelines}/index.html.haml (76%)
 rename app/views/projects/{ci_commits => pipelines}/new.html.haml (72%)

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 75b770ae5a2..3a7f5bb932e 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -34,6 +34,25 @@ table {
         font-weight: normal;
         font-size: 15px;
         border-bottom: 1px solid $border-color;
+
+        .rotate {
+          height: 140px;
+          white-space: nowrap;
+        }
+
+        .rotate > div {
+          transform:
+                  /* Magic Numbers */
+                  translate(25px, 51px)
+                    /* 45 is really 360 - 45 */
+                  rotate(315deg);
+          width: 30px;
+        }
+
+        .rotate > div > span {
+          border-bottom: 1px solid #ccc;
+          padding: 5px 10px;
+        }
       }
 
       td {
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 764c8cc9cca..a3e72fbdef1 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -1,4 +1,4 @@
-class Projects::PipelineController < Projects::ApplicationController
+class Projects::PipelinesController < Projects::ApplicationController
   before_action :ci_commit, except: [:index, :new, :create]
   before_action :authorize_read_pipeline!
   before_action :authorize_create_pipeline!, only: [:new, :create]
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index effa7ce77e1..3f7282d0c6c 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -37,7 +37,7 @@ module CiStatusHelper
     return unless ci_commit.is_a?(Commit) || ci_commit.is_a?(Ci::Commit)
 
     link_to ci_icon_for_status(ci_commit.status),
-      project_ci_commit_path(ci_commit.project, ci_commit),
+      project_pipeline_path(ci_commit.project, ci_commit),
       class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}",
       title: "Build #{ci_label_for_status(ci_commit.status)}",
       data: { toggle: 'tooltip', placement: tooltip_placement }
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index f1af8e163cd..ed0db04e069 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -37,7 +37,7 @@ module GitlabRoutingHelper
     builds_namespace_project_commit_path(project.namespace, project, commit.id)
   end
 
-  def project_ci_commit_path(project, ci_commit)
+  def project_pipeline_path(project, ci_commit)
     builds_namespace_project_commit_path(project.namespace, project, ci_commit.sha)
   end
 
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 8865bd76bd2..687654d3c89 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -94,6 +94,10 @@ module Ci
       end
     end
 
+    def triggered?
+      trigger_requests.any?
+    end
+
     def invalidate
       write_attribute(:status, nil)
       write_attribute(:started_at, nil)
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index fcce1b1dc98..b58d8270230 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -40,7 +40,7 @@
 
   - if project_nav_tab? :builds
     = nav_link(controller: %w(ci_commits)) do
-      = link_to project_ci_commits_path(@project), title: 'Pipelines', class: 'shortcuts-builds' do
+      = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-builds' do
         = icon('ship fw')
         %span
           Pipelines
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 29efcc9cfdd..7c6ba216386 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -1,7 +1,7 @@
 - status = commit.status
 %tr.commit
   %td.commit-link
-    = link_to namespace_project_commit_url(@project.namespace, @project, commit), class: "ci-status ci-#{status}" do
+    = link_to namespace_project_commit_path(@project.namespace, @project, commit.sha), class: "ci-status ci-#{status}" do
       = ci_icon_for_status(status)
       %strong ##{commit.id}
 
@@ -14,7 +14,7 @@
         %span.label.label-primary tag
       - if commit.branch?
         %span.label.label-primary branch
-      - if commit.trigger_requests.any?
+      - if commit.triggered?
         %span.label.label-primary triggered
       - if commit.yaml_errors.present?
         %span.label.label-danger.has-tooltip(title="#{commit.yaml_errors}") yaml invalid
@@ -27,22 +27,21 @@
         %p
           Cant find HEAD commit for this branch
 
+    - stages_status = commit.statuses.stages_status
     - stages.each do |stage|
       %td
-        - status = commit.statuses.latest.where(stage: stage).status
-        %span.has-tooltip(title="#{status || "missing"}"){class: "ci-status-icon-#{status || "skipped"}"}
-          = ci_icon_for_status(status || "missing")
-        -#- if status
-        -#  = ci_status_with_icon(status)
-        -#- else
-        -#  = ci_status_with_icon('missing')
+        - if status = stages_status[stage]
+          %span.has-tooltip(title="#{status}"){class: "ci-status-icon-#{status}"}
+            = ci_icon_for_status(status)
 
   %td
     - if commit.started_at && commit.finished_at
       %p
+        %i.fa.fa-late-o
         #{duration_in_words(commit.finished_at, commit.started_at)}
     - if commit.finished_at
       %p
+        %i.fa.fa-date-o
         #{time_ago_with_tooltip(commit.finished_at)}
 
   %td.content
@@ -63,11 +62,11 @@
 
       - if can?(current_user, :update_pipeline, @project)
         - if commit.retryable?
-          = link_to retry_namespace_project_ci_commit_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
+          = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
 
         &nbsp;
 
         - if commit.active?
-          = link_to cancel_namespace_project_ci_commit_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
+          = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
             = icon("remove cred")
diff --git a/app/views/projects/ci_commits/_header_title.html.haml b/app/views/projects/ci_commits/_header_title.html.haml
deleted file mode 100644
index 27c125ca40f..00000000000
--- a/app/views/projects/ci_commits/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Pipelines", project_ci_commits_path(@project))
diff --git a/app/views/projects/pipelines/_header_title.html.haml b/app/views/projects/pipelines/_header_title.html.haml
new file mode 100644
index 00000000000..faf63d64a79
--- /dev/null
+++ b/app/views/projects/pipelines/_header_title.html.haml
@@ -0,0 +1 @@
+- header_title project_title(@project, "Pipelines", project_pipelines_path(@project))
diff --git a/app/views/projects/ci_commits/index.html.haml b/app/views/projects/pipelines/index.html.haml
similarity index 76%
rename from app/views/projects/ci_commits/index.html.haml
rename to app/views/projects/pipelines/index.html.haml
index 0347c220382..b9877cd37be 100644
--- a/app/views/projects/ci_commits/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -4,32 +4,32 @@
 .top-area
   %ul.nav-links
     %li{class: ('active' if @scope.nil?)}
-      = link_to project_ci_commits_path(@project) do
+      = link_to project_pipelines_path(@project) do
         All
         %span.badge.js-totalbuilds-count
           = number_with_delimiter(@all_commits.count(:id))
 
     %li{class: ('active' if @scope == 'branches')}
-      = link_to project_ci_commits_path(@project, scope: :branches) do
+      = link_to project_pipelines_path(@project, scope: :branches) do
         Branches
         %span.badge.js-running-count
           = number_with_delimiter(@all_commits.running_or_pending.count(:id))
 
     %li{class: ('active' if @scope == 'tags')}
-      = link_to project_ci_commits_path(@project, scope: :tags) do
+      = link_to project_pipelines_path(@project, scope: :tags) do
         Tags
         %span.badge.js-running-count
           = number_with_delimiter(@all_commits.running_or_pending.count(:id))
 
     %li{class: ('active' if @scope == 'running')}
-      = link_to project_ci_commits_path(@project, scope: :running) do
+      = link_to project_pipelines_path(@project, scope: :running) do
         Failed
         %span.badge.js-running-count
           = number_with_delimiter(@all_commits.running_or_pending.count(:id))
 
   .nav-controls
     - if can? current_user, :create_pipeline, @project
-      = link_to new_namespace_project_ci_commit_path(@project.namespace, @project), class: 'btn btn-create' do
+      = link_to new_namespace_project_pipeline_path(@project.namespace, @project), class: 'btn btn-create' do
         = icon('plus')
         New
 
@@ -56,10 +56,10 @@
           %th Pipeline ID
           %th Commit
           - @commits.stages.each do |stage|
-            %th
+            %th.rotate
               = stage.titleize
           %th
           %th
-        = render @commits.includes(:statuses).includes(:builds), commit_sha: true, stage: true, allow_retry: true, stages: stages
+        = render @commits, commit_sha: true, stage: true, allow_retry: true, stages: stages
 
     = paginate @commits, theme: 'gitlab'
diff --git a/app/views/projects/ci_commits/new.html.haml b/app/views/projects/pipelines/new.html.haml
similarity index 72%
rename from app/views/projects/ci_commits/new.html.haml
rename to app/views/projects/pipelines/new.html.haml
index e9a22bbb157..39b1571b9cf 100644
--- a/app/views/projects/ci_commits/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -9,7 +9,7 @@
   New Pipeline
 %hr
 
-= form_tag namespace_project_ci_commits_path, method: :post, id: "new-pipeline-form", class: "form-horizontal js-create-branch-form js-requires-input" do
+= form_tag namespace_project_pipelines_path, method: :post, id: "new-pipeline-form", class: "form-horizontal js-create-branch-form js-requires-input" do
   .form-group
     = label_tag :ref, 'Create for', class: 'control-label'
     .col-sm-10
@@ -17,7 +17,7 @@
       .help-block Existing branch name, tag
   .form-actions
     = button_tag 'Create pipeline', class: 'btn btn-create', tabindex: 3
-    = link_to 'Cancel', namespace_project_ci_commits_path(@project.namespace, @project), class: 'btn btn-cancel'
+    = link_to 'Cancel', namespace_project_pipelines_path(@project.namespace, @project), class: 'btn btn-cancel'
 
 :javascript
   var availableRefs = #{@project.repository.ref_names.to_json};
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 1688e91ca62..59df2c5cb87 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -62,7 +62,7 @@ describe Project, models: true do
     it { is_expected.to have_one(:pushover_service).dependent(:destroy) }
     it { is_expected.to have_one(:asana_service).dependent(:destroy) }
     it { is_expected.to have_many(:commit_statuses) }
-    it { is_expected.to have_many(:ci_commits) }
+    it { is_expected.to have_many(:pipelines) }
     it { is_expected.to have_many(:builds) }
     it { is_expected.to have_many(:runner_projects) }
     it { is_expected.to have_many(:runners) }

From f5d24e60f842096f670593fb4dd0d29c3f5d4fcc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 13:01:08 +0200
Subject: [PATCH 0025/1431] Pipeline view

---
 app/assets/stylesheets/framework/tables.scss  |  3 -
 .../projects/pipelines_controller.rb          | 56 +++++++------------
 app/models/ci/commit.rb                       |  7 +++
 app/views/projects/ci/builds/_build.html.haml |  4 +-
 .../projects/ci/commits/_commit.html.haml     | 41 +++++++-------
 .../projects/commit/_ci_commit.html.haml      | 30 +++-------
 app/views/projects/pipelines/index.html.haml  | 33 +++++------
 app/views/projects/pipelines/show.html.haml   |  3 +
 config/routes.rb                              |  2 +-
 9 files changed, 79 insertions(+), 100 deletions(-)
 create mode 100644 app/views/projects/pipelines/show.html.haml

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 3a7f5bb932e..9d6a6c5b237 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -38,9 +38,6 @@ table {
         .rotate {
           height: 140px;
           white-space: nowrap;
-        }
-
-        .rotate > div {
           transform:
                   /* Magic Numbers */
                   translate(25px, 51px)
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index a3e72fbdef1..b2ee5573bfc 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -1,5 +1,5 @@
 class Projects::PipelinesController < Projects::ApplicationController
-  before_action :ci_commit, except: [:index, :new, :create]
+  before_action :pipeline, except: [:index, :new, :create]
   before_action :authorize_read_pipeline!
   before_action :authorize_create_pipeline!, only: [:new, :create]
   before_action :authorize_update_pipeline!, only: [:retry, :cancel]
@@ -7,26 +7,24 @@ class Projects::PipelinesController < Projects::ApplicationController
 
   def index
     @scope = params[:scope]
-    @all_commits = project.ci_commits
-    @commits = @all_commits.order(id: :desc)
-    @commits =
+    @all_pipelines = project.ci_commits
+    @pipelines = @all_pipelines.order(id: :desc)
+    @pipelines =
       case @scope
-      when 'latest'
-        @commits
       when 'running'
-        @commits.running_or_pending
+        @pipelines.running_or_pending
       when 'branches'
-        refs = project.repository.branches.map(&:name)
-        ids = @all_commits.where(ref: refs).group(:ref).select('max(id)')
-        @commits.where(id: ids)
+        @branches = project.repository.branches.map(&:name)
+        @branches_ids = @all_pipelines.where(ref: @branches).group(:ref).select('max(id)')
+        @pipelines.where(id: @branches_ids)
       when 'tags'
-        refs = project.repository.tags.map(&:name)
-        ids = @all_commits.where(ref: refs).group(:ref).select('max(id)')
-        @commits.where(id: ids)
+        @tags = project.repository.tags.map(&:name)
+        @tags_ids = @all_pipelines.where(ref: @tags).group(:ref).select('max(id)')
+        @pipelines.where(id: @tags_ids)
       else
-        @commits
+        @pipelines
       end
-    @commits = @commits.page(params[:page]).per(30)
+    @pipelines = @pipelines.page(params[:page]).per(30)
   end
 
   def new
@@ -47,56 +45,44 @@ class Projects::PipelinesController < Projects::ApplicationController
       return
     end
 
-    ci_commit = project.ci_commit(commit.id, params[:ref])
-    if ci_commit
-      @error = 'Pipeline already created'
-      render action: 'new'
-      return
-    end
+    pipeline = project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
 
     # Skip creating ci_commit when no gitlab-ci.yml is found
-    commit = project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
-    unless commit.config_processor
-      @error = commit.yaml_errors || 'Missing .gitlab-ci.yml file'
+    unless pipeline.config_processor
+      @error = pipeline.yaml_errors || 'Missing .gitlab-ci.yml file'
       render action: 'new'
       return
     end
 
     Ci::Commit.transaction do
       commit.save!
-      commit.create_builds(params[:ref], false, current_user)
+      commit.create_builds(current_user)
     end
 
     redirect_to builds_namespace_project_commit_path(project.namespace, project, commit.id)
   end
 
   def show
-    @commit = @ci_commit.commit
-    @builds = @ci_commit.builds
-    @statuses = @ci_commit.statuses
-
     respond_to do |format|
       format.html
     end
   end
 
   def retry
-    ci_commit.builds.latest.failed.select(&:retryable?).each(&:retry)
+    pipeline.builds.latest.failed.select(&:retryable?).each(&:retry)
 
     redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
   end
 
   def cancel
-    ci_commit.builds.running_or_pending.each(&:cancel)
+    pipeline.builds.running_or_pending.each(&:cancel)
 
     redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
   end
 
-  def retry_builds
-  end
   private
 
-  def ci_commit
-    @ci_commit ||= project.ci_commits.find_by!(id: params[:id])
+  def pipeline
+    @pipeline ||= project.ci_commits.find_by!(id: params[:id])
   end
 end
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 687654d3c89..7991b987e35 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -94,6 +94,13 @@ module Ci
       end
     end
 
+    def latest?
+      return false unless ref
+      commit = project.commit(ref)
+      return false unless commit
+      commit.sha == sha
+    end
+
     def triggered?
       trigger_requests.any?
     end
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 218d396b898..7ded4828b2f 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -13,7 +13,9 @@
       %strong ##{build.id}
 
     - if build.stuck?
-      %i.fa.fa-warning.text-warning
+      %i.fa.fa-warning.text-warning.has-tooltip(title="Build is stuck. Check runners.")
+    - if defined?(retried) && retried
+      %i.fa.fa-warning.has-tooltip(title="Build was retried")
 
   - if defined?(commit_sha) && commit_sha
     %td
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 7c6ba216386..32f85cb8f8c 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -1,19 +1,21 @@
 - status = commit.status
 %tr.commit
   %td.commit-link
-    = link_to namespace_project_commit_path(@project.namespace, @project, commit.sha), class: "ci-status ci-#{status}" do
+    = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: "ci-status ci-#{status}" do
       = ci_icon_for_status(status)
       %strong ##{commit.id}
 
   %td
-    %div
+    %div.branch-commit
       - if commit.ref
-        = link_to commit.ref, namespace_project_commits_path(@project.namespace, @project, commit.ref)
+        = link_to commit.ref, namespace_project_commits_path(@project.namespace, @project, commit.ref), class: "monospace"
+        &middot;
+      = link_to commit.short_sha, namespace_project_commit_path(@project.namespace, @project, commit.sha), class: "commit-id monospace"
       &nbsp;
+      - if commit.latest?
+        %span.label.label-success latest
       - if commit.tag?
         %span.label.label-primary tag
-      - if commit.branch?
-        %span.label.label-primary branch
       - if commit.triggered?
         %span.label.label-primary triggered
       - if commit.yaml_errors.present?
@@ -21,32 +23,36 @@
       - if commit.builds.any?(&:stuck?)
         %span.label.label-warning stuck
 
-      - if commit_data = commit.commit_data
-        = render 'projects/branches/commit', commit: commit_data, project: @project
-      - else
-        %p
-          Cant find HEAD commit for this branch
+      %p
+        %span
+          - if commit_data = commit.commit_data
+            = link_to_gfm commit_data.title, namespace_project_commit_path(@project.namespace, @project, commit_data.id), class: "commit-row-message"
+          - else
+            Cant find HEAD commit for this branch
+
 
     - stages_status = commit.statuses.stages_status
     - stages.each do |stage|
       %td
         - if status = stages_status[stage]
-          %span.has-tooltip(title="#{status}"){class: "ci-status-icon-#{status}"}
+          %span.has-tooltip(title="#{stage.titleize}: #{status}"){class: "ci-status-icon-#{status}"}
             = ci_icon_for_status(status)
 
   %td
     - if commit.started_at && commit.finished_at
       %p
-        %i.fa.fa-late-o
+        %i.fa.fa-clock-o
+        &nbsp;
         #{duration_in_words(commit.finished_at, commit.started_at)}
     - if commit.finished_at
       %p
-        %i.fa.fa-date-o
+        %i.fa.fa-calendar
+        &nbsp;
         #{time_ago_with_tooltip(commit.finished_at)}
 
-  %td.content
+  %td
     .controls.hidden-xs.pull-right
-      - artifacts = commit.builds.latest.select { |status| status.artifacts? }
+      - artifacts = commit.builds.latest
       - if artifacts.present?
         .dropdown.inline
           %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
@@ -58,15 +64,12 @@
                 = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
                   %i.fa.fa-download
                   %span #{build.name}
-        &nbsp;
 
       - if can?(current_user, :update_pipeline, @project)
-        - if commit.retryable?
+        - if commit.retryable? && commit.builds.failed.any?
           = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
-
         &nbsp;
-
         - if commit.active?
           = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
             = icon("remove cred")
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 06520e40bd9..582ce61a64a 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -2,12 +2,15 @@
   .pull-right
     - if can?(current_user, :update_build, @project)
       - if ci_commit.builds.latest.failed.any?(&:retryable?)
-        = link_to "Retry failed", retry_builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: 'btn btn-grouped btn-primary', method: :post
+        = link_to "Retry failed", retry_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post
 
       - if ci_commit.builds.running_or_pending.any?
-        = link_to "Cancel running", cancel_builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
+        = link_to "Cancel running", cancel_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
 
   .oneline
+    Pipeline
+    = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
+    with
     = pluralize ci_commit.statuses.count(:id), "build"
     - if ci_commit.ref
       for
@@ -17,7 +20,7 @@
       for commit
       = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace"
     - if ci_commit.duration > 0
-      in
+      took
       = time_interval_in_words ci_commit.duration
 
 - if ci_commit.yaml_errors.present?
@@ -47,23 +50,4 @@
         %th
     - builds = ci_commit.statuses.latest.ordered
     = render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
-
-- if ci_commit.retried.any?
-  .gray-content-block.second-block
-    Retried builds
-
-  .table-holder
-    %table.table.builds
-      %thead
-        %tr
-          %th Status
-          %th Build ID
-          %th Ref
-          %th Stage
-          %th Name
-          %th Duration
-          %th Finished at
-          - if @project.build_coverage_enabled?
-            %th Coverage
-          %th
-      = render ci_commit.retried, coverage: @project.build_coverage_enabled?, stage: true, ref: false
+    = render ci_commit.retried, coverage: @project.build_coverage_enabled?, stage: true, ref: false, retried: true
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index b9877cd37be..838b2986d4f 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -7,25 +7,21 @@
       = link_to project_pipelines_path(@project) do
         All
         %span.badge.js-totalbuilds-count
-          = number_with_delimiter(@all_commits.count(:id))
+          = number_with_delimiter(@all_pipelines.count)
+
+    %li{class: ('active' if @scope == 'running')}
+      = link_to project_pipelines_path(@project, scope: :running) do
+        Running
+        %span.badge.js-running-count
+          = number_with_delimiter(@all_pipelines.running_or_pending.count)
 
     %li{class: ('active' if @scope == 'branches')}
       = link_to project_pipelines_path(@project, scope: :branches) do
         Branches
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_commits.running_or_pending.count(:id))
 
     %li{class: ('active' if @scope == 'tags')}
       = link_to project_pipelines_path(@project, scope: :tags) do
         Tags
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_commits.running_or_pending.count(:id))
-
-    %li{class: ('active' if @scope == 'running')}
-      = link_to project_pipelines_path(@project, scope: :running) do
-        Failed
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_commits.running_or_pending.count(:id))
 
   .nav-controls
     - if can? current_user, :create_pipeline, @project
@@ -45,8 +41,8 @@
   Pipelines for #{(@scope || 'changes')} on this project
 
 %ul.content-list
-  - stages = @commits.stages
-  - if @commits.blank?
+  - stages = @pipelines.stages
+  - if @pipelines.blank?
     %li
       .nothing-here-block No pipelines to show
   - else
@@ -55,11 +51,12 @@
         %tbody
           %th Pipeline ID
           %th Commit
-          - @commits.stages.each do |stage|
-            %th.rotate
-              = stage.titleize
+          - @pipelines.stages.each do |stage|
+            %th
+              %span.has-tooltip(title="#{stage.titleize}")
+                = truncate(stage.titleize.pluralize, length: 8)
           %th
           %th
-        = render @commits, commit_sha: true, stage: true, allow_retry: true, stages: stages
+        = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
 
-    = paginate @commits, theme: 'gitlab'
+    = paginate @pipelines, theme: 'gitlab'
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
new file mode 100644
index 00000000000..9f33e2ad624
--- /dev/null
+++ b/app/views/projects/pipelines/show.html.haml
@@ -0,0 +1,3 @@
+- page_title "Pipeline"
+= render "header_title"
+= render "projects/commit/ci_commit", ci_commit: @pipeline
diff --git a/config/routes.rb b/config/routes.rb
index 841b3f26272..6384757835a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -654,7 +654,7 @@ Rails.application.routes.draw do
         resource :variables, only: [:show, :update]
         resources :triggers, only: [:index, :create, :destroy]
 
-        resources :pipelines, only: [:index, :new, :create] do
+        resources :pipelines, only: [:index, :new, :create, :show] do
           member do
             post :cancel
             post :retry

From 410f2b40f2579b2e6a77591157900ce07512ee36 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 16:39:23 +0200
Subject: [PATCH 0026/1431] Remove unneeded changes

---
 app/assets/stylesheets/framework/tables.scss   | 16 ----------------
 app/views/layouts/nav/_project.html.haml       |  2 +-
 app/views/projects/commit/_ci_commit.html.haml |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 9d6a6c5b237..75b770ae5a2 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -34,22 +34,6 @@ table {
         font-weight: normal;
         font-size: 15px;
         border-bottom: 1px solid $border-color;
-
-        .rotate {
-          height: 140px;
-          white-space: nowrap;
-          transform:
-                  /* Magic Numbers */
-                  translate(25px, 51px)
-                    /* 45 is really 360 - 45 */
-                  rotate(315deg);
-          width: 30px;
-        }
-
-        .rotate > div > span {
-          border-bottom: 1px solid #ccc;
-          padding: 5px 10px;
-        }
       }
 
       td {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index b58d8270230..f4797a85bb7 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -39,7 +39,7 @@
           Commits
 
   - if project_nav_tab? :builds
-    = nav_link(controller: %w(ci_commits)) do
+    = nav_link(controller: %w(pipelines)) do
       = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-builds' do
         = icon('ship fw')
         %span
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 2ec3c809e1c..cf101acbb53 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -20,7 +20,7 @@
       for commit
       = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
     - if ci_commit.duration > 0
-      took
+      in
       = time_interval_in_words ci_commit.duration
 
 - if ci_commit.yaml_errors.present?

From c351b9f599aa1af693435738d2c897cc2a954fe7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 16:51:52 +0200
Subject: [PATCH 0027/1431] Improve rendered CI statuses

---
 app/helpers/ci_status_helper.rb               | 27 ++++++++++++-------
 app/views/projects/commits/_commit.html.haml  |  2 +-
 .../projects/issues/_merge_requests.html.haml |  2 +-
 .../issues/_related_branches.html.haml        |  2 +-
 .../merge_requests/_merge_request.html.haml   |  2 +-
 app/views/shared/projects/_project.html.haml  |  2 +-
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 417050b4132..acc01b008bf 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -38,15 +38,24 @@ module CiStatusHelper
     icon(icon_name + ' fw')
   end
 
-  def render_ci_status(ci_commit, tooltip_placement: 'auto left')
-    # TODO: split this method into
-    # - render_commit_status
-    # - render_pipeline_status
-    link_to ci_icon_for_status(ci_commit.status),
-      ci_status_path(ci_commit),
-      class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}",
-      title: "Build #{ci_label_for_status(ci_commit.status)}",
-      data: { toggle: 'tooltip', placement: tooltip_placement }
+  def render_commit_status(commit, tooltip_placement: 'auto left')
+    project = commit.project
+    path = builds_namespace_project_commit_path(project.namespace, project, commit)
+    render_status_with_link('commit', commit.status, path, tooltip_placement)
+  end
+
+  def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
+    project = pipeline.project
+    path = namespace_project_pipeline_path(project.namespace, project, pipeline)
+    render_status_with_link('pipeline', pipeline.status, path, tooltip_placement)
+  end
+
+  def render_status_with_link(type, status, path, tooltip_placement)
+    link_to ci_icon_for_status(status),
+            path,
+            class: "ci-status-link ci-status-icon-#{status.dasherize}",
+            title: "#{type.titleize}: #{ci_label_for_status(status)}",
+            data: { toggle: 'tooltip', placement: tooltip_placement }
   end
 
   def no_runners_for_project?(project)
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index f7c8647ac0e..b231b584eab 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -17,7 +17,7 @@
 
       .pull-right
         - if commit.status
-          = render_ci_status(commit)
+          = render_commit_status(commit)
         = clipboard_button(clipboard_text: commit.id)
         = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
 
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index d6b38b327ff..e953353567e 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -7,7 +7,7 @@
       %li
         %span.merge-request-ci-status
           - if merge_request.ci_commit
-            = render_ci_status(merge_request.ci_commit)
+            = render_pipeline_status(merge_request.ci_commit)
           - elsif has_any_ci
             = icon('blank fw')
         %span.merge-request-id
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
index bdfa0c7009e..5f9d2919982 100644
--- a/app/views/projects/issues/_related_branches.html.haml
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -8,7 +8,7 @@
         - ci_commit = @project.ci_commit(sha, branch) if sha
         - if ci_commit
           %span.related-branch-ci-status
-            = render_ci_status(ci_commit)
+            = render_pipeline_status(ci_commit)
         %span.related-branch-info
           %strong
             = link_to namespace_project_compare_path(@project.namespace, @project, from: @project.default_branch, to: branch), class: "label-branch" do
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 391193eed6c..7bfde8b1c57 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -13,7 +13,7 @@
 
       - if merge_request.ci_commit
         %li
-          = render_ci_status(merge_request.ci_commit)
+          = render_pipeline_status(merge_request.ci_commit)
 
       - if merge_request.open? && merge_request.broken?
         %li
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index ab8b022411d..9ef021747a5 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -17,7 +17,7 @@
           = project.main_language
       - if project.commit.try(:status)
         %span
-          = render_ci_status(project.commit)
+          = render_commit_status(project.commit)
       - if forks
         %span
           = icon('code-fork')

From cb6f035141d2e7792d9594e5d664d1a305b728cf Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 17:05:17 +0200
Subject: [PATCH 0028/1431] Improve pipeline view

---
 app/controllers/projects/pipelines_controller.rb |  5 +++++
 app/views/projects/commit/_ci_commit.html.haml   |  3 +--
 app/views/projects/commit/_commit_box.html.haml  | 11 +++++++++--
 app/views/projects/pipelines/show.html.haml      |  6 ++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index b2ee5573bfc..aba64e4a730 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -1,5 +1,6 @@
 class Projects::PipelinesController < Projects::ApplicationController
   before_action :pipeline, except: [:index, :new, :create]
+  before_action :commit, only: [:show]
   before_action :authorize_read_pipeline!
   before_action :authorize_create_pipeline!, only: [:new, :create]
   before_action :authorize_update_pipeline!, only: [:retry, :cancel]
@@ -85,4 +86,8 @@ class Projects::PipelinesController < Projects::ApplicationController
   def pipeline
     @pipeline ||= project.ci_commits.find_by!(id: params[:id])
   end
+
+  def commit
+    @commit ||= @pipeline.commit_data
+  end
 end
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index cf101acbb53..782ea341daf 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -14,8 +14,7 @@
     = pluralize ci_commit.statuses.count(:id), "build"
     - if ci_commit.ref
       for
-      %span.label.label-info
-        = ci_commit.ref
+      = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace"
     - if defined?(link_to_commit) && link_to_commit
       for commit
       = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 0908e830f83..9cb14b6a90f 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -1,6 +1,6 @@
 .pull-right
   %div
-    - if @notes_count > 0
+    - if defined?(@notes_count) && @notes_count > 0
       %span.btn.disabled.btn-grouped
         %i.fa.fa-comment
         = @notes_count
@@ -42,7 +42,14 @@
   - @commit.parents.each do |parent|
     = link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "monospace"
 
-- if @commit.status
+- if defined?(pipeline) && pipeline
+  .pull-right
+    = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline), class: "ci-status ci-#{pipeline.status}" do
+      = ci_icon_for_status(pipeline.status)
+      pipeline:
+      = ci_label_for_status(pipeline.status)
+
+- elsif @commit.status
   .pull-right
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
       = ci_icon_for_status(@commit.status)
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
index 9f33e2ad624..8a2e14d8d87 100644
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@@ -1,3 +1,9 @@
 - page_title "Pipeline"
+
 = render "header_title"
+.prepend-top-default
+  - if @commit
+    = render "projects/commit/commit_box", pipeline: @pipeline
+  %div.block-connector
+
 = render "projects/commit/ci_commit", ci_commit: @pipeline

From 21136baa77369d5990ef5db4af26d688aedc8320 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 20:51:03 +0200
Subject: [PATCH 0029/1431] Update handling of skipped status

---
 app/models/ci/build.rb           |  2 +-
 app/models/ci/commit.rb          | 23 ++++++++---------------
 app/models/concerns/ci_status.rb | 10 +++++++++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 085ecc6951c..c0b334d3600 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -116,7 +116,7 @@ module Ci
     end
 
     def retried?
-      !self.commit.latest.include?(self)
+      !self.commit.statuses.latest.include?(self)
     end
 
     def retry
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index e2bf4d62541..00a95dd05be 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -125,16 +125,12 @@ module Ci
       end
     end
 
-    def latest
-      statuses.latest
-    end
-
     def retried
       @retried ||= (statuses.order(id: :desc) - statuses.latest)
     end
 
     def coverage
-      coverage_array = latest.map(&:coverage).compact
+      coverage_array = statuses.latest.map(&:coverage).compact
       if coverage_array.size >= 1
         '%.2f' % (coverage_array.reduce(:+) / coverage_array.size)
       end
@@ -169,18 +165,15 @@ module Ci
     private
 
     def update_state
-      reload
-      self.status = if yaml_errors.present?
-                      'failed'
+      statuses.reload
+      self.status = if yaml_errors.blank?
+                      statuses.latest.status || 'skipped'
                     else
-                      latest.status
+                      'failed'
                     end
-      self.started_at = statuses.minimum(:started_at)
-      self.finished_at = statuses.maximum(:finished_at)
-      self.duration = begin
-        duration_array = latest.map(&:duration).compact
-        duration_array.reduce(:+).to_i
-      end
+      self.started_at = statuses.started_at
+      self.finished_at = statuses.finished_at
+      self.duration = statuses.latest.duration
       save
     end
 
diff --git a/app/models/concerns/ci_status.rb b/app/models/concerns/ci_status.rb
index fd86d2f7553..8190b2a20c6 100644
--- a/app/models/concerns/ci_status.rb
+++ b/app/models/concerns/ci_status.rb
@@ -15,7 +15,7 @@ module CiStatus
       skipped = all.skipped.select('count(*)').to_sql
 
       deduce_status = "(CASE
-        WHEN (#{builds})=0 THEN 'skipped'
+        WHEN (#{builds})=0 THEN NULL
         WHEN (#{builds})=(#{success})+(#{ignored}) THEN 'success'
         WHEN (#{builds})=(#{pending}) THEN 'pending'
         WHEN (#{builds})=(#{canceled}) THEN 'canceled'
@@ -35,6 +35,14 @@ module CiStatus
       duration_array = all.map(&:duration).compact
       duration_array.reduce(:+).to_i
     end
+
+    def started_at
+      all.minimum(:started_at)
+    end
+
+    def finished_at
+      all.minimum(:finished_at)
+    end
   end
 
   included do

From e7cea8cd75aa23ad4eb9705ddb0871775d65309b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 15 Apr 2016 11:22:08 +0200
Subject: [PATCH 0030/1431] Avoid path helper name clash

---
 app/controllers/projects/application_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 275e94d39ed..817727d7868 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -23,8 +23,8 @@ class Projects::ApplicationController < ApplicationController
       @project = find_project
 
       if @project && can?(current_user, :read_project, @project)
-        if @project.path_with_namespace != project_path
-          redirect_to request.original_url.gsub(project_path, @project.path_with_namespace)
+        if @project.path_with_namespace != path_with_namespace
+          redirect_to request.original_url.gsub(path_with_namespace, @project.path_with_namespace)
         end
       else
         @project = nil
@@ -48,12 +48,12 @@ class Projects::ApplicationController < ApplicationController
     params[:namespace_id]
   end
   
-  def project_path
+  def path_with_namespace
     "#{namespace}/#{id}"
   end
   
   def find_project
-    Project.find_with_namespace(project_path)
+    Project.find_with_namespace(path_with_namespace)
   end
 
   def repository

From d3541da4ceaa0f5e2051edd2aa59d4275f93f0f8 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 15 Apr 2016 12:40:43 +0200
Subject: [PATCH 0031/1431] Comment and whitespace

---
 .../projects/git_http_controller.rb           | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 11e17510cb9..13af17083bd 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -2,7 +2,18 @@ class Projects::GitHttpController < Projects::ApplicationController
   skip_before_action :repository
   before_action :authenticate_user
   before_action :project_found?
-    
+
+  # We support two actions (git push and git pull) which use four
+  # different HTTP requests:
+  #
+  # - GET /foo/bar.git/info/refs?service=git-upload-pack (pull)
+  # - GET /foo/bar.git/info/refs?service=git-receive-pack (push)
+  # - POST /foo/bar.git/git-upload-pack (pull)
+  # - POST /foo/bar.git/git-receive-pack" (push)
+  #
+  # The Rails routes divide these four requests over three methods:
+  # info_refs, git_upload_pack, and git_receive_pack.
+
   def git_rpc
     if upload_pack? && upload_pack_allowed?
       render_ok
@@ -12,7 +23,7 @@ class Projects::GitHttpController < Projects::ApplicationController
       render_not_found
     end
   end
-  
+
   %i{info_refs git_receive_pack git_upload_pack}.each do |method|
     alias_method method, :git_rpc
   end
@@ -60,7 +71,7 @@ class Projects::GitHttpController < Projects::ApplicationController
       token && token.accessible? && User.find_by(id: token.resource_owner_id)
     end
   end
-  
+
   def rate_limit_ip!(login, user)
     # If the user authenticated successfully, we reset the auth failure count
     # from Rack::Attack for that IP. A client may attempt to authenticate
@@ -95,7 +106,7 @@ class Projects::GitHttpController < Projects::ApplicationController
           "as #{login} but has been temporarily banned from Git auth"
       end
     end
-    
+
     user
   end
 
@@ -107,7 +118,7 @@ class Projects::GitHttpController < Projects::ApplicationController
   def id
     id = params[:project_id]
     return if id.nil?
-    
+
     %w{.wiki.git .git}.each do |suffix|
       # Be careful to only remove the suffix from the end of 'id'.
       # Accidentally removing it from the middle is how security
@@ -143,11 +154,11 @@ class Projects::GitHttpController < Projects::ApplicationController
       action_name.gsub('_', '-')
     end
   end
-    
+
   def render_ok
     render json: Gitlab::Workhorse.git_http_ok(repository, user)
   end
-  
+
   def render_not_found
     render text: 'Not Found', status: :not_found
   end
@@ -155,11 +166,11 @@ class Projects::GitHttpController < Projects::ApplicationController
   def ci?
     !!@ci
   end
-  
+
   def user
     @user
   end
-  
+
   def upload_pack_allowed?
     if !Gitlab.config.gitlab_shell.upload_pack
       false

From 03e5873ae52f3c8c0efb7baa7d1a358a7c3e7974 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 19 Apr 2016 19:04:58 +0300
Subject: [PATCH 0032/1431] Fix broken links

[ci skip]
---
 doc/ci/{ => examples}/deployment/README.md | 0
 doc/ci/triggers/README.md                  | 2 +-
 doc/markdown/markdown.md                   | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename doc/ci/{ => examples}/deployment/README.md (100%)

diff --git a/doc/ci/deployment/README.md b/doc/ci/examples/deployment/README.md
similarity index 100%
rename from doc/ci/deployment/README.md
rename to doc/ci/examples/deployment/README.md
diff --git a/doc/ci/triggers/README.md b/doc/ci/triggers/README.md
index 9f7c1bfe6a0..1848f6319d8 100644
--- a/doc/ci/triggers/README.md
+++ b/doc/ci/triggers/README.md
@@ -33,7 +33,7 @@ POST /projects/:id/trigger/builds
 
 The required parameters are the trigger's `token` and the Git `ref` on which
 the trigger will be performed. Valid refs are the branch, the tag or the commit
-SHA. The `:id` of a project can be found by [querying the API](../api/projects.md)
+SHA. The `:id` of a project can be found by [querying the API](../../api/projects.md)
 or by visiting the **Triggers** page which provides self-explanatory examples.
 
 When a rebuild is triggered, the information is exposed in GitLab's UI under
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 4f199b6af6f..3f44a1b4c6c 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -402,7 +402,7 @@ There are two ways to create links, inline-style and reference-style.
 
 [I'm a reference-style link][Arbitrary case-insensitive reference text]
 
-[I'm a relative reference to a repository file](LICENSE)
+[I'm a relative reference to a repository file](LICENSE)[^1]
 
 [You can use numbers for reference-style link definitions][1]
 
@@ -594,3 +594,4 @@ By including colons in the header row, you can align the text within that column
 
 [rouge]: http://rouge.jneen.net/ "Rouge website"
 [redcarpet]: https://github.com/vmg/redcarpet "Redcarpet website"
+[^1]: This link will be broken if you see this document from the Help page or docs.gitlab.com

From a6ba8647f919cca5f37f663502186d8b6b7642ec Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 19 Apr 2016 16:00:45 -0400
Subject: [PATCH 0033/1431] Improve uniqueness of field names on the signup
 form

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
---
 app/controllers/registrations_controller.rb   |  7 ++++++
 app/views/devise/shared/_signup_box.html.haml |  4 ++--
 spec/features/signup_spec.rb                  | 24 +++++++++----------
 spec/features/users_spec.rb                   | 16 ++++++-------
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index c48175a4c5a..b441b34d0be 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -8,6 +8,13 @@ class RegistrationsController < Devise::RegistrationsController
 
   def create
     if !Gitlab::Recaptcha.load_configurations! || verify_recaptcha
+      # To avoid duplicate form fields on the login page, the registration form
+      # names fields using `new_user`, but Devise still wants the params in
+      # `user`.
+      if params["new_#{resource_name}"].present? && params[resource_name].blank?
+        params[resource_name] = params.delete(:"new_#{resource_name}")
+      end
+
       super
     else
       flash[:alert] = "There was an error with the reCAPTCHA code below. Please re-enter the code."
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml
index e5607dacd0d..510215bb8cd 100644
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@@ -6,7 +6,7 @@
     .login-heading
       %h3 Create an account
   .login-body
-    = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+    = form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name)) do |f|
       .devise-errors
         = devise_error_messages!
       %div
@@ -16,7 +16,7 @@
       %div
         = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
       .form-group.append-bottom-20#password-strength
-        = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true
+        = f.password_field :password, class: "form-control bottom", placeholder: "Password", required: true
       %div
       - if current_application_settings.recaptcha_enabled
         = recaptcha_tags
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index 01472743b2a..a9b81733897 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -7,10 +7,10 @@ feature 'Signup', feature: true do
 
       visit root_path
 
-      fill_in 'user_name',                with: user.name
-      fill_in 'user_username',            with: user.username
-      fill_in 'user_email',               with: user.email
-      fill_in 'user_password_sign_up',    with: user.password
+      fill_in 'new_user_name',     with: user.name
+      fill_in 'new_user_username', with: user.username
+      fill_in 'new_user_email',    with: user.email
+      fill_in 'new_user_password', with: user.password
       click_button "Sign up"
 
       expect(current_path).to eq user_session_path
@@ -25,10 +25,10 @@ feature 'Signup', feature: true do
 
       visit root_path
 
-      fill_in 'user_name',                with: user.name
-      fill_in 'user_username',            with: user.username
-      fill_in 'user_email',               with: existing_user.email
-      fill_in 'user_password_sign_up',    with: user.password
+      fill_in 'new_user_name',     with: user.name
+      fill_in 'new_user_username', with: user.username
+      fill_in 'new_user_email',    with: existing_user.email
+      fill_in 'new_user_password', with: user.password
       click_button "Sign up"
 
       expect(current_path).to eq user_registration_path
@@ -42,10 +42,10 @@ feature 'Signup', feature: true do
 
       visit root_path
 
-      fill_in 'user_name',                with: user.name
-      fill_in 'user_username',            with: user.username
-      fill_in 'user_email',               with: existing_user.email
-      fill_in 'user_password_sign_up',    with: user.password
+      fill_in 'new_user_name',     with: user.name
+      fill_in 'new_user_username', with: user.username
+      fill_in 'new_user_email',    with: existing_user.email
+      fill_in 'new_user_password', with: user.password
       click_button "Sign up"
 
       expect(current_path).to eq user_registration_path
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index c1248162031..cf116040394 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -5,10 +5,10 @@ feature 'Users', feature: true do
 
   scenario 'GET /users/sign_in creates a new user account' do
     visit new_user_session_path
-    fill_in 'user_name', with: 'Name Surname'
-    fill_in 'user_username', with: 'Great'
-    fill_in 'user_email', with: 'name@mail.com'
-    fill_in 'user_password_sign_up', with: 'password1234'
+    fill_in 'new_user_name',     with: 'Name Surname'
+    fill_in 'new_user_username', with: 'Great'
+    fill_in 'new_user_email',    with: 'name@mail.com'
+    fill_in 'new_user_password', with: 'password1234'
     expect { click_button 'Sign up' }.to change { User.count }.by(1)
   end
 
@@ -31,10 +31,10 @@ feature 'Users', feature: true do
 
   scenario 'Should show one error if email is already taken' do
     visit new_user_session_path
-    fill_in 'user_name', with: 'Another user name'
-    fill_in 'user_username', with: 'anotheruser'
-    fill_in 'user_email', with: user.email
-    fill_in 'user_password_sign_up', with: '12341234'
+    fill_in 'new_user_name',     with: 'Another user name'
+    fill_in 'new_user_username', with: 'anotheruser'
+    fill_in 'new_user_email',    with: user.email
+    fill_in 'new_user_password', with: '12341234'
     expect { click_button 'Sign up' }.to change { User.count }.by(0)
     expect(page).to have_text('Email has already been taken')
     expect(number_of_errors_on_page(page)).to be(1), 'errors on page:\n #{errors_on_page page}'

From 077f9a4eeef3c64c5f3e9cc5df5442c8817ee1d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Wed, 30 Mar 2016 23:12:34 -0300
Subject: [PATCH 0034/1431] Implementing special GitLab markdown reference for
 milestones

Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name)
to get a link to the referred milestone.
---
 app/models/milestone.rb                       | 42 +++++++++++++++----
 .../filter/milestone_reference_filter.rb      | 26 +++++++++++-
 spec/fixtures/markdown.md.erb                 |  9 ++--
 spec/support/markdown_feature.rb              |  6 ++-
 spec/support/matchers/markdown_matchers.rb    |  2 +-
 5 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 986184dd301..39dc8d89614 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -74,8 +74,22 @@ class Milestone < ActiveRecord::Base
     end
   end
 
+  def self.reference_prefix
+    '%'
+  end
+
   def self.reference_pattern
-    nil
+    %r{
+      (#{Project.reference_pattern})?
+      #{Regexp.escape(reference_prefix)}
+      (?:
+        (?<milestone_id>\d+) | # Integer-based milestone ID, or
+        (?<milestone_name>
+          [A-Za-z0-9_-]+ | # String-based single-word milestone title, or
+          "[^"]+"       # String-based multi-word milestone surrounded in quotes
+        )
+      )
+    }x
   end
 
   def self.link_reference_pattern
@@ -86,13 +100,15 @@ class Milestone < ActiveRecord::Base
     self.where('due_date > ?', Time.now).reorder(due_date: :asc).first
   end
 
-  def to_reference(from_project = nil)
-    escaped_title = self.title.gsub("]", "\\]")
+  def to_reference(from_project = nil, format: :id)
+    format_reference = milestone_format_reference(format)
+    reference = "#{self.class.reference_prefix}#{format_reference}"
 
-    h = Gitlab::Routing.url_helpers
-    url = h.namespace_project_milestone_url(self.project.namespace, self.project, self)
-
-    "[#{escaped_title}](#{url})"
+    if cross_project_reference?(from_project)
+      project.to_reference + reference
+    else
+      reference
+    end
   end
 
   def reference_link_text(from_project = nil)
@@ -160,4 +176,16 @@ class Milestone < ActiveRecord::Base
     issues.where(id: ids).
       update_all(["position = CASE #{conditions} ELSE position END", *pairs])
   end
+
+  private
+
+  def milestone_format_reference(format = :id)
+    raise StandardError, 'Unknown format' unless [:id, :name].include?(format)
+
+    if format == :name && !name.include?('"')
+      %("#{name}")
+    else
+      id
+    end
+  end
 end
diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index 4cb82178024..2c90fd4d385 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -7,14 +7,36 @@ module Banzai
       end
 
       def find_object(project, id)
-        project.milestones.find_by(iid: id)
+        project.milestones.find(id)
       end
 
-      def url_for_object(issue, project)
+      def references_in(text, pattern = Milestone.reference_pattern)
+        text.gsub(pattern) do |match|
+          project = project_from_ref($~[:project])
+          params = milestone_params($~[:milestone_id].to_i, $~[:milestone_name])
+          milestone = project.milestones.find_by(params)
+
+          if milestone
+            yield match, milestone.id, $~[:project], $~
+          else
+            match
+          end
+        end
+      end
+
+      def url_for_object(milestone, project)
         h = Gitlab::Routing.url_helpers
         h.namespace_project_milestone_url(project.namespace, project, milestone,
                                         only_path: context[:only_path])
       end
+
+      def milestone_params(id, name)
+        if name
+          { name: name.tr('"', '') }
+        else
+          { id: id }
+        end
+      end
     end
   end
 end
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 1772cc3f6a4..6d3bf810c2c 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -216,10 +216,13 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e
 
 #### MilestoneReferenceFilter
 
-- Milestone: <%= milestone.to_reference %>
+- Milestone by ID: <%= simple_milestone.to_reference %>
+- Milestone by name: <%= Milestone.reference_prefix %><%= simple_milestone.name %>
+- Milestone by name in quotes: <%= milestone.to_reference(format: :name) %>
 - Milestone in another project: <%= xmilestone.to_reference(project) %>
-- Ignored in code: `<%= milestone.to_reference %>`
-- Link to milestone by URL: [Milestone](<%= urls.namespace_project_milestone_url(milestone.project.namespace, milestone.project, milestone) %>)
+- Ignored in code: `<%= simple_milestone.to_reference %>`
+- Ignored in links: [Link to <%= simple_milestone.to_reference %>](#milestone-link)
+- Link to milestone by URL: [Milestone](<%= milestone.to_reference %>)
 
 ### Task Lists
 
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index b87cd6bbca2..7fc6d6fcc5e 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -63,8 +63,12 @@ class MarkdownFeature
     @label ||= create(:label, name: 'awaiting feedback', project: project)
   end
 
+  def simple_milestone
+    @simple_milestone ||= create(:milestone, name: 'gfm-milestone', project: project)
+  end
+
   def milestone
-    @milestone ||= create(:milestone, project: project)
+    @milestone ||= create(:milestone, name: 'next goal', project: project)
   end
 
   # Cross-references -----------------------------------------------------------
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb
index 43cb6ef43f2..492138716af 100644
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -154,7 +154,7 @@ module MarkdownMatchers
     set_default_markdown_messages
 
     match do |actual|
-      expect(actual).to have_selector('a.gfm.gfm-milestone', count: 3)
+      expect(actual).to have_selector('a.gfm.gfm-milestone', count: 5)
     end
   end
 

From 375e83bb57dc0143691cf6ef7277bec494f060f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Thu, 31 Mar 2016 21:54:00 -0300
Subject: [PATCH 0035/1431] Consistently using iid when treating milestones as
 referrables

Also, addint a suffix to the reference text when the milestone is in another project
---
 app/models/milestone.rb                       |  25 ++-
 .../filter/milestone_reference_filter.rb      |  19 ++-
 .../filter/milestone_reference_filter_spec.rb | 159 +++++++++++++++---
 3 files changed, 164 insertions(+), 39 deletions(-)

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 39dc8d89614..50fa95d4d4b 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -83,10 +83,10 @@ class Milestone < ActiveRecord::Base
       (#{Project.reference_pattern})?
       #{Regexp.escape(reference_prefix)}
       (?:
-        (?<milestone_id>\d+) | # Integer-based milestone ID, or
+        (?<milestone_iid>\d+) | # Integer-based milestone iid, or
         (?<milestone_name>
-          [A-Za-z0-9_-]+ | # String-based single-word milestone title, or
-          "[^"]+"       # String-based multi-word milestone surrounded in quotes
+          [A-Za-z0-9_-]+ |      # String-based single-word milestone title, or
+          "[^"]+"               # String-based multi-word milestone surrounded in quotes
         )
       )
     }x
@@ -100,7 +100,18 @@ class Milestone < ActiveRecord::Base
     self.where('due_date > ?', Time.now).reorder(due_date: :asc).first
   end
 
-  def to_reference(from_project = nil, format: :id)
+  ##
+  # Returns the String necessary to reference this Milestone in Markdown
+  #
+  # format - Symbol format to use (default: :iid, optional: :name)
+  #
+  # Examples:
+  #
+  #   Milestone.first.to_reference                # => "%1"
+  #   Milestone.first.to_reference(format: :name) # => "%\"goal\""
+  #   Milestone.first.to_reference(project)       # => "gitlab-org/gitlab-ce%1"
+  #
+  def to_reference(from_project = nil, format: :iid)
     format_reference = milestone_format_reference(format)
     reference = "#{self.class.reference_prefix}#{format_reference}"
 
@@ -179,13 +190,13 @@ class Milestone < ActiveRecord::Base
 
   private
 
-  def milestone_format_reference(format = :id)
-    raise StandardError, 'Unknown format' unless [:id, :name].include?(format)
+  def milestone_format_reference(format = :iid)
+    raise StandardError, 'Unknown format' unless [:iid, :name].include?(format)
 
     if format == :name && !name.include?('"')
       %("#{name}")
     else
-      id
+      iid
     end
   end
 end
diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index 2c90fd4d385..419532717f2 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -7,17 +7,17 @@ module Banzai
       end
 
       def find_object(project, id)
-        project.milestones.find(id)
+        project.milestones.find_by(iid: id)
       end
 
       def references_in(text, pattern = Milestone.reference_pattern)
         text.gsub(pattern) do |match|
           project = project_from_ref($~[:project])
-          params = milestone_params($~[:milestone_id].to_i, $~[:milestone_name])
+          params = milestone_params($~[:milestone_iid].to_i, $~[:milestone_name])
           milestone = project.milestones.find_by(params)
 
           if milestone
-            yield match, milestone.id, $~[:project], $~
+            yield match, milestone.iid, $~[:project], $~
           else
             match
           end
@@ -30,11 +30,20 @@ module Banzai
                                         only_path: context[:only_path])
       end
 
-      def milestone_params(id, name)
+      def object_link_text(object, matches)
+        if context[:project] == object.project
+          super
+        else
+          "#{super} <i>in #{escape_once(object.project.name_with_namespace)}</i>".
+            html_safe
+        end
+      end
+
+      def milestone_params(iid, name)
         if name
           { name: name.tr('"', '') }
         else
-          { id: id }
+          { iid: iid }
         end
       end
     end
diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
index ebf3d7489b5..26f87286b2c 100644
--- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
@@ -3,8 +3,9 @@ require 'spec_helper'
 describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
   include FilterSpecHelper
 
-  let(:project) { create(:project, :public) }
-  let(:milestone)   { create(:milestone, project: project) }
+  let(:project)   { create(:project, :public) }
+  let(:milestone) { create(:milestone, project: project) }
+  let(:reference) { milestone.to_reference }
 
   it 'requires project context' do
     expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
@@ -17,10 +18,111 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
     end
   end
 
-  context 'internal reference' do
-    # Convert the Markdown link to only the URL, since these tests aren't run through the regular Markdown pipeline.
-    # Milestone reference behavior in the full Markdown pipeline is tested elsewhere.
-    let(:reference) { milestone.to_reference.gsub(/\[([^\]]+)\]\(([^)]+)\)/, '\2') }
+  it 'includes default classes' do
+    doc = reference_filter("Milestone #{reference}")
+    expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-milestone'
+  end
+
+  it 'includes a data-project attribute' do
+    doc = reference_filter("Milestone #{reference}")
+    link = doc.css('a').first
+
+    expect(link).to have_attribute('data-project')
+    expect(link.attr('data-project')).to eq project.id.to_s
+  end
+
+  it 'includes a data-milestone attribute' do
+    doc = reference_filter("See #{reference}")
+    link = doc.css('a').first
+
+    expect(link).to have_attribute('data-milestone')
+    expect(link.attr('data-milestone')).to eq milestone.id.to_s
+  end
+
+  it 'supports an :only_path context' do
+    doc = reference_filter("Milestone #{reference}", only_path: true)
+    link = doc.css('a').first.attr('href')
+
+    expect(link).not_to match %r(https?://)
+    expect(link).to eq urls.
+      namespace_project_milestone_path(project.namespace, project, milestone)
+  end
+
+  it 'adds to the results hash' do
+    result = reference_pipeline_result("Milestone #{reference}")
+    expect(result[:references][:milestone]).to eq [milestone]
+  end
+
+  context 'Integer-based references' do
+    it 'links to a valid reference' do
+      doc = reference_filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_milestone_url(project.namespace, project, milestone)
+    end
+
+    it 'links with adjacent text' do
+      doc = reference_filter("Milestone (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+>#{milestone.name}</a>\.\)))
+    end
+
+    it 'ignores invalid milestone IIDs' do
+      exp = act = "Milestone #{invalidate_reference(reference)}"
+
+      expect(reference_filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'String-based single-word references' do
+    let(:milestone) { create(:milestone, name: 'gfm', project: project) }
+    let(:reference) { "#{Milestone.reference_prefix}#{milestone.name}" }
+
+    it 'links to a valid reference' do
+      doc = reference_filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_milestone_url(project.namespace, project, milestone)
+      expect(doc.text).to eq 'See gfm'
+    end
+
+    it 'links with adjacent text' do
+      doc = reference_filter("Milestone (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+>#{milestone.name}</a>\.\)))
+    end
+
+    it 'ignores invalid milestone names' do
+      exp = act = "Milestone #{Milestone.reference_prefix}#{milestone.name.reverse}"
+
+      expect(reference_filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'String-based multi-word references in quotes' do
+    let(:milestone) { create(:milestone, name: 'gfm references', project: project) }
+    let(:reference) { milestone.to_reference(format: :name) }
+
+    it 'links to a valid reference' do
+      doc = reference_filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_milestone_url(project.namespace, project, milestone)
+      expect(doc.text).to eq 'See gfm references'
+    end
+
+    it 'links with adjacent text' do
+      doc = reference_filter("Milestone (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+>#{milestone.name}</a>\.\)))
+    end
+
+    it 'ignores invalid milestone names' do
+      exp = act = %(Milestone #{Milestone.reference_prefix}"#{milestone.name.reverse}")
+
+      expect(reference_filter(act).to_html).to eq exp
+    end
+  end
+
+  describe 'referencing a milestone in a link href' do
+    let(:reference) { %Q{<a href="#{milestone.to_reference}">Milestone</a>} }
 
     it 'links to a valid reference' do
       doc = reference_filter("See #{reference}")
@@ -30,29 +132,12 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
     end
 
     it 'links with adjacent text' do
-      doc = reference_filter("milestone (#{reference}.)")
-      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(milestone.title)}<\/a>\.\)/)
-    end
-
-    it 'includes a title attribute' do
-      doc = reference_filter("milestone #{reference}")
-      expect(doc.css('a').first.attr('title')).to eq "Milestone: #{milestone.title}"
-    end
-
-    it 'escapes the title attribute' do
-      milestone.update_attribute(:title, %{"></a>whatever<a title="})
-
-      doc = reference_filter("milestone #{reference}")
-      expect(doc.text).to eq "milestone #{milestone.title}"
-    end
-
-    it 'includes default classes' do
-      doc = reference_filter("milestone #{reference}")
-      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-milestone'
+      doc = reference_filter("Milestone (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+>Milestone</a>\.\)))
     end
 
     it 'includes a data-project attribute' do
-      doc = reference_filter("milestone #{reference}")
+      doc = reference_filter("Milestone #{reference}")
       link = doc.css('a').first
 
       expect(link).to have_attribute('data-project')
@@ -68,8 +153,28 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
     end
 
     it 'adds to the results hash' do
-      result = reference_pipeline_result("milestone #{reference}")
+      result = reference_pipeline_result("Milestone #{reference}")
       expect(result[:references][:milestone]).to eq [milestone]
     end
   end
+
+  describe 'cross project milestone references' do
+    let(:another_project)  { create(:empty_project, :public) }
+    let(:project_name) { another_project.name_with_namespace }
+    let(:milestone) { create(:milestone, project: another_project) }
+    let(:reference) { milestone.to_reference(project) }
+
+    let!(:result) { reference_filter("See #{reference}") }
+
+    it 'points to referenced project milestone page' do
+      expect(result.css('a').first.attr('href')).to eq urls.
+        namespace_project_milestone_url(another_project.namespace,
+                                        another_project,
+                                        milestone)
+    end
+
+    it 'contains cross project content' do
+      expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_name}"
+    end
+  end
 end

From 6d9794d42a7bea1150374c76fd3ce5521a44e58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Mon, 4 Apr 2016 22:20:10 -0300
Subject: [PATCH 0036/1431] Transforming milestones link references to the
 short reference form

---
 lib/banzai/filter/milestone_reference_filter.rb | 5 +++++
 spec/fixtures/markdown.md.erb                   | 1 +
 spec/support/matchers/markdown_matchers.rb      | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index 419532717f2..556087c4880 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -11,6 +11,11 @@ module Banzai
       end
 
       def references_in(text, pattern = Milestone.reference_pattern)
+        # We'll handle here the references that follow the `reference_pattern`.
+        # Other patterns (for example, the link pattern) are handled by the
+        # default implementation.
+        return super(text, pattern) if pattern != Milestone.reference_pattern
+
         text.gsub(pattern) do |match|
           project = project_from_ref($~[:project])
           params = milestone_params($~[:milestone_iid].to_i, $~[:milestone_name])
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 6d3bf810c2c..3e777a5e92b 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -222,6 +222,7 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e
 - Milestone in another project: <%= xmilestone.to_reference(project) %>
 - Ignored in code: `<%= simple_milestone.to_reference %>`
 - Ignored in links: [Link to <%= simple_milestone.to_reference %>](#milestone-link)
+- Milestone by URL: <%= urls.namespace_project_milestone_url(milestone.project.namespace, milestone.project, milestone) %>
 - Link to milestone by URL: [Milestone](<%= milestone.to_reference %>)
 
 ### Task Lists
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb
index 492138716af..d921f9bb2bc 100644
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -154,7 +154,7 @@ module MarkdownMatchers
     set_default_markdown_messages
 
     match do |actual|
-      expect(actual).to have_selector('a.gfm.gfm-milestone', count: 5)
+      expect(actual).to have_selector('a.gfm.gfm-milestone', count: 6)
     end
   end
 

From 1ff896f2bf5d06d0d772fd0df98bf43edf107373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Mon, 4 Apr 2016 23:09:44 -0300
Subject: [PATCH 0037/1431] Escaping the `object_link_text` on cross project
 milestone references

---
 lib/banzai/filter/milestone_reference_filter.rb           | 2 +-
 spec/lib/banzai/filter/milestone_reference_filter_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index 556087c4880..aea1abf3b8e 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -39,7 +39,7 @@ module Banzai
         if context[:project] == object.project
           super
         else
-          "#{super} <i>in #{escape_once(object.project.name_with_namespace)}</i>".
+          "#{escape_once(super)} <i>in #{escape_once(object.project.name_with_namespace)}</i>".
             html_safe
         end
       end
diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
index 26f87286b2c..ac3e6e4e536 100644
--- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
@@ -176,5 +176,11 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
     it 'contains cross project content' do
       expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_name}"
     end
+
+    it 'escapes the name attribute' do
+      allow_any_instance_of(Milestone).to receive(:title).and_return(%{"></a>whatever<a title="})
+      doc = reference_filter("See #{reference}")
+      expect(doc.css('a').first.text).to eq "#{milestone.name} in #{project_name}"
+    end
   end
 end

From 4cab66e3e2ca53c2d96a5306b6ae6cd864c5a39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Mon, 4 Apr 2016 23:37:50 -0300
Subject: [PATCH 0038/1431] Implementing autocomplete for GFM milestone
 references

---
 .../javascripts/gfm_auto_complete.js.coffee   | 19 +++++++++++++++++++
 app/controllers/projects_controller.rb        |  1 +
 app/services/projects/autocomplete_service.rb |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 61e3f811e73..54d89ef69a1 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -18,6 +18,10 @@ GitLab.GfmAutoComplete =
   Issues:
     template: '<li><small>${id}</small> ${title}</li>'
 
+  # Milestones
+  Milestones:
+    template: '<li>${title}</li>'
+
   # Add GFM auto-completion to all input fields, that accept GFM input.
   setup: (wrap) ->
     @input = $('.js-gfm-input')
@@ -81,6 +85,19 @@ GitLab.GfmAutoComplete =
             title:  sanitize(i.title)
             search: "#{i.iid} #{i.title}"
 
+    @input.atwho
+      at: '%'
+      alias: 'milestones'
+      searchKey: 'search'
+      displayTpl: @Milestones.template
+      insertTpl: '${atwho-at}${id}'
+      callbacks:
+        beforeSave: (milestones) ->
+          $.map milestones, (m) ->
+            id:     m.iid
+            title:  sanitize(m.title)
+            search: "#{m.title}"
+
     @input.atwho
       at: '!'
       alias: 'mergerequests'
@@ -105,6 +122,8 @@ GitLab.GfmAutoComplete =
     @input.atwho 'load', '@', data.members
     # load issues
     @input.atwho 'load', 'issues', data.issues
+    # load milestones
+    @input.atwho 'load', 'milestones', data.milestones
     # load merge requests
     @input.atwho 'load', 'mergerequests', data.mergerequests
     # load emojis
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3768efe142a..8662de712a1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -147,6 +147,7 @@ class ProjectsController < Projects::ApplicationController
     @suggestions = {
       emojis: AwardEmoji.urls,
       issues: autocomplete.issues,
+      milestones: autocomplete.milestones,
       mergerequests: autocomplete.merge_requests,
       members: participants
     }
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index ba50305dbd5..eec38c5c3d8 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -4,6 +4,10 @@ module Projects
       @project.issues.visible_to_user(current_user).opened.select([:iid, :title])
     end
 
+    def milestones
+      @project.milestones.active.select([:iid, :title])
+    end
+
     def merge_requests
       @project.merge_requests.opened.select([:iid, :title])
     end

From 0ba116a58ed57d760b264c39f241798528f54b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Tue, 5 Apr 2016 21:35:43 -0300
Subject: [PATCH 0039/1431] Matching version-like expressions as
 `milestone_name`s instead of `milestone_iid`s

The changes also account for %2.1. being matched as milestone_name = "2.1" without
the word-separating dot.
---
 app/models/milestone.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 50fa95d4d4b..92c07fd20da 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -79,14 +79,19 @@ class Milestone < ActiveRecord::Base
   end
 
   def self.reference_pattern
+    # NOTE: The iid pattern only matches when all characters on the expression
+    # are digits, so it will match %2 but not %2.1 because that's probably a
+    # milestone name and we want it to be matched as such.
     %r{
       (#{Project.reference_pattern})?
       #{Regexp.escape(reference_prefix)}
       (?:
-        (?<milestone_iid>\d+) | # Integer-based milestone iid, or
+        (?<milestone_iid>
+          \d+(?!\S\w)\b # Integer-based milestone iid, or
+        ) |
         (?<milestone_name>
-          [A-Za-z0-9_-]+ |      # String-based single-word milestone title, or
-          "[^"]+"               # String-based multi-word milestone surrounded in quotes
+          [^"\s]+\b |  # String-based single-word milestone title, or
+          "[^"]+"      # String-based multi-word milestone surrounded in quotes
         )
       )
     }x

From 4596190a2d1eb6d575b52ff889a20c49fbd8ca2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Tue, 5 Apr 2016 21:40:40 -0300
Subject: [PATCH 0040/1431] Inserting Milestone titles insted of IIDs with GFM
 auto complete

---
 app/assets/javascripts/gfm_auto_complete.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 54d89ef69a1..0f2c5a6241c 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -90,7 +90,7 @@ GitLab.GfmAutoComplete =
       alias: 'milestones'
       searchKey: 'search'
       displayTpl: @Milestones.template
-      insertTpl: '${atwho-at}${id}'
+      insertTpl: '${atwho-at}${title}'
       callbacks:
         beforeSave: (milestones) ->
           $.map milestones, (m) ->

From ec71edfeddc403df5dcff1300e3f4868554c5f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Tue, 5 Apr 2016 21:43:26 -0300
Subject: [PATCH 0041/1431] Sorting Milestones on the auto complete list by due
 date and title

---
 app/services/projects/autocomplete_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index eec38c5c3d8..eb73948006e 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -5,7 +5,7 @@ module Projects
     end
 
     def milestones
-      @project.milestones.active.select([:iid, :title])
+      @project.milestones.active.reorder(due_date: :asc, title: :asc).select([:iid, :title])
     end
 
     def merge_requests

From 0f925714d04a4d2e86db3a752fc8c1fc45da2214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Wed, 6 Apr 2016 20:35:02 -0300
Subject: [PATCH 0042/1431] Inserting the Milestone title between quotes on GFM
 auto complete

This is due to the fact that for multiple word titles it might be
an invalid reference without the quotes
---
 app/assets/javascripts/gfm_auto_complete.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 0f2c5a6241c..41dba342107 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -90,7 +90,7 @@ GitLab.GfmAutoComplete =
       alias: 'milestones'
       searchKey: 'search'
       displayTpl: @Milestones.template
-      insertTpl: '${atwho-at}${title}'
+      insertTpl: '${atwho-at}"${title}"'
       callbacks:
         beforeSave: (milestones) ->
           $.map milestones, (m) ->

From 30d1d47d1da729319a3e71bd5599c473fc926565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Wed, 6 Apr 2016 21:37:56 -0300
Subject: [PATCH 0043/1431] Using project `path_with_namespace` in milestone's
 cross project references link text

---
 lib/banzai/filter/milestone_reference_filter.rb           | 2 +-
 spec/lib/banzai/filter/milestone_reference_filter_spec.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index aea1abf3b8e..746e768061c 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -39,7 +39,7 @@ module Banzai
         if context[:project] == object.project
           super
         else
-          "#{escape_once(super)} <i>in #{escape_once(object.project.name_with_namespace)}</i>".
+          "#{escape_once(super)} <i>in #{escape_once(object.project.path_with_namespace)}</i>".
             html_safe
         end
       end
diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
index ac3e6e4e536..bdf48eabb0e 100644
--- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
@@ -160,7 +160,7 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
 
   describe 'cross project milestone references' do
     let(:another_project)  { create(:empty_project, :public) }
-    let(:project_name) { another_project.name_with_namespace }
+    let(:project_path) { another_project.path_with_namespace }
     let(:milestone) { create(:milestone, project: another_project) }
     let(:reference) { milestone.to_reference(project) }
 
@@ -174,13 +174,13 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
     end
 
     it 'contains cross project content' do
-      expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_name}"
+      expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_path}"
     end
 
     it 'escapes the name attribute' do
       allow_any_instance_of(Milestone).to receive(:title).and_return(%{"></a>whatever<a title="})
       doc = reference_filter("See #{reference}")
-      expect(doc.css('a').first.text).to eq "#{milestone.name} in #{project_name}"
+      expect(doc.css('a').first.text).to eq "#{milestone.name} in #{project_path}"
     end
   end
 end

From d39127104727f019c0728c599a807fbbb3e8e7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Fri, 8 Apr 2016 23:03:23 -0300
Subject: [PATCH 0044/1431] Include Milestone reference syntax in Markdown
 documentation

---
 doc/markdown/markdown.md | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 4f199b6af6f..1afa1f14067 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -185,20 +185,23 @@ GFM will turn that reference into a link so you can navigate between them easily
 
 GFM will recognize the following:
 
-| input                  | references                 |
-|:-----------------------|:---------------------------|
-| `@user_name`           | specific user              |
-| `@group_name`          | specific group             |
-| `@all`                 | entire team                |
-| `#123`                 | issue                      |
-| `!123`                 | merge request              |
-| `$123`                 | snippet                    |
-| `~123`                 | label by ID                |
-| `~bug`                 | one-word label by name     |
-| `~"feature request"`   | multi-word label by name   |
-| `9ba12248`             | specific commit            |
-| `9ba12248...b19a04f5`  | commit range comparison    |
-| `[README](doc/README)` | repository file references |
+| input                  | references                   |
+|:-----------------------|:---------------------------  |
+| `@user_name`           | specific user                |
+| `@group_name`          | specific group               |
+| `@all`                 | entire team                  |
+| `#123`                 | issue                        |
+| `!123`                 | merge request                |
+| `$123`                 | snippet                      |
+| `~123`                 | label by ID                  |
+| `~bug`                 | one-word label by name       |
+| `~"feature request"`   | multi-word label by name     |
+| `%123`                 | milestone by ID              |
+| `%v1.23`               | one-word milestone by name   |
+| `%"release candidate"` | multi-word milestone by name |
+| `9ba12248`             | specific commit              |
+| `9ba12248...b19a04f5`  | commit range comparison      |
+| `[README](doc/README)` | repository file references   |
 
 GFM also recognizes certain cross-project references:
 
@@ -206,6 +209,7 @@ GFM also recognizes certain cross-project references:
 |:----------------------------------------|:------------------------|
 | `namespace/project#123`                 | issue                   |
 | `namespace/project!123`                 | merge request           |
+| `namespace/project%123`                 | milestone               |
 | `namespace/project$123`                 | snippet                 |
 | `namespace/project@9ba12248`            | specific commit         |
 | `namespace/project@9ba12248...b19a04f5` | commit range comparison |

From 7910853368970292eb243ee34072c7f527fa67f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejandroluis24@gmail.com>
Date: Tue, 19 Apr 2016 22:20:43 -0300
Subject: [PATCH 0045/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index d4b8a509261..b35cd9585dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -112,6 +112,7 @@ v 8.7.0 (unreleased)
   - Fix GitHub project's link in the import page when provider has a custom URL
   - Add RAW build trace output and button on build page
   - Add incremental build trace update into CI API
+  - Implement GFM references for milestones (Alejandro Rodríguez)
 
 v 8.6.7
   - Fix persistent XSS vulnerability in `commit_person_link` helper

From ff1e7474ed0f210df004c714e1b83c1c2eb0d91c Mon Sep 17 00:00:00 2001
From: Andrew Collett <andrewjamescollett@gmail.com>
Date: Thu, 21 Apr 2016 10:30:27 +0000
Subject: [PATCH 0046/1431] Update cas.md to reflect the current syntax, and
 added that gitlab-ctl reconfigure should be run.

---
 doc/integration/cas.md | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/integration/cas.md b/doc/integration/cas.md
index e6b2071f193..e34e306f9ac 100644
--- a/doc/integration/cas.md
+++ b/doc/integration/cas.md
@@ -27,17 +27,18 @@ To enable the CAS OmniAuth provider you must register your application with your
     ```ruby
       gitlab_rails['omniauth_providers'] = [
         {
-          name: "cas3",
-          label: "cas",
-          args: {
-                  url: 'CAS_SERVER',
-                  login_url: '/CAS_PATH/login',
-                  service_validate_url: '/CAS_PATH/p3/serviceValidate',
-                  logout_url: '/CAS_PATH/logout'} }
-          }
+            "name"=> "cas3",
+            "label"=> "cas",
+            "args"=> {
+                "url"=> 'CAS_SERVER',
+                "login_url"=> '/CAS_PATH/login',
+                "service_validate_url"=> '/CAS_PATH/p3/serviceValidate',
+                "logout_url"=> '/CAS_PATH/logout'
+            }
         }
       ]
     ```
+    
 
     For installations from source:
 
@@ -57,6 +58,8 @@ To enable the CAS OmniAuth provider you must register your application with your
 
 1.  Save the configuration file.
 
+1.  Run `gitlab-ctl reconfigure` for the omnibus package.
+
 1.  Restart GitLab for the changes to take effect.
 
 On the sign in page there should now be a CAS tab in the sign in form.

From 9add3fbb3346460934d5990ede1b3216c03e62ee Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 22 Apr 2016 13:24:53 +0200
Subject: [PATCH 0047/1431] =?UTF-8?q?Some=20changes=20after=20review=20fro?=
 =?UTF-8?q?m=20R=C3=A9my=20and=20Valery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/git_http_controller.rb           | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 13af17083bd..cd8dd610bcd 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -1,20 +1,11 @@
 class Projects::GitHttpController < Projects::ApplicationController
   skip_before_action :repository
   before_action :authenticate_user
-  before_action :project_found?
+  before_action :ensure_project_found?
 
-  # We support two actions (git push and git pull) which use four
-  # different HTTP requests:
-  #
-  # - GET /foo/bar.git/info/refs?service=git-upload-pack (pull)
-  # - GET /foo/bar.git/info/refs?service=git-receive-pack (push)
-  # - POST /foo/bar.git/git-upload-pack (pull)
-  # - POST /foo/bar.git/git-receive-pack" (push)
-  #
-  # The Rails routes divide these four requests over three methods:
-  # info_refs, git_upload_pack, and git_receive_pack.
-
-  def git_rpc
+  # GET /foo/bar.git/info/refs?service=git-upload-pack (git pull)
+  # GET /foo/bar.git/info/refs?service=git-receive-pack (git push)
+  def info_refs
     if upload_pack? && upload_pack_allowed?
       render_ok
     elsif receive_pack? && receive_pack_allowed?
@@ -24,8 +15,22 @@ class Projects::GitHttpController < Projects::ApplicationController
     end
   end
 
-  %i{info_refs git_receive_pack git_upload_pack}.each do |method|
-    alias_method method, :git_rpc
+  # POST /foo/bar.git/git-upload-pack (git pull)
+  def git_upload_pack
+    if upload_pack? && upload_pack_allowed?
+      render_ok
+    else
+      render_not_found
+    end
+  end
+
+  # POST /foo/bar.git/git-receive-pack" (git push)
+  def git_receive_pack
+    if receive_pack? && receive_pack_allowed?
+      render_ok
+    else
+      render_not_found
+    end
   end
 
   private
@@ -34,7 +39,7 @@ class Projects::GitHttpController < Projects::ApplicationController
     return if project && project.public? && upload_pack?
 
     authenticate_or_request_with_http_basic do |login, password|
-      return @ci = true if ci_request?(login, password)
+      return @ci = true if valid_ci_request?(login, password)
 
       @user = Gitlab::Auth.new.find(login, password)
       @user ||= oauth_access_token_check(login, password)
@@ -42,19 +47,21 @@ class Projects::GitHttpController < Projects::ApplicationController
     end
   end
 
-  def project_found?
+  def ensure_project_found?
     render_not_found if project.blank?
   end
 
-  def ci_request?(login, password)
-    matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
+  def valid_ci_request?(login, password)
+    matched_login = /(?<service>^[a-zA-Z]*-ci)-token$/.match(login)
 
     if project && matched_login.present? && upload_pack?
-      underscored_service = matched_login['s'].underscore
+      underscored_service = matched_login['service'].underscore
 
       if underscored_service == 'gitlab_ci'
         return project && project.valid_build_token?(password)
       elsif Service.available_services_names.include?(underscored_service)
+        # We treat underscored_service as a trusted input because it is included
+        # in the Service.available_services_names whitelist.
         service_method = "#{underscored_service}_service"
         service = project.send(service_method)
 
@@ -126,6 +133,7 @@ class Projects::GitHttpController < Projects::ApplicationController
       return id.slice(0, id.length - suffix.length) if id.end_with?(suffix)
     end
 
+    # No valid id was found.
     nil
   end
 
@@ -140,14 +148,14 @@ class Projects::GitHttpController < Projects::ApplicationController
   end
 
   def upload_pack?
-    rpc == 'git-upload-pack'
+    git_command == 'git-upload-pack'
   end
 
   def receive_pack?
-    rpc == 'git-receive-pack'
+    git_command == 'git-receive-pack'
   end
 
-  def rpc
+  def git_command
     if action_name == 'info_refs'
       params[:service]
     else
@@ -178,11 +186,8 @@ class Projects::GitHttpController < Projects::ApplicationController
       true
     elsif user
       Gitlab::GitAccess.new(user, project).download_access_check.allowed?
-    elsif project.public?
-      # Allow clone/fetch for public projects
-      true
     else
-      false
+      project.public?
     end
   end
 

From c161065e781a2c6d7a3b22954259809ffd7c5b26 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 22 Apr 2016 13:58:40 +0200
Subject: [PATCH 0048/1431] Don't mess up our parent controller

---
 .../projects/application_controller.rb        | 26 ++++-----------
 .../projects/git_http_controller.rb           | 32 ++++++++++++-------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 817727d7868..74150ad606b 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -10,6 +10,9 @@ class Projects::ApplicationController < ApplicationController
 
   def project
     unless @project
+      namespace = params[:namespace_id]
+      id = params[:project_id] || params[:id]
+
       # Redirect from
       #   localhost/group/project.git
       # to
@@ -20,11 +23,12 @@ class Projects::ApplicationController < ApplicationController
         return
       end
 
-      @project = find_project
+      project_path = "#{namespace}/#{id}"
+      @project = Project.find_with_namespace(project_path)
 
       if @project && can?(current_user, :read_project, @project)
-        if @project.path_with_namespace != path_with_namespace
-          redirect_to request.original_url.gsub(path_with_namespace, @project.path_with_namespace)
+        if @project.path_with_namespace != project_path
+          redirect_to request.original_url.gsub(project_path, @project.path_with_namespace)
         end
       else
         @project = nil
@@ -40,22 +44,6 @@ class Projects::ApplicationController < ApplicationController
     @project
   end
 
-  def id
-    params[:project_id] || params[:id]
-  end
-  
-  def namespace
-    params[:namespace_id]
-  end
-  
-  def path_with_namespace
-    "#{namespace}/#{id}"
-  end
-  
-  def find_project
-    Project.find_with_namespace(path_with_namespace)
-  end
-
   def repository
     @repository ||= project.repository
   end
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index cd8dd610bcd..e38552218ec 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -119,27 +119,37 @@ class Projects::GitHttpController < Projects::ApplicationController
 
   def project
     return @project if defined?(@project)
-    @project = find_project
+
+    project_id, _ = project_id_with_suffix
+    if project_id.blank?
+      @project = nil
+    else
+      @project = Project.find_with_namespace("#{params[:namespace_id]}/#{project_id}")
+    end
   end
 
-  def id
-    id = params[:project_id]
-    return if id.nil?
+  # This method returns two values so that we can parse
+  # params[:project_id] (untrusted input!) in exactly one place.
+  def project_id_with_suffix
+    id = params[:project_id] || ''
 
     %w{.wiki.git .git}.each do |suffix|
-      # Be careful to only remove the suffix from the end of 'id'.
-      # Accidentally removing it from the middle is how security
-      # vulnerabilities happen!
-      return id.slice(0, id.length - suffix.length) if id.end_with?(suffix)
+      if id.end_with?(suffix)
+        # Be careful to only remove the suffix from the end of 'id'.
+        # Accidentally removing it from the middle is how security
+        # vulnerabilities happen!
+        return [id.slice(0, id.length - suffix.length), suffix]
+      end
     end
 
-    # No valid id was found.
-    nil
+    # Something is wrong with params[:project_id]; do not pass it on.
+    [nil, nil]
   end
 
   def repository
     @repository ||= begin
-      if params[:project_id].end_with?('.wiki.git')
+      _, suffix = project_id_with_suffix
+      if suffix == '.wiki.git'
         project.wiki.repository
       else
         project.repository

From b64cbaccbe297c82b5af0dac94b491f86b17ddd3 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 22 Apr 2016 14:04:36 +0200
Subject: [PATCH 0049/1431] Remove trivial 'let'

---
 spec/requests/git_http_spec.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 8b217684911..20c7357cba5 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -54,7 +54,6 @@ describe 'Git HTTP requests', lib: true do
 
   context "when the project exists" do
     let(:path) { "#{project.path_with_namespace}.git" }
-    let(:env) { {} }
 
     context "when the project is public" do
       before do
@@ -62,13 +61,13 @@ describe 'Git HTTP requests', lib: true do
       end
 
       it "downloads get status 200" do
-        download(path, env) do |response|
+        download(path, {}) do |response|
           expect(response.status).to eq(200)
         end
       end
 
       it "uploads get status 401" do
-        upload(path, env) do |response|
+        upload(path, {}) do |response|
           expect(response.status).to eq(401)
         end
       end
@@ -97,7 +96,7 @@ describe 'Git HTTP requests', lib: true do
         it "responds with status 404" do
           allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
 
-          download(path, env) do |response|
+          download(path, {}) do |response|
             expect(response.status).to eq(404)
           end
         end
@@ -111,13 +110,13 @@ describe 'Git HTTP requests', lib: true do
 
       context "when no authentication is provided" do
         it "responds with status 401 to downloads" do
-          download(path, env) do |response|
+          download(path, {}) do |response|
             expect(response.status).to eq(401)
           end
         end
 
         it "responds with status 401 to uploads" do
-          upload(path, env) do |response|
+          upload(path, {}) do |response|
             expect(response.status).to eq(401)
           end
         end

From ab1734f9e1e3f07482185c8a4cb168be463fcff5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Sat, 23 Apr 2016 12:27:29 +0200
Subject: [PATCH 0050/1431] Move changelog item

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

diff --git a/CHANGELOG b/CHANGELOG
index f81435805d3..b1df9145d93 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.8.0 (unreleased)
+  - Implement GFM references for milestones (Alejandro Rodríguez)
 
 v 8.7.1 (unreleased)
   - Use the `can?` helper instead of `current_user.can?`
@@ -121,7 +122,6 @@ v 8.7.0
   - Fix GitHub project's link in the import page when provider has a custom URL
   - Add RAW build trace output and button on build page
   - Add incremental build trace update into CI API
-  - Implement GFM references for milestones (Alejandro Rodríguez)
 
 v 8.6.7
   - Fix persistent XSS vulnerability in `commit_person_link` helper

From 715959e58190eca661ea377b949af3515d8da913 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Sat, 23 Apr 2016 12:34:09 +0200
Subject: [PATCH 0051/1431] Fix cross-project milestone ref with invalid
 project

---
 .../filter/milestone_reference_filter.rb      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index 746e768061c..dad0768f51b 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -17,9 +17,7 @@ module Banzai
         return super(text, pattern) if pattern != Milestone.reference_pattern
 
         text.gsub(pattern) do |match|
-          project = project_from_ref($~[:project])
-          params = milestone_params($~[:milestone_iid].to_i, $~[:milestone_name])
-          milestone = project.milestones.find_by(params)
+          milestone = find_milestone($~[:project], $~[:milestone_iid], $~[:milestone_name])
 
           if milestone
             yield match, milestone.iid, $~[:project], $~
@@ -29,6 +27,22 @@ module Banzai
         end
       end
 
+      def find_milestone(project_ref, milestone_id, milestone_name)
+        project = project_from_ref(project_ref)
+        return unless project
+
+        milestone_params = milestone_params(milestone_id, milestone_name)
+        project.milestones.find_by(milestone_params)
+      end
+
+      def milestone_params(iid, name)
+        if name
+          { name: name.tr('"', '') }
+        else
+          { iid: iid.to_i }
+        end
+      end
+
       def url_for_object(milestone, project)
         h = Gitlab::Routing.url_helpers
         h.namespace_project_milestone_url(project.namespace, project, milestone,
@@ -43,14 +57,6 @@ module Banzai
             html_safe
         end
       end
-
-      def milestone_params(iid, name)
-        if name
-          { name: name.tr('"', '') }
-        else
-          { iid: iid }
-        end
-      end
     end
   end
 end

From d698d3e846c83f49cd363291dd811220c338c8e9 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 25 Apr 2016 18:05:05 +0200
Subject: [PATCH 0052/1431] =?UTF-8?q?More=20changes=20suggested=20by=20R?=
 =?UTF-8?q?=C3=A9my?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/git_http_controller.rb           | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index e38552218ec..fafd9e445b5 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -1,7 +1,9 @@
 class Projects::GitHttpController < Projects::ApplicationController
+  attr_reader :user
+
   skip_before_action :repository
   before_action :authenticate_user
-  before_action :ensure_project_found?
+  before_action :ensure_project_found!
 
   # GET /foo/bar.git/info/refs?service=git-upload-pack (git pull)
   # GET /foo/bar.git/info/refs?service=git-receive-pack (git push)
@@ -47,29 +49,29 @@ class Projects::GitHttpController < Projects::ApplicationController
     end
   end
 
-  def ensure_project_found?
+  def ensure_project_found!
     render_not_found if project.blank?
   end
 
   def valid_ci_request?(login, password)
     matched_login = /(?<service>^[a-zA-Z]*-ci)-token$/.match(login)
 
-    if project && matched_login.present? && upload_pack?
-      underscored_service = matched_login['service'].underscore
-
-      if underscored_service == 'gitlab_ci'
-        return project && project.valid_build_token?(password)
-      elsif Service.available_services_names.include?(underscored_service)
-        # We treat underscored_service as a trusted input because it is included
-        # in the Service.available_services_names whitelist.
-        service_method = "#{underscored_service}_service"
-        service = project.send(service_method)
-
-        return service && service.activated? && service.valid_token?(password)
-      end
+    unless project && matched_login.present? && upload_pack?
+      return false
     end
 
-    false
+    underscored_service = matched_login['service'].underscore
+
+    if underscored_service == 'gitlab_ci'
+      project && project.valid_build_token?(password)
+    elsif Service.available_services_names.include?(underscored_service)
+      # We treat underscored_service as a trusted input because it is included
+      # in the Service.available_services_names whitelist.
+      service_method = "#{underscored_service}_service"
+      service = project.send(service_method)
+
+      service && service.activated? && service.valid_token?(password)
+    end
   end
 
   def oauth_access_token_check(login, password)
@@ -185,10 +187,6 @@ class Projects::GitHttpController < Projects::ApplicationController
     !!@ci
   end
 
-  def user
-    @user
-  end
-
   def upload_pack_allowed?
     if !Gitlab.config.gitlab_shell.upload_pack
       false

From c6f19aed51736e5945283a611eae09f32a9b5aeb Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 26 Apr 2016 16:01:00 +0200
Subject: [PATCH 0053/1431] Fix builds rendering bug

---
 app/views/projects/commit/_ci_commit.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 782ea341daf..21a30080868 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -18,7 +18,7 @@
     - if defined?(link_to_commit) && link_to_commit
       for commit
       = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
-    - if ci_commit.duration > 0
+    - if ci_commit.duration
       in
       = time_interval_in_words ci_commit.duration
 

From 9f85b7bc58485831a61da0f9acc530511ea7474a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 26 Apr 2016 16:56:14 +0200
Subject: [PATCH 0054/1431] Initialize wikis on legacy projects during check

---
 .../single_repository_worker.rb               | 34 +++++++++++++------
 .../single_repository_worker_spec.rb          | 33 +++++++++++++++---
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/app/workers/repository_check/single_repository_worker.rb b/app/workers/repository_check/single_repository_worker.rb
index a76729e3c74..f2d12ba5a7d 100644
--- a/app/workers/repository_check/single_repository_worker.rb
+++ b/app/workers/repository_check/single_repository_worker.rb
@@ -1,9 +1,9 @@
 module RepositoryCheck
   class SingleRepositoryWorker
     include Sidekiq::Worker
-  
+
     sidekiq_options retry: false
-  
+
     def perform(project_id)
       project = Project.find(project_id)
       project.update_columns(
@@ -11,20 +11,32 @@ module RepositoryCheck
         last_repository_check_at: Time.now,
       )
     end
-  
+
     private
-  
+
     def check(project)
-      repositories = [project.repository]
-      repositories << project.wiki.repository if project.wiki_enabled?
-      # Use 'map do', not 'all? do', to prevent short-circuiting
-      repositories.map { |repository| git_fsck(repository.path_to_repo) }.all?
+      if !git_fsck(project.repository)
+        false
+      elsif project.wiki_enabled?
+        # Historically some projects never had their wiki repos initialized;
+        # this happens on project creation now. Let's initialize an empty repo
+        # if it is not already there.
+        begin
+          project.create_wiki
+        rescue Rugged::RepositoryError
+        end
+
+        git_fsck(project.wiki.repository)
+      else
+        true
+      end
     end
-  
-    def git_fsck(path)
+
+    def git_fsck(repository)
+      path = repository.path_to_repo
       cmd = %W(nice git --git-dir=#{path} fsck)
       output, status = Gitlab::Popen.popen(cmd)
-  
+
       if status.zero?
         true
       else
diff --git a/spec/workers/repository_check/single_repository_worker_spec.rb b/spec/workers/repository_check/single_repository_worker_spec.rb
index 087e4c667d8..5a03bb77ebd 100644
--- a/spec/workers/repository_check/single_repository_worker_spec.rb
+++ b/spec/workers/repository_check/single_repository_worker_spec.rb
@@ -12,7 +12,7 @@ describe RepositoryCheck::SingleRepositoryWorker do
     subject.perform(project.id)
     expect(project.reload.last_repository_check_failed).to eq(false)
 
-    destroy_wiki(project)
+    break_wiki(project)
     subject.perform(project.id)
 
     expect(project.reload.last_repository_check_failed).to eq(true)
@@ -20,15 +20,38 @@ describe RepositoryCheck::SingleRepositoryWorker do
 
   it 'skips wikis when disabled' do
     project = create(:project_empty_repo, wiki_enabled: false)
-    # Make sure the test would fail if it checked the wiki repo
-    destroy_wiki(project)
+    # Make sure the test would fail if the wiki repo was checked
+    break_wiki(project)
 
     subject.perform(project.id)
 
     expect(project.reload.last_repository_check_failed).to eq(false)
   end
 
-  def destroy_wiki(project)
-    FileUtils.rm_rf(project.wiki.repository.path_to_repo)
+  it 'creates missing wikis' do
+    project = create(:project_empty_repo, wiki_enabled: true)
+    FileUtils.rm_rf(wiki_path(project))
+
+    subject.perform(project.id)
+
+    expect(project.reload.last_repository_check_failed).to eq(false)
+  end
+
+  it 'does not create a wiki if the main repo does not exist at all' do
+    project = create(:project_empty_repo)
+    FileUtils.rm_rf(project.repository.path_to_repo)
+    FileUtils.rm_rf(wiki_path(project))
+
+    subject.perform(project.id)
+
+    expect(File.exist?(wiki_path(project))).to eq(false)
+  end
+
+  def break_wiki(project)
+    FileUtils.rm_rf(wiki_path(project) + '/objects')
+  end
+
+  def wiki_path(project)
+    project.wiki.repository.path_to_repo
   end
 end

From 247ae960552acc8cd3be299dbb10ed61d8dafe75 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Tue, 26 Apr 2016 23:20:19 +0700
Subject: [PATCH 0055/1431] Allow to assign labels and milestone to target
 project when moving issue

---
 app/services/issues/move_service.rb       | 11 ++++++++++-
 spec/services/issues/move_service_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index 82e7090f1ea..8d41ea5df55 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -41,7 +41,8 @@ module Issues
     private
 
     def create_new_issue
-      new_params = { id: nil, iid: nil, label_ids: [], milestone: nil,
+      new_params = { id: nil, iid: nil, label_ids: cloneable_label_ids,
+                     milestone: cloneable_milestone_id,
                      project: @new_project, author: @old_issue.author,
                      description: rewrite_content(@old_issue.description) }
 
@@ -49,6 +50,14 @@ module Issues
       CreateService.new(@new_project, @current_user, new_params).execute
     end
 
+    def cloneable_label_ids
+      @new_project.labels.where(title: @old_issue.labels.pluck(:title)).pluck(:id)
+    end
+
+    def cloneable_milestone_id
+      @new_project.milestones.find_by(title: @old_issue.milestone.try(:title))
+    end
+
     def rewrite_notes
       @old_issue.notes.find_each do |note|
         new_note = note.dup
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 2a5e4ac3ec4..c98e60d76b3 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -21,6 +21,15 @@ describe Issues::MoveService, services: true do
     before do
       old_project.team << [user, :reporter]
       new_project.team << [user, :reporter]
+
+      create(:milestone, project_id: old_project.id, title: 'v1.0')
+      create(:milestone, project_id: new_project.id, title: 'v1.0')
+
+      old_issue.labels << create(:label, project_id: old_project.id, title: 'label1')
+      old_issue.labels << create(:label, project_id: old_project.id, title: 'label2')
+
+      new_project.labels << create(:label, title: 'label1')
+      new_project.labels << create(:label, title: 'label2')
     end
   end
 
@@ -39,6 +48,17 @@ describe Issues::MoveService, services: true do
           expect(new_issue.project).to eq new_project
         end
 
+        it 'assigns milestone to new issue' do
+          expect(new_issue.reload.milestone.title).to eq 'v1.0'
+        end
+
+        it 'assign labels to new issue' do
+          expected_label_titles = new_issue.reload.labels.map(&:title)
+          expect(expected_label_titles).to include 'label1'
+          expect(expected_label_titles).to include 'label2'
+          expect(expected_label_titles.size).to eq 2
+        end
+
         it 'rewrites issue title' do
           expect(new_issue.title).to eq title
         end

From d6d1daf430bbadef953b40975a503e0bb64044fc Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Wed, 27 Apr 2016 00:03:09 +0700
Subject: [PATCH 0056/1431] Update specs

---
 spec/services/issues/move_service_spec.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index c98e60d76b3..7654b255697 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -7,10 +7,11 @@ describe Issues::MoveService, services: true do
   let(:description) { 'Some issue description' }
   let(:old_project) { create(:project) }
   let(:new_project) { create(:project) }
+  let!(:milestone1) { create(:milestone, project_id: old_project.id, title: 'v9.0') }
 
   let(:old_issue) do
     create(:issue, title: title, description: description,
-                   project: old_project, author: author)
+                   project: old_project, author: author, milestone: milestone1)
   end
 
   let(:move_service) do
@@ -22,8 +23,7 @@ describe Issues::MoveService, services: true do
       old_project.team << [user, :reporter]
       new_project.team << [user, :reporter]
 
-      create(:milestone, project_id: old_project.id, title: 'v1.0')
-      create(:milestone, project_id: new_project.id, title: 'v1.0')
+      create(:milestone, project_id: new_project.id, title: 'v9.0')
 
       old_issue.labels << create(:label, project_id: old_project.id, title: 'label1')
       old_issue.labels << create(:label, project_id: old_project.id, title: 'label2')
@@ -49,7 +49,7 @@ describe Issues::MoveService, services: true do
         end
 
         it 'assigns milestone to new issue' do
-          expect(new_issue.reload.milestone.title).to eq 'v1.0'
+          expect(new_issue.reload.milestone.title).to eq 'v9.0'
         end
 
         it 'assign labels to new issue' do
@@ -92,11 +92,6 @@ describe Issues::MoveService, services: true do
           expect(new_issue.author).to eq author
         end
 
-        it 'removes data that is invalid in new context' do
-          expect(new_issue.milestone).to be_nil
-          expect(new_issue.labels).to be_empty
-        end
-
         it 'creates a new internal id for issue' do
           expect(new_issue.iid).to be 1
         end

From 0ace42cdb90161ee7daf69b7a6a7af6ce4195208 Mon Sep 17 00:00:00 2001
From: Jason Roehm <jasonr@3db-labs.com>
Date: Tue, 26 Apr 2016 21:41:52 -0400
Subject: [PATCH 0057/1431] fix: in recent versions of Docker, the /.dockerinit
 file doesn't exist; use /.dockerenv instead [ci skip]

Signed-off-by: Jason Roehm <jasonr@3db-labs.com>
---
 doc/ci/ssh_keys/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md
index 7f825e6a065..7c0fb225dac 100644
--- a/doc/ci/ssh_keys/README.md
+++ b/doc/ci/ssh_keys/README.md
@@ -57,7 +57,7 @@ before_script:
   # WARNING: Use this only with the Docker executor, if you use it with shell
   # you will overwrite your user's SSH config.
   - mkdir -p ~/.ssh
-  - '[[ -f /.dockerinit ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 ```
 
 As a final step, add the _public_ key from the one you created earlier to the

From ce9310d63f6ddf55187d16b882d59f26f7b384a9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 27 Apr 2016 09:28:08 +0200
Subject: [PATCH 0058/1431] fix var error

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

diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb
index 9bb507b5edd..9b83292ef33 100644
--- a/lib/gitlab/bitbucket_import/client.rb
+++ b/lib/gitlab/bitbucket_import/client.rb
@@ -12,7 +12,7 @@ module Gitlab
           token_secret = import_data_credentials[:bb_session][:bitbucket_access_token_secret]
           new(token, token_secret)
         else
-          raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}"
+          raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{project.id}"
         end
       end
 

From 6b2489f2007e3ffe890f707d824a915f97ed7e61 Mon Sep 17 00:00:00 2001
From: Karlo Soriano <karlo@aelogica.com>
Date: Wed, 27 Apr 2016 17:45:50 +0800
Subject: [PATCH 0059/1431] Fix typo in user steps feature

[ci skip]
---
 features/steps/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/user.rb b/features/steps/user.rb
index 3230234cb6d..39bbb59343b 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -12,7 +12,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
     user = User.find_by(name: 'John Doe')
     project = contributed_project
 
-    # Issue controbution
+    # Issue contribution
     issue_params = { title: 'Bug in old browser' }
     Issues::CreateService.new(project, user, issue_params).execute
 

From c8187738a217166cbf03c26adc4a09fcf43a3b94 Mon Sep 17 00:00:00 2001
From: Karlo Soriano <karlo@aelogica.com>
Date: Wed, 27 Apr 2016 19:36:04 +0800
Subject: [PATCH 0060/1431] Remove unused .contributed-projects class

While working on #13401 and trying to add a new tab to the user profile
page, I came across this. I noticed that the `contributed-projects`
class was only being used in order to select the div in the tests. For
consistency with the other tabs, I decided to remove this class and use
the div's id for the selector.
---
 app/views/users/show.html.haml | 2 +-
 features/steps/user.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 3028491e5b6..5554f736e98 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -98,7 +98,7 @@
       #groups.tab-pane
         - # This tab is always loaded via AJAX
 
-      #contributed.contributed-projects.tab-pane
+      #contributed.tab-pane
         - # This tab is always loaded via AJAX
 
       #projects.tab-pane
diff --git a/features/steps/user.rb b/features/steps/user.rb
index 3230234cb6d..18fd8e5c618 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -28,7 +28,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
   end
 
   step 'I should see contributed projects' do
-    page.within '.contributed-projects' do
+    page.within '#contributed' do
       expect(page).to have_content(@contributed_project.name)
     end
   end

From b677b0e33a04ead7edaad5ee528c915980b1c283 Mon Sep 17 00:00:00 2001
From: mike <github@ravuya.com>
Date: Wed, 27 Apr 2016 16:03:20 -0600
Subject: [PATCH 0061/1431] Add explicit --with statement for postgres and
 mysql gem groups as necessary. When I followed these instructions, the first
 command did not install the postgres group and it had to be made explicit.

---
 doc/update/patch_versions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index f446ed0a35b..bca570b28b9 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -57,10 +57,10 @@ sudo -u git -H make
 cd /home/git/gitlab
 
 # PostgreSQL
-sudo -u git -H bundle install --without development test mysql --deployment
+sudo -u git -H bundle install --without development test mysql --with postgres --deployment
 
 # MySQL
-sudo -u git -H bundle install --without development test postgres --deployment
+sudo -u git -H bundle install --without development test postgres --with mysql --deployment
 
 # Optional: clean up old gems
 sudo -u git -H bundle clean

From 267dd23311fe6ad6e9c9af15d683dc1a1bf608fe Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 27 Apr 2016 18:05:57 -0600
Subject: [PATCH 0062/1431] Enable LstripRstrip cop

This requires no code changes since it doesn't actually change anything
in the codebase, just preventative.
---
 .rubocop.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 83ed6c38678..9f179efa3ce 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -953,10 +953,9 @@ Performance/DoubleStartEndWith:
 Performance/EndWith:
   Enabled: false
 
-# TODO: Enable LstripRstrip Cop.
 # Use `strip` instead of `lstrip.rstrip`.
 Performance/LstripRstrip:
-  Enabled: false
+  Enabled: true
 
 # TODO: Enable RangeInclude Cop.
 # Use `Range#cover?` instead of `Range#include?`.

From 8793025dd04b7a6c8dd6dd04a52eabbfc612745d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 28 Apr 2016 10:26:44 +0200
Subject: [PATCH 0063/1431] added spec testing exception raised

---
 .../gitlab/bitbucket_import/client_spec.rb    | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb
index aa0699f2ebf..cd31894eda6 100644
--- a/spec/lib/gitlab/bitbucket_import/client_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb
@@ -34,18 +34,33 @@ describe Gitlab::BitbucketImport::Client, lib: true do
     it 'retrieves issues over a number of pages' do
       stub_request(:get,
                    "https://bitbucket.org/api/1.0/repositories/#{project_id}/issues?limit=50&sort=utc_created_on&start=0").
-          to_return(status: 200,
-                    body: first_sample_data.to_json,
-                    headers: {})
+        to_return(status: 200,
+                  body: first_sample_data.to_json,
+                  headers: {})
 
       stub_request(:get,
                    "https://bitbucket.org/api/1.0/repositories/#{project_id}/issues?limit=50&sort=utc_created_on&start=50").
-          to_return(status: 200,
-                    body: second_sample_data.to_json,
-                    headers: {})
+        to_return(status: 200,
+                  body: second_sample_data.to_json,
+                  headers: {})
 
       issues = client.issues(project_id)
       expect(issues.count).to eq(95)
     end
   end
+
+  context 'project import' do
+    it 'calls .from_project with no errors' do
+      project = create(:empty_project)
+      project.create_or_update_import_data(credentials:
+                                             { :user => "git",
+                                               :password => nil,
+                                               :bb_session =>
+                                                 { :bitbucket_access_token => "test",
+                                                   :bitbucket_access_token_secret => "test" } })
+      project.import_url = "ssh://git@bitbucket.org/test/test.git"
+
+      expect { described_class.from_project(project) }.to_not raise_error
+    end
+  end
 end

From f7844a11be6a5f6aa7011bd96f59bf218c4788ea Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 28 Apr 2016 15:52:23 +0700
Subject: [PATCH 0064/1431] Code refactor and fix broken spec

---
 app/services/issues/move_service.rb       |  8 +++++---
 spec/services/issues/move_service_spec.rb | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index 8d41ea5df55..fe5df8f18cb 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -42,7 +42,7 @@ module Issues
 
     def create_new_issue
       new_params = { id: nil, iid: nil, label_ids: cloneable_label_ids,
-                     milestone: cloneable_milestone_id,
+                     milestone_id: cloneable_milestone_id,
                      project: @new_project, author: @old_issue.author,
                      description: rewrite_content(@old_issue.description) }
 
@@ -51,11 +51,13 @@ module Issues
     end
 
     def cloneable_label_ids
-      @new_project.labels.where(title: @old_issue.labels.pluck(:title)).pluck(:id)
+      @new_project.labels
+        .where(title: @old_issue.labels.pluck(:title)).pluck(:id)
     end
 
     def cloneable_milestone_id
-      @new_project.milestones.find_by(title: @old_issue.milestone.try(:title))
+      @new_project.milestones
+        .find_by(title: @old_issue.milestone.try(:title)).try(:id)
     end
 
     def rewrite_notes
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 7654b255697..62a5e93037e 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -7,7 +7,9 @@ describe Issues::MoveService, services: true do
   let(:description) { 'Some issue description' }
   let(:old_project) { create(:project) }
   let(:new_project) { create(:project) }
-  let!(:milestone1) { create(:milestone, project_id: old_project.id, title: 'v9.0') }
+  let!(:milestone1) do
+    create(:milestone, project_id: old_project.id, title: 'v9.0')
+  end
 
   let(:old_issue) do
     create(:issue, title: title, description: description,
@@ -23,10 +25,12 @@ describe Issues::MoveService, services: true do
       old_project.team << [user, :reporter]
       new_project.team << [user, :reporter]
 
-      create(:milestone, project_id: new_project.id, title: 'v9.0')
-
-      old_issue.labels << create(:label, project_id: old_project.id, title: 'label1')
-      old_issue.labels << create(:label, project_id: old_project.id, title: 'label2')
+      ['label1', 'label2'].each do |label|
+        old_issue.labels << create(:label,
+          project_id: old_project.id,
+          title: label
+        )
+      end
 
       new_project.labels << create(:label, title: 'label1')
       new_project.labels << create(:label, title: 'label2')
@@ -35,6 +39,10 @@ describe Issues::MoveService, services: true do
 
   describe '#execute' do
     shared_context 'issue move executed' do
+      let!(:milestone2) do
+        create(:milestone, project_id: new_project.id, title: 'v9.0')
+      end
+
       let!(:new_issue) { move_service.execute(old_issue, new_project) }
     end
 

From 81467d2e04562d63249063113bdd61d4ad16da7d Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 28 Apr 2016 16:21:41 +0700
Subject: [PATCH 0065/1431] Fix rubocop

---
 spec/services/issues/move_service_spec.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 62a5e93037e..7399003bd75 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -28,8 +28,7 @@ describe Issues::MoveService, services: true do
       ['label1', 'label2'].each do |label|
         old_issue.labels << create(:label,
           project_id: old_project.id,
-          title: label
-        )
+          title: label)
       end
 
       new_project.labels << create(:label, title: 'label1')

From 9a9681772c3c8a6523bb94e758655e5c555cea91 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 28 Apr 2016 11:40:23 +0200
Subject: [PATCH 0066/1431] fix failing spec

---
 spec/lib/gitlab/bitbucket_import/client_spec.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb
index cd31894eda6..af839f42421 100644
--- a/spec/lib/gitlab/bitbucket_import/client_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb
@@ -53,11 +53,10 @@ describe Gitlab::BitbucketImport::Client, lib: true do
     it 'calls .from_project with no errors' do
       project = create(:empty_project)
       project.create_or_update_import_data(credentials:
-                                             { :user => "git",
-                                               :password => nil,
-                                               :bb_session =>
-                                                 { :bitbucket_access_token => "test",
-                                                   :bitbucket_access_token_secret => "test" } })
+                                             { user: "git",
+                                               password: nil,
+                                               bb_session: { bitbucket_access_token: "test",
+                                                             bitbucket_access_token_secret: "test" } })
       project.import_url = "ssh://git@bitbucket.org/test/test.git"
 
       expect { described_class.from_project(project) }.to_not raise_error

From ced6563121851d95cd156ee486476469acdd6469 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 28 Apr 2016 16:41:35 +0700
Subject: [PATCH 0067/1431] Add changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index 558897ad892..c6c96c096c8 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.8.0 (unreleased)
+  - Assign labels and milestone to target project when moving issue
   - Remove future dates from contribution calendar graph.
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project

From f43044cc8abb23f391f635e145b52cf5a54a0058 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 28 Apr 2016 16:43:21 +0700
Subject: [PATCH 0068/1431] Update changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index c6c96c096c8..2d3a9e051e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.8.0 (unreleased)
-  - Assign labels and milestone to target project when moving issue
+  - Assign labels and milestone to target project when moving issue. !3934
   - Remove future dates from contribution calendar graph.
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project

From 8a6776caa9f45c4c16347ad662bd83519032687d Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 28 Apr 2016 12:11:08 +0200
Subject: [PATCH 0069/1431] Use 'exec' in Unicorn and Sidekiq launch scripts

When running Unicorn or Sidekiq in the foreground this change removes
an intermediate /bin/sh process. This makes process supervision in the
GitLab Development Kit more reliable.

This change does not affect Omnibus-GitLab (because there we do not
use these launch scripts). Installations from source do use the launch
scripts but for the standard GitLab init script this change will not
make a difference.

Custom installations using Upstart or Systemd may be affected however,
because under certain configurations these systems count exactly how
many forks happen during process startup, and we are reducing that
number by one here.
---
 bin/background_jobs | 2 +-
 bin/web             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/background_jobs b/bin/background_jobs
index 1f67d732949..25a578a1c49 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -37,7 +37,7 @@ start_no_deamonize()
 
 start_sidekiq()
 {
-  bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile "$@"
+  exec bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile "$@"
 }
 
 load_ok()
diff --git a/bin/web b/bin/web
index 03fe7a6354b..ecd0bbd10b0 100755
--- a/bin/web
+++ b/bin/web
@@ -19,12 +19,12 @@ get_unicorn_pid()
 
 start()
 {
-  $unicorn_cmd -D
+  exec $unicorn_cmd -D
 }
 
 start_foreground()
 {
-  $unicorn_cmd
+  exec $unicorn_cmd
 }
 
 stop()

From 52a6b976a77d9ede9f1b50d55e33824ed05acb5f Mon Sep 17 00:00:00 2001
From: Job van der Voort <jobvandervoort@gmail.com>
Date: Thu, 28 Apr 2016 14:13:39 +0200
Subject: [PATCH 0070/1431] feature proposal issue template in contributing
 guide

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 24cd5864530..a1ded9b9848 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,6 +141,16 @@ members to add the label `feature proposal` to the issue.
 Please keep feature proposals as small and simple as possible, complex ones
 might be edited to make them small and simple.
 
+You are encouraged to use the template below for feature proposals.
+
+```
+## Description including problem, use cases, benefits, and/or goals
+
+## Proposal
+
+## Links / references
+```
+
 For changes in the interface, it can be helpful to create a mockup first.
 If you want to create something yourself, consider opening an issue first to
 discuss whether it is interesting to include this in GitLab.

From e9eeeaa0d0c8820f66a9581d8b4d03f02ac705d0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Apr 2016 15:35:40 +0200
Subject: [PATCH 0071/1431] Redesign navigation for group pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/groups/activity.html.haml           |  1 -
 app/views/groups/edit.html.haml               |  2 -
 .../groups/group_members/index.html.haml      |  1 -
 app/views/groups/issues.html.haml             |  1 -
 app/views/groups/merge_requests.html.haml     |  1 -
 app/views/groups/milestones/index.html.haml   |  1 -
 app/views/groups/projects.html.haml           |  1 -
 app/views/groups/show.html.haml               |  6 ---
 app/views/layouts/group.html.haml             |  3 +-
 app/views/layouts/group_settings.html.haml    |  4 +-
 app/views/layouts/nav/_dashboard.html.haml    |  4 +-
 app/views/layouts/nav/_group.html.haml        | 40 ++++++++++++-------
 12 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/app/views/groups/activity.html.haml b/app/views/groups/activity.html.haml
index f73e1d9e865..aaad265b3ee 100644
--- a/app/views/groups/activity.html.haml
+++ b/app/views/groups/activity.html.haml
@@ -3,7 +3,6 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 - page_title    "Activity"
-- header_title  group_title(@group, "Activity", activity_group_path(@group))
 
 %section.activities
   = render 'activities'
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index a698cbbe9db..92cd4c553d0 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -1,5 +1,3 @@
-- header_title group_title(@group, "Settings", edit_group_path(@group))
-
 .panel.panel-default.prepend-top-default
   .panel-heading
     Group settings
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 6b7fd5746d6..0eb6bbd4420 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Members"
-- header_title group_title(@group, "Members", group_group_members_path(@group))
 
 .group-members-page.prepend-top-default
   - if current_user && current_user.can?(:admin_group_member, @group)
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index aea35c50862..76160232e06 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,5 +1,4 @@
 - page_title "Issues"
-- header_title group_title(@group, "Issues", issues_group_path(@group))
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, issues_group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} issues")
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index e1c9dd931ee..87090352e26 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,5 +1,4 @@
 - page_title "Merge Requests"
-- header_title group_title(@group, "Merge Requests", merge_requests_group_path(@group))
 
 .top-area
   = render 'shared/issuable/nav', type: :merge_requests
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index ab307708b75..8bca00eb710 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Milestones"
-- header_title group_title(@group, "Milestones", group_milestones_path(@group))
 
 .top-area
   = render 'shared/milestones_filter'
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index dd75766121e..c2f2d9912f7 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -1,5 +1,4 @@
 - page_title "Projects"
-- header_title group_title(@group, "Projects", projects_group_path(@group))
 
 .panel.panel-default.prepend-top-default
   .panel-heading
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 3d16ecb097a..c71070e6c9c 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,12 +5,6 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 .cover-block
-  .cover-controls
-    - if @group && can?(current_user, :admin_group, @group)
-      = link_to icon('pencil'), edit_group_path(@group), class: 'btn'
-    - if current_user
-      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn'
-
   .avatar-holder
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 2e483b7148d..7bee7e172e6 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -1,6 +1,7 @@
 - page_title       @group.name
 - page_description @group.description  unless page_description
 - header_title     group_title(@group) unless header_title
-- sidebar          "group"             unless sidebar
+- sidebar          "dashboard"         unless sidebar
+- nav              "group"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml
index a1a1fc2f858..1ff53ce2a9d 100644
--- a/app/views/layouts/group_settings.html.haml
+++ b/app/views/layouts/group_settings.html.haml
@@ -1,5 +1,5 @@
 - page_title    "Settings"
-- header_title group_title(@group, "Settings", edit_group_path(@group))
-- sidebar       "group_settings"
+- sidebar       "dashboard" unless sidebar
+- nav           "group"
 
 = render template: "layouts/group"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index ca49c313ff7..fad4224e945 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -15,12 +15,12 @@
       = icon('dashboard fw')
       %span
         Activity
-  = nav_link(controller: :groups) do
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
       %span
         Groups
-  = nav_link(controller: :milestones) do
+  = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
       %span
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 55940741dc0..bc5ce7052e4 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,12 +1,28 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to root_path, title: 'Go to dashboard', class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Go to dashboard
+- if current_user
+  .controls
+    - if current_path?('groups#show')
+      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn btn-gray rss-btn'
 
-  %li.separate-item
+    %span.dropdown.group-settings-dropdown
+      %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+        = icon('cog')
+        = icon('angle-down')
+      %ul.dropdown-menu.dropdown-menu-align-right
+        = nav_link(path: 'groups#projects') do
+          = link_to projects_group_path(@group), title: 'Projects' do
+            Projects
+        %li.divider
+        - if @group && can?(current_user, :admin_group, @group)
+          %li
+            = link_to edit_group_path(@group) do
+              Edit Group
+        - if access = @group.users.find(current_user)
+          %li
+            = link_to leave_group_group_members_path(@group),
+              data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
+              Leave Group
 
+%ul.nav-links
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: 'Home' do
       = icon('group fw')
@@ -28,22 +44,16 @@
       %span
         Issues
         - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count= number_with_delimiter(issues.count)
+        %span.badge.count= number_with_delimiter(issues.count)
   = nav_link(path: 'groups#merge_requests') do
     = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
       = icon('tasks fw')
       %span
         Merge Requests
         - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count= number_with_delimiter(merge_requests.count)
+        %span.badge.count= number_with_delimiter(merge_requests.count)
   = nav_link(controller: [:group_members]) do
     = link_to group_group_members_path(@group), title: 'Members' do
       = icon('users fw')
       %span
         Members
-  - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "separate-item" }) do
-      = link_to edit_group_path(@group), title: 'Settings' do
-        = icon ('cogs fw')
-        %span
-          Settings

From 9ab70184e3299766165017267a74f53e80b03836 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 28 Apr 2016 12:05:45 -0700
Subject: [PATCH 0072/1431] Pass trusted_proxies to action_dispatch as IPAddrs
 instead of strings

Without this setting your own trusted_proxies does not work.
---
 config/initializers/trusted_proxies.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index b8cc025bae2..d256a16d42b 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -1,2 +1,3 @@
-Rails.application.config.action_dispatch.trusted_proxies =
+Rails.application.config.action_dispatch.trusted_proxies = (
   [ '127.0.0.1', '::1' ] + Array(Gitlab.config.gitlab.trusted_proxies)
+).map { |proxy| IPAddr.new(proxy) }

From c4b9bd041321df25764ad1de90f89b1f0dda9f33 Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Fri, 22 Apr 2016 14:07:25 +0200
Subject: [PATCH 0073/1431] API support for the 'since' and 'until' operators
 on commit requests

- Parameter validation as ISO8601 format
---
 CHANGELOG                                     |  1 +
 Gemfile.lock                                  |  2 +-
 .../projects/commits_controller.rb            |  2 +-
 app/controllers/projects/graphs_controller.rb |  4 +--
 app/models/repository.rb                      |  6 ++--
 doc/api/commits.md                            |  2 ++
 lib/api/commits.rb                            |  8 ++++-
 lib/api/helpers.rb                            | 16 +++++++++
 lib/gitlab/push_data_builder.rb               |  2 +-
 spec/models/repository_spec.rb                |  2 +-
 spec/requests/api/commits_spec.rb             | 35 +++++++++++++++++++
 11 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e52e52691c2..c9215954378 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.8.0 (unreleased)
   - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
+  - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
 
 v 8.7.1 (unreleased)
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848
diff --git a/Gemfile.lock b/Gemfile.lock
index 91d89b4875a..02ccbdd8fc3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -351,7 +351,7 @@ GEM
       posix-spawn (~> 0.3)
     gitlab_emoji (0.3.1)
       gemojione (~> 2.2, >= 2.2.1)
-    gitlab_git (10.0.0)
+    gitlab_git (10.0.2)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index 1420b96840c..a52c614b259 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -15,7 +15,7 @@ class Projects::CommitsController < Projects::ApplicationController
       if search.present?
         @repository.find_commits_by_message(search, @ref, @path, @limit, @offset).compact
       else
-        @repository.commits(@ref, @path, @limit, @offset)
+        @repository.commits(@ref, path: @path, limit: @limit, offset: @offset)
       end
 
     @note_counts = project.notes.where(commit_id: @commits.map(&:id)).
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
index d13ea9f34b6..092ef32e6e3 100644
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
@@ -17,7 +17,7 @@ class Projects::GraphsController < Projects::ApplicationController
   end
 
   def commits
-    @commits = @project.repository.commits(@ref, nil, 2000, 0, true)
+    @commits = @project.repository.commits(@ref, limit: 2000, skip_merges: true)
     @commits_graph = Gitlab::Graphs::Commits.new(@commits)
     @commits_per_week_days = @commits_graph.commits_per_week_days
     @commits_per_time = @commits_graph.commits_per_time
@@ -55,7 +55,7 @@ class Projects::GraphsController < Projects::ApplicationController
   private
 
   def fetch_graph
-    @commits = @project.repository.commits(@ref, nil, 6000, 0, true)
+    @commits = @project.repository.commits(@ref, limit: 6000, skip_merges: true)
     @log = []
 
     @commits.each do |commit|
diff --git a/app/models/repository.rb b/app/models/repository.rb
index d495c8d18f5..292acf9044f 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -87,13 +87,15 @@ class Repository
     nil
   end
 
-  def commits(ref, path = nil, limit = nil, offset = nil, skip_merges = false)
+  def commits(ref, path: nil, limit: nil, offset: nil, skip_merges: false, after: nil, before: nil)
     options = {
       repo: raw_repository,
       ref: ref,
       path: path,
       limit: limit,
       offset: offset,
+      after: after,
+      before: before,
       # --follow doesn't play well with --skip. See:
       # https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520
       follow: false,
@@ -575,7 +577,7 @@ class Repository
   end
 
   def contributors
-    commits = self.commits(nil, nil, 2000, 0, true)
+    commits = self.commits(nil, limit: 2000, offset: 0, skip_merges: true)
 
     commits.group_by(&:author_email).map do |email, commits|
       contributor = Gitlab::Contributor.new
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 6341440c58b..57c2e1d9b87 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -12,6 +12,8 @@ GET /projects/:id/repository/commits
 | --------- | ---- | -------- | ----------- |
 | `id` | integer | yes | The ID of a project |
 | `ref_name` | string | no | The name of a repository branch or tag or if not given the default branch |
+| `since` | string | no | Only commits after or in this date will be returned in ISO 8601 format YYYY-MM-DDTHH:MM:SSZ |
+| `until` | string | no | Only commits before or in this date will be returned in ISO 8601 format YYYY-MM-DDTHH:MM:SSZ |
 
 ```bash
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/repository/commits"
diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 4544a41b1e3..93a3a5ce089 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -12,14 +12,20 @@ module API
       # Parameters:
       #   id (required) - The ID of a project
       #   ref_name (optional) - The name of a repository branch or tag, if not given the default branch is used
+      #   since (optional) - Only commits after or in this date will be returned
+      #   until (optional) - Only commits before or in this date will be returned
       # Example Request:
       #   GET /projects/:id/repository/commits
       get ":id/repository/commits" do
+        datetime_attributes! :since, :until
+
         page = (params[:page] || 0).to_i
         per_page = (params[:per_page] || 20).to_i
         ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
+        after = params[:since]
+        before = params[:until]
 
-        commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
+        commits = user_project.repository.commits(ref, limit: per_page, offset: page * per_page, after: after, before: before)
         present commits, with: Entities::RepoCommit
       end
 
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 5bbf721321d..40c967453fb 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -183,6 +183,22 @@ module API
       Gitlab::Access.options_with_owner.values.include? level.to_i
     end
 
+    # Checks the occurrences of datetime attributes, each attribute if present in the params hash must be in ISO 8601
+    # format (YYYY-MM-DDTHH:MM:SSZ) or a Bad Request error is invoked.
+    #
+    # Parameters:
+    #   keys (required) - An array consisting of elements that must be parseable as dates from the params hash
+    def datetime_attributes!(*keys)
+      keys.each do |key|
+        begin
+          params[key] = Time.xmlschema(params[key]) if params[key].present?
+        rescue ArgumentError
+          message = "\"" + key.to_s + "\" must be a timestamp in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ"
+          render_api_error!(message, 400)
+        end
+      end
+    end
+
     def issuable_order_by
       if params["order_by"] == 'updated_at'
         'updated_at'
diff --git a/lib/gitlab/push_data_builder.rb b/lib/gitlab/push_data_builder.rb
index 67622f321a6..c8f12577112 100644
--- a/lib/gitlab/push_data_builder.rb
+++ b/lib/gitlab/push_data_builder.rb
@@ -66,7 +66,7 @@ module Gitlab
       # This method provide a sample data generated with
       # existing project and commits to test webhooks
       def build_sample(project, user)
-        commits = project.repository.commits(project.default_branch, nil, 3)
+        commits = project.repository.commits(project.default_branch, limit: 3)
         ref = "#{Gitlab::Git::BRANCH_REF_PREFIX}#{project.default_branch}"
         build(project, user, commits.last.id, commits.first.id, ref, commits)
       end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index a306cc4aef8..802b4e579e1 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -561,7 +561,7 @@ describe Repository, models: true do
   end
 
   describe :skip_merged_commit do
-    subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", nil, 100, 0, true).map{ |k| k.id } }
+    subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", limit: 100, skip_merges: true).map{ |k| k.id } }
 
     it { is_expected.not_to include('e56497bb5f03a90a51293fc6d516788730953899') }
   end
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index e28998d51b5..cb82ca7802d 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -32,6 +32,41 @@ describe API::API, api: true  do
         expect(response.status).to eq(401)
       end
     end
+
+    context "since optional parameter" do
+      it "should return project commits since provided parameter" do
+        commits = project.repository.commits("master")
+        since = commits.second.created_at
+
+        get api("/projects/#{project.id}/repository/commits?since=#{since.utc.iso8601}", user)
+
+        expect(json_response.size).to eq 2
+        expect(json_response.first["id"]).to eq(commits.first.id)
+        expect(json_response.second["id"]).to eq(commits.second.id)
+      end
+    end
+
+    context "until optional parameter" do
+      it "should return project commits until provided parameter" do
+        commits = project.repository.commits("master")
+        before = commits.second.created_at
+
+        get api("/projects/#{project.id}/repository/commits?until=#{before.utc.iso8601}", user)
+
+        expect(json_response.size).to eq(commits.size - 1)
+        expect(json_response.first["id"]).to eq(commits.second.id)
+        expect(json_response.second["id"]).to eq(commits.third.id)
+      end
+    end
+
+    context "invalid xmlschema date parameters" do
+      it "should return an invalid parameter error message" do
+        get api("/projects/#{project.id}/repository/commits?since=invalid-date", user)
+
+        expect(response.status).to eq(400)
+        expect(json_response['message']).to include "\"since\" must be a timestamp in ISO 8601 format"
+      end
+    end
   end
 
   describe "GET /projects:id/repository/commits/:sha" do

From f41a3e24d20b26b53c5321571ef89f441c32aa4d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 18 Apr 2016 08:13:16 -0400
Subject: [PATCH 0074/1431] Added authentication service for docker registry

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   1 +
 app/models/ability.rb                         |   8 +-
 app/models/ci/build.rb                        |   1 +
 app/models/project.rb                         |   5 +
 config/initializers/1_settings.rb             |  39 ++++
 ...07120251_add_images_enabled_for_project.rb |   5 +
 db/schema.rb                                  |   1 +
 lib/api/api.rb                                |   1 +
 lib/api/auth.rb                               | 166 ++++++++++++++++++
 10 files changed, 226 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20160407120251_add_images_enabled_for_project.rb
 create mode 100644 lib/api/auth.rb

diff --git a/Gemfile b/Gemfile
index 7882e467f8d..512c6babd7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
 gem 'rack-oauth2',            '~> 1.2.1'
+gem 'jwt'
 
 # Spam and anti-bot protection
 gem 'recaptcha', require: 'recaptcha/rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1dcda0daff6..2b578429b3c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -957,6 +957,7 @@ DEPENDENCIES
   jquery-scrollto-rails (~> 1.4.3)
   jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
+  jwt
   kaminari (~> 0.16.3)
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 6103a2947e2..ba27b9a9b14 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -203,6 +203,7 @@ class Ability
         :admin_label,
         :read_commit_status,
         :read_build,
+        :read_image,
       ]
     end
 
@@ -216,7 +217,9 @@ class Ability
         :update_build,
         :create_merge_request,
         :create_wiki,
-        :push_code
+        :push_code,
+        :create_image,
+        :update_image,
       ]
     end
 
@@ -242,7 +245,8 @@ class Ability
         :admin_wiki,
         :admin_project,
         :admin_commit_status,
-        :admin_build
+        :admin_build,
+        :admin_image
       ]
     end
 
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 553cd447971..c2ddee527e5 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -426,6 +426,7 @@ module Ci
       variables << { key: :CI_BUILD_NAME, value: name, public: true }
       variables << { key: :CI_BUILD_STAGE, value: stage, public: true }
       variables << { key: :CI_BUILD_TRIGGERED, value: 'true', public: true } if trigger_request
+      variables << { key: :CI_DOCKER_REGISTRY, value: project.registry_repository_url, public: true } if project.registry_repository_url
       variables
     end
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index 5c6c36e6b31..76265a59ea7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -64,6 +64,7 @@ class Project < ActiveRecord::Base
   default_value_for :wiki_enabled, gitlab_config_features.wiki
   default_value_for :wall_enabled, false
   default_value_for :snippets_enabled, gitlab_config_features.snippets
+  default_value_for :images_enabled, gitlab_config_features.images
   default_value_for(:shared_runners_enabled) { current_application_settings.shared_runners_enabled }
 
   # set last_activity_at to the same as created_at
@@ -369,6 +370,10 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
+  def registry_repository_url
+    "#{Gitlab.config.registry.host_with_port}/#{path_with_namespace}" if images_enabled? && Gitlab.config.registry.enabled
+  end
+
   def commit(id = 'HEAD')
     repository.commit(id)
   end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8db2c05fe45..01ee8a0d525 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -27,6 +27,30 @@ class Settings < Settingslogic
       ].join('')
     end
 
+    def build_registry_api_url
+      if registry.port.to_i == (registry.https ? 443 : 80)
+        custom_port = nil
+      else
+        custom_port = ":#{registry.port}"
+      end
+      [ registry.protocol,
+        "://",
+        registry.internal_host,
+        custom_port
+      ].join('')
+    end
+
+    def build_registry_host_with_port
+      if registry.port.to_i == (registry.https ? 443 : 80)
+        custom_port = nil
+      else
+        custom_port = ":#{registry.port}"
+      end
+      [ registry.host,
+        custom_port
+      ].join('')
+    end
+
     def build_gitlab_shell_ssh_path_prefix
       user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}"
 
@@ -211,6 +235,7 @@ Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.g
 Settings.gitlab.default_projects_features['wiki']           = true if Settings.gitlab.default_projects_features['wiki'].nil?
 Settings.gitlab.default_projects_features['snippets']       = false if Settings.gitlab.default_projects_features['snippets'].nil?
 Settings.gitlab.default_projects_features['builds']         = true if Settings.gitlab.default_projects_features['builds'].nil?
+Settings.gitlab.default_projects_features['images']         = true if Settings.gitlab.default_projects_features['images'].nil?
 Settings.gitlab.default_projects_features['visibility_level']    = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
 Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') if Settings.gitlab['repository_downloads_path'].nil?
 Settings.gitlab['restricted_signup_domains'] ||= []
@@ -242,6 +267,20 @@ Settings.artifacts['enabled']      = true if Settings.artifacts['enabled'].nil?
 Settings.artifacts['path']         = File.expand_path(Settings.artifacts['path'] || File.join(Settings.shared['path'], "artifacts"), Rails.root)
 Settings.artifacts['max_size']    ||= 100 # in megabytes
 
+#
+# Registry
+#
+Settings['registry'] ||= Settingslogic.new({})
+Settings.registry['registry']     = false if Settings.registry['enabled'].nil?
+Settings.registry['path']         = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], "registry"), Rails.root)
+Settings.registry['host']         ||= "example.com"
+Settings.registry['internal_host']||= "localhost"
+Settings.registry['https']        = false if Settings.registry['https'].nil?
+Settings.registry['port']         ||= Settings.registry.https ? 443 : 80
+Settings.registry['protocol']     ||= Settings.registry.https ? "https" : "http"
+Settings.registry['api_url']      ||= Settings.send(:build_registry_api_url)
+Settings.registry['host_port']    ||= Settings.send(:build_registry_host_with_port)
+
 #
 # Git LFS
 #
diff --git a/db/migrate/20160407120251_add_images_enabled_for_project.rb b/db/migrate/20160407120251_add_images_enabled_for_project.rb
new file mode 100644
index 00000000000..6a221a7fb03
--- /dev/null
+++ b/db/migrate/20160407120251_add_images_enabled_for_project.rb
@@ -0,0 +1,5 @@
+class AddImagesEnabledForProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :images_enabled, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 42457d92353..bf46028d23f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -760,6 +760,7 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     t.integer  "pushes_since_gc",              default: 0
     t.boolean  "last_repository_check_failed"
     t.datetime "last_repository_check_at"
+    t.boolean  "images_enabled"
   end
 
   add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
diff --git a/lib/api/api.rb b/lib/api/api.rb
index cc1004f8005..6ddfe11d98e 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -58,5 +58,6 @@ module API
     mount Variables
     mount Runners
     mount Licenses
+    mount Auth
   end
 end
diff --git a/lib/api/auth.rb b/lib/api/auth.rb
new file mode 100644
index 00000000000..b992e497307
--- /dev/null
+++ b/lib/api/auth.rb
@@ -0,0 +1,166 @@
+module API
+  # Projects builds API
+  class Auth < Grape::API
+    namespace 'auth' do
+      get 'token' do
+        required_attributes! [:scope, :service]
+        keys = attributes_for_keys [:scope, :service]
+
+        case keys[:service]
+        when 'docker'
+          docker_token_auth(keys[:scope])
+        else
+          not_found!
+        end
+      end
+    end
+
+    helpers do
+      def docker_token_auth(scope)
+        @type, @path, actions = scope.split(':', 3)
+        bad_request!("invalid type: #{type}") unless type == 'repository'
+
+        @actions = actions.split(',')
+        bad_request!('missing actions') if @actions.empty?
+
+        @project = Project.find_with_namespace(path)
+        not_found!('Project') unless @project
+
+        auth!
+
+        authorize_actions!(@actions)
+
+        { token: encode(docker_payload) }
+      end
+
+      def auth!
+        auth = BasicRequest.new(request.env)
+        return unless auth.provided?
+
+        return bad_request unless auth.basic?
+
+        # Authentication with username and password
+        login, password = auth.credentials
+
+        if ci_request?(login, password)
+          @ci = true
+          return
+        end
+
+        @user = authenticate_user(login, password)
+
+        if @user
+          request.env['REMOTE_USER'] = @auth.username
+        end
+      end
+
+      def ci_request?(login, password)
+        matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
+
+        if @project && matched_login.present?
+          underscored_service = matched_login['s'].underscore
+
+          if underscored_service == 'gitlab_ci'
+            return @project.valid_build_token?(password)
+          end
+        end
+
+        false
+      end
+
+      def authenticate_user(login, password)
+        user = Gitlab::Auth.new.find(login, password)
+
+        unless user
+          user = oauth_access_token_check(login, password)
+        end
+
+        # If the user authenticated successfully, we reset the auth failure count
+        # from Rack::Attack for that IP. A client may attempt to authenticate
+        # with a username and blank password first, and only after it receives
+        # a 401 error does it present a password. Resetting the count prevents
+        # false positives from occurring.
+        #
+        # Otherwise, we let Rack::Attack know there was a failed authentication
+        # attempt from this IP. This information is stored in the Rails cache
+        # (Redis) and will be used by the Rack::Attack middleware to decide
+        # whether to block requests from this IP.
+        config = Gitlab.config.rack_attack.git_basic_auth
+
+        if config.enabled
+          if user
+            # A successful login will reset the auth failure count from this IP
+            Rack::Attack::Allow2Ban.reset(@request.ip, config)
+          else
+            banned = Rack::Attack::Allow2Ban.filter(@request.ip, config) do
+              # Unless the IP is whitelisted, return true so that Allow2Ban
+              # increments the counter (stored in Rails.cache) for the IP
+              if config.ip_whitelist.include?(@request.ip)
+                false
+              else
+                true
+              end
+            end
+
+            if banned
+              Rails.logger.info "IP #{@request.ip} failed to login " \
+              "as #{login} but has been temporarily banned from Git auth"
+            end
+          end
+        end
+
+        user
+      end
+
+      def docker_payload
+        {
+          access: [
+            type: @type,
+            name: @path,
+            actions: @actions
+          ],
+          exp: Time.now.to_i + 3600
+        }
+      end
+
+      def private_key
+        @private_key ||= OpenSSL::PKey::RSA.new File.read 'config/registry.key'
+      end
+
+      def encode(payload)
+        JWT.encode(payload, private_key, 'RS256')
+      end
+
+      def authorize_actions!(actions)
+        actions.each do |action|
+          forbidden! unless can_access?(action)
+        end
+      end
+
+      def can_access?(action)
+        case action
+        when 'pull'
+          @ci || can?(@user, :download_code, @project)
+        when 'push'
+          @ci || can?(@user, :push_code, @project)
+        else
+          false
+        end
+      end
+
+      class BasicRequest < Rack::Auth::AbstractRequest
+        def basic?
+          "basic" == scheme
+        end
+
+        def credentials
+          @credentials ||= params.unpack("m*").first.split(/:/, 2)
+        end
+
+        def username
+          credentials.first
+        end
+      end
+    end
+  end
+end

From 03b3fe13f6af67f8117cf4322b605630f55f3136 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 18 Apr 2016 08:23:17 -0400
Subject: [PATCH 0075/1431] Make images_enabled configurable

---
 app/controllers/projects_controller.rb |  3 ++-
 app/views/projects/edit.html.haml      | 10 ++++++++++
 lib/api/entities.rb                    |  3 ++-
 lib/api/projects.rb                    |  5 +++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3768efe142a..52f7b993343 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -235,7 +235,8 @@ class ProjectsController < Projects::ApplicationController
   def project_params
     params.require(:project).permit(
       :name, :path, :description, :issues_tracker, :tag_list, :runners_token,
-      :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
+      :issues_enabled, :merge_requests_enabled, :snippets_enabled, :images_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,
       :public_builds,
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 76a4f41193c..5c7960031e0 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -84,6 +84,16 @@
                     %br
                     %span.descr Share code pastes with others out of git repository
 
+            - if Gitlab.config.registry.enabled
+              .form-group
+                .col-sm-offset-2.col-sm-10
+                  .checkbox
+                    = f.label :images_enabled do
+                      = f.check_box :images_enabled
+                      %strong Images
+                      %br
+                      %span.descr Use Docker Registry for this repository
+
           = render 'builds_settings', f: f
 
           %fieldset.features
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 716ca6f7ed9..95c3597b03c 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -66,7 +66,8 @@ module API
       expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group }
       expose :name, :name_with_namespace
       expose :path, :path_with_namespace
-      expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :builds_enabled, :snippets_enabled, :created_at, :last_activity_at
+      expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :builds_enabled, :snippets_enabled, :images_enabled
+      expose :created_at, :last_activity_at
       expose :shared_runners_enabled
       expose :creator_id
       expose :namespace
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index cc2c7a0c503..6f85bc4b1b9 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -94,6 +94,7 @@ module API
       #   builds_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
+      #   images_enabled (optional)
       #   shared_runners_enabled (optional)
       #   namespace_id (optional) - defaults to user namespace
       #   public (optional) - if true same as setting visibility_level = 20
@@ -112,6 +113,7 @@ module API
                                      :builds_enabled,
                                      :wiki_enabled,
                                      :snippets_enabled,
+                                     :images_enabled,
                                      :shared_runners_enabled,
                                      :namespace_id,
                                      :public,
@@ -143,6 +145,7 @@ module API
       #   builds_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
+      #   images_enabled (optional)
       #   shared_runners_enabled (optional)
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional)
@@ -206,6 +209,7 @@ module API
       #   builds_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
+      #   images_enabled (optional)
       #   shared_runners_enabled (optional)
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional) - visibility level of a project
@@ -222,6 +226,7 @@ module API
                                      :builds_enabled,
                                      :wiki_enabled,
                                      :snippets_enabled,
+                                     :images_enabled,
                                      :shared_runners_enabled,
                                      :public,
                                      :visibility_level,

From 0ca8db25f008cd3bc4f2df0f58efd739718323d0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 19 Apr 2016 10:55:10 -0400
Subject: [PATCH 0076/1431] Try to fix auth service

---
 lib/api/auth.rb | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/api/auth.rb b/lib/api/auth.rb
index b992e497307..ec944b1dc8c 100644
--- a/lib/api/auth.rb
+++ b/lib/api/auth.rb
@@ -3,12 +3,12 @@ module API
   class Auth < Grape::API
     namespace 'auth' do
       get 'token' do
-        required_attributes! [:scope, :service]
-        keys = attributes_for_keys [:scope, :service]
+        required_attributes! [:service]
+        keys = attributes_for_keys [:offline_token, :scope, :service]
 
         case keys[:service]
         when 'docker'
-          docker_token_auth(keys[:scope])
+          docker_token_auth(keys[:scope], keys[:offline_token])
         else
           not_found!
         end
@@ -16,19 +16,23 @@ module API
     end
 
     helpers do
-      def docker_token_auth(scope)
-        @type, @path, actions = scope.split(':', 3)
-        bad_request!("invalid type: #{type}") unless type == 'repository'
-
-        @actions = actions.split(',')
-        bad_request!('missing actions') if @actions.empty?
-
-        @project = Project.find_with_namespace(path)
-        not_found!('Project') unless @project
-
+      def docker_token_auth(scope, offline_token)
         auth!
 
-        authorize_actions!(@actions)
+        if offline_token
+          forbidden! unless @user
+        elsif scope
+          @type, @path, actions = scope.split(':', 3)
+          bad_request!("invalid type: #{@type}") unless @type == 'repository'
+
+          @actions = actions.split(',')
+          bad_request!('missing actions') if @actions.empty?
+
+          @project = Project.find_with_namespace(@path)
+          not_found!('Project') unless @project
+
+          authorize_actions!(@actions)
+        end
 
         { token: encode(docker_payload) }
       end
@@ -50,7 +54,7 @@ module API
         @user = authenticate_user(login, password)
 
         if @user
-          request.env['REMOTE_USER'] = @auth.username
+          request.env['REMOTE_USER'] = @user.username
         end
       end
 
@@ -71,10 +75,6 @@ module API
       def authenticate_user(login, password)
         user = Gitlab::Auth.new.find(login, password)
 
-        unless user
-          user = oauth_access_token_check(login, password)
-        end
-
         # If the user authenticated successfully, we reset the auth failure count
         # from Rack::Attack for that IP. A client may attempt to authenticate
         # with a username and blank password first, and only after it receives

From 72611f9cfa9014653c0894115af6223687c2eab4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 19 Apr 2016 13:57:35 -0400
Subject: [PATCH 0077/1431] Auth token

---
 config/gitlab.yml.example         | 10 ++++++++++
 config/initializers/1_settings.rb |  1 +
 lib/api/auth.rb                   |  3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 07ce4b6d715..e55ca6f9c6b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -176,6 +176,16 @@ production: &base
     repository_archive_cache_worker:
       cron: "0 * * * *"
 
+  registry:
+    # enabled: true
+    # host: localhost
+    # port: 5000
+    # https: false
+    # internal_host: localhost
+    # key: config/registry.key
+    # issuer: omnibus-certificate
+    # path: shared/registry
+
   #
   # 2. GitLab CI settings
   # ==========================
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 01ee8a0d525..b94f3f2f901 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -275,6 +275,7 @@ Settings.registry['registry']     = false if Settings.registry['enabled'].nil?
 Settings.registry['path']         = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], "registry"), Rails.root)
 Settings.registry['host']         ||= "example.com"
 Settings.registry['internal_host']||= "localhost"
+Settings.registry['key']          ||= nil
 Settings.registry['https']        = false if Settings.registry['https'].nil?
 Settings.registry['port']         ||= Settings.registry.https ? 443 : 80
 Settings.registry['protocol']     ||= Settings.registry.https ? "https" : "http"
diff --git a/lib/api/auth.rb b/lib/api/auth.rb
index ec944b1dc8c..d769c692754 100644
--- a/lib/api/auth.rb
+++ b/lib/api/auth.rb
@@ -119,12 +119,13 @@ module API
             name: @path,
             actions: @actions
           ],
+          iss: Gitlab.config.registry.issuer,
           exp: Time.now.to_i + 3600
         }
       end
 
       def private_key
-        @private_key ||= OpenSSL::PKey::RSA.new File.read 'config/registry.key'
+        @private_key ||= OpenSSL::PKey::RSA.new File.read Gitlab.config.registry.key
       end
 
       def encode(payload)

From 8aac802eaf417a4f484f099089410934cdfdb0b7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 19 Apr 2016 14:16:17 -0400
Subject: [PATCH 0078/1431] Audience

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

diff --git a/lib/api/auth.rb b/lib/api/auth.rb
index d769c692754..e4ce9bf122d 100644
--- a/lib/api/auth.rb
+++ b/lib/api/auth.rb
@@ -120,6 +120,7 @@ module API
             actions: @actions
           ],
           iss: Gitlab.config.registry.issuer,
+          aud: "docker",
           exp: Time.now.to_i + 3600
         }
       end

From 5fc310b440a7bb3ead91760ac2b7cbb1cee72f2a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 21 Apr 2016 10:02:24 +0200
Subject: [PATCH 0079/1431] Missing parameters of docker payload

---
 lib/api/auth.rb | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/api/auth.rb b/lib/api/auth.rb
index e4ce9bf122d..dab04bca818 100644
--- a/lib/api/auth.rb
+++ b/lib/api/auth.rb
@@ -113,6 +113,7 @@ module API
       end
 
       def docker_payload
+        issued_at = Time.now
         {
           access: [
             type: @type,
@@ -121,8 +122,14 @@ module API
           ],
           iss: Gitlab.config.registry.issuer,
           aud: "docker",
+          sub: @user.try(:username),
+          aud: @service,
+          iat: issued_at,
+          nbf: issued_at - 5.seconds,
+          exp: issued_at + 60.minutes,
+          jti: SecureRandom.uuid,
           exp: Time.now.to_i + 3600
-        }
+        }.compact
       end
 
       def private_key
@@ -130,7 +137,10 @@ module API
       end
 
       def encode(payload)
-        JWT.encode(payload, private_key, 'RS256')
+        headers = {
+          kid: kid(private_key)
+        }
+        JWT.encode(payload, private_key, 'RS256', headers)
       end
 
       def authorize_actions!(actions)
@@ -150,6 +160,15 @@ module API
         end
       end
 
+      def kid(private_key)
+        sha256 = Digest::SHA256.new
+        sha256.update(private_key.public_key.to_der)
+        payload = StringIO.new(sha256.digest).read(30)
+        Base32.encode(payload).split("").each_slice(4).each_with_object([]) do |slice, mem|
+          mem << slice.join
+        end.join(":")
+      end
+
       class BasicRequest < Rack::Auth::AbstractRequest
         def basic?
           "basic" == scheme

From 0a280158efeb7f681589ae7af24f0ed9052de809 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Fri, 15 Apr 2016 19:23:33 +0530
Subject: [PATCH 0080/1431] Eager load `lib/api`

- So that the server doesn't have to be restarted for every change in dev.
---
 config/application.rb |   2 +
 config/routes.rb      |   1 -
 lib/api/api.rb        |   4 +-
 lib/api/api_guard.rb  | 316 +++++++++++++++++++++---------------------
 lib/ci/api/api.rb     |   2 +-
 5 files changed, 163 insertions(+), 162 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 2e2ed48db07..abe22691ad1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -79,6 +79,8 @@ module Gitlab
     # This is needed for gitlab-shell
     ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
 
+    config.eager_load_paths += ["#{Rails.root}/lib"]
+
     config.generators do |g|
       g.factory_girl false
     end
diff --git a/config/routes.rb b/config/routes.rb
index 5ce1f49ec6a..adf4bb18b3c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,5 @@
 require 'sidekiq/web'
 require 'sidekiq/cron/web'
-require 'api/api'
 
 Rails.application.routes.draw do
   if Gitlab::Sherlock.enabled?
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 6ddfe11d98e..d41b4b71865 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -1,8 +1,6 @@
-Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
-
 module API
   class API < Grape::API
-    include APIGuard
+    include ::API::APIGuard
     version 'v3', using: :path
 
     rescue_from ActiveRecord::RecordNotFound do
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb
index b9994fcefda..6dfd6e4396b 100644
--- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb
@@ -2,171 +2,173 @@
 
 require 'rack/oauth2'
 
-module APIGuard
-  extend ActiveSupport::Concern
+module API
+  module APIGuard
+    extend ActiveSupport::Concern
 
-  included do |base|
-    # OAuth2 Resource Server Authentication
-    use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
-      # The authenticator only fetches the raw token string
+    included do |base|
+      # OAuth2 Resource Server Authentication
+      use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
+        # The authenticator only fetches the raw token string
 
-      # Must yield access token to store it in the env
-      request.access_token
-    end
-
-    helpers HelperMethods
-
-    install_error_responders(base)
-  end
-
-  # Helper Methods for Grape Endpoint
-  module HelperMethods
-    # Invokes the doorkeeper guard.
-    #
-    # If token is presented and valid, then it sets @current_user.
-    #
-    # If the token does not have sufficient scopes to cover the requred scopes,
-    # then it raises InsufficientScopeError.
-    #
-    # If the token is expired, then it raises ExpiredError.
-    #
-    # If the token is revoked, then it raises RevokedError.
-    #
-    # If the token is not found (nil), then it raises TokenNotFoundError.
-    #
-    # Arguments:
-    #
-    #   scopes: (optional) scopes required for this guard.
-    #           Defaults to empty array.
-    #
-    def doorkeeper_guard!(scopes: [])
-      if (access_token = find_access_token).nil?
-        raise TokenNotFoundError
-
-      else
-        case validate_access_token(access_token, scopes)
-        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-          raise InsufficientScopeError.new(scopes)
-        when Oauth2::AccessTokenValidationService::EXPIRED
-          raise ExpiredError
-        when Oauth2::AccessTokenValidationService::REVOKED
-          raise RevokedError
-        when Oauth2::AccessTokenValidationService::VALID
-          @current_user = User.find(access_token.resource_owner_id)
-        end
+        # Must yield access token to store it in the env
+        request.access_token
       end
+
+      helpers HelperMethods
+
+      install_error_responders(base)
     end
 
-    def doorkeeper_guard(scopes: [])
-      if access_token = find_access_token
-        case validate_access_token(access_token, scopes)
-        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-          raise InsufficientScopeError.new(scopes)
+    # Helper Methods for Grape Endpoint
+    module HelperMethods
+      # Invokes the doorkeeper guard.
+      #
+      # If token is presented and valid, then it sets @current_user.
+      #
+      # If the token does not have sufficient scopes to cover the requred scopes,
+      # then it raises InsufficientScopeError.
+      #
+      # If the token is expired, then it raises ExpiredError.
+      #
+      # If the token is revoked, then it raises RevokedError.
+      #
+      # If the token is not found (nil), then it raises TokenNotFoundError.
+      #
+      # Arguments:
+      #
+      #   scopes: (optional) scopes required for this guard.
+      #           Defaults to empty array.
+      #
+      def doorkeeper_guard!(scopes: [])
+        if (access_token = find_access_token).nil?
+          raise TokenNotFoundError
 
-        when Oauth2::AccessTokenValidationService::EXPIRED
-          raise ExpiredError
-
-        when Oauth2::AccessTokenValidationService::REVOKED
-          raise RevokedError
-
-        when Oauth2::AccessTokenValidationService::VALID
-          @current_user = User.find(access_token.resource_owner_id)
-        end
-      end
-    end
-
-    def current_user
-      @current_user
-    end
-
-    private
-    def find_access_token
-      @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
-    end
-
-    def doorkeeper_request
-      @doorkeeper_request ||= ActionDispatch::Request.new(env)
-    end
-
-    def validate_access_token(access_token, scopes)
-      Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
-    end
-  end
-
-  module ClassMethods
-    # Installs the doorkeeper guard on the whole Grape API endpoint.
-    #
-    # Arguments:
-    #
-    #   scopes: (optional) scopes required for this guard.
-    #           Defaults to empty array.
-    #
-    def guard_all!(scopes: [])
-      before do
-        guard! scopes: scopes
-      end
-    end
-
-    private
-    def install_error_responders(base)
-      error_classes = [ MissingTokenError, TokenNotFoundError,
-                        ExpiredError, RevokedError, InsufficientScopeError]
-
-      base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
-    end
-
-    def oauth2_bearer_token_error_handler
-      Proc.new do |e|
-        response =
-          case e
-          when MissingTokenError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
-
-          when TokenNotFoundError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-              :invalid_token,
-              "Bad Access Token.")
-
-          when ExpiredError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-              :invalid_token,
-              "Token is expired. You can either do re-authorization or token refresh.")
-
-          when RevokedError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-              :invalid_token,
-              "Token was revoked. You have to re-authorize from the user.")
-
-          when InsufficientScopeError
-            # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
-            # does not include WWW-Authenticate header, which breaks the standard.
-            Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
-              :insufficient_scope,
-              Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
-              { scope: e.scopes })
+        else
+          case validate_access_token(access_token, scopes)
+            when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+              raise InsufficientScopeError.new(scopes)
+            when Oauth2::AccessTokenValidationService::EXPIRED
+              raise ExpiredError
+            when Oauth2::AccessTokenValidationService::REVOKED
+              raise RevokedError
+            when Oauth2::AccessTokenValidationService::VALID
+              @current_user = User.find(access_token.resource_owner_id)
           end
+        end
+      end
 
-        response.finish
+      def doorkeeper_guard(scopes: [])
+        if access_token = find_access_token
+          case validate_access_token(access_token, scopes)
+            when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+              raise InsufficientScopeError.new(scopes)
+
+            when Oauth2::AccessTokenValidationService::EXPIRED
+              raise ExpiredError
+
+            when Oauth2::AccessTokenValidationService::REVOKED
+              raise RevokedError
+
+            when Oauth2::AccessTokenValidationService::VALID
+              @current_user = User.find(access_token.resource_owner_id)
+          end
+        end
+      end
+
+      def current_user
+        @current_user
+      end
+
+      private
+      def find_access_token
+        @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
+      end
+
+      def doorkeeper_request
+        @doorkeeper_request ||= ActionDispatch::Request.new(env)
+      end
+
+      def validate_access_token(access_token, scopes)
+        Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
+      end
+    end
+
+    module ClassMethods
+      # Installs the doorkeeper guard on the whole Grape API endpoint.
+      #
+      # Arguments:
+      #
+      #   scopes: (optional) scopes required for this guard.
+      #           Defaults to empty array.
+      #
+      def guard_all!(scopes: [])
+        before do
+          guard! scopes: scopes
+        end
+      end
+
+      private
+      def install_error_responders(base)
+        error_classes = [ MissingTokenError, TokenNotFoundError,
+                          ExpiredError, RevokedError, InsufficientScopeError]
+
+        base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
+      end
+
+      def oauth2_bearer_token_error_handler
+        Proc.new do |e|
+          response =
+              case e
+                when MissingTokenError
+                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
+
+                when TokenNotFoundError
+                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+                      :invalid_token,
+                      "Bad Access Token.")
+
+                when ExpiredError
+                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+                      :invalid_token,
+                      "Token is expired. You can either do re-authorization or token refresh.")
+
+                when RevokedError
+                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+                      :invalid_token,
+                      "Token was revoked. You have to re-authorize from the user.")
+
+                when InsufficientScopeError
+                  # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
+                  # does not include WWW-Authenticate header, which breaks the standard.
+                  Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
+                      :insufficient_scope,
+                      Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
+                      { scope: e.scopes })
+              end
+
+          response.finish
+        end
+      end
+    end
+
+    #
+    # Exceptions
+    #
+
+    class MissingTokenError < StandardError; end
+
+    class TokenNotFoundError < StandardError; end
+
+    class ExpiredError < StandardError; end
+
+    class RevokedError < StandardError; end
+
+    class InsufficientScopeError < StandardError
+      attr_reader :scopes
+      def initialize(scopes)
+        @scopes = scopes
       end
     end
   end
-
-  #
-  # Exceptions
-  #
-
-  class MissingTokenError < StandardError; end
-
-  class TokenNotFoundError < StandardError; end
-
-  class ExpiredError < StandardError; end
-
-  class RevokedError < StandardError; end
-
-  class InsufficientScopeError < StandardError
-    attr_reader :scopes
-    def initialize(scopes)
-      @scopes = scopes
-    end
-  end
-end
+end
\ No newline at end of file
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index 353c4ddebf8..7cd8b6fbae2 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -3,7 +3,7 @@ Dir["#{Rails.root}/lib/ci/api/*.rb"].each {|file| require file}
 module Ci
   module API
     class API < Grape::API
-      include APIGuard
+      include ::API::APIGuard
       version 'v1', using: :path
 
       rescue_from ActiveRecord::RecordNotFound do

From 9ef50db6279d722caed1ab1e4576275428e6a94f Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 29 Apr 2016 18:56:53 +0200
Subject: [PATCH 0081/1431] Specify that oauth cannot push code

---
 spec/requests/git_http_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 20c7357cba5..14d126480a3 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -179,6 +179,25 @@ describe 'Git HTTP requests', lib: true do
               end
             end
 
+            context "when an oauth token is provided" do
+              before do
+                application = Doorkeeper::Application.create!(name: "MyApp", redirect_uri: "https://app.com", owner: user)
+                @token = Doorkeeper::AccessToken.create!(application_id: application.id, resource_owner_id: user.id)
+              end
+
+              it "downloads get status 200" do
+                clone_get "#{project.path_with_namespace}.git", user: 'oauth2', password: @token.token
+
+                expect(response.status).to eq(200)
+              end
+
+              it "uploads get status 401 (no project existence information leak)" do
+                push_get "#{project.path_with_namespace}.git", user: 'oauth2', password: @token.token
+
+                expect(response.status).to eq(401)
+              end
+            end
+
             context "when blank password attempts follow a valid login" do
               def attempt_login(include_password)
                 password = include_password ? user.password : ""

From b1ffc9f0fee16251899e5a2efbc78c4781ef4902 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 29 Apr 2016 18:58:55 +0200
Subject: [PATCH 0082/1431] Make CI/Oauth/rate limiting reusable

---
 .../projects/git_http_controller.rb           |  78 ++-----------
 config/initializers/doorkeeper.rb             |   2 +-
 lib/api/session.rb                            |   8 +-
 lib/gitlab/auth.rb                            | 103 ++++++++++++++++--
 lib/gitlab/backend/grack_auth.rb              |   2 +-
 spec/lib/gitlab/auth_spec.rb                  |  56 ++++++++--
 6 files changed, 156 insertions(+), 93 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index fafd9e445b5..16a85d6f62b 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -41,11 +41,15 @@ class Projects::GitHttpController < Projects::ApplicationController
     return if project && project.public? && upload_pack?
 
     authenticate_or_request_with_http_basic do |login, password|
-      return @ci = true if valid_ci_request?(login, password)
+      user, type = Gitlab::Auth.find(login, password, project: project, ip: request.ip)
 
-      @user = Gitlab::Auth.new.find(login, password)
-      @user ||= oauth_access_token_check(login, password)
-      rate_limit_ip!(login, @user)
+      if (type == :ci) && upload_pack?
+        @ci = true
+      elsif (type == :oauth) && !upload_pack?
+        @user = nil
+      else
+        @user = user
+      end
     end
   end
 
@@ -53,72 +57,6 @@ class Projects::GitHttpController < Projects::ApplicationController
     render_not_found if project.blank?
   end
 
-  def valid_ci_request?(login, password)
-    matched_login = /(?<service>^[a-zA-Z]*-ci)-token$/.match(login)
-
-    unless project && matched_login.present? && upload_pack?
-      return false
-    end
-
-    underscored_service = matched_login['service'].underscore
-
-    if underscored_service == 'gitlab_ci'
-      project && project.valid_build_token?(password)
-    elsif Service.available_services_names.include?(underscored_service)
-      # We treat underscored_service as a trusted input because it is included
-      # in the Service.available_services_names whitelist.
-      service_method = "#{underscored_service}_service"
-      service = project.send(service_method)
-
-      service && service.activated? && service.valid_token?(password)
-    end
-  end
-
-  def oauth_access_token_check(login, password)
-    if login == "oauth2" && upload_pack? && password.present?
-      token = Doorkeeper::AccessToken.by_token(password)
-      token && token.accessible? && User.find_by(id: token.resource_owner_id)
-    end
-  end
-
-  def rate_limit_ip!(login, user)
-    # If the user authenticated successfully, we reset the auth failure count
-    # from Rack::Attack for that IP. A client may attempt to authenticate
-    # with a username and blank password first, and only after it receives
-    # a 401 error does it present a password. Resetting the count prevents
-    # false positives from occurring.
-    #
-    # Otherwise, we let Rack::Attack know there was a failed authentication
-    # attempt from this IP. This information is stored in the Rails cache
-    # (Redis) and will be used by the Rack::Attack middleware to decide
-    # whether to block requests from this IP.
-
-    config = Gitlab.config.rack_attack.git_basic_auth
-    return user unless config.enabled
-
-    if user
-      # A successful login will reset the auth failure count from this IP
-      Rack::Attack::Allow2Ban.reset(request.ip, config)
-    else
-      banned = Rack::Attack::Allow2Ban.filter(request.ip, config) do
-        # Unless the IP is whitelisted, return true so that Allow2Ban
-        # increments the counter (stored in Rails.cache) for the IP
-        if config.ip_whitelist.include?(request.ip)
-          false
-        else
-          true
-        end
-      end
-
-      if banned
-        Rails.logger.info "IP #{request.ip} failed to login " \
-          "as #{login} but has been temporarily banned from Git auth"
-      end
-    end
-
-    user
-  end
-
   def project
     return @project if defined?(@project)
 
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 66ac88e9f4a..0c694e0d37a 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -12,7 +12,7 @@ Doorkeeper.configure do
   end
 
   resource_owner_from_credentials do |routes|
-    Gitlab::Auth.new.find(params[:username], params[:password])
+    Gitlab::Auth.find_by_master_or_ldap(params[:username], params[:password])
   end
 
   # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
diff --git a/lib/api/session.rb b/lib/api/session.rb
index cc646895914..e308ccc3004 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,8 +11,12 @@ module API
     # Example Request:
     #  POST /session
     post "/session" do
-      auth = Gitlab::Auth.new
-      user = auth.find(params[:email] || params[:login], params[:password])
+      user, _ = Gitlab::Auth.find(
+        params[:email] || params[:login],
+        params[:password],
+        project: nil,
+        ip: request.ip
+      )
 
       return unauthorized! unless user
       present user, with: Entities::UserLogin
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 30509528b8b..32e903905ad 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -1,17 +1,100 @@
 module Gitlab
   class Auth
-    def find(login, password)
-      user = User.by_login(login)
+    class << self
+      def find(login, password, project:, ip:)
+        raise "Must provide an IP for rate limiting" if ip.nil?
 
-      # If no user is found, or it's an LDAP server, try LDAP.
-      #   LDAP users are only authenticated via LDAP
-      if user.nil? || user.ldap_user?
-        # Second chance - try LDAP authentication
-        return nil unless Gitlab::LDAP::Config.enabled?
+        user, type = nil, nil
 
-        Gitlab::LDAP::Authentication.login(login, password)
-      else
-        user if user.valid_password?(password)
+        if valid_ci_request?(login, password, project)
+          type = :ci
+        elsif user = find_by_master_or_ldap(login, password)
+          type = :master_or_ldap
+        elsif user = oauth_access_token_check(login, password)
+          type = :oauth
+        end
+
+        rate_limit!(ip, success: !!user || (type == :ci), login: login)
+        [user, type]
+      end
+
+      def find_by_master_or_ldap(login, password)
+        user = User.by_login(login)
+
+        # If no user is found, or it's an LDAP server, try LDAP.
+        #   LDAP users are only authenticated via LDAP
+        if user.nil? || user.ldap_user?
+          # Second chance - try LDAP authentication
+          return nil unless Gitlab::LDAP::Config.enabled?
+
+          Gitlab::LDAP::Authentication.login(login, password)
+        else
+          user if user.valid_password?(password)
+        end
+      end
+
+      private
+
+      def valid_ci_request?(login, password, project)
+        matched_login = /(?<service>^[a-zA-Z]*-ci)-token$/.match(login)
+
+        return false unless project && matched_login.present?
+
+        underscored_service = matched_login['service'].underscore
+
+        if underscored_service == 'gitlab_ci'
+          project && project.valid_build_token?(password)
+        elsif Service.available_services_names.include?(underscored_service)
+          # We treat underscored_service as a trusted input because it is included
+          # in the Service.available_services_names whitelist.
+          service_method = "#{underscored_service}_service"
+          service = project.send(service_method)
+
+          service && service.activated? && service.valid_token?(password)
+        end
+      end
+
+      def oauth_access_token_check(login, password)
+        if login == "oauth2" && password.present?
+          token = Doorkeeper::AccessToken.by_token(password)
+          token && token.accessible? && User.find_by(id: token.resource_owner_id)
+        end
+      end
+
+      def rate_limit!(ip, success:, login:)
+        # If the user authenticated successfully, we reset the auth failure count
+        # from Rack::Attack for that IP. A client may attempt to authenticate
+        # with a username and blank password first, and only after it receives
+        # a 401 error does it present a password. Resetting the count prevents
+        # false positives from occurring.
+        #
+        # Otherwise, we let Rack::Attack know there was a failed authentication
+        # attempt from this IP. This information is stored in the Rails cache
+        # (Redis) and will be used by the Rack::Attack middleware to decide
+        # whether to block requests from this IP.
+
+        config = Gitlab.config.rack_attack.git_basic_auth
+        return unless config.enabled
+
+        if success
+          # A successful login will reset the auth failure count from this IP
+          Rack::Attack::Allow2Ban.reset(ip, config)
+        else
+          banned = Rack::Attack::Allow2Ban.filter(ip, config) do
+            # Unless the IP is whitelisted, return true so that Allow2Ban
+            # increments the counter (stored in Rails.cache) for the IP
+            if config.ip_whitelist.include?(ip)
+              false
+            else
+              true
+            end
+          end
+
+          if banned
+            Rails.logger.info "IP #{ip} failed to login " \
+              "as #{login} but has been temporarily banned from Git auth"
+          end
+        end
       end
     end
   end
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index e2363b91265..b263a27d4d3 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -95,7 +95,7 @@ module Grack
     end
 
     def authenticate_user(login, password)
-      user = Gitlab::Auth.new.find(login, password)
+      user, _ = Gitlab::Auth.new.find_by_master_or_ldap(login, password)
 
       unless user
         user = oauth_access_token_check(login, password)
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index aad291c03cd..2c2f7ed0665 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -1,9 +1,47 @@
 require 'spec_helper'
 
 describe Gitlab::Auth, lib: true do
-  let(:gl_auth) { Gitlab::Auth.new }
+  let(:gl_auth) { described_class }
 
-  describe :find do
+  describe 'find' do
+    it 'recognizes CI' do
+      token = '123'
+      project = create(:empty_project)
+      project.update_attributes(runners_token: token, builds_enabled: true)
+      ip = 'ip'
+
+      expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: 'gitlab-ci-token')
+      expect(gl_auth.find('gitlab-ci-token', token, project: project, ip: ip)).to eq([nil, :ci])
+    end
+
+    it 'recognizes master passwords' do
+      user = create(:user, password: 'password')
+      ip = 'ip'
+
+      expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: user.username)
+      expect(gl_auth.find(user.username, 'password', project: nil, ip: ip)).to eq([user, :master_or_ldap])
+    end
+
+    it 'recognizes OAuth tokens' do
+      user = create(:user)
+      application = Doorkeeper::Application.create!(name: "MyApp", redirect_uri: "https://app.com", owner: user)
+      token = Doorkeeper::AccessToken.create!(application_id: application.id, resource_owner_id: user.id)
+      ip = 'ip'
+
+      expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: 'oauth2')
+      expect(gl_auth.find("oauth2", token.token, project: nil, ip: ip)).to eq([user, :oauth])
+    end
+
+    it 'returns double nil for invalid credentials' do
+      login = 'foo'
+      ip = 'ip'
+
+      expect(gl_auth).to receive(:rate_limit!).with(ip, success: false, login: login)
+      expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq ([nil, nil])
+    end
+  end
+
+  describe 'find_by_master_or_ldap' do
     let!(:user) do
       create(:user,
         username: username,
@@ -14,25 +52,25 @@ describe Gitlab::Auth, lib: true do
     let(:password) { 'my-secret' }
 
     it "should find user by valid login/password" do
-      expect( gl_auth.find(username, password) ).to eql user
+      expect( gl_auth.find_by_master_or_ldap(username, password) ).to eql user
     end
 
     it 'should find user by valid email/password with case-insensitive email' do
-      expect(gl_auth.find(user.email.upcase, password)).to eql user
+      expect(gl_auth.find_by_master_or_ldap(user.email.upcase, password)).to eql user
     end
 
     it 'should find user by valid username/password with case-insensitive username' do
-      expect(gl_auth.find(username.upcase, password)).to eql user
+      expect(gl_auth.find_by_master_or_ldap(username.upcase, password)).to eql user
     end
 
     it "should not find user with invalid password" do
       password = 'wrong'
-      expect( gl_auth.find(username, password) ).not_to eql user
+      expect( gl_auth.find_by_master_or_ldap(username, password) ).not_to eql user
     end
 
     it "should not find user with invalid login" do
       user = 'wrong'
-      expect( gl_auth.find(username, password) ).not_to eql user
+      expect( gl_auth.find_by_master_or_ldap(username, password) ).not_to eql user
     end
 
     context "with ldap enabled" do
@@ -43,13 +81,13 @@ describe Gitlab::Auth, lib: true do
       it "tries to autheticate with db before ldap" do
         expect(Gitlab::LDAP::Authentication).not_to receive(:login)
 
-        gl_auth.find(username, password)
+        gl_auth.find_by_master_or_ldap(username, password)
       end
 
       it "uses ldap as fallback to for authentication" do
         expect(Gitlab::LDAP::Authentication).to receive(:login)
 
-        gl_auth.find('ldap_user', 'password')
+        gl_auth.find_by_master_or_ldap('ldap_user', 'password')
       end
     end
   end

From b47a84b4be5781c91bf1072dcfa765b6782f0a35 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 28 Apr 2016 21:44:21 +0200
Subject: [PATCH 0083/1431] Added performance guidelines

Fixes gitlab-org/gitlab-ce#15254 gitlab-org/gitlab-ce#14277

[ci skip]
---
 doc/development/README.md      |   1 +
 doc/development/performance.md | 258 +++++++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)
 create mode 100644 doc/development/performance.md

diff --git a/doc/development/README.md b/doc/development/README.md
index 3f3ef068f96..aa7d54c01d0 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -8,6 +8,7 @@
 - [How to dump production data to staging](db_dump.md)
 - [Instrumentation](instrumentation.md)
 - [Migration Style Guide](migration_style_guide.md) for creating safe migrations
+- [Performance guidelines](performance.md)
 - [Rake tasks](rake_tasks.md) for development
 - [Shell commands](shell_commands.md) in the GitLab codebase
 - [Sidekiq debugging](sidekiq_debugging.md)
diff --git a/doc/development/performance.md b/doc/development/performance.md
new file mode 100644
index 00000000000..c74198650e5
--- /dev/null
+++ b/doc/development/performance.md
@@ -0,0 +1,258 @@
+# Performance Guidelines
+
+This document describes various guidelines to follow to ensure good and
+consistent performance of GitLab.
+
+## Workflow
+
+The process of solving performance problems is roughly as follows:
+
+1. Make sure there's an issue open somewhere (e.g. on the GitLab CE issue
+   tracker), create one if there isn't. See [#15607][#15607] for an example.
+2. Measure the performance of the code in a production environment such as
+   GitLab.com (see the [Tooling](#tooling) section below). Performance should be
+   measured over a period of _at least_ 24 hours.
+3. Add your findings based on the measurement period (screenshots of graphs,
+   timings, etc) to the issue mentioned in step 1.
+4. Solve the problem.
+5. Create a merge request, assign the "performance" label and ping the right
+   people (e.g. [@yorickpeterse][@yorickpeterse] and [@joshfng][@joshfng]).
+6. Once a change has been deployed make sure to _again_ measure for at least 24
+   hours to see if your changes have any impact on the production environment.
+7. Repeat until you're done.
+
+When providing timings make sure to provide:
+
+* The 95th percentile
+* The 99th percentile
+* The mean
+
+When providing screenshots of graphs make sure that both the X and Y axes and
+the legend are clearly visible. If you happen to have access to GitLab.com's own
+monitoring tools you should also provide a link to any relevant
+graphs/dashboards.
+
+## Tooling
+
+GitLab provides two built-in tools to aid the process of improving performance:
+
+* [Sherlock](doc/development/profiling.md#sherlock)
+* [GitLab Performance Monitoring](doc/monitoring/performance)
+
+GitLab employees can use GitLab.com's performance monitoring systems located at
+<http://performance.gitlab.net>, this requires you to log in using your
+`@gitlab.com` Email address. Non-GitLab employees are advised to set up their
+own InfluxDB + Grafana stack.
+
+## Benchmarks
+
+Benchmarks are almost always useless. Benchmarks usually only test small bits of
+code in isolation and often only measure the best case scenario. On top of that,
+benchmarks for libraries (e.g. a Gem) tend to be biased in favour of the
+library. After all there's little benefit to an author publishing a benchmark
+that shows they perform worse than their competitors.
+
+Benchmarks are only really useful when you need a rough (emphasis on "rough")
+understanding of the impact of your changes. For example, if a certain method is
+slow a benchmark can be used to see if the changes you're making have any impact
+on the method's performance. However, even when a benchmark shows your changes
+improve performance there's no guarantee the performance also improves in a
+production environment.
+
+When writing benchmarks you should almost always use
+[benchmark-ips](https://github.com/evanphx/benchmark-ips). Ruby's `Benchmark`
+module that comes with the standard library is rarely useful as it runs either a
+single iteration (when using `Benchmark.bm`) or two iterations (when using
+`Benchmark.bmbm`). Running this few iterations means external factors (e.g. a
+video streaming in the background) can very easily skew the benchmark
+statistics.
+
+Another problem with the `Benchmark` module is that it displays timings, not
+iterations. This means that if a piece of code completes in a very short period
+of time it can be very difficult to compare the timings before and after a
+certain change. This in turn leads to patterns such as the following:
+
+```ruby
+Benchmark.bmbm(10) do |bench|
+  bench.report 'do something' do
+    100.times do
+      ... work here ...
+    end
+  end
+end
+```
+
+This however leads to the question: how many iterations should we run to get
+meaningful statistics?
+
+The benchmark-ips Gem basically takes care of all this and much more, and as a
+result of this should be used instead of the `Benchmark` module.
+
+In short:
+
+1. Don't trust benchmarks you find on the internet.
+2. Never make claims based on just benchmarks, always measure in production to
+   confirm your findings.
+3. X being N times faster than Y is meaningless if you don't know what impact it
+   will actually have on your production environment.
+4. A production environment is the _only_ benchmark that always tells the truth
+   (unless your performance monitoring systems are not set up correctly).
+5. If you must write a benchmark use the benchmark-ips Gem instead of Ruby's
+   `Benchmark` module.
+
+## Importance of Changes
+
+When working on performance improvements it's important to always ask yourself
+the question "How important is it to improve the performance of this piece of
+code?". Not every piece of code is equally important and it would be a waste to
+spend a week trying to improve something that only impacts a tiny fraction of
+our users. For example, spending a week trying to squeeze 10 milliseconds out of
+a method is a waste of time when you could have spent a week squeezing out 10
+seconds elsewhere.
+
+There is no clear set of steps that you can follow to determine if a certain
+piece of code is worth optimizing. The only two things you can do are:
+
+1. Think about what the code does, how it's used, how many times it's called and
+   how much time is spent in it relative to the total execution time (e.g. the
+   total time spent in a web request).
+2. Ask others (preferably in the form of an issue).
+
+Some examples of changes that aren't really important/worth the effort:
+
+* Replacing double quotes with single quotes.
+* Replacing usage of Array with Set when the list of values is very small.
+* Replacing library A with library B when both only take up 0.1% of the total
+  execution time.
+* Calling `freeze` on every string (see [String Freezing](#string-freezing)).
+
+## Slow Operations & Sidekiq
+
+Slow operations (e.g. merging branches) or operations that are prone to errors
+(using external APIs) should be performed in a Sidekiq worker instead of
+directly in a web request as much as possible. This has numerous benefits such
+as:
+
+1. An error won't prevent the request from completing.
+2. The process being slow won't affect the loading time of a page.
+3. In case of a failure it's easy to re-try the process (Sidekiq takes care of
+   this automatically).
+4. By isolating the code from a web request it will hopefully be easier to test
+   and maintain.
+
+It's especially important to use Sidekiq as much as possible when dealing with
+Git operations as these operations can take quite some time to complete
+depending on the performance of the underlying storage system.
+
+## Git Operations
+
+Care should be taken to not run unnecessary Git operations. For example,
+retrieving the list of branch names using `Repository#branch_names` can be done
+without an explicit check if a repository exists or not. In other words, instead
+of this:
+
+```ruby
+if repository.exists?
+  repository.branch_names.each do |name|
+    ...
+  end
+end
+```
+
+You can instead just write:
+
+```ruby
+repository.branch_names.each do |name|
+  ...
+end
+```
+
+## Caching
+
+Operations that will often return the same result should be cached using Redis,
+in particular Git operations. When caching data in Redis make sure the cache is
+flushed whenever needed. For example, a cache for the list of tags should be
+flushed whenever a new tag is pushed or a tag is removed.
+
+When adding cache expiration code for repositories this code should be placed in
+one of the before/after hooks residing in the Repository class. For example, if
+a cache should be flushed after importing a repository this code should be added
+to `Repository#after_import`. This ensures the cache logic stays within the
+Repository class instead of leaking into other classes.
+
+When caching data make sure to also memoize the result in an instance variable.
+While retrieving data from Redis is much faster than raw Git operations it still
+has overhead. By caching the result in an instance variable repeated calls to
+the same method won't end up retrieving data from Redis upon every call. When
+memoizing cached data in an instance variable make sure to also reset the
+instance variable when flushing the cache. An example:
+
+
+```ruby
+def first_branch
+  @first_branch ||= cache.fetch(:first_branch) { branches.first }
+end
+
+def expire_first_branch_cache
+  cache.expire(:first_branch)
+  @first_branch = nil
+end
+```
+
+## Anti-Patterns
+
+This is a collection of [anti-patterns][anti-pattern] that should be avoided
+unless these changes have a measurable, significant and positive impact on
+production environments.
+
+### String Freezing
+
+In recent Ruby versions calling `freeze` on a String leads to it being allocated
+only once and re-used. For example, on Ruby 2.3 this will only allocate the
+"foo" String once:
+
+```ruby
+10.times do
+  'foo'.freeze
+end
+```
+
+Blindly adding a `.freeze` call to every String is an anti-pattern that should
+be avoided unless one can prove (using production data) the call actually has a
+positive impact on performance.
+
+This feature of Ruby wasn't really meant to make things faster directly, instead
+it was meant to reduce the number of allocations. Depending on the size of the
+String and how frequently it would be allocated (before the `.freeze` call was
+added) this _may_ make things faster, but there's no guarantee it will.
+
+Another common flavour of this is to not only freeze a String but also assign it
+to a constant, for example:
+
+```ruby
+SOME_CONSTANT = 'foo'.freeze
+
+9000.times do
+  SOME_CONSTANT
+end
+```
+
+The only reason you should be doing this is to prevent somebody from mutating
+the global String. However, since you can just re-assign constants in Ruby
+there's nothing stopping somebody from doing this elsewhere in the code:
+
+```ruby
+SOME_CONSTANT = 'bar'
+```
+
+### Moving Allocations to Constants
+
+Storing an object as a constant so you only allocate it once _may_ improve
+performance but there's no guarantee this will. Looking up constants has an
+impact on runtime performance and as such using a constant instead of
+referencing an object directly may even slow code down.
+
+[#15607]: https://gitlab.com/gitlab-org/gitlab-ce/issues/15607
+[@yorickpeterse]: https://gitlab.com/u/yorickpeterse
+[@joshfng]: https://gitlab.com/u/joshfng
+[anti-pattern]: https://en.wikipedia.org/wiki/Anti-pattern

From 6243a834115c9c815fe9a1224824f02f9fb3857f Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 30 Apr 2016 22:36:26 -0700
Subject: [PATCH 0084/1431] Bump mail_room to 0.7.0 to fix stuck IDLE
 connections

Closes #13357
---
 CHANGELOG    | 1 +
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 121b03be320..7b34095af9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Make build status canceled if any of the jobs was canceled and none failed
+  - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated
diff --git a/Gemfile b/Gemfile
index 25c13fda575..8210f4cb3d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -319,7 +319,7 @@ gem "newrelic_rpm", '~> 3.14'
 
 gem 'octokit', '~> 4.3.0'
 
-gem "mail_room", "~> 0.6.1"
+gem "mail_room", "~> 0.7"
 
 gem 'email_reply_parser', '~> 0.5.8'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b1e954e0884..5ea4347112c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -465,7 +465,7 @@ GEM
       systemu (~> 2.6.2)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mail_room (0.6.1)
+    mail_room (0.7.0)
     method_source (0.8.2)
     mime-types (2.99.1)
     mimemagic (0.3.0)
@@ -961,7 +961,7 @@ DEPENDENCIES
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
-  mail_room (~> 0.6.1)
+  mail_room (~> 0.7)
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)

From 41df76b028aa663711b8126b2aabd7f36f254153 Mon Sep 17 00:00:00 2001
From: Karlo Soriano <karlo@aelogica.com>
Date: Sun, 1 May 2016 14:43:52 +0800
Subject: [PATCH 0085/1431] Remove unnecessary method call in events view

Since `User#to_param` already returns `User#username`, we don't need to
pass in the user's username. Changing this also helps us obey LoD.
---
 app/views/events/_event.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 5d622582088..e4629bae0e6 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -5,7 +5,7 @@
 
     = cache [event, current_application_settings, "v2.2"] do
       - if event.author
-        = link_to user_path(event.author.username) do
+        = link_to user_path(event.author) do
           = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:''
       - else
         = image_tag avatar_icon(event.author_email, 40), class: "avatar s40", alt:''

From 66d7acfe4ddec5d5f16bc6a7d758343ff8573fd9 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 1 May 2016 13:44:50 -0600
Subject: [PATCH 0086/1431] Update rspec-rails from 3.3.3 to 3.4.2.

This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54

It'll also make it slightly easier to upgrade to 3.5.0 later.

Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
---
 Gemfile             |  2 +-
 Gemfile.lock        | 36 ++++++++++++++++++------------------
 spec/spec_helper.rb |  6 ------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index 25c13fda575..c10fe0a1c7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -269,7 +269,7 @@ group :development, :test do
 
   gem 'database_cleaner',   '~> 1.4.0'
   gem 'factory_girl_rails', '~> 4.6.0'
-  gem 'rspec-rails',        '~> 3.3.0'
+  gem 'rspec-rails',        '~> 3.4.0'
   gem 'rspec-retry'
   gem 'spinach-rails',      '~> 0.2.1'
   gem 'spinach-rerun-reporter', '~> 0.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b1e954e0884..b19dc5b6d20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -662,29 +662,29 @@ GEM
       chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
     rspec-retry (0.4.5)
       rspec-core
-    rspec-support (3.3.0)
+    rspec-support (3.4.1)
     rubocop (0.38.0)
       parser (>= 2.3.0.6, < 3.0)
       powerpack (~> 0.1)
@@ -1011,7 +1011,7 @@ DEPENDENCIES
   responders (~> 2.0)
   rouge (~> 1.10.1)
   rqrcode-rails3 (~> 0.1.7)
-  rspec-rails (~> 3.3.0)
+  rspec-rails (~> 3.4.0)
   rspec-retry
   rubocop (~> 0.38.0)
   ruby-fogbugz (~> 0.2.1)
@@ -1058,4 +1058,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.11.2
+   1.12.1
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 596d607f2a1..576d16e7ea3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -51,10 +51,4 @@ FactoryGirl::SyntaxRunner.class_eval do
   include RSpec::Mocks::ExampleMethods
 end
 
-# Work around a Rails 4.2.5.1 issue
-# See https://github.com/rspec/rspec-rails/issues/1532
-RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do
-  alias_method :find_all_anywhere, :find_all
-end
-
 ActiveRecord::Migration.maintain_test_schema!

From c0f02aad4a1a178109a235d34bd70218c0aec86c Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Mon, 2 May 2016 16:37:12 +0700
Subject: [PATCH 0087/1431] Add snippet tab under user profile

---
 app/assets/javascripts/user_tabs.js.coffee |  9 ++++++++-
 app/controllers/users_controller.rb        | 22 ++++++++++++++++++++++
 app/views/users/show.html.haml             |  6 ++++++
 config/routes.rb                           |  5 +++--
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/user_tabs.js.coffee b/app/assets/javascripts/user_tabs.js.coffee
index 09b7eec9104..aa798b96ede 100644
--- a/app/assets/javascripts/user_tabs.js.coffee
+++ b/app/assets/javascripts/user_tabs.js.coffee
@@ -26,6 +26,10 @@
 #         Personal projects
 #       </a>
 #     </li>
+#    <li class="snippets-tab">
+#       <a data-action="snippets" data-target="#snippets" data-toggle="tab" href="/u/username/snippets">
+#       </a>
+#     </li>
 #   </ul>
 #
 #   <div class="tab-content">
@@ -41,6 +45,9 @@
 #     <div class="tab-pane" id="projects">
 #       Projects content
 #     </div>
+#     <div class="tab-pane" id="snippets">
+#       Snippets content
+#     </div>
 #   </div>
 #
 #   <div class="loading-status">
@@ -100,7 +107,7 @@ class @UserTabs
     if action is 'activity'
       @loadActivities(source)
 
-    if action in ['groups', 'contributed', 'projects']
+    if action in ['groups', 'contributed', 'projects', 'snippets']
       @loadTab(source, action)
 
   loadTab: (source, action) ->
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2ae180c8a12..799421c185b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -58,6 +58,19 @@ class UsersController < ApplicationController
     end
   end
 
+  def snippets
+    load_snippets
+
+    respond_to do |format|
+      format.html { render 'show' }
+      format.json do
+        render json: {
+          html: view_to_html_string("snippets/_snippets", collection: @snippets)
+        }
+      end
+    end
+  end
+
   def calendar
     calendar = contributions_calendar
     @timestamps = calendar.timestamps
@@ -116,6 +129,15 @@ class UsersController < ApplicationController
     @groups = JoinedGroupsFinder.new(user).execute(current_user)
   end
 
+  def load_snippets
+    @snippets = SnippetsFinder.new.execute(
+      current_user,
+      filter: :by_user,
+      user: user,
+      scope: params[:scope]
+    ).page(params[:page])
+  end
+
   def projects_for_current_user
     ProjectsFinder.new.execute(current_user)
   end
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 3028491e5b6..a453a7fedb7 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -81,6 +81,9 @@
       %li.projects-tab
         = link_to user_projects_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
           Personal projects
+      %li.snippets-tab
+        = link_to user_snippets_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
+          Snippets
 
   %div{ class: container_class }
     .tab-content
@@ -104,6 +107,9 @@
       #projects.tab-pane
         - # This tab is always loaded via AJAX
 
+      #snippets.tab-pane
+        - # This tab is always loaded via AJAX
+
     .loading-status
       = spinner
 
diff --git a/config/routes.rb b/config/routes.rb
index 2f820aafed1..f6a41331ecf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,8 +89,6 @@ Rails.application.routes.draw do
     end
   end
 
-  get '/s/:username' => 'snippets#index', as: :user_snippets, constraints: { username: /.*/ }
-
   #
   # Invites
   #
@@ -355,6 +353,9 @@ Rails.application.routes.draw do
   get 'u/:username/contributed' => 'users#contributed', as: :user_contributed_projects,
       constraints: { username: /.*/ }
 
+  get 'u/:username/snippets' => 'users#snippets', as: :user_snippets,
+      constraints: { username: /.*/ }
+
   get '/u/:username' => 'users#show', as: :user,
       constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
 

From d1f5019511a1dc630e97f99bdb1f6b9fe6b02bba Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 2 May 2016 13:19:39 +0200
Subject: [PATCH 0088/1431] Use correct auth finder

---
 lib/api/session.rb               | 7 +------
 lib/gitlab/backend/grack_auth.rb | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/api/session.rb b/lib/api/session.rb
index e308ccc3004..1156aab8cc2 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,12 +11,7 @@ module API
     # Example Request:
     #  POST /session
     post "/session" do
-      user, _ = Gitlab::Auth.find(
-        params[:email] || params[:login],
-        params[:password],
-        project: nil,
-        ip: request.ip
-      )
+      user = Gitlab::Auth.find_by_master_or_ldap(params[:email] || params[:login], params[:password])
 
       return unauthorized! unless user
       present user, with: Entities::UserLogin
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index b263a27d4d3..3462c2dcfbc 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -95,7 +95,7 @@ module Grack
     end
 
     def authenticate_user(login, password)
-      user, _ = Gitlab::Auth.new.find_by_master_or_ldap(login, password)
+      user = Gitlab::Auth.new.find_by_master_or_ldap(login, password)
 
       unless user
         user = oauth_access_token_check(login, password)

From 9ce099429972726da22253407d98ae8aa1ef167b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 2 May 2016 13:21:59 +0200
Subject: [PATCH 0089/1431] Rubocop and whitespace

---
 lib/gitlab/workhorse.rb      | 4 ++--
 spec/lib/gitlab/auth_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 5b2982e4994..f9ceee142d7 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -36,9 +36,9 @@ module Gitlab
           "git-archive:#{encode(params)}",
         ]
       end
-      
+
       protected
-      
+
       def encode(hash)
         Base64.urlsafe_encode64(JSON.dump(hash))
       end
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 2c2f7ed0665..16083f90bb4 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: false, login: login)
-      expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq ([nil, nil])
+      expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq([nil, nil])
     end
   end
 

From 105017c3084c60e45f4bac85a76da78f39e6433f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 2 May 2016 13:29:17 +0200
Subject: [PATCH 0090/1431] Added JWT controller

---
 Gemfile                           |   1 +
 Gemfile.lock                      |   2 +
 app/controllers/jwt_controller.rb | 173 ++++++++++++++++++++++++++++++
 config/routes.rb                  |   3 +
 4 files changed, 179 insertions(+)
 create mode 100644 app/controllers/jwt_controller.rb

diff --git a/Gemfile b/Gemfile
index 512c6babd7e..0301f6fe062 100644
--- a/Gemfile
+++ b/Gemfile
@@ -225,6 +225,7 @@ gem 'request_store',      '~> 1.3.0'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
+gem 'base32',             '~> 0.3.0'
 
 # Sentry integration
 gem 'sentry-raven', '~> 0.15'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2b578429b3c..2b1cfdc9bb2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,6 +74,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
+    base32 (0.3.2)
     bcrypt (3.1.10)
     benchmark-ips (2.3.0)
     better_errors (1.0.1)
@@ -897,6 +898,7 @@ DEPENDENCIES
   attr_encrypted (~> 1.3.4)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
+  base32 (~> 0.3.0)
   benchmark-ips
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
new file mode 100644
index 00000000000..7e70c70c89c
--- /dev/null
+++ b/app/controllers/jwt_controller.rb
@@ -0,0 +1,173 @@
+class JwtController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_before_action :verify_authenticity_token
+
+  def auth
+    @authenticated = authenticate_with_http_basic do |login, password|
+      @ci_project = ci_project(login, password)
+      @user = authenticate_user(login, password) unless @ci_project
+    end
+
+    unless @authenticated
+      return render_403 if has_basic_credentials?
+    end
+
+    case params[:service]
+    when 'docker'
+      docker_token_auth(params[:scope], params[:offline_token])
+    else
+      return render_404
+    end
+  end
+
+  private
+
+  def render_400
+    head :invalid_request
+  end
+
+  def render_404
+    head :not_found
+  end
+
+  def render_403
+    head :forbidden
+  end
+
+  def docker_token_auth(scope, offline_token)
+    payload = {
+      aud: params[:service],
+      sub: @user.try(:username)
+    }
+
+    if offline_token
+      return render_403 unless @user
+    elsif scope
+      access = process_access(scope)
+      return render_404 unless access
+      payload[:access] = [access]
+    end
+
+    render json: { token: encode(payload) }
+  end
+
+  def ci_project(login, password)
+    matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
+
+    if matched_login.present?
+      underscored_service = matched_login['s'].underscore
+
+      if underscored_service == 'gitlab_ci'
+        Project.find_by(builds_enabled: true, runners_token: password)
+      end
+    end
+  end
+
+  def authenticate_user(login, password)
+    user = Gitlab::Auth.new.find(login, password)
+
+    # If the user authenticated successfully, we reset the auth failure count
+    # from Rack::Attack for that IP. A client may attempt to authenticate
+    # with a username and blank password first, and only after it receives
+    # a 401 error does it present a password. Resetting the count prevents
+    # false positives from occurring.
+    #
+    # Otherwise, we let Rack::Attack know there was a failed authentication
+    # attempt from this IP. This information is stored in the Rails cache
+    # (Redis) and will be used by the Rack::Attack middleware to decide
+    # whether to block requests from this IP.
+    config = Gitlab.config.rack_attack.git_basic_auth
+
+    if config.enabled
+      if user
+        # A successful login will reset the auth failure count from this IP
+        Rack::Attack::Allow2Ban.reset(request.ip, config)
+      else
+        banned = Rack::Attack::Allow2Ban.filter(request.ip, config) do
+          # Unless the IP is whitelisted, return true so that Allow2Ban
+          # increments the counter (stored in Rails.cache) for the IP
+          if config.ip_whitelist.include?(request.ip)
+            false
+          else
+            true
+          end
+        end
+
+        if banned
+          Rails.logger.info "IP #{request.ip} failed to login " \
+              "as #{login} but has been temporarily banned from Git auth"
+        end
+      end
+    end
+
+    user
+  end
+
+  def process_access(scope)
+    type, name, actions = scope.split(':', 3)
+    actions = actions.split(',')
+
+    case type
+    when 'repository'
+      process_repository_access(type, name, actions)
+    end
+  end
+
+  def process_repository_access(type, name, actions)
+    project = Project.find_with_namespace(name)
+    return unless project
+
+    actions = actions.select do |action|
+      can_access?(project, action)
+    end
+
+    { type: 'repository', name: name, actions: actions } if actions
+  end
+
+  def default_payload
+    {
+      aud: 'docker',
+      sub: @user.try(:username),
+      aud: params[:service],
+    }
+  end
+
+  def private_key
+    @private_key ||= OpenSSL::PKey::RSA.new File.read Gitlab.config.registry.key
+  end
+
+  def encode(payload)
+    issued_at = Time.now
+    payload = payload.merge(
+      iss: Gitlab.config.registry.issuer,
+      iat: issued_at.to_i,
+      nbf: issued_at.to_i - 5.seconds.to_i,
+      exp: issued_at.to_i + 60.minutes.to_i,
+      jti: SecureRandom.uuid,
+    )
+    headers = {
+      kid: kid(private_key)
+    }
+    JWT.encode(payload, private_key, 'RS256', headers)
+  end
+
+  def can_access?(project, action)
+    case action
+    when 'pull'
+      project == @ci_project || can?(@user, :download_code, project)
+    when 'push'
+      project == @ci_project || can?(@user, :push_code, project)
+    else
+      false
+    end
+  end
+
+  def kid(private_key)
+    sha256 = Digest::SHA256.new
+    sha256.update(private_key.public_key.to_der)
+    payload = StringIO.new(sha256.digest).read(30)
+    Base32.encode(payload).split('').each_slice(4).each_with_object([]) do |slice, mem|
+      mem << slice.join
+    end.join(':')
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index adf4bb18b3c..5b48819dd9d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -63,6 +63,9 @@ Rails.application.routes.draw do
   get 'search' => 'search#show'
   get 'search/autocomplete' => 'search#autocomplete', as: :search_autocomplete
 
+  # JSON Web Token
+  get 'jwt/auth' => 'jwt#auth'
+
   # API
   API::API.logger Rails.logger
   mount API::API => '/api'

From 011a905a821e2ff0cd2d9885ef93764018eb8346 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 2 May 2016 14:32:16 +0200
Subject: [PATCH 0091/1431] Split docker authentication service

---
 app/controllers/jwt_controller.rb             | 116 +++---------------
 .../jwt/docker_authentication_service.rb      |  65 ++++++++++
 lib/jwt/rsa_token.rb                          |  36 ++++++
 lib/jwt/token.rb                              |  48 ++++++++
 4 files changed, 163 insertions(+), 102 deletions(-)
 create mode 100644 app/services/jwt/docker_authentication_service.rb
 create mode 100644 lib/jwt/rsa_token.rb
 create mode 100644 lib/jwt/token.rb

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 7e70c70c89c..2a92627cb1b 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -2,6 +2,10 @@ class JwtController < ApplicationController
   skip_before_action :authenticate_user!
   skip_before_action :verify_authenticity_token
 
+  SERVICES = {
+    'docker' => Jwt::DockerAuthenticationService,
+  }
+
   def auth
     @authenticated = authenticate_with_http_basic do |login, password|
       @ci_project = ci_project(login, password)
@@ -9,46 +13,22 @@ class JwtController < ApplicationController
     end
 
     unless @authenticated
-      return render_403 if has_basic_credentials?
+      head :forbidden if ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
     end
 
-    case params[:service]
-    when 'docker'
-      docker_token_auth(params[:scope], params[:offline_token])
-    else
-      return render_404
-    end
+    service = SERVICES[params[:service]]
+    head :not_found unless service
+
+    result = service.new(@ci_project, @user, auth_params).execute
+    return head result[:http_status] if result[:http_status]
+
+    render json: result
   end
 
   private
 
-  def render_400
-    head :invalid_request
-  end
-
-  def render_404
-    head :not_found
-  end
-
-  def render_403
-    head :forbidden
-  end
-
-  def docker_token_auth(scope, offline_token)
-    payload = {
-      aud: params[:service],
-      sub: @user.try(:username)
-    }
-
-    if offline_token
-      return render_403 unless @user
-    elsif scope
-      access = process_access(scope)
-      return render_404 unless access
-      payload[:access] = [access]
-    end
-
-    render json: { token: encode(payload) }
+  def auth_params
+    params.permit(:service, :scope, :offline_token, :account, :client_id)
   end
 
   def ci_project(login, password)
@@ -102,72 +82,4 @@ class JwtController < ApplicationController
 
     user
   end
-
-  def process_access(scope)
-    type, name, actions = scope.split(':', 3)
-    actions = actions.split(',')
-
-    case type
-    when 'repository'
-      process_repository_access(type, name, actions)
-    end
-  end
-
-  def process_repository_access(type, name, actions)
-    project = Project.find_with_namespace(name)
-    return unless project
-
-    actions = actions.select do |action|
-      can_access?(project, action)
-    end
-
-    { type: 'repository', name: name, actions: actions } if actions
-  end
-
-  def default_payload
-    {
-      aud: 'docker',
-      sub: @user.try(:username),
-      aud: params[:service],
-    }
-  end
-
-  def private_key
-    @private_key ||= OpenSSL::PKey::RSA.new File.read Gitlab.config.registry.key
-  end
-
-  def encode(payload)
-    issued_at = Time.now
-    payload = payload.merge(
-      iss: Gitlab.config.registry.issuer,
-      iat: issued_at.to_i,
-      nbf: issued_at.to_i - 5.seconds.to_i,
-      exp: issued_at.to_i + 60.minutes.to_i,
-      jti: SecureRandom.uuid,
-    )
-    headers = {
-      kid: kid(private_key)
-    }
-    JWT.encode(payload, private_key, 'RS256', headers)
-  end
-
-  def can_access?(project, action)
-    case action
-    when 'pull'
-      project == @ci_project || can?(@user, :download_code, project)
-    when 'push'
-      project == @ci_project || can?(@user, :push_code, project)
-    else
-      false
-    end
-  end
-
-  def kid(private_key)
-    sha256 = Digest::SHA256.new
-    sha256.update(private_key.public_key.to_der)
-    payload = StringIO.new(sha256.digest).read(30)
-    Base32.encode(payload).split('').each_slice(4).each_with_object([]) do |slice, mem|
-      mem << slice.join
-    end.join(':')
-  end
 end
diff --git a/app/services/jwt/docker_authentication_service.rb b/app/services/jwt/docker_authentication_service.rb
new file mode 100644
index 00000000000..ce28085e5d6
--- /dev/null
+++ b/app/services/jwt/docker_authentication_service.rb
@@ -0,0 +1,65 @@
+module Jwt
+  class DockerAuthenticationService < BaseService
+    def execute
+      if params[:offline_token]
+        return error('forbidden', 403) unless current_user
+      end
+
+      { token: token.encoded }
+    end
+
+    private
+
+    def token
+      token = ::Jwt::RSAToken.new(registry.key)
+      token.issuer = registry.issuer
+      token.audience = params[:service]
+      token.subject = current_user.try(:username)
+      token[:access] = access
+      token
+    end
+
+    def access
+      return unless params[:scope]
+
+      scope = process_scope(params[:scope])
+      [scope].compact
+    end
+
+    def process_scope(scope)
+      type, name, actions = scope.split(':', 3)
+      actions = actions.split(',')
+
+      case type
+      when 'repository'
+        process_repository_access(type, name, actions)
+      end
+    end
+
+    def process_repository_access(type, name, actions)
+      current_project = Project.find_with_namespace(name)
+      return unless current_project
+
+      actions = actions.select do |action|
+        can_access?(current_project, action)
+      end
+
+      { type: type, name: name, actions: actions } if actions
+    end
+
+    def can_access?(current_project, action)
+      case action
+      when 'pull'
+        current_project == project || can?(current_user, :download_code, current_project)
+      when 'push'
+        current_project == project || can?(current_user, :push_code, current_project)
+      else
+        false
+      end
+    end
+
+    def registry
+      Gitlab.config.registry
+    end
+  end
+end
diff --git a/lib/jwt/rsa_token.rb b/lib/jwt/rsa_token.rb
new file mode 100644
index 00000000000..cc265e3b31a
--- /dev/null
+++ b/lib/jwt/rsa_token.rb
@@ -0,0 +1,36 @@
+module Jwt
+  class RSAToken < Token
+    attr_reader :key_file
+
+    def initialize(key_file)
+      super()
+      @key_file = key_file
+    end
+
+    def encoded
+      headers = {
+        kid: kid
+      }
+      JWT.encode(payload, key, 'RS256', headers)
+    end
+
+    private
+
+    def key_data
+      @key_data ||= File.read(key_file)
+    end
+
+    def key
+      @key ||= OpenSSL::PKey::RSA.new(key_data)
+    end
+
+    def kid
+      sha256 = Digest::SHA256.new
+      sha256.update(key.public_key.to_der)
+      payload = StringIO.new(sha256.digest).read(30)
+      Base32.encode(payload).split('').each_slice(4).each_with_object([]) do |slice, mem|
+        mem << slice.join
+      end.join(':')
+    end
+  end
+end
diff --git a/lib/jwt/token.rb b/lib/jwt/token.rb
new file mode 100644
index 00000000000..38cbc8004e7
--- /dev/null
+++ b/lib/jwt/token.rb
@@ -0,0 +1,48 @@
+module Jwt
+  class Token
+    attr_accessor :issuer, :subject, :audience, :id
+    attr_accessor :issued_at, :not_before, :expire_time
+
+    def initialize
+      @payload = {}
+      @id = SecureRandom.uuid
+      @issued_at = Time.now
+      @not_before = issued_at - 5.seconds
+      @expire_time = issued_at + 1.minute
+    end
+
+    def [](key)
+      @payload[key]
+    end
+
+    def []=(key, value)
+      @payload[key] = value
+    end
+
+    def encoded
+      raise NotImplementedError
+    end
+
+    def payload
+      @payload.merge(default_payload)
+    end
+
+    def to_json
+      payload.to_json
+    end
+
+    private
+
+    def default_payload
+      {
+        jti: id,
+        aud: audience,
+        sub: subject,
+        iss: issuer,
+        iat: issued_at.to_i,
+        nbf: not_before.to_i,
+        exp: expire_time.to_i
+      }.compact
+    end
+  end
+end
\ No newline at end of file

From e31b471efc7e9e21011b80a0bce9433a3d899eda Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 May 2016 19:22:48 +0200
Subject: [PATCH 0092/1431] Make files list more compact by reducing row height
 from 47px to 44px

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/tree.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 25b5e95583e..a84fc2e0318 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -16,7 +16,7 @@
 
     tr {
       > td, > th {
-        line-height: 26px;
+        line-height: 23px;
       }
 
       &:hover {

From b0cfd2a9c55e134711079a64a50c00d6fcdd766a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 May 2016 19:37:22 +0200
Subject: [PATCH 0093/1431] Use correct border color between table rows

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/tables.scss    | 2 +-
 app/assets/stylesheets/framework/variables.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 75b770ae5a2..4765a3de515 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -37,8 +37,8 @@ table {
       }
 
       td {
+        border-bottom: 1px solid;
         border-color: $table-border-color;
-        border-bottom: 1px solid $border-color;
       }
     }
   }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index b8ed7e8a74c..92ecfe50488 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -12,7 +12,7 @@ $gutter_inner_width: 258px;
  */
 $border-color:       #e5e5e5;
 $focus-border-color: #3aabf0;
-$table-border-color: #eef0f2;
+$table-border-color: #ececec;
 $background-color:   #fafafa;
 
 /*

From 606e09c141d39ccc3bcfe47ac200eef6df3861a0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 May 2016 19:52:46 +0200
Subject: [PATCH 0094/1431] Fix table borders

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/tables.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 4765a3de515..b42075c98d0 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -32,12 +32,10 @@ table {
       th {
         background-color: $background-color;
         font-weight: normal;
-        font-size: 15px;
-        border-bottom: 1px solid $border-color;
+        border-bottom: none;
       }
 
       td {
-        border-bottom: 1px solid;
         border-color: $table-border-color;
       }
     }

From 3dc276b367fe88c3c1026371d275d6078611f625 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 3 May 2016 11:46:14 +0200
Subject: [PATCH 0095/1431] Remove parallel assignment

---
 lib/gitlab/auth.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 32e903905ad..0479006f993 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -4,7 +4,8 @@ module Gitlab
       def find(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?
 
-        user, type = nil, nil
+        user = nil
+        type = nil
 
         if valid_ci_request?(login, password, project)
           type = :ci

From 01aed0c84863ee0271cfb27ab3120ffdf2be7739 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 May 2016 12:31:50 +0200
Subject: [PATCH 0096/1431] Dont specify sidebar for group and group settings
 layouts

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/group.html.haml          | 1 -
 app/views/layouts/group_settings.html.haml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 7bee7e172e6..f06acc98ca1 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -1,7 +1,6 @@
 - page_title       @group.name
 - page_description @group.description  unless page_description
 - header_title     group_title(@group) unless header_title
-- sidebar          "dashboard"         unless sidebar
 - nav              "group"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml
index 1ff53ce2a9d..66b115e36de 100644
--- a/app/views/layouts/group_settings.html.haml
+++ b/app/views/layouts/group_settings.html.haml
@@ -1,5 +1,4 @@
 - page_title    "Settings"
-- sidebar       "dashboard" unless sidebar
 - nav           "group"
 
 = render template: "layouts/group"

From d8440b3035667623c87fe84b5a58c68da4ff936f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 May 2016 12:37:07 +0200
Subject: [PATCH 0097/1431] Fix active state for group pages if user not logged
 in

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_explore.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml
index f08c5edf99c..3b40006a0cc 100644
--- a/app/views/layouts/nav/_explore.html.haml
+++ b/app/views/layouts/nav/_explore.html.haml
@@ -4,7 +4,7 @@
       = icon('bookmark fw')
       %span
         Projects
-  = nav_link(controller: :groups) do
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to explore_groups_path, title: 'Groups' do
       = icon('group fw')
       %span

From f4e0c56279007fd6cec3d8e6bd684f0483b0e0ff Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 3 May 2016 13:03:10 +0200
Subject: [PATCH 0098/1431] Improve documentation and web test for web hooks

I wanted to share what I learned trying to debug web hooks using
netcat.
---
 app/controllers/projects/hooks_controller.rb |  2 +-
 app/models/hooks/web_hook.rb                 |  2 +-
 doc/web_hooks/web_hooks.md                   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index dfa9bd259e8..366373b0f0a 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -28,7 +28,7 @@ class Projects::HooksController < Projects::ApplicationController
       status, message = TestHookService.new.execute(hook, current_user)
 
       if status
-        flash[:notice] = 'Hook successfully executed.'
+        flash[:notice] = "Hook successfully executed, HTTP #{status} #{message}"
       else
         flash[:alert] = "Hook execution failed: #{message}"
       end
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 1e3b4815596..818abbf4cc4 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -59,7 +59,7 @@ class WebHook < ActiveRecord::Base
                               basic_auth: auth)
     end
 
-    [(response.code >= 200 && response.code < 300), ActionView::Base.full_sanitizer.sanitize(response.to_s)]
+    [response.code, ActionView::Base.full_sanitizer.sanitize(response.to_s)]
   rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e
     logger.error("WebHook Error => #{e}")
     [false, e.to_s]
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index c1c51302e79..6ffdb18339e 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -13,6 +13,19 @@ You can configure webhooks to listen for specific events like pushes, issues or
 
 Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
 
+## Webhook endpoint tips
+
+If you are writing your own endpoint (web server) that will receive
+GitLab web hooks keep in mind the following things:
+
+-   Your endpoint should send its HTTP response as fast as possible. If
+    you wait too long, GitLab may decide the hook failed and retry it.
+-   Your endpoint should ALWAYS return a valid HTTP response. If you do
+    not do this then GitLab will think the hook failed and retry it.
+    Most HTTP libraries take care of this for you automatically but if
+    you are writing a low-level hook this is important to remember.
+-   GitLab ignores the HTTP status code returned by your endpoint.
+
 ## SSL Verification
 
 By default, the SSL certificate of the webhook endpoint is verified based on

From 774af93027a5e1758adac00eb61178ecd85567ed Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 May 2016 13:04:47 +0200
Subject: [PATCH 0099/1431] Remove go to dashboard test suite for group page
 and get rid of AR warning

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_group.html.haml | 2 +-
 features/groups.feature                | 4 ----
 features/steps/group/milestones.rb     | 6 ++++--
 features/steps/groups.rb               | 4 ----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index bc5ce7052e4..87ee765b8f2 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -16,7 +16,7 @@
           %li
             = link_to edit_group_path(@group) do
               Edit Group
-        - if access = @group.users.find(current_user)
+        - if access = @group.users.find(current_user.id)
           %li
             = link_to leave_group_group_members_path(@group),
               data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
diff --git a/features/groups.feature b/features/groups.feature
index 419a5d3963d..49e939807b5 100644
--- a/features/groups.feature
+++ b/features/groups.feature
@@ -7,10 +7,6 @@ Feature: Groups
     When I visit group "NonExistentGroup" page
     Then page status code should be 404
 
-  Scenario: I should have back to group button
-    When I visit group "Owned" page
-    Then I should see back to dashboard button
-
   @javascript
   Scenario: I should see group "Owned" dashboard list
     When I visit group "Owned" page
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index a167d259837..f5fddab357d 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -5,7 +5,9 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   include SharedUser
 
   step 'I click on group milestones' do
-    click_link 'Milestones'
+    page.within('.layout-nav') do
+      click_link 'Milestones'
+    end
   end
 
   step 'I should see group milestones index page has no milestones' do
@@ -84,7 +86,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   end
 
   step 'I click on the "Labels" tab' do
-    page.within('.nav-links') do
+    page.within('.content .nav-links') do
       page.find(:xpath, "//a[@href='#tab-labels']").click
     end
   end
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index e5b7db4c5e3..483370f41c6 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -4,10 +4,6 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   include SharedGroup
   include SharedUser
 
-  step 'I should see back to dashboard button' do
-    expect(page).to have_content 'Go to dashboard'
-  end
-
   step 'I should see group "Owned"' do
     expect(page).to have_content '@owned'
   end

From 268868bcf0e1d09448c2212fb5275d1264d21b1b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 May 2016 13:21:09 +0200
Subject: [PATCH 0100/1431] Improve milestone page UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/milestone.scss  |  4 ++--
 app/views/projects/milestones/show.html.haml | 10 +++++-----
 app/views/shared/milestones/_top.html.haml   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index d0e72a4422c..b94f524b513 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -28,7 +28,7 @@ li.milestone {
 
     // Issue title
     span a {
-      color: rgba(0,0,0,0.64);
+      color: $gl-text-color;
     }
   }
 }
@@ -51,7 +51,7 @@ li.milestone {
     margin-top: 7px;
 
     .issuable-number {
-      color: rgba(0,0,0,0.44);
+      color: $gl-placeholder-color;
       margin-right: 5px;
     }
     .avatar {
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 56543ccd062..6ec84660157 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -24,15 +24,15 @@
       - else
         = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped"
 
-      = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-nr" do
-        = icon('trash-o')
-        Delete
-
       = link_to edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-grouped btn-nr" do
         = icon('pencil-square-o')
         Edit
 
-.detail-page-description.milestone-detail.second-block
+      = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-danger" do
+        = icon('trash-o')
+        Delete
+
+.detail-page-description.milestone-detail
   %h2.title
     = markdown escape_once(@milestone.title), pipeline: :single_line
   %div
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index cab8743a077..7ff947a51db 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -24,7 +24,7 @@
         - else
           = link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
 
-.detail-page-description.gray-content-block.second-block
+.detail-page-description.milestone-detail
   %h2.title
     = markdown escape_once(milestone.title), pipeline: :single_line
 

From 23a3e3756a4f44aa8bd69310a2e584c1d4f7af1d Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 3 May 2016 13:40:59 +0200
Subject: [PATCH 0101/1431] Inform user about questionable hook success

---
 app/controllers/projects/hooks_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 366373b0f0a..9869d90831c 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -27,8 +27,10 @@ class Projects::HooksController < Projects::ApplicationController
     if !@project.empty_repo?
       status, message = TestHookService.new.execute(hook, current_user)
 
-      if status
-        flash[:notice] = "Hook successfully executed, HTTP #{status} #{message}"
+      if status && status >= 200 && status < 400
+        flash[:notice] = "Hook executed successfully"
+      elsif status
+        flash[:alert] = "Hook executed successfully but returned HTTP #{status} #{message}"
       else
         flash[:alert] = "Hook execution failed: #{message}"
       end

From 6957fb7c4f0993ba1e0cbd9949a7e96c2c2def32 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 3 May 2016 13:42:56 +0200
Subject: [PATCH 0102/1431] Always mention HTTP status

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

diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 9869d90831c..47524b1cf0b 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -28,7 +28,7 @@ class Projects::HooksController < Projects::ApplicationController
       status, message = TestHookService.new.execute(hook, current_user)
 
       if status && status >= 200 && status < 400
-        flash[:notice] = "Hook executed successfully"
+        flash[:notice] = "Hook executed successfully: HTTP #{status}"
       elsif status
         flash[:alert] = "Hook executed successfully but returned HTTP #{status} #{message}"
       else

From bdda1eeddeb8a49484d221ae7217a9983bf984c4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 May 2016 14:30:42 +0200
Subject: [PATCH 0103/1431] Fix 404 on group page if user is not member of page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_group.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 87ee765b8f2..0971bccfcd4 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -12,11 +12,11 @@
           = link_to projects_group_path(@group), title: 'Projects' do
             Projects
         %li.divider
-        - if @group && can?(current_user, :admin_group, @group)
+        - if can?(current_user, :admin_group, @group)
           %li
             = link_to edit_group_path(@group) do
               Edit Group
-        - if access = @group.users.find(current_user.id)
+        - if access = @group.users.find_by(id: current_user.id)
           %li
             = link_to leave_group_group_members_path(@group),
               data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do

From 1fddfa8f2a7b6bd6e71f7e997f152a2f8baa15d4 Mon Sep 17 00:00:00 2001
From: Karlo Soriano <karlo@aelogica.com>
Date: Tue, 3 May 2016 21:17:39 +0800
Subject: [PATCH 0104/1431] Link to gitlab code review guide in contributing
 guidelines

I noticed that the contributing guidelines still link to the thoughtbot
code review guidelines even though we already have our own.

[ci skip]
---
 CONTRIBUTING.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 24cd5864530..783d6947edb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -349,7 +349,7 @@ on your merge request feel free to mention one of the Merge Marshalls in the
 Please ensure that your merge request meets the contribution acceptance criteria.
 
 When having your code reviewed and when reviewing merge requests please take the
-[Thoughtbot code review guide] into account.
+[code review guidelines](doc/development/code_review.md) into account.
 
 ### Merge request description format
 
@@ -523,4 +523,3 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
 [gitlab-design]: https://gitlab.com/gitlab-org/gitlab-design
 [free Antetype viewer (Mac OSX only)]: https://itunes.apple.com/us/app/antetype-viewer/id824152298?mt=12
 [`gitlab1.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/gitlab1.atype/
-[Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review

From 50d18a1e1d945297de4162b2712fa6bbcee0e42e Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Tue, 3 May 2016 09:29:15 -0500
Subject: [PATCH 0105/1431] Rake drop tables with cascade

---
 lib/tasks/gitlab/db.rake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 4921c6e0bcf..1c706dc11b3 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -29,7 +29,10 @@ namespace :gitlab do
       tables.delete 'schema_migrations'
       # Truncate schema_migrations to ensure migrations re-run
       connection.execute('TRUNCATE schema_migrations')
-      tables.each { |t| connection.execute("DROP TABLE #{t}") }
+      # Drop tables with cascade to avoid dependent table errors
+      # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html
+      # MySQL: http://dev.mysql.com/doc/refman/5.7/en/drop-table.html
+      tables.each { |t| connection.execute("DROP TABLE #{t} CASCADE") }
     end
   end
 end

From 94df8d5fc87a6a3a43a23b8f484de9e24af837d1 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 3 May 2016 16:39:08 +0200
Subject: [PATCH 0106/1431] Updated CHANGELOG for 8.7.2

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

diff --git a/CHANGELOG b/CHANGELOG
index b6527780bbf..11b1768c8eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,9 +18,10 @@ v 8.8.0 (unreleased)
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Added multiple colors for labels in dropdowns when dups happen.
 
-v 8.7.2 (unreleased)
+v 8.7.2
   - The "New Branch" button is now loaded asynchronously
   - Fix error 500 when trying to create a wiki page
+  - Updated spacing between notification label and button
 
 v 8.7.1
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848

From b7641dbb51102b24e692efa5ba01d52a88bce855 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 3 May 2016 11:24:30 -0400
Subject: [PATCH 0107/1431] Update link to release docs in README

[ci skip]
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index afa60116ebb..36f4bb12df0 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ There are a lot of [third-party applications integrating with GitLab](https://ab
 
 ## GitLab release cycle
 
-For more information about the release process see the [release documentation](http://doc.gitlab.com/ce/release/).
+For more information about the release process see the [release documentation](https://gitlab.com/gitlab-org/release-tools/blob/master/README.md).
 
 ## Upgrading
 

From faaab2aef8e7f6b06f8f04dc68596e1229d507db Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 3 May 2016 11:58:43 -0500
Subject: [PATCH 0108/1431] Add to label :id to response

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

diff --git a/app/controllers/dashboard/labels_controller.rb b/app/controllers/dashboard/labels_controller.rb
index 23a4ef21ea2..2a88350a4ca 100644
--- a/app/controllers/dashboard/labels_controller.rb
+++ b/app/controllers/dashboard/labels_controller.rb
@@ -1,6 +1,6 @@
 class Dashboard::LabelsController < Dashboard::ApplicationController
   def index
-    labels = Label.where(project_id: projects).select(:title, :color).uniq(:title)
+    labels = Label.where(project_id: projects).select(:id, :title, :color).uniq(:title)
 
     respond_to do |format|
       format.json { render json: labels }

From f53557a4faa02c4596d16819c4b5c7783829677a Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 3 May 2016 11:44:55 -0500
Subject: [PATCH 0109/1431] Group navigation design update

---
 app/assets/stylesheets/framework/blocks.scss  |  7 +++++++
 app/assets/stylesheets/framework/header.scss  |  4 ++++
 app/assets/stylesheets/framework/nav.scss     | 10 +++++++---
 .../stylesheets/framework/variables.scss      |  2 ++
 app/helpers/nav_helper.rb                     | 13 +++++++-----
 app/views/groups/show.html.haml               | 20 +++++++------------
 app/views/layouts/nav/_group.html.haml        |  6 ++++--
 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index e72e4aa47ef..57f722c4818 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -150,6 +150,13 @@
       right: auto;
     }
   }
+
+  &.groups-cover-block {
+    background: $white-light;
+    border-bottom: 1px solid $border-color;
+    text-align: left;
+    padding: 24px 0;
+  }
 }
 
 .block-connector {
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 5fa10d29a87..97f9d582007 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -30,6 +30,10 @@ header {
     border: none;
     border-bottom: 1px solid $border-color;
 
+    &.with-horizontal-nav {
+      border-bottom: none;
+    }
+
     .container-fluid {
       width: 100% !important;
       filter: none;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 5fe687dcec3..40b24e96fa3 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -26,8 +26,8 @@
     }
 
     &.active a {
-      color: #000;
-      border-bottom: 2px solid #4688f1;
+      border-bottom: 2px solid $link-underline-blue;
+      color: $black;
     }
 
     .badge {
@@ -193,7 +193,7 @@
   .controls {
     float: right;
     position: relative;
-    top: 10px;
+    top: 0;
 
     .dropdown {
       margin-left: 7px;
@@ -202,5 +202,9 @@
 
   .nav-links {
     border-bottom: none;
+
+    a {
+      padding-top: 2px;
+    }
   }
 }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index b8ed7e8a74c..3b69e50aca7 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -74,6 +74,7 @@ $btn-transparent-color: #8f8f8f;
 $settings-icon-size: 18px;
 $provider-btn-group-border: #e5e5e5;
 $provider-btn-not-active-color: #4688f1;
+$link-underline-blue: #4a8bee;
 
 /*
  * Color schema
@@ -108,6 +109,7 @@ $red-light: #e52c5a;
 $red-normal: #d22852;
 $red-dark: darken($red-normal, 5%);
 
+$black: #000000;
 $black-transparent: rgba(0, 0, 0, 0.3);
 
 $border-white-light: #f1f2f4;
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 5d86bd490a8..3aa41030453 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -34,10 +34,13 @@ module NavHelper
   end
 
   def nav_header_class
-    if nav_menu_collapsed?
-      "header-collapsed"
-    else
-      "header-expanded"
-    end
+    class_name =
+      if nav_menu_collapsed?
+        "header-collapsed"
+      else
+        "header-expanded"
+      end
+    class_name += " with-horizontal-nav" if defined?(nav) && nav
+    class_name
   end
 end
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index c71070e6c9c..ffce7b1fc48 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -4,22 +4,16 @@
   - if current_user
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
-.cover-block
-  .avatar-holder
+.cover-block.groups-cover-block
+  .container-fluid
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"
-  .cover-title
-    %h1
-      = @group.name
-      %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
-        = visibility_level_icon(@group.visibility_level, fw: false)
+    .cover-title
+      %h1 @#{@group.path}
 
-  .cover-desc.username
-    @#{@group.path}
-
-  - if @group.description.present?
-    .cover-desc.description
-      = markdown(@group.description, pipeline: :description)
+    - if @group.description.present?
+      .cover-desc.description
+        = markdown(@group.description, pipeline: :description)
 
 %div{ class: container_class }
   .top-area
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 0971bccfcd4..705682aeb29 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -44,14 +44,16 @@
       %span
         Issues
         - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.badge.count= number_with_delimiter(issues.count)
+        %span.count
+          (#{number_with_delimiter(issues.count)})
   = nav_link(path: 'groups#merge_requests') do
     = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
       = icon('tasks fw')
       %span
         Merge Requests
         - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.badge.count= number_with_delimiter(merge_requests.count)
+        %span.count
+          (#{number_with_delimiter(merge_requests.count)})
   = nav_link(controller: [:group_members]) do
     = link_to group_group_members_path(@group), title: 'Members' do
       = icon('users fw')

From 8bd793c9c58c701882447fba055cd93e55f34af5 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 3 May 2016 20:46:14 +0300
Subject: [PATCH 0110/1431] Copyedit performance document

[ci skip]
---
 doc/development/performance.md | 44 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/development/performance.md b/doc/development/performance.md
index c74198650e5..41f415812a0 100644
--- a/doc/development/performance.md
+++ b/doc/development/performance.md
@@ -7,7 +7,7 @@ consistent performance of GitLab.
 
 The process of solving performance problems is roughly as follows:
 
-1. Make sure there's an issue open somewhere (e.g. on the GitLab CE issue
+1. Make sure there's an issue open somewhere (e.g., on the GitLab CE issue
    tracker), create one if there isn't. See [#15607][#15607] for an example.
 2. Measure the performance of the code in a production environment such as
    GitLab.com (see the [Tooling](#tooling) section below). Performance should be
@@ -27,7 +27,7 @@ When providing timings make sure to provide:
 * The 99th percentile
 * The mean
 
-When providing screenshots of graphs make sure that both the X and Y axes and
+When providing screenshots of graphs, make sure that both the X and Y axes and
 the legend are clearly visible. If you happen to have access to GitLab.com's own
 monitoring tools you should also provide a link to any relevant
 graphs/dashboards.
@@ -37,7 +37,7 @@ graphs/dashboards.
 GitLab provides two built-in tools to aid the process of improving performance:
 
 * [Sherlock](doc/development/profiling.md#sherlock)
-* [GitLab Performance Monitoring](doc/monitoring/performance)
+* [GitLab Performance Monitoring](doc/monitoring/performance/monitoring.md)
 
 GitLab employees can use GitLab.com's performance monitoring systems located at
 <http://performance.gitlab.net>, this requires you to log in using your
@@ -48,7 +48,7 @@ own InfluxDB + Grafana stack.
 
 Benchmarks are almost always useless. Benchmarks usually only test small bits of
 code in isolation and often only measure the best case scenario. On top of that,
-benchmarks for libraries (e.g. a Gem) tend to be biased in favour of the
+benchmarks for libraries (e.g., a Gem) tend to be biased in favour of the
 library. After all there's little benefit to an author publishing a benchmark
 that shows they perform worse than their competitors.
 
@@ -102,7 +102,7 @@ In short:
 
 ## Importance of Changes
 
-When working on performance improvements it's important to always ask yourself
+When working on performance improvements, it's important to always ask yourself
 the question "How important is it to improve the performance of this piece of
 code?". Not every piece of code is equally important and it would be a waste to
 spend a week trying to improve something that only impacts a tiny fraction of
@@ -114,7 +114,7 @@ There is no clear set of steps that you can follow to determine if a certain
 piece of code is worth optimizing. The only two things you can do are:
 
 1. Think about what the code does, how it's used, how many times it's called and
-   how much time is spent in it relative to the total execution time (e.g. the
+   how much time is spent in it relative to the total execution time (e.g., the
    total time spent in a web request).
 2. Ask others (preferably in the form of an issue).
 
@@ -159,7 +159,7 @@ if repository.exists?
 end
 ```
 
-You can instead just write:
+You can just write:
 
 ```ruby
 repository.branch_names.each do |name|
@@ -170,21 +170,21 @@ end
 ## Caching
 
 Operations that will often return the same result should be cached using Redis,
-in particular Git operations. When caching data in Redis make sure the cache is
+in particular Git operations. When caching data in Redis, make sure the cache is
 flushed whenever needed. For example, a cache for the list of tags should be
 flushed whenever a new tag is pushed or a tag is removed.
 
-When adding cache expiration code for repositories this code should be placed in
-one of the before/after hooks residing in the Repository class. For example, if
-a cache should be flushed after importing a repository this code should be added
-to `Repository#after_import`. This ensures the cache logic stays within the
-Repository class instead of leaking into other classes.
+When adding cache expiration code for repositories, this code should be placed
+in one of the before/after hooks residing in the Repository class. For example,
+if a cache should be flushed after importing a repository this code should be
+added to `Repository#after_import`. This ensures the cache logic stays within
+the Repository class instead of leaking into other classes.
 
-When caching data make sure to also memoize the result in an instance variable.
-While retrieving data from Redis is much faster than raw Git operations it still
-has overhead. By caching the result in an instance variable repeated calls to
+When caching data, make sure to also memoize the result in an instance variable.
+While retrieving data from Redis is much faster than raw Git operations, it still
+has overhead. By caching the result in an instance variable, repeated calls to
 the same method won't end up retrieving data from Redis upon every call. When
-memoizing cached data in an instance variable make sure to also reset the
+memoizing cached data in an instance variable, make sure to also reset the
 instance variable when flushing the cache. An example:
 
 
@@ -224,10 +224,10 @@ positive impact on performance.
 This feature of Ruby wasn't really meant to make things faster directly, instead
 it was meant to reduce the number of allocations. Depending on the size of the
 String and how frequently it would be allocated (before the `.freeze` call was
-added) this _may_ make things faster, but there's no guarantee it will.
+added), this _may_ make things faster, but there's no guarantee it will.
 
-Another common flavour of this is to not only freeze a String but also assign it
-to a constant, for example:
+Another common flavour of this is to not only freeze a String, but also assign
+it to a constant, for example:
 
 ```ruby
 SOME_CONSTANT = 'foo'.freeze
@@ -248,8 +248,8 @@ SOME_CONSTANT = 'bar'
 ### Moving Allocations to Constants
 
 Storing an object as a constant so you only allocate it once _may_ improve
-performance but there's no guarantee this will. Looking up constants has an
-impact on runtime performance and as such using a constant instead of
+performance, but there's no guarantee this will. Looking up constants has an
+impact on runtime performance, and as such, using a constant instead of
 referencing an object directly may even slow code down.
 
 [#15607]: https://gitlab.com/gitlab-org/gitlab-ce/issues/15607

From 473e653e2408e818d0d61732332aeba53e5ca499 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 3 May 2016 21:53:54 +0300
Subject: [PATCH 0111/1431] Add clear instructions on installing the pg_trgm
 extension

[ci skip]
---
 doc/install/installation.md | 56 ++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index e721e70a596..e3af3022262 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -157,22 +157,64 @@ Create a `git` user for GitLab:
 
 ## 5. Database
 
-We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md). *Note*: because we need to make use of extensions you need at least pgsql 9.1.
+We recommend using a PostgreSQL database. For MySQL check the
+[MySQL setup guide](database_mysql.md).
 
-    # Install the database packages
-    sudo apt-get install -y postgresql postgresql-client libpq-dev
+> **Note**: because we need to make use of extensions you need at least pgsql 9.1.
 
-    # Create a user for GitLab
+1. Install the database packages:
+
+    ```bash
+    sudo apt-get install -y postgresql postgresql-client libpq-dev postgresql-contrib
+    ```
+
+1. Create a database user for GitLab:
+
+    ```bash
     sudo -u postgres psql -d template1 -c "CREATE USER git CREATEDB;"
+    ```
 
-    # Create the GitLab production database & grant all privileges on database
+1. Create the GitLab production database and grant all privileges on database:
+
+    ```bash
     sudo -u postgres psql -d template1 -c "CREATE DATABASE gitlabhq_production OWNER git;"
+    ```
 
-    # Try connecting to the new database with the new user
+1. Create the `pg_trgm` extension (required for GitLab 8.6+):
+
+    ```bash
+    sudo -u postgres psql -d template1 -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+    ```
+
+1. Try connecting to the new database with the new user:
+
+    ```bash
     sudo -u git -H psql -d gitlabhq_production
+    ```
 
-    # Quit the database session
+1. Check if the `pg_trgm` extension is enabled:
+
+    ```bash
+    SELECT true AS enabled
+    FROM pg_available_extensions
+    WHERE name = 'pg_trgm'
+    AND installed_version IS NOT NULL;
+    ```
+
+    If the extension is enabled this will produce the following output:
+
+    ```
+    enabled
+    ---------
+     t
+    (1 row)
+    ```
+
+1. Quit the database session:
+
+    ```bash
     gitlabhq_production> \q
+    ```
 
 ## 6. Redis
 

From b898810c8d94b51514a7b5582921ab9ace4e40fb Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Thu, 31 Mar 2016 19:54:03 -0600
Subject: [PATCH 0112/1431] Improve the Two-factor Authentication sign-in text
 [ci skip]

Resolves #14543.
---
 CHANGELOG                                      | 1 +
 app/views/devise/sessions/two_factor.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 11b1768c8eb..4c68c836080 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.8.0 (unreleased)
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Added multiple colors for labels in dropdowns when dups happen.
+  - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index 22b2c1a186b..c9d1e454a5e 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -4,7 +4,7 @@
       %h3 Two-factor Authentication
     .login-body
       = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-        = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor authentication code', required: true, autofocus: true
-        %p.help-block.hint If you've lost your phone, you may enter one of your recovery codes.
+        = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor Authentication code', required: true, autofocus: true
+        %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
         .prepend-top-20
           = f.submit "Verify code", class: "btn btn-save"

From d6c2d6bab9f00c288df3318424c4c1bbbca614dc Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem@posteo.de>
Date: Sat, 30 Apr 2016 17:38:39 +0200
Subject: [PATCH 0113/1431] Use sign out path only if not empty

---
 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 1c53b0b21a3..17b3f49aed1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -117,7 +117,7 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(resource)
-    current_application_settings.after_sign_out_path || new_user_session_path
+    current_application_settings.after_sign_out_path.presence || new_user_session_path
   end
 
   def abilities

From 21ccf89685bceee2b502a9e6a9fbb55310e02ebc Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 3 May 2016 15:29:11 -0500
Subject: [PATCH 0114/1431] Redesign profile page and group page mobile
 navigation

---
 app/assets/stylesheets/framework/blocks.scss  | 20 ++++++++++++
 app/assets/stylesheets/framework/mobile.scss  |  2 +-
 app/assets/stylesheets/framework/nav.scss     | 32 ++++++++++++++++---
 .../stylesheets/framework/variables.scss      |  2 +-
 app/assets/stylesheets/pages/profile.scss     | 30 +++++++++++++++++
 app/views/groups/show.html.haml               | 14 +++++---
 6 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 57f722c4818..a78b1f30e61 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -156,6 +156,26 @@
     border-bottom: 1px solid $border-color;
     text-align: left;
     padding: 24px 0;
+
+    .group-info {
+      p {
+        margin-bottom: 0;
+      }
+    }
+
+    @media (max-width: $screen-xs-max) {
+      text-align: center;
+
+      .avatar {
+        float: none;
+      }
+    }
+  }
+
+  .group-info {
+    h1 {
+      display: inline;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index 7eb451c124e..33cbee85987 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -30,7 +30,7 @@
   }
 
   .rss-btn {
-    display: none !important;
+    display: none;
   }
 
   .project-home-links {
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 40b24e96fa3..2ada2b9f2f2 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -198,13 +198,35 @@
     .dropdown {
       margin-left: 7px;
     }
-  }
 
-  .nav-links {
-    border-bottom: none;
+    @media (max-width: $screen-md-max) {
+      float: none;
+      margin-bottom: 10px;
 
-    a {
-      padding-top: 2px;
+      .btn {
+        width: 20%;
+      }
+    }
+
+    @media (max-width: $screen-xs-max) {
+      text-align: center;
+
+      .rss-btn,
+      .dropdown-new {
+        display: inline-block;
+        width: 48%;
+      }
     }
   }
 }
+
+.nav-links {
+  border-bottom: none;
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden;
+
+  a {
+    padding-top: 2px;
+  }
+}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 3b69e50aca7..7c695ba8f46 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -109,7 +109,7 @@ $red-light: #e52c5a;
 $red-normal: #d22852;
 $red-dark: darken($red-normal, 5%);
 
-$black: #000000;
+$black: #000;
 $black-transparent: rgba(0, 0, 0, 0.3);
 
 $border-white-light: #f1f2f4;
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 01f98479623..7a3a2ddd363 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -205,3 +205,33 @@
     text-align: center;
   }
 }
+
+.user-profile {
+  @media (max-width: $screen-xs-max) {
+    .cover-block {
+      padding-top: 20px;
+    }
+
+    .cover-controls {
+      position: static;
+      margin-bottom: 20px;
+
+      .btn {
+        display: inline-block;
+        width: 48%;
+      }
+    }
+  }
+
+  .cover-controls {
+    @media (max-width: $screen-xs-max) {
+      position: static;
+      margin-bottom: 20px;
+
+      .btn {
+        display: inline-block;
+        width: 48%;
+      }
+    }
+  }
+}
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index ffce7b1fc48..8c23a4ed1a4 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -8,12 +8,16 @@
   .container-fluid
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"
-    .cover-title
-      %h1 @#{@group.path}
+    .group-info
+      .cover-title
+        %h1
+          @#{@group.path}
+          %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
+            = visibility_level_icon(@group.visibility_level, fw: false)
 
-    - if @group.description.present?
-      .cover-desc.description
-        = markdown(@group.description, pipeline: :description)
+      - if @group.description.present?
+        .cover-desc.description
+          = markdown(@group.description, pipeline: :description)
 
 %div{ class: container_class }
   .top-area

From 3004386b55fede6381e5e0794c12625e2b83de25 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 3 May 2016 15:37:59 -0600
Subject: [PATCH 0115/1431] Revert "Remove the Devise Async gem."

This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
---
 CHANGELOG                           | 1 -
 Gemfile                             | 1 +
 Gemfile.lock                        | 3 +++
 app/models/user.rb                  | 2 +-
 config/initializers/devise_async.rb | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 config/initializers/devise_async.rb

diff --git a/CHANGELOG b/CHANGELOG
index 11b1768c8eb..5e64e776f78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,7 +10,6 @@ v 8.8.0 (unreleased)
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
   - Updated search UI
   - Display informative message when new milestone is created
-  - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitLab Enterprise support from EE
diff --git a/Gemfile b/Gemfile
index 25c13fda575..890fcbc1318 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres
 # Authentication libraries
 gem 'devise',                 '~> 3.5.4'
 gem 'doorkeeper',             '~> 3.1'
+gem 'devise-async',           '~> 0.9.0'
 gem 'omniauth',               '~> 1.3.1'
 gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index b1e954e0884..ae91b0fb6dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,6 +164,8 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    devise-async (0.9.0)
+      devise (~> 3.2)
     devise-two-factor (2.0.1)
       activesupport
       attr_encrypted (~> 1.3.2)
@@ -920,6 +922,7 @@ DEPENDENCIES
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
   devise (~> 3.5.4)
+  devise-async (~> 0.9.0)
   devise-two-factor (~> 2.0.0)
   diffy (~> 3.0.3)
   doorkeeper (~> 3.1)
diff --git a/app/models/user.rb b/app/models/user.rb
index b6f405c6981..ab48f8f1960 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -91,7 +91,7 @@ class User < ActiveRecord::Base
   devise :two_factor_backupable, otp_number_of_backup_codes: 10
   serialize :otp_backup_codes, JSON
 
-  devise :lockable, :recoverable, :rememberable, :trackable,
+  devise :lockable, :async, :recoverable, :rememberable, :trackable,
     :validatable, :omniauthable, :confirmable, :registerable
 
   attr_accessor :force_random_password
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
new file mode 100644
index 00000000000..05a1852cdbd
--- /dev/null
+++ b/config/initializers/devise_async.rb
@@ -0,0 +1 @@
+Devise::Async.backend = :sidekiq

From 82b5bb91179438bb74f0b6ce31f6fd3cebac6645 Mon Sep 17 00:00:00 2001
From: Aral Balkan <aral@aralbalkan.com>
Date: Wed, 4 May 2016 06:58:40 +0000
Subject: [PATCH 0116/1431] Made it clearer that issue_id means iid, not id.

---
 doc/api/notes.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/api/notes.md b/doc/api/notes.md
index 7aa1c2155bf..a6b5b1787fd 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -15,7 +15,7 @@ GET /projects/:id/issues/:issue_id/notes
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The ID of an issue
+- `issue_id` (required) - The IID of an issue (not ID)
 
 ```json
 [
@@ -73,7 +73,7 @@ GET /projects/:id/issues/:issue_id/notes/:note_id
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The ID of a project issue
+- `issue_id` (required) - The IID of a project issue (not ID)
 - `note_id` (required) - The ID of an issue note
 
 ### Create new issue note
@@ -87,7 +87,7 @@ POST /projects/:id/issues/:issue_id/notes
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The ID of an issue
+- `issue_id` (required) - The IID of an issue (not ID)
 - `body` (required) - The content of a note
 - `created_at` (optional) - Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z
 
@@ -102,7 +102,7 @@ PUT /projects/:id/issues/:issue_id/notes/:note_id
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The ID of an issue
+- `issue_id` (required) - The IID of an issue (not ID)
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
@@ -120,7 +120,7 @@ Parameters:
 | Attribute | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `id` | integer | yes | The ID of a project |
-| `issue_id` | integer | yes | The ID of an issue |
+| `issue_id` | integer | yes | The IID of an issue |
 | `note_id` | integer | yes | The ID of a note |
 
 ```bash

From b0ddbaa07cd780b0ed86aa4e3c24744c6426b1e1 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 18 Apr 2016 08:14:40 -0400
Subject: [PATCH 0117/1431] Added docker registry view

---
 app/controllers/projects/images_controller.rb | 26 ++++++++++
 app/helpers/gitlab_routing_helper.rb          |  4 ++
 app/helpers/projects_helper.rb                |  4 ++
 app/models/project.rb                         |  4 ++
 app/models/registry.rb                        | 42 ++++++++++++++++
 app/views/layouts/nav/_project.html.haml      |  7 +++
 .../projects/images/_header_title.html.haml   |  1 +
 app/views/projects/images/index.html.haml     | 48 +++++++++++++++++++
 config/initializers/mime_types.rb             |  7 +++
 config/routes.rb                              |  2 +
 lib/gitlab/regex.rb                           |  4 ++
 lib/registry_client.rb                        | 38 +++++++++++++++
 12 files changed, 187 insertions(+)
 create mode 100644 app/controllers/projects/images_controller.rb
 create mode 100644 app/models/registry.rb
 create mode 100644 app/views/projects/images/_header_title.html.haml
 create mode 100644 app/views/projects/images/index.html.haml
 create mode 100644 lib/registry_client.rb

diff --git a/app/controllers/projects/images_controller.rb b/app/controllers/projects/images_controller.rb
new file mode 100644
index 00000000000..5b10746aa0d
--- /dev/null
+++ b/app/controllers/projects/images_controller.rb
@@ -0,0 +1,26 @@
+class Projects::ImagesController < Projects::ApplicationController
+  before_action :authorize_read_image!
+  before_action :authorize_update_image!, only: [:destroy]
+  before_action :tag, except: [:index]
+  layout 'project'
+
+  def index
+    @tags = registry.tags
+  end
+
+  def destroy
+    # registry.destroy_tag(tag['fsLayers'].first['blobSum'])
+    registry.destroy_tag(registry.tag_digest(params[:id]))
+    redirect_to namespace_project_images_path(project.namespace, project)
+  end
+
+  private
+
+  def registry
+    @registry ||= project.registry
+  end
+
+  def tag
+    @tag ||= registry.tag(params[:id])
+  end
+end
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index f07eff3fb57..66cb41cc496 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -33,6 +33,10 @@ module GitlabRoutingHelper
     namespace_project_builds_path(project.namespace, project, *args)
   end
 
+  def project_images_path(project, *args)
+    namespace_project_images_path(project.namespace, project, *args)
+  end
+
   def activity_project_path(project, *args)
     activity_namespace_project_path(project.namespace, project, *args)
   end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3d5e61d2c18..6d1e630a097 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,6 +152,10 @@ module ProjectsHelper
       nav_tabs << :builds
     end
 
+    if can?(current_user, :read_image, project)
+      nav_tabs << :images
+    end
+
     if can?(current_user, :admin_project, project)
       nav_tabs << :settings
     end
diff --git a/app/models/project.rb b/app/models/project.rb
index 76265a59ea7..496f9f3e347 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -370,6 +370,10 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
+  def registry
+    @registry ||= Registry.new(path_with_namespace, self)
+  end
+
   def registry_repository_url
     "#{Gitlab.config.registry.host_with_port}/#{path_with_namespace}" if images_enabled? && Gitlab.config.registry.enabled
   end
diff --git a/app/models/registry.rb b/app/models/registry.rb
new file mode 100644
index 00000000000..b4ef60a016f
--- /dev/null
+++ b/app/models/registry.rb
@@ -0,0 +1,42 @@
+require 'net/http'
+
+class Registry
+  attr_accessor :path_with_namespace, :project
+
+  def initialize(path_with_namespace, project)
+    @path_with_namespace = path_with_namespace
+    @project = project
+  end
+
+  def tags
+    @tags ||= client.tags(path_with_namespace)
+  end
+
+  def tag(reference)
+    return @tag[reference] if defined?(@tag[reference])
+    @tag ||= {}
+    @tag[reference] ||= client.tag(path_with_namespace, reference)
+  end
+
+  def tag_digest(reference)
+    return @tag_digest[reference] if defined?(@tag_digest[reference])
+    @tag_digest ||= {}
+    @tag_digest[reference] ||= client.tag_digest(path_with_namespace, reference)
+  end
+
+  def destroy_tag(reference)
+    client.delete_tag(path_with_namespace, reference)
+  end
+
+  def blob_size(blob)
+    return @blob_size[blob] if defined?(@blob_size[blob])
+    @blob_size ||= {}
+    @blob_size[blob] ||= client.blob_size(path_with_namespace, blob)
+  end
+
+  private
+
+  def client
+    @client ||= RegistryClient.new(Gitlab.config.registry.api_url)
+  end
+end
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 479bde33719..2577afefa95 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -46,6 +46,13 @@
           Builds
           %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
+  - if project_nav_tab? :images
+    = nav_link(controller: %w(images)) do
+      = link_to project_images_path(@project), title: 'Images', class: 'shortcuts-images' do
+        = icon('image fw')
+        %span
+          Images
+
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
       = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
diff --git a/app/views/projects/images/_header_title.html.haml b/app/views/projects/images/_header_title.html.haml
new file mode 100644
index 00000000000..648aeeef2dc
--- /dev/null
+++ b/app/views/projects/images/_header_title.html.haml
@@ -0,0 +1 @@
+- header_title project_title(@project, "Images", project_images_path(@project))
diff --git a/app/views/projects/images/index.html.haml b/app/views/projects/images/index.html.haml
new file mode 100644
index 00000000000..338f3e5662c
--- /dev/null
+++ b/app/views/projects/images/index.html.haml
@@ -0,0 +1,48 @@
+- page_title "Images"
+= render "header_title"
+
+.top-area
+  .nav-controls
+
+.gray-content-block
+  A list of Docker Images for this project
+
+%ul.content-list
+  - if @tags.blank?
+    %li
+      .nothing-here-block No images to show
+  - else
+    .table-holder
+      %table.table.builds
+        %thead
+          %tr
+            %th Name
+            %th Layers
+            %th Size
+            %th Created
+            %th Docker
+            %th
+
+        - @tags.sort.each do |tag|
+          - details = @registry.tag(tag)
+          - layer = details['history'].first
+          - if layer && layer['v1Compatibility']
+            - layer_data = JSON.parse(layer['v1Compatibility'])
+          %tr
+            %td
+              = link_to namespace_project_image_path(@project.namespace, @project, tag) do
+                #{details['name']}:#{details['tag']}
+            %td
+              = details['fsLayers'].length
+            %td
+              = number_to_human_size(details['fsLayers'].inject(0) { |sum, d| sum + @registry.blob_size(d['blobSum']) }.bytes)
+            %td
+              - if layer_data
+                = time_ago_in_words(DateTime.rfc3339(layer_data['created']))
+            %td
+              - if layer_data
+                = layer_data['docker_version']
+            %td.content
+              .controls.hidden-xs.pull-right
+                = link_to namespace_project_image_path(@project.namespace, @project, tag), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
+                  = icon("trash cred")
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index ca58ae92d1b..71e3c9d7db4 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -8,3 +8,10 @@ Mime::Type.register_alias "text/plain", :diff
 Mime::Type.register_alias "text/plain", :patch
 Mime::Type.register_alias 'text/html',  :markdown
 Mime::Type.register_alias 'text/html',  :md
+#Mime::Type.unregister :json
+Mime::Type.register_alias 'application/vnd.docker.distribution.manifest.v1+prettyjws', :json
+#Mime::Type.register 'application/json', :json, %w( text/plain text/x-json application/jsonrequest )
+
+ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup('application/vnd.docker.distribution.manifest.v1+prettyjws')]=lambda do |body|
+  JSON.parse(body)
+end
diff --git a/config/routes.rb b/config/routes.rb
index 5b48819dd9d..0280898accd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -690,6 +690,8 @@ Rails.application.routes.draw do
           end
         end
 
+        resources :images, only: [:index, :destroy], constraints: { id: Gitlab::Regex.image_reference_regex }
+
         resources :milestones, constraints: { id: /\d+/ } do
           member do
             put :sort_issues
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index ace906a6f59..9b8f416ddfa 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -96,5 +96,9 @@ module Gitlab
         (?<![\/.])                (?# rule #6-7)
       }x.freeze
     end
+
+    def image_reference_regex
+      git_reference_regex
+    end
   end
 end
diff --git a/lib/registry_client.rb b/lib/registry_client.rb
new file mode 100644
index 00000000000..87518a7b39c
--- /dev/null
+++ b/lib/registry_client.rb
@@ -0,0 +1,38 @@
+require 'HTTParty'
+
+class RegistryClient
+  attr_accessor :uri
+
+  def initialize(uri)
+    @uri = uri
+  end
+
+  def tags(name)
+    response = HTTParty.get("#{uri}/v2/#{name}/tags/list")
+    response.parsed_response['tags']
+  end
+
+  def tag(name, reference)
+    response = HTTParty.get("#{uri}/v2/#{name}/manifests/#{reference}")
+    JSON.parse(response)
+  end
+
+  def tag_digest(name, reference)
+    response = HTTParty.head("#{uri}/v2/#{name}/manifests/#{reference}")
+    response.headers['docker-content-digest'].split(':')
+  end
+
+  def delete_tag(name, reference)
+    response = HTTParty.delete("#{uri}/v2/#{name}/manifests/#{reference}")
+    response.parsed_response
+  end
+
+  def blob_size(name, digest)
+    response = HTTParty.head("#{uri}/v2/#{name}/blobs/#{digest}")
+    response.headers.content_length
+  end
+
+  def delete_blob(name, digest)
+    HTTParty.delete("#{uri}/v2/#{name}/blobs/#{digest}")
+  end
+end

From 5f89c9642e6fa48d0487e40ea2dc6977676855dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 4 May 2016 12:17:12 +0200
Subject: [PATCH 0118/1431] Fix a spec that was failing due to !3483
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Spec were skipped in this MR so that tests started to fail in master
instead of in this MR!

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/features/login_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 4433ef2d6f1..8c38dd5b122 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -37,7 +37,7 @@ feature 'Login', feature: true do
       end
 
       def enter_code(code)
-        fill_in 'Two-factor authentication code', with: code
+        fill_in 'Two-factor Authentication code', with: code
         click_button 'Verify code'
       end
 

From 70551217a6cc250dc2e9a61720fc447df74e38c7 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 4 May 2016 13:17:43 +0200
Subject: [PATCH 0119/1431] Fixed username links in the performance guide

These would end up being rendered as:

    <a href="...">@yorickpeterse</a>
    <a href="...">@yorickpeterse</a>

[ci skip]
---
 doc/development/performance.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/development/performance.md b/doc/development/performance.md
index 41f415812a0..fb37b3a889c 100644
--- a/doc/development/performance.md
+++ b/doc/development/performance.md
@@ -16,7 +16,7 @@ The process of solving performance problems is roughly as follows:
    timings, etc) to the issue mentioned in step 1.
 4. Solve the problem.
 5. Create a merge request, assign the "performance" label and ping the right
-   people (e.g. [@yorickpeterse][@yorickpeterse] and [@joshfng][@joshfng]).
+   people (e.g. [@yorickpeterse][yorickpeterse] and [@joshfng][joshfng]).
 6. Once a change has been deployed make sure to _again_ measure for at least 24
    hours to see if your changes have any impact on the production environment.
 7. Repeat until you're done.
@@ -253,6 +253,6 @@ impact on runtime performance, and as such, using a constant instead of
 referencing an object directly may even slow code down.
 
 [#15607]: https://gitlab.com/gitlab-org/gitlab-ce/issues/15607
-[@yorickpeterse]: https://gitlab.com/u/yorickpeterse
-[@joshfng]: https://gitlab.com/u/joshfng
+[yorickpeterse]: https://gitlab.com/u/yorickpeterse
+[joshfng]: https://gitlab.com/u/joshfng
 [anti-pattern]: https://en.wikipedia.org/wiki/Anti-pattern

From 9243b6d0197ee7e3f1856d7e16f750fa74341851 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 14:22:54 +0200
Subject: [PATCH 0120/1431] Implement Container Registry API client

---
 app/controllers/projects/images_controller.rb | 16 +++--
 app/models/project.rb                         |  5 +-
 app/models/registry.rb                        | 42 ------------
 app/views/projects/images/index.html.haml     | 28 ++++----
 lib/image_registry/blob.rb                    | 47 ++++++++++++++
 lib/image_registry/client.rb                  | 64 +++++++++++++++++++
 lib/image_registry/config.rb                  | 15 +++++
 lib/image_registry/registry.rb                | 14 ++++
 lib/image_registry/repository.rb              | 38 +++++++++++
 lib/image_registry/tag.rb                     | 62 ++++++++++++++++++
 lib/registry_client.rb                        | 38 -----------
 11 files changed, 263 insertions(+), 106 deletions(-)
 delete mode 100644 app/models/registry.rb
 create mode 100644 lib/image_registry/blob.rb
 create mode 100644 lib/image_registry/client.rb
 create mode 100644 lib/image_registry/config.rb
 create mode 100644 lib/image_registry/registry.rb
 create mode 100644 lib/image_registry/repository.rb
 create mode 100644 lib/image_registry/tag.rb
 delete mode 100644 lib/registry_client.rb

diff --git a/app/controllers/projects/images_controller.rb b/app/controllers/projects/images_controller.rb
index 5b10746aa0d..cf3bdd42cf4 100644
--- a/app/controllers/projects/images_controller.rb
+++ b/app/controllers/projects/images_controller.rb
@@ -5,22 +5,24 @@ class Projects::ImagesController < Projects::ApplicationController
   layout 'project'
 
   def index
-    @tags = registry.tags
+    @tags = image_repository.tags
   end
 
   def destroy
-    # registry.destroy_tag(tag['fsLayers'].first['blobSum'])
-    registry.destroy_tag(registry.tag_digest(params[:id]))
-    redirect_to namespace_project_images_path(project.namespace, project)
+    if tag.delete
+      redirect_to namespace_project_images_path(project.namespace, project)
+    else
+      redirect_to namespace_project_images_path(project.namespace, project), alert: 'Failed to remove tag'
+    end
   end
 
   private
 
-  def registry
-    @registry ||= project.registry
+  def image_repository
+    @image_repository ||= project.image_repository
   end
 
   def tag
-    @tag ||= registry.tag(params[:id])
+    @tag ||= image_repository[params[:id]]
   end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 496f9f3e347..b905ebbfcaa 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -370,8 +370,9 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
-  def registry
-    @registry ||= Registry.new(path_with_namespace, self)
+  def image_repository
+    @registry ||= ImageRegistry::Registry.new(Gitlab.config.registry.api_url)
+    @image_repository ||= ImageRegistry::Repository.new(@registry, path_with_namespace)
   end
 
   def registry_repository_url
diff --git a/app/models/registry.rb b/app/models/registry.rb
deleted file mode 100644
index b4ef60a016f..00000000000
--- a/app/models/registry.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'net/http'
-
-class Registry
-  attr_accessor :path_with_namespace, :project
-
-  def initialize(path_with_namespace, project)
-    @path_with_namespace = path_with_namespace
-    @project = project
-  end
-
-  def tags
-    @tags ||= client.tags(path_with_namespace)
-  end
-
-  def tag(reference)
-    return @tag[reference] if defined?(@tag[reference])
-    @tag ||= {}
-    @tag[reference] ||= client.tag(path_with_namespace, reference)
-  end
-
-  def tag_digest(reference)
-    return @tag_digest[reference] if defined?(@tag_digest[reference])
-    @tag_digest ||= {}
-    @tag_digest[reference] ||= client.tag_digest(path_with_namespace, reference)
-  end
-
-  def destroy_tag(reference)
-    client.delete_tag(path_with_namespace, reference)
-  end
-
-  def blob_size(blob)
-    return @blob_size[blob] if defined?(@blob_size[blob])
-    @blob_size ||= {}
-    @blob_size[blob] ||= client.blob_size(path_with_namespace, blob)
-  end
-
-  private
-
-  def client
-    @client ||= RegistryClient.new(Gitlab.config.registry.api_url)
-  end
-end
diff --git a/app/views/projects/images/index.html.haml b/app/views/projects/images/index.html.haml
index 338f3e5662c..0987c7a39eb 100644
--- a/app/views/projects/images/index.html.haml
+++ b/app/views/projects/images/index.html.haml
@@ -17,32 +17,26 @@
         %thead
           %tr
             %th Name
-            %th Layers
+            %th Revision
             %th Size
             %th Created
-            %th Docker
             %th
 
-        - @tags.sort.each do |tag|
-          - details = @registry.tag(tag)
-          - layer = details['history'].first
-          - if layer && layer['v1Compatibility']
-            - layer_data = JSON.parse(layer['v1Compatibility'])
+        - @tags.each do |tag|
           %tr
             %td
-              = link_to namespace_project_image_path(@project.namespace, @project, tag) do
-                #{details['name']}:#{details['tag']}
+              = link_to namespace_project_image_path(@project.namespace, @project, tag.name) do
+                #{tag.repository.name}:#{tag.name}
             %td
-              = details['fsLayers'].length
+              - if layer = tag.layers.first
+                \##{layer.short_revision}
             %td
-              = number_to_human_size(details['fsLayers'].inject(0) { |sum, d| sum + @registry.blob_size(d['blobSum']) }.bytes)
+              = pluralize(tag.layers.size, "layer")
+              &nbsp;
+              = number_to_human_size(tag.total_size)
             %td
-              - if layer_data
-                = time_ago_in_words(DateTime.rfc3339(layer_data['created']))
-            %td
-              - if layer_data
-                = layer_data['docker_version']
+              = time_ago_in_words(tag.created_at)
             %td.content
               .controls.hidden-xs.pull-right
-                = link_to namespace_project_image_path(@project.namespace, @project, tag), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
+                = link_to namespace_project_image_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
                   = icon("trash cred")
diff --git a/lib/image_registry/blob.rb b/lib/image_registry/blob.rb
new file mode 100644
index 00000000000..1aeeba7a686
--- /dev/null
+++ b/lib/image_registry/blob.rb
@@ -0,0 +1,47 @@
+module ImageRegistry
+  class Blob
+    attr_reader :repository, :config
+
+    def initialize(repository, config)
+      @repository = repository
+      @config = config || {}
+    end
+
+    def valid?
+      digest.present?
+    end
+
+    def digest
+      config['digest']
+    end
+
+    def type
+      config['mediaType']
+    end
+
+    def size
+      config['size']
+    end
+
+    def revision
+      digest.split(':')[1]
+    end
+
+    def short_revision
+      revision[0..8]
+    end
+
+    def client
+      @client ||= repository.client
+    end
+
+    def delete
+      client.delete_blob(repository.name, digest)
+    end
+
+    def data
+      return @data if defined?(@data)
+      @data ||= client.blob(repository.name, digest, type)
+    end
+  end
+end
diff --git a/lib/image_registry/client.rb b/lib/image_registry/client.rb
new file mode 100644
index 00000000000..b2e43ce4aeb
--- /dev/null
+++ b/lib/image_registry/client.rb
@@ -0,0 +1,64 @@
+require 'faraday'
+require 'faraday_middleware'
+
+module ImageRegistry
+  class Client
+    attr_accessor :uri
+
+    MANIFEST_VERSION = 'application/vnd.docker.distribution.manifest.v2+json'
+
+    def initialize(base_uri, options = {})
+      @base_uri = base_uri
+      @faraday = Faraday.new(@base_uri) do |builder|
+        builder.request :json
+        builder.headers['Accept'] = MANIFEST_VERSION
+
+        builder.response :json, :content_type => /\bjson$/
+        builder.response :json, :content_type => 'application/vnd.docker.distribution.manifest.v1+prettyjws'
+
+        if options[:user] && options[:password]
+          builder.request(:basic_auth, options[:user].to_s, options[:password].to_s)
+        elsif options[:token]
+          builder.request(:authentication, :Bearer, options[:token].to_s)
+        end
+
+        builder.adapter :net_http
+      end
+    end
+
+    def repository_tags(name)
+      @faraday.get("/v2/#{name}/tags/list").body
+    end
+
+    def repository_manifest(name, reference)
+      @faraday.get("/v2/#{name}/manifests/#{reference}").body
+    end
+
+    def put_repository_manifest(name, reference, manifest)
+      @faraday.put("/v2/#{name}/manifests/#{reference}", manifest, { "Content-Type" => MANIFEST_VERSION }).success?
+    end
+
+    def repository_mount_blob(name, digest, from)
+      @faraday.post("/v2/#{name}/blobls/uploads/?mount=#{digest}&from=#{from}").status == 201
+    end
+
+    def repository_tag_digest(name, reference)
+      response = @faraday.head("/v2/#{name}/manifests/#{reference}")
+      response.headers['docker-content-digest'] if response.success?
+    end
+
+    def delete_repository_tag(name, reference)
+      @faraday.delete("/v2/#{name}/manifests/#{reference}").success?
+    end
+
+    def blob(name, digest, type = nil)
+      headers = {}
+      headers['Accept'] = type if type
+      @faraday.get("/v2/#{name}/blobs/#{digest}", nil, headers).body
+    end
+
+    def delete_blob(name, digest)
+      @faraday.delete("/v2/#{name}/blobs/#{digest}").success?
+    end
+  end
+end
diff --git a/lib/image_registry/config.rb b/lib/image_registry/config.rb
new file mode 100644
index 00000000000..1c2abec1bfa
--- /dev/null
+++ b/lib/image_registry/config.rb
@@ -0,0 +1,15 @@
+module ImageRegistry
+  class Config
+    attr_reader :tag, :blob, :data
+
+    def initialize(tag, blob)
+      @tag, @blob = tag, blob
+      @data = JSON.parse(blob.data)
+    end
+
+    def [](key)
+      return unless data
+      data[key]
+    end
+  end
+end
diff --git a/lib/image_registry/registry.rb b/lib/image_registry/registry.rb
new file mode 100644
index 00000000000..d8de8e392e9
--- /dev/null
+++ b/lib/image_registry/registry.rb
@@ -0,0 +1,14 @@
+module ImageRegistry
+  class Registry
+    attr_reader :uri, :client
+
+    def initialize(uri, options = {})
+      @uri = URI.parse(uri)
+      @client = ImageRegistry::Client.new(uri, options)
+    end
+
+    def [](name)
+      ImageRegistry::Repository.new(self, name)
+    end
+  end
+end
diff --git a/lib/image_registry/repository.rb b/lib/image_registry/repository.rb
new file mode 100644
index 00000000000..f4f4ba65afc
--- /dev/null
+++ b/lib/image_registry/repository.rb
@@ -0,0 +1,38 @@
+module ImageRegistry
+  class Repository
+    attr_reader :registry, :name
+
+    def initialize(registry, name)
+      @registry, @name = registry, name
+    end
+
+    def client
+      @client ||= registry.client
+    end
+
+    def [](tag)
+      ImageRegistry::Tag.new(self, tag)
+    end
+
+    def manifest
+      return @manifest if defined?(@manifest)
+      @manifest = client.repository_tags(name)
+    end
+
+    def valid?
+      manifest.present?
+    end
+
+    def tags
+      return @tags if defined?(@tags)
+      return unless manifest && manifest['tags']
+      @tags = manifest['tags'].map do |tag|
+        ImageRegistry::Tag.new(self, tag)
+      end
+    end
+
+    def delete
+      tags.each(:delete)
+    end
+  end
+end
diff --git a/lib/image_registry/tag.rb b/lib/image_registry/tag.rb
new file mode 100644
index 00000000000..2bf0b8e345f
--- /dev/null
+++ b/lib/image_registry/tag.rb
@@ -0,0 +1,62 @@
+module ImageRegistry
+  class Tag
+    attr_reader :repository, :name
+
+    def initialize(repository, name)
+      @repository, @name = repository, name
+    end
+
+    def valid?
+      manifest.present?
+    end
+
+    def manifest
+      return @manifest if defined?(@manifest)
+      @manifest = client.repository_manifest(repository.name, name)
+    end
+
+    def [](key)
+      return unless manifest
+      manifest[key]
+    end
+
+    def digest
+      return @digest if defined?(@digest)
+      @digest = client.repository_tag_digest(repository.name, name)
+    end
+
+    def config
+      return @config if defined?(@config)
+      return unless manifest && manifest['config']
+      blob = ImageRegistry::Blob.new(repository, manifest['config'])
+      @config = ImageRegistry::Config.new(self, blob)
+    end
+
+    def created_at
+      return unless config
+      @created_at ||= DateTime.rfc3339(config['created'])
+    end
+
+    def layers
+      return @layers if defined?(@layers)
+      return unless manifest
+      @layers = manifest['layers'].map do |layer|
+        ImageRegistry::Blob.new(repository, layer)
+      end
+    end
+
+    def total_size
+      return unless layers
+      layers.map(&:size).sum
+    end
+
+    def delete
+      return unless digest
+      client.delete_repository_tag(repository.name, digest)
+    end
+
+    def client
+      @client ||= repository.client
+    end
+  end
+end
diff --git a/lib/registry_client.rb b/lib/registry_client.rb
deleted file mode 100644
index 87518a7b39c..00000000000
--- a/lib/registry_client.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'HTTParty'
-
-class RegistryClient
-  attr_accessor :uri
-
-  def initialize(uri)
-    @uri = uri
-  end
-
-  def tags(name)
-    response = HTTParty.get("#{uri}/v2/#{name}/tags/list")
-    response.parsed_response['tags']
-  end
-
-  def tag(name, reference)
-    response = HTTParty.get("#{uri}/v2/#{name}/manifests/#{reference}")
-    JSON.parse(response)
-  end
-
-  def tag_digest(name, reference)
-    response = HTTParty.head("#{uri}/v2/#{name}/manifests/#{reference}")
-    response.headers['docker-content-digest'].split(':')
-  end
-
-  def delete_tag(name, reference)
-    response = HTTParty.delete("#{uri}/v2/#{name}/manifests/#{reference}")
-    response.parsed_response
-  end
-
-  def blob_size(name, digest)
-    response = HTTParty.head("#{uri}/v2/#{name}/blobs/#{digest}")
-    response.headers.content_length
-  end
-
-  def delete_blob(name, digest)
-    HTTParty.delete("#{uri}/v2/#{name}/blobs/#{digest}")
-  end
-end

From d85b88962b603d46672ed6ebd01955ca7560fcc6 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 14:23:43 +0200
Subject: [PATCH 0121/1431] Remove unused mime_types

---
 config/initializers/mime_types.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 71e3c9d7db4..ca58ae92d1b 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -8,10 +8,3 @@ Mime::Type.register_alias "text/plain", :diff
 Mime::Type.register_alias "text/plain", :patch
 Mime::Type.register_alias 'text/html',  :markdown
 Mime::Type.register_alias 'text/html',  :md
-#Mime::Type.unregister :json
-Mime::Type.register_alias 'application/vnd.docker.distribution.manifest.v1+prettyjws', :json
-#Mime::Type.register 'application/json', :json, %w( text/plain text/x-json application/jsonrequest )
-
-ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup('application/vnd.docker.distribution.manifest.v1+prettyjws')]=lambda do |body|
-  JSON.parse(body)
-end

From 9bd5ac50b4c0677a2999ccee4f13e2c8e20a2def Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Wed, 4 May 2016 21:33:55 +0900
Subject: [PATCH 0122/1431] Use new build badge URLs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 36f4bb12df0..c1a29c3bb1e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # GitLab
 
-[![build status](https://ci.gitlab.com/projects/1/status.svg?ref=master)](https://ci.gitlab.com/projects/1?ref=master)
+[![build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
 [![Build Status](https://semaphoreci.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/400484/shields_badge.svg)](https://semaphoreci.com/gitlabhq/gitlabhq)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
 [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.svg?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)

From 7168493e8a25836dc7eedf25ec3241afd0d501b8 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 14:35:18 +0200
Subject: [PATCH 0123/1431] Remove container registry on project removal

---
 app/services/projects/destroy_service.rb | 8 ++++++++
 lib/image_registry/repository.rb         | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index df5054f08d7..70bfc1fd533 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -28,6 +28,10 @@ module Projects
       Project.transaction do
         project.destroy!
 
+        unless remove_registry_tags
+          raise_error('Failed to remove project image registry. Please try again or contact administrator')
+        end
+
         unless remove_repository(repo_path)
           raise_error('Failed to remove project repository. Please try again or contact administrator')
         end
@@ -61,6 +65,10 @@ module Projects
       end
     end
 
+    def remove_registry_tags
+      project.image_registry.delete_tags
+    end
+
     def raise_error(message)
       raise DestroyError.new(message)
     end
diff --git a/lib/image_registry/repository.rb b/lib/image_registry/repository.rb
index f4f4ba65afc..c45fa2911e7 100644
--- a/lib/image_registry/repository.rb
+++ b/lib/image_registry/repository.rb
@@ -31,7 +31,8 @@ module ImageRegistry
       end
     end
 
-    def delete
+    def delete_tags
+      return unless tags
       tags.each(:delete)
     end
   end

From e1c8663a3e7ad1f77a8476888331c376cc35eda5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 15:15:16 +0200
Subject: [PATCH 0124/1431] Allow to copy all manifests from one container
 repository to another

---
 lib/image_registry/blob.rb       |  4 ++++
 lib/image_registry/client.rb     |  2 +-
 lib/image_registry/repository.rb | 16 ++++++++++++++++
 lib/image_registry/tag.rb        | 21 +++++++++++++++++----
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/lib/image_registry/blob.rb b/lib/image_registry/blob.rb
index 1aeeba7a686..43665149e23 100644
--- a/lib/image_registry/blob.rb
+++ b/lib/image_registry/blob.rb
@@ -43,5 +43,9 @@ module ImageRegistry
       return @data if defined?(@data)
       @data ||= client.blob(repository.name, digest, type)
     end
+
+    def mount_to(to_repository)
+      client.repository_mount_blob(to_repository.name, digest, repository.name)
+    end
   end
 end
diff --git a/lib/image_registry/client.rb b/lib/image_registry/client.rb
index b2e43ce4aeb..84375ce8029 100644
--- a/lib/image_registry/client.rb
+++ b/lib/image_registry/client.rb
@@ -39,7 +39,7 @@ module ImageRegistry
     end
 
     def repository_mount_blob(name, digest, from)
-      @faraday.post("/v2/#{name}/blobls/uploads/?mount=#{digest}&from=#{from}").status == 201
+      @faraday.post("/v2/#{name}/blobs/uploads/?mount=#{digest}&from=#{from}").status == 201
     end
 
     def repository_tag_digest(name, reference)
diff --git a/lib/image_registry/repository.rb b/lib/image_registry/repository.rb
index c45fa2911e7..763d8669555 100644
--- a/lib/image_registry/repository.rb
+++ b/lib/image_registry/repository.rb
@@ -29,11 +29,27 @@ module ImageRegistry
       @tags = manifest['tags'].map do |tag|
         ImageRegistry::Tag.new(self, tag)
       end
+      @tags ||= []
     end
 
     def delete_tags
       return unless tags
       tags.each(:delete)
     end
+
+    def mount_blob(blob)
+      return unless blob
+      client.repository_mount_blob(name, blob.digest, blob.repository.name)
+    end
+
+    def mount_manifest(tag, manifest)
+      client.put_repository_manifest(name, tag, manifest)
+    end
+
+    def copy_to(other_repository)
+      tags.all? do |tag|
+        tag.copy_to(other_repository)
+      end
+    end
   end
 end
diff --git a/lib/image_registry/tag.rb b/lib/image_registry/tag.rb
index 2bf0b8e345f..76946a6ce5b 100644
--- a/lib/image_registry/tag.rb
+++ b/lib/image_registry/tag.rb
@@ -25,11 +25,15 @@ module ImageRegistry
       @digest = client.repository_tag_digest(repository.name, name)
     end
 
-    def config
-      return @config if defined?(@config)
+    def config_blob
+      return @config_blob if defined?(@config_blob)
       return unless manifest && manifest['config']
-      blob = ImageRegistry::Blob.new(repository, manifest['config'])
-      @config = ImageRegistry::Config.new(self, blob)
+      @config_blob = ImageRegistry::Blob.new(repository, manifest['config'])
+    end
+
+    def config
+      return unless config_blob
+      @config ||= ImageRegistry::Config.new(self, config_blob)
     end
 
     def created_at
@@ -55,6 +59,15 @@ module ImageRegistry
       client.delete_repository_tag(repository.name, digest)
     end
 
+    def copy_to(repository)
+      return unless manifest
+      layers.each do |blob|
+        repository.mount_blob(blob)
+      end
+      repository.mount_blob(config_blob)
+      repository.mount_manifest(name, manifest.to_json)
+    end
+
     def client
       @client ||= repository.client
     end

From f660b2173e408a0e527b9852c92b2d57982885b5 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 4 May 2016 12:54:11 +0100
Subject: [PATCH 0125/1431] Instrument methods used in email diffs

Make all of the nested constant instrumentation for core app code work
the same way, add mailer instrumentation, and add instrumentation to the
premailer gem.
---
 CHANGELOG                      |  3 +++
 config/initializers/metrics.rb | 35 ++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4c68c836080..268c7a81108 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,9 @@ v 8.8.0 (unreleased)
   - Added multiple colors for labels in dropdowns when dups happen.
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
 
+v 8.7.3
+  - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
+
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously
   - Fix error 500 when trying to create a wiki page
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 283936d0efc..b2d08d87bac 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -61,12 +61,30 @@ if Gitlab::Metrics.enabled?
       config.instrument_instance_methods(const)
     end
 
-    Dir[Rails.root.join('app', 'finders', '*.rb')].each do |path|
-      const = File.basename(path, '.rb').camelize.constantize
+    # Path to search => prefix to strip from constant
+    paths_to_instrument = {
+      ['app', 'finders']                    => ['app', 'finders'],
+      ['app', 'mailers', 'emails']          => ['app', 'mailers'],
+      ['app', 'services', '**']             => ['app', 'services'],
+      ['lib', 'gitlab', 'diff']             => ['lib'],
+      ['lib', 'gitlab', 'email', 'message'] => ['lib']
+    }
 
-      config.instrument_instance_methods(const)
+    paths_to_instrument.each do |(path, prefix)|
+      prefix = Rails.root.join(*prefix)
+
+      Dir[Rails.root.join(*path + ['*.rb'])].each do |file_path|
+        path = Pathname.new(file_path).relative_path_from(prefix)
+        const = path.to_s.sub('.rb', '').camelize.constantize
+
+        config.instrument_methods(const)
+        config.instrument_instance_methods(const)
+      end
     end
 
+    config.instrument_methods(Premailer::Adapter::Nokogiri)
+    config.instrument_instance_methods(Premailer::Adapter::Nokogiri)
+
     [
       :Blame, :Branch, :BranchCollection, :Blob, :Commit, :Diff, :Repository,
       :Tag, :TagCollection, :Tree
@@ -97,17 +115,6 @@ if Gitlab::Metrics.enabled?
     config.instrument_methods(Gitlab::ReferenceExtractor)
     config.instrument_instance_methods(Gitlab::ReferenceExtractor)
 
-    # Instrument all service classes
-    services = Rails.root.join('app', 'services')
-
-    Dir[services.join('**', '*.rb')].each do |file_path|
-      path = Pathname.new(file_path).relative_path_from(services)
-      const = path.to_s.sub('.rb', '').camelize.constantize
-
-      config.instrument_methods(const)
-      config.instrument_instance_methods(const)
-    end
-
     # Instrument the classes used for checking if somebody has push access.
     config.instrument_instance_methods(Gitlab::GitAccess)
     config.instrument_instance_methods(Gitlab::GitAccessWiki)

From de008127eb9a7a14b06b2e4a3d3d1822ad6a54d7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 16:16:54 +0200
Subject: [PATCH 0126/1431] Fix bearer token support

---
 lib/image_registry/client.rb     | 2 +-
 lib/image_registry/repository.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/image_registry/client.rb b/lib/image_registry/client.rb
index 84375ce8029..a4432059097 100644
--- a/lib/image_registry/client.rb
+++ b/lib/image_registry/client.rb
@@ -19,7 +19,7 @@ module ImageRegistry
         if options[:user] && options[:password]
           builder.request(:basic_auth, options[:user].to_s, options[:password].to_s)
         elsif options[:token]
-          builder.request(:authentication, :Bearer, options[:token].to_s)
+          builder.request(:authorization, :bearer, options[:token].to_s)
         end
 
         builder.adapter :net_http
diff --git a/lib/image_registry/repository.rb b/lib/image_registry/repository.rb
index 763d8669555..43e8e7720db 100644
--- a/lib/image_registry/repository.rb
+++ b/lib/image_registry/repository.rb
@@ -25,7 +25,7 @@ module ImageRegistry
 
     def tags
       return @tags if defined?(@tags)
-      return unless manifest && manifest['tags']
+      return [] unless manifest && manifest['tags']
       @tags = manifest['tags'].map do |tag|
         ImageRegistry::Tag.new(self, tag)
       end

From 7731bb59c8d43cfa7e47c945d7aed05e5e3932c1 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 16:17:08 +0200
Subject: [PATCH 0127/1431] Use bearer token to access registry

---
 app/models/project.rb                             |  3 ++-
 app/services/jwt/docker_authentication_service.rb | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index b905ebbfcaa..c50ea45d3eb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -371,7 +371,8 @@ class Project < ActiveRecord::Base
   end
 
   def image_repository
-    @registry ||= ImageRegistry::Registry.new(Gitlab.config.registry.api_url)
+    @registry_token ||= Jwt::DockerAuthenticationService.full_access_token(path_with_namespace)
+    @registry ||= ImageRegistry::Registry.new(Gitlab.config.registry.api_url, token: @registry_token)
     @image_repository ||= ImageRegistry::Repository.new(@registry, path_with_namespace)
   end
 
diff --git a/app/services/jwt/docker_authentication_service.rb b/app/services/jwt/docker_authentication_service.rb
index ce28085e5d6..16d77193a1e 100644
--- a/app/services/jwt/docker_authentication_service.rb
+++ b/app/services/jwt/docker_authentication_service.rb
@@ -8,6 +8,17 @@ module Jwt
       { token: token.encoded }
     end
 
+    def self.full_access_token(*names)
+      registry = Gitlab.config.registry
+      token = ::Jwt::RSAToken.new(registry.key)
+      token.issuer = registry.issuer
+      token.audience = 'docker'
+      token[:access] = names.map do |name|
+        { type: 'repository', name: name, actions: %w(pull push) }
+      end
+      token.encoded
+    end
+
     private
 
     def token

From 2afae7eac97d24d51eb949b9faa676314f06cdd6 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 16:17:35 +0200
Subject: [PATCH 0128/1431] Use Container Images instead of Images

---
 .../projects/images/_header_title.html.haml   |  2 +-
 app/views/projects/images/index.html.haml     | 30 +++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/views/projects/images/_header_title.html.haml b/app/views/projects/images/_header_title.html.haml
index 648aeeef2dc..f583e7fcfef 100644
--- a/app/views/projects/images/_header_title.html.haml
+++ b/app/views/projects/images/_header_title.html.haml
@@ -1 +1 @@
-- header_title project_title(@project, "Images", project_images_path(@project))
+- header_title project_title(@project, "Container Images", project_images_path(@project))
diff --git a/app/views/projects/images/index.html.haml b/app/views/projects/images/index.html.haml
index 0987c7a39eb..3732698c088 100644
--- a/app/views/projects/images/index.html.haml
+++ b/app/views/projects/images/index.html.haml
@@ -1,11 +1,23 @@
-- page_title "Images"
+- page_title "Container Images"
 = render "header_title"
 
-.top-area
-  .nav-controls
+.light.prepend-top-default
+  %p
+    A 'container image' is a snapshot of a container.
+    You can host your 'container images' with GitLab.
+    %br
+    To start using container images hosted on GitLab you first need to login:
+    %pre
+      %code
+        docker login #{Gitlab.config.registry.host_port}
+    %br
+    Then you are free to create and upload a container images with build and push commands:
+    %pre
+      docker build -t #{Gitlab.config.registry.host_port}/#{@project.path_with_namespace} .
+      %br
+      docker push #{Gitlab.config.registry.host_port}/#{@project.path_with_namespace}
 
-.gray-content-block
-  A list of Docker Images for this project
+%hr
 
 %ul.content-list
   - if @tags.blank?
@@ -25,15 +37,15 @@
         - @tags.each do |tag|
           %tr
             %td
-              = link_to namespace_project_image_path(@project.namespace, @project, tag.name) do
-                #{tag.repository.name}:#{tag.name}
+              #{tag.repository.name}:#{tag.name}
+              = clipboard_button(clipboard_text: "docker pull #{Gitlab.config.registry.host_port}/#{tag.repository.name}:#{tag.name}")
             %td
               - if layer = tag.layers.first
                 \##{layer.short_revision}
             %td
-              = pluralize(tag.layers.size, "layer")
-              &nbsp;
               = number_to_human_size(tag.total_size)
+              &middot;
+              = pluralize(tag.layers.size, "layer")
             %td
               = time_ago_in_words(tag.created_at)
             %td.content

From 9e619d3813764566e5f4c0208e5f2c7365351808 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 4 May 2016 16:28:01 +0200
Subject: [PATCH 0129/1431] Use Container Images

---
 app/views/layouts/nav/_project.html.haml  | 4 ++--
 app/views/projects/images/index.html.haml | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 2577afefa95..bef350adf34 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -49,9 +49,9 @@
   - if project_nav_tab? :images
     = nav_link(controller: %w(images)) do
       = link_to project_images_path(@project), title: 'Images', class: 'shortcuts-images' do
-        = icon('image fw')
+        = icon('hdd-o fw')
         %span
-          Images
+          Container Images
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
diff --git a/app/views/projects/images/index.html.haml b/app/views/projects/images/index.html.haml
index 3732698c088..08f67345b4a 100644
--- a/app/views/projects/images/index.html.haml
+++ b/app/views/projects/images/index.html.haml
@@ -29,7 +29,7 @@
         %thead
           %tr
             %th Name
-            %th Revision
+            %th Digest
             %th Size
             %th Created
             %th
@@ -41,7 +41,10 @@
               = clipboard_button(clipboard_text: "docker pull #{Gitlab.config.registry.host_port}/#{tag.repository.name}:#{tag.name}")
             %td
               - if layer = tag.layers.first
-                \##{layer.short_revision}
+                %span.has-tooltip(title="#{layer.revision}")
+                  = layer.short_revision
+              - else
+                \-
             %td
               = number_to_human_size(tag.total_size)
               &middot;

From 44f89eafc08a7967544429a3f930354a5f9bbbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 15 Apr 2016 12:15:52 +0200
Subject: [PATCH 0130/1431] Use Rugged's TagCollection#create instead of
 gitlab-shell's Repository#add_tag for better performance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                              |  1 +
 app/models/repository.rb               | 11 +++++--
 app/services/create_tag_service.rb     | 44 ++++++++++++--------------
 features/steps/project/commits/tags.rb |  4 +--
 lib/gitlab/backend/shell.rb            | 18 -----------
 spec/models/repository_spec.rb         | 11 ++++---
 spec/requests/api/tags_spec.rb         |  4 +--
 7 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4c5c2b42dfa..577a3643d97 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.8.0 (unreleased)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitLab Enterprise support from EE
+  - Create tags using Rugged for performance reasons. !3745
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Added multiple colors for labels in dropdowns when dups happen.
diff --git a/app/models/repository.rb b/app/models/repository.rb
index b4319297e43..c4e38980a83 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -146,10 +146,17 @@ class Repository
     find_branch(branch_name)
   end
 
-  def add_tag(tag_name, ref, message = nil)
+  def add_tag(user, tag_name, ref, message = nil)
     before_push_tag
 
-    gitlab_shell.add_tag(path_with_namespace, tag_name, ref, message)
+    options = { message: message, tagger: user_to_committer(user) } if message
+
+    tag = rugged.tags.create(tag_name, ref, options)
+    if tag.annotated?
+      Gitlab::Git::Tag.new(tag_name, ref, tag.annotation.message)
+    else
+      Gitlab::Git::Tag.new(tag_name, ref)
+    end
   end
 
   def rm_branch(user, branch_name)
diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb
index 55985380d31..775f9db2a46 100644
--- a/app/services/create_tag_service.rb
+++ b/app/services/create_tag_service.rb
@@ -8,32 +8,28 @@ class CreateTagService < BaseService
     end
 
     repository = project.repository
-    existing_tag = repository.find_tag(tag_name)
-    if existing_tag
-      return error('Tag already exists')
-    end
-
     message.strip! if message
-
-    repository.add_tag(tag_name, ref, message)
-    new_tag = repository.find_tag(tag_name)
-
-    if new_tag
-      push_data = create_push_data(project, current_user, new_tag)
-      EventCreateService.new.push(project, current_user, push_data)
-      project.execute_hooks(push_data.dup, :tag_push_hooks)
-      project.execute_services(push_data.dup, :tag_push_hooks)
-      CreateCommitBuildsService.new.execute(project, current_user, push_data)
-
-      if release_description
-        CreateReleaseService.new(@project, @current_user).
-          execute(tag_name, release_description)
-      end
-
-      success(new_tag)
-    else
-      error('Invalid reference name')
+    begin
+      new_tag = repository.add_tag(current_user, tag_name, ref, message)
+    rescue Rugged::TagError
+      return error("Tag #{tag_name} already exists")
+    rescue Rugged::ReferenceError
+      return error("Target #{ref} is invalid")
     end
+
+    push_data = create_push_data(project, current_user, new_tag)
+
+    EventCreateService.new.push(project, current_user, push_data)
+    project.execute_hooks(push_data.dup, :tag_push_hooks)
+    project.execute_services(push_data.dup, :tag_push_hooks)
+    CreateCommitBuildsService.new.execute(project, current_user, push_data)
+
+    if release_description
+      CreateReleaseService.new(@project, @current_user).
+        execute(tag_name, release_description)
+    end
+
+    success(new_tag)
   end
 
   def success(branch)
diff --git a/features/steps/project/commits/tags.rb b/features/steps/project/commits/tags.rb
index eff4234a44a..912ba580efd 100644
--- a/features/steps/project/commits/tags.rb
+++ b/features/steps/project/commits/tags.rb
@@ -57,11 +57,11 @@ class Spinach::Features::ProjectCommitsTags < Spinach::FeatureSteps
   end
 
   step 'I should see new an error that tag ref is invalid' do
-    expect(page).to have_content 'Invalid reference name'
+    expect(page).to have_content 'Target foo is invalid'
   end
 
   step 'I should see new an error that tag already exists' do
-    expect(page).to have_content 'Tag already exists'
+    expect(page).to have_content 'Tag v1.0.0 already exists'
   end
 
   step "I visit tag 'v1.1.0' page" do
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 5e2fb863a8f..132f9cd1966 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -79,24 +79,6 @@ module Gitlab
                                    'rm-project', "#{name}.git"])
     end
 
-    # Add repository tag from passed ref
-    #
-    # path - project path with namespace
-    # tag_name - new tag name
-    # ref - HEAD for new tag
-    # message - optional message for tag (annotated tag)
-    #
-    # Ex.
-    #   add_tag("gitlab/gitlab-ci", "v4.0", "master")
-    #   add_tag("gitlab/gitlab-ci", "v4.0", "master", "message")
-    #
-    def add_tag(path, tag_name, ref, message = nil)
-      cmd = %W(#{gitlab_shell_path}/bin/gitlab-projects create-tag #{path}.git
-               #{tag_name} #{ref})
-      cmd << message unless message.nil? || message.empty?
-      Gitlab::Utils.system_silent(cmd)
-    end
-
     # Gc repository
     #
     # path - project path with namespace
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 397bb5a8028..5cdf644a0e1 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -859,12 +859,15 @@ describe Repository, models: true do
 
   describe '#add_tag' do
     it 'adds a tag' do
+      user = build_stubbed(:user)
       expect(repository).to receive(:before_push_tag)
+      expect(repository.rugged.tags).to receive(:create).
+        with('8.5', 'master',
+             hash_including(message: 'foo',
+                            tagger: hash_including(name: user.name, email: user.email))).
+        and_call_original
 
-      expect_any_instance_of(Gitlab::Shell).to receive(:add_tag).
-        with(repository.path_with_namespace, '8.5', 'master', 'foo')
-
-      repository.add_tag('8.5', 'master', 'foo')
+      repository.add_tag(user, '8.5', 'master', 'foo')
     end
   end
 
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index edcb2bedbf7..12e170b232f 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -147,7 +147,7 @@ describe API::API, api: true  do
            tag_name: 'v8.0.0',
            ref: 'master'
       expect(response.status).to eq(400)
-      expect(json_response['message']).to eq('Tag already exists')
+      expect(json_response['message']).to eq('Tag v8.0.0 already exists')
     end
 
     it 'should return 400 if ref name is invalid' do
@@ -155,7 +155,7 @@ describe API::API, api: true  do
            tag_name: 'mytag',
            ref: 'foo'
       expect(response.status).to eq(400)
-      expect(json_response['message']).to eq('Invalid reference name')
+      expect(json_response['message']).to eq('Target foo is invalid')
     end
   end
 

From 209f2f1e6fd861dd7bb6a73389400b4bb266d26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 25 Apr 2016 16:31:45 +0200
Subject: [PATCH 0131/1431] Use a similar approach to branch creation for tag
 creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/repository.rb                 | 17 ++++----
 app/services/create_branch_service.rb    |  5 ---
 app/services/create_tag_service.rb       | 46 +++++++-------------
 spec/models/repository_spec.rb           | 32 ++++++++++----
 spec/services/create_tag_service_spec.rb | 53 ++++++++++++++++++++++++
 5 files changed, 101 insertions(+), 52 deletions(-)
 create mode 100644 spec/services/create_tag_service_spec.rb

diff --git a/app/models/repository.rb b/app/models/repository.rb
index c4e38980a83..d5d70f41fd3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -146,17 +146,20 @@ class Repository
     find_branch(branch_name)
   end
 
-  def add_tag(user, tag_name, ref, message = nil)
-    before_push_tag
+  def add_tag(user, tag_name, target, message = nil)
+    oldrev = Gitlab::Git::BLANK_SHA
+    ref    = Gitlab::Git::TAG_REF_PREFIX + tag_name
+    target = commit(target).try(:id)
+
+    return false unless target
 
     options = { message: message, tagger: user_to_committer(user) } if message
 
-    tag = rugged.tags.create(tag_name, ref, options)
-    if tag.annotated?
-      Gitlab::Git::Tag.new(tag_name, ref, tag.annotation.message)
-    else
-      Gitlab::Git::Tag.new(tag_name, ref)
+    GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do
+      rugged.tags.create(tag_name, target, options)
     end
+
+    find_tag(tag_name)
   end
 
   def rm_branch(user, branch_name)
diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb
index 707c2f7ff85..9f4481a8153 100644
--- a/app/services/create_branch_service.rb
+++ b/app/services/create_branch_service.rb
@@ -43,9 +43,4 @@ class CreateBranchService < BaseService
     out[:branch] = branch
     out
   end
-
-  def build_push_data(project, user, branch)
-    Gitlab::PushDataBuilder.
-      build(project, user, Gitlab::Git::BLANK_SHA, branch.target, "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch.name}", [])
-  end
 end
diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb
index 775f9db2a46..91ed0e354d0 100644
--- a/app/services/create_tag_service.rb
+++ b/app/services/create_tag_service.rb
@@ -1,46 +1,30 @@
 require_relative 'base_service'
 
 class CreateTagService < BaseService
-  def execute(tag_name, ref, message, release_description = nil)
+  def execute(tag_name, target, message, release_description = nil)
     valid_tag = Gitlab::GitRefValidator.validate(tag_name)
-    if valid_tag == false
-      return error('Tag name invalid')
-    end
+    return error('Tag name invalid') unless valid_tag
 
     repository = project.repository
     message.strip! if message
+
+    new_tag = nil
     begin
-      new_tag = repository.add_tag(current_user, tag_name, ref, message)
+      new_tag = repository.add_tag(current_user, tag_name, target, message)
     rescue Rugged::TagError
       return error("Tag #{tag_name} already exists")
-    rescue Rugged::ReferenceError
-      return error("Target #{ref} is invalid")
+    rescue GitHooksService::PreReceiveError
+      return error('Tag creation was rejected by Git hook')
     end
 
-    push_data = create_push_data(project, current_user, new_tag)
-
-    EventCreateService.new.push(project, current_user, push_data)
-    project.execute_hooks(push_data.dup, :tag_push_hooks)
-    project.execute_services(push_data.dup, :tag_push_hooks)
-    CreateCommitBuildsService.new.execute(project, current_user, push_data)
-
-    if release_description
-      CreateReleaseService.new(@project, @current_user).
-        execute(tag_name, release_description)
+    if new_tag
+      if release_description
+        CreateReleaseService.new(@project, @current_user).
+          execute(tag_name, release_description)
+      end
+      success.merge(tag: new_tag)
+    else
+      error("Target #{target} is invalid")
     end
-
-    success(new_tag)
-  end
-
-  def success(branch)
-    out = super()
-    out[:tag] = branch
-    out
-  end
-
-  def create_push_data(project, user, tag)
-    commits = [project.commit(tag.target)].compact
-    Gitlab::PushDataBuilder.
-      build(project, user, Gitlab::Git::BLANK_SHA, tag.target, "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}", commits, tag.message)
   end
 end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 5cdf644a0e1..b3359a42237 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -858,16 +858,30 @@ describe Repository, models: true do
   end
 
   describe '#add_tag' do
-    it 'adds a tag' do
-      user = build_stubbed(:user)
-      expect(repository).to receive(:before_push_tag)
-      expect(repository.rugged.tags).to receive(:create).
-        with('8.5', 'master',
-             hash_including(message: 'foo',
-                            tagger: hash_including(name: user.name, email: user.email))).
-        and_call_original
+    context 'with a valid target' do
+      let(:user) { build_stubbed(:user) }
 
-      repository.add_tag(user, '8.5', 'master', 'foo')
+      it 'creates the tag using rugged' do
+        expect(repository.rugged.tags).to receive(:create).
+          with('8.5', repository.commit('master').id,
+            hash_including(message: 'foo',
+                           tagger: hash_including(name: user.name, email: user.email))).
+          and_call_original
+
+        repository.add_tag(user, '8.5', 'master', 'foo')
+      end
+
+      it 'returns a Gitlab::Git::Tag object' do
+        tag = repository.add_tag(user, '8.5', 'master', 'foo')
+
+        expect(tag).to be_a(Gitlab::Git::Tag)
+      end
+    end
+
+    context 'with an invalid target' do
+      it 'returns false' do
+        expect(repository.add_tag(user, '8.5', 'bar', 'foo')).to be false
+      end
     end
   end
 
diff --git a/spec/services/create_tag_service_spec.rb b/spec/services/create_tag_service_spec.rb
new file mode 100644
index 00000000000..91f9e663b66
--- /dev/null
+++ b/spec/services/create_tag_service_spec.rb
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe CreateTagService, services: true do
+  let(:project) { create(:project) }
+  let(:repository) { project.repository }
+  let(:user) { create(:user) }
+  let(:service) { described_class.new(project, user) }
+
+  describe '#execute' do
+    it 'creates the tag and returns success' do
+      response = service.execute('v42.42.42', 'master', 'Foo')
+
+      expect(response[:status]).to eq(:success)
+      expect(response[:tag]).to be_a Gitlab::Git::Tag
+      expect(response[:tag].name).to eq('v42.42.42')
+    end
+
+    context 'when target is invalid' do
+      it 'returns an error' do
+        response = service.execute('v1.1.0', 'foo', 'Foo')
+
+        expect(response).to eq(status: :error,
+                               message: 'Target foo is invalid')
+      end
+    end
+
+    context 'when tag already exists' do
+      it 'returns an error' do
+        expect(repository).to receive(:add_tag).
+          with(user, 'v1.1.0', 'master', 'Foo').
+          and_raise(Rugged::TagError)
+
+        response = service.execute('v1.1.0', 'master', 'Foo')
+
+        expect(response).to eq(status: :error,
+                               message: 'Tag v1.1.0 already exists')
+      end
+    end
+
+    context 'when pre-receive hook fails' do
+      it 'returns an error' do
+        expect(repository).to receive(:add_tag).
+          with(user, 'v1.1.0', 'master', 'Foo').
+          and_raise(GitHooksService::PreReceiveError)
+
+        response = service.execute('v1.1.0', 'master', 'Foo')
+
+        expect(response).to eq(status: :error,
+                               message: 'Tag creation was rejected by Git hook')
+      end
+    end
+  end
+end

From fb5682e7cd587e7e6c871588240fc49b325b042f Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem@posteo.de>
Date: Sat, 30 Apr 2016 16:35:10 +0200
Subject: [PATCH 0132/1431] Use the new admin settings for gravatar

---
 CHANGELOG                         | 1 +
 app/views/profiles/show.html.haml | 4 ++--
 config/gitlab.yml.example         | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index cc6588c6cbd..4505b424987 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.8.0 (unreleased)
   - Added multiple colors for labels in dropdowns when dups happen.
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
+  - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index f59d27f7ed0..eef50d887c7 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -8,11 +8,11 @@
       %p
         - if @user.avatar?
           You can change your avatar here
-          - if Gitlab.config.gravatar.enabled
+          - if gravatar_enabled?
             or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
         - else
           You can upload an avatar here
-          - if Gitlab.config.gravatar.enabled
+          - if gravatar_enabled?
             or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
     .col-lg-9
       .clearfix.avatar-image.append-bottom-default
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 07ce4b6d715..e682bcb976d 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -152,7 +152,6 @@ production: &base
   ## Gravatar
   ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
   gravatar:
-    enabled: true                 # Use user avatar image from Gravatar.com (default: true)
     # gravatar urls: possible placeholders: %{hash} %{size} %{email}
     # plain_url: "http://..."     # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
     # ssl_url:   "https://..."    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon

From 731b231357f3b0b71f60a3bb1f81f8cd78f3e318 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 3 May 2016 20:55:35 -0700
Subject: [PATCH 0133/1431] Log to application.log when an admin starts and
 stops impersonating a user

Closes gitlab-org/gitlab-ee#536
---
 CHANGELOG                                          | 1 +
 app/controllers/admin/impersonations_controller.rb | 2 ++
 app/controllers/admin/users_controller.rb          | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b2f5c283a1a..5f1793d472a 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.8.0 (unreleased)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
+  - Log to application.log when an admin starts and stops impersonating a user
   - Make build status canceled if any of the jobs was canceled and none failed
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
diff --git a/app/controllers/admin/impersonations_controller.rb b/app/controllers/admin/impersonations_controller.rb
index 2db824c87ef..8be35f00a77 100644
--- a/app/controllers/admin/impersonations_controller.rb
+++ b/app/controllers/admin/impersonations_controller.rb
@@ -7,6 +7,8 @@ class Admin::ImpersonationsController < Admin::ApplicationController
 
     warden.set_user(impersonator, scope: :user)
 
+    Gitlab::AppLogger.info("User #{original_user.username} has stopped impersonating #{impersonator.username}")
+
     session[:impersonator_id] = nil
 
     redirect_to admin_user_path(original_user)
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b8976fa09a9..f2f654c7bcd 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -41,6 +41,8 @@ class Admin::UsersController < Admin::ApplicationController
 
       warden.set_user(user, scope: :user)
 
+      Gitlab::AppLogger.info("User #{current_user.username} has started impersonating #{user.username}")
+
       flash[:alert] = "You are now impersonating #{user.username}"
 
       redirect_to root_path

From b9672d4b38514a14cc39773d30f55c9629973f63 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 4 May 2016 00:59:20 -0700
Subject: [PATCH 0134/1431] Limit the number of merge requests per project to
 avoid long seeds

This step was taking a long time because seed_fu creates N / 2 merge requests
for each repo, where N is the number of branches for that repo. At the time of
this writing, there are 234 branches on the gitlab-ce repo, leading to 117
merge requests.
---
 db/fixtures/development/10_merge_requests.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index 0825776ffaa..87fb8e3300d 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -1,6 +1,9 @@
 Gitlab::Seeder.quiet do
+  # Limit the number of merge requests per project to avoid long seeds
+  MAX_NUM_MERGE_REQUESTS = 10
+
   Project.all.reject(&:empty_repo?).each do |project|
-    branches = project.repository.branch_names
+    branches = project.repository.branch_names.sample(MAX_NUM_MERGE_REQUESTS * 2)
 
     branches.each do |branch_name|
       break if branches.size < 2

From 003b36b45f38ca3116af5d9179fff4adb26a4eb1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 11:43:47 -0500
Subject: [PATCH 0135/1431] Fixed layout nav, revert back to badge styles,
 general enhancements

---
 app/assets/stylesheets/framework/nav.scss     | 36 +++++++++++++------
 app/assets/stylesheets/framework/sidebar.scss |  8 +++++
 app/views/groups/show.html.haml               |  2 +-
 app/views/layouts/_page.html.haml             |  2 +-
 app/views/layouts/nav/_group.html.haml        |  6 ++--
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 2ada2b9f2f2..c79de099d38 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -140,6 +140,12 @@
       }
     }
 
+    .project-filter-form {
+      input {
+        background-color: $background-color;
+      }
+    }
+
     @media (max-width: $screen-xs-max) {
       padding-bottom: 0;
 
@@ -187,13 +193,17 @@
 }
 
 .layout-nav {
+  position: fixed;
+  top: 58px;
+  width: 100%;
+  z-index: 1;
   background: $background-color;
   border-bottom: 1px solid $border-color;
+  transition-duration: .3s;
 
   .controls {
     float: right;
-    position: relative;
-    top: 0;
+    padding: 12px 5px 0 0;
 
     .dropdown {
       margin-left: 7px;
@@ -218,15 +228,21 @@
       }
     }
   }
-}
 
-.nav-links {
-  border-bottom: none;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
+  .nav-links {
+    border-bottom: none;
 
-  a {
-    padding-top: 2px;
+    li {
+
+      .badge {
+        color: $gl-icon-color;
+      }
+
+    }
   }
+
+}
+
+.page-with-layout-nav {
+  margin-top: 56px;
 }
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 18189e985c4..32d948e4c53 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -254,6 +254,10 @@
       }
     }
   }
+
+  .layout-nav {
+    padding-right: $sidebar_collapsed_width;
+  }
 }
 
 .page-sidebar-expanded {
@@ -280,6 +284,10 @@
       }
     }
   }
+
+  .layout-nav {
+    padding-right: $sidebar_width;
+  }
 }
 
 .right-sidebar-collapsed {
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 8c23a4ed1a4..089de798bd8 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,7 +5,7 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 .cover-block.groups-cover-block
-  .container-fluid
+  .container-fluid.container-limited
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"
     .group-info
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index ad8a2e1e6c7..3c3bc41bf0e 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -26,7 +26,7 @@
     .layout-nav
       .container-fluid
         = render "layouts/nav/#{nav}"
-  .content-wrapper
+  .content-wrapper{ class: ('page-with-layout-nav' if defined?(nav) && nav) }
     = render "layouts/flash"
     = yield :flash_message
     %div{ class: (container_class unless @no_container) }
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 705682aeb29..0971bccfcd4 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -44,16 +44,14 @@
       %span
         Issues
         - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count
-          (#{number_with_delimiter(issues.count)})
+        %span.badge.count= number_with_delimiter(issues.count)
   = nav_link(path: 'groups#merge_requests') do
     = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
       = icon('tasks fw')
       %span
         Merge Requests
         - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count
-          (#{number_with_delimiter(merge_requests.count)})
+        %span.badge.count= number_with_delimiter(merge_requests.count)
   = nav_link(controller: [:group_members]) do
     = link_to group_group_members_path(@group), title: 'Members' do
       = icon('users fw')

From 17d23283a119fcfc2f6ac070bb5df8d913abf2e7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 4 May 2016 12:46:53 -0500
Subject: [PATCH 0136/1431] Restore "r" shortcut

---
 app/assets/javascripts/shortcuts_issuable.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/shortcuts_issuable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee
index ad9b3c1c6bf..ccb42ab2168 100644
--- a/app/assets/javascripts/shortcuts_issuable.coffee
+++ b/app/assets/javascripts/shortcuts_issuable.coffee
@@ -6,6 +6,10 @@ class @ShortcutsIssuable extends ShortcutsNavigation
     super()
     Mousetrap.bind('a', @openSidebarDropdown.bind(@, 'assignee'))
     Mousetrap.bind('m', @openSidebarDropdown.bind(@, 'milestone'))
+    Mousetrap.bind('r', =>
+      @replyWithSelectedText()
+      return false
+    )
     Mousetrap.bind('j', =>
       @prevIssue()
       return false

From 4ed9e5f5bebc5d3e11c21a929fdf57b8b014a31b Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 13:11:38 -0500
Subject: [PATCH 0137/1431] Update font colors, font sizes, caret icon, avatar
 size

---
 app/assets/stylesheets/framework/avatar.scss  |  1 +
 app/assets/stylesheets/framework/blocks.scss  |  8 +++++
 app/assets/stylesheets/framework/nav.scss     | 33 +++++++++++++++++--
 .../stylesheets/framework/variables.scss      |  1 +
 app/views/groups/show.html.haml               |  2 +-
 app/views/layouts/nav/_group.html.haml        |  2 +-
 6 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 5aa425dab6c..f5ce70b606b 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -28,6 +28,7 @@
   &.s46 { width: 46px; height: 46px; margin-right: 15px; }
   &.s48 { width: 48px; height: 48px; margin-right: 10px; }
   &.s60 { width: 60px; height: 60px; margin-right: 12px; }
+  &.s70 { width: 70px; height: 70px; margin-right: 14px; }
   &.s90 { width: 90px; height: 90px; margin-right: 15px; }
   &.s110 { width: 110px; height: 110px; margin-right: 15px; }
   &.s140 { width: 140px; height: 140px; margin-right: 20px; }
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index a78b1f30e61..e85eac585f2 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -158,6 +158,10 @@
     padding: 24px 0;
 
     .group-info {
+      .cover-title {
+        margin-top: 9px;
+      }
+
       p {
         margin-bottom: 0;
       }
@@ -173,8 +177,12 @@
   }
 
   .group-info {
+
     h1 {
       display: inline;
+      font-weight: normal;
+      font-size: 24px;
+      color: $gl-title-color;
     }
   }
 }
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index c79de099d38..5c205ab7245 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -203,7 +203,21 @@
 
   .controls {
     float: right;
-    padding: 12px 5px 0 0;
+    padding: 7px 5px 0 0;
+
+    i {
+      color: $layout-link-gray;
+    }
+
+    .fa-rss,
+    .fa-cog {
+      font-size: 16px;
+    }
+
+    .fa-caret-down {
+      margin-left: 5px;
+      color: $gl-icon-color;
+    }
 
     .dropdown {
       margin-left: 7px;
@@ -234,15 +248,28 @@
 
     li {
 
+      a {
+        padding-top: 10px;
+      }
+
+      a, i {
+        color: $layout-link-gray;
+      }
+
+      &.active {
+        a, i {
+          color: $black;
+        }
+      }
+
       .badge {
         color: $gl-icon-color;
       }
-
     }
   }
 
 }
 
 .page-with-layout-nav {
-  margin-top: 56px;
+  margin-top: 52px;
 }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 7c695ba8f46..6c8cdcded1f 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -75,6 +75,7 @@ $settings-icon-size: 18px;
 $provider-btn-group-border: #e5e5e5;
 $provider-btn-not-active-color: #4688f1;
 $link-underline-blue: #4a8bee;
+$layout-link-gray: #7e7c7c;
 
 /*
  * Color schema
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 089de798bd8..77c297255b8 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -7,7 +7,7 @@
 .cover-block.groups-cover-block
   .container-fluid.container-limited
     = link_to group_icon(@group), target: '_blank' do
-      = image_tag group_icon(@group), class: "avatar group-avatar s90"
+      = image_tag group_icon(@group), class: "avatar group-avatar s70"
     .group-info
       .cover-title
         %h1
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 0971bccfcd4..b4b528c614f 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -6,7 +6,7 @@
     %span.dropdown.group-settings-dropdown
       %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
         = icon('cog')
-        = icon('angle-down')
+        = icon('caret-down')
       %ul.dropdown-menu.dropdown-menu-align-right
         = nav_link(path: 'groups#projects') do
           = link_to projects_group_path(@group), title: 'Projects' do

From 525e05b6536123a3117b5ff53fd46a96382d5f9d Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 28 Apr 2016 16:48:37 -0700
Subject: [PATCH 0138/1431] Expire repository exists? and has_visible_content?
 caches after a push if necessary

Closes #17012
---
 CHANGELOG                            | 1 +
 app/services/git_push_service.rb     | 1 +
 app/services/git_tag_push_service.rb | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 25d26535b72..925740e5d98 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ v 8.8.0 (unreleased)
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
+  - Expire repository exists? and has_visible_content? caches after a push if necessary
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index b7af80055bf..66136b62617 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -17,6 +17,7 @@ class GitPushService < BaseService
   #  6. Checks if the project's main language has changed
   #
   def execute
+    @project.repository.after_create if @project.empty_repo?
     @project.repository.after_push_commit(branch_name, params[:newrev])
 
     if push_remove_branch?
diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb
index 64271d8bc5c..7410442609d 100644
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
@@ -2,6 +2,7 @@ class GitTagPushService < BaseService
   attr_accessor :push_data
 
   def execute
+    project.repository.after_create if project.empty_repo?
     project.repository.before_push_tag
 
     @push_data = build_push_data

From 6b4e255aa86864571b7d8dbc338986d4017b4215 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 15:00:33 -0500
Subject: [PATCH 0139/1431] Remove break-all from links

---
 app/assets/stylesheets/pages/notes.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 9619d65db85..50ca755bcb6 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -114,10 +114,6 @@ ul.notes {
           word-break: keep-all;
         }
       }
-
-      a {
-        word-break: break-all;
-      }
     }
 
     .note-header {

From ccd9c4be00a1e783b6d8c821aaec2b975e4a3176 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 14:19:12 -0500
Subject: [PATCH 0140/1431] Reduce height of nav to 50px

---
 app/assets/stylesheets/framework/nav.scss       | 4 ++--
 app/assets/stylesheets/framework/sidebar.scss   | 5 +++--
 app/assets/stylesheets/framework/variables.scss | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 5c205ab7245..bf09b6dadc6 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -194,7 +194,7 @@
 
 .layout-nav {
   position: fixed;
-  top: 58px;
+  top: $header-height;
   width: 100%;
   z-index: 1;
   background: $background-color;
@@ -271,5 +271,5 @@
 }
 
 .page-with-layout-nav {
-  margin-top: 52px;
+  margin-top: 50px;
 }
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 32d948e4c53..e940fd7286e 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -3,6 +3,7 @@
   position: absolute;
   width: 58px;
   cursor: pointer;
+  margin-top: 8px;
 }
 
 .page-with-sidebar {
@@ -62,7 +63,7 @@
       float: left;
       height: $header-height;
       width: 100%;
-      padding: 11px 0 11px 22px;
+      padding-left: 22px;
       overflow: hidden;
       outline: none;
       transition-duration: .3s;
@@ -85,7 +86,7 @@
           margin: 0;
           margin-left: 50px;
           font-size: 19px;
-          line-height: 41px;
+          line-height: 50px;
           font-weight: normal;
         }
       }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 6c8cdcded1f..42772ff5c33 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -65,7 +65,7 @@ $gl-padding-top: 10px;
 $row-hover: #f4f8fe;
 $progress-color: #c0392b;
 $avatar_radius: 50%;
-$header-height: 58px;
+$header-height: 50px;
 $fixed-layout-width: 1280px;
 $gl-avatar-size: 40px;
 $error-exclamation-point: #e62958;

From 8b813277b0cbf57b2a07ad2e1b4cb87dadfb66c5 Mon Sep 17 00:00:00 2001
From: Yatish Mehta <yatish.mehta@coupa.com>
Date: Wed, 4 May 2016 14:04:13 -0700
Subject: [PATCH 0141/1431] Fixed typo in zen.scss and corresponding views

---
 app/assets/stylesheets/framework/zen.scss | 2 +-
 app/views/projects/_md_preview.html.haml  | 2 +-
 app/views/projects/_zen.html.haml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/zen.scss b/app/assets/stylesheets/framework/zen.scss
index f870ea0d87f..ff02ebdd34c 100644
--- a/app/assets/stylesheets/framework/zen.scss
+++ b/app/assets/stylesheets/framework/zen.scss
@@ -32,7 +32,7 @@
   }
 }
 
-.zen-cotrol {
+.zen-control {
   padding: 0;
   color: #555;
   background: none;
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index 8de44a6c914..81afea2c60a 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -8,7 +8,7 @@
         %a.js-md-preview-button{ href: "#md-preview-holder", tabindex: -1 }
           Preview
       %li.pull-right
-        %button.zen-cotrol.zen-control-full.js-zen-enter{ type: 'button', tabindex: -1 }
+        %button.zen-control.zen-control-full.js-zen-enter{ type: 'button', tabindex: -1 }
           Go full screen
 
   .md-write-holder
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml
index e1e35013968..413477a2d3a 100644
--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
@@ -4,5 +4,5 @@
     = f.text_area attr, class: classes, placeholder: placeholder
   - else
     = text_area_tag attr, nil, class: classes, placeholder: placeholder
-  %a.zen-cotrol.zen-control-leave.js-zen-leave{ href: "#" }
+  %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" }
     = icon('compress')

From f18ec70743375024aa7ec7bb86c437ca9198e729 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 4 May 2016 17:05:16 -0400
Subject: [PATCH 0142/1431] Backport changes from gitlab-org/gitlab-ee!372

Mostly replaces several Spinach tests with RSpec Feature tests.
---
 app/helpers/projects_helper.rb                |  3 +-
 features/project/create.feature               | 16 +----
 features/steps/project/create.rb              | 26 +-------
 spec/factories/projects.rb                    | 10 ++-
 ...r_views_empty_project_instructions_spec.rb | 63 +++++++++++++++++++
 spec/helpers/projects_helper_spec.rb          | 10 +--
 6 files changed, 80 insertions(+), 48 deletions(-)
 create mode 100644 spec/features/projects/developer_views_empty_project_instructions_spec.rb

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3d5e61d2c18..62e8c03cc81 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -209,7 +209,8 @@ module ProjectsHelper
   end
 
   def default_url_to_repo(project = @project)
-    if default_clone_protocol == "ssh"
+    case default_clone_protocol
+    when 'ssh'
       project.ssh_url_to_repo
     else
       project.http_url_to_repo
diff --git a/features/project/create.feature b/features/project/create.feature
index 27136798e36..67336d73bf7 100644
--- a/features/project/create.feature
+++ b/features/project/create.feature
@@ -7,20 +7,8 @@ Feature: Project Create
   @javascript
   Scenario: User create a project
     Given I sign in as a user
-    When I visit new project page
     And I have an ssh key
+    When I visit new project page
     And fill project form with valid data
     Then I should see project page
-    And I should see empty project instuctions
-
-  @javascript
-  Scenario: Empty project instructions
-    Given I sign in as a user
-    And I have an ssh key
-    When I visit new project page
-    And fill project form with valid data
-    Then I see empty project instuctions
-    And I click on HTTP
-    Then Remote url should update to http link
-    And If I click on SSH
-    Then Remote url should update to ssh link
+    And I should see empty project instructions
diff --git a/features/steps/project/create.rb b/features/steps/project/create.rb
index 422b151eaa2..5f5f806df36 100644
--- a/features/steps/project/create.rb
+++ b/features/steps/project/create.rb
@@ -13,33 +13,9 @@ class Spinach::Features::ProjectCreate < Spinach::FeatureSteps
     expect(current_path).to eq namespace_project_path(Project.last.namespace, Project.last)
   end
 
-  step 'I should see empty project instuctions' do
+  step 'I should see empty project instructions' do
     expect(page).to have_content "git init"
     expect(page).to have_content "git remote"
     expect(page).to have_content Project.last.url_to_repo
   end
-
-  step 'I see empty project instuctions' do
-    expect(page).to have_content "git init"
-    expect(page).to have_content "git remote"
-    expect(page).to have_content Project.last.url_to_repo
-  end
-
-  step 'I click on HTTP' do
-    find('#clone-dropdown').click
-    find('.http-selector').click
-  end
-
-  step 'Remote url should update to http link' do
-    expect(page).to have_content "git remote add origin #{Project.last.http_url_to_repo}"
-  end
-
-  step 'If I click on SSH' do
-    find('#clone-dropdown').click
-    find('.ssh-selector').click
-  end
-
-  step 'Remote url should update to ssh link' do
-    expect(page).to have_content "git remote add origin #{Project.last.url_to_repo}"
-  end
 end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index c14b99606ba..5338c88dd84 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -61,6 +61,12 @@ FactoryGirl.define do
     trait :private do
       visibility_level Gitlab::VisibilityLevel::PRIVATE
     end
+
+    trait :empty_repo do
+      after(:create) do |project|
+        project.create_repository
+      end
+    end
   end
 
   # Project with empty repository
@@ -68,9 +74,7 @@ FactoryGirl.define do
   # This is a case when you just created a project
   # but not pushed any code there yet
   factory :project_empty_repo, parent: :empty_project do
-    after :create do |project|
-      project.create_repository
-    end
+    empty_repo
   end
 
   # Project with test repository
diff --git a/spec/features/projects/developer_views_empty_project_instructions_spec.rb b/spec/features/projects/developer_views_empty_project_instructions_spec.rb
new file mode 100644
index 00000000000..0c51fe72ca4
--- /dev/null
+++ b/spec/features/projects/developer_views_empty_project_instructions_spec.rb
@@ -0,0 +1,63 @@
+require 'rails_helper'
+
+feature 'Developer views empty project instructions', feature: true do
+  let(:project) { create(:empty_project, :empty_repo) }
+  let(:developer) { create(:user) }
+
+  background do
+    project.team << [developer, :developer]
+
+    login_as(developer)
+  end
+
+  context 'without an SSH key' do
+    scenario 'defaults to HTTP' do
+      visit_project
+
+      expect_instructions_for('http')
+    end
+
+    scenario 'switches to SSH', js: true do
+      visit_project
+
+      select_protocol('SSH')
+
+      expect_instructions_for('ssh')
+    end
+  end
+
+  context 'with an SSH key' do
+    background do
+      create(:personal_key, user: developer)
+    end
+
+    scenario 'defaults to SSH' do
+      visit_project
+
+      expect_instructions_for('ssh')
+    end
+
+    scenario 'switches to HTTP', js: true do
+      visit_project
+
+      select_protocol('HTTP')
+
+      expect_instructions_for('http')
+    end
+  end
+
+  def visit_project
+    visit namespace_project_path(project.namespace, project)
+  end
+
+  def select_protocol(protocol)
+    find('#clone-dropdown').click
+    find(".#{protocol.downcase}-selector").click
+  end
+
+  def expect_instructions_for(protocol)
+    msg = :"#{protocol.downcase}_url_to_repo"
+
+    expect(page).to have_content("git clone #{project.send(msg)}")
+  end
+end
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 62389188d2c..6f7e2ae78fd 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -88,18 +88,18 @@ describe ProjectsHelper do
   end
 
   describe 'default_clone_protocol' do
-    describe 'using HTTP' do
+    context 'when user is not logged in and gitlab protocol is HTTP' do
       it 'returns HTTP' do
-        expect(helper).to receive(:current_user).and_return(nil)
+        allow(helper).to receive(:current_user).and_return(nil)
 
         expect(helper.send(:default_clone_protocol)).to eq('http')
       end
     end
 
-    describe 'using HTTPS' do
+    context 'when user is not logged in and gitlab protocol is HTTPS' do
       it 'returns HTTPS' do
-        allow(Gitlab.config.gitlab).to receive(:protocol).and_return('https')
-        expect(helper).to receive(:current_user).and_return(nil)
+        stub_config_setting(protocol: 'https')
+        allow(helper).to receive(:current_user).and_return(nil)
 
         expect(helper.send(:default_clone_protocol)).to eq('https')
       end

From 75523d1df91cc871847a00cad4e5e1d44278a647 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 3 May 2016 21:32:49 -0700
Subject: [PATCH 0143/1431] Sanitize repo paths in new project error message

Closes #17243
---
 CHANGELOG                                | 1 +
 app/helpers/projects_helper.rb           | 6 ++++++
 app/views/projects/imports/new.html.haml | 2 +-
 spec/helpers/projects_helper_spec.rb     | 9 +++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 25d26535b72..e5dc5e5d4a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Make build status canceled if any of the jobs was canceled and none failed
+  - Sanitize repo paths in new project error message
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
   - Use ActionDispatch Remote IP for Akismet checking
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3d5e61d2c18..3720b0085e5 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -341,4 +341,10 @@ module ProjectsHelper
       )
     end
   end
+
+  def sanitize_repo_path(message)
+    return '' unless message.present?
+
+    message.strip.gsub(Gitlab.config.gitlab_shell.repos_path.chomp('/'), "[REPOS PATH]")
+  end
 end
diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml
index 6027fb23360..a8a8caf7280 100644
--- a/app/views/projects/imports/new.html.haml
+++ b/app/views/projects/imports/new.html.haml
@@ -10,7 +10,7 @@
     .panel-body
       %pre
         :preserve
-          #{@project.import_error.try(:strip)}
+          #{sanitize_repo_path(@project.import_error)}
 
 = form_for @project, url: namespace_project_import_path(@project.namespace, @project), method: :post, html: { class: 'form-horizontal' } do |f|
   = render "shared/import_form", f: f
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 62389188d2c..29bcb8c5892 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -131,4 +131,13 @@ describe ProjectsHelper do
       end
     end
   end
+
+  describe '#sanitized_import_error' do
+    it 'removes the repo path' do
+      repo = File.join(Gitlab.config.gitlab_shell.repos_path, '/namespace/test.git')
+      import_error = "Could not clone #{repo}\n"
+
+      expect(sanitize_repo_path(import_error)).to eq('Could not clone [REPOS PATH]/namespace/test.git')
+    end
+  end
 end

From e4c64855e8531a9375de1d64a95f2e593b80c2bd Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 27 Apr 2016 23:37:07 +0200
Subject: [PATCH 0144/1431] Don't read otp_secret_encryption_key from hardcoded
 path in models/user

Variable `Gitlab::Application.config.secret_key_base` is set in
config/initializers/secret_token.rb. It's very bad practice to use
hard-coded paths inside an application and really unnecessary in this
case.
---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index ab48f8f1960..a468b6ea075 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -85,7 +85,7 @@ class User < ActiveRecord::Base
   default_value_for :theme_id, gitlab_config.default_theme
 
   devise :two_factor_authenticatable,
-         otp_secret_encryption_key: File.read(Rails.root.join('.secret')).chomp
+         otp_secret_encryption_key: Gitlab::Application.config.secret_key_base
   alias_attribute :two_factor_enabled, :otp_required_for_login
 
   devise :two_factor_backupable, otp_number_of_backup_codes: 10

From 7878eb9fa69123981281c2d71a2964dca1b459ee Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 25 Apr 2016 15:02:15 -0500
Subject: [PATCH 0145/1431] Start builds redesign

---
 app/assets/stylesheets/framework/blocks.scss  |  9 +++++--
 app/assets/stylesheets/framework/buttons.scss |  2 +-
 .../stylesheets/framework/tw_bootstrap.scss   |  2 +-
 .../stylesheets/framework/typography.scss     |  4 ++--
 .../stylesheets/framework/variables.scss      |  3 ++-
 app/assets/stylesheets/pages/commit.scss      | 12 ++++++++--
 app/assets/stylesheets/pages/detail_page.scss |  2 +-
 .../stylesheets/pages/merge_requests.scss     | 20 ++++++++++++++--
 app/assets/stylesheets/pages/projects.scss    |  2 +-
 app/views/admin/builds/_build.html.haml       | 20 ++++++++--------
 app/views/admin/builds/index.html.haml        |  3 ++-
 app/views/admin/logs/show.html.haml           |  2 +-
 app/views/admin/users/index.html.haml         |  2 +-
 app/views/dashboard/todos/index.html.haml     |  2 +-
 app/views/events/_event_last_push.html.haml   |  2 +-
 app/views/explore/groups/index.html.haml      |  2 +-
 app/views/explore/snippets/index.html.haml    |  2 +-
 app/views/groups/issues.html.haml             |  2 +-
 app/views/groups/merge_requests.html.haml     |  2 +-
 app/views/groups/milestones/index.html.haml   |  2 +-
 app/views/help/ui.html.haml                   |  6 ++---
 app/views/projects/_last_push.html.haml       |  2 +-
 app/views/projects/_readme.html.haml          |  2 +-
 app/views/projects/artifacts/browse.html.haml |  2 +-
 app/views/projects/branches/index.html.haml   |  2 +-
 app/views/projects/builds/index.html.haml     |  3 ++-
 app/views/projects/builds/show.html.haml      |  4 ++--
 app/views/projects/ci/builds/_build.html.haml |  3 ++-
 .../projects/commit/_ci_commit.html.haml      |  6 +++--
 .../projects/commit/_commit_box.html.haml     | 24 +++++++++----------
 app/views/projects/commits/show.html.haml     |  2 +-
 app/views/projects/compare/index.html.haml    |  2 +-
 app/views/projects/compare/show.html.haml     |  2 +-
 app/views/projects/empty.html.haml            |  2 +-
 app/views/projects/graphs/ci.html.haml        |  2 +-
 app/views/projects/graphs/commits.html.haml   |  2 +-
 app/views/projects/graphs/languages.html.haml |  2 +-
 app/views/projects/graphs/show.html.haml      |  2 +-
 app/views/projects/network/_head.html.haml    |  2 +-
 app/views/projects/releases/edit.html.haml    |  2 +-
 app/views/projects/show.html.haml             |  2 +-
 app/views/projects/snippets/index.html.haml   |  2 +-
 app/views/projects/tags/index.html.haml       |  2 +-
 app/views/projects/tags/show.html.haml        |  2 +-
 app/views/projects/wikis/git_access.html.haml |  2 +-
 app/views/search/_results.html.haml           |  2 +-
 app/views/shared/issuable/_filter.html.haml   |  4 ++--
 app/views/shared/issuable/_form.html.haml     |  2 +-
 app/views/shared/milestones/_top.html.haml    |  2 +-
 app/views/shared/snippets/_header.html.haml   |  2 +-
 .../sherlock/file_samples/show.html.haml      |  2 +-
 app/views/sherlock/queries/show.html.haml     |  2 +-
 .../sherlock/transactions/index.html.haml     |  2 +-
 .../sherlock/transactions/show.html.haml      |  2 +-
 app/views/users/show.html.haml                |  2 +-
 55 files changed, 118 insertions(+), 85 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index e72e4aa47ef..af6f22da281 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -18,7 +18,7 @@
   line-height: 36px;
 }
 
-.gray-content-block {
+.row-content-block {
   margin-top: 0;
   margin-bottom: -$gl-padding;
   background-color: $background-color;
@@ -81,6 +81,11 @@
       margin-left: 10px;
     }
   }
+
+  &.build-content {
+    background-color: $white-light;
+    border-top: none;
+  }
 }
 
 .cover-block {
@@ -113,7 +118,7 @@
     line-height: 1.1;
 
     h1 {
-      color: #313236;
+      color: $gl-gray-dark;
       margin-bottom: 6px;
       font-size: 23px;
     }
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 062da397b6b..edb5ee71f98 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -59,7 +59,7 @@
 }
 
 @mixin btn-gray {
-  @include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, #313236);
+  @include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, $gl-gray-dark);
 }
 
 @mixin btn-white {
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index 96bab7880c2..6a45c34ccbb 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -81,7 +81,7 @@
 
 // Labels
 .label {
-  padding: 2px 4px;
+  padding: 4px 5px;
   font-size: 13px;
   font-style: normal;
   font-weight: normal;
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index b2535ddf4bd..2779cd56788 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -42,14 +42,14 @@
     margin: 24px 0 12px;
     padding: 0 0 10px;
     border-bottom: 1px solid #e7e9ed;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   h2 {
     font-size: 1.2em;
     font-weight: 600;
     margin: 24px 0 12px;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   h3 {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 92ecfe50488..4227839eed3 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -20,7 +20,7 @@ $background-color:   #fafafa;
  */
 $gl-font-size:         15px;
 $gl-title-color:       #333;
-$gl-text-color:        #555;
+$gl-text-color:        #5c5c5c;
 $gl-text-green:        #4a2;
 $gl-text-red:          #d12f19;
 $gl-text-orange:       #d90;
@@ -30,6 +30,7 @@ $gl-placeholder-color: #8f8f8f;
 $gl-icon-color:        $gl-placeholder-color;
 $gl-grayish-blue:      #7f8fa4;
 $gl-gray:              $gl-text-color;
+$gl-gray-dark:         #313236;
 $gl-header-color:      $gl-title-color;
 
 /*
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 358d2f4ab9d..5c945e2d4c9 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -31,9 +31,17 @@
   }
   .commit-committer-link,
   .commit-author-link {
-    color: #444;
+    color: $gl-gray;
     font-weight: bold;
   }
+
+  .ci-status {
+    margin-right: 10px;
+  }
+
+  .fa-clipboard {
+    color: $dropdown-title-btn-color;
+  }
 }
 
 .commit-box {
@@ -42,7 +50,7 @@
   .commit-title {
     margin: 0;
     font-size: 23px;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   .commit-description {
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 3438dbe4958..5e61e61d85c 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -22,7 +22,7 @@
   .title {
     margin: 0;
     font-size: 23px;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   .description {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4ef548ffbe7..c4005ba1e69 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -104,7 +104,7 @@
       font-weight: 600;
       font-size: 17px;
       margin: 5px 0;
-      color: #313236;
+      color: $gl-gray-dark;
     }
 
     p:last-child {
@@ -136,7 +136,7 @@
 }
 
 .label-branch {
-  color: #313236;
+  color: $gl-gray-dark;
   font-family: $monospace_font;
   font-weight: bold;
   overflow: hidden;
@@ -272,3 +272,19 @@
   display: inline-block;
   width: 250px;
 }
+
+.table-holder {
+  .builds {
+
+    th {
+      background-color: $white-light;
+      color: $gl-placeholder-color;
+    }
+
+    th,
+    td {
+      padding: 16px;
+    }
+  }
+}
+
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 99108e9bfc4..c20f04653fc 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -178,7 +178,7 @@
     .option-title {
       font-weight: normal;
       display: inline-block;
-      color: #313236;
+      color: $gl-gray-dark;
     }
 
     .option-descr {
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 3571eefd570..84b78a6f36a 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -35,15 +35,15 @@
   %td
     #{build.stage} / #{build.name}
 
-    .pull-right
-      - if build.tags.any?
-        - build.tags.each do |tag|
-          %span.label.label-primary
-            = tag
-      - if build.try(:trigger_request)
-        %span.label.label-info triggered
-      - if build.try(:allow_failure)
-        %span.label.label-danger allowed to fail
+  %td
+    - if build.tags.any?
+      - build.tags.each do |tag|
+        %span.label.label-primary
+          = tag
+    - if build.try(:trigger_request)
+      %span.label.label-info triggered
+    - if build.try(:allow_failure)
+      %span.label.label-danger allowed to fail
 
   %td.duration
     - if build.duration
@@ -69,4 +69,4 @@
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
           = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
-            %i.fa.fa-repeat
+            %i.fa.fa-refresh
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 5931efdefe6..804d7851bdb 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -19,7 +19,7 @@
     - if @all_builds.running_or_pending.any?
       = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
 
-.gray-content-block.second-block
+.row-content-block.second-block
   #{(@scope || 'running').capitalize} builds
 
 %ul.content-list
@@ -38,6 +38,7 @@
             %th Ref
             %th Runner
             %th Name
+            %th Tags
             %th Duration
             %th Finished at
             %th
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index 4b475a4d8fa..698feb571ac 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -7,7 +7,7 @@
     %li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }
       = link_to klass::file_name, "##{klass::file_name_noext}",
           'data-toggle' => 'tab'
-.gray-content-block
+.row-content-block
   To prevent performance issues admin logs output the last 2000 lines
 .tab-content
   - loggers.each do |klass|
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 0ee8dc962b9..d6743081c8e 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -32,7 +32,7 @@
         Without projects
         %small.badge= number_with_delimiter(User.without_projects.count)
 
-  .gray-content-block.second-block
+  .row-content-block.second-block
     .pull-right
       .dropdown.inline
         %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 49ab8aad1d5..e27fefc0afd 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -25,7 +25,7 @@
         = icon('spinner spin')
 
 .todos-filters
-  .gray-content-block.second-block
+  .row-content-block.second-block
     = form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form' do
       .filter-item.inline
         = select_tag('project_id', todo_projects_options,
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index 5753158c24d..a1a282178e7 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,5 +1,5 @@
 - if show_last_push_widget?(event)
-  .gray-content-block.clear-block.last-push-widget
+  .row-content-block.clear-block.last-push-widget
     .event-last-push
       .event-last-push-text
         %span You pushed to
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 8ffca96bb4e..57f6e7e0612 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -6,7 +6,7 @@
 - else
   = render 'explore/head'
 
-.gray-content-block.clearfix
+.row-content-block.clearfix
   .pull-left
     = form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
       = hidden_field_tag :sort, @sort
diff --git a/app/views/explore/snippets/index.html.haml b/app/views/explore/snippets/index.html.haml
index 0f100c39ffb..9b838b9f3b7 100644
--- a/app/views/explore/snippets/index.html.haml
+++ b/app/views/explore/snippets/index.html.haml
@@ -6,7 +6,7 @@
 - else
   = render 'explore/head'
 
-.gray-content-block
+.row-content-block
   - if current_user
     .pull-right
       = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index aea35c50862..df6db8c23d3 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -16,7 +16,7 @@
 
 = render 'shared/issuable/filter', type: :issues
 
-.gray-content-block.second-block
+.row-content-block.second-block
   Only issues from
   %strong #{@group.name}
   group are listed here.
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index e1c9dd931ee..0cc2305b7d7 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -8,7 +8,7 @@
 
 = render 'shared/issuable/filter', type: :merge_requests
 
-.gray-content-block.second-block
+.row-content-block.second-block
   Only merge requests from
   %strong #{@group.name}
   group are listed here.
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index ab307708b75..ddb8be0d496 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -10,7 +10,7 @@
         = icon('plus')
         New Milestone
 
-.gray-content-block
+.row-content-block
   Only milestones from
   %strong #{@group.name}
   group are listed here.
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index f12df5c8ffe..d676bc28c89 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -48,14 +48,14 @@
 
   .lead
     Gray content block with side padding using
-    %code .gray-content-block
+    %code .row-content-block
 
   .example
-    .gray-content-block
+    .row-content-block
       %h4 Normal block inside content
       = lorem
 
-    .gray-content-block.second-block
+    .row-content-block.second-block
       %h4 Second block
       = lorem
 
diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml
index f0a3e416db7..7c2b8d01508 100644
--- a/app/views/projects/_last_push.html.haml
+++ b/app/views/projects/_last_push.html.haml
@@ -1,7 +1,7 @@
 - if event = last_push_event
   - if show_last_push_widget?(event)
 
-    .gray-content-block.top-block.clear-block.hidden-xs
+    .row-content-block.top-block.clear-block.hidden-xs
       .event-last-push
         .event-last-push-text
           %span You pushed to
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml
index a9908eaecca..369a847e7d4 100644
--- a/app/views/projects/_readme.html.haml
+++ b/app/views/projects/_readme.html.haml
@@ -7,7 +7,7 @@
       = cache(readme_cache_key) do
         = render_readme(readme)
 - else
-  .gray-content-block.second-block.center
+  .row-content-block.second-block.center
     %h3.page-title
       This project does not have a README yet
     - if can?(current_user, :push_code, @project)
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml
index 84034c8bf16..49f95ff37db 100644
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@@ -1,7 +1,7 @@
 - page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
 = render 'projects/builds/header_title'
 
-.top-block.gray-content-block.clearfix
+.top-block.row-content-block.clearfix
   .pull-right
     = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build),
       class: 'btn btn-default download' do
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 88266e21230..ac7790421a4 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Branches"
 = render "projects/commits/header_title"
 = render "projects/commits/head"
-.gray-content-block
+.row-content-block
   .pull-right
     - if can? current_user, :push_code, @project
       = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 0406fc21d77..d842dd54e6b 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -34,7 +34,7 @@
         = icon('wrench')
         %span CI Lint
 
-.gray-content-block
+.row-content-block
   #{(@scope || 'running').capitalize} builds from this project
 
 %ul.content-list
@@ -52,6 +52,7 @@
             %th Ref
             %th Stage
             %th Name
+            %th Tags
             %th Duration
             %th Finished at
             - if @project.build_coverage_enabled?
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 99d72aa7935..c0f7a7686f0 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 
 .build-page
-  .gray-content-block.top-block
+  .row-content-block.top-block
     Build ##{@build.id} for commit
     %strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit)
     from
@@ -34,7 +34,7 @@
             %i.fa.fa-warning
             This build was retried.
 
-  .gray-content-block.middle-block
+  .row-content-block.middle-block
     .build-head
       .clearfix
         = ci_status_with_icon(@build.status)
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e123eb1cc7a..e5a5efb3153 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -40,6 +40,7 @@
   %td
     = build.name
 
+  %td
     .label-container
       - if build.tags.any?
         - build.tags.each do |tag|
@@ -76,4 +77,4 @@
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
           = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
-            %i.fa.fa-repeat
+            %i.fa.fa-refresh
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index d3acd33116c..e849aefb188 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -1,4 +1,4 @@
-.gray-content-block.middle-block
+.row-content-block.build-content.middle-block
   .pull-right
     - if can?(current_user, :update_build, @project)
       - if ci_commit.builds.latest.failed.any?(&:retryable?)
@@ -40,6 +40,7 @@
         %th Build ID
         %th Stage
         %th Name
+        %th Tags
         %th Duration
         %th Finished at
         - if @project.build_coverage_enabled?
@@ -49,7 +50,7 @@
     = render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
 
 - if ci_commit.retried.any?
-  .gray-content-block.second-block
+  .row-content-block.second-block
     Retried builds
 
   .table-holder
@@ -61,6 +62,7 @@
           %th Ref
           %th Stage
           %th Name
+          %th Tags
           %th Duration
           %th Finished at
           - if @project.build_coverage_enabled?
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 3d7c18a5f58..b73cbf3f1d8 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -22,10 +22,12 @@
   %div
 
 %p
-  %span.light Commit
-  = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
-  = clipboard_button(clipboard_text: @commit.id)
 .commit-info-row
+  - if @commit.status
+    = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
+      = ci_icon_for_status(@commit.status)
+      build:
+      = ci_label_for_status(@commit.status)
   %span.light Authored by
   %strong
     = commit_author_link(@commit, avatar: true, size: 24)
@@ -39,19 +41,15 @@
     #{time_ago_with_tooltip(@commit.committed_date)}
 
 .commit-info-row
+  %span.light Commit
+  = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
+  = clipboard_button(clipboard_text: @commit.id)
   %span.cgray= pluralize(@commit.parents.count, "parent")
   - @commit.parents.each do |parent|
     = link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "monospace"
 
-- if @commit.status
-  .pull-right
-    = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
-      = ci_icon_for_status(@commit.status)
-      build:
-      = ci_label_for_status(@commit.status)
-
-.commit-info-row.branches
-  %i.fa.fa-spinner.fa-spin
+  %span.commit-info.branches
+    %i.fa.fa-spinner.fa-spin
 
 .commit-box.content-block
   %h3.commit-title
@@ -61,4 +59,4 @@
       = preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
 
 :javascript
-  $(".commit-info-row.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
+  $(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index bcdb09208aa..088eaa28013 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -6,7 +6,7 @@
 
 = render "head"
 
-.gray-content-block.second-block
+.row-content-block.second-block
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'commits'
 
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 02be5a2d07f..5e188dd0f3c 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   Compare branches, tags or commit ranges.
   %br
   Fill input field with commit id like
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index da731f28bb6..62525168239 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -3,7 +3,7 @@
 = render "projects/commits/head"
 
 
-.gray-content-block
+.row-content-block
   = render "form"
 
 - if @commits.present?
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 52d093871b4..1a2e59752fe 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -7,7 +7,7 @@
 
 = render "home_panel"
 
-.gray-content-block.second-block.center
+.row-content-block.second-block.center
   %h3.page-title
     The repository for this project is empty
   - if can?(current_user, :push_code, @project)
diff --git a/app/views/projects/graphs/ci.html.haml b/app/views/projects/graphs/ci.html.haml
index 6fa77cc10c6..9f05be9982b 100644
--- a/app/views/projects/graphs/ci.html.haml
+++ b/app/views/projects/graphs/ci.html.haml
@@ -1,7 +1,7 @@
 - page_title "Continuous Integration", "Graphs"
 = render "header_title"
 = render 'head'
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .oneline
     A collection of graphs for Continuous Integration
 
diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml
index fc465ab273b..da9f648cc9c 100644
--- a/app/views/projects/graphs/commits.html.haml
+++ b/app/views/projects/graphs/commits.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 = render 'head'
 
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'graphs_commits'
   %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/graphs/languages.html.haml b/app/views/projects/graphs/languages.html.haml
index a7fab5b6d72..ebecab1dbfc 100644
--- a/app/views/projects/graphs/languages.html.haml
+++ b/app/views/projects/graphs/languages.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 = render 'head'
 
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .oneline
     Programming languages used in this repository
 
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 882e7d6b6ee..ad4a932d391 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 = render 'head'
 
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'graphs'
   %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index 28a617538b5..c609c505def 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,4 +1,4 @@
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .tree-ref-holder
     = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
 
diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml
index 6f0b32aa165..0d59cec322c 100644
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   .oneline
     .title
       Release notes for tag
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index d854ac21725..74feb9e3282 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -12,7 +12,7 @@
 = render 'projects/last_push'
 = render "home_panel"
 
-.project-stats.gray-content-block.second-block
+.project-stats.row-content-block.second-block
   %ul.nav
     %li
       = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index 4af963e14da..103ff447464 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Snippets"
 = render "header_title"
 
-.gray-content-block.top-block
+.row-content-block.top-block
   .pull-right
     = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "New Snippet" do
       = icon('plus')
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 760347de0a9..dc6ece30dd2 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   - if can? current_user, :push_code, @project
     .pull-right
       = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 1dc9b799a95..9c916fd02de 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   .pull-right
     - if can?(current_user, :push_code, @project)
       = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn has-tooltip', title: 'Edit release notes' do
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index dd27ea2b11b..ba3f2cadc48 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 
 = render 'nav'
-.gray-content-block
+.row-content-block
   %span.oneline
     Git access for
     %strong= @project_wiki.path_with_namespace
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 711337f308e..252c37532e1 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,7 +1,7 @@
 - if @search_objects.empty?
   = render partial: "search/results/empty"
 - else
-  .gray-content-block
+  .row-content-block
     = search_entries_info(@search_objects, @scope, @search_term)
     - unless @show_snippets
       - if @project
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index fc1101646fb..9474462cbd1 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -1,5 +1,5 @@
 .issues-filters
-  .issues-details-filters.gray-content-block.second-block
+  .issues-details-filters.row-content-block.second-block
     = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
       - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
         .check-all-holder
@@ -48,7 +48,7 @@
             = button_tag "Update issues", class: "btn update_selected_issues btn-save"
 
   - if !@labels.nil?
-    .gray-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels.any?) }
+    .row-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels.any?) }
       - if @labels.any?
         = render "shared/labels_row", labels: @labels
 
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 18b091df39b..5c52cc6d1da 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -116,7 +116,7 @@
         = link_to 'Change branches', mr_change_branches_path(@merge_request)
 
 - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
-.gray-content-block{class: (is_footer ? "footer-block" : "middle-block")}
+.row-content-block{class: (is_footer ? "footer-block" : "middle-block")}
   - if issuable.new_record?
     = f.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
   - else
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index 7ff947a51db..8bca971bcf2 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -24,7 +24,7 @@
         - else
           = link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
 
-.detail-page-description.milestone-detail
+.detail-page-description.milestone-detailrow-content-block.second-block
   %h2.title
     = markdown escape_once(milestone.title), pipeline: :single_line
 
diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 3c445f67236..e65b1814872 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -20,6 +20,6 @@
     - else
       = render "snippets/actions"
 
-.detail-page-description.gray-content-block.second-block
+.detail-page-description.row-content-block.second-block
   %h2.title
     = markdown escape_once(@snippet.title), pipeline: :single_line
diff --git a/app/views/sherlock/file_samples/show.html.haml b/app/views/sherlock/file_samples/show.html.haml
index cfd11e45b6a..94d4dd4fa7d 100644
--- a/app/views/sherlock/file_samples/show.html.haml
+++ b/app/views/sherlock/file_samples/show.html.haml
@@ -3,7 +3,7 @@
 
 - header_title t('sherlock.title'), sherlock_transactions_path
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(sherlock_transaction_path(@transaction), class: 'btn') do
       %i.fa.fa-arrow-left
diff --git a/app/views/sherlock/queries/show.html.haml b/app/views/sherlock/queries/show.html.haml
index 83f61ce4b07..fc2863dca8e 100644
--- a/app/views/sherlock/queries/show.html.haml
+++ b/app/views/sherlock/queries/show.html.haml
@@ -9,7 +9,7 @@
     %a(href="#tab-backtrace" data-toggle="tab")
       = t('sherlock.backtrace')
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(sherlock_transaction_path(@transaction), class: 'btn') do
       %i.fa.fa-arrow-left
diff --git a/app/views/sherlock/transactions/index.html.haml b/app/views/sherlock/transactions/index.html.haml
index 010e1a2a902..da969c02765 100644
--- a/app/views/sherlock/transactions/index.html.haml
+++ b/app/views/sherlock/transactions/index.html.haml
@@ -1,7 +1,7 @@
 - page_title t('sherlock.title')
 - header_title t('sherlock.title'), sherlock_transactions_path
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(destroy_all_sherlock_transactions_path,
       class: 'btn btn-danger',
diff --git a/app/views/sherlock/transactions/show.html.haml b/app/views/sherlock/transactions/show.html.haml
index 9d4b0b2724c..8aa6b437d95 100644
--- a/app/views/sherlock/transactions/show.html.haml
+++ b/app/views/sherlock/transactions/show.html.haml
@@ -16,7 +16,7 @@
       %span.badge
         #{@transaction.file_samples.length}
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(sherlock_transactions_path, class: 'btn') do
       %i.fa.fa-arrow-left
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 03511b0654f..3c0b89c6741 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -85,7 +85,7 @@
   %div{ class: container_class }
     .tab-content
       #activity.tab-pane
-        .gray-content-block.calender-block.white.second-block.hidden-xs
+        .row-content-block.calender-block.white.second-block.hidden-xs
           %div{ class: container_class }
             .user-calendar{data: {href: user_calendar_path}}
               %h4.center.light

From fc20639c8d76b367dc0e0b66ef94033697b28dc7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 26 Apr 2016 13:20:58 -0500
Subject: [PATCH 0146/1431] Builds page redesign

---
 app/assets/stylesheets/framework/buttons.scss  |  6 ++++++
 app/assets/stylesheets/pages/builds.scss       | 13 +++++++++++++
 app/assets/stylesheets/pages/commit.scss       | 18 ++++++++++++++++--
 app/assets/stylesheets/pages/status.scss       |  2 +-
 app/helpers/application_helper.rb              |  3 +--
 app/views/admin/builds/_build.html.haml        |  2 +-
 app/views/dashboard/snippets/index.html.haml   | 16 ++++++++--------
 app/views/dashboard/todos/index.html.haml      |  8 ++++----
 app/views/projects/builds/index.html.haml      | 13 +++++++------
 app/views/projects/ci/builds/_build.html.haml  |  2 +-
 app/views/projects/commit/_ci_menu.html.haml   |  4 ++--
 .../projects/commit/_commit_box.html.haml      |  2 +-
 app/views/projects/commit/branches.html.haml   |  1 -
 app/views/projects/commits/_head.html.haml     |  9 ++++++---
 .../projects/merge_requests/_show.html.haml    | 12 ++++++++----
 15 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index edb5ee71f98..1f2f9f7754c 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -251,3 +251,9 @@
 .btn-file-option {
   background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
 }
+
+.btn-refresh {
+  i {
+    color: $gl-icon-color;
+  }
+}
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 201f3e5ca46..3340cee9643 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -83,3 +83,16 @@
     }
   }
 }
+
+table.builds {
+
+  .build-link {
+    a {
+      color: $gl-dark-link-color;
+    }
+  }
+
+  .btn-refresh {
+    margin-left: 10px;
+  }
+}
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 5c945e2d4c9..c2cd227571f 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -35,13 +35,19 @@
     font-weight: bold;
   }
 
-  .ci-status {
-    margin-right: 10px;
+  .time_ago {
+    margin-left: 8px;
   }
 
   .fa-clipboard {
     color: $dropdown-title-btn-color;
   }
+
+  .commit-info {
+    &.branches {
+      margin-left: 8px;
+    }
+  }
 }
 
 .commit-box {
@@ -91,6 +97,14 @@
   }
 }
 
+.commit-action-buttons {
+  i {
+    color: $gl-icon-color;
+    font-size: 13px;
+    margin-right: 3px;
+  }
+}
+
 /*
  * Commit message textarea for web editor and
  * custom merge request message
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index dbb6daf0d70..2370d35924e 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,7 +1,7 @@
 .container-fluid {
   .ci-status {
     padding: 2px 7px;
-    margin-right: 5px;
+    margin-right: 10px;
     border: 1px solid #eee;
     white-space: nowrap;
     @include border-radius(4px);
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3e0074da394..313a8fd56c5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -316,8 +316,7 @@ module ApplicationHelper
     html = content_tag :span, entity_title
 
     if count.present?
-      html += " "
-      html += content_tag :span, number_with_delimiter(count), class: 'badge'
+      html += content_tag :span, " (#{number_with_delimiter(count)})"
     end
 
     html.html_safe
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 84b78a6f36a..2b99f360d6f 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -68,5 +68,5 @@
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
+          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-refresh' do
             %i.fa.fa-refresh
diff --git a/app/views/dashboard/snippets/index.html.haml b/app/views/dashboard/snippets/index.html.haml
index d4e7862981c..53f1094ec07 100644
--- a/app/views/dashboard/snippets/index.html.haml
+++ b/app/views/dashboard/snippets/index.html.haml
@@ -13,26 +13,26 @@
     %li{ class: ("active" unless params[:scope]) }
       = link_to dashboard_snippets_path do
         All
-        %span.badge
-          = current_user.snippets.count
+        %span
+          (#{current_user.snippets.count})
 
     %li{ class: ("active" if params[:scope] == "are_private") }
       = link_to dashboard_snippets_path(scope: 'are_private') do
         Private
-        %span.badge
-          = current_user.snippets.are_private.count
+        %span
+          (#{current_user.snippets.are_private.count})
 
     %li{ class: ("active" if params[:scope] == "are_internal") }
       = link_to dashboard_snippets_path(scope: 'are_internal') do
         Internal
-        %span.badge
-          = current_user.snippets.are_internal.count
+        %span
+          (#{current_user.snippets.are_internal.count})
 
     %li{ class: ("active" if params[:scope] == "are_public") }
       = link_to dashboard_snippets_path(scope: 'are_public') do
         Public
-        %span.badge
-          = current_user.snippets.are_public.count
+        %span
+          (#{current_user.snippets.are_public.count})
 
 = render 'snippets/snippets'
 
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index e27fefc0afd..a87b796c6f3 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -8,15 +8,15 @@
       = link_to todos_filter_path(state: 'pending') do
         %span
           To do
-        %span{class: 'badge'}
-          = todos_pending_count
+        %span
+          (#{todos_pending_count})
     - todo_done_active = ('active' if params[:state] == 'done')
     %li{class: "todos-done #{todo_done_active}"}
       = link_to todos_filter_path(state: 'done') do
         %span
           Done
-        %span{class: 'badge'}
-          = todos_done_count
+        %span
+          (#{todos_done_count})
 
   .nav-controls
     - if @todos.any?(&:pending?)
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index d842dd54e6b..fcb1e656d72 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -6,20 +6,21 @@
     %li{class: ('active' if @scope.nil?)}
       = link_to project_builds_path(@project) do
         All
-        %span.badge.js-totalbuilds-count
-          = number_with_delimiter(@all_builds.count(:id))
+        %span.js-totalbuilds-count
+          (#{number_with_delimiter(@all_builds.count(:id))})
+
 
     %li{class: ('active' if @scope == 'running')}
       = link_to project_builds_path(@project, scope: :running) do
         Running
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_builds.running_or_pending.count(:id))
+        %span.js-running-count
+          (#{number_with_delimiter(@all_builds.running_or_pending.count(:id))})
 
     %li{class: ('active' if @scope == 'finished')}
       = link_to project_builds_path(@project, scope: :finished) do
         Finished
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_builds.finished.count(:id))
+        %span.js-running-count
+          (#{number_with_delimiter(@all_builds.finished.count(:id))})
 
   .nav-controls
     - if can?(current_user, :update_build, @project)
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e5a5efb3153..1b382e48365 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -76,5 +76,5 @@
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
+          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-refresh' do
             %i.fa.fa-refresh
diff --git a/app/views/projects/commit/_ci_menu.html.haml b/app/views/projects/commit/_ci_menu.html.haml
index ea33aa472a6..b2d3db0bdc6 100644
--- a/app/views/projects/commit/_ci_menu.html.haml
+++ b/app/views/projects/commit/_ci_menu.html.haml
@@ -2,8 +2,8 @@
   = nav_link(path: 'commit#show') do
     = link_to namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Changes
-      %span.badge= @diffs.count
+      %span (#{@diffs.count})
   = nav_link(path: 'commit#builds') do
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Builds
-      %span.badge= @statuses.count
+      %span (#{@statuses.count})
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index b73cbf3f1d8..01163e526b2 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -1,4 +1,4 @@
-.pull-right
+.pull-right.commit-action-buttons
   %div
     - if @notes_count > 0
       %span.btn.disabled.btn-grouped
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 82aac1fbd15..2b0c9a4b4de 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -3,7 +3,6 @@
     - branch = commit_default_branch(@project, @branches)
     = link_to(namespace_project_tree_path(@project.namespace, @project, branch)) do
       %span.label.label-gray
-        %i.fa.fa-code-fork
         = branch
     - if @branches.any? || @tags.any?
       = link_to("#", class: "js-details-expand") do
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 7a5b0d993db..2c8fecae760 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -2,7 +2,8 @@
   = nav_link(controller: [:commit, :commits]) do
     = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
       Commits
-      %span.badge= number_with_delimiter(@repository.commit_count)
+      %span
+        (#{number_with_delimiter(@repository.commit_count)})
 
   = nav_link(controller: %w(network)) do
     = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
@@ -15,9 +16,11 @@
   = nav_link(html_options: {class: branches_tab_class}) do
     = link_to namespace_project_branches_path(@project.namespace, @project) do
       Branches
-      %span.badge.js-totalbranch-count= @repository.branch_count
+      %span.js-totalbranch-count
+        (#{@repository.branch_count})
 
   = nav_link(controller: [:tags, :releases]) do
     = link_to namespace_project_tags_path(@project.namespace, @project) do
       Tags
-      %span.badge.js-totaltags-count= @repository.tag_count
+      %span.js-totaltags-count
+        (#{@repository.tag_count})
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 290753d57c6..0c97a29847d 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -50,20 +50,24 @@
         %li.notes-tab
           = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
             Discussion
-            %span.badge= @merge_request.mr_and_commit_notes.user.nonawards.count
+            %span
+              (#{@merge_request.mr_and_commit_notes.user.nonawards.count})
         %li.commits-tab
           = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
             Commits
-            %span.badge= @commits.size
+            %span
+              (#{@commits.size})
         - if @ci_commit
           %li.builds-tab
             = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
               Builds
-              %span.badge= @statuses.size
+              %span
+                (#{@statuses.size})
         %li.diffs-tab
           = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
             Changes
-            %span.badge= @merge_request.diff_size
+            %span
+              (#{@merge_request.diff_size})
 
       .tab-content
         #notes.notes.tab-pane.voting_notes

From 3a3f0bf436007b3eecc0b85d0fc696951245ab6a Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 27 Apr 2016 09:46:31 -0500
Subject: [PATCH 0147/1431] Change build icons into buttons; update tests

---
 app/assets/stylesheets/framework/buttons.scss |  3 ++-
 app/assets/stylesheets/pages/builds.scss      |  4 ----
 app/views/admin/builds/_build.html.haml       |  6 +++---
 app/views/projects/ci/builds/_build.html.haml |  6 +++---
 features/project/merge_requests.feature       |  8 ++++----
 features/steps/dashboard/todos.rb             |  8 ++++----
 features/steps/project/merge_requests.rb      | 10 +++++-----
 spec/features/notes_on_merge_requests_spec.rb |  2 +-
 8 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 1f2f9f7754c..eaf85bb17ca 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -252,7 +252,8 @@
   background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
 }
 
-.btn-refresh {
+.btn-build {
+  margin-left: 10px;
   i {
     color: $gl-icon-color;
   }
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 3340cee9643..aa41565f812 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -91,8 +91,4 @@ table.builds {
       color: $gl-dark-link-color;
     }
   }
-
-  .btn-refresh {
-    margin-left: 10px;
-  }
 }
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 2b99f360d6f..967151bc33b 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -61,12 +61,12 @@
   %td
     .pull-right
       - if can?(current_user, :read_build, project) && build.artifacts?
-        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts' do
+        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts', class: 'btn btn-build' do
           %i.fa.fa-download
       - if can?(current_user, :update_build, build.project)
         - if build.active?
-          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
+          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-refresh' do
+          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
             %i.fa.fa-refresh
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 1b382e48365..8e95f040273 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -69,12 +69,12 @@
   %td
     .pull-right
       - if can?(current_user, :read_build, build) && build.artifacts?
-        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts' do
+        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts', class: 'btn btn-build' do
           %i.fa.fa-download
       - if can?(current_user, :update_build, build)
         - if build.active?
-          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
+          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-refresh' do
+          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
             %i.fa.fa-refresh
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index ecda4ea8240..aec590f7d9e 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -135,7 +135,7 @@ Feature: Project Merge Requests
     And I leave a comment like "Line is wrong" on diff
     And I switch to the merge request's comments tab
     Then I should see a discussion has started on diff
-    And I should see a badge of "1" next to the discussion link
+    And I should see a badge of "(1)" next to the discussion link
 
   @javascript
   Scenario: I see a new comment on merge request diff from another user in the discussion tab
@@ -143,7 +143,7 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And user "John Doe" leaves a comment like "Line is wrong" on diff
     Then I should see a discussion by user "John Doe" has started on diff
-    And I should see a badge of "1" next to the discussion link
+    And I should see a badge of "(1)" next to the discussion link
 
   @javascript
   Scenario: I edit a comment on a merge request diff
@@ -161,11 +161,11 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And I click on the Changes tab
     And I leave a comment like "Line is wrong" on diff
-    And I should see a badge of "1" next to the discussion link
+    And I should see a badge of "(1)" next to the discussion link
     And I delete the comment "Line is wrong" on diff
     And I click on the Discussion tab
     Then I should not see any discussion
-    And I should see a badge of "0" next to the discussion link
+    And I should see a badge of "(0)" next to the discussion link
 
   @javascript
   Scenario: I comment on a line of a commit in merge request
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index 2b23df6764b..da380250cd7 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -27,8 +27,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
 
   step 'I should see todos assigned to me' do
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 4' }
-    expect(page).to have_content 'To do 4'
-    expect(page).to have_content 'Done 0'
+    expect(page).to have_content 'To do (4)'
+    expect(page).to have_content 'Done (0)'
 
     expect(page).to have_link project.name_with_namespace
     should_see_todo(1, "John Doe assigned you merge request #{merge_request.to_reference}", merge_request.title)
@@ -43,8 +43,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
     end
 
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 3' }
-    expect(page).to have_content 'To do 3'
-    expect(page).to have_content 'Done 1'
+    expect(page).to have_content 'To do (3)'
+    expect(page).to have_content 'Done (1)'
     should_not_see_todo "John Doe assigned you merge request #{merge_request.to_reference}"
   end
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 3b1a00f628a..463235742fb 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -344,12 +344,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see a badge of "1" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("1")
+  step 'I should see a badge of "(1)" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("(1)")
   end
 
-  step 'I should see a badge of "0" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("0")
+  step 'I should see a badge of "(0)" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("(0)")
   end
 
   step 'I should see a discussion has started on commit diff' do
@@ -572,7 +572,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   def expect_discussion_badge_to_have_counter(value)
-    page.within(".notes-tab .badge") do
+    page.within(".notes-tab span") do
       page.should have_content value
     end
   end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 389812ff7e1..0aef4cba238 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -151,7 +151,7 @@ describe 'Comments', feature: true do
         visit namespace_project_merge_request_path(project.namespace, project, merge_request)
 
         expect(merge_request.mr_and_commit_notes.count).to eq 2
-        expect(find('.notes-tab span.badge').text).to eq "1"
+        expect(find('.notes-tab span').text).to eq "(1)"
       end
     end
   end

From 8d19955c05f18675fc16dee6ca0f4da24013e816 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 16:25:10 -0500
Subject: [PATCH 0148/1431] Revert counter parentheses back to badges

---
 app/helpers/application_helper.rb                |  3 ++-
 app/views/dashboard/snippets/index.html.haml     | 16 ++++++++--------
 app/views/dashboard/todos/index.html.haml        |  8 ++++----
 app/views/projects/builds/index.html.haml        | 12 ++++++------
 app/views/projects/commit/_ci_menu.html.haml     |  4 ++--
 app/views/projects/commits/_head.html.haml       | 10 ++++------
 .../projects/merge_requests/_show.html.haml      | 12 ++++--------
 app/views/shared/milestones/_top.html.haml       |  2 +-
 features/project/merge_requests.feature          |  8 ++++----
 features/steps/dashboard/todos.rb                |  8 ++++----
 features/steps/project/merge_requests.rb         | 10 +++++-----
 spec/features/notes_on_merge_requests_spec.rb    |  2 +-
 12 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 313a8fd56c5..3e0074da394 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -316,7 +316,8 @@ module ApplicationHelper
     html = content_tag :span, entity_title
 
     if count.present?
-      html += content_tag :span, " (#{number_with_delimiter(count)})"
+      html += " "
+      html += content_tag :span, number_with_delimiter(count), class: 'badge'
     end
 
     html.html_safe
diff --git a/app/views/dashboard/snippets/index.html.haml b/app/views/dashboard/snippets/index.html.haml
index 53f1094ec07..d4e7862981c 100644
--- a/app/views/dashboard/snippets/index.html.haml
+++ b/app/views/dashboard/snippets/index.html.haml
@@ -13,26 +13,26 @@
     %li{ class: ("active" unless params[:scope]) }
       = link_to dashboard_snippets_path do
         All
-        %span
-          (#{current_user.snippets.count})
+        %span.badge
+          = current_user.snippets.count
 
     %li{ class: ("active" if params[:scope] == "are_private") }
       = link_to dashboard_snippets_path(scope: 'are_private') do
         Private
-        %span
-          (#{current_user.snippets.are_private.count})
+        %span.badge
+          = current_user.snippets.are_private.count
 
     %li{ class: ("active" if params[:scope] == "are_internal") }
       = link_to dashboard_snippets_path(scope: 'are_internal') do
         Internal
-        %span
-          (#{current_user.snippets.are_internal.count})
+        %span.badge
+          = current_user.snippets.are_internal.count
 
     %li{ class: ("active" if params[:scope] == "are_public") }
       = link_to dashboard_snippets_path(scope: 'are_public') do
         Public
-        %span
-          (#{current_user.snippets.are_public.count})
+        %span.badge
+          = current_user.snippets.are_public.count
 
 = render 'snippets/snippets'
 
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index a87b796c6f3..fc42e5dcc66 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -8,15 +8,15 @@
       = link_to todos_filter_path(state: 'pending') do
         %span
           To do
-        %span
-          (#{todos_pending_count})
+        %span.badge
+          = todos_pending_count
     - todo_done_active = ('active' if params[:state] == 'done')
     %li{class: "todos-done #{todo_done_active}"}
       = link_to todos_filter_path(state: 'done') do
         %span
           Done
-        %span
-          (#{todos_done_count})
+        %span.badge
+          = todos_done_count
 
   .nav-controls
     - if @todos.any?(&:pending?)
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index fcb1e656d72..2e8015d119b 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -6,21 +6,21 @@
     %li{class: ('active' if @scope.nil?)}
       = link_to project_builds_path(@project) do
         All
-        %span.js-totalbuilds-count
-          (#{number_with_delimiter(@all_builds.count(:id))})
+        %span.badge.js-totalbuilds-count
+          = number_with_delimiter(@all_builds.count(:id))
 
 
     %li{class: ('active' if @scope == 'running')}
       = link_to project_builds_path(@project, scope: :running) do
         Running
-        %span.js-running-count
-          (#{number_with_delimiter(@all_builds.running_or_pending.count(:id))})
+        %span.badge.js-running-count
+          = number_with_delimiter(@all_builds.running_or_pending.count(:id))
 
     %li{class: ('active' if @scope == 'finished')}
       = link_to project_builds_path(@project, scope: :finished) do
         Finished
-        %span.js-running-count
-          (#{number_with_delimiter(@all_builds.finished.count(:id))})
+        %span.badge.js-running-count
+          = number_with_delimiter(@all_builds.finished.count(:id))
 
   .nav-controls
     - if can?(current_user, :update_build, @project)
diff --git a/app/views/projects/commit/_ci_menu.html.haml b/app/views/projects/commit/_ci_menu.html.haml
index b2d3db0bdc6..ea33aa472a6 100644
--- a/app/views/projects/commit/_ci_menu.html.haml
+++ b/app/views/projects/commit/_ci_menu.html.haml
@@ -2,8 +2,8 @@
   = nav_link(path: 'commit#show') do
     = link_to namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Changes
-      %span (#{@diffs.count})
+      %span.badge= @diffs.count
   = nav_link(path: 'commit#builds') do
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Builds
-      %span (#{@statuses.count})
+      %span.badge= @statuses.count
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 2c8fecae760..d1bd76ab529 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -2,8 +2,8 @@
   = nav_link(controller: [:commit, :commits]) do
     = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
       Commits
-      %span
-        (#{number_with_delimiter(@repository.commit_count)})
+      %span.badge
+        = number_with_delimiter(@repository.commit_count)
 
   = nav_link(controller: %w(network)) do
     = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
@@ -16,11 +16,9 @@
   = nav_link(html_options: {class: branches_tab_class}) do
     = link_to namespace_project_branches_path(@project.namespace, @project) do
       Branches
-      %span.js-totalbranch-count
-        (#{@repository.branch_count})
+      %span.badge.js-totalbranch-count= @repository.branch_count
 
   = nav_link(controller: [:tags, :releases]) do
     = link_to namespace_project_tags_path(@project.namespace, @project) do
       Tags
-      %span.js-totaltags-count
-        (#{@repository.tag_count})
+      %span.badge.js-totaltags-count= @repository.tag_count
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 0c97a29847d..290753d57c6 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -50,24 +50,20 @@
         %li.notes-tab
           = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
             Discussion
-            %span
-              (#{@merge_request.mr_and_commit_notes.user.nonawards.count})
+            %span.badge= @merge_request.mr_and_commit_notes.user.nonawards.count
         %li.commits-tab
           = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
             Commits
-            %span
-              (#{@commits.size})
+            %span.badge= @commits.size
         - if @ci_commit
           %li.builds-tab
             = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
               Builds
-              %span
-                (#{@statuses.size})
+              %span.badge= @statuses.size
         %li.diffs-tab
           = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
             Changes
-            %span
-              (#{@merge_request.diff_size})
+            %span.badge= @merge_request.diff_size
 
       .tab-content
         #notes.notes.tab-pane.voting_notes
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index 8bca971bcf2..7ff947a51db 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -24,7 +24,7 @@
         - else
           = link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
 
-.detail-page-description.milestone-detailrow-content-block.second-block
+.detail-page-description.milestone-detail
   %h2.title
     = markdown escape_once(milestone.title), pipeline: :single_line
 
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index aec590f7d9e..ecda4ea8240 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -135,7 +135,7 @@ Feature: Project Merge Requests
     And I leave a comment like "Line is wrong" on diff
     And I switch to the merge request's comments tab
     Then I should see a discussion has started on diff
-    And I should see a badge of "(1)" next to the discussion link
+    And I should see a badge of "1" next to the discussion link
 
   @javascript
   Scenario: I see a new comment on merge request diff from another user in the discussion tab
@@ -143,7 +143,7 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And user "John Doe" leaves a comment like "Line is wrong" on diff
     Then I should see a discussion by user "John Doe" has started on diff
-    And I should see a badge of "(1)" next to the discussion link
+    And I should see a badge of "1" next to the discussion link
 
   @javascript
   Scenario: I edit a comment on a merge request diff
@@ -161,11 +161,11 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And I click on the Changes tab
     And I leave a comment like "Line is wrong" on diff
-    And I should see a badge of "(1)" next to the discussion link
+    And I should see a badge of "1" next to the discussion link
     And I delete the comment "Line is wrong" on diff
     And I click on the Discussion tab
     Then I should not see any discussion
-    And I should see a badge of "(0)" next to the discussion link
+    And I should see a badge of "0" next to the discussion link
 
   @javascript
   Scenario: I comment on a line of a commit in merge request
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index da380250cd7..2b23df6764b 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -27,8 +27,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
 
   step 'I should see todos assigned to me' do
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 4' }
-    expect(page).to have_content 'To do (4)'
-    expect(page).to have_content 'Done (0)'
+    expect(page).to have_content 'To do 4'
+    expect(page).to have_content 'Done 0'
 
     expect(page).to have_link project.name_with_namespace
     should_see_todo(1, "John Doe assigned you merge request #{merge_request.to_reference}", merge_request.title)
@@ -43,8 +43,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
     end
 
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 3' }
-    expect(page).to have_content 'To do (3)'
-    expect(page).to have_content 'Done (1)'
+    expect(page).to have_content 'To do 3'
+    expect(page).to have_content 'Done 1'
     should_not_see_todo "John Doe assigned you merge request #{merge_request.to_reference}"
   end
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 463235742fb..3b1a00f628a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -344,12 +344,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see a badge of "(1)" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("(1)")
+  step 'I should see a badge of "1" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("1")
   end
 
-  step 'I should see a badge of "(0)" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("(0)")
+  step 'I should see a badge of "0" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("0")
   end
 
   step 'I should see a discussion has started on commit diff' do
@@ -572,7 +572,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   def expect_discussion_badge_to_have_counter(value)
-    page.within(".notes-tab span") do
+    page.within(".notes-tab .badge") do
       page.should have_content value
     end
   end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 0aef4cba238..389812ff7e1 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -151,7 +151,7 @@ describe 'Comments', feature: true do
         visit namespace_project_merge_request_path(project.namespace, project, merge_request)
 
         expect(merge_request.mr_and_commit_notes.count).to eq 2
-        expect(find('.notes-tab span').text).to eq "(1)"
+        expect(find('.notes-tab span.badge').text).to eq "1"
       end
     end
   end

From 655b2640ae9cbe2737369401969e99caeddf192d Mon Sep 17 00:00:00 2001
From: Benedikt Huss <benedikt.huss@gmail.com>
Date: Wed, 4 May 2016 09:34:25 +0200
Subject: [PATCH 0149/1431] Merge request widget displays TeamCity build state
 and code coverage correctly again

---
 .../merge_request_widget.js.coffee            | 12 +++----
 .../merge_request_widget_spec.js.coffee       | 35 +++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 spec/javascripts/merge_request_widget_spec.js.coffee

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 065626beeb8..1abda3530c4 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -68,13 +68,13 @@ class @MergeRequestWidget
     $.getJSON @opts.ci_status_url, (data) =>
       @readyForCICheck = true
 
-      if @firstCICheck
-        @firstCICheck = false
+      if @firstCICheck || @opts.ci_status is ''
+        if @firstCICheck
+          @firstCICheck = false
         @opts.ci_status = data.status
-
-      if @opts.ci_status is ''
-        @opts.ci_status = data.status
-        return
+        @showCIStatus data.status
+        if data.coverage
+          @showCICoverage data.coverage
 
       if data.status isnt @opts.ci_status and data.status?
         @showCIStatus data.status
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee
new file mode 100644
index 00000000000..e1fb610654e
--- /dev/null
+++ b/spec/javascripts/merge_request_widget_spec.js.coffee
@@ -0,0 +1,35 @@
+#= require merge_request_widget
+
+describe 'MergeRequestWidget', ->
+
+  beforeEach ->
+    window.notifyPermissions = () ->
+    @opts = {ci_status_url:"http://sampledomain.local/ci/getstatus",ci_status:""}
+    @class = new MergeRequestWidget(@opts)
+    @ciStatusData = {"title":"Sample MR title","sha":"12a34bc5","status":"success","coverage":98}
+
+  describe 'getCIStatus', ->
+    beforeEach ->
+      spyOn(jQuery, 'getJSON').and.callFake (req, cb) =>
+        cb(@ciStatusData)
+
+    it 'should call showCIStatus even if a notification should not be displayed', ->
+      spy = spyOn(@class, 'showCIStatus').and.stub()
+      @class.getCIStatus(false)
+      expect(spy).toHaveBeenCalledWith(@ciStatusData.status)
+
+    it 'should call showCIStatus when a notification should be displayed', ->
+      spy = spyOn(@class, 'showCIStatus').and.stub()
+      @class.getCIStatus(true)
+      expect(spy).toHaveBeenCalledWith(@ciStatusData.status)
+
+    it 'should call showCICoverage when the coverage rate is set', ->
+      spy = spyOn(@class, 'showCICoverage').and.stub()
+      @class.getCIStatus(true)
+      expect(spy).toHaveBeenCalledWith(@ciStatusData.coverage)
+
+    it 'should not call showCICoverage when the coverage rate is not set', ->
+      @ciStatusData.coverage = null
+      spy = spyOn(@class, 'showCICoverage').and.stub()
+      @class.getCIStatus(true)
+      expect(spy).not.toHaveBeenCalled()

From 92c25f42009ce42c439efa4236d14ac1440711e4 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 4 May 2016 17:33:58 -0400
Subject: [PATCH 0150/1431] Use `number_to_human_size` helper to show
 repository size

This will intelligently format large repository sizes in GBs (or,
shudder, TBs).
---
 app/helpers/projects_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3d5e61d2c18..058233c88ad 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -200,7 +200,8 @@ module ProjectsHelper
   end
 
   def repository_size(project = @project)
-    "#{project.repository_size} MB"
+    size_in_bytes = project.repository_size * 1.megabyte
+    number_to_human_size(size_in_bytes, delimiter: ',', precision: 2)
   rescue
     # In order to prevent 500 error
     # when application cannot allocate memory

From 5448970950008fb49092fcfbdb155161d707e10f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 4 May 2016 17:39:06 -0400
Subject: [PATCH 0151/1431] Remove `rescue` clause from `repository_size`
 helper

The repository size has since become calculated (and cached) more
intelligently, and this should no longer be necessary.
---
 app/helpers/projects_helper.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 058233c88ad..20e47f77b48 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -202,11 +202,6 @@ module ProjectsHelper
   def repository_size(project = @project)
     size_in_bytes = project.repository_size * 1.megabyte
     number_to_human_size(size_in_bytes, delimiter: ',', precision: 2)
-  rescue
-    # In order to prevent 500 error
-    # when application cannot allocate memory
-    # to calculate repo size - just show 'Unknown'
-    'unknown'
   end
 
   def default_url_to_repo(project = @project)

From 0e9c2e721b08e244e63f1d26ac3771a8d858cd76 Mon Sep 17 00:00:00 2001
From: Benedikt Huss <benedikt.huss@gmail.com>
Date: Wed, 4 May 2016 20:45:12 +0200
Subject: [PATCH 0152/1431] Feedback from stanhu

---
 CHANGELOG                                     |  1 +
 .../merge_request_widget.js.coffee            | 19 ++++++++----------
 .../merge_request_widget_spec.js.coffee       | 20 ++++++++++++++++---
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0e6e2505ec6..d2ff4c32f2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ v 8.8.0 (unreleased)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
+  - Merge request widget displays TeamCity build state and code coverage correctly again.
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 1abda3530c4..17a5a057a94 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -68,20 +68,18 @@ class @MergeRequestWidget
     $.getJSON @opts.ci_status_url, (data) =>
       @readyForCICheck = true
 
-      if @firstCICheck || @opts.ci_status is ''
-        if @firstCICheck
-          @firstCICheck = false
+      if data.status is ''
+        return
+
+      if @firstCiCheck || data.status isnt @opts.ci_status and data.status?
         @opts.ci_status = data.status
         @showCIStatus data.status
         if data.coverage
           @showCICoverage data.coverage
 
-      if data.status isnt @opts.ci_status and data.status?
-        @showCIStatus data.status
-        if data.coverage
-          @showCICoverage data.coverage
-
-        if showNotification
+        # The first check should only update the UI, a notification
+        # should only be displayed on status changes
+        if showNotification and not @firstCiCheck
           status = @ciLabelForStatus(data.status)
 
           if status is "preparing"
@@ -104,8 +102,7 @@ class @MergeRequestWidget
               @close()
               Turbolinks.visit _this.opts.builds_path
           )
-
-        @opts.ci_status = data.status
+        @firstCiCheck = false
 
   showCIStatus: (state) ->
     $('.ci_widget').hide()
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee
index e1fb610654e..c0bd8a29e43 100644
--- a/spec/javascripts/merge_request_widget_spec.js.coffee
+++ b/spec/javascripts/merge_request_widget_spec.js.coffee
@@ -4,7 +4,21 @@ describe 'MergeRequestWidget', ->
 
   beforeEach ->
     window.notifyPermissions = () ->
-    @opts = {ci_status_url:"http://sampledomain.local/ci/getstatus",ci_status:""}
+    window.notify = () ->
+    @opts = {
+      ci_status_url:"http://sampledomain.local/ci/getstatus",
+      ci_status:"",
+      ci_message: {
+        normal: "Build {{status}} for \"{{title}}\"",
+        preparing: "{{status}} build for \"{{title}}\""
+      },
+      ci_title: {
+        preparing: "{{status}} build",
+        normal: "Build {{status}}"
+      },
+      gitlab_icon:"gitlab_logo.png",
+      builds_path:"http://sampledomain.local/sampleBuildsPath"
+    }
     @class = new MergeRequestWidget(@opts)
     @ciStatusData = {"title":"Sample MR title","sha":"12a34bc5","status":"success","coverage":98}
 
@@ -25,11 +39,11 @@ describe 'MergeRequestWidget', ->
 
     it 'should call showCICoverage when the coverage rate is set', ->
       spy = spyOn(@class, 'showCICoverage').and.stub()
-      @class.getCIStatus(true)
+      @class.getCIStatus(false)
       expect(spy).toHaveBeenCalledWith(@ciStatusData.coverage)
 
     it 'should not call showCICoverage when the coverage rate is not set', ->
       @ciStatusData.coverage = null
       spy = spyOn(@class, 'showCICoverage').and.stub()
-      @class.getCIStatus(true)
+      @class.getCIStatus(false)
       expect(spy).not.toHaveBeenCalled()

From e37b31456774c92fd718f7ef0a576266ffcca894 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 4 May 2016 15:49:39 -0700
Subject: [PATCH 0153/1431] Add tests for setting trusted_proxies

Each test reloads the trusted_proxies initializer, which in turn will set Rails.application.config.action_dispatch.trusted_proxies to something new. This will leak into the other tests, but the middleware that it is used in has already been loaded for the whole test suite, so it should have no impact.
---
 spec/initializers/trusted_proxies_spec.rb | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 spec/initializers/trusted_proxies_spec.rb

diff --git a/spec/initializers/trusted_proxies_spec.rb b/spec/initializers/trusted_proxies_spec.rb
new file mode 100644
index 00000000000..4bb149f25ff
--- /dev/null
+++ b/spec/initializers/trusted_proxies_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'trusted_proxies', lib: true do
+  context 'with default config' do
+    before do
+      set_trusted_proxies([])
+    end
+
+    it 'preserves private IPs as remote_ip' do
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '10.1.5.89')
+      expect(request.remote_ip).to eq('10.1.5.89')
+    end
+
+    it 'filters out localhost from remote_ip' do
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '1.1.1.1, 10.1.5.89, 127.0.0.1')
+      expect(request.remote_ip).to eq('10.1.5.89')
+    end
+  end
+
+  context 'with private IP ranges added' do
+    before do
+      set_trusted_proxies([ "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16" ])
+    end
+
+    it 'filters out private and local IPs from remote_ip' do
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '1.2.3.6, 1.1.1.1, 10.1.5.89, 127.0.0.1')
+      expect(request.remote_ip).to eq('1.1.1.1')
+    end
+  end
+
+  context 'with proxy IP added' do
+    before do
+      set_trusted_proxies([ "60.98.25.47" ])
+    end
+
+    it 'filters out proxy IP from remote_ip' do
+      request = stub_request('HTTP_X_FORWARDED_FOR' => '1.2.3.6, 1.1.1.1, 60.98.25.47, 127.0.0.1')
+      expect(request.remote_ip).to eq('1.1.1.1')
+    end
+  end
+
+  def stub_request(headers = {})
+    ActionDispatch::RemoteIp.new(Proc.new { }, false, Rails.application.config.action_dispatch.trusted_proxies).call(headers)
+    ActionDispatch::Request.new(headers)
+  end
+
+  def set_trusted_proxies(proxies = [])
+    stub_config_setting('trusted_proxies' => proxies)
+    load File.join(__dir__, '../../config/initializers/trusted_proxies.rb')
+  end
+end

From 8dc19494c3fdae366daa8849b5e2a3f58f98878c Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 5 May 2016 13:26:36 +0700
Subject: [PATCH 0154/1431] Remove unused code, update spec, and update
 changelog

---
 CHANGELOG                              |  1 +
 app/controllers/snippets_controller.rb | 20 +-------------------
 spec/routing/routing_spec.rb           |  8 --------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 558897ad892..6c044192d06 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.8.0 (unreleased)
+  - Snippets tab under user profile. !4001 (Long Nguyen)
   - Remove future dates from contribution calendar graph.
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 2daceed039b..f0bd842ca56 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -10,29 +10,11 @@ class SnippetsController < ApplicationController
   # Allow destroy snippet
   before_action :authorize_admin_snippet!, only: [:destroy]
 
-  skip_before_action :authenticate_user!, only: [:index, :user_index, :show, :raw]
+  skip_before_action :authenticate_user!, only: [:show, :raw]
 
   layout 'snippets'
   respond_to :html
 
-  def index
-    if params[:username].present?
-      @user = User.find_by(username: params[:username])
-
-      render_404 and return unless @user
-
-      @snippets = SnippetsFinder.new.execute(current_user, {
-        filter: :by_user,
-        user: @user,
-        scope: params[:scope] }).
-      page(params[:page])
-
-      render 'index'
-    else
-      redirect_to(current_user ? dashboard_snippets_path : explore_snippets_path)
-    end
-  end
-
   def new
     @snippet = PersonalSnippet.new
   end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 1527eddfa48..9deffd0a1e3 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -27,18 +27,10 @@ end
 #          PUT    /snippets/:id(.:format)      snippets#update
 #          DELETE /snippets/:id(.:format)      snippets#destroy
 describe SnippetsController, "routing" do
-  it "to #user_index" do
-    expect(get("/s/User")).to route_to('snippets#index', username: 'User')
-  end
-
   it "to #raw" do
     expect(get("/snippets/1/raw")).to route_to('snippets#raw', id: '1')
   end
 
-  it "to #index" do
-    expect(get("/snippets")).to route_to('snippets#index')
-  end
-
   it "to #create" do
     expect(post("/snippets")).to route_to('snippets#create')
   end

From 91f693c0c4f1ebb62d78e6c82b833f8a19c4dc62 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 5 May 2016 13:59:09 +0700
Subject: [PATCH 0155/1431] Update changelog, improve specs

---
 CHANGELOG                                 |  2 +-
 app/services/issues/move_service.rb       |  2 +-
 spec/services/issues/move_service_spec.rb | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2d3a9e051e5..27c89a7c1ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.8.0 (unreleased)
-  - Assign labels and milestone to target project when moving issue. !3934
+  - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Remove future dates from contribution calendar graph.
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index fe5df8f18cb..e61628086f0 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -46,7 +46,7 @@ module Issues
                      project: @new_project, author: @old_issue.author,
                      description: rewrite_content(@old_issue.description) }
 
-      new_params = @old_issue.serializable_hash.merge(new_params)
+      new_params = @old_issue.serializable_hash.symbolize_keys.merge(new_params)
       CreateService.new(@new_project, @current_user, new_params).execute
     end
 
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 7399003bd75..c15e26189a5 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -7,9 +7,7 @@ describe Issues::MoveService, services: true do
   let(:description) { 'Some issue description' }
   let(:old_project) { create(:project) }
   let(:new_project) { create(:project) }
-  let!(:milestone1) do
-    create(:milestone, project_id: old_project.id, title: 'v9.0')
-  end
+  let(:milestone1) { create(:milestone, project_id: old_project.id, title: 'v9.0') }
 
   let(:old_issue) do
     create(:issue, title: title, description: description,
@@ -57,6 +55,7 @@ describe Issues::MoveService, services: true do
 
         it 'assigns milestone to new issue' do
           expect(new_issue.reload.milestone.title).to eq 'v9.0'
+          expect(new_issue.reload.milestone).to eq(milestone2)
         end
 
         it 'assign labels to new issue' do
@@ -64,6 +63,11 @@ describe Issues::MoveService, services: true do
           expect(expected_label_titles).to include 'label1'
           expect(expected_label_titles).to include 'label2'
           expect(expected_label_titles.size).to eq 2
+
+          new_issue.labels.each do |label|
+            expect(new_project.labels).to include(label)
+            expect(old_project.labels).not_to include(label)
+          end
         end
 
         it 'rewrites issue title' do

From ae29ec31e4f71d722e975bfce945aaed7e0d0bd1 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Thu, 5 May 2016 14:57:34 +0700
Subject: [PATCH 0156/1431] Remove unused view and update redirect when destroy
 snippet

---
 app/controllers/snippets_controller.rb |  2 +-
 app/views/snippets/index.html.haml     | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 app/views/snippets/index.html.haml

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index f0bd842ca56..2c038bdfda5 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -43,7 +43,7 @@ class SnippetsController < ApplicationController
 
     @snippet.destroy
 
-    redirect_to snippets_path
+    redirect_to dashboard_snippets_path
   end
 
   def raw
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
deleted file mode 100644
index 7e4918a6085..00000000000
--- a/app/views/snippets/index.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-- page_title "By #{@user.name}", "Snippets"
-
-%ol.breadcrumb
-  %li
-    = link_to snippets_path do
-      Snippets
-  %li
-    = @user.name
-  .pull-right.hidden-xs
-    = link_to user_path(@user) do
-      #{@user.name} profile page
-
-= render 'snippets'

From 92ed02c54896d395160e9801f286ba16eb8e3ea6 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 5 May 2016 10:09:26 +0200
Subject: [PATCH 0157/1431] Moved TeamCity changelog entry to 8.7.3

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

diff --git a/CHANGELOG b/CHANGELOG
index ecd8b7c3474..e989e622b97 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,10 +23,10 @@ v 8.8.0 (unreleased)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
-  - Merge request widget displays TeamCity build state and code coverage correctly again.
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
+  - Merge request widget displays TeamCity build state and code coverage correctly again.
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously

From 6fbf6b2936e8fa4aecae1bb798d38ec82d2989d2 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 3 May 2016 02:45:46 -0300
Subject: [PATCH 0158/1431] Fix the line code when importing PR review comments
 from GitHub

Pull Request Review Comments are comments on a portion of the unified
diff.
---
 lib/gitlab/github_import/comment_formatter.rb | 21 ++++++++++---
 .../github_import/comment_formatter_spec.rb   | 30 ++++++++-----------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/lib/gitlab/github_import/comment_formatter.rb b/lib/gitlab/github_import/comment_formatter.rb
index 7d58e53991a..7d679eaec6a 100644
--- a/lib/gitlab/github_import/comment_formatter.rb
+++ b/lib/gitlab/github_import/comment_formatter.rb
@@ -28,13 +28,26 @@ module Gitlab
       end
 
       def line_code
-        if on_diff?
-          Gitlab::Diff::LineCode.generate(raw_data.path, raw_data.position, 0)
-        end
+        return unless on_diff?
+
+        parsed_lines = Gitlab::Diff::Parser.new.parse(diff_hunk.lines)
+        generate_line_code(parsed_lines.to_a.last)
+      end
+
+      def generate_line_code(line)
+        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
       end
 
       def on_diff?
-        raw_data.path && raw_data.position
+        diff_hunk.present?
+      end
+
+      def diff_hunk
+        raw_data.diff_hunk
+      end
+
+      def file_path
+        raw_data.path
       end
 
       def note
diff --git a/spec/lib/gitlab/github_import/comment_formatter_spec.rb b/spec/lib/gitlab/github_import/comment_formatter_spec.rb
index a324a82e69f..55e86d4ceac 100644
--- a/spec/lib/gitlab/github_import/comment_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/comment_formatter_spec.rb
@@ -2,23 +2,25 @@ require 'spec_helper'
 
 describe Gitlab::GithubImport::CommentFormatter, lib: true do
   let(:project) { create(:project) }
-  let(:octocat) { OpenStruct.new(id: 123456, login: 'octocat') }
+  let(:octocat) { double(id: 123456, login: 'octocat') }
   let(:created_at) { DateTime.strptime('2013-04-10T20:09:31Z') }
   let(:updated_at) { DateTime.strptime('2014-03-03T18:58:10Z') }
-  let(:base_data) do
+  let(:base) do
     {
       body: "I'm having a problem with this.",
       user: octocat,
+      commit_id: nil,
+      diff_hunk: nil,
       created_at: created_at,
       updated_at: updated_at
     }
   end
 
-  subject(:comment) { described_class.new(project, raw_data)}
+  subject(:comment) { described_class.new(project, raw)}
 
   describe '#attributes' do
     context 'when do not reference a portion of the diff' do
-      let(:raw_data) { OpenStruct.new(base_data) }
+      let(:raw) { double(base) }
 
       it 'returns formatted attributes' do
         expected = {
@@ -36,24 +38,23 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
     end
 
     context 'when on a portion of the diff' do
-      let(:diff_data) do
+      let(:diff) do
         {
           body: 'Great stuff',
           commit_id: '6dcb09b5b57875f334f61aebed695e2e4193db5e',
-          diff_hunk: '@@ -16,33 +16,40 @@ public class Connection : IConnection...',
-          path: 'file1.txt',
-          position: 1
+          diff_hunk: "@@ -1,5 +1,9 @@\n class User\n   def name\n-    'John Doe'\n+    'Jane Doe'",
+          path: 'file1.txt'
         }
       end
 
-      let(:raw_data) { OpenStruct.new(base_data.merge(diff_data)) }
+      let(:raw) { double(base.merge(diff)) }
 
       it 'returns formatted attributes' do
         expected = {
           project: project,
           note: "*Created by: octocat*\n\nGreat stuff",
           commit_id: '6dcb09b5b57875f334f61aebed695e2e4193db5e',
-          line_code: 'ce1be0ff4065a6e9415095c95f25f47a633cef2b_0_1',
+          line_code: 'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3',
           author_id: project.creator_id,
           created_at: created_at,
           updated_at: updated_at
@@ -64,15 +65,10 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
     end
 
     context 'when author is a GitLab user' do
-      let(:raw_data) { OpenStruct.new(base_data.merge(user: octocat)) }
+      let(:raw) { double(base.merge(user: octocat)) }
 
-      it 'returns project#creator_id as author_id when is not a GitLab user' do
-        expect(comment.attributes.fetch(:author_id)).to eq project.creator_id
-      end
-
-      it 'returns GitLab user id as author_id when is a GitLab user' do
+      it 'returns GitLab user id as author_id' do
         gl_user = create(:omniauth_user, extern_uid: octocat.id, provider: 'github')
-
         expect(comment.attributes.fetch(:author_id)).to eq gl_user.id
       end
     end

From 3bf43e7c2710f150720392e28757862bc4e021b3 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 5 May 2016 10:47:08 -0300
Subject: [PATCH 0159/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 0020e580b86..bcb3ecec26c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.8.0 (unreleased)
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
   - Merge request widget displays TeamCity build state and code coverage correctly again.
+  - Fix the line code when importing PR review comments from GitHub. !4010
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously

From c24958365fa739357e7a090e10c233860008dcd3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 5 May 2016 09:00:29 -0500
Subject: [PATCH 0160/1431] Remove mobile styles; horizontally scroll layout
 nav links

---
 app/assets/stylesheets/framework/nav.scss | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index bf09b6dadc6..7c18e93a261 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -222,29 +222,13 @@
     .dropdown {
       margin-left: 7px;
     }
-
-    @media (max-width: $screen-md-max) {
-      float: none;
-      margin-bottom: 10px;
-
-      .btn {
-        width: 20%;
-      }
-    }
-
-    @media (max-width: $screen-xs-max) {
-      text-align: center;
-
-      .rss-btn,
-      .dropdown-new {
-        display: inline-block;
-        width: 48%;
-      }
-    }
   }
 
   .nav-links {
     border-bottom: none;
+    height: 51px;
+    white-space: nowrap;
+    overflow-x: auto;
 
     li {
 

From 4bef939e27d7a6b2df9984f445485207f3dacd43 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 May 2016 16:31:19 +0200
Subject: [PATCH 0161/1431] Remove group rss icon since it depends on context
 and duplciates on other pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_group.html.haml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index b4b528c614f..5c11d3c36c6 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,8 +1,5 @@
 - if current_user
   .controls
-    - if current_path?('groups#show')
-      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn btn-gray rss-btn'
-
     %span.dropdown.group-settings-dropdown
       %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
         = icon('cog')

From 5a8b8ba6c76a74dcad401a627b271b10bb7a1088 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 May 2016 16:37:41 +0200
Subject: [PATCH 0162/1431] Fix group settings dropdown for group members and
 visitors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_group.html.haml | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 5c11d3c36c6..dff188e0b15 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,19 +1,19 @@
 - if current_user
-  .controls
-    %span.dropdown.group-settings-dropdown
-      %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
-        = icon('cog')
-        = icon('caret-down')
-      %ul.dropdown-menu.dropdown-menu-align-right
-        = nav_link(path: 'groups#projects') do
-          = link_to projects_group_path(@group), title: 'Projects' do
-            Projects
-        %li.divider
-        - if can?(current_user, :admin_group, @group)
-          %li
-            = link_to edit_group_path(@group) do
-              Edit Group
-        - if access = @group.users.find_by(id: current_user.id)
+  - if access = @group.users.find_by(id: current_user.id)
+    .controls
+      %span.dropdown.group-settings-dropdown
+        %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+          = icon('cog')
+          = icon('caret-down')
+        %ul.dropdown-menu.dropdown-menu-align-right
+          - if can?(current_user, :admin_group, @group)
+            = nav_link(path: 'groups#projects') do
+              = link_to projects_group_path(@group), title: 'Projects' do
+                Projects
+            %li.divider
+            %li
+              = link_to edit_group_path(@group) do
+                Edit Group
           %li
             = link_to leave_group_group_members_path(@group),
               data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do

From 280ea4f600f9084d16d84fdaf57bf54830787fe3 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 5 May 2016 09:17:46 -0700
Subject: [PATCH 0163/1431] Upgrade Sidekiq to 4.1.2

---
 CHANGELOG    | 1 +
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bcb3ecec26c..8bc554efbe8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.8.0 (unreleased)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Log to application.log when an admin starts and stops impersonating a user
   - Make build status canceled if any of the jobs was canceled and none failed
+  - Upgrade Sidekiq to 4.1.2
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
diff --git a/Gemfile.lock b/Gemfile.lock
index 41d2922f63e..a8f7bfe43ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.7.7)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
     coveralls (0.8.13)
       json (~> 1.8)
@@ -740,7 +740,7 @@ GEM
       rack
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.1.1)
+    sidekiq (4.1.2)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       redis (~> 3.2, >= 3.2.1)

From e449a6c05c734ff9e38e13013591d07d03c0fff6 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 4 May 2016 13:14:11 +0200
Subject: [PATCH 0164/1431] Added documentation on how to instrument methods

[ci skip]
---
 doc/development/instrumentation.md | 129 +++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 6 deletions(-)

diff --git a/doc/development/instrumentation.md b/doc/development/instrumentation.md
index c1cf2e77c26..9168c70945a 100644
--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
@@ -1,12 +1,125 @@
 # Instrumenting Ruby Code
 
-GitLab Performance Monitoring allows instrumenting of custom blocks of Ruby
-code. This can be used to measure the time spent in a specific part of a larger
-chunk of code. The resulting data is stored as a field in the transaction that
-executed the block.
+GitLab Performance Monitoring allows instrumenting of both methods and custom
+blocks of Ruby code. Method instrumentation is the primary form of
+instrumentation with block-based instrumentation only being used when we want to
+drill down to specific regions of code within a method.
 
-To start measuring a block of Ruby code you should use `Gitlab::Metrics.measure`
-and give it a name:
+## Instrumenting Methods
+
+Instrumenting methods is done by using the `Gitlab::Metrics::Instrumentation`
+module. This module offers a few different methods that can be used to
+instrument code:
+
+* `instrument_method`: instruments a single class method.
+* `instrument_instance_method`: instruments a single instance method.
+* `instrument_class_hierarchy`: given a Class this method will recursively
+  instrument all sub-classes (both class and instance methods).
+* `instrument_methods`: instruments all public class methods of a Module.
+* `instrument_instance_methods`: instruments all public instance methods of a
+  Module.
+
+To remove the need for typing the full `Gitlab::Metrics::Instrumentation`
+namespace you can use the `configure` class method. This method simply yields
+the supplied block while passing `Gitlab::Metrics::Instrumentation` as its
+argument. An example:
+
+```
+Gitlab::Metrics::Instrumentation.configure do |conf|
+  conf.instrument_method(Foo, :bar)
+  conf.instrument_method(Foo, :baz)
+end
+```
+
+Using this method is in general preferred over directly calling the various
+instrumentation methods.
+
+Method instrumentation should be added in the initializer
+`config/initializers/metrics.rb`.
+
+### Examples
+
+Instrumenting a single method:
+
+```
+Gitlab::Metrics::Instrumentation.configure do |conf|
+  conf.instrument_method(User, :find_by)
+end
+```
+
+Instrumenting an entire class hierarchy:
+
+```
+Gitlab::Metrics::Instrumentation.configure do |conf|
+  conf.instrument_class_hierarchy(ActiveRecord::Base)
+end
+```
+
+Instrumenting all public class methods:
+
+```
+Gitlab::Metrics::Instrumentation.configure do |conf|
+  conf.instrument_methods(User)
+end
+```
+
+### Checking Instrumented Methods
+
+The easiest way to check if a method has been instrumented is to check its
+source location. For example:
+
+```
+method = Rugged::TagCollection.instance_method(:[])
+
+method.source_location
+```
+
+If the source location points to `lib/gitlab/metrics/instrumentation.rb` you
+know the method has been instrumented.
+
+If you're using Pry you can use the `$` command to display the source code of a
+method (along with its source location), this is easier than running the above
+Ruby code. In case of the above snippet you'd run the following:
+
+```
+$ Rugged::TagCollection#[]
+```
+
+This will print out something along the lines of:
+
+```
+From: /path/to/your/gitlab/lib/gitlab/metrics/instrumentation.rb @ line 148:
+Owner: #<Module:0x0055f0865c6d50>
+Visibility: public
+Number of lines: 21
+
+def #{name}(#{args_signature})
+  trans = Gitlab::Metrics::Instrumentation.transaction
+
+  if trans
+    start    = Time.now
+    retval   = super
+    duration = (Time.now - start) * 1000.0
+
+    if duration >= Gitlab::Metrics.method_call_threshold
+      trans.increment(:method_duration, duration)
+
+      trans.add_metric(Gitlab::Metrics::Instrumentation::SERIES,
+                       { duration: duration },
+                       method: #{label.inspect})
+    end
+
+    retval
+  else
+    super
+  end
+end
+```
+
+## Instrumenting Ruby Blocks
+
+Measuring blocks of Ruby code is done by calling `Gitlab::Metrics.measure` and
+passing it a block. For example:
 
 ```ruby
 Gitlab::Metrics.measure(:foo) do
@@ -14,6 +127,10 @@ Gitlab::Metrics.measure(:foo) do
 end
 ```
 
+The block is executed and the execution time is stored as a set of fields in the
+currently running transaction. If no transaction is present the block is yielded
+without measuring anything.
+
 3 values are measured for a block:
 
 1. The real time elapsed, stored in NAME_real_time.

From 8159555491d0f1f9524ee818236b4bc552012bfa Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 5 May 2016 19:31:10 +0200
Subject: [PATCH 0165/1431] Added CHANGELOG entry for merge request !3931

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

diff --git a/CHANGELOG b/CHANGELOG
index 8bc554efbe8..d8dfaaf7d0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
   - Merge request widget displays TeamCity build state and code coverage correctly again.
   - Fix the line code when importing PR review comments from GitHub. !4010
+  - Wikis are now initialized on legacy projects when checking repositories
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously

From d04146b0e0450f6363193fb703d90321df9920e5 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 5 May 2016 19:33:05 +0200
Subject: [PATCH 0166/1431] Added CHANGELOG entry for merge request !3880

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

diff --git a/CHANGELOG b/CHANGELOG
index d8dfaaf7d0b..975157c683f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 8.7.3
   - Merge request widget displays TeamCity build state and code coverage correctly again.
   - Fix the line code when importing PR review comments from GitHub. !4010
   - Wikis are now initialized on legacy projects when checking repositories
+  - Label titles in filters are now escaped properly
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously

From 0cf59281cda96e970a525b939d9db5f5ca7a3be4 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 5 May 2016 19:40:08 +0200
Subject: [PATCH 0167/1431] Moved entry for !3880 to 8.7.2

Apparently this was already released in 8.7.2 but no changelog entry was
added.

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

diff --git a/CHANGELOG b/CHANGELOG
index 975157c683f..5469723beca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,12 +31,12 @@ v 8.7.3
   - Merge request widget displays TeamCity build state and code coverage correctly again.
   - Fix the line code when importing PR review comments from GitHub. !4010
   - Wikis are now initialized on legacy projects when checking repositories
-  - Label titles in filters are now escaped properly
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously
   - Fix error 500 when trying to create a wiki page
   - Updated spacing between notification label and button
+  - Label titles in filters are now escaped properly
 
 v 8.7.1
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848

From 6e47a1924b71c44b989769e6af41459b0f5da6d2 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 4 May 2016 10:44:43 +0200
Subject: [PATCH 0168/1431] Updated gitlab_git to 10.1.0

---
 CHANGELOG    | 2 ++
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5469723beca..769ffb2476a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Log to application.log when an admin starts and stops impersonating a user
+  - Updated gitlab_git to 10.1.0
+  - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
   - Sanitize repo paths in new project error message
diff --git a/Gemfile.lock b/Gemfile.lock
index a8f7bfe43ba..fe083c2b566 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -353,7 +353,7 @@ GEM
       posix-spawn (~> 0.3)
     gitlab_emoji (0.3.1)
       gemojione (~> 2.2, >= 2.2.1)
-    gitlab_git (10.0.2)
+    gitlab_git (10.1.0)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)

From 93ce229665f875efcd7ee25b006834300c2e37be Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Fri, 29 Apr 2016 21:41:39 +0200
Subject: [PATCH 0169/1431] Use tag_exists? in GitAccess#protected_tag?

This removes the need for retrieving the entire list of tags just to
check if a specific one exists.
---
 lib/gitlab/git_access.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 3ed1eec517c..ad2da2b81cf 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -176,7 +176,7 @@ module Gitlab
     end
 
     def protected_tag?(tag_name)
-      project.repository.tag_names.include?(tag_name)
+      project.repository.tag_exists?(tag_name)
     end
 
     def user_allowed?

From 003671207db67eee5f3ceb605a061346dfad945d Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 4 May 2016 12:06:40 +0200
Subject: [PATCH 0170/1431] Fix passing nil to protected_tag?

Previously this method would directly receive the output of tag_name().
This method could either return a String or nil. In the previous setup
this would somehow magically work but because Rugged::TagCollection#[]
doesn't accept nil values it started to fail.

To work around this the elsif in change_access_check() assigns the
result of tag_name() to a local and then _only_ calls protected_tag?()
if the tag name is not nil. The extra parenthesis are put in place to
ensure that things are parsed correctly, without these the code would be
parsed as follows:

    elsif tag_ref = (tag_name(ref) && protected_tag(tag_ref))

During runtime this would basically resolve to:

    elsif tag_ref = (tag_name(ref) && protected_tag(nil))

This is because when you refer to the variable you're assigning _in_ the
assignment Ruby returns nil instead of raising an error.
---
 lib/gitlab/git_access.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index ad2da2b81cf..6cb41239871 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -128,7 +128,7 @@ module Gitlab
       action =
         if project.protected_branch?(branch_name(ref))
           protected_branch_action(oldrev, newrev, branch_name(ref))
-        elsif protected_tag?(tag_name(ref))
+        elsif (tag_ref = tag_name(ref)) && protected_tag?(tag_ref)
           # Prevent any changes to existing git tag unless user has permissions
           :admin_project
         else

From 00b3eedf7c1a4c94bd82ef513c5aecc21d1296d0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 5 May 2016 12:55:01 -0500
Subject: [PATCH 0171/1431] Remove duplicate cover-control mobile styles

---
 app/assets/stylesheets/pages/profile.scss | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 7a3a2ddd363..abc5a0e9877 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -222,16 +222,4 @@
       }
     }
   }
-
-  .cover-controls {
-    @media (max-width: $screen-xs-max) {
-      position: static;
-      margin-bottom: 20px;
-
-      .btn {
-        display: inline-block;
-        width: 48%;
-      }
-    }
-  }
 }

From d028863eda8b97f6e4db129ef57f0d3a2130c9b3 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 4 May 2016 18:21:57 -0300
Subject: [PATCH 0172/1431] Sanitize milestones and label titles

---
 app/models/label.rb                                       | 5 +++++
 app/models/milestone.rb                                   | 5 +++++
 spec/lib/banzai/filter/milestone_reference_filter_spec.rb | 2 +-
 spec/models/label_spec.rb                                 | 8 ++++++++
 spec/models/milestone_spec.rb                             | 8 ++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/models/label.rb b/app/models/label.rb
index 60bdce32952..0b34911a4e9 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -117,6 +117,11 @@ class Label < ActiveRecord::Base
     LabelsHelper::text_color_for_bg(self.color)
   end
 
+  def title= value
+    value = Sanitize.clean(value.to_s) if value
+    write_attribute(:title, Sanitize.clean(value))
+  end
+
   private
 
   def label_format_reference(format = :id)
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 986184dd301..ed81791c69c 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -129,6 +129,11 @@ class Milestone < ActiveRecord::Base
     nil
   end
 
+  def title= value
+    value = Sanitize.clean(value.to_s) if value
+    write_attribute(:title, value)
+  end
+
   # Sorts the issues for the given IDs.
   #
   # This method runs a single SQL query using a CASE statement to update the
diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
index ebf3d7489b5..5beb61dac5c 100644
--- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
@@ -43,7 +43,7 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
       milestone.update_attribute(:title, %{"></a>whatever<a title="})
 
       doc = reference_filter("milestone #{reference}")
-      expect(doc.text).to eq "milestone #{milestone.title}"
+      expect(doc.text).to eq "milestone \">whatever"
     end
 
     it 'includes default classes' do
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
index 0614ca1e7c9..b61c55a3f6d 100644
--- a/spec/models/label_spec.rb
+++ b/spec/models/label_spec.rb
@@ -55,6 +55,14 @@ describe Label, models: true do
     end
   end
 
+  describe "#title" do
+    let(:label) { create(:label, title: "<b>test</b>") }
+
+    it "sanitizes title" do
+      expect(label.title).to eq("test")
+    end
+  end
+
   describe '#to_reference' do
     context 'using id' do
       it 'returns a String reference to the object' do
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 72a4ea70228..e2c89a4b3e6 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -34,6 +34,14 @@ describe Milestone, models: true do
   let(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
+  describe "#title" do
+    let(:milestone) { create(:milestone, title: "<b>test</b>") }
+
+    it "sanitizes title" do
+      expect(milestone.title).to eq("test")
+    end
+  end
+
   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)

From d6f67dba0144bdae20bd86051f3eb98ce201439e Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 5 May 2016 13:46:58 -0700
Subject: [PATCH 0173/1431] Add note to requirements doc on swap
 recommendation, and ensuring enough available memory.

---
 doc/install/requirements.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 58f409746cd..df8e8bdc476 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -64,7 +64,10 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim
 ### Memory
 
 You need at least 2GB of addressable memory (RAM + swap) to install and use GitLab!
-With less memory GitLab will give strange errors during the reconfigure run and 500 errors during usage.
+The operating system and any other running applications will also be using memory
+so keep in mind that you need at least 2GB available before running GitLab. With
+less memory GitLab will give strange errors during the reconfigure run and 500
+errors during usage.
 
 - 512MB RAM + 1.5GB of swap is the absolute minimum but we strongly **advise against** this amount of memory. See the unicorn worker section below for more advice.
 - 1GB RAM + 1GB swap supports up to 100 users but it will be very slow
@@ -77,6 +80,10 @@ With less memory GitLab will give strange errors during the reconfigure run and
 - 128GB RAM supports up to 32,000 users
 - More users? Run it on [multiple application servers](https://about.gitlab.com/high-availability/)
 
+We recommend having at least 1GB of swap on your server, even if you currently have
+enough available RAM. Having swap will help reduce the chance of errors occuring
+if your available memory changes.
+
 Notice: The 25 workers of Sidekiq will show up as separate processes in your process overview (such as top or htop) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about many you need of those.
 
 ## Gitlab Runner

From df9a7c6b4acf0a662366b2e31d897cda370c2216 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 5 May 2016 17:22:18 -0400
Subject: [PATCH 0174/1431] Add a note to testing docs about the `:each`
 argument to RSpec hooks

[ci skip]
---
 doc/development/testing.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/development/testing.md b/doc/development/testing.md
index 672e3fb4649..33eed29ba5c 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -64,6 +64,7 @@ the command line via `bundle exec teaspoon`, or via a web browser at
   methods.
 - Use `context` to test branching logic.
 - Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
+- Don't supply the `:each` argument to hooks since it's the default.
 - Prefer `not_to` to `to_not`.
 - Try to match the ordering of tests to the ordering within the class.
 - Try to follow the [Four-Phase Test][four-phase-test] pattern, using newlines

From 80b30500e44b621c0ecd3c062349b34ddbb0a0fb Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Fri, 6 May 2016 00:42:13 +0000
Subject: [PATCH 0175/1431] blost -> blog

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

diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md
index cc059dc4376..3a152c9116a 100644
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
@@ -10,6 +10,6 @@
 
 ## Outside the documentation
 
-- [Blost post about using GitLab CI for iOS projects](https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/)
+- [Blog post about using GitLab CI for iOS projects](https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/)
 - [Repo's with examples for various languages](https://gitlab.com/groups/gitlab-examples)
 - [The .gitlab-ci.yml file for GitLab itself](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml)

From 47da013cf83b4a42fc9f4b049d8ba41dc3f325d2 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Wed, 4 May 2016 19:42:10 +0200
Subject: [PATCH 0176/1431] Annotate the models

---
 app/models/appearance.rb                      | 13 ++++
 app/models/application_setting.rb             | 16 ++--
 app/models/audit_event.rb                     |  4 +-
 app/models/broadcast_message.rb               |  4 +-
 app/models/ci/build.rb                        | 14 ++--
 app/models/ci/commit.rb                       | 10 ++-
 app/models/ci/runner.rb                       | 14 ++--
 app/models/ci/trigger.rb                      |  2 +-
 app/models/ci/variable.rb                     |  6 +-
 app/models/commit_status.rb                   | 17 +++--
 app/models/deploy_key.rb                      |  6 +-
 app/models/email.rb                           |  2 +-
 app/models/event.rb                           |  4 +-
 app/models/generic_commit_status.rb           | 17 +++--
 app/models/group.rb                           | 21 +++---
 app/models/hooks/project_hook.rb              |  2 +-
 app/models/hooks/service_hook.rb              |  2 +-
 app/models/hooks/system_hook.rb               |  2 +-
 app/models/hooks/web_hook.rb                  |  2 +-
 app/models/identity.rb                        |  4 +-
 app/models/issue.rb                           |  9 ++-
 app/models/key.rb                             |  6 +-
 app/models/label.rb                           | 16 ++--
 app/models/label_link.rb                      |  2 +-
 app/models/lfs_object.rb                      |  4 +-
 app/models/member.rb                          |  8 +-
 app/models/members/group_member.rb            |  8 +-
 app/models/members/project_member.rb          |  8 +-
 app/models/merge_request.rb                   | 13 ++--
 app/models/merge_request_diff.rb              |  4 +-
 app/models/milestone.rb                       |  4 +-
 app/models/namespace.rb                       | 20 ++---
 app/models/note.rb                            |  8 +-
 app/models/notification_setting.rb            | 13 ++++
 app/models/personal_snippet.rb                |  6 +-
 app/models/project.rb                         | 75 ++++++++++---------
 app/models/project_group_link.rb              | 12 +++
 app/models/project_import_data.rb             |  9 ++-
 app/models/project_services/asana_service.rb  | 13 ++--
 .../project_services/assembla_service.rb      | 13 ++--
 app/models/project_services/bamboo_service.rb | 13 ++--
 .../project_services/buildkite_service.rb     | 13 ++--
 .../project_services/builds_email_service.rb  | 13 ++--
 .../project_services/campfire_service.rb      | 13 ++--
 app/models/project_services/ci_service.rb     | 13 ++--
 .../custom_issue_tracker_service.rb           | 13 ++--
 .../project_services/drone_ci_service.rb      | 13 ++--
 .../emails_on_push_service.rb                 | 13 ++--
 .../project_services/external_wiki_service.rb | 13 ++--
 .../project_services/flowdock_service.rb      | 13 ++--
 .../project_services/gemnasium_service.rb     | 13 ++--
 .../project_services/gitlab_ci_service.rb     | 13 ++--
 .../gitlab_issue_tracker_service.rb           | 13 ++--
 .../project_services/hipchat_service.rb       | 13 ++--
 app/models/project_services/irker_service.rb  | 13 ++--
 .../project_services/issue_tracker_service.rb | 13 ++--
 app/models/project_services/jira_service.rb   | 13 ++--
 .../pivotaltracker_service.rb                 | 13 ++--
 .../project_services/pushover_service.rb      | 13 ++--
 .../project_services/redmine_service.rb       | 13 ++--
 app/models/project_services/slack_service.rb  | 13 ++--
 .../project_services/teamcity_service.rb      | 13 ++--
 app/models/project_snippet.rb                 |  6 +-
 app/models/protected_branch.rb                |  2 +-
 app/models/release.rb                         |  2 +-
 app/models/security_event.rb                  |  4 +-
 app/models/sent_notification.rb               |  8 +-
 app/models/service.rb                         | 13 ++--
 app/models/snippet.rb                         |  6 +-
 app/models/spam_log.rb                        | 17 +++++
 app/models/subscription.rb                    |  2 +-
 app/models/user.rb                            | 49 ++++++------
 72 files changed, 485 insertions(+), 323 deletions(-)

diff --git a/app/models/appearance.rb b/app/models/appearance.rb
index 4cf8dd9a8ce..4528760fefa 100644
--- a/app/models/appearance.rb
+++ b/app/models/appearance.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: appearances
+#
+#  id          :integer          not null, primary key
+#  title       :string
+#  description :text
+#  header_logo :string
+#  logo        :string
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
 class Appearance < ActiveRecord::Base
   validates :title,       presence: true
   validates :description, presence: true
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 36f88154232..72ec91d2909 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -10,21 +10,20 @@
 #  sign_in_text                      :text
 #  created_at                        :datetime
 #  updated_at                        :datetime
-#  home_page_url                     :string(255)
+#  home_page_url                     :string
 #  default_branch_protection         :integer          default(2)
 #  restricted_visibility_levels      :text
 #  version_check_enabled             :boolean          default(TRUE)
 #  max_attachment_size               :integer          default(10), not null
 #  default_project_visibility        :integer
 #  default_snippet_visibility        :integer
-#  default_group_visibility          :integer
 #  restricted_signup_domains         :text
 #  user_oauth_applications           :boolean          default(TRUE)
-#  after_sign_out_path               :string(255)
+#  after_sign_out_path               :string
 #  session_expire_delay              :integer          default(10080), not null
 #  import_sources                    :text
 #  help_page_text                    :text
-#  admin_notification_email          :string(255)
+#  admin_notification_email          :string
 #  shared_runners_enabled            :boolean          default(TRUE), not null
 #  max_artifacts_size                :integer          default(100), not null
 #  runners_registration_token        :string
@@ -32,8 +31,6 @@
 #  two_factor_grace_period           :integer          default(48)
 #  metrics_enabled                   :boolean          default(FALSE)
 #  metrics_host                      :string           default("localhost")
-#  metrics_username                  :string
-#  metrics_password                  :string
 #  metrics_pool_size                 :integer          default(16)
 #  metrics_timeout                   :integer          default(10)
 #  metrics_method_call_threshold     :integer          default(10)
@@ -41,9 +38,16 @@
 #  recaptcha_site_key                :string
 #  recaptcha_private_key             :string
 #  metrics_port                      :integer          default(8089)
+#  metrics_sample_interval           :integer          default(15)
 #  sentry_enabled                    :boolean          default(FALSE)
 #  sentry_dsn                        :string
+#  akismet_enabled                   :boolean          default(FALSE)
+#  akismet_api_key                   :string
 #  email_author_in_body              :boolean          default(FALSE)
+#  default_group_visibility          :integer
+#  repository_checks_enabled         :boolean          default(FALSE)
+#  metrics_packet_size               :integer          default(1)
+#  shared_runners_text               :text
 #
 
 class ApplicationSetting < ActiveRecord::Base
diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb
index 0ed0dd98a59..44b090260e7 100644
--- a/app/models/audit_event.rb
+++ b/app/models/audit_event.rb
@@ -4,9 +4,9 @@
 #
 #  id          :integer          not null, primary key
 #  author_id   :integer          not null
-#  type        :string(255)      not null
+#  type        :string           not null
 #  entity_id   :integer          not null
-#  entity_type :string(255)      not null
+#  entity_type :string           not null
 #  details     :text
 #  created_at  :datetime
 #  updated_at  :datetime
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb
index 8a0a8a4c2a9..075ac733bfc 100644
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -8,8 +8,8 @@
 #  ends_at    :datetime
 #  created_at :datetime
 #  updated_at :datetime
-#  color      :string(255)
-#  font       :string(255)
+#  color      :string
+#  font       :string
 #
 
 class BroadcastMessage < ActiveRecord::Base
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 553cd447971..4bc3a225e2c 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -4,7 +4,7 @@
 #
 #  id                 :integer          not null, primary key
 #  project_id         :integer
-#  status             :string(255)
+#  status             :string
 #  finished_at        :datetime
 #  trace              :text
 #  created_at         :datetime
@@ -15,19 +15,19 @@
 #  commit_id          :integer
 #  commands           :text
 #  job_id             :integer
-#  name               :string(255)
+#  name               :string
 #  deploy             :boolean          default(FALSE)
 #  options            :text
 #  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string(255)
+#  stage              :string
 #  trigger_request_id :integer
 #  stage_idx          :integer
 #  tag                :boolean
-#  ref                :string(255)
+#  ref                :string
 #  user_id            :integer
-#  type               :string(255)
-#  target_url         :string(255)
-#  description        :string(255)
+#  type               :string
+#  target_url         :string
+#  description        :string
 #  artifacts_file     :text
 #  gl_project_id      :integer
 #  artifacts_metadata :text
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index f2667e5476b..4ac4e0fb8b2 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -4,9 +4,9 @@
 #
 #  id            :integer          not null, primary key
 #  project_id    :integer
-#  ref           :string(255)
-#  sha           :string(255)
-#  before_sha    :string(255)
+#  ref           :string
+#  sha           :string
+#  before_sha    :string
 #  push_data     :text
 #  created_at    :datetime
 #  updated_at    :datetime
@@ -14,6 +14,10 @@
 #  yaml_errors   :text
 #  committed_at  :datetime
 #  gl_project_id :integer
+#  status        :string
+#  started_at    :datetime
+#  finished_at   :datetime
+#  duration      :integer
 #
 
 module Ci
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 90349a07594..add59a08892 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -3,18 +3,18 @@
 # Table name: ci_runners
 #
 #  id           :integer          not null, primary key
-#  token        :string(255)
+#  token        :string
 #  created_at   :datetime
 #  updated_at   :datetime
-#  description  :string(255)
+#  description  :string
 #  contacted_at :datetime
 #  active       :boolean          default(TRUE), not null
 #  is_shared    :boolean          default(FALSE)
-#  name         :string(255)
-#  version      :string(255)
-#  revision     :string(255)
-#  platform     :string(255)
-#  architecture :string(255)
+#  name         :string
+#  version      :string
+#  revision     :string
+#  platform     :string
+#  architecture :string
 #
 
 module Ci
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 2b9a457c8ab..4f3f4d79fac 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -3,7 +3,7 @@
 # Table name: ci_triggers
 #
 #  id            :integer          not null, primary key
-#  token         :string(255)
+#  token         :string
 #  project_id    :integer
 #  deleted_at    :datetime
 #  created_at    :datetime
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index e786bd7dd93..4229fe085a1 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -4,11 +4,11 @@
 #
 #  id                   :integer          not null, primary key
 #  project_id           :integer
-#  key                  :string(255)
+#  key                  :string
 #  value                :text
 #  encrypted_value      :text
-#  encrypted_value_salt :string(255)
-#  encrypted_value_iv   :string(255)
+#  encrypted_value_salt :string
+#  encrypted_value_iv   :string
 #  gl_project_id        :integer
 #
 
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index aa56314aa16..1260c448de3 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -4,7 +4,7 @@
 #
 #  id                 :integer          not null, primary key
 #  project_id         :integer
-#  status             :string(255)
+#  status             :string
 #  finished_at        :datetime
 #  trace              :text
 #  created_at         :datetime
@@ -15,21 +15,24 @@
 #  commit_id          :integer
 #  commands           :text
 #  job_id             :integer
-#  name               :string(255)
+#  name               :string
 #  deploy             :boolean          default(FALSE)
 #  options            :text
 #  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string(255)
+#  stage              :string
 #  trigger_request_id :integer
 #  stage_idx          :integer
 #  tag                :boolean
-#  ref                :string(255)
+#  ref                :string
 #  user_id            :integer
-#  type               :string(255)
-#  target_url         :string(255)
-#  description        :string(255)
+#  type               :string
+#  target_url         :string
+#  description        :string
 #  artifacts_file     :text
 #  gl_project_id      :integer
+#  artifacts_metadata :text
+#  erased_by_id       :integer
+#  erased_at          :datetime
 #
 
 class CommitStatus < ActiveRecord::Base
diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index 9ab663c04ad..43cf625f770 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -7,9 +7,9 @@
 #  created_at  :datetime
 #  updated_at  :datetime
 #  key         :text
-#  title       :string(255)
-#  type        :string(255)
-#  fingerprint :string(255)
+#  title       :string
+#  type        :string
+#  fingerprint :string
 #  public      :boolean          default(FALSE), not null
 #
 
diff --git a/app/models/email.rb b/app/models/email.rb
index b323d1edd10..eae2472f337 100644
--- a/app/models/email.rb
+++ b/app/models/email.rb
@@ -4,7 +4,7 @@
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  email      :string(255)      not null
+#  email      :string           not null
 #  created_at :datetime
 #  updated_at :datetime
 #
diff --git a/app/models/event.rb b/app/models/event.rb
index 897518aadc7..25c7c3e6dc7 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -3,9 +3,9 @@
 # Table name: events
 #
 #  id          :integer          not null, primary key
-#  target_type :string(255)
+#  target_type :string
 #  target_id   :integer
-#  title       :string(255)
+#  title       :string
 #  data        :text
 #  project_id  :integer
 #  created_at  :datetime
diff --git a/app/models/generic_commit_status.rb b/app/models/generic_commit_status.rb
index 97f4f03a9a5..d4afd8cbe84 100644
--- a/app/models/generic_commit_status.rb
+++ b/app/models/generic_commit_status.rb
@@ -4,7 +4,7 @@
 #
 #  id                 :integer          not null, primary key
 #  project_id         :integer
-#  status             :string(255)
+#  status             :string
 #  finished_at        :datetime
 #  trace              :text
 #  created_at         :datetime
@@ -15,21 +15,24 @@
 #  commit_id          :integer
 #  commands           :text
 #  job_id             :integer
-#  name               :string(255)
+#  name               :string
 #  deploy             :boolean          default(FALSE)
 #  options            :text
 #  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string(255)
+#  stage              :string
 #  trigger_request_id :integer
 #  stage_idx          :integer
 #  tag                :boolean
-#  ref                :string(255)
+#  ref                :string
 #  user_id            :integer
-#  type               :string(255)
-#  target_url         :string(255)
-#  description        :string(255)
+#  type               :string
+#  target_url         :string
+#  description        :string
 #  artifacts_file     :text
 #  gl_project_id      :integer
+#  artifacts_metadata :text
+#  erased_by_id       :integer
+#  erased_at          :datetime
 #
 
 class GenericCommitStatus < CommitStatus
diff --git a/app/models/group.rb b/app/models/group.rb
index 1f8432e3320..cff76877958 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -2,16 +2,17 @@
 #
 # Table name: namespaces
 #
-#  id                     :integer          not null, primary key
-#  name                   :string(255)      not null
-#  path                   :string(255)      not null
-#  owner_id               :integer
-#  visibility_level       :integer          default(20), not null
-#  created_at             :datetime
-#  updated_at             :datetime
-#  type                   :string(255)
-#  description            :string(255)      default(""), not null
-#  avatar                 :string(255)
+#  id                    :integer          not null, primary key
+#  name                  :string           not null
+#  path                  :string           not null
+#  owner_id              :integer
+#  created_at            :datetime
+#  updated_at            :datetime
+#  type                  :string
+#  description           :string           default(""), not null
+#  avatar                :string
+#  share_with_group_lock :boolean          default(FALSE)
+#  visibility_level      :integer          default(20), not null
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb
index d149511b868..64f570b12ae 100644
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
@@ -16,7 +16,7 @@
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
-#  token                   :string
+#  wiki_page_events        :boolean          default(FALSE), not null
 #
 
 class ProjectHook < WebHook
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb
index f45145eeb3a..23f6468ee52 100644
--- a/app/models/hooks/service_hook.rb
+++ b/app/models/hooks/service_hook.rb
@@ -16,7 +16,7 @@
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
-#  token                   :string
+#  wiki_page_events        :boolean          default(FALSE), not null
 #
 
 class ServiceHook < WebHook
diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb
index 012cc8ec005..5e9046f3623 100644
--- a/app/models/hooks/system_hook.rb
+++ b/app/models/hooks/system_hook.rb
@@ -16,7 +16,7 @@
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
-#  token                   :string
+#  wiki_page_events        :boolean          default(FALSE), not null
 #
 
 class SystemHook < WebHook
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 1e3b4815596..a8f17ac16a6 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -16,7 +16,7 @@
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
-#  token                   :string
+#  wiki_page_events        :boolean          default(FALSE), not null
 #
 
 class WebHook < ActiveRecord::Base
diff --git a/app/models/identity.rb b/app/models/identity.rb
index e1915b079d4..ef4d5f99091 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -3,8 +3,8 @@
 # Table name: identities
 #
 #  id         :integer          not null, primary key
-#  extern_uid :string(255)
-#  provider   :string(255)
+#  extern_uid :string
+#  provider   :string
 #  user_id    :integer
 #  created_at :datetime
 #  updated_at :datetime
diff --git a/app/models/issue.rb b/app/models/issue.rb
index ea1bfb776ee..abaa509707c 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -3,20 +3,23 @@
 # Table name: issues
 #
 #  id            :integer          not null, primary key
-#  title         :string(255)
+#  title         :string
 #  assignee_id   :integer
 #  author_id     :integer
 #  project_id    :integer
 #  created_at    :datetime
 #  updated_at    :datetime
 #  position      :integer          default(0)
-#  branch_name   :string(255)
+#  branch_name   :string
 #  description   :text
 #  milestone_id  :integer
-#  state         :string(255)
+#  state         :string
 #  iid           :integer
 #  updated_by_id :integer
 #  moved_to_id   :integer
+#  confidential  :boolean          default(FALSE)
+#  deleted_at    :datetime
+#  due_date      :date
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/key.rb b/app/models/key.rb
index 0282ad18139..b2b57849f8a 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -7,9 +7,9 @@
 #  created_at  :datetime
 #  updated_at  :datetime
 #  key         :text
-#  title       :string(255)
-#  type        :string(255)
-#  fingerprint :string(255)
+#  title       :string
+#  type        :string
+#  fingerprint :string
 #  public      :boolean          default(FALSE), not null
 #
 
diff --git a/app/models/label.rb b/app/models/label.rb
index 60bdce32952..9a22398d952 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -2,14 +2,14 @@
 #
 # Table name: labels
 #
-#  id           :integer          not null, primary key
-#  title        :string(255)
-#  color        :string(255)
-#  project_id   :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#  template     :boolean          default(FALSE)
-#  description  :string(255)
+#  id          :integer          not null, primary key
+#  title       :string
+#  color       :string
+#  project_id  :integer
+#  created_at  :datetime
+#  updated_at  :datetime
+#  template    :boolean          default(FALSE)
+#  description :string
 #
 
 class Label < ActiveRecord::Base
diff --git a/app/models/label_link.rb b/app/models/label_link.rb
index b94c9c777af..7b8e872b6dd 100644
--- a/app/models/label_link.rb
+++ b/app/models/label_link.rb
@@ -5,7 +5,7 @@
 #  id          :integer          not null, primary key
 #  label_id    :integer
 #  target_id   :integer
-#  target_type :string(255)
+#  target_type :string
 #  created_at  :datetime
 #  updated_at  :datetime
 #
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index 86b1b7e2f99..927e764af92 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -3,11 +3,11 @@
 # Table name: lfs_objects
 #
 #  id         :integer          not null, primary key
-#  oid        :string(255)      not null
+#  oid        :string           not null
 #  size       :integer          not null
 #  created_at :datetime
 #  updated_at :datetime
-#  file       :string(255)
+#  file       :string
 #
 
 class LfsObject < ActiveRecord::Base
diff --git a/app/models/member.rb b/app/models/member.rb
index 60efafef211..cca82da89f1 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -5,15 +5,15 @@
 #  id                 :integer          not null, primary key
 #  access_level       :integer          not null
 #  source_id          :integer          not null
-#  source_type        :string(255)      not null
+#  source_type        :string           not null
 #  user_id            :integer
 #  notification_level :integer          not null
-#  type               :string(255)
+#  type               :string
 #  created_at         :datetime
 #  updated_at         :datetime
 #  created_by_id      :integer
-#  invite_email       :string(255)
-#  invite_token       :string(255)
+#  invite_email       :string
+#  invite_token       :string
 #  invite_accepted_at :datetime
 #
 
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index 9fb474a1a93..a48c1943e6f 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -5,15 +5,15 @@
 #  id                 :integer          not null, primary key
 #  access_level       :integer          not null
 #  source_id          :integer          not null
-#  source_type        :string(255)      not null
+#  source_type        :string           not null
 #  user_id            :integer
 #  notification_level :integer          not null
-#  type               :string(255)
+#  type               :string
 #  created_at         :datetime
 #  updated_at         :datetime
 #  created_by_id      :integer
-#  invite_email       :string(255)
-#  invite_token       :string(255)
+#  invite_email       :string
+#  invite_token       :string
 #  invite_accepted_at :datetime
 #
 
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 07ddb02ae9d..143350a0b55 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -5,15 +5,15 @@
 #  id                 :integer          not null, primary key
 #  access_level       :integer          not null
 #  source_id          :integer          not null
-#  source_type        :string(255)      not null
+#  source_type        :string           not null
 #  user_id            :integer
 #  notification_level :integer          not null
-#  type               :string(255)
+#  type               :string
 #  created_at         :datetime
 #  updated_at         :datetime
 #  created_by_id      :integer
-#  invite_email       :string(255)
-#  invite_token       :string(255)
+#  invite_email       :string
+#  invite_token       :string
 #  invite_accepted_at :datetime
 #
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index d00919c3b0c..4175e1e5fba 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -3,28 +3,29 @@
 # Table name: merge_requests
 #
 #  id                        :integer          not null, primary key
-#  target_branch             :string(255)      not null
-#  source_branch             :string(255)      not null
+#  target_branch             :string           not null
+#  source_branch             :string           not null
 #  source_project_id         :integer          not null
 #  author_id                 :integer
 #  assignee_id               :integer
-#  title                     :string(255)
+#  title                     :string
 #  created_at                :datetime
 #  updated_at                :datetime
 #  milestone_id              :integer
-#  state                     :string(255)
-#  merge_status              :string(255)
+#  state                     :string
+#  merge_status              :string
 #  target_project_id         :integer          not null
 #  iid                       :integer
 #  description               :text
 #  position                  :integer          default(0)
 #  locked_at                 :datetime
 #  updated_by_id             :integer
-#  merge_error               :string(255)
+#  merge_error               :string
 #  merge_params              :text
 #  merge_when_build_succeeds :boolean          default(FALSE), not null
 #  merge_user_id             :integer
 #  merge_commit_sha          :string
+#  deleted_at                :datetime
 #
 
 class MergeRequest < ActiveRecord::Base
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 0580cafdd1b..8951e92a0b8 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -3,12 +3,14 @@
 # Table name: merge_request_diffs
 #
 #  id               :integer          not null, primary key
-#  state            :string(255)
+#  state            :string
 #  st_commits       :text
 #  st_diffs         :text
 #  merge_request_id :integer          not null
 #  created_at       :datetime
 #  updated_at       :datetime
+#  base_commit_sha  :string
+#  real_size        :string
 #
 
 class MergeRequestDiff < ActiveRecord::Base
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 986184dd301..5ee8a965ad8 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -3,13 +3,13 @@
 # Table name: milestones
 #
 #  id          :integer          not null, primary key
-#  title       :string(255)      not null
+#  title       :string           not null
 #  project_id  :integer          not null
 #  description :text
 #  due_date    :date
 #  created_at  :datetime
 #  updated_at  :datetime
-#  state       :string(255)
+#  state       :string
 #  iid         :integer
 #
 
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 55842df1e2d..741e912171d 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -2,15 +2,17 @@
 #
 # Table name: namespaces
 #
-#  id          :integer          not null, primary key
-#  name        :string(255)      not null
-#  path        :string(255)      not null
-#  owner_id    :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  type        :string(255)
-#  description :string(255)      default(""), not null
-#  avatar      :string(255)
+#  id                    :integer          not null, primary key
+#  name                  :string           not null
+#  path                  :string           not null
+#  owner_id              :integer
+#  created_at            :datetime
+#  updated_at            :datetime
+#  type                  :string
+#  description           :string           default(""), not null
+#  avatar                :string
+#  share_with_group_lock :boolean          default(FALSE)
+#  visibility_level      :integer          default(20), not null
 #
 
 class Namespace < ActiveRecord::Base
diff --git a/app/models/note.rb b/app/models/note.rb
index 71b4293d57a..deee2b9e885 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -4,14 +4,14 @@
 #
 #  id            :integer          not null, primary key
 #  note          :text
-#  noteable_type :string(255)
+#  noteable_type :string
 #  author_id     :integer
 #  created_at    :datetime
 #  updated_at    :datetime
 #  project_id    :integer
-#  attachment    :string(255)
-#  line_code     :string(255)
-#  commit_id     :string(255)
+#  attachment    :string
+#  line_code     :string
+#  commit_id     :string
 #  noteable_id   :integer
 #  system        :boolean          default(FALSE), not null
 #  st_diff       :text
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 5001738f411..846773752a6 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: notification_settings
+#
+#  id          :integer          not null, primary key
+#  user_id     :integer          not null
+#  source_id   :integer          not null
+#  source_type :string           not null
+#  level       :integer          default(0), not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
 class NotificationSetting < ActiveRecord::Base
   enum level: { disabled: 0,  participating: 1,  watch: 2,  global: 3, mention: 4 }
 
diff --git a/app/models/personal_snippet.rb b/app/models/personal_snippet.rb
index 452f3913eef..1d5f4c50254 100644
--- a/app/models/personal_snippet.rb
+++ b/app/models/personal_snippet.rb
@@ -3,14 +3,14 @@
 # Table name: snippets
 #
 #  id               :integer          not null, primary key
-#  title            :string(255)
+#  title            :string
 #  content          :text
 #  author_id        :integer          not null
 #  project_id       :integer
 #  created_at       :datetime
 #  updated_at       :datetime
-#  file_name        :string(255)
-#  type             :string(255)
+#  file_name        :string
+#  type             :string
 #  visibility_level :integer          default(0), not null
 #
 
diff --git a/app/models/project.rb b/app/models/project.rb
index af62e8ecd90..9403acf7759 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2,41 +2,46 @@
 #
 # Table name: projects
 #
-#  id                     :integer          not null, primary key
-#  name                   :string(255)
-#  path                   :string(255)
-#  description            :text
-#  created_at             :datetime
-#  updated_at             :datetime
-#  creator_id             :integer
-#  issues_enabled         :boolean          default(TRUE), not null
-#  wall_enabled           :boolean          default(TRUE), not null
-#  merge_requests_enabled :boolean          default(TRUE), not null
-#  wiki_enabled           :boolean          default(TRUE), not null
-#  namespace_id           :integer
-#  issues_tracker         :string(255)      default("gitlab"), not null
-#  issues_tracker_id      :string(255)
-#  snippets_enabled       :boolean          default(TRUE), not null
-#  last_activity_at       :datetime
-#  import_url             :string(255)
-#  visibility_level       :integer          default(0), not null
-#  archived               :boolean          default(FALSE), not null
-#  avatar                 :string(255)
-#  import_status          :string(255)
-#  repository_size        :float            default(0.0)
-#  star_count             :integer          default(0), not null
-#  import_type            :string(255)
-#  import_source          :string(255)
-#  commit_count           :integer          default(0)
-#  import_error           :text
-#  ci_id                  :integer
-#  builds_enabled         :boolean          default(TRUE), not null
-#  shared_runners_enabled :boolean          default(TRUE), not null
-#  runners_token          :string
-#  build_coverage_regex   :string
-#  build_allow_git_fetch  :boolean          default(TRUE), not null
-#  build_timeout          :integer          default(3600), not null
-#  pending_delete         :boolean
+#  id                           :integer          not null, primary key
+#  name                         :string
+#  path                         :string
+#  description                  :text
+#  created_at                   :datetime
+#  updated_at                   :datetime
+#  creator_id                   :integer
+#  issues_enabled               :boolean          default(TRUE), not null
+#  wall_enabled                 :boolean          default(TRUE), not null
+#  merge_requests_enabled       :boolean          default(TRUE), not null
+#  wiki_enabled                 :boolean          default(TRUE), not null
+#  namespace_id                 :integer
+#  issues_tracker               :string           default("gitlab"), not null
+#  issues_tracker_id            :string
+#  snippets_enabled             :boolean          default(TRUE), not null
+#  last_activity_at             :datetime
+#  import_url                   :string
+#  visibility_level             :integer          default(0), not null
+#  archived                     :boolean          default(FALSE), not null
+#  avatar                       :string
+#  import_status                :string
+#  repository_size              :float            default(0.0)
+#  star_count                   :integer          default(0), not null
+#  import_type                  :string
+#  import_source                :string
+#  commit_count                 :integer          default(0)
+#  import_error                 :text
+#  ci_id                        :integer
+#  builds_enabled               :boolean          default(TRUE), not null
+#  shared_runners_enabled       :boolean          default(TRUE), not null
+#  runners_token                :string
+#  build_coverage_regex         :string
+#  build_allow_git_fetch        :boolean          default(TRUE), not null
+#  build_timeout                :integer          default(3600), not null
+#  pending_delete               :boolean          default(FALSE)
+#  public_builds                :boolean          default(TRUE), not null
+#  main_language                :string
+#  pushes_since_gc              :integer          default(0)
+#  last_repository_check_failed :boolean
+#  last_repository_check_at     :datetime
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/project_group_link.rb b/app/models/project_group_link.rb
index e52a6bd7c84..66f5a609bf5 100644
--- a/app/models/project_group_link.rb
+++ b/app/models/project_group_link.rb
@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: project_group_links
+#
+#  id           :integer          not null, primary key
+#  project_id   :integer          not null
+#  group_id     :integer          not null
+#  created_at   :datetime
+#  updated_at   :datetime
+#  group_access :integer          default(30), not null
+#
+
 class ProjectGroupLink < ActiveRecord::Base
   GUEST     = 10
   REPORTER  = 20
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index 2c0ae312f1b..3f0080205dd 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -2,9 +2,12 @@
 #
 # Table name: project_import_data
 #
-#  id         :integer          not null, primary key
-#  project_id :integer
-#  data       :text
+#  id                         :integer          not null, primary key
+#  project_id                 :integer
+#  data                       :text
+#  encrypted_credentials      :text
+#  encrypted_credentials_iv   :text
+#  encrypted_credentials_salt :text
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 792ad804575..368485a060a 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 require 'asana'
diff --git a/app/models/project_services/assembla_service.rb b/app/models/project_services/assembla_service.rb
index 29d841faed8..ffb7455b014 100644
--- a/app/models/project_services/assembla_service.rb
+++ b/app/models/project_services/assembla_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class AssemblaService < Service
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb
index 060062aaf7a..c36ee95e378 100644
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class BambooService < CiService
diff --git a/app/models/project_services/buildkite_service.rb b/app/models/project_services/buildkite_service.rb
index 861cc974ec4..f9f4897a065 100644
--- a/app/models/project_services/buildkite_service.rb
+++ b/app/models/project_services/buildkite_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 require "addressable/uri"
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index 6ab6d7417b7..20cdfcaffb2 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class BuildsEmailService < Service
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index 6e8f0842524..28c969fe57f 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class CampfireService < Service
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb
index d9f0849d147..9bc8f982da6 100644
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 # Base class for CI services
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
index 88a3e9218cb..4d1319eb6f8 100644
--- a/app/models/project_services/custom_issue_tracker_service.rb
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class CustomIssueTrackerService < IssueTrackerService
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb
index b4724bb647e..d8e00e018cc 100644
--- a/app/models/project_services/drone_ci_service.rb
+++ b/app/models/project_services/drone_ci_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class DroneCiService < CiService
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index b831577cd97..2dbd29062df 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class EmailsOnPushService < Service
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index b402b68665a..5469049bb5e 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class ExternalWikiService < Service
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index 8605ce66e48..3dc1e0fbe8b 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 require "flowdock-git-hook"
diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb
index 61babe9cfe5..b4c311cf664 100644
--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 require "gemnasium/gitlab_service"
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 33f0d7ea01a..a92f7226083 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 # TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb
index eaa5654b9c6..1adaeeb3b2b 100644
--- a/app/models/project_services/gitlab_issue_tracker_service.rb
+++ b/app/models/project_services/gitlab_issue_tracker_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class GitlabIssueTrackerService < IssueTrackerService
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 064ef8e8674..f9ddf588722 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class HipchatService < Service
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index 04c714bfaad..b9a592d7096 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 require 'uri'
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index c5501e06411..98a3a7c6b86 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class IssueTrackerService < Service
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index b4418ba9284..ba68658f0bd 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class JiraService < IssueTrackerService
diff --git a/app/models/project_services/pivotaltracker_service.rb b/app/models/project_services/pivotaltracker_service.rb
index c9a890c7e3f..acaa0c39365 100644
--- a/app/models/project_services/pivotaltracker_service.rb
+++ b/app/models/project_services/pivotaltracker_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class PivotaltrackerService < Service
diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index e76d9eca2ab..a640c8cb440 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class PushoverService < Service
diff --git a/app/models/project_services/redmine_service.rb b/app/models/project_services/redmine_service.rb
index de974354c77..e2137e92c62 100644
--- a/app/models/project_services/redmine_service.rb
+++ b/app/models/project_services/redmine_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class RedmineService < IssueTrackerService
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 7092b757549..83ffa53a407 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class SlackService < Service
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index 8dceee5e2c5..4015da31509 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 class TeamcityService < CiService
diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb
index d48f0546159..b4b2807eba4 100644
--- a/app/models/project_snippet.rb
+++ b/app/models/project_snippet.rb
@@ -3,14 +3,14 @@
 # Table name: snippets
 #
 #  id               :integer          not null, primary key
-#  title            :string(255)
+#  title            :string
 #  content          :text
 #  author_id        :integer          not null
 #  project_id       :integer
 #  created_at       :datetime
 #  updated_at       :datetime
-#  file_name        :string(255)
-#  type             :string(255)
+#  file_name        :string
+#  type             :string
 #  visibility_level :integer          default(0), not null
 #
 
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 8ebd790a89e..3d2052c892c 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -4,7 +4,7 @@
 #
 #  id                  :integer          not null, primary key
 #  project_id          :integer          not null
-#  name                :string(255)      not null
+#  name                :string           not null
 #  created_at          :datetime
 #  updated_at          :datetime
 #  developers_can_push :boolean          default(FALSE), not null
diff --git a/app/models/release.rb b/app/models/release.rb
index 89f70278af5..dc700d1ea5a 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -3,7 +3,7 @@
 # Table name: releases
 #
 #  id          :integer          not null, primary key
-#  tag         :string(255)
+#  tag         :string
 #  description :text
 #  project_id  :integer
 #  created_at  :datetime
diff --git a/app/models/security_event.rb b/app/models/security_event.rb
index 68c00adad59..0bee03974f1 100644
--- a/app/models/security_event.rb
+++ b/app/models/security_event.rb
@@ -4,9 +4,9 @@
 #
 #  id          :integer          not null, primary key
 #  author_id   :integer          not null
-#  type        :string(255)      not null
+#  type        :string           not null
 #  entity_id   :integer          not null
-#  entity_type :string(255)      not null
+#  entity_type :string           not null
 #  details     :text
 #  created_at  :datetime
 #  updated_at  :datetime
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 77115597d71..99279a2e083 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -5,11 +5,11 @@
 #  id            :integer          not null, primary key
 #  project_id    :integer
 #  noteable_id   :integer
-#  noteable_type :string(255)
+#  noteable_type :string
 #  recipient_id  :integer
-#  commit_id     :string(255)
-#  line_code     :string(255)
-#  reply_key     :string(255)      not null
+#  commit_id     :string
+#  reply_key     :string           not null
+#  line_code     :string
 #
 
 class SentNotification < ActiveRecord::Base
diff --git a/app/models/service.rb b/app/models/service.rb
index 2645b8321d7..bf16a545307 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -3,12 +3,12 @@
 # Table name: services
 #
 #  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
+#  type                  :string
+#  title                 :string
 #  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  active                :boolean          not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
 #  push_events           :boolean          default(TRUE)
@@ -17,6 +17,9 @@
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
 #  build_events          :boolean          default(FALSE), not null
+#  category              :string           default("common"), not null
+#  default               :boolean          default(FALSE)
+#  wiki_page_events      :boolean          default(TRUE)
 #
 
 # To add new service you should build a class inherited from Service
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 0fd08061925..2f905a90942 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -3,14 +3,14 @@
 # Table name: snippets
 #
 #  id               :integer          not null, primary key
-#  title            :string(255)
+#  title            :string
 #  content          :text
 #  author_id        :integer          not null
 #  project_id       :integer
 #  created_at       :datetime
 #  updated_at       :datetime
-#  file_name        :string(255)
-#  type             :string(255)
+#  file_name        :string
+#  type             :string
 #  visibility_level :integer          default(0), not null
 #
 
diff --git a/app/models/spam_log.rb b/app/models/spam_log.rb
index 12df68ef83b..f49eb7d88e2 100644
--- a/app/models/spam_log.rb
+++ b/app/models/spam_log.rb
@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: spam_logs
+#
+#  id            :integer          not null, primary key
+#  user_id       :integer
+#  source_ip     :string
+#  user_agent    :string
+#  via_api       :boolean
+#  project_id    :integer
+#  noteable_type :string
+#  title         :string
+#  description   :text
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#
+
 class SpamLog < ActiveRecord::Base
   belongs_to :user
 
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index dd800ce110f..242faa7d32e 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -5,7 +5,7 @@
 #  id                :integer          not null, primary key
 #  user_id           :integer
 #  subscribable_id   :integer
-#  subscribable_type :string(255)
+#  subscribable_type :string
 #  subscribed        :boolean
 #  created_at        :datetime
 #  updated_at        :datetime
diff --git a/app/models/user.rb b/app/models/user.rb
index ab48f8f1960..959b1f93758 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,55 +3,55 @@
 # Table name: users
 #
 #  id                          :integer          not null, primary key
-#  email                       :string(255)      default(""), not null
-#  encrypted_password          :string(255)      default(""), not null
-#  reset_password_token        :string(255)
+#  email                       :string           default(""), not null
+#  encrypted_password          :string           default(""), not null
+#  reset_password_token        :string
 #  reset_password_sent_at      :datetime
 #  remember_created_at         :datetime
 #  sign_in_count               :integer          default(0)
 #  current_sign_in_at          :datetime
 #  last_sign_in_at             :datetime
-#  current_sign_in_ip          :string(255)
-#  last_sign_in_ip             :string(255)
+#  current_sign_in_ip          :string
+#  last_sign_in_ip             :string
 #  created_at                  :datetime
 #  updated_at                  :datetime
-#  name                        :string(255)
+#  name                        :string
 #  admin                       :boolean          default(FALSE), not null
 #  projects_limit              :integer          default(10)
-#  skype                       :string(255)      default(""), not null
-#  linkedin                    :string(255)      default(""), not null
-#  twitter                     :string(255)      default(""), not null
-#  authentication_token        :string(255)
+#  skype                       :string           default(""), not null
+#  linkedin                    :string           default(""), not null
+#  twitter                     :string           default(""), not null
+#  authentication_token        :string
 #  theme_id                    :integer          default(1), not null
-#  bio                         :string(255)
+#  bio                         :string
 #  failed_attempts             :integer          default(0)
 #  locked_at                   :datetime
-#  username                    :string(255)
+#  username                    :string
 #  can_create_group            :boolean          default(TRUE), not null
 #  can_create_team             :boolean          default(TRUE), not null
-#  state                       :string(255)
+#  state                       :string
 #  color_scheme_id             :integer          default(1), not null
 #  notification_level          :integer          default(1), not null
 #  password_expires_at         :datetime
 #  created_by_id               :integer
 #  last_credential_check_at    :datetime
-#  avatar                      :string(255)
-#  confirmation_token          :string(255)
+#  avatar                      :string
+#  confirmation_token          :string
 #  confirmed_at                :datetime
 #  confirmation_sent_at        :datetime
-#  unconfirmed_email           :string(255)
+#  unconfirmed_email           :string
 #  hide_no_ssh_key             :boolean          default(FALSE)
-#  website_url                 :string(255)      default(""), not null
-#  notification_email          :string(255)
+#  website_url                 :string           default(""), not null
+#  notification_email          :string
 #  hide_no_password            :boolean          default(FALSE)
 #  password_automatically_set  :boolean          default(FALSE)
-#  location                    :string(255)
-#  encrypted_otp_secret        :string(255)
-#  encrypted_otp_secret_iv     :string(255)
-#  encrypted_otp_secret_salt   :string(255)
+#  location                    :string
+#  encrypted_otp_secret        :string
+#  encrypted_otp_secret_iv     :string
+#  encrypted_otp_secret_salt   :string
 #  otp_required_for_login      :boolean          default(FALSE), not null
 #  otp_backup_codes            :text
-#  public_email                :string(255)      default(""), not null
+#  public_email                :string           default(""), not null
 #  dashboard                   :integer          default(0)
 #  project_view                :integer          default(0)
 #  consumed_timestep           :integer
@@ -59,7 +59,8 @@
 #  hide_project_limit          :boolean          default(FALSE)
 #  unlock_token                :string
 #  otp_grace_period_started_at :datetime
-#  external                    :boolean           default(FALSE)
+#  ldap_email                  :boolean          default(FALSE), not null
+#  external                    :boolean          default(FALSE)
 #
 
 require 'carrierwave/orm/activerecord'

From 8278b763d96ef10c6494409b18b7eb541463af29 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Fri, 6 May 2016 08:27:40 +0200
Subject: [PATCH 0177/1431] Auto annotate models on migration

[ci skip]
---
 lib/tasks/auto_annotate_models.rake | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 lib/tasks/auto_annotate_models.rake

diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
new file mode 100644
index 00000000000..16bad4bd2bd
--- /dev/null
+++ b/lib/tasks/auto_annotate_models.rake
@@ -0,0 +1,44 @@
+if Rails.env.development?
+  task :set_annotation_options do
+    # You can override any of these by setting an environment variable of the
+    # same name.
+    Annotate.set_defaults(
+      'routes'                  => 'false',
+      'position_in_routes'      => 'before',
+      'position_in_class'       => 'before',
+      'position_in_test'        => 'before',
+      'position_in_fixture'     => 'before',
+      'position_in_factory'     => 'before',
+      'position_in_serializer'  => 'before',
+      'show_foreign_keys'       => 'true',
+      'show_indexes'            => 'false',
+      'simple_indexes'          => 'false',
+      'model_dir'               => 'app/models',
+      'root_dir'                => '',
+      'include_version'         => 'false',
+      'require'                 => '',
+      'exclude_tests'           => 'true',
+      'exclude_fixtures'        => 'true',
+      'exclude_factories'       => 'true',
+      'exclude_serializers'     => 'true',
+      'exclude_scaffolds'       => 'true',
+      'exclude_controllers'     => 'true',
+      'exclude_helpers'         => 'true',
+      'ignore_model_sub_dir'    => 'false',
+      'ignore_columns'          => nil,
+      'ignore_unknown_models'   => 'false',
+      'hide_limit_column_types' => 'integer,boolean',
+      'skip_on_db_migrate'      => 'false',
+      'format_bare'             => 'true',
+      'format_rdoc'             => 'false',
+      'format_markdown'         => 'false',
+      'sort'                    => 'false',
+      'force'                   => 'false',
+      'trace'                   => 'false',
+      'wrapper_open'            => nil,
+      'wrapper_close'           => nil,
+    )
+  end
+
+  Annotate.load_tasks
+end

From b8b54252fde4dc636db9d41330fa910af803284e Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Fri, 6 May 2016 07:54:00 +0000
Subject: [PATCH 0178/1431] clarify changelog entry on GitHub Enterprise import
 support

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

diff --git a/CHANGELOG b/CHANGELOG
index 769ffb2476a..99e294c9ae1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,7 +18,7 @@ v 8.8.0 (unreleased)
   - Display informative message when new milestone is created
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
-  - Backport GitLab Enterprise support from EE
+  - Backport GitHub Enterprise import support from EE
   - Create tags using Rugged for performance reasons. !3745
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)

From 3bdc57f0a710b3769381ecad7ea4098223ecff56 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Sat, 16 Apr 2016 21:09:08 +0200
Subject: [PATCH 0179/1431] Create table for award emoji

---
 .../concerns/toggle_award_emoji.rb            | 20 +++++
 app/controllers/projects/issues_controller.rb |  4 +-
 .../projects/merge_requests_controller.rb     |  6 +-
 app/controllers/projects/notes_controller.rb  | 35 ++------
 app/controllers/projects_controller.rb        |  2 +-
 app/helpers/issues_helper.rb                  | 13 +--
 app/models/award_emoji.rb                     | 35 ++++++++
 app/models/concerns/awardable.rb              | 81 ++++++++++++++++++
 app/models/concerns/issuable.rb               | 32 +-------
 app/models/merge_request.rb                   |  1 +
 app/models/note.rb                            | 53 +++---------
 app/models/user.rb                            |  1 +
 app/services/notes/create_service.rb          |  5 ++
 app/services/notes/post_process_service.rb    |  2 +-
 app/services/notification_service.rb          |  1 -
 app/services/todo_service.rb                  |  8 ++
 app/services/toggle_award_emoji_service.rb    | 21 +++++
 app/views/award_emoji/_awards_block.html.haml | 15 ++++
 app/views/emojis/index.html.haml              |  4 +-
 app/views/projects/issues/_issue.html.haml    |  2 +-
 app/views/projects/issues/show.html.haml      |  2 +-
 .../merge_requests/_merge_request.html.haml   |  2 +-
 .../projects/merge_requests/_show.html.haml   |  4 +-
 app/views/votes/_votes_block.html.haml        |  8 +-
 config/initializers/inflections.rb            |  4 +
 config/routes.rb                              |  7 +-
 db/migrate/20160416180807_add_award_emoji.rb  | 15 ++++
 ...82152_convert_award_note_to_emoji_award.rb | 17 ++++
 .../20160416190505_remove_note_is_award.rb    |  5 ++
 db/schema.rb                                  | 53 +++++++-----
 lib/api/entities.rb                           |  7 +-
 lib/award_emoji.rb                            | 80 ------------------
 lib/gitlab/award_emoji.rb                     | 82 +++++++++++++++++++
 spec/controllers/groups_controller_spec.rb    | 12 +--
 spec/factories/award_emoji.rb                 |  7 ++
 spec/factories/notes.rb                       |  6 --
 spec/helpers/issues_helper_spec.rb            | 11 +--
 spec/lib/{ => gitlab}/award_emoji_spec.rb     |  6 +-
 spec/models/award_emoji_spec.rb               | 31 +++++++
 spec/models/concerns/issuable_spec.rb         | 14 ----
 spec/models/note_spec.rb                      | 39 ---------
 41 files changed, 446 insertions(+), 307 deletions(-)
 create mode 100644 app/controllers/concerns/toggle_award_emoji.rb
 create mode 100644 app/models/award_emoji.rb
 create mode 100644 app/models/concerns/awardable.rb
 create mode 100644 app/services/toggle_award_emoji_service.rb
 create mode 100644 app/views/award_emoji/_awards_block.html.haml
 create mode 100644 db/migrate/20160416180807_add_award_emoji.rb
 create mode 100644 db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
 create mode 100644 db/migrate/20160416190505_remove_note_is_award.rb
 delete mode 100644 lib/award_emoji.rb
 create mode 100644 lib/gitlab/award_emoji.rb
 create mode 100644 spec/factories/award_emoji.rb
 rename spec/lib/{ => gitlab}/award_emoji_spec.rb (75%)
 create mode 100644 spec/models/award_emoji_spec.rb

diff --git a/app/controllers/concerns/toggle_award_emoji.rb b/app/controllers/concerns/toggle_award_emoji.rb
new file mode 100644
index 00000000000..9cd522d1c30
--- /dev/null
+++ b/app/controllers/concerns/toggle_award_emoji.rb
@@ -0,0 +1,20 @@
+module ToggleAwardEmoji
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :authenticate_user!, only: [:toggle_award_emoji]
+  end
+
+  def toggle_award_emoji
+    name = params.require(:name)
+    awardable.toggle_award_emoji(name, current_user)
+
+    render json: { ok: true }
+  end
+
+  private
+
+  def awardable
+    raise NotImplementedError
+  end
+end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 38214f04793..86ba40facc5 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -1,6 +1,7 @@
 class Projects::IssuesController < Projects::ApplicationController
   include ToggleSubscriptionAction
   include IssuableActions
+  include ToggleAwardEmoji
 
   before_action :module_enabled
   before_action :issue,
@@ -61,7 +62,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def show
     @note     = @project.notes.new(noteable: @issue)
-    @notes    = @issue.notes.nonawards.with_associations.fresh
+    @notes    = @issue.notes.with_associations.fresh
     @noteable = @issue
 
     respond_to do |format|
@@ -158,6 +159,7 @@ class Projects::IssuesController < Projects::ApplicationController
   end
   alias_method :subscribable_resource, :issue
   alias_method :issuable, :issue
+  alias_method :awardable, :issue
 
   def authorize_read_issue!
     return render_404 unless can?(current_user, :read_issue, @issue)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 3e0cfc6aa65..9117f9242cd 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -2,6 +2,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   include ToggleSubscriptionAction
   include DiffHelper
   include IssuableActions
+  include ToggleAwardEmoji
 
   before_action :module_enabled
   before_action :merge_request, only: [
@@ -195,7 +196,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit && @merge_request.ci_commit.active?
       MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
-                                                      .execute(@merge_request)
+        .execute(@merge_request)
       @status = :merge_when_build_succeeds
     else
       MergeWorker.perform_async(@merge_request.id, current_user.id, params)
@@ -264,6 +265,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
   alias_method :subscribable_resource, :merge_request
   alias_method :issuable, :merge_request
+  alias_method :awardable, :merge_request
 
   def closes_issues
     @closes_issues ||= @merge_request.closes_issues
@@ -299,7 +301,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def define_show_vars
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
-    @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
+    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
     @discussions = Note.discussions_from_notes(@notes)
     @noteable = @merge_request
 
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 707a0d0e5c6..9000e0adf63 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -3,7 +3,7 @@ class Projects::NotesController < Projects::ApplicationController
   before_action :authorize_read_note!
   before_action :authorize_create_note!, only: [:create]
   before_action :authorize_admin_note!, only: [:update, :destroy]
-  before_action :find_current_user_notes, except: [:destroy, :delete_attachment, :award_toggle]
+  before_action :find_current_user_notes, only: [:index]
 
   def index
     current_fetched_at = Time.now.to_i
@@ -22,8 +22,10 @@ class Projects::NotesController < Projects::ApplicationController
   def create
     @note = Notes::CreateService.new(project, current_user, note_params).execute
 
+    @note = note.is_a?(AwardEmoji) ? @note.to_note_json : note_json(@note)
+
     respond_to do |format|
-      format.json { render json: note_json(@note) }
+      format.json { render json: @note }
       format.html { redirect_back_or_default }
     end
   end
@@ -56,35 +58,12 @@ class Projects::NotesController < Projects::ApplicationController
     end
   end
 
-  def award_toggle
-    noteable = if note_params[:noteable_type] == "issue"
-                 project.issues.find(note_params[:noteable_id])
-               else
-                 project.merge_requests.find(note_params[:noteable_id])
-               end
-
-    data = {
-      author: current_user,
-      is_award: true,
-      note: note_params[:note].delete(":")
-    }
-
-    note = noteable.notes.find_by(data)
-
-    if note
-      note.destroy
-    else
-      Notes::CreateService.new(project, current_user, note_params).execute
-    end
-
-    render json: { ok: true }
-  end
-
   private
 
   def note
     @note ||= @project.notes.find(params[:id])
   end
+  alias_method :awardable, :note
 
   def note_to_html(note)
     render_to_string(
@@ -137,7 +116,7 @@ class Projects::NotesController < Projects::ApplicationController
         id: note.id,
         discussion_id: note.discussion_id,
         html: note_to_html(note),
-        award: note.is_award,
+        award: false,
         note: note.note,
         discussion_html: note_to_discussion_html(note),
         discussion_with_diff_html: note_to_discussion_with_diff_html(note)
@@ -145,7 +124,7 @@ class Projects::NotesController < Projects::ApplicationController
     else
       {
         valid: false,
-        award: note.is_award,
+        award: false,
         errors: note.errors
       }
     end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3768efe142a..85a987c2cb2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -145,7 +145,7 @@ class ProjectsController < Projects::ApplicationController
     participants = ::Projects::ParticipantsService.new(@project, current_user).execute(note_type, note_id)
 
     @suggestions = {
-      emojis: AwardEmoji.urls,
+      emojis: Gitlab::AwardEmoji.urls,
       issues: autocomplete.issues,
       mergerequests: autocomplete.merge_requests,
       members: participants
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 4cb8adcebad..38de0b442ca 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -144,16 +144,17 @@ module IssuesHelper
     end
   end
 
-  def emoji_author_list(notes, current_user)
-    list = notes.map do |note|
-             note.author == current_user ? "me" : note.author.name
-           end
+  def award_user_list(awards, current_user)
+    list = 
+      awards.map do |award|
+        award.user == current_user ? "me" : award.user.name
+      end
 
     list.join(", ")
   end
 
-  def note_active_class(notes, current_user)
-    if current_user && notes.pluck(:author_id).include?(current_user.id)
+  def award_active_class(awards, current_user)
+    if current_user && awards.find { |a| a.user_id == current_user.id }
       "active"
     else
       ""
diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb
new file mode 100644
index 00000000000..44a9b55a8a6
--- /dev/null
+++ b/app/models/award_emoji.rb
@@ -0,0 +1,35 @@
+class AwardEmoji < ActiveRecord::Base
+  DOWNVOTE_NAME = "thumbsdown".freeze
+  UPVOTE_NAME   = "thumbsup".freeze
+
+  include Participable
+
+  belongs_to :awardable, polymorphic: true
+  belongs_to :user
+
+  validates :awardable, :user, presence: true
+  validates :name, presence: true, inclusion: { in: Emoji.emojis_names }
+  validates :name, uniqueness: { scope: [:user, :awardable_type, :awardable_id] }
+
+  participant :user
+
+  scope :downvotes, -> { where(name: DOWNVOTE_NAME) }
+  scope :upvotes,   -> { where(name: UPVOTE_NAME) }
+
+  def downvote?
+    self.name == DOWNVOTE_NAME
+  end
+
+  def upvote?
+    self.name == UPVOTE_NAME
+  end
+
+  def to_note_json
+    {
+      valid:  valid?,
+      award:  true,
+      id:     id,
+      name:   name
+    }
+  end
+end
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
new file mode 100644
index 00000000000..b4e3e9eb3dd
--- /dev/null
+++ b/app/models/concerns/awardable.rb
@@ -0,0 +1,81 @@
+module Awardable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :award_emoji, as: :awardable, dependent: :destroy
+
+    if self < Participable
+      participant :award_emoji
+    end
+  end
+
+  module ClassMethods
+    def order_upvotes_desc
+      order_votes_desc(AwardEmoji::UPVOTE_NAME)
+    end
+
+    def order_downvotes_desc
+      order_votes_desc(AwardEmoji::DOWNVOTE_NAME)
+    end
+
+    def order_votes_desc(emoji_name)
+      awardable_table = self.arel_table
+      awards_table = AwardEmoji.arel_table
+
+      join_clause = awardable_table.join(awards_table, Arel::Nodes::OuterJoin).on(
+        awards_table[:awardable_id].eq(awardable_table[:id]).and(
+          awards_table[:awardable_type].eq(self.name).and(
+            awards_table[:name].eq(emoji_name)
+          )
+        )
+      ).join_sources
+
+      joins(join_clause).group(awardable_table[:id]).reorder("COUNT(award_emoji.id) DESC")
+    end
+  end
+
+  def grouped_awards(with_thumbs = true)
+    awards = award_emoji.group_by(&:name)
+
+    if with_thumbs
+      awards[AwardEmoji::UPVOTE_NAME]   ||= AwardEmoji.none
+      awards[AwardEmoji::DOWNVOTE_NAME] ||= AwardEmoji.none
+    end
+
+    awards
+  end
+
+  def downvotes
+    award_emoji.where(name: AwardEmoji::DOWNVOTE_NAME).count
+  end
+
+  def upvotes
+    award_emoji.where(name: AwardEmoji::UPVOTE_NAME).count
+  end
+
+  def emoji_awardable?
+    true
+  end
+
+  def awarded_emoji?(emoji_name, current_user)
+    award_emoji.where(name: emoji_name, user: current_user).exists?
+  end
+
+  def create_award_emoji(name, current_user)
+    return unless emoji_awardable?
+
+    award_emoji.create(name: name, user: current_user)
+  end
+
+  def remove_award_emoji(name, current_user)
+    award_emoji.where(name: name, user: current_user).destroy_all
+  end
+
+  def toggle_award_emoji(emoji_name, current_user)
+    if awarded_emoji?(emoji_name, current_user)
+      remove_award_emoji(emoji_name, current_user)
+    else
+      create_award_emoji(emoji_name, current_user)
+    end
+  end
+end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index afa2ca039ae..6af76c97cd3 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -10,6 +10,7 @@ module Issuable
   include Mentionable
   include Subscribable
   include StripAttribute
+  include Awardable
 
   included do
     belongs_to :author, class_name: "User"
@@ -99,29 +100,6 @@ module Issuable
         order_by(method)
       end
     end
-
-    def order_downvotes_desc
-      order_votes_desc('thumbsdown')
-    end
-
-    def order_upvotes_desc
-      order_votes_desc('thumbsup')
-    end
-
-    def order_votes_desc(award_emoji_name)
-      issuable_table = self.arel_table
-      note_table = Note.arel_table
-
-      join_clause = issuable_table.join(note_table, Arel::Nodes::OuterJoin).on(
-        note_table[:noteable_id].eq(issuable_table[:id]).and(
-          note_table[:noteable_type].eq(self.name).and(
-            note_table[:is_award].eq(true).and(note_table[:note].eq(award_emoji_name))
-          )
-        )
-      ).join_sources
-
-      joins(join_clause).group(issuable_table[:id]).reorder("COUNT(notes.id) DESC")
-    end
   end
 
   def today?
@@ -144,14 +122,6 @@ module Issuable
     opened? || reopened?
   end
 
-  def downvotes
-    notes.awards.where(note: "thumbsdown").count
-  end
-
-  def upvotes
-    notes.awards.where(note: "thumbsup").count
-  end
-
   def subscribed_without_subscriptions?(user)
     participants(user).include?(user)
   end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e410febdfff..2cb3e8b0176 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -36,6 +36,7 @@ class MergeRequest < ActiveRecord::Base
   include Referable
   include Sortable
   include Taskable
+  include Awardable
 
   belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
   belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
diff --git a/app/models/note.rb b/app/models/note.rb
index 87ced65c650..b992b2e76f0 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -16,7 +16,6 @@
 #  system        :boolean          default(FALSE), not null
 #  st_diff       :text
 #  updated_by_id :integer
-#  is_award      :boolean          default(FALSE), not null
 #
 
 require 'carrierwave/orm/activerecord'
@@ -43,12 +42,9 @@ class Note < ActiveRecord::Base
   delegate :name, to: :project, prefix: true
   delegate :name, :email, to: :author, prefix: true
 
-  before_validation :set_award!
   before_validation :clear_blank_line_code!
 
   validates :note, :project, presence: true
-  validates :note, uniqueness: { scope: [:author, :noteable_type, :noteable_id] }, if: ->(n) { n.is_award }
-  validates :note, inclusion: { in: Emoji.emojis_names }, if: ->(n) { n.is_award }
   validates :line_code, line_code: true, allow_blank: true
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
@@ -60,8 +56,6 @@ class Note < ActiveRecord::Base
   mount_uploader :attachment, AttachmentUploader
 
   # Scopes
-  scope :awards, ->{ where(is_award: true) }
-  scope :nonawards, ->{ where(is_award: false) }
   scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) }
   scope :inline, ->{ where("line_code IS NOT NULL") }
   scope :not_inline, ->{ where(line_code: nil) }
@@ -119,19 +113,6 @@ class Note < ActiveRecord::Base
 
       where(table[:note].matches(pattern))
     end
-
-    def grouped_awards
-      notes = {}
-
-      awards.select(:note).distinct.map do |note|
-        notes[note.note] = where(note: note.note)
-      end
-
-      notes["thumbsup"] ||= Note.none
-      notes["thumbsdown"] ||= Note.none
-
-      notes
-    end
   end
 
   def cross_reference?
@@ -347,37 +328,25 @@ class Note < ActiveRecord::Base
     Event.reset_event_cache_for(self)
   end
 
-  def downvote?
-    is_award && note == "thumbsdown"
-  end
-
-  def upvote?
-    is_award && note == "thumbsup"
+  def system?
+    read_attribute(:system)
   end
 
   def editable?
-    !system? && !is_award
+    !system?
   end
 
   def cross_reference_not_visible_for?(user)
     cross_reference? && referenced_mentionables(user).empty?
   end
 
-  # Checks if note is an award added as a comment
-  #
-  # If note is an award, this method sets is_award to true
-  #   and changes content of the note to award name.
-  #
-  # Method is executed as a before_validation callback.
-  #
-  def set_award!
-    return unless awards_supported? && contains_emoji_only?
-
-    self.is_award = true
-    self.note = award_emoji_name
+  def award_emoji?
+    award_emoji_supported? && contains_emoji_only?
   end
 
-  private
+  def create_award_emoji
+    self.noteable.award_emoji(award_emoji_name, author)	
+  end
 
   def clear_blank_line_code!
     self.line_code = nil if self.line_code.blank?
@@ -389,8 +358,8 @@ class Note < ActiveRecord::Base
     diffs.find { |d| d.new_path == self.diff.new_path }
   end
 
-  def awards_supported?
-    (for_issue? || for_merge_request?) && !for_diff_line?
+  def award_emoji_supported?
+    noteable.is_a?(Awardable) && !for_diff_line?
   end
 
   def contains_emoji_only?
@@ -399,6 +368,6 @@ class Note < ActiveRecord::Base
 
   def award_emoji_name
     original_name = note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
-    AwardEmoji.normilize_emoji_name(original_name)
+    Gitlab::AwardEmoji.normilize_emoji_name(original_name)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 031315debd7..52f2904f450 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -144,6 +144,7 @@ class User < ActiveRecord::Base
   has_many :builds,                   dependent: :nullify, class_name: 'Ci::Build'
   has_many :todos,                    dependent: :destroy
   has_many :notification_settings,    dependent: :destroy
+  has_many :award_emoji, 							as: :awardable, dependent: :destroy
 
   #
   # Validations
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 2bb312bb252..c5be21ba897 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -5,6 +5,11 @@ module Notes
       note.author = current_user
       note.system = false
 
+      if note.award_emoji?
+        return ToggleAwardEmojiService.new(project, current_user, params).
+                                        execute(note.noteable, note.note)
+      end
+
       if note.save
         # Finish the harder work in the background
         NewNoteWorker.perform_in(2.seconds, note.id, params)
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index e818f58d13c..c1bf46bdfb3 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -8,7 +8,7 @@ module Notes
 
     def execute
       # Skip system notes, like status changes and cross-references and awards
-      unless @note.system || @note.is_award
+      unless @note.system
         EventCreateService.new.leave_note(@note, @note.author)
         @note.create_cross_references!
         execute_note_hooks
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 42ec1ac9e1a..703636658b7 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -131,7 +131,6 @@ class NotificationService
     # ignore gitlab service messages
     return true if note.note.start_with?('Status changed to closed')
     return true if note.cross_reference? && note.system == true
-    return true if note.is_award
 
     target = note.noteable
 
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 42c5bca90fd..da1b77c0f9e 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -98,6 +98,14 @@ class TodoService
     handle_note(note, current_user)
   end
 
+  # When an emoji is awarded we should:
+  #
+  #  * mark all pending todos related to the awardable for the current user as done
+  #
+  def new_award_emoji(awardable, current_user)
+    mark_pending_todos_as_done(awardable, current_user)
+  end
+
   # When marking pending todos as done we should:
   #
   #  * mark all pending todos related to the target for the current user as done
diff --git a/app/services/toggle_award_emoji_service.rb b/app/services/toggle_award_emoji_service.rb
new file mode 100644
index 00000000000..b77b4e79bf2
--- /dev/null
+++ b/app/services/toggle_award_emoji_service.rb
@@ -0,0 +1,21 @@
+require_relative 'base_service'
+
+class ToggleAwardEmojiService < BaseService
+  # For an award emoji being posted we should:
+  # - Mark the TODO as done for this issuable (skip on snippets)
+  # - Save the award emoji
+  def execute(awardable, emoji)
+    todo_service.new_award_emoji(awardable, current_user)
+
+    # Needed if its posted as a note containing only :+1:
+    emoji = award_emoji_name(emoji) if emoji.start_with? ':'
+    awardable.toggle_award_emoji(emoji, current_user)
+  end
+
+  private
+
+  def award_emoji_name(emoji)
+    original_name = emoji.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
+    Gitlab::AwardEmoji.normalize_emoji_name(original_name)
+  end
+end
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
new file mode 100644
index 00000000000..63c953195fe
--- /dev/null
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -0,0 +1,15 @@
+- grouped_awards = awardable.grouped_awards(inline)
+.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
+  - awards_sort(grouped_awards).each do |emoji, awards|
+    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user), data: { placement: "bottom" } }
+      = emoji_icon(emoji)
+      %span.award-control-text.js-counter
+        = awards.count
+
+  - if current_user
+    .award-menu-holder.js-award-holder
+      %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
+        = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
+        = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
+        %span.award-control-text
+          Add
diff --git a/app/views/emojis/index.html.haml b/app/views/emojis/index.html.haml
index 3443a8e2307..97401a2e618 100644
--- a/app/views/emojis/index.html.haml
+++ b/app/views/emojis/index.html.haml
@@ -1,9 +1,9 @@
 .emoji-menu
   .emoji-menu-content
     = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
-    - AwardEmoji.emoji_by_category.each do |category, emojis|
+    - Gitlab::AwardEmoji.emoji_by_category.each do |category, emojis|
       %h5.emoji-menu-title
-        = AwardEmoji::CATEGORIES[category]
+        = Gitlab::AwardEmoji::CATEGORIES[category]
       %ul.clearfix.emoji-menu-list
         - emojis.each do |emoji|
           %li.pull-left.text-center.emoji-menu-list-item
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 7a8009f6da4..4aa92d0b39e 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -27,7 +27,7 @@
           = icon('thumbs-down')
           = downvotes
 
-      - note_count = issue.notes.user.nonawards.count
+      - note_count = issue.notes.user.count
       - if note_count > 0
         %li
           = link_to issue_path(issue) + "#notes" do
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 5fe5ddc0819..c4cdd4b3d43 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -72,7 +72,7 @@
 
     .content-block.content-block-small
       = render 'new_branch'
-      = render 'votes/votes_block', votable: @issue
+      = render 'award_emoji/awards_block', awardable: @issue, inline: true
 
     .row
       %section.col-md-12
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index e740fe8c84d..391193eed6c 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -35,7 +35,7 @@
           = icon('thumbs-down')
           = downvotes
 
-      - note_count = merge_request.mr_and_commit_notes.user.nonawards.count
+      - note_count = merge_request.mr_and_commit_notes.user.count
       - if note_count > 0
         %li
           = link_to merge_request_path(merge_request) + "#notes" do
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 2c34f9c454b..e8cda51e759 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -50,7 +50,7 @@
         %li.notes-tab
           = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
             Discussion
-            %span.badge= @merge_request.mr_and_commit_notes.user.nonawards.count
+            %span.badge= @merge_request.mr_and_commit_notes.user.count
         %li.commits-tab
           = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
             Commits
@@ -68,7 +68,7 @@
       .tab-content
         #notes.notes.tab-pane.voting_notes
           .content-block.content-block-small.oneline-block
-            = render 'votes/votes_block', votable: @merge_request
+            = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
 
           .row
             %section.col-md-12
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index dc249155b92..8692c1cccee 100644
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -1,9 +1,9 @@
-.awards.votes-block
-  - awards_sort(votable.notes.awards.grouped_awards).each do |emoji, notes|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{class: (note_active_class(notes, current_user)), data: {placement: "top", original_title: emoji_author_list(notes, current_user)}}
+.awards.votes-block{data: { toggle_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) }}
+  - awards_sort(awardable.grouped_awards).each do |emoji, awards|
+    %button.btn.award-control.js-emoji-btn.has-tooltip{class: (note_active_class(awards, current_user)), data: {placement: "top", original_title: emoji_author_list(awards, current_user)}}
       = emoji_icon(emoji, sprite: false)
       %span.award-control-text.js-counter
-        = notes.count
+        = awards.count
 
   - if current_user
     %div.award-menu-holder.js-award-holder
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 9e8b0131f8f..3d1a41a4652 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -8,3 +8,7 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.uncountable %w(award_emoji)
+end
diff --git a/config/routes.rb b/config/routes.rb
index 46a25262844..ecde83d8547 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -639,6 +639,7 @@ Rails.application.routes.draw do
             post :cancel_merge_when_build_succeeds
             get :ci_status
             post :toggle_subscription
+            post :toggle_award_emoji
             post :remove_wip
           end
 
@@ -703,6 +704,7 @@ Rails.application.routes.draw do
         resources :issues, constraints: { id: /\d+/ } do
           member do
             post :toggle_subscription
+            post :toggle_award_emoji
             get :referenced_merge_requests
             get :related_branches
           end
@@ -731,10 +733,7 @@ Rails.application.routes.draw do
         resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
           member do
             delete :delete_attachment
-          end
-
-          collection do
-            post :award_toggle
+            post :toggle_award_emoji
           end
         end
 
diff --git a/db/migrate/20160416180807_add_award_emoji.rb b/db/migrate/20160416180807_add_award_emoji.rb
new file mode 100644
index 00000000000..3177b86a133
--- /dev/null
+++ b/db/migrate/20160416180807_add_award_emoji.rb
@@ -0,0 +1,15 @@
+class AddAwardEmoji < ActiveRecord::Migration
+  def change
+    create_table :award_emoji do |t|
+      t.string :name
+      t.references :user
+      t.references :awardable, polymorphic: true
+
+      t.timestamps
+    end
+
+    add_index :award_emoji, :user_id
+    add_index :award_emoji, :awardable_type
+    add_index :award_emoji, :awardable_id
+  end
+end
diff --git a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
new file mode 100644
index 00000000000..76f4a3aa6ae
--- /dev/null
+++ b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
@@ -0,0 +1,17 @@
+class ConvertAwardNoteToEmojiAward < ActiveRecord::Migration
+  def change
+    def up
+      execute "INSERT INTO award_emoji (awardable_type, awardable_id, user_id, name, created_at, updated_at) (SELECT noteable_type, noteable_id, author_id, note, created_at, updated_at FROM notes WHERE is_award = true)"
+    end
+
+    def down
+      execute <<-SQL
+      INSERT INTO notes (noteable_type, noteable_id, author_id, note, created_at, updated_at, is_award) 
+        (SELECT awardable_type, awardable_id, user_id, name, created_at, updated_at, TRUE 
+         FROM award_emoji 
+         WHERE awardable_type IN ('Issue', 'MergeRequest')
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20160416190505_remove_note_is_award.rb b/db/migrate/20160416190505_remove_note_is_award.rb
new file mode 100644
index 00000000000..da16372a297
--- /dev/null
+++ b/db/migrate/20160416190505_remove_note_is_award.rb
@@ -0,0 +1,5 @@
+class RemoveNoteIsAward < ActiveRecord::Migration
+  def change
+    remove_column :notes, :is_award, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 42c261003bb..354d7390a5b 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: 20160412140240) do
+ActiveRecord::Schema.define(version: 20160416190505) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -94,6 +94,19 @@ ActiveRecord::Schema.define(version: 20160412140240) do
   add_index "audit_events", ["entity_id", "entity_type"], name: "index_audit_events_on_entity_id_and_entity_type", using: :btree
   add_index "audit_events", ["type"], name: "index_audit_events_on_type", using: :btree
 
+  create_table "award_emoji", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.integer  "awardable_id"
+    t.string   "awardable_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "award_emoji", ["awardable_id"], name: "index_award_emoji_on_awardable_id", using: :btree
+  add_index "award_emoji", ["awardable_type"], name: "index_award_emoji_on_awardable_type", using: :btree
+  add_index "award_emoji", ["user_id"], name: "index_award_emoji_on_user_id", using: :btree
+
   create_table "broadcast_messages", force: :cascade do |t|
     t.text     "message",    null: false
     t.datetime "starts_at"
@@ -622,14 +635,12 @@ ActiveRecord::Schema.define(version: 20160412140240) do
     t.boolean  "system",        default: false, null: false
     t.text     "st_diff"
     t.integer  "updated_by_id"
-    t.boolean  "is_award",      default: false, null: false
   end
 
   add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
   add_index "notes", ["commit_id"], name: "index_notes_on_commit_id", using: :btree
   add_index "notes", ["created_at", "id"], name: "index_notes_on_created_at_and_id", using: :btree
   add_index "notes", ["created_at"], name: "index_notes_on_created_at", using: :btree
-  add_index "notes", ["is_award"], name: "index_notes_on_is_award", using: :btree
   add_index "notes", ["line_code"], name: "index_notes_on_line_code", using: :btree
   add_index "notes", ["note"], name: "index_notes_on_note_trigram", using: :gin, opclasses: {"note"=>"gin_trgm_ops"}
   add_index "notes", ["noteable_id", "noteable_type"], name: "index_notes_on_noteable_id_and_noteable_type", using: :btree
@@ -716,37 +727,37 @@ ActiveRecord::Schema.define(version: 20160412140240) 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  "public_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
     t.string   "main_language"
-    t.integer  "pushes_since_gc",        default: 0
+    t.integer  "pushes_since_gc",              default: 0
     t.boolean  "last_repository_check_failed"
     t.datetime "last_repository_check_at"
   end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 60b9f5e0ece..b3769ba9c2d 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -170,6 +170,7 @@ module API
       expose :label_names, as: :labels
       expose :milestone, using: Entities::Milestone
       expose :assignee, :author, using: Entities::UserBasic
+      expose :upvotes, :downvotes
 
       expose :subscribed do |issue, options|
         issue.subscribed?(options[:current_user])
@@ -178,7 +179,7 @@ module API
 
     class MergeRequest < ProjectEntity
       expose :target_branch, :source_branch
-      expose :upvotes,  :downvotes
+      expose :upvotes, :downvotes
       expose :author, :assignee, using: Entities::UserBasic
       expose :source_project_id, :target_project_id
       expose :label_names, as: :labels
@@ -216,8 +217,8 @@ module API
       expose :system?, as: :system
       expose :noteable_id, :noteable_type
       # upvote? and downvote? are deprecated, always return false
-      expose :upvote?, as: :upvote
-      expose :downvote?, as: :downvote
+      expose(:upvote?)    { |note| false }
+      expose(:downvote?)  { |note| false }
     end
 
     class MRNote < Grape::Entity
diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb
deleted file mode 100644
index 5f8ff01b0a9..00000000000
--- a/lib/award_emoji.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-class AwardEmoji
-  CATEGORIES = {
-    other: "Other",
-    objects: "Objects",
-    places: "Places",
-    travel_places: "Travel",
-    emoticons: "Emoticons",
-    objects_symbols: "Symbols",
-    nature: "Nature",
-    celebration: "Celebration",
-    people: "People",
-    activity: "Activity",
-    flags: "Flags",
-    food_drink: "Food"
-  }.with_indifferent_access
-
-  CATEGORY_ALIASES = {
-    symbols: "objects_symbols",
-    foods: "food_drink",
-    travel: "travel_places"
-  }.with_indifferent_access
-
-  def self.normilize_emoji_name(name)
-    aliases[name] || name
-  end
-
-  def self.emoji_by_category
-    unless @emoji_by_category
-      @emoji_by_category = Hash.new { |h, key| h[key] = [] }
-
-      emojis.each do |emoji_name, data|
-        data["name"] = emoji_name
-
-        # Skip Fitzpatrick(tone) modifiers
-        next if data["category"] == "modifier"
-
-        category = CATEGORY_ALIASES[data["category"]] || data["category"]
-
-        @emoji_by_category[category] << data
-      end
-
-      @emoji_by_category = @emoji_by_category.sort.to_h
-    end
-
-    @emoji_by_category
-  end
-
-  def self.emojis
-    @emojis ||= begin
-      json_path = File.join(Rails.root, 'fixtures', 'emojis', 'index.json' )
-      JSON.parse(File.read(json_path))
-    end
-  end
-
-  def self.aliases
-    @aliases ||= begin
-      json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
-      JSON.parse(File.read(json_path))
-    end
-  end
-
-  # Returns an Array of Emoji names and their asset URLs.
-  def self.urls
-    @urls ||= begin
-      path = File.join(Rails.root, 'fixtures', 'emojis', 'digests.json')
-      prefix = Gitlab::Application.config.assets.prefix
-      digest = Gitlab::Application.config.assets.digest
-
-      JSON.parse(File.read(path)).map do |hash|
-        if digest
-          fname = "#{hash['unicode']}-#{hash['digest']}"
-        else
-          fname = hash['unicode']
-        end
-
-        { name: hash['name'], path: "#{prefix}/#{fname}.png" }
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/award_emoji.rb b/lib/gitlab/award_emoji.rb
new file mode 100644
index 00000000000..0ae220a86bc
--- /dev/null
+++ b/lib/gitlab/award_emoji.rb
@@ -0,0 +1,82 @@
+module Gitlab
+  class AwardEmoji
+    CATEGORIES = {
+      other: "Other",
+      objects: "Objects",
+      places: "Places",
+      travel_places: "Travel",
+      emoticons: "Emoticons",
+      objects_symbols: "Symbols",
+      nature: "Nature",
+      celebration: "Celebration",
+      people: "People",
+      activity: "Activity",
+      flags: "Flags",
+      food_drink: "Food"
+    }.with_indifferent_access
+
+    CATEGORY_ALIASES = {
+      symbols: "objects_symbols",
+      foods: "food_drink",
+      travel: "travel_places"
+    }.with_indifferent_access
+
+    def self.normalize_emoji_name(name)
+      aliases[name] || name
+    end
+
+    def self.emoji_by_category
+      unless @emoji_by_category
+        @emoji_by_category = Hash.new { |h, key| h[key] = [] }
+
+        emojis.each do |emoji_name, data|
+          data["name"] = emoji_name
+
+          # Skip Fitzpatrick(tone) modifiers
+          next if data["category"] == "modifier"
+
+          category = CATEGORY_ALIASES[data["category"]] || data["category"]
+
+          @emoji_by_category[category] << data
+        end
+
+        @emoji_by_category = @emoji_by_category.sort.to_h
+      end
+
+      @emoji_by_category
+    end
+
+    def self.emojis
+      @emojis ||= begin
+                    json_path = File.join(Rails.root, 'fixtures', 'emojis', 'index.json' )
+                    JSON.parse(File.read(json_path))
+                  end
+    end
+
+    def self.aliases
+      @aliases ||= begin
+                     json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
+                     JSON.parse(File.read(json_path))
+                   end
+    end
+
+    # Returns an Array of Emoji names and their asset URLs.
+    def self.urls
+      @urls ||= begin
+                  path = File.join(Rails.root, 'fixtures', 'emojis', 'digests.json')
+                  prefix = Gitlab::Application.config.assets.prefix
+                  digest = Gitlab::Application.config.assets.digest
+
+                  JSON.parse(File.read(path)).map do |hash|
+                    if digest
+                      fname = "#{hash['unicode']}-#{hash['digest']}"
+                    else
+                      fname = hash['unicode']
+                    end
+
+                    { name: hash['name'], path: "#{prefix}/#{fname}.png" }
+                  end
+                end
+    end
+  end
+end
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 465531b2b36..82b25702172 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -31,9 +31,9 @@ describe GroupsController do
     let(:issue_2) { create(:issue, project: project) }
 
     before do
-      create_list(:upvote_note, 3, project: project, noteable: issue_2)
-      create_list(:upvote_note, 2, project: project, noteable: issue_1)
-      create_list(:downvote_note, 2, project: project, noteable: issue_2)
+      create_list(:award_emoji, 3, awardable: issue_2)
+      create_list(:award_emoji, 2, awardable: issue_1)
+      create_list(:award_emoji, 2, awardable: issue_2, name: "thumbsdown")
 
       sign_in(user)
     end
@@ -56,9 +56,9 @@ describe GroupsController do
     let(:merge_request_2) { create(:merge_request, :simple, source_project: project) }
 
     before do
-      create_list(:upvote_note, 3, project: project, noteable: merge_request_2)
-      create_list(:upvote_note, 2, project: project, noteable: merge_request_1)
-      create_list(:downvote_note, 2, project: project, noteable: merge_request_2)
+      create_list(:award_emoji, 3, awardable: merge_request_2)
+      create_list(:award_emoji, 2, awardable: merge_request_1)
+      create_list(:award_emoji, 2, awardable: merge_request_2, name: "thumbsdown")
 
       sign_in(user)
     end
diff --git a/spec/factories/award_emoji.rb b/spec/factories/award_emoji.rb
new file mode 100644
index 00000000000..a1173834b29
--- /dev/null
+++ b/spec/factories/award_emoji.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :award_emoji do
+    name "thumbsup"
+    user
+    awardable factory: :issue
+  end
+end
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index e5dcb159014..2bfc5effd78 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -36,8 +36,6 @@ FactoryGirl.define do
     factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff]
     factory :note_on_project_snippet,    traits: [:on_project_snippet]
     factory :system_note,                traits: [:system]
-    factory :downvote_note,              traits: [:award, :downvote]
-    factory :upvote_note,                traits: [:award, :upvote]
 
     trait :on_commit do
       project
@@ -69,10 +67,6 @@ FactoryGirl.define do
       system true
     end
 
-    trait :award do
-      is_award true
-    end
-
     trait :downvote do
       note "thumbsdown"
     end
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index 543593cf389..2d4d9c18c9d 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -127,18 +127,15 @@ describe IssuesHelper do
     it { is_expected.to eq("!1, !2, or !3") }
   end
 
-  describe "note_active_class" do
-    before do
-      @note = create :note
-      @note1 = create :note
-    end
+  describe '#award_active_class' do
+    let!(:upvote) { create(:award_emoji) }
 
     it "returns empty string for unauthenticated user" do
-      expect(note_active_class(Note.all, nil)).to eq("")
+      expect(award_active_class(AwardEmoji.all, nil)).to eq("")
     end
 
     it "returns active string for author" do
-      expect(note_active_class(Note.all, @note.author)).to eq("active")
+      expect(award_active_class(AwardEmoji.all, upvote.user)).to eq("active")
     end
   end
 
diff --git a/spec/lib/award_emoji_spec.rb b/spec/lib/gitlab/award_emoji_spec.rb
similarity index 75%
rename from spec/lib/award_emoji_spec.rb
rename to spec/lib/gitlab/award_emoji_spec.rb
index 88c22912950..4e6c04a11b9 100644
--- a/spec/lib/award_emoji_spec.rb
+++ b/spec/lib/gitlab/award_emoji_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe AwardEmoji do
+describe Gitlab::AwardEmoji do
   describe '.urls' do
-    subject { AwardEmoji.urls }
+    subject { Gitlab::AwardEmoji.urls }
 
     it { is_expected.to be_an_instance_of(Array) }
     it { is_expected.to_not be_empty }
@@ -19,7 +19,7 @@ describe AwardEmoji do
 
   describe '.emoji_by_category' do
     it "only contains known categories" do
-      undefined_categories = AwardEmoji.emoji_by_category.keys - AwardEmoji::CATEGORIES.keys
+      undefined_categories = Gitlab::AwardEmoji.emoji_by_category.keys - Gitlab::AwardEmoji::CATEGORIES.keys
       expect(undefined_categories).to be_empty
     end
   end
diff --git a/spec/models/award_emoji_spec.rb b/spec/models/award_emoji_spec.rb
new file mode 100644
index 00000000000..fd3712b7d43
--- /dev/null
+++ b/spec/models/award_emoji_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe AwardEmoji, models: true do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:awardable) }
+    it { is_expected.to belong_to(:user) }
+  end
+
+  describe 'modules' do
+    it { is_expected.to include_module(Participable) }
+  end
+
+  describe "validations" do
+    it { is_expected.to validate_presence_of(:awardable) }
+    it { is_expected.to validate_presence_of(:user) }
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:awardable) }
+
+    # To circumvent a bug in the shoulda matchers
+    describe "scoped uniqueness validation" do
+      it "rejects duplicate award emoji" do
+        user  = create(:user)
+        issue = create(:issue)
+        create(:award_emoji, user: user, awardable: issue)
+        new_award = AwardEmoji.new(user: user, awardable: issue, name: "thumbsup")
+
+        expect(new_award).not_to be_valid
+      end
+    end
+  end
+end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index b16ccc6e305..d5435916ea1 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -198,18 +198,4 @@ describe Issue, "Issuable" do
         to eq({ 'Author' => 'Robert', 'Assignee' => 'Douwe' })
     end
   end
-
-  describe "votes" do
-    before do
-      author = create :user
-      project = create :empty_project
-      issue.notes.awards.create!(note: "thumbsup", author: author, project: project)
-      issue.notes.awards.create!(note: "thumbsdown", author: author, project: project)
-    end
-
-    it "returns correct values" do
-      expect(issue.upvotes).to eq(1)
-      expect(issue.downvotes).to eq(1)
-    end
-  end
 end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 6b18936edb1..bb591e9cb53 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -152,23 +152,6 @@ describe Note, models: true do
     end
   end
 
-  describe '.grouped_awards' do
-    before do
-      create :note, note: "smile", is_award: true
-      create :note, note: "smile", is_award: true
-    end
-
-    it "returns grouped hash of notes" do
-      expect(Note.grouped_awards.keys.size).to eq(3)
-      expect(Note.grouped_awards["smile"]).to match_array(Note.all)
-    end
-
-    it "returns thumbsup and thumbsdown always" do
-      expect(Note.grouped_awards["thumbsup"]).to match_array(Note.none)
-      expect(Note.grouped_awards["thumbsdown"]).to match_array(Note.none)
-    end
-  end
-
   describe '#active?' do
     it 'is always true when the note has no associated diff' do
       note = build(:note)
@@ -239,11 +222,6 @@ describe Note, models: true do
       note = build(:note, system: true)
       expect(note.editable?).to be_falsy
     end
-
-    it "returns false" do
-      note = build(:note, is_award: true, note: "smiley")
-      expect(note.editable?).to be_falsy
-    end
   end
 
   describe "cross_reference_not_visible_for?" do
@@ -270,23 +248,6 @@ describe Note, models: true do
     end
   end
 
-  describe "set_award!" do
-    let(:merge_request) { create :merge_request }
-
-    it "converts aliases to actual name" do
-      note = create(:note, note: ":+1:", noteable: merge_request)
-      expect(note.reload.note).to eq("thumbsup")
-    end
-
-    it "is not an award emoji when comment is on a diff" do
-      note = create(:note, note: ":blowfish:", noteable: merge_request, line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2")
-      note = note.reload
-
-      expect(note.note).to eq(":blowfish:")
-      expect(note.is_award?).to be_falsy
-    end
-  end
-
   describe 'clear_blank_line_code!' do
     it 'clears a blank line code before validation' do
       note = build(:note, line_code: ' ')

From 4eb16290e4e95c0a9bcf3d01ecc8060d91eec021 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Mon, 25 Apr 2016 09:09:39 +0100
Subject: [PATCH 0180/1431] move frontend logic from previous MR to new MR

---
 app/assets/javascripts/awards_handler.coffee  | 211 +++++++++++-------
 app/assets/javascripts/dispatcher.js.coffee   |   2 +
 .../lib/emoji_aliases.js.coffee.erb           |   9 +
 app/assets/javascripts/notes.js.coffee        |   4 +-
 app/assets/stylesheets/pages/awards.scss      |  13 +-
 app/assets/stylesheets/pages/notes.scss       |  41 +++-
 app/finders/notes_finder.rb                   |   4 +-
 app/views/award_emoji/_awards_block.html.haml |   6 +-
 8 files changed, 190 insertions(+), 100 deletions(-)
 create mode 100644 app/assets/javascripts/lib/emoji_aliases.js.coffee.erb

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index af4462ece38..4c0a274b793 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,63 +1,109 @@
 class @AwardsHandler
-  constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
-    $(".js-add-award").on "click", (event) =>
-      event.stopPropagation()
-      event.preventDefault()
+  constructor: ->
+    @aliases = gl.emoji.emojiAliases()
 
-      @showEmojiMenu()
+    $(document)
+      .off "click", ".js-add-award"
+      .on "click", ".js-add-award", (event) =>
+        event.stopPropagation()
+        event.preventDefault()
+
+        @showEmojiMenu $(event.currentTarget)
 
     $("html").on 'click', (event) ->
       if !$(event.target).closest(".emoji-menu").length
         if $(".emoji-menu").is(":visible")
+          $('.js-add-award.is-active').removeClass 'is-active'
           $(".emoji-menu").removeClass "is-visible"
 
-    $(".awards")
-      .off "click"
-      .on "click", ".js-emoji-btn", @handleClick
-
-    @renderFrequentlyUsedBlock()
+    $(document)
+      .off "click", ".js-emoji-btn"
+      .on "click", ".js-emoji-btn", (e) => @handleClick(e)
 
   handleClick: (e) ->
     e.preventDefault()
-    emoji = $(this)
+    $emojiBtn = $(e.currentTarget)
+    $addAwardBtn = $('.js-add-award.is-active')
+    $votesBlock = $($addAwardBtn.closest('.js-award-holder').data('target'))
+
+    if $addAwardBtn.length is 0
+      $votesBlock = $emojiBtn.closest('.js-awards-block')
+    else if $votesBlock.length is 0
+      $votesBlock = $addAwardBtn.closest('.js-awards-block')
+
+    $votesBlock.addClass 'js-awards-block-current'
+    awardUrl = $votesBlock.data 'award-url'
+    emoji = $emojiBtn
       .find(".icon")
       .data "emoji"
 
-    if emoji is "thumbsup" and awards_handler.didUserClickEmoji $(this), "thumbsdown"
-      awards_handler.addAward "thumbsdown"
+    if emoji is "thumbsup" and @didUserClickEmoji $emojiBtn, "thumbsdown"
+      @addAward awardUrl, "thumbsdown"
 
-    else if emoji is "thumbsdown" and awards_handler.didUserClickEmoji $(this), "thumbsup"
-      awards_handler.addAward "thumbsup"
+    else if emoji is "thumbsdown" and @didUserClickEmoji $emojiBtn, "thumbsup"
+      @addAward awardUrl, "thumbsup"
 
-    awards_handler.addAward emoji
+    @addAward awardUrl, emoji
 
-  didUserClickEmoji: (that, emoji) ->
-    if $(that).siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title")
-      $(that).siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title").indexOf('me') > -1
+  didUserClickEmoji: (emojiBtn, emoji) ->
+    if emojiBtn.siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title")
+      emojiBtn.siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title").indexOf('me') > -1
 
-  showEmojiMenu: ->
-    if $(".emoji-menu").length
-      if $(".emoji-menu").is ".is-visible"
-        $(".emoji-menu").removeClass "is-visible"
+  showEmojiMenu: ($addBtn) ->
+    $menu = $('.emoji-menu')
+    if $menu.length
+      $holder = $addBtn.closest('.js-award-holder')
+
+      if $menu.is ".is-visible"
+        $addBtn.removeClass "is-active"
+        $menu.removeClass "is-visible"
         $("#emoji_search").blur()
       else
         $(".emoji-menu").addClass "is-visible"
+        $addBtn.addClass "is-active"
+        @positionMenu($menu, $addBtn)
+
+        $menu.addClass "is-visible"
         $("#emoji_search").focus()
     else
-      $('.js-add-award').addClass "is-loading"
-      $.get @get_emojis_url, (response) =>
-        $('.js-add-award').removeClass "is-loading"
-        $(".js-award-holder").append response
+      $addBtn.addClass "is-loading is-active"
+      $.get $addBtn.data('award-menu-url'), (response) =>
+        $addBtn.removeClass "is-loading"
+        $('body').append response
+
+        $menu = $(".emoji-menu")
+
+        @positionMenu($menu, $addBtn)
+
+        @renderFrequentlyUsedBlock()
         setTimeout =>
-          $(".emoji-menu").addClass "is-visible"
+          $menu.addClass "is-visible"
           $("#emoji_search").focus()
           @setupSearch()
         , 200
 
-  addAward: (emoji) ->
+  positionMenu: ($menu, $addBtn) ->
+    position = $addBtn.data('position')
+
+    # The menu could potentially be off-screen or in a hidden overflow element
+    # So we position the element absolute in the body
+    css =
+      top: "#{$addBtn.offset().top + $addBtn.outerHeight()}px"
+
+    if position? and position is 'right'
+      css.left = "#{($addBtn.offset().left - $menu.outerWidth()) + 20}px"
+      $menu.addClass "is-aligned-right"
+    else
+      css.left = "#{$addBtn.offset().left}px"
+      $menu.removeClass "is-aligned-right"
+
+    $menu.css(css)
+
+  addAward: (awardUrl, emoji) ->
     emoji = @normilizeEmojiName(emoji)
-    @postEmoji emoji, =>
+    @postEmoji awardUrl, emoji, =>
       @addAwardToEmojiBar(emoji)
+      $('.js-awards-block').removeClass 'js-awards-block-current'
 
     $(".emoji-menu").removeClass "is-visible"
 
@@ -65,58 +111,60 @@ class @AwardsHandler
     @addEmojiToFrequentlyUsedList(emoji)
 
     emoji = @normilizeEmojiName(emoji)
-    if @exist(emoji)
-      if @isActive(emoji)
-        @decrementCounter(emoji)
+    $emojiBtn = @findEmojiIcon(emoji).parent()
+
+    if $emojiBtn.length > 0
+      if @isActive($emojiBtn)
+        @decrementCounter($emojiBtn, emoji)
       else
-        counter = @findEmojiIcon(emoji).siblings(".js-counter")
-        counter.text(parseInt(counter.text()) + 1)
-        counter.parent().addClass("active")
-        @addMeToAuthorList(emoji)
+        $counter = $emojiBtn.find('.js-counter')
+        $counter.text(parseInt($counter.text()) + 1)
+        $emojiBtn.addClass("active")
+        @addMeToUserList(emoji)
     else
       @createEmoji(emoji)
 
-  exist: (emoji) ->
-    @findEmojiIcon(emoji).length > 0
+  isActive: ($emojiBtn) ->
+    $emojiBtn.hasClass("active")
 
-  isActive: (emoji) ->
-    @findEmojiIcon(emoji).parent().hasClass("active")
+  decrementCounter: ($emojiBtn, emoji) ->
+    $awardsBlock = $emojiBtn.closest('.js-awards-block')
+    isntNoteBody = $emojiBtn.closest('.note-body').length is 0
+    counter = $('.js-counter', $emojiBtn)
+    counterNumber = parseInt(counter.text())
 
-  decrementCounter: (emoji) ->
-    counter = @findEmojiIcon(emoji).siblings(".js-counter")
-    emojiIcon = counter.parent()
-    if parseInt(counter.text()) > 1
-      counter.text(parseInt(counter.text()) - 1)
-      emojiIcon.removeClass("active")
-      @removeMeFromAuthorList(emoji)
-    else if emoji == "thumbsup" || emoji == "thumbsdown"
-      emojiIcon.tooltip("destroy")
-      counter.text(0)
-      emojiIcon.removeClass("active")
-      @removeMeFromAuthorList(emoji)
+    if counterNumber > 1
+      counter.text(counterNumber - 1)
+      @removeMeFromUserList($emojiBtn, emoji)
+    else if (emoji == "thumbsup" || emoji == "thumbsdown") && isntNoteBody
+      $emojiBtn.tooltip("destroy")
+      counter.text('0')
+      @removeMeFromUserList($emojiBtn, emoji)
     else
-      emojiIcon.tooltip("destroy")
-      emojiIcon.remove()
+      $emojiBtn.tooltip("destroy")
+      $emojiBtn.remove()
 
-  removeMeFromAuthorList: (emoji) ->
-    award_block = @findEmojiIcon(emoji).parent()
+    $emojiBtn.removeClass("active")
+
+  removeMeFromUserList: ($emojiBtn, emoji) ->
+    award_block = $emojiBtn
     authors = award_block
       .attr("data-original-title")
       .split(", ")
-    authors.splice(authors.indexOf("me"),1)
+    authors.splice(authors.indexOf("me"), 1)
     award_block
       .closest(".js-emoji-btn")
       .attr("data-original-title", authors.join(", "))
     @resetTooltip(award_block)
 
-  addMeToAuthorList: (emoji) ->
+  addMeToUserList: (emoji) ->
     award_block = @findEmojiIcon(emoji).parent()
     origTitle = award_block.attr("data-original-title").trim()
-    authors = []
+    users = []
     if origTitle
-      authors = origTitle.split(', ')
-    authors.push("me")
-    award_block.attr("data-original-title", authors.join(", "))
+      users = origTitle.split(', ')
+    users.push("me")
+    award_block.attr("data-original-title", users.join(", "))
     @resetTooltip(award_block)
 
   resetTooltip: (award) ->
@@ -127,24 +175,24 @@ class @AwardsHandler
       award.tooltip()
     ), 200
 
-
   createEmoji: (emoji) ->
     emojiCssClass = @resolveNameToCssClass(emoji)
 
-    nodes = []
-    nodes.push(
-      "<button class='btn award-control js-emoji-btn has-tooltip active' data-original-title='me'>",
-      "<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>",
-      "<span class='award-control-text js-counter'>1</span>",
-      "</button>"
-    )
+    buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
+      <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
+      <span class='award-control-text js-counter'>1</span>
+    </button>"
 
-    emoji_node = $(nodes.join("\n"))
-      .insertBefore(".js-award-holder")
+    emoji_node = $(buttonHtml)
+      .insertBefore(".js-awards-block-current .js-award-holder:not(.js-award-action-btn)")
       .find(".emoji-icon")
       .data("emoji", emoji)
     $('.award-control').tooltip()
 
+    $currentBlock = $('.js-awards-block-current')
+    if $currentBlock.is('.hidden')
+      $currentBlock.removeClass 'hidden'
+
   resolveNameToCssClass: (emoji) ->
     emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
@@ -156,17 +204,13 @@ class @AwardsHandler
 
     "emoji-#{unicodeName}"
 
-  postEmoji: (emoji, callback) ->
-    $.post @post_emoji_url, { note: {
-      note: ":#{emoji}:"
-      noteable_type: @noteable_type
-      noteable_id: @noteable_id
-    }},(data) ->
+  postEmoji: (awardUrl, emoji, callback) ->
+    $.post awardUrl, { name: emoji }, (data) ->
       if data.ok
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    $(".awards > .js-emoji-btn [data-emoji='#{emoji}']")
+    $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']")
 
   scrollToAwards: ->
     $('body, html').animate({
@@ -189,16 +233,15 @@ class @AwardsHandler
     if $.cookie('frequently_used_emojis')
       frequently_used_emojis = @getFrequentlyUsedEmojis()
 
-      ul = $("<ul>")
+      ul = $("<ul class='clearfix emoji-menu-list'>")
 
       for emoji in frequently_used_emojis
-        do (emoji) ->
-          $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
+        $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
 
       $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
 
   setupSearch: ->
-    $("input.emoji-search").keyup (ev) =>
+    $("input.emoji-search").on 'keyup', (ev) =>
       term = $(ev.target).val()
 
       # Clean previous search results
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 0b9110d35fa..610fa990fc7 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -22,6 +22,7 @@ class Dispatcher
         new Issue()
         shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
+        awards_handler = new AwardsHandler()
       when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
         new Milestone()
       when 'dashboard:todos:index'
@@ -52,6 +53,7 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
+        awards_handler = new AwardsHandler()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
new file mode 100644
index 00000000000..e005ab3684e
--- /dev/null
+++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
@@ -0,0 +1,9 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.emoji ?= {}
+
+  w.gl.emoji.emojiAliases = ->
+    JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>')
+
+) window
\ No newline at end of file
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index fa91baa07c0..ae8c1f22e4c 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -150,12 +150,12 @@ class @Notes
   renderNote: (note) ->
     unless note.valid
       if note.award
-        flash = new Flash('You have already used this award emoji!', 'alert')
+        flash = new Flash('You have already awarded this emoji, and it we\'ve removed it', 'alert')
         flash.pinTo('.header-content')
       return
 
     if note.award
-      awards_handler.addAwardToEmojiBar(note.note)
+      awards_handler.addAwardToEmojiBar(note.name)
       awards_handler.scrollToAwards()
 
     # render note if it not present in loaded list
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 37bf38fa65d..07d40f40556 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -1,6 +1,4 @@
 .awards {
-  line-height: 34px;
-
   .emoji-icon {
     width: 20px;
     height: 20px;
@@ -9,8 +7,6 @@
 
 .emoji-menu {
   position: absolute;
-  top: 100%;
-  left: 0;
   margin-top: 3px;
   z-index: 1000;
   min-width: 160px;
@@ -23,7 +19,12 @@
   opacity: 0;
   transform: scale(.2);
   transform-origin: 0 -45px;
-  transition: all .3s cubic-bezier(.87,-.41,.19,1.44);
+  transition: .3s cubic-bezier(.87,-.41,.19,1.44);
+  transition-property: transform, opacity;
+
+  &.is-aligned-right {
+    transform-origin: 100% -45px;
+  }
 
   &.is-visible {
     pointer-events: all;
@@ -107,7 +108,7 @@
   }
 
   &.is-loading {
-    .award-control-icon {
+    .award-control-icon-normal {
       display: none;
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ce44f5aa13b..9d808cce152 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -63,7 +63,8 @@ ul.notes {
     &.is-editting {
       .note-header,
       .note-text,
-      .edited-text {
+      .edited-text,
+      .note-awards {
         display: none;
       }
 
@@ -73,8 +74,6 @@ ul.notes {
     }
 
     .note-body {
-      overflow: auto;
-
       .note-text {
         overflow: auto;
         word-wrap: break-word;
@@ -307,6 +306,42 @@ ul.notes {
   }
 }
 
+.note-award-control {
+  display: block;
+
+  &:hover,
+  &:focus {
+    text-decoration: none;
+  }
+
+  .award-control-icon-loading {
+    display: none;
+  }
+
+  &.is-loading {
+    .award-control-icon-normal {
+      display: none;
+    }
+
+    .award-control-icon-loading {
+      display: block;
+    }
+ }
+}
+
+.note-awards {
+  .awards {
+    padding-top: 10px;
+  }
+
+  .award-control {
+    padding-top: 2px;
+    padding-bottom: 2px;
+    color: #8f8f8f;
+    font-size: 13px;
+  }
+}
+
 .disabled-comment {
   margin-left: -$gl-padding-top;
   margin-right: -$gl-padding-top;
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index fa4c635f55c..ab252821b52 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -12,9 +12,9 @@ class NotesFinder
       when "commit"
         project.notes.for_commit_id(target_id).not_inline
       when "issue"
-        project.issues.find(target_id).notes.nonawards.inc_author
+        project.issues.find(target_id).notes.inc_author
       when "merge_request"
-        project.merge_requests.find(target_id).mr_and_commit_notes.nonawards.inc_author
+        project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
       when "snippet", "project_snippet"
         project.snippets.find(target_id).notes
       else
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index 63c953195fe..b57c9afcbd2 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -1,7 +1,7 @@
-- grouped_awards = awardable.grouped_awards(inline)
+- grouped_emojis = awardable.grouped_awards(inline)
 .awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
-  - awards_sort(grouped_awards).each do |emoji, awards|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user), data: { placement: "bottom" } }
+  - awards_sort(grouped_emojis).each do |emoji, awards|
+    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)),data: { placement: "bottom", original_title:  award_user_list(awards, current_user)} }
       = emoji_icon(emoji)
       %span.award-control-text.js-counter
         = awards.count

From 76f43d5ce2e784067a04b64ea1838e1de459287d Mon Sep 17 00:00:00 2001
From: Fabio Huser <fabio.huser@siemens.com>
Date: Sun, 1 May 2016 22:48:26 +0200
Subject: [PATCH 0181/1431] docs(api): adapted user API documentation to match
 with latest API

The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation.

Signed-off-by: Fabio Huser <fabio@fh1.ch>
---
 doc/api/users.md | 80 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 22 deletions(-)

diff --git a/doc/api/users.md b/doc/api/users.md
index 7d2b4897cff..7e848586dbd 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -20,6 +20,7 @@ GET /users
     "name": "John Smith",
     "state": "active",
     "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
+    "web_url": "http://localhost:3000/u/john_smith"
   },
   {
     "id": 2,
@@ -27,6 +28,7 @@ GET /users
     "name": "Jack Smith",
     "state": "blocked",
     "avatar_url": "http://gravatar.com/../e32131cd8.jpeg",
+    "web_url": "http://localhost:3000/u/jack_smith"
   }
 ]
 ```
@@ -45,21 +47,31 @@ GET /users
     "email": "john@example.com",
     "name": "John Smith",
     "state": "active",
+    "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg",
+    "web_url": "http://localhost:3000/u/john_smith",
     "created_at": "2012-05-23T08:00:58Z",
+    "is_admin": false,
     "bio": null,
+    "location": null,
     "skype": "",
     "linkedin": "",
     "twitter": "",
     "website_url": "",
-    "extern_uid": "john.smith",
-    "provider": "provider_name",
+    "last_sign_in_at": "2012-06-01T11:41:01Z",
+    "confirmed_at": "2012-05-23T09:05:22Z",
     "theme_id": 1,
     "color_scheme_id": 2,
-    "is_admin": false,
-    "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
+    "projects_limit": 100,
+    "current_sign_in_at": "2012-06-02T06:36:55Z",
+    "identities": [
+      {"provider": "github", "extern_uid": "2435223452345"},
+      {"provider": "bitbucket", "extern_uid": "john.smith"},
+      {"provider": "google_oauth2", "extern_uid": "8776128412476123468721346"}
+    ],
     "can_create_group": true,
-    "current_sign_in_at": "2014-03-19T13:12:15Z",
-    "two_factor_enabled": true
+    "can_create_project": true,
+    "two_factor_enabled": true,
+    "external": false
   },
   {
     "id": 2,
@@ -67,24 +79,27 @@ GET /users
     "email": "jack@example.com",
     "name": "Jack Smith",
     "state": "blocked",
+    "avatar_url": "http://localhost:3000/uploads/user/avatar/2/index.jpg",
+    "web_url": "http://localhost:3000/u/jack_smith",
     "created_at": "2012-05-23T08:01:01Z",
+    "is_admin": false,
     "bio": null,
     "location": null,
     "skype": "",
     "linkedin": "",
     "twitter": "",
     "website_url": "",
-    "extern_uid": "jack.smith",
-    "provider": "provider_name",
+    "last_sign_in_at": null,
+    "confirmed_at": "2012-05-30T16:53:06.148Z",
     "theme_id": 1,
     "color_scheme_id": 3,
-    "is_admin": false,
-    "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
-    "can_create_group": true,
-    "can_create_project": true,
     "projects_limit": 100,
     "current_sign_in_at": "2014-03-19T17:54:13Z",
-    "two_factor_enabled": false
+    "identities": [],
+    "can_create_group": true,
+    "can_create_project": true,
+    "two_factor_enabled": true,
+    "external": false
   }
 ]
 ```
@@ -124,6 +139,7 @@ Parameters:
   "name": "John Smith",
   "state": "active",
   "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
+  "web_url": "http://localhost:3000/u/john_smith",
   "created_at": "2012-05-23T08:00:58Z",
   "is_admin": false,
   "bio": null,
@@ -152,23 +168,31 @@ Parameters:
   "email": "john@example.com",
   "name": "John Smith",
   "state": "active",
+  "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg",
+  "web_url": "http://localhost:3000/u/john_smith",
   "created_at": "2012-05-23T08:00:58Z",
-  "confirmed_at": "2012-05-23T08:00:58Z",
-  "last_sign_in_at": "2015-03-23T08:00:58Z",
+  "is_admin": false,
   "bio": null,
   "location": null,
   "skype": "",
   "linkedin": "",
   "twitter": "",
   "website_url": "",
-  "extern_uid": "john.smith",
-  "provider": "provider_name",
+  "last_sign_in_at": "2012-06-01T11:41:01Z",
+  "confirmed_at": "2012-05-23T09:05:22Z",
   "theme_id": 1,
   "color_scheme_id": 2,
-  "is_admin": false,
+  "projects_limit": 100,
+  "current_sign_in_at": "2012-06-02T06:36:55Z",
+  "identities": [
+    {"provider": "github", "extern_uid": "2435223452345"},
+    {"provider": "bitbucket", "extern_uid": "john.smith"},
+    {"provider": "google_oauth2", "extern_uid": "8776128412476123468721346"}
+  ],
   "can_create_group": true,
   "can_create_project": true,
-  "projects_limit": 100
+  "two_factor_enabled": true,
+  "external": false
 }
 ```
 
@@ -261,21 +285,33 @@ GET /user
   "username": "john_smith",
   "email": "john@example.com",
   "name": "John Smith",
-  "private_token": "dd34asd13as",
   "state": "active",
+  "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg",
+  "web_url": "http://localhost:3000/u/john_smith",
   "created_at": "2012-05-23T08:00:58Z",
+  "is_admin": false,
   "bio": null,
   "location": null,
   "skype": "",
   "linkedin": "",
   "twitter": "",
   "website_url": "",
+  "last_sign_in_at": "2012-06-01T11:41:01Z",
+  "confirmed_at": "2012-05-23T09:05:22Z",
   "theme_id": 1,
   "color_scheme_id": 2,
-  "is_admin": false,
+  "projects_limit": 100,
+  "current_sign_in_at": "2012-06-02T06:36:55Z",
+  "identities": [
+    {"provider": "github", "extern_uid": "2435223452345"},
+    {"provider": "bitbucket", "extern_uid": "john_smith"},
+    {"provider": "google_oauth2", "extern_uid": "8776128412476123468721346"}
+  ],
   "can_create_group": true,
   "can_create_project": true,
-  "projects_limit": 100
+  "two_factor_enabled": true,
+  "external": false,
+  "private_token": "dd34asd13as"
 }
 ```
 

From 4ab49fab94284f3f7e3804309ba8825ed28fc24c Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Fri, 22 Apr 2016 19:23:21 +0900
Subject: [PATCH 0182/1431] Use outer join for issues ordering by milestones
 due.

---
 app/models/concerns/issuable.rb | 5 +++--
 spec/features/issues_spec.rb    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index d5166e81474..2e4efc4e8d8 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -35,13 +35,14 @@ module Issuable
     scope :only_opened, -> { with_state(:opened) }
     scope :only_reopened, -> { with_state(:reopened) }
     scope :closed, -> { with_state(:closed) }
-    scope :order_milestone_due_desc, -> { joins(:milestone).reorder('milestones.due_date DESC, milestones.id DESC') }
-    scope :order_milestone_due_asc, -> { joins(:milestone).reorder('milestones.due_date ASC, milestones.id ASC') }
+    scope :order_milestone_due_desc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date DESC, milestones.id DESC') }
+    scope :order_milestone_due_asc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date ASC, milestones.id ASC') }
     scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
 
     scope :join_project, -> { joins(:project) }
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
+    scope :outer_join_milestone, -> { joins("LEFT OUTER JOIN milestones ON milestones.id = #{table_name}.milestone_id") }
 
     delegate :name,
              :email,
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index b57131f68d5..d5755c293c5 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -264,12 +264,14 @@ describe 'Issues', feature: true do
         visit namespace_project_issues_path(project.namespace, project, sort: sort_value_milestone_soon)
 
         expect(first_issue).to include('foo')
+        expect(last_issue).to include('baz')
       end
 
       it 'sorts by least recently due milestone' do
         visit namespace_project_issues_path(project.namespace, project, sort: sort_value_milestone_later)
 
         expect(first_issue).to include('bar')
+        expect(last_issue).to include('baz')
       end
     end
 

From 0a38eac16e1d86d094c98c12a38702ffe88cd527 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Wed, 4 May 2016 21:07:07 +0900
Subject: [PATCH 0183/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 5b907fa217d..78d6c1ec2b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.8.0 (unreleased)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
+  - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From 13d4d3c8b0df93dd51228db79265179cb978ff29 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 28 Apr 2016 10:45:45 +0100
Subject: [PATCH 0184/1431] Add specs for MergeRequests::BuildService

---
 .../merge_requests/build_service_spec.rb      | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 spec/services/merge_requests/build_service_spec.rb

diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
new file mode 100644
index 00000000000..7ad13478dd4
--- /dev/null
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+describe MergeRequests::BuildService, services: true do
+  include RepoHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:issue) { create(:issue, project: project) }
+  let(:description) { nil }
+  let(:source_branch) { 'feature-branch' }
+  let(:target_branch) { 'master' }
+  let(:merge_request) { service.execute }
+  let(:compare) { double(:compare, commits: commits) }
+  let(:commit_1) { double(:commit_1, safe_message: "Initial commit\n\nCreate the app") }
+  let(:commit_2) { double(:commit_2, safe_message: 'This is a bad commit message!') }
+  let(:commits) { nil }
+
+  let(:service) do
+    MergeRequests::BuildService.new(project, user,
+                                    description: description,
+                                    source_branch: source_branch,
+                                    target_branch: target_branch)
+  end
+
+  before do
+    allow(CompareService).to receive_message_chain(:new, :execute).and_return(compare)
+  end
+
+  describe 'execute' do
+    context 'missing source branch' do
+      let(:source_branch) { '' }
+
+      it 'forbids the merge request from being created' do
+        expect(merge_request.can_be_created).to eq(false)
+      end
+
+      it 'adds an error message to the merge request' do
+        expect(merge_request.errors).to contain_exactly('You must select source and target branch')
+      end
+    end
+
+    context 'missing target branch' do
+      let(:target_branch) { '' }
+
+      it 'forbids the merge request from being created' do
+        expect(merge_request.can_be_created).to eq(false)
+      end
+
+      it 'adds an error message to the merge request' do
+        expect(merge_request.errors).to contain_exactly('You must select source and target branch')
+      end
+    end
+
+    context 'no commits in the diff' do
+      let(:commits) { [] }
+
+      it 'forbids the merge request from being created' do
+        expect(merge_request.can_be_created).to eq(false)
+      end
+    end
+
+    context 'one commit in the diff' do
+      let(:commits) { [commit_1] }
+
+      it 'allows the merge request to be created' do
+        expect(merge_request.can_be_created).to eq(true)
+      end
+
+      it 'uses the title of the commit as the title of the merge request' do
+        expect(merge_request.title).to eq(commit_1.safe_message.split("\n").first)
+      end
+
+      it 'uses the description of the commit as the description of the merge request' do
+        expect(merge_request.description).to eq(commit_1.safe_message.split(/\n+/, 2).last)
+      end
+
+      context 'merge request already has a description set' do
+        let(:description) { 'Merge request description' }
+
+        it 'keeps the description from the initial params' do
+          expect(merge_request.description).to eq(description)
+        end
+      end
+
+      context 'commit has no description' do
+        let(:commits) { [commit_2] }
+
+        it 'uses the title of the commit as the title of the merge request' do
+          expect(merge_request.title).to eq(commit_2.safe_message)
+        end
+
+        it 'sets the description to nil' do
+          expect(merge_request.description).to be_nil
+        end
+      end
+
+      context 'branch starts with issue IID followed by a hyphen' do
+        let(:source_branch) { "#{issue.iid}-fix-issue" }
+
+        it 'appends "Closes #$issue-iid" to the description' do
+          expect(merge_request.description).to eq("#{commit_1.safe_message.split(/\n+/, 2).last}\nCloses ##{issue.iid}")
+        end
+
+        context 'merge request already has a description set' do
+          let(:description) { 'Merge request description' }
+
+          it 'appends "Closes #$issue-iid" to the description' do
+            expect(merge_request.description).to eq("#{description}\nCloses ##{issue.iid}")
+          end
+        end
+
+        context 'commit has no description' do
+          let(:commits) { [commit_2] }
+
+          it 'sets the description to "Closes #$issue-iid"' do
+            expect(merge_request.description).to eq("Closes ##{issue.iid}")
+          end
+        end
+      end
+    end
+
+    context 'more than one commit in the diff' do
+      let(:commits) { [commit_1, commit_2] }
+
+      it 'allows the merge request to be created' do
+        expect(merge_request.can_be_created).to eq(true)
+      end
+
+      it 'uses the title of the branch as the merge request title' do
+        expect(merge_request.title).to eq('Feature branch')
+      end
+
+      it 'does not add a description' do
+        expect(merge_request.description).to be_nil
+      end
+
+      context 'merge request already has a description set' do
+        let(:description) { 'Merge request description' }
+
+        it 'keeps the description from the initial params' do
+          expect(merge_request.description).to eq(description)
+        end
+      end
+    end
+  end
+end

From e76f339dcd83799a63d206007750077b7af753f4 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 28 Apr 2016 11:36:37 +0100
Subject: [PATCH 0185/1431] Auto-set title for branches created from issues

If a branch starts with an issue's IID, followed by a hyphen, the
description will be updated to say that is closes the issue. This also
updates the title of the merge request to 'Resolves "$issue-title"', as
long as:
- There is more than one commit in the merge request (if there is only
  one commit, the commit's title will be used as before)
- The issue's IID is valid for the project
---
 app/services/merge_requests/build_service.rb  | 36 +++++++++++++++----
 .../merge_requests/build_service_spec.rb      | 28 ++++++++++++++-
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 3544752d47a..4add1d66ea5 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -41,21 +41,45 @@ module MergeRequests
         merge_request.can_be_created = false
       end
 
+      set_title_and_description(merge_request)
+    end
+
+    private
+
+    # When your branch name starts with an iid followed by a dash this pattern will be
+    # interpreted as the user wants to close that issue on this project.
+    #
+    # For example:
+    # - Issue 112 exists, title: Emoji don't show up in commit title
+    # - Source branch is: 112-fix-mep-mep
+    #
+    # Will lead to:
+    # - Appending `Closes #112` to the description
+    # - Setting the title as 'Resolves "Emoji don't show up in commit title"' if there is
+    #   more than one commit in the MR
+    #
+    def set_title_and_description(merge_request)
+      if match = merge_request.source_branch.match(/\A(\d+)-/)
+        iid = match[1]
+      end
+
       commits = merge_request.compare_commits
       if commits && commits.count == 1
         commit = commits.first
         merge_request.title       = commit.title
         merge_request.description ||= commit.description.try(:strip)
+      elsif iid && (issue = merge_request.target_project.get_issue(iid))
+        case issue
+        when Issue
+          merge_request.title = "Resolve \"#{issue.title}\""
+        when ExternalIssue
+          merge_request.title = "Resolve #{issue.title}"
+        end
       else
         merge_request.title = merge_request.source_branch.titleize.humanize
       end
 
-      # When your branch name starts with an iid followed by a dash this pattern will
-      # be interpreted as the use wants to close that issue on this project
-      # Pattern example: 112-fix-mep-mep
-      # Will lead to appending `Closes #112` to the description
-      if match = merge_request.source_branch.match(/\A(\d+)-/)
-        iid = match[1]
+      if iid
         closes_issue = "Closes ##{iid}"
 
         if merge_request.description.present?
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index 7ad13478dd4..f8b768a1a9b 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -5,7 +5,7 @@ describe MergeRequests::BuildService, services: true do
 
   let(:project) { create(:project) }
   let(:user) { create(:user) }
-  let(:issue) { create(:issue, project: project) }
+  let(:issue) { create(:issue, project: project, title: 'A bug') }
   let(:description) { nil }
   let(:source_branch) { 'feature-branch' }
   let(:target_branch) { 'master' }
@@ -141,6 +141,32 @@ describe MergeRequests::BuildService, services: true do
           expect(merge_request.description).to eq(description)
         end
       end
+
+      context 'branch starts with GitLab issue IID followed by a hyphen' do
+        let(:source_branch) { "#{issue.iid}-fix-issue" }
+
+        it 'sets the title to: Resolves "$issue-title"' do
+          expect(merge_request.title).to eq("Resolve \"#{issue.title}\"")
+        end
+
+        context 'issue does not exist' do
+          let(:source_branch) { "#{issue.iid.succ}-fix-issue" }
+
+          it 'uses the title of the branch as the merge request title' do
+            expect(merge_request.title).to eq("#{issue.iid.succ} fix issue")
+          end
+        end
+      end
+
+      context 'branch starts with external issue IID followed by a hyphen' do
+        let(:source_branch) { '12345-fix-issue' }
+
+        before { allow(project).to receive(:default_issues_tracker?).and_return(false) }
+
+        it 'sets the title to: Resolves External Issue $issue-iid' do
+          expect(merge_request.title).to eq('Resolve External Issue 12345')
+        end
+      end
     end
   end
 end

From 09209725cee58b3d9645b8cf58ec955b566f5b5b Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 28 Apr 2016 12:12:03 +0100
Subject: [PATCH 0186/1431] Don't auto-set MR title for confidential issues

---
 app/services/merge_requests/build_service.rb       |  2 +-
 spec/services/merge_requests/build_service_spec.rb | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 4add1d66ea5..cd4230aa5e4 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -68,7 +68,7 @@ module MergeRequests
         commit = commits.first
         merge_request.title       = commit.title
         merge_request.description ||= commit.description.try(:strip)
-      elsif iid && (issue = merge_request.target_project.get_issue(iid))
+      elsif iid && (issue = merge_request.target_project.get_issue(iid)) && !issue.try(:confidential?)
         case issue
         when Issue
           merge_request.title = "Resolve \"#{issue.title}\""
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index f8b768a1a9b..782d74ec5ec 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -5,7 +5,8 @@ describe MergeRequests::BuildService, services: true do
 
   let(:project) { create(:project) }
   let(:user) { create(:user) }
-  let(:issue) { create(:issue, project: project, title: 'A bug') }
+  let(:issue_confidential) { false }
+  let(:issue) { create(:issue, project: project, title: 'A bug', confidential: issue_confidential) }
   let(:description) { nil }
   let(:source_branch) { 'feature-branch' }
   let(:target_branch) { 'master' }
@@ -156,6 +157,14 @@ describe MergeRequests::BuildService, services: true do
             expect(merge_request.title).to eq("#{issue.iid.succ} fix issue")
           end
         end
+
+        context 'issue is confidential' do
+          let(:issue_confidential) { true }
+
+          it 'uses the title of the branch as the merge request title' do
+            expect(merge_request.title).to eq("#{issue.iid} fix issue")
+          end
+        end
       end
 
       context 'branch starts with external issue IID followed by a hyphen' do

From 2dcd3f29ddf6d54468f3e712166d9504aa356f6f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 6 May 2016 16:13:35 +0200
Subject: [PATCH 0187/1431] Annotate models

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/hooks/project_hook.rb  | 1 +
 app/models/hooks/service_hook.rb  | 1 +
 app/models/hooks/system_hook.rb   | 1 +
 app/models/hooks/web_hook.rb      | 1 +
 app/models/project_import_data.rb | 4 ++--
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb
index 64f570b12ae..2b8f34a0568 100644
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class ProjectHook < WebHook
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb
index 23f6468ee52..0e176de5ef8 100644
--- a/app/models/hooks/service_hook.rb
+++ b/app/models/hooks/service_hook.rb
@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class ServiceHook < WebHook
diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb
index 5e9046f3623..ad508cbbcb8 100644
--- a/app/models/hooks/system_hook.rb
+++ b/app/models/hooks/system_hook.rb
@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class SystemHook < WebHook
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index a8f17ac16a6..8e58c9583ab 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class WebHook < ActiveRecord::Base
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index 3f0080205dd..7830f764ed3 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -6,8 +6,8 @@
 #  project_id                 :integer
 #  data                       :text
 #  encrypted_credentials      :text
-#  encrypted_credentials_iv   :text
-#  encrypted_credentials_salt :text
+#  encrypted_credentials_iv   :string
+#  encrypted_credentials_salt :string
 #
 
 require 'carrierwave/orm/activerecord'

From 0aba37cfd192234eba518cadf002608e15edd1e0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 6 May 2016 09:21:04 -0500
Subject: [PATCH 0188/1431] Align code within links in comments

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

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 50ca755bcb6..624c8249f7e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -168,6 +168,11 @@ ul.notes {
       .notes {
         background-color: $white-light;
       }
+
+      a code {
+        top: 0;
+        margin-right: 0;
+      }
     }
   }
 }

From 235d70da73c5538b48278deb971ecda8667af68f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 6 May 2016 16:32:11 +0200
Subject: [PATCH 0189/1431] Update db/schema.rb after running db:migrate:reset

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 db/schema.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 04aee737e4c..7683aad968c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -70,16 +70,16 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     t.string   "recaptcha_site_key"
     t.string   "recaptcha_private_key"
     t.integer  "metrics_port",                      default: 8089
+    t.boolean  "akismet_enabled",                   default: false
+    t.string   "akismet_api_key"
     t.integer  "metrics_sample_interval",           default: 15
     t.boolean  "sentry_enabled",                    default: false
     t.string   "sentry_dsn"
-    t.boolean  "akismet_enabled",                   default: false
-    t.string   "akismet_api_key"
     t.boolean  "email_author_in_body",              default: false
     t.integer  "default_group_visibility"
     t.boolean  "repository_checks_enabled",         default: false
-    t.integer  "metrics_packet_size",               default: 1
     t.text     "shared_runners_text"
+    t.integer  "metrics_packet_size",               default: 1
   end
 
   create_table "audit_events", force: :cascade do |t|
@@ -426,10 +426,10 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     t.string   "state"
     t.integer  "iid"
     t.integer  "updated_by_id"
-    t.integer  "moved_to_id"
     t.boolean  "confidential",  default: false
     t.datetime "deleted_at"
     t.date     "due_date"
+    t.integer  "moved_to_id"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -716,8 +716,8 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     t.integer "project_id"
     t.text    "data"
     t.text    "encrypted_credentials"
-    t.text    "encrypted_credentials_iv"
-    t.text    "encrypted_credentials_salt"
+    t.string  "encrypted_credentials_iv"
+    t.string  "encrypted_credentials_salt"
   end
 
   create_table "projects", force: :cascade do |t|
@@ -816,9 +816,9 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     t.string   "type"
     t.string   "title"
     t.integer  "project_id"
-    t.datetime "created_at",                               null: false
-    t.datetime "updated_at",                               null: false
-    t.boolean  "active",                                   null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                default: false,    null: false
     t.text     "properties"
     t.boolean  "template",              default: false
     t.boolean  "push_events",           default: true

From 64ef2e0834fe9320191286052f03689f9080c2ac Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 6 May 2016 17:33:32 +0200
Subject: [PATCH 0190/1431] Move group settings navigation to own partial

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_group.html.haml        | 21 +---------
 .../layouts/nav/_group_settings.html.haml     | 40 +++++++++----------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index dff188e0b15..3438005863a 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,23 +1,4 @@
-- if current_user
-  - if access = @group.users.find_by(id: current_user.id)
-    .controls
-      %span.dropdown.group-settings-dropdown
-        %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
-          = icon('cog')
-          = icon('caret-down')
-        %ul.dropdown-menu.dropdown-menu-align-right
-          - if can?(current_user, :admin_group, @group)
-            = nav_link(path: 'groups#projects') do
-              = link_to projects_group_path(@group), title: 'Projects' do
-                Projects
-            %li.divider
-            %li
-              = link_to edit_group_path(@group) do
-                Edit Group
-          %li
-            = link_to leave_group_group_members_path(@group),
-              data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
-              Leave Group
+= render 'layouts/nav/group_settings'
 
 %ul.nav-links
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
diff --git a/app/views/layouts/nav/_group_settings.html.haml b/app/views/layouts/nav/_group_settings.html.haml
index 56a92fe9103..f6ba1b75a54 100644
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
@@ -1,20 +1,20 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to group_path(@group), title: 'Go to group', class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Go to group
-
-  %li.separate-item
-
-  %ul.sidebar-subnav
-    = nav_link(path: 'groups#edit') do
-      = link_to edit_group_path(@group), title: 'Group Settings' do
-        = icon ('pencil-square-o fw')
-        %span
-          Group Settings
-    = nav_link(path: 'groups#projects') do
-      = link_to projects_group_path(@group), title: 'Projects' do
-        = icon('folder fw')
-        %span
-          Projects
+- if current_user
+  - if access = @group.users.find_by(id: current_user.id)
+    .controls
+      %span.dropdown.group-settings-dropdown
+        %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+          = icon('cog')
+          = icon('caret-down')
+        %ul.dropdown-menu.dropdown-menu-align-right
+          - if can?(current_user, :admin_group, @group)
+            = nav_link(path: 'groups#projects') do
+              = link_to projects_group_path(@group), title: 'Projects' do
+                Projects
+            %li.divider
+            %li
+              = link_to edit_group_path(@group) do
+                Edit Group
+          %li
+            = link_to leave_group_group_members_path(@group),
+              data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
+              Leave Group

From 510b10583c5b40d544c878adde16b43a9060c0b4 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Fri, 6 May 2016 11:47:43 -0400
Subject: [PATCH 0191/1431] Add nice new Todo bell

---
 app/assets/stylesheets/framework/variables.scss | 1 +
 app/assets/stylesheets/pages/todos.scss         | 9 ++++++++-
 app/views/layouts/header/_default.html.haml     | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index e4a7339491a..ccb4e5381b7 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -77,6 +77,7 @@ $provider-btn-group-border: #e5e5e5;
 $provider-btn-not-active-color: #4688f1;
 $link-underline-blue: #4a8bee;
 $layout-link-gray: #7e7c7c;
+$todo-alert-blue: #428bca;
 
 /*
  * Color schema
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index 75f78569e3c..e51c3491dae 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -6,9 +6,16 @@
 .navbar-nav {
   li {
     .badge.todos-pending-count {
-      background-color: $gl-icon-color;
       margin-top: -5px;
       font-weight: normal;
+      background: $todo-alert-blue;
+      margin-left: -17px;
+      font-size: 11px;
+      color: white;
+      padding: 3px;
+      padding-top: 1px;
+      padding-bottom: 1px;
+      border-radius: 3px;
     }
   }
 }
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index cde9e1b918b..86930d4eaaf 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -23,6 +23,7 @@
                   = icon('wrench fw')
             %li
               = link_to dashboard_todos_path, title: 'Todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                = icon('bell fw')
                 %span.badge.todos-pending-count
                   = todos_pending_count
             - if current_user.can_create_project?

From dd03cfd1367c6876ac6b4d38cbc8e607e7cd9bf0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 6 May 2016 21:05:57 +0200
Subject: [PATCH 0192/1431] Make group settings button white instead of gray
 for better visibility

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_group_settings.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/nav/_group_settings.html.haml b/app/views/layouts/nav/_group_settings.html.haml
index f6ba1b75a54..e391ec7f2b7 100644
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
@@ -2,7 +2,7 @@
   - if access = @group.users.find_by(id: current_user.id)
     .controls
       %span.dropdown.group-settings-dropdown
-        %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+        %a.dropdown-new.btn.btn-default#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
           = icon('cog')
           = icon('caret-down')
         %ul.dropdown-menu.dropdown-menu-align-right

From f4bde77529169ab8a48f16ec9c1dd4dcc817e578 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@gitlab.com>
Date: Fri, 6 May 2016 21:52:29 +0200
Subject: [PATCH 0193/1431] We're hiring.

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index c1a29c3bb1e..5e41665a6ba 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,10 @@ To see how GitLab looks please see the [features page on our website](https://ab
 - Completely free and open source (MIT Expat license)
 - Powered by [Ruby on Rails](https://github.com/rails/rails)
 
+## Hiring
+
+We're hiring developers, support people, and production engineers all the time, please see our [jobs page](https://about.gitlab.com/jobs/).
+
 ## Editions
 
 There are two editions of GitLab:

From ab4671f26ab789b1e3647754911197aaba1f81bb Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Sat, 7 May 2016 01:31:56 +0200
Subject: [PATCH 0194/1431] Fix adding a todo for private group members

Fixes #14002
---
 CHANGELOG                          |  1 +
 app/models/concerns/mentionable.rb |  4 ++--
 spec/services/todo_service_spec.rb | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 78d6c1ec2b2..c68a11a91f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 8.8.0 (unreleased)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
   - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
+  - Fix adding a todo for private group members (Ahmad Sherif)
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 98f71ae8cb0..b381d225485 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -43,8 +43,8 @@ module Mentionable
     self
   end
 
-  def all_references(current_user = self.author, text = nil)
-    ext = Gitlab::ReferenceExtractor.new(self.project, current_user, self.author)
+  def all_references(current_user = nil, text = nil)
+    ext = Gitlab::ReferenceExtractor.new(self.project, current_user || self.author, self.author)
 
     if text
       ext.analyze(text)
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 82b7fbfa816..a075496ee63 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -55,6 +55,25 @@ describe TodoService, services: true do
         should_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
         should_not_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
       end
+
+      context 'when a private group is mentioned' do
+        let(:group) { create :group, :private }
+        let(:project) { create :project, :private, group: group }
+        let(:issue) { create :issue, author: author, project: project, description: group.to_reference }
+
+        before do
+          group.add_owner(author)
+          group.add_user(member, Gitlab::Access::DEVELOPER)
+          group.add_user(john_doe, Gitlab::Access::DEVELOPER)
+
+          service.new_issue(issue, author)
+        end
+
+        it 'creates a todo for group members' do
+          should_create_todo(user: member, target: issue)
+          should_create_todo(user: john_doe, target: issue)
+        end
+      end
     end
 
     describe '#update_issue' do

From 8d8189be9d4121bb5a18489e1bee4992efc8f120 Mon Sep 17 00:00:00 2001
From: Morton Fox <github@qslw.com>
Date: Sat, 7 May 2016 00:06:06 -0400
Subject: [PATCH 0195/1431] Update Subscription and EE links

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c1a29c3bb1e..d1e5bcf256c 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,11 @@ There are two editions of GitLab:
 
 On [about.gitlab.com](https://about.gitlab.com/) you can find more information about:
 
-- [Subscriptions](https://about.gitlab.com/subscription/)
+- [Subscriptions](https://about.gitlab.com/pricing/)
 - [Consultancy](https://about.gitlab.com/consultancy/)
 - [Community](https://about.gitlab.com/community/)
 - [Hosted GitLab.com](https://about.gitlab.com/gitlab-com/) use GitLab as a free service
-- [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/) with additional features aimed at larger organizations.
+- [GitLab Enterprise Edition](https://about.gitlab.com/features/#enterprise) with additional features aimed at larger organizations.
 - [GitLab CI](https://about.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
 
 ## Requirements

From dd4fe8e9bbdd1f9874f20fbbd481bf56158f4f0c Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sat, 7 May 2016 13:09:27 +0900
Subject: [PATCH 0196/1431] Update CI example docs.

---
 doc/ci/examples/README.md                              |  2 +-
 .../test-and-deploy-python-application-to-heroku.md    | 10 +++++-----
 .../test-and-deploy-ruby-application-to-heroku.md      |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md
index cc059dc4376..31760d872b2 100644
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
@@ -4,7 +4,7 @@
 - [Test and deploy a Ruby application to Heroku](test-and-deploy-ruby-application-to-heroku.md)
 - [Test and deploy a Python application to Heroku](test-and-deploy-python-application-to-heroku.md)
 - [Test a Clojure application](test-clojure-application.md)
-- [Using `dpl` as deployment tool](deployment/README.md)
+- [Using `dpl` as deployment tool](../deployment/README.md)
 - Help your favorite programming language and GitLab by sending a merge request
   with a guide for that language.
 
diff --git a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
index a236da53fe9..e4d3970deac 100644
--- a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
+++ b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
@@ -8,7 +8,7 @@ This is what the `.gitlab-ci.yml` file looks like for this project:
 ```yaml
 test:
   script:
-  # this configures django application to use attached postgres database that is run on `postgres` host
+  # this configures Django application to use attached postgres database that is run on `postgres` host
   - export DATABASE_URL=postgres://postgres:@postgres:5432/python-test-app
   - apt-get update -qy
   - apt-get install -y python-dev python-pip
@@ -37,7 +37,7 @@ production:
 ```
 
 This project has three jobs:
-1. `test` - used to test rails application,
+1. `test` - used to test Django application,
 2. `staging` - used to automatically deploy staging environment every push to `master` branch
 3. `production` - used to automatically deploy production environmnet for every created tag
 
@@ -61,12 +61,12 @@ gitlab-ci-multi-runner register \
   --non-interactive \
   --url "https://gitlab.com/ci/" \
   --registration-token "PROJECT_REGISTRATION_TOKEN" \
-  --description "python-3.2" \
+  --description "python-3.5" \
   --executor "docker" \
-  --docker-image python:3.2 \
+  --docker-image python:3.5 \
   --docker-postgres latest
 ```
 
-With the command above, you create a runner that uses [python:3.2](https://registry.hub.docker.com/u/library/python/) image and uses [postgres](https://registry.hub.docker.com/u/library/postgres/) database.
+With the command above, you create a runner that uses [python:3.5](https://hub.docker.com/r/_/python/) image and uses [postgres](https://hub.docker.com/r/_/postgres/) database.
 
 To access PostgreSQL database you need to connect to `host: postgres` as user `postgres` without password.
diff --git a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
index f5645d586ae..08c10d391ea 100644
--- a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
+++ b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
@@ -1,5 +1,5 @@
 ## Test and Deploy a ruby application
-This example will guide you how to run tests in your Ruby application and deploy it automatically as Heroku application.
+This example will guide you how to run tests in your Ruby on Rails application and deploy it automatically as Heroku application.
 
 You can checkout the example [source](https://gitlab.com/ayufan/ruby-getting-started) and check [CI status](https://gitlab.com/ayufan/ruby-getting-started/builds?scope=all).
 
@@ -32,7 +32,7 @@ production:
 ```
 
 This project has three jobs:
-1. `test` - used to test rails application,
+1. `test` - used to test Rails application,
 2. `staging` - used to automatically deploy staging environment every push to `master` branch
 3. `production` - used to automatically deploy production environmnet for every created tag
 
@@ -62,6 +62,6 @@ gitlab-ci-multi-runner register \
   --docker-postgres latest
 ```
 
-With the command above, you create a runner that uses [ruby:2.2](https://registry.hub.docker.com/u/library/ruby/) image and uses [postgres](https://registry.hub.docker.com/u/library/postgres/) database.
+With the command above, you create a runner that uses [ruby:2.2](https://hub.docker.com/r/_/ruby/) image and uses [postgres](https://hub.docker.com/r/_/postgres/) database.
 
 To access PostgreSQL database you need to connect to `host: postgres` as user `postgres` without password.

From 95221312599a88b2f7898a22b2fa5b47d3b61f8c Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sat, 7 May 2016 13:29:24 +0900
Subject: [PATCH 0197/1431] Update Docker Hub links.

---
 doc/ci/docker/using_docker_images.md | 6 +++---
 doc/ci/examples/php.md               | 6 +++---
 doc/ci/services/mysql.md             | 4 ++--
 doc/ci/services/postgres.md          | 2 +-
 doc/ci/services/redis.md             | 2 +-
 docker/README.md                     | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 84212fb3c61..ab7369ce972 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -273,7 +273,7 @@ creation.
 [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/
-[postgres-hub]: https://registry.hub.docker.com/u/library/postgres/
-[mysql-hub]: https://registry.hub.docker.com/u/library/mysql/
+[tutum/wordpress]: https://hub.docker.com/r/tutum/wordpress/
+[postgres-hub]: https://hub.docker.com/r/_/postgres/
+[mysql-hub]: https://hub.docker.com/r/_/mysql/
 [runner-priv-reg]: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/configuration/advanced-configuration.md#using-a-private-docker-registry
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md
index db077927126..26953014502 100644
--- a/doc/ci/examples/php.md
+++ b/doc/ci/examples/php.md
@@ -60,7 +60,7 @@ docker-php-ext-install pdo_mysql
 You might wonder what `docker-php-ext-install` is. In short, it is a script
 provided by the official php docker image that you can use to easilly install
 extensions. For more information read the the documentation at
-<https://hub.docker.com/_/php/>.
+<https://hub.docker.com/r/_/php/>.
 
 Now that we created the script that contains all prerequisites for our build
 environment, let's add it in `.gitlab-ci.yml`:
@@ -92,7 +92,7 @@ Finally, commit your files and push them to GitLab to see your build succeeding
 The final `.gitlab-ci.yml` should look similar to this:
 
 ```yaml
-# Select image from https://hub.docker.com/_/php/
+# Select image from https://hub.docker.com/r/_/php/
 image: php:5.6
 
 before_script:
@@ -278,7 +278,7 @@ that runs on [GitLab.com](https://gitlab.com) using our publicly available
 Want to hack on it? Simply fork it, commit and push  your changes. Within a few
 moments the changes will be picked by a public runner and the build will begin.
 
-[php-hub]: https://hub.docker.com/_/php/
+[php-hub]: https://hub.docker.com/r/_/php/
 [phpenv]: https://github.com/phpenv/phpenv
 [phpenv-installation]: https://github.com/phpenv/phpenv#installation
 [php-example-repo]: https://gitlab.com/gitlab-examples/php
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md
index c66d77122b2..aaf3aa77837 100644
--- a/doc/ci/services/mysql.md
+++ b/doc/ci/services/mysql.md
@@ -16,7 +16,7 @@ services:
   - mysql:latest
 
 variables:
-  # Configure mysql environment variables (https://hub.docker.com/_/mysql/)
+  # Configure mysql environment variables (https://hub.docker.com/r/_/mysql/)
   MYSQL_DATABASE: el_duderino
   MYSQL_ROOT_PASSWORD: mysql_strong_password
 ```
@@ -114,5 +114,5 @@ available [shared runners](../runners/README.md).
 Want to hack on it? Simply fork it, commit and push  your changes. Within a few
 moments the changes will be picked by a public runner and the build will begin.
 
-[hub-mysql]: https://hub.docker.com/_/mysql/
+[hub-mysql]: https://hub.docker.com/r/_/mysql/
 [mysql-example-repo]: https://gitlab.com/gitlab-examples/mysql
diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md
index 17d21dbda1c..f787cc0a124 100644
--- a/doc/ci/services/postgres.md
+++ b/doc/ci/services/postgres.md
@@ -110,5 +110,5 @@ available [shared runners](../runners/README.md).
 Want to hack on it? Simply fork it, commit and push  your changes. Within a few
 moments the changes will be picked by a public runner and the build will begin.
 
-[hub-pg]: https://hub.docker.com/_/postgres/
+[hub-pg]: https://hub.docker.com/r/_/postgres/
 [postgres-example-repo]: https://gitlab.com/gitlab-examples/postgres
diff --git a/doc/ci/services/redis.md b/doc/ci/services/redis.md
index b281e8f9f60..80705024d2f 100644
--- a/doc/ci/services/redis.md
+++ b/doc/ci/services/redis.md
@@ -65,5 +65,5 @@ that runs on [GitLab.com](https://gitlab.com) using our publicly available
 Want to hack on it? Simply fork it, commit and push  your changes. Within a few
 moments the changes will be picked by a public runner and the build will begin.
 
-[hub-redis]: https://hub.docker.com/_/redis/
+[hub-redis]: https://hub.docker.com/r/_/redis/
 [redis-example-repo]: https://gitlab.com/gitlab-examples/redis
diff --git a/docker/README.md b/docker/README.md
index 7514d610aec..ee1f32adc26 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
 # GitLab Docker images
 
-* The official GitLab Community Edition Docker image is [available on Docker Hub](https://registry.hub.docker.com/u/gitlab/gitlab-ce/).
-* The official GitLab Enterprise Edition Docker image is [available on Docker Hub](https://registry.hub.docker.com/u/gitlab/gitlab-ee/).
+* The official GitLab Community Edition Docker image is [available on Docker Hub](https://hub.docker.com/r/gitlab/gitlab-ce/).
+* The official GitLab Enterprise Edition Docker image is [available on Docker Hub](https://hub.docker.com/r/gitlab/gitlab-ee/).
 * The complete usage guide can be found in [Using GitLab Docker images](http://doc.gitlab.com/omnibus/docker/)
 * The Dockerfile used for building public images is in [Omnibus Repository](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master/docker)
-* Check the guide for [creating Omnibus-based Docker Image](http://doc.gitlab.com/omnibus/build/README.html#Build-Docker-image)
+* Check the guide for [creating Omnibus-based Docker Image](http://doc.gitlab.com/omnibus/build/README.html#build-docker-image)

From 3c8265559a6965411c5c155a15fae4f2a822a532 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sat, 7 May 2016 14:54:36 +0900
Subject: [PATCH 0198/1431] Rename Docker with Docker Engine.

---
 doc/ci/docker/using_docker_build.md  | 6 +++---
 doc/ci/docker/using_docker_images.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 5fb086b1dd9..ca52a483a59 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -41,9 +41,9 @@ GitLab Runner then executes build scripts as `gitlab-runner` user.
       --description "My Runner"
     ```
 
-2. Install Docker on server.
+2. Install Docker Engine on server.
 
-    For more information how to install Docker on different systems checkout the [Supported installations](https://docs.docker.com/installation/).
+    For more information how to install Docker Engine on different systems checkout the [Supported installations](https://docs.docker.com/engine/installation/).
 
 3. Add `gitlab-runner` user to `docker` group:
 
@@ -151,4 +151,4 @@ In order to do that follow the steps:
 An example project using this approach can be found here: https://gitlab.com/gitlab-examples/docker.
 
 [docker-in-docker]: https://blog.docker.com/2013/09/docker-can-now-run-within-docker/
-[docker-cap]: https://docs.docker.com/reference/run/#runtime-privilege-and-linux-capabilities
+[docker-cap]: https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index ab7369ce972..56ac2195c49 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -64,7 +64,7 @@ You can see some widely used services examples in the relevant documentation of
 ### How is service linked to the build
 
 To better understand how the container linking works, read
-[Linking containers together](https://docs.docker.com/userguide/dockerlinks/).
+[Linking containers together][linking-containers].
 
 To summarize, if you add `mysql` as service to your application, the image will
 then be used to create a container that is linked to the build container.

From 21d89d0286e385d6d0a4debdbf7c801939c3e279 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 24 Mar 2016 22:39:58 -0700
Subject: [PATCH 0199/1431] Update SVG sanitizer to conform to SVG 1.1

Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate
to handle case-sensitive SVG attributes. sanitize parses documents as HTML
instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased.

* SVG element list: https://www.w3.org/TR/SVG/eltindex.html
* SVG attribute list: https://www.w3.org/TR/SVG/attindex.html

Closes #14555
---
 CHANGELOG                              |   1 +
 app/helpers/blob_helper.rb             |   2 +-
 lib/gitlab/sanitizers/svg.rb           |  37 +++++++++
 lib/gitlab/sanitizers/svg/whitelist.rb | 107 +++++++++++++++++++++++++
 spec/fixtures/sanitized.svg            |  50 ++++++++++++
 spec/fixtures/unsanitized.svg          |  50 ++++++++++++
 spec/helpers/blob_helper_spec.rb       |  12 +++
 7 files changed, 258 insertions(+), 1 deletion(-)
 create mode 100644 lib/gitlab/sanitizers/svg.rb
 create mode 100644 lib/gitlab/sanitizers/svg/whitelist.rb
 create mode 100644 spec/fixtures/sanitized.svg
 create mode 100644 spec/fixtures/unsanitized.svg

diff --git a/CHANGELOG b/CHANGELOG
index 78d6c1ec2b2..55de2533245 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.8.0 (unreleased)
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
+  - Update SVG sanitizer to conform to SVG 1.1
   - Updated search UI
   - Display informative message when new milestone is created
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 474c6f27374..93241b3afb7 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -131,7 +131,7 @@ module BlobHelper
   # elements and attributes. Note that this whitelist is by no means complete
   # and may omit some elements.
   def sanitize_svg(blob)
-    blob.data = Loofah.scrub_fragment(blob.data, :strip).to_xml
+    blob.data = Gitlab::Sanitizers::SVG.clean(blob.data)
     blob
   end
 
diff --git a/lib/gitlab/sanitizers/svg.rb b/lib/gitlab/sanitizers/svg.rb
new file mode 100644
index 00000000000..b98589dff89
--- /dev/null
+++ b/lib/gitlab/sanitizers/svg.rb
@@ -0,0 +1,37 @@
+require_relative "svg/whitelist"
+
+module Gitlab
+  module Sanitizers
+    module SVG
+      def self.clean(data)
+        Loofah.xml_document(data).scrub!(Scrubber.new).to_s
+      end
+
+      class Scrubber < Loofah::Scrubber
+        # http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data-with-the-data-*-attributes
+        DATA_ATTR_PATTERN = /\Adata-(?!xml)[a-z_][\w.\u00E0-\u00F6\u00F8-\u017F\u01DD-\u02AF-]*\z/u
+
+        def scrub(node)
+          unless ALLOWED_ELEMENTS.include?(node.name)
+            node.unlink
+          else
+            node.attributes.each do |attr_name, attr|
+              valid_attributes = ALLOWED_ATTRIBUTES[node.name]
+
+              unless valid_attributes && valid_attributes.include?(attr_name)
+                if ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) &&
+                    attr_name.start_with?('data-')
+                  # Arbitrary data attributes are allowed. Verify that the attribute
+                  # is a valid data attribute.
+                  attr.unlink unless attr_name =~ DATA_ATTR_PATTERN
+                else
+                  attr.unlink
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/sanitizers/svg/whitelist.rb b/lib/gitlab/sanitizers/svg/whitelist.rb
new file mode 100644
index 00000000000..917e795b29e
--- /dev/null
+++ b/lib/gitlab/sanitizers/svg/whitelist.rb
@@ -0,0 +1,107 @@
+# Generated from:
+# SVG element list: https://www.w3.org/TR/SVG/eltindex.html
+# SVG Attribute list: https://www.w3.org/TR/SVG/attindex.html
+module Gitlab
+  module Sanitizers
+    module SVG
+      ALLOWED_ELEMENTS = %w[
+        a altGlyph altGlyphDef altGlyphItem animate
+        animateColor animateMotion animateTransform circle clipPath color-profile
+        cursor defs desc ellipse feBlend feColorMatrix feComponentTransfer
+        feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap
+        feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur
+        feImage feMerge feMergeNode feMorphology feOffset fePointLight
+        feSpecularLighting feSpotLight feTile feTurbulence filter font font-face
+        font-face-format font-face-name font-face-src font-face-uri foreignObject
+        g glyph glyphRef hkern image line linearGradient marker mask metadata
+        missing-glyph mpath path pattern polygon polyline radialGradient rect
+        script set stop style svg switch symbol text textPath title tref tspan use
+        view vkern].freeze
+
+      ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS = %w[svg].freeze
+
+      ALLOWED_ATTRIBUTES = {
+        'a' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage target text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'altGlyph' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight format glyph-orientation-horizontal glyph-orientation-vertical glyphRef id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'altGlyphDef' => %w[id xml:base xml:lang xml:space],
+        'altGlyphItem' => %w[id xml:base xml:lang xml:space],
+        'animate' => %w[accumulate additive alignment-baseline attributeName attributeType baseline-shift begin by calcMode clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dur enable-background end externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight from glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning keySplines keyTimes letter-spacing lighting-color marker-end marker-mid marker-start mask max min onbegin onend onload onrepeat opacity overflow pointer-events repeatCount repeatDur requiredExtensions requiredFeatures restart shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width systemLanguage text-anchor text-decoration text-rendering to unicode-bidi values visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'animateColor' => %w[accumulate additive alignment-baseline attributeName attributeType baseline-shift begin by calcMode clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dur enable-background end externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight from glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning keySplines keyTimes letter-spacing lighting-color marker-end marker-mid marker-start mask max min onbegin onend onload onrepeat opacity overflow pointer-events repeatCount repeatDur requiredExtensions requiredFeatures restart shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width systemLanguage text-anchor text-decoration text-rendering to unicode-bidi values visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'animateMotion' => %w[accumulate additive begin by calcMode dur end externalResourcesRequired fill from id keyPoints keySplines keyTimes max min onbegin onend onload onrepeat origin path repeatCount repeatDur requiredExtensions requiredFeatures restart rotate systemLanguage to values xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'animateTransform' => %w[accumulate additive attributeName attributeType begin by calcMode dur end externalResourcesRequired fill from id keySplines keyTimes max min onbegin onend onload onrepeat repeatCount repeatDur requiredExtensions requiredFeatures restart systemLanguage to type values xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'circle' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events r requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'clipPath' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule clipPathUnits color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'color-profile' => %w[id local name rendering-intent xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'cursor' => %w[externalResourcesRequired id requiredExtensions requiredFeatures systemLanguage x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'defs' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'desc' => %w[class id style xml:base xml:lang xml:space],
+        'ellipse' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rx ry shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'feBlend' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask mode opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feColorMatrix' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering type unicode-bidi values visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feComponentTransfer' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feComposite' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 k1 k2 k3 k4 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity operator overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feConvolveMatrix' => %w[alignment-baseline baseline-shift bias class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display divisor dominant-baseline edgeMode enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelMatrix kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity order overflow pointer-events preserveAlpha result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style targetX targetY text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feDiffuseLighting' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor diffuseConstant direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style surfaceScale text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feDisplacementMap' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result scale shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xChannelSelector xml:base xml:lang xml:space y yChannelSelector],
+        'feDistantLight' => %w[azimuth elevation id xml:base xml:lang xml:space],
+        'feFlood' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feFuncA' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+        'feFuncB' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+        'feFuncG' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+        'feFuncR' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+        'feGaussianBlur' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stdDeviation stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feImage' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events preserveAspectRatio result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'feMerge' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feMergeNode' => %w[id xml:base xml:lang xml:space],
+        'feMorphology' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity operator overflow pointer-events radius result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feOffset' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'fePointLight' => %w[id x xml:base xml:lang xml:space y z],
+        'feSpecularLighting' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering specularConstant specularExponent stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style surfaceScale text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feSpotLight' => %w[id limitingConeAngle pointsAtX pointsAtY pointsAtZ specularExponent x xml:base xml:lang xml:space y z],
+        'feTile' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'feTurbulence' => %w[alignment-baseline baseFrequency baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask numOctaves opacity overflow pointer-events result seed shape-rendering stitchTiles stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering type unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'filter' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter filterRes filterUnits flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events primitiveUnits shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'font' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x horiz-origin-y id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'font-face' => %w[accent-height alphabetic ascent bbox cap-height descent font-family font-size font-stretch font-style font-variant font-weight hanging id ideographic mathematical overline-position overline-thickness panose-1 slope stemh stemv strikethrough-position strikethrough-thickness underline-position underline-thickness unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical widths x-height xml:base xml:lang xml:space],
+        'font-face-format' => %w[id string xml:base xml:lang xml:space],
+        'font-face-name' => %w[id name xml:base xml:lang xml:space],
+        'font-face-src' => %w[id xml:base xml:lang xml:space],
+        'font-face-uri' => %w[id xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'foreignObject' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'g' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'glyph' => %w[alignment-baseline arabic-form baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x id image-rendering kerning lang letter-spacing lighting-color marker-end marker-mid marker-start mask opacity orientation overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'glyphRef' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight format glyph-orientation-horizontal glyph-orientation-vertical glyphRef id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'hkern' => %w[g1 g2 id k u1 u2 xml:base xml:lang xml:space],
+        'image' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'line' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode x1 x2 xml:base xml:lang xml:space y1 y2],
+        'linearGradient' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical gradientTransform gradientUnits id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering spreadMethod stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x1 x2 xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space y1 y2],
+        'marker' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start markerHeight markerUnits markerWidth mask opacity orient overflow pointer-events preserveAspectRatio refX refY shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi viewBox visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'mask' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask maskContentUnits maskUnits opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'metadata' => %w[id xml:base xml:lang xml:space],
+        'missing-glyph' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'mpath' => %w[externalResourcesRequired id xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'path' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pathLength pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'pattern' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow patternContentUnits patternTransform patternUnits pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi viewBox visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'polygon' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events points requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'polyline' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events points requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'radialGradient' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight fx fy glyph-orientation-horizontal glyph-orientation-vertical gradientTransform gradientUnits id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events r shape-rendering spreadMethod stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space],
+        'rect' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rx ry shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'script' => %w[externalResourcesRequired id type xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'set' => %w[attributeName attributeType begin dur end externalResourcesRequired fill id max min onbegin onend onload onrepeat repeatCount repeatDur requiredExtensions requiredFeatures restart systemLanguage to xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+        'stop' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask offset opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'style' => %w[id media title type xml:base xml:lang xml:space],
+        'svg' => %w[alignment-baseline baseProfile baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering contentScriptType contentStyleType cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onabort onactivate onclick onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onresize onscroll onunload onzoom opacity overflow pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi version viewBox visibility width word-spacing writing-mode x xml:base xml:lang xml:space xmlns y zoomAndPan],
+        'switch' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'symbol' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events preserveAspectRatio shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi viewBox visibility word-spacing writing-mode xml:base xml:lang xml:space],
+        'text' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength transform unicode-bidi visibility word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'textPath' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask method onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering spacing startOffset stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space],
+        'title' => %w[class id style xml:base xml:lang xml:space],
+        'tref' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode x xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space y],
+        'tspan' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode x xml:base xml:lang xml:space y],
+        'use' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+        'view' => %w[externalResourcesRequired id preserveAspectRatio viewBox viewTarget xml:base xml:lang xml:space zoomAndPan],
+        'vkern' => %w[g1 g2 id k u1 u2 xml:base xml:lang xml:space]
+      }.freeze
+    end
+  end
+end
diff --git a/spec/fixtures/sanitized.svg b/spec/fixtures/sanitized.svg
new file mode 100644
index 00000000000..8f84b8f5e20
--- /dev/null
+++ b/spec/fixtures/sanitized.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 622 682">
+  
+  <defs>
+    <style>.cls-1{fill:#30353e;}.cls-2{fill:#8c929d;}.cls-3{fill:#fc6d26;}.cls-4{fill:#e24329;}.cls-5{fill:#fca326;}</style>
+  </defs>
+  <title>stacked_wm</title>
+  <path id="bg" class="cls-1" d="M622,681H0V-1H622V681h0Z"/>
+  <g id="g12">
+    <path id="path14" class="cls-2" d="M316.89,497.72h-19l0.06,141.74H375V621.93h-58l-0.06-124.22h0Z"/>
+  </g>
+  <g id="g24">
+    <path id="path26" class="cls-2" d="M448.32,614.57a32.46,32.46,0,0,1-23.59,10c-14.5,0-20.35-7.14-20.35-16.45,0-14.07,9.74-20.77,30.52-20.77a86.46,86.46,0,0,1,13.42,1.08v26.19h0Zm-19.7-85.91a63.45,63.45,0,0,0-40.5,14.53l6.73,11.66c7.79-4.54,17.32-9.09,31-9.09,15.58,0,22.51,8,22.51,21.42v6.93a81.48,81.48,0,0,0-13.2-1.08c-33.33,0-50.22,11.69-50.22,36.14,0,21.86,13.42,32.89,33.76,32.89,13.71,0,26.84-6.28,31.38-16.45l3.46,13.85h13.42V567c0-22.94-10-38.3-38.31-38.3h0Z"/>
+  </g>
+  <g id="g28">
+    <path id="path30" class="cls-2" d="M528.4,625.18c-7.14,0-13.42-.87-18.18-3V556.58c6.49-5.41,14.5-9.31,24.68-9.31,18.4,0,25.54,13,25.54,34,0,29.86-11.47,43.93-32,43.93m8-96.52a34.88,34.88,0,0,0-26.19,11.58V522l-0.06-24.24H491.54L491.6,636c9.31,3.9,22.08,6.06,35.93,6.06,35.5,0,52.6-22.72,52.6-61.89,0-30.95-15.8-51.51-43.73-51.51"/>
+  </g>
+  <g id="g32">
+    <path id="path34" class="cls-2" d="M109.84,513.08c16.88,0,27.7,5.63,34.85,11.25l8.19-14.18c-11.16-9.78-26.16-15-42.17-15-40.47,0-68.83,24.67-68.83,74.44,0,52.15,30.59,72.5,65.58,72.5a111,111,0,0,0,42.21-8.22l-0.4-55.72V560.58H97.32v17.53h33.12l0.4,42.31c-4.33,2.16-11.9,3.9-22.08,3.9-28.14,0-47-17.7-47-55,0-37.87,19.48-56.26,48.05-56.26"/>
+  </g>
+  <g id="g36">
+    <path id="path38" class="cls-2" d="M243.79,497.72H225.17l0.06,23.8v82.23c0,22.94,10,38.3,38.31,38.3A64.16,64.16,0,0,0,275,641V624.31a57,57,0,0,1-8.66.65c-15.58,0-22.51-8-22.51-21.42v-56.7H275V531.26H243.85l-0.06-33.54h0Z"/>
+  </g>
+  <path id="path40" class="cls-2" d="M177.94,639.46h18.61V531.26H177.94v108.2h0Z"/>
+  <path id="path42" class="cls-2" d="M177.94,516.33h18.61V497.72H177.94v18.61h0Z"/>
+  <g id="g44">
+    <path id="path46" class="cls-3" d="M525.05,266.23l-24-74L453.36,45.6a8.19,8.19,0,0,0-15.58,0L390.12,192.24H231.88L184.22,45.6a8.19,8.19,0,0,0-15.58,0L121,192.24l-24,74a16.38,16.38,0,0,0,6,18.31L311,435.71,519.1,284.54a16.38,16.38,0,0,0,6-18.31"/>
+  </g>
+  <g id="g48">
+    <path id="path50" class="cls-4" d="M311,435.71h0l79.12-243.47H231.88L311,435.71h0Z"/>
+  </g>
+  <g id="g56">
+    <path id="path58" class="cls-3" d="M311,435.71L231.88,192.24H121L311,435.71h0Z"/>
+  </g>
+  <g id="g64">
+    <path id="path66" class="cls-5" d="M121,192.24h0l-24,74a16.37,16.37,0,0,0,6,18.31L311,435.7,121,192.24h0Z"/>
+  </g>
+  <g id="g72">
+    <path id="path74" class="cls-4" d="M121,192.24H231.88L184.22,45.6a8.19,8.19,0,0,0-15.58,0L121,192.24h0Z"/>
+  </g>
+  <g id="g76">
+    <path id="path78" class="cls-3" d="M311,435.71l79.12-243.47H501L311,435.71h0Z"/>
+  </g>
+  <g id="g80">
+    <path id="path82" class="cls-5" d="M501,192.24h0l24,74a16.37,16.37,0,0,1-6,18.31L311,435.7,501,192.24h0Z"/>
+  </g>
+  <g id="g84">
+    <path id="path86" class="cls-4" d="M501,192.24H390.12L437.78,45.6a8.19,8.19,0,0,1,15.58,0L501,192.24h0Z"/>
+  </g>
+</svg>
diff --git a/spec/fixtures/unsanitized.svg b/spec/fixtures/unsanitized.svg
new file mode 100644
index 00000000000..3957557334b
--- /dev/null
+++ b/spec/fixtures/unsanitized.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 622 682" filterMe="test">
+  <iframe src="http://www.google.com"></iframe>
+  <defs>
+    <style>.cls-1{fill:#30353e;}.cls-2{fill:#8c929d;}.cls-3{fill:#fc6d26;}.cls-4{fill:#e24329;}.cls-5{fill:#fca326;}</style>
+  </defs>
+  <title>stacked_wm</title>
+  <path id="bg" class="cls-1" d="M622,681H0V-1H622V681h0Z"/>
+  <g id="g12">
+    <path id="path14" class="cls-2" d="M316.89,497.72h-19l0.06,141.74H375V621.93h-58l-0.06-124.22h0Z"/>
+  </g>
+  <g id="g24">
+    <path id="path26" class="cls-2" d="M448.32,614.57a32.46,32.46,0,0,1-23.59,10c-14.5,0-20.35-7.14-20.35-16.45,0-14.07,9.74-20.77,30.52-20.77a86.46,86.46,0,0,1,13.42,1.08v26.19h0Zm-19.7-85.91a63.45,63.45,0,0,0-40.5,14.53l6.73,11.66c7.79-4.54,17.32-9.09,31-9.09,15.58,0,22.51,8,22.51,21.42v6.93a81.48,81.48,0,0,0-13.2-1.08c-33.33,0-50.22,11.69-50.22,36.14,0,21.86,13.42,32.89,33.76,32.89,13.71,0,26.84-6.28,31.38-16.45l3.46,13.85h13.42V567c0-22.94-10-38.3-38.31-38.3h0Z"/>
+  </g>
+  <g id="g28">
+    <path id="path30" class="cls-2" d="M528.4,625.18c-7.14,0-13.42-.87-18.18-3V556.58c6.49-5.41,14.5-9.31,24.68-9.31,18.4,0,25.54,13,25.54,34,0,29.86-11.47,43.93-32,43.93m8-96.52a34.88,34.88,0,0,0-26.19,11.58V522l-0.06-24.24H491.54L491.6,636c9.31,3.9,22.08,6.06,35.93,6.06,35.5,0,52.6-22.72,52.6-61.89,0-30.95-15.8-51.51-43.73-51.51"/>
+  </g>
+  <g id="g32">
+    <path id="path34" class="cls-2" d="M109.84,513.08c16.88,0,27.7,5.63,34.85,11.25l8.19-14.18c-11.16-9.78-26.16-15-42.17-15-40.47,0-68.83,24.67-68.83,74.44,0,52.15,30.59,72.5,65.58,72.5a111,111,0,0,0,42.21-8.22l-0.4-55.72V560.58H97.32v17.53h33.12l0.4,42.31c-4.33,2.16-11.9,3.9-22.08,3.9-28.14,0-47-17.7-47-55,0-37.87,19.48-56.26,48.05-56.26"/>
+  </g>
+  <g id="g36">
+    <path id="path38" class="cls-2" d="M243.79,497.72H225.17l0.06,23.8v82.23c0,22.94,10,38.3,38.31,38.3A64.16,64.16,0,0,0,275,641V624.31a57,57,0,0,1-8.66.65c-15.58,0-22.51-8-22.51-21.42v-56.7H275V531.26H243.85l-0.06-33.54h0Z"/>
+  </g>
+  <path id="path40" class="cls-2" d="M177.94,639.46h18.61V531.26H177.94v108.2h0Z"/>
+  <path id="path42" class="cls-2" d="M177.94,516.33h18.61V497.72H177.94v18.61h0Z"/>
+  <g id="g44">
+    <path id="path46" class="cls-3" d="M525.05,266.23l-24-74L453.36,45.6a8.19,8.19,0,0,0-15.58,0L390.12,192.24H231.88L184.22,45.6a8.19,8.19,0,0,0-15.58,0L121,192.24l-24,74a16.38,16.38,0,0,0,6,18.31L311,435.71,519.1,284.54a16.38,16.38,0,0,0,6-18.31"/>
+  </g>
+  <g id="g48">
+    <path id="path50" class="cls-4" d="M311,435.71h0l79.12-243.47H231.88L311,435.71h0Z"/>
+  </g>
+  <g id="g56">
+    <path id="path58" class="cls-3" d="M311,435.71L231.88,192.24H121L311,435.71h0Z"/>
+  </g>
+  <g id="g64">
+    <path id="path66" class="cls-5" d="M121,192.24h0l-24,74a16.37,16.37,0,0,0,6,18.31L311,435.7,121,192.24h0Z"/>
+  </g>
+  <g id="g72">
+    <path id="path74" class="cls-4" d="M121,192.24H231.88L184.22,45.6a8.19,8.19,0,0,0-15.58,0L121,192.24h0Z"/>
+  </g>
+  <g id="g76">
+    <path id="path78" class="cls-3" d="M311,435.71l79.12-243.47H501L311,435.71h0Z"/>
+  </g>
+  <g id="g80">
+    <path id="path82" class="cls-5" d="M501,192.24h0l24,74a16.37,16.37,0,0,1-6,18.31L311,435.7,501,192.24h0Z"/>
+  </g>
+  <g id="g84">
+    <path id="path86" class="cls-4" d="M501,192.24H390.12L437.78,45.6a8.19,8.19,0,0,1,15.58,0L501,192.24h0Z"/>
+  </g>
+</svg>
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 87849230dbe..6d1c02db297 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -67,4 +67,16 @@ describe BlobHelper do
       expect(result).to eq(expected)
     end
   end
+
+  describe "#sanitize_svg" do
+    let(:input_svg_path) { File.join(Rails.root, 'spec', 'fixtures', 'unsanitized.svg') }
+    let(:data) { open(input_svg_path).read }
+    let(:expected_svg_path) { File.join(Rails.root, 'spec', 'fixtures', 'sanitized.svg') }
+    let(:expected) { open(expected_svg_path).read }
+
+    it 'should retain essential elements' do
+      blob = OpenStruct.new(data: data)
+      expect(sanitize_svg(blob).data).to eq(expected)
+    end
+  end
 end

From a65de9c2c1b8ea2d7dca3132ff0d72775f04bb78 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 1 May 2016 00:38:53 -0700
Subject: [PATCH 0200/1431] Reduce delay in destroying a project from 1-minute
 to immediately

Run ProjectDestroyWorker after pending_delete attribute has been committed to DB
---
 CHANGELOG                                | 1 +
 app/models/project.rb                    | 7 +++++++
 app/services/projects/destroy_service.rb | 4 +---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 78d6c1ec2b2..e9b3e7b097d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.8.0 (unreleased)
   - Log to application.log when an admin starts and stops impersonating a user
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
+  - Reduce delay in destroying a project from 1-minute to immediately
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
   - Sanitize repo paths in new project error message
diff --git a/app/models/project.rb b/app/models/project.rb
index 9403acf7759..dfd1e54ecf7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1039,4 +1039,11 @@ class Project < ActiveRecord::Base
   def wiki
     @wiki ||= ProjectWiki.new(self, self.owner)
   end
+
+  def schedule_delete!(user_id, params)
+    # Queue this task for after the commit, so once we mark pending_delete it will run
+    run_after_commit { ProjectDestroyWorker.perform_async(id, user_id, params) }
+
+    update_attribute(:pending_delete, true)
+  end
 end
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index df5054f08d7..19aab999e00 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -7,9 +7,7 @@ module Projects
     DELETED_FLAG = '+deleted'
 
     def pending_delete!
-      project.update_attribute(:pending_delete, true)
-
-      ProjectDestroyWorker.perform_in(1.minute, project.id, current_user.id, params)
+      project.schedule_delete!(current_user.id, params)
     end
 
     def execute

From adf9a51899b02f7adc678dca7909201500f05026 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 7 May 2016 08:41:10 -0700
Subject: [PATCH 0201/1431] Escape HTML in commit titles in system note
 messages

Closes #17348
---
 CHANGELOG                                 | 1 +
 app/services/system_note_service.rb       | 6 +++++-
 spec/services/system_note_service_spec.rb | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 78d6c1ec2b2..ebc27c21575 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
+  - Escape HTML in commit titles in system note messages
   - Log to application.log when an admin starts and stops impersonating a user
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 82a0e2fd1f5..4bdb1b0c074 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -351,7 +351,7 @@ class SystemNoteService
   # Returns an Array of Strings
   def self.new_commit_summary(new_commits)
     new_commits.collect do |commit|
-      "* #{commit.short_id} - #{commit.title}"
+      "* #{commit.short_id} - #{escape_html(commit.title)}"
     end
   end
 
@@ -433,4 +433,8 @@ class SystemNoteService
     body = "Moved #{direction} #{cross_reference}"
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
+
+  def self.escape_html(text)
+    Rack::Utils.escape_html(text)
+  end
 end
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 240eae10052..5fbf2ae5247 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -506,6 +506,15 @@ describe SystemNoteService, services: true do
     end
   end
 
+  describe '.new_commit_summary' do
+    it 'escapes HTML titles' do
+      commit = double(title: '<pre>This is a test</pre>', short_id: '12345678')
+      escaped = '* 12345678 - &lt;pre&gt;This is a test&lt;&#x2F;pre&gt;'
+
+      expect(described_class.new_commit_summary([commit])).to eq([escaped])
+    end
+  end
+
   include JiraServiceHelper
 
   describe 'JIRA integration' do

From ffda8a1a0eb273e62fcb0197f352400946571778 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sun, 8 May 2016 15:27:33 +0700
Subject: [PATCH 0202/1431] user routings refactor

---
 app/controllers/snippets_controller.rb        | 22 ++++++++++-
 .../search/results/_snippet_blob.html.haml    |  2 +-
 .../search/results/_snippet_title.html.haml   |  2 +-
 app/views/shared/snippets/_snippet.html.haml  |  2 +-
 app/views/snippets/index.html.haml            | 13 +++++++
 app/views/users/calendar.html.haml            |  2 +-
 app/views/users/show.html.haml                | 12 +++---
 config/routes.rb                              | 37 +++++++++----------
 spec/routing/routing_spec.rb                  |  4 ++
 9 files changed, 64 insertions(+), 32 deletions(-)
 create mode 100644 app/views/snippets/index.html.haml

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 2c038bdfda5..2a17c1f34db 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -10,11 +10,29 @@ class SnippetsController < ApplicationController
   # Allow destroy snippet
   before_action :authorize_admin_snippet!, only: [:destroy]
 
-  skip_before_action :authenticate_user!, only: [:show, :raw]
+  skip_before_action :authenticate_user!, only: [:index, :show, :raw]
 
   layout 'snippets'
   respond_to :html
 
+  def index
+    if params[:username].present?
+      @user = User.find_by(username: params[:username])
+
+      render_404 and return unless @user
+
+      @snippets = SnippetsFinder.new.execute(current_user, {
+        filter: :by_user,
+        user: @user,
+        scope: params[:scope] }).
+      page(params[:page])
+
+      render 'index'
+    else
+      redirect_to(current_user ? dashboard_snippets_path : explore_snippets_path)
+    end
+  end
+
   def new
     @snippet = PersonalSnippet.new
   end
@@ -43,7 +61,7 @@ class SnippetsController < ApplicationController
 
     @snippet.destroy
 
-    redirect_to dashboard_snippets_path
+    redirect_to snippets_path
   end
 
   def raw
diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml
index c9b7bd154af..6b7e06f2b21 100644
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
@@ -6,7 +6,7 @@
   %span
     = snippet.title
     by
-    = link_to user_snippets_path(snippet.author) do
+    = link_to snippets_user_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)}
diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml
index c414acb6a11..8c884926db5 100644
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@@ -17,7 +17,7 @@
     = "##{snippet_title.id}"
     %span
       by
-      = link_to user_snippets_path(snippet_title.author) do
+      = link_to snippets_user_path(snippet_title.author) do
         = image_tag avatar_icon(snippet_title.author_email), class: "avatar avatar-inline s16", alt: ''
         = snippet_title.author_name
       %span.light #{time_ago_with_tooltip(snippet_title.created_at)}
diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml
index c96dfefe17f..e6a7a7777b0 100644
--- a/app/views/shared/snippets/_snippet.html.haml
+++ b/app/views/shared/snippets/_snippet.html.haml
@@ -16,6 +16,6 @@
       = link_to snippet.project.name_with_namespace, namespace_project_path(snippet.project.namespace, snippet.project)
 
   .snippet-info
-    = link_to user_snippets_path(snippet.author) do
+    = link_to snippets_user_path(snippet.author) do
       = snippet.author_name
     authored #{time_ago_with_tooltip(snippet.created_at)}
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
new file mode 100644
index 00000000000..8aa3d490fa3
--- /dev/null
+++ b/app/views/snippets/index.html.haml
@@ -0,0 +1,13 @@
+ - page_title "By #{@user.name}", "Snippets"
+
+ %ol.breadcrumb
+   %li
+     = link_to snippets_path do
+       Snippets
+   %li
+     = @user.name
+   .pull-right.hidden-xs
+     = link_to user_path(@user) do
+       #{@user.name} profile page
+
+ = render 'snippets'
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 1de71f37d1a..6ff4eb79b05 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -4,7 +4,7 @@
       #{@timestamps.to_json},
       #{@starting_year},
       #{@starting_month},
-      '#{user_calendar_activities_path}'
+      '#{calendar_activities_user_path}'
     );
 
 .calendar-hint Summary of issues, merge requests, and push events
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 2ccdf843a6c..e894a8e9395 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -70,19 +70,19 @@
 
     %ul.nav-links.center.user-profile-nav
       %li.js-activity-tab
-        = link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do
+        = link_to calendar_activities_user_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do
           Activity
       %li.js-groups-tab
-        = link_to user_groups_path, data: {target: 'div#groups', action: 'groups', toggle: 'tab'} do
+        = link_to groups_user_path, data: {target: 'div#groups', action: 'groups', toggle: 'tab'} do
           Groups
       %li.js-contributed-tab
-        = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
+        = link_to contributed_projects_user_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
           Contributed projects
       %li.projects-tab
-        = link_to user_projects_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
+        = link_to projects_user_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
           Personal projects
       %li.snippets-tab
-        = link_to user_snippets_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
+        = link_to snippets_user_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
           Snippets
 
   %div{ class: container_class }
@@ -90,7 +90,7 @@
       #activity.tab-pane
         .gray-content-block.calender-block.white.second-block.hidden-xs
           %div{ class: container_class }
-            .user-calendar{data: {href: user_calendar_path}}
+            .user-calendar{data: {href: calendar_user_path}}
               %h4.center.light
                 %i.fa.fa-spinner.fa-spin
           .user-calendar-activities
diff --git a/config/routes.rb b/config/routes.rb
index 2bfaa2c2af6..533c3b98e8e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -91,6 +91,9 @@ Rails.application.routes.draw do
     end
   end
 
+  get '/s/:username', to: redirect('/u/:username/snippets'),
+                      constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
+
   #
   # Invites
   #
@@ -340,26 +343,20 @@ Rails.application.routes.draw do
     end
   end
 
-  get 'u/:username/calendar' => 'users#calendar', as: :user_calendar,
-      constraints: { username: /.*/ }
-
-  get 'u/:username/calendar_activities' => 'users#calendar_activities', as: :user_calendar_activities,
-      constraints: { username: /.*/ }
-
-  get 'u/:username/groups' => 'users#groups', as: :user_groups,
-      constraints: { username: /.*/ }
-
-  get 'u/:username/projects' => 'users#projects', as: :user_projects,
-      constraints: { username: /.*/ }
-
-  get 'u/:username/contributed' => 'users#contributed', as: :user_contributed_projects,
-      constraints: { username: /.*/ }
-
-  get 'u/:username/snippets' => 'users#snippets', as: :user_snippets,
-      constraints: { username: /.*/ }
-
-  get '/u/:username' => 'users#show', as: :user,
-      constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
+  resources(:users,
+            path: 'u',
+            param: :username,
+            constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
+            only: :show) do
+    member do
+      get :calendar, as: :calendar
+      get :calendar_activities, as: :calendar_activities
+      get :groups, as: :groups
+      get :projects, as: :projects
+      get :contributed, as: :contributed_projects
+      get :snippets, as: :snippets
+    end
+  end
 
   #
   # Dashboard Area
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 9deffd0a1e3..543088fa088 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -31,6 +31,10 @@ describe SnippetsController, "routing" do
     expect(get("/snippets/1/raw")).to route_to('snippets#raw', id: '1')
   end
 
+  it "to #index" do
+    expect(get("/snippets")).to route_to('snippets#index')
+  end
+
   it "to #create" do
     expect(post("/snippets")).to route_to('snippets#create')
   end

From ff21f999ae705afee920ca6871f8fb151130f185 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sun, 8 May 2016 15:29:51 +0700
Subject: [PATCH 0203/1431] Fix routing error

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

diff --git a/config/routes.rb b/config/routes.rb
index 533c3b98e8e..299b0dd1acf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -91,7 +91,7 @@ Rails.application.routes.draw do
     end
   end
 
-  get '/s/:username', to: redirect('/u/:username/snippets'),
+  get '/s/:username', to: redirect('/u/%{username}/snippets'),
                       constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
 
   #

From e129df53e1760b678b8c478787bf69253f8a1eaf Mon Sep 17 00:00:00 2001
From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Sun, 8 May 2016 09:38:24 +0100
Subject: [PATCH 0204/1431] Update build triggers API documentation (#10153)

Update build triggers API documentation
[ci skip]

* Ensure updated/deleted timestamps are consistent
---
 doc/api/build_triggers.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/api/build_triggers.md b/doc/api/build_triggers.md
index 4a12e962b62..0881a7d7a90 100644
--- a/doc/api/build_triggers.md
+++ b/doc/api/build_triggers.md
@@ -101,8 +101,18 @@ DELETE /projects/:id/triggers/:token
 | Attribute | Type    | required | Description              |
 |-----------|---------|----------|--------------------------|
 | `id`      | integer | yes      | The ID of a project      |
-| `token`   | string  | yes      | The `token` of a project |
+| `token`   | string  | yes      | The `token` of a trigger |
 
 ```
 curl -X DELETE -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/triggers/7b9148c158980bbd9bcea92c17522d"
 ```
+
+```json
+{
+    "created_at": "2015-12-23T16:25:56.760Z",
+    "deleted_at": "2015-12-24T12:32:20.100Z",
+    "last_used": null,
+    "token": "7b9148c158980bbd9bcea92c17522d",
+    "updated_at": "2015-12-24T12:32:20.100Z"
+}
+```

From 29089352e388882a799daff7623fc7213f60e1c9 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sun, 8 May 2016 20:48:07 +0700
Subject: [PATCH 0205/1431] Routing refactoring

---
 .../search/results/_snippet_blob.html.haml    |  2 +-
 .../search/results/_snippet_title.html.haml   |  2 +-
 app/views/shared/snippets/_snippet.html.haml  |  2 +-
 app/views/users/calendar.html.haml            |  2 +-
 app/views/users/show.html.haml                | 12 +++++-----
 config/routes.rb                              | 23 ++++++++-----------
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml
index 6b7e06f2b21..c9b7bd154af 100644
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
@@ -6,7 +6,7 @@
   %span
     = snippet.title
     by
-    = link_to snippets_user_path(snippet.author) do
+    = 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)}
diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml
index 8c884926db5..c414acb6a11 100644
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@@ -17,7 +17,7 @@
     = "##{snippet_title.id}"
     %span
       by
-      = link_to snippets_user_path(snippet_title.author) do
+      = link_to user_snippets_path(snippet_title.author) do
         = image_tag avatar_icon(snippet_title.author_email), class: "avatar avatar-inline s16", alt: ''
         = snippet_title.author_name
       %span.light #{time_ago_with_tooltip(snippet_title.created_at)}
diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml
index e6a7a7777b0..c96dfefe17f 100644
--- a/app/views/shared/snippets/_snippet.html.haml
+++ b/app/views/shared/snippets/_snippet.html.haml
@@ -16,6 +16,6 @@
       = link_to snippet.project.name_with_namespace, namespace_project_path(snippet.project.namespace, snippet.project)
 
   .snippet-info
-    = link_to snippets_user_path(snippet.author) do
+    = link_to user_snippets_path(snippet.author) do
       = snippet.author_name
     authored #{time_ago_with_tooltip(snippet.created_at)}
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 6ff4eb79b05..1de71f37d1a 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -4,7 +4,7 @@
       #{@timestamps.to_json},
       #{@starting_year},
       #{@starting_month},
-      '#{calendar_activities_user_path}'
+      '#{user_calendar_activities_path}'
     );
 
 .calendar-hint Summary of issues, merge requests, and push events
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index d5f482f7168..9017fd54fcc 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -70,19 +70,19 @@
 
     %ul.nav-links.center.user-profile-nav
       %li.js-activity-tab
-        = link_to calendar_activities_user_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do
+        = link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do
           Activity
       %li.js-groups-tab
-        = link_to groups_user_path, data: {target: 'div#groups', action: 'groups', toggle: 'tab'} do
+        = link_to user_groups_path, data: {target: 'div#groups', action: 'groups', toggle: 'tab'} do
           Groups
       %li.js-contributed-tab
-        = link_to contributed_projects_user_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
+        = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
           Contributed projects
       %li.projects-tab
-        = link_to projects_user_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
+        = link_to user_projects_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
           Personal projects
       %li.snippets-tab
-        = link_to snippets_user_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
+        = link_to user_snippets_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
           Snippets
 
   %div{ class: container_class }
@@ -90,7 +90,7 @@
       #activity.tab-pane
         .row-content-block.calender-block.white.second-block.hidden-xs
           %div{ class: container_class }
-            .user-calendar{data: {href: calendar_user_path}}
+            .user-calendar{data: {href: user_calendar_path}}
               %h4.center.light
                 %i.fa.fa-spinner.fa-spin
           .user-calendar-activities
diff --git a/config/routes.rb b/config/routes.rb
index 299b0dd1acf..594bab204fd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -343,19 +343,16 @@ Rails.application.routes.draw do
     end
   end
 
-  resources(:users,
-            path: 'u',
-            param: :username,
-            constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
-            only: :show) do
-    member do
-      get :calendar, as: :calendar
-      get :calendar_activities, as: :calendar_activities
-      get :groups, as: :groups
-      get :projects, as: :projects
-      get :contributed, as: :contributed_projects
-      get :snippets, as: :snippets
-    end
+  scope(path: 'u/:username',
+        constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
+        controller: :users) do
+    get :calendar, action: :calendar, as: :user_calendar
+    get :calendar_activities, action: :calendar_activities, as: :user_calendar_activities
+    get :groups, action: :groups, as: :user_groups
+    get :projects, action: :projects, as: :user_projects
+    get :contributed, action: :contributed, as: :user_contributed_projects
+    get :snippets, action: :snippets, as: :user_snippets
+    get '/', action: :show, as: :user
   end
 
   #

From 6781c1b4ba8bb1a7da0a4bf637d7a311abf281f0 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sun, 8 May 2016 22:06:19 +0700
Subject: [PATCH 0206/1431] Add specs for user routing and update spec for user
 controller

---
 spec/controllers/users_controller_spec.rb | 22 ++++++++++++++
 spec/routing/routing_spec.rb              | 37 +++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 8045c8b940d..c61ec174665 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -112,4 +112,26 @@ describe UsersController do
       expect(response).to render_template('calendar_activities')
     end
   end
+
+  describe 'GET #snippets' do
+    before do
+      sign_in(user)
+    end
+
+    context 'format html' do
+      it 'renders snippets page' do
+        get :snippets, username: user.username
+        expect(response.status).to eq(200)
+        expect(response).to render_template('show')
+      end
+    end
+
+    context 'format json' do
+      it 'response with snippets json data' do
+        get :snippets, username: user.username, format: :json
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)).to have_key('html')
+      end
+    end
+  end
 end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 543088fa088..8530a2f31d5 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -1,5 +1,42 @@
 require 'spec_helper'
 
+# user                       GET    /u/:username/
+# user_groups                GET    /u/:username/groups(.:format)
+# user_projects              GET    /u/:username/projects(.:format)
+# user_contributed_projects  GET    /u/:username/contributed(.:format)
+# user_snippets              GET    /u/:username/snippets(.:format)
+# user_calendar              GET    /u/:username/calendar(.:format)
+# user_calendar_activities   GET    /u/:username/calendar_activities(.:format)
+describe UsersController, "routing" do
+  it "to #show" do
+    expect(get("/u/User")).to route_to('users#show', username: 'User')
+  end
+
+  it "to #groups" do
+    expect(get("/u/User/groups")).to route_to('users#groups', username: 'User')
+  end
+
+  it "to #projects" do
+    expect(get("/u/User/projects")).to route_to('users#projects', username: 'User')
+  end
+
+  it "to #contributed" do
+    expect(get("/u/User/contributed")).to route_to('users#contributed', username: 'User')
+  end
+
+  it "to #snippets" do
+    expect(get("/u/User/snippets")).to route_to('users#snippets', username: 'User')
+  end
+
+  it "to #calendar" do
+    expect(get("/u/User/calendar")).to route_to('users#calendar', username: 'User')
+  end
+
+  it "to #calendar_activities" do
+    expect(get("/u/User/calendar_activities")).to route_to('users#calendar_activities', username: 'User')
+  end
+end
+
 # search GET    /search(.:format) search#show
 describe SearchController, "routing" do
   it "to #show" do

From ed2a7a1ec616fa948d3e24d77bfc7626ae55e9b9 Mon Sep 17 00:00:00 2001
From: Benedikt Huss <benedikt.huss@gmail.com>
Date: Sat, 7 May 2016 21:12:15 +0200
Subject: [PATCH 0207/1431] Fix build notification on merge request page change
 even if the build status didn't change

---
 CHANGELOG                                                | 3 +++
 app/assets/javascripts/merge_request_widget.js.coffee    | 9 +++++----
 .../projects/merge_requests/widget/_heading.html.haml    | 7 +------
 spec/javascripts/merge_request_widget_spec.js.coffee     | 6 ++++++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e9b3e7b097d..e9204d32bde 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,9 @@ v 8.8.0 (unreleased)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
   - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
 
+v 8.7.4
+  - Fix always showing build notification message when switching between merge requests
+
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
   - Merge request widget displays TeamCity build state and code coverage correctly again.
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 17a5a057a94..f58647988a2 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -9,11 +9,12 @@ class @MergeRequestWidget
   constructor: (@opts) ->
     $('#modal_merge_info').modal(show: false)
     @firstCICheck = true
-    @readyForCICheck = true
+    @readyForCICheck = false
     clearInterval @fetchBuildStatusInterval
 
     @clearEventListeners()
     @addEventListeners()
+    @getCIStatus(false)
     @pollCIStatus()
     notifyPermissions()
 
@@ -71,7 +72,7 @@ class @MergeRequestWidget
       if data.status is ''
         return
 
-      if @firstCiCheck || data.status isnt @opts.ci_status and data.status?
+      if @firstCICheck || data.status isnt @opts.ci_status and data.status?
         @opts.ci_status = data.status
         @showCIStatus data.status
         if data.coverage
@@ -79,7 +80,7 @@ class @MergeRequestWidget
 
         # The first check should only update the UI, a notification
         # should only be displayed on status changes
-        if showNotification and not @firstCiCheck
+        if showNotification and not @firstCICheck
           status = @ciLabelForStatus(data.status)
 
           if status is "preparing"
@@ -102,7 +103,7 @@ class @MergeRequestWidget
               @close()
               Turbolinks.visit _this.opts.builds_path
           )
-        @firstCiCheck = false
+        @firstCICheck = false
 
   showCIStatus: (state) ->
     $('.ci_widget').hide()
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 2ec0d20a879..4d381754610 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -41,9 +41,4 @@
 
     .ci_widget.ci-error{style: "display:none"}
       = icon("times-circle")
-      Could not connect to the CI server. Please check your settings and try again.
-
-  :javascript
-    $(function() {
-      merge_request_widget.getCIStatus(false);
-    });
+      Could not connect to the CI server. Please check your settings and try again.
\ No newline at end of file
diff --git a/spec/javascripts/merge_request_widget_spec.js.coffee b/spec/javascripts/merge_request_widget_spec.js.coffee
index c0bd8a29e43..92b7eeb1116 100644
--- a/spec/javascripts/merge_request_widget_spec.js.coffee
+++ b/spec/javascripts/merge_request_widget_spec.js.coffee
@@ -47,3 +47,9 @@ describe 'MergeRequestWidget', ->
       spy = spyOn(@class, 'showCICoverage').and.stub()
       @class.getCIStatus(false)
       expect(spy).not.toHaveBeenCalled()
+
+    it 'should not display a notification on the first check after the widget has been created', ->
+      spy = spyOn(window, 'notify')
+      @class = new MergeRequestWidget(@opts)
+      @class.getCIStatus(true)
+      expect(spy).not.toHaveBeenCalled()

From 0e29653f51b439eb018cefe434a4a57db4239cf4 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 8 May 2016 15:45:04 -0400
Subject: [PATCH 0208/1431] Remove `wall_enabled` field from Project

---
 app/models/project.rb                                        | 2 --
 config/gitlab.teatro.yml                                     | 1 -
 .../20160508194200_remove_wall_enabled_from_projects.rb      | 5 +++++
 db/schema.rb                                                 | 3 +--
 spec/factories/projects.rb                                   | 1 -
 spec/models/project_spec.rb                                  | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20160508194200_remove_wall_enabled_from_projects.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index dfd1e54ecf7..86a7835c5f6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -10,7 +10,6 @@
 #  updated_at                   :datetime
 #  creator_id                   :integer
 #  issues_enabled               :boolean          default(TRUE), not null
-#  wall_enabled                 :boolean          default(TRUE), not null
 #  merge_requests_enabled       :boolean          default(TRUE), not null
 #  wiki_enabled                 :boolean          default(TRUE), not null
 #  namespace_id                 :integer
@@ -67,7 +66,6 @@ class Project < ActiveRecord::Base
   default_value_for :merge_requests_enabled, gitlab_config_features.merge_requests
   default_value_for :builds_enabled, gitlab_config_features.builds
   default_value_for :wiki_enabled, gitlab_config_features.wiki
-  default_value_for :wall_enabled, false
   default_value_for :snippets_enabled, gitlab_config_features.snippets
   default_value_for(:shared_runners_enabled) { current_application_settings.shared_runners_enabled }
 
diff --git a/config/gitlab.teatro.yml b/config/gitlab.teatro.yml
index f0656400beb..01c8dc5ff98 100644
--- a/config/gitlab.teatro.yml
+++ b/config/gitlab.teatro.yml
@@ -15,7 +15,6 @@ production: &base
       issues: true
       merge_requests: true
       wiki: true
-      wall: false
       snippets: false
       visibility_level: "private"  # can be "private" | "internal" | "public"
 
diff --git a/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb
new file mode 100644
index 00000000000..aa560bc0f0c
--- /dev/null
+++ b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb
@@ -0,0 +1,5 @@
+class RemoveWallEnabledFromProjects < ActiveRecord::Migration
+  def change
+    remove_column :projects, :wall_enabled, :boolean, default: true, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7683aad968c..71d953afe30 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: 20160421130527) do
+ActiveRecord::Schema.define(version: 20160508194200) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -728,7 +728,6 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     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.integer  "namespace_id"
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index c14b99606ba..ecd0e44dd62 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -10,7 +10,6 @@
 #  updated_at             :datetime
 #  creator_id             :integer
 #  issues_enabled         :boolean          default(TRUE), not null
-#  wall_enabled           :boolean          default(TRUE), not null
 #  merge_requests_enabled :boolean          default(TRUE), not null
 #  wiki_enabled           :boolean          default(TRUE), not null
 #  namespace_id           :integer
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 5b1cf71337e..3a8a6c2c166 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -10,7 +10,6 @@
 #  updated_at             :datetime
 #  creator_id             :integer
 #  issues_enabled         :boolean          default(TRUE), not null
-#  wall_enabled           :boolean          default(TRUE), not null
 #  merge_requests_enabled :boolean          default(TRUE), not null
 #  wiki_enabled           :boolean          default(TRUE), not null
 #  namespace_id           :integer

From 5196f8e993491e8e9dea6e36a7c5c3b8d95a5491 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 8 May 2016 22:50:30 +0200
Subject: [PATCH 0209/1431] WIP

---
 .../projects/container_registry_controller.rb | 31 +++++++++++++++++++
 app/controllers/projects/images_controller.rb | 28 -----------------
 app/helpers/gitlab_routing_helper.rb          |  4 +--
 app/models/project.rb                         |  4 +--
 app/views/layouts/nav/_project.html.haml      |  6 ++--
 .../_header_title.html.haml                   |  1 +
 .../index.html.haml                           |  4 +--
 .../projects/images/_header_title.html.haml   |  1 -
 config/routes.rb                              |  2 +-
 lib/gitlab/regex.rb                           |  2 +-
 10 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 app/controllers/projects/container_registry_controller.rb
 delete mode 100644 app/controllers/projects/images_controller.rb
 create mode 100644 app/views/projects/container_registry/_header_title.html.haml
 rename app/views/projects/{images => container_registry}/index.html.haml (86%)
 delete mode 100644 app/views/projects/images/_header_title.html.haml

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
new file mode 100644
index 00000000000..ffd455e6476
--- /dev/null
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -0,0 +1,31 @@
+class Projects::ContainerRegistryController < Projects::ApplicationController
+  before_action :authorize_read_image!
+  before_action :authorize_update_image!, only: [:destroy]
+  before_action :tag, except: [:index]
+  layout 'project'
+
+  def index
+    @tags = container_registry.tags
+
+    other_repository = container_registry.registry["gitlab/gitlab-test3"]
+    container_registry.copy_to(other_repository)
+  end
+
+  def destroy
+    if tag.delete
+      redirect_to namespace_project_container_registry_index_path(project.namespace, project)
+    else
+      redirect_to namespace_project_container_registry_index_path(project.namespace, project), alert: 'Failed to remove tag'
+    end
+  end
+
+  private
+
+  def container_registry
+    @container_registry ||= project.container_registry
+  end
+
+  def tag
+    @tag ||= container_registry[params[:id]]
+  end
+end
diff --git a/app/controllers/projects/images_controller.rb b/app/controllers/projects/images_controller.rb
deleted file mode 100644
index cf3bdd42cf4..00000000000
--- a/app/controllers/projects/images_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class Projects::ImagesController < Projects::ApplicationController
-  before_action :authorize_read_image!
-  before_action :authorize_update_image!, only: [:destroy]
-  before_action :tag, except: [:index]
-  layout 'project'
-
-  def index
-    @tags = image_repository.tags
-  end
-
-  def destroy
-    if tag.delete
-      redirect_to namespace_project_images_path(project.namespace, project)
-    else
-      redirect_to namespace_project_images_path(project.namespace, project), alert: 'Failed to remove tag'
-    end
-  end
-
-  private
-
-  def image_repository
-    @image_repository ||= project.image_repository
-  end
-
-  def tag
-    @tag ||= image_repository[params[:id]]
-  end
-end
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 66cb41cc496..dd9536b1460 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -33,8 +33,8 @@ module GitlabRoutingHelper
     namespace_project_builds_path(project.namespace, project, *args)
   end
 
-  def project_images_path(project, *args)
-    namespace_project_images_path(project.namespace, project, *args)
+  def project_container_registry_path(project, *args)
+    namespace_project_container_registry_index_url(project.namespace, project, *args)
   end
 
   def activity_project_path(project, *args)
diff --git a/app/models/project.rb b/app/models/project.rb
index c50ea45d3eb..0e32be5a536 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -370,10 +370,10 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
-  def image_repository
+  def container_registry
     @registry_token ||= Jwt::DockerAuthenticationService.full_access_token(path_with_namespace)
     @registry ||= ImageRegistry::Registry.new(Gitlab.config.registry.api_url, token: @registry_token)
-    @image_repository ||= ImageRegistry::Repository.new(@registry, path_with_namespace)
+    @container_registry ||= ImageRegistry::Repository.new(@registry, path_with_namespace)
   end
 
   def registry_repository_url
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index bef350adf34..8448599c1cc 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -47,11 +47,11 @@
           %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
   - if project_nav_tab? :images
-    = nav_link(controller: %w(images)) do
-      = link_to project_images_path(@project), title: 'Images', class: 'shortcuts-images' do
+    = nav_link(controller: %w(container_registry)) do
+      = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-images' do
         = icon('hdd-o fw')
         %span
-          Container Images
+          Container Registry
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
diff --git a/app/views/projects/container_registry/_header_title.html.haml b/app/views/projects/container_registry/_header_title.html.haml
new file mode 100644
index 00000000000..f1863c52a3e
--- /dev/null
+++ b/app/views/projects/container_registry/_header_title.html.haml
@@ -0,0 +1 @@
+- header_title project_title(@project, "Container Registry", project_container_registry_path(@project))
diff --git a/app/views/projects/images/index.html.haml b/app/views/projects/container_registry/index.html.haml
similarity index 86%
rename from app/views/projects/images/index.html.haml
rename to app/views/projects/container_registry/index.html.haml
index 08f67345b4a..1ac3a62f54e 100644
--- a/app/views/projects/images/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -1,4 +1,4 @@
-- page_title "Container Images"
+- page_title "Container Registry"
 = render "header_title"
 
 .light.prepend-top-default
@@ -53,5 +53,5 @@
               = time_ago_in_words(tag.created_at)
             %td.content
               .controls.hidden-xs.pull-right
-                = link_to namespace_project_image_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
+                = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
                   = icon("trash cred")
diff --git a/app/views/projects/images/_header_title.html.haml b/app/views/projects/images/_header_title.html.haml
deleted file mode 100644
index f583e7fcfef..00000000000
--- a/app/views/projects/images/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Container Images", project_images_path(@project))
diff --git a/config/routes.rb b/config/routes.rb
index 0280898accd..ce75329597b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -690,7 +690,7 @@ Rails.application.routes.draw do
           end
         end
 
-        resources :images, only: [:index, :destroy], constraints: { id: Gitlab::Regex.image_reference_regex }
+        resources :container_registry, only: [:index, :destroy], constraints: { id: Gitlab::Regex.container_registry_reference_regex }
 
         resources :milestones, constraints: { id: /\d+/ } do
           member do
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 9b8f416ddfa..1cbd6d945a0 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -97,7 +97,7 @@ module Gitlab
       }x.freeze
     end
 
-    def image_reference_regex
+    def container_registry_reference_regex
       git_reference_regex
     end
   end

From 9cc0937b3a41caca89fa6722149248a8f7b0a447 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 8 May 2016 15:33:34 -0600
Subject: [PATCH 0210/1431] Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of
`.exist?`. Also fixes all existing uses of the deprecated methods.
---
 .rubocop.yml                                   | 2 +-
 app/models/ci/build.rb                         | 2 +-
 app/models/merge_request.rb                    | 2 +-
 config/boot.rb                                 | 2 +-
 config/initializers/carrierwave.rb             | 2 +-
 lib/gitlab/backend/shell.rb                    | 2 +-
 lib/gitlab/redis.rb                            | 2 +-
 spec/config/mail_room_spec.rb                  | 2 +-
 spec/services/projects/create_service_spec.rb  | 4 ++--
 spec/services/projects/destroy_service_spec.rb | 8 ++++----
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9f179efa3ce..b49b60d6767 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -770,7 +770,7 @@ Lint/DefEndAlignment:
 
 # Check for deprecated class method calls.
 Lint/DeprecatedClassMethods:
-  Enabled: false
+  Enabled: true
 
 # Check for duplicate method definitions.
 Lint/DuplicateMethods:
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 4bc3a225e2c..073ec9dd89e 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -238,7 +238,7 @@ module Ci
     end
 
     def recreate_trace_dir
-      unless Dir.exists?(dir_to_trace)
+      unless Dir.exist?(dir_to_trace)
         FileUtils.mkdir_p(dir_to_trace)
       end
     end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 4175e1e5fba..365ccc90b40 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -544,7 +544,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def ref_is_fetched?
-    File.exists?(File.join(project.repository.path_to_repo, ref_path))
+    File.exist?(File.join(project.repository.path_to_repo, ref_path))
   end
 
   def ensure_ref_fetched
diff --git a/config/boot.rb b/config/boot.rb
index 4489e58688c..f2830ae3166 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -3,4 +3,4 @@ require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index df28d30d750..0d278717d6e 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -2,7 +2,7 @@ CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
 
 aws_file = Rails.root.join('config', 'aws.yml')
 
-if File.exists?(aws_file)
+if File.exist?(aws_file)
   AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env]
 
   CarrierWave.configure do |config|
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 132f9cd1966..3e3986d6382 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -180,7 +180,7 @@ module Gitlab
     #   exists?('gitlab/cookies.git')
     #
     def exists?(dir_name)
-      File.exists?(full_path(dir_name))
+      File.exist?(full_path(dir_name))
     end
 
     protected
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index 5c352c96de5..f7db7a6391c 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -42,7 +42,7 @@ module Gitlab
       config_file = File.expand_path('../../../config/resque.yml', __FILE__)
   
       @url = "redis://localhost:6379"
-      if File.exists?(config_file)
+      if File.exist?(config_file)
         @url =YAML.load_file(config_file)[rails_env]
       end
     end
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index 462afb24f08..6fad7e2b9e7 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -43,7 +43,7 @@ describe "mail_room.yml" do
       redis_config_file = Rails.root.join('config', 'resque.yml')
 
       redis_url =
-        if File.exists?(redis_config_file)
+        if File.exist?(redis_config_file)
           YAML.load_file(redis_config_file)[Rails.env]
         else
           "redis://localhost:6379"
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index e43903dbd3c..fd114359467 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -64,7 +64,7 @@ describe Projects::CreateService, services: true do
           @path = ProjectWiki.new(@project, @user).send(:path_to_repo)
         end
 
-        it { expect(File.exists?(@path)).to be_truthy }
+        it { expect(File.exist?(@path)).to be_truthy }
       end
 
       context 'wiki_enabled false does not create wiki repository directory' do
@@ -74,7 +74,7 @@ describe Projects::CreateService, services: true do
           @path = ProjectWiki.new(@project, @user).send(:path_to_repo)
         end
 
-        it { expect(File.exists?(@path)).to be_falsey }
+        it { expect(File.exist?(@path)).to be_falsey }
       end
     end
 
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index 1ec27077717..a5cb6f382e4 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -13,8 +13,8 @@ describe Projects::DestroyService, services: true do
     end
 
     it { expect(Project.all).not_to include(project) }
-    it { expect(Dir.exists?(path)).to be_falsey }
-    it { expect(Dir.exists?(remove_path)).to be_falsey }
+    it { expect(Dir.exist?(path)).to be_falsey }
+    it { expect(Dir.exist?(remove_path)).to be_falsey }
   end
 
   context 'Sidekiq fake' do
@@ -24,8 +24,8 @@ describe Projects::DestroyService, services: true do
     end
 
     it { expect(Project.all).not_to include(project) }
-    it { expect(Dir.exists?(path)).to be_falsey }
-    it { expect(Dir.exists?(remove_path)).to be_truthy }
+    it { expect(Dir.exist?(path)).to be_falsey }
+    it { expect(Dir.exist?(remove_path)).to be_truthy }
   end
 
   def destroy_project(project, user, params)

From 4be77d0b057e3b26f48fbaee947bf8f91a755f41 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 8 May 2016 19:09:33 -0700
Subject: [PATCH 0211/1431] Improve multiple branch push performance by
 memoizing permission checking

If you attempt to push thousands of branches at once, the 60-second timeout
will occur because GitAccess checking does a lot of work to check if the
user has permission to push to a branch. This changes does two things:

1. Instead of making 1 DB query per branch push, use a memoized list of protected branches to check
2. Memoize what permissions the user has to perform on this project

On a test of 10,000 branch pushes, this prevents gitlab-shell from hitting the 60-second
timeout.

Closes #17225
---
 CHANGELOG                | 1 +
 app/models/project.rb    | 2 +-
 lib/gitlab/git_access.rb | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e85d3c88b28..822fa4be565 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.8.0 (unreleased)
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
+  - Improve multiple branch push performance by memoizing permission checking
   - Log to application.log when an admin starts and stops impersonating a user
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
diff --git a/app/models/project.rb b/app/models/project.rb
index dfd1e54ecf7..5b556a22755 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -767,7 +767,7 @@ class Project < ActiveRecord::Base
 
   # Check if current branch name is marked as protected in the system
   def protected_branch?(branch_name)
-    protected_branches.where(name: branch_name).any?
+    protected_branch_names.include?(branch_name)
   end
 
   def developers_can_push_to_protected_branch?(branch_name)
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 6cb41239871..d2a0e316cbe 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -122,6 +122,11 @@ module Gitlab
       build_status_object(true)
     end
 
+    def can_user_do_action?(action)
+      @permission_cache ||= {}
+      @permission_cache[action] ||= user.can?(action, project)
+    end
+
     def change_access_check(change)
       oldrev, newrev, ref = change.split(' ')
 
@@ -135,7 +140,7 @@ module Gitlab
           :push_code
         end
 
-      unless user.can?(action, project)
+      unless can_user_do_action?(action)
         status =
           case action
           when :force_push_code_to_protected_branches

From 14b36f91d9d803850f59fe49961d6d6a9d540aab Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem@posteo.de>
Date: Tue, 3 May 2016 17:33:43 +0200
Subject: [PATCH 0212/1431] Use the proper GitLab URL for links in Wiki

---
 CHANGELOG                           | 1 +
 app/models/project_wiki.rb          | 2 +-
 lib/gitlab/url_builder.rb           | 2 +-
 spec/lib/gitlab/url_builder_spec.rb | 2 +-
 spec/models/project_wiki_spec.rb    | 4 +++-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 822fa4be565..b07b7da3300 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.8.0 (unreleased)
 
 v 8.7.4
   - Fix always showing build notification message when switching between merge requests
+  - Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 7c1a61bb0bf..c91cb70ae25 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -40,7 +40,7 @@ class ProjectWiki
   end
 
   def wiki_base_path
-    ["/", @project.path_with_namespace, "/wikis"].join('')
+    [Gitlab.config.gitlab.url, "/", @project.path_with_namespace, "/wikis"].join('')
   end
 
   # Returns the Gollum::Wiki object.
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index 2bbbd3074e8..67a09d5abf5 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -62,7 +62,7 @@ module Gitlab
     end
 
     def wiki_page_url
-      "#{Gitlab.config.gitlab.url}#{object.wiki.wiki_base_path}/#{object.slug}"
+      "#{object.wiki.wiki_base_path}/#{object.slug}"
     end
   end
 end
diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb
index bf11472407a..c8d3bc01395 100644
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
@@ -112,7 +112,7 @@ describe Gitlab::UrlBuilder, lib: true do
         wiki_page = build(:wiki_page)
         url = described_class.build(wiki_page)
 
-        expect(url).to eq "#{Gitlab.config.gitlab.url}#{wiki_page.wiki.wiki_base_path}/#{wiki_page.slug}"
+        expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki_page.wiki.project.path_with_namespace}/wikis/#{wiki_page.slug}"
       end
     end
   end
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 532e3f013fd..ea659f417f2 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -38,7 +38,9 @@ describe ProjectWiki, models: true do
 
   describe "#wiki_base_path" do
     it "returns the wiki base path" do
-      wiki_base_path = "/#{project.path_with_namespace}/wikis"
+      gitlab_url = Gitlab.config.gitlab.url
+      wiki_base_path = "#{gitlab_url}/#{project.path_with_namespace}/wikis"
+
       expect(subject.wiki_base_path).to eq(wiki_base_path)
     end
   end

From 5bd32954f619b521496bca200a0ed31615b8e736 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 9 May 2016 13:52:20 +0200
Subject: [PATCH 0213/1431] Remove space

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

diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 6ffdb18339e..45506ac1d7c 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -16,7 +16,7 @@ Webhooks can be used to update an external issue tracker, trigger CI builds, upd
 ## Webhook endpoint tips
 
 If you are writing your own endpoint (web server) that will receive
-GitLab web hooks keep in mind the following things:
+GitLab webhooks keep in mind the following things:
 
 -   Your endpoint should send its HTTP response as fast as possible. If
     you wait too long, GitLab may decide the hook failed and retry it.

From 607996c664ddfb67befaf372b108081169ebeaea Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 9 May 2016 13:56:15 +0200
Subject: [PATCH 0214/1431] Remove broken inline runner description edit form

---
 .../javascripts/ci/application.js.coffee      | 28 -------------------
 app/views/admin/runners/_runner.html.haml     | 12 ++------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/ci/application.js.coffee b/app/assets/javascripts/ci/application.js.coffee
index 05aa0f366bb..ca24c1d759f 100644
--- a/app/assets/javascripts/ci/application.js.coffee
+++ b/app/assets/javascripts/ci/application.js.coffee
@@ -1,34 +1,6 @@
-# This is a manifest file that'll be compiled into application.js, which will include all the files
-# listed below.
-#
-# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-#
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# the compiled file.
-#
-# WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-# GO AFTER THE REQUIRES BELOW.
-#
 #= require pager
 #= require jquery_nested_form
 #= require_tree .
-#
-$(document).on 'click', '.edit-runner-link', (event) ->
-  event.preventDefault()
-
-  descr = $(this).closest('.runner-description').first()
-  descr.addClass('hide')
-  form = descr.next('.runner-description-form')
-  descrInput = form.find('input.description')
-  originalValue = descrInput.val()
-  form.removeClass('hide')
-  form.find('.cancel').on 'click', (event) ->
-    event.preventDefault()
-
-    form.addClass('hide')
-    descrInput.val(originalValue)
-    descr.removeClass('hide')
 
 $(document).on 'click', '.assign-all-runner', ->
   $(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..')
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 6745e58deca..97b6ec1f85d 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -11,18 +11,10 @@
     = link_to admin_runner_path(runner) do
       = runner.short_sha
   %td
-    .runner-description
-      = runner.description
-      %span (#{link_to 'edit', '#', class: 'edit-runner-link'})
-    .runner-description-form.hide
-      = form_for [:admin, runner], remote: true, html: { class: 'form-inline' } do |f|
-        .form-group
-          = f.text_field :description, class: 'form-control'
-        = f.submit 'Save', class: 'btn'
-        %span (#{link_to 'cancel', '#', class: 'cancel'})
+    = runner.description
   %td
     - if runner.shared?
-      \-
+      = '-'
     - else
       = runner.projects.count(:all)
   %td

From a19508d6b79aa3a399f479b09b52b35b5289a92a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 9 May 2016 13:58:43 +0200
Subject: [PATCH 0215/1431] Fix test failures

---
 features/steps/project/hooks.rb    | 2 +-
 spec/models/hooks/web_hook_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index b1ffe7f7b4c..13c0713669a 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -59,7 +59,7 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
   step 'hook should be triggered' do
     expect(current_path).to eq namespace_project_hooks_path(current_project.namespace, current_project)
     expect(page).to have_selector '.flash-notice',
-                              text: 'Hook successfully executed.'
+                              text: 'Hook executed successfully: HTTP 200'
   end
 
   step 'I should see hook error message' do
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 37a27d73aab..f9bab487b96 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -95,13 +95,13 @@ describe WebHook, models: true do
     it "handles 200 status code" do
       WebMock.stub_request(:post, project_hook.url).to_return(status: 200, body: "Success")
 
-      expect(project_hook.execute(@data, 'push_hooks')).to eq([true, 'Success'])
+      expect(project_hook.execute(@data, 'push_hooks')).to eq([200, 'Success'])
     end
 
     it "handles 2xx status codes" do
       WebMock.stub_request(:post, project_hook.url).to_return(status: 201, body: "Success")
 
-      expect(project_hook.execute(@data, 'push_hooks')).to eq([true, 'Success'])
+      expect(project_hook.execute(@data, 'push_hooks')).to eq([201, 'Success'])
     end
   end
 end

From 5364400741b7d041c945ccca98283bc465d5a87c Mon Sep 17 00:00:00 2001
From: cnam-dep <cnam812@gmail.com>
Date: Wed, 24 Feb 2016 00:59:32 +0300
Subject: [PATCH 0216/1431] API: Expose Issue#user_notes_count

---
 CHANGELOG                        |  3 +++
 app/models/concerns/issuable.rb  |  4 ++++
 doc/api/issues.md                | 15 ++++++++++-----
 lib/api/entities.rb              |  2 +-
 spec/requests/api/issues_spec.rb | 15 +++++++++++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b07b7da3300..567b5717171 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,9 @@ v 8.7.2
   - Label titles in filters are now escaped properly
 
 v 8.7.1
+  - API: Expose Issue#user_notes_count (Anton Popov)
+
+v 8.7.1 (unreleased)
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848
   - Fix .gitlab-ci.yml parsing issue when hidde job is a template without script definition. !3849
   - Fix license detection to detect all license files, not only known licenses. !3878
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 2e4efc4e8d8..7a3db742030 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -160,6 +160,10 @@ module Issuable
     notes.awards.where(note: "thumbsup").count
   end
 
+  def user_notes_count
+    notes.user.count
+  end
+
   def subscribed_without_subscriptions?(user)
     participants(user).include?(user)
   end
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 3e78149f442..fc7a7ae0c0c 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -77,7 +77,8 @@ Example response:
       "created_at" : "2016-01-04T15:31:51.081Z",
       "iid" : 6,
       "labels" : [],
-      "subscribed" : false
+      "subscribed" : false,
+      "user_notes_count": 1
    }
 ]
 ```
@@ -154,7 +155,8 @@ Example response:
       "title" : "Ut commodi ullam eos dolores perferendis nihil sunt.",
       "updated_at" : "2016-01-04T15:31:46.176Z",
       "created_at" : "2016-01-04T15:31:46.176Z",
-      "subscribed" : false
+      "subscribed" : false,
+      "user_notes_count": 1
    }
 ]
 ```
@@ -216,7 +218,8 @@ Example response:
    "title" : "Ut commodi ullam eos dolores perferendis nihil sunt.",
    "updated_at" : "2016-01-04T15:31:46.176Z",
    "created_at" : "2016-01-04T15:31:46.176Z",
-   "subscribed": false
+   "subscribed": false,
+   "user_notes_count": 1
 }
 ```
 
@@ -271,7 +274,8 @@ Example response:
    "description" : null,
    "updated_at" : "2016-01-07T12:44:33.959Z",
    "milestone" : null,
-   "subscribed" : true
+   "subscribed" : true,
+   "user_notes_count": 0
 }
 ```
 
@@ -329,7 +333,8 @@ Example response:
    "id" : 85,
    "assignee" : null,
    "milestone" : null,
-   "subscribed" : true
+   "subscribed" : true,
+   "user_notes_count": 0
 }
 ```
 
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 716ca6f7ed9..42f623c5a3a 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -170,10 +170,10 @@ module API
       expose :label_names, as: :labels
       expose :milestone, using: Entities::Milestone
       expose :assignee, :author, using: Entities::UserBasic
-
       expose :subscribed do |issue, options|
         issue.subscribed?(options[:current_user])
       end
+      expose :user_notes_count
     end
 
     class MergeRequest < ProjectEntity
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index f88e39cad9e..008bcae1747 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -39,6 +39,7 @@ describe API::API, api: true  do
   let!(:empty_milestone) do
     create(:milestone, title: '2.0.0', project: project)
   end
+  let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) }
 
   before { project.team << [user, :reporter] }
 
@@ -128,6 +129,13 @@ describe API::API, api: true  do
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(0)
       end
+
+      it 'should return an count notes in issue' do
+        get api("/issues", user)
+        expect(response.status).to eq(200)
+        expect(json_response).to be_an Array
+        expect(json_response.first['user_notes_count']).to eq(1)
+      end
     end
   end
 
@@ -229,6 +237,13 @@ describe API::API, api: true  do
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(closed_issue.id)
     end
+
+    it 'should return an count notes in issue' do
+      get api("#{base_url}/issues", user)
+      expect(response.status).to eq(200)
+      expect(json_response).to be_an Array
+      expect(json_response.first['user_notes_count']).to eq(1)
+    end
   end
 
   describe "GET /projects/:id/issues/:issue_id" do

From f5240f9703fea9902ac4304b8e12daed5c21820d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 15 Mar 2016 16:17:24 +0100
Subject: [PATCH 0217/1431] Expose MergeRequest#user_notes_count in the API and
 use the method in issues list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                     |  4 +--
 app/views/projects/issues/_issue.html.haml    | 14 +++-----
 .../merge_requests/_merge_request.html.haml   | 14 +++-----
 doc/api/merge_requests.md                     | 22 ++++++++----
 lib/api/entities.rb                           |  2 +-
 spec/requests/api/issues_spec.rb              | 36 +++++++++++--------
 spec/requests/api/merge_requests_spec.rb      | 28 +++++++++++++++
 7 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 567b5717171..aeade934b46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@ v 8.8.0 (unreleased)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
   - Create tags using Rugged for performance reasons. !3745
+  - API: Expose Issue#user_notes_count. !3126 (Anton Popov)
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Added multiple colors for labels in dropdowns when dups happen.
@@ -51,9 +52,6 @@ v 8.7.2
   - Label titles in filters are now escaped properly
 
 v 8.7.1
-  - API: Expose Issue#user_notes_count (Anton Popov)
-
-v 8.7.1 (unreleased)
   - Throttle the update of `project.last_activity_at` to 1 minute. !3848
   - Fix .gitlab-ci.yml parsing issue when hidde job is a template without script definition. !3849
   - Fix license detection to detect all license files, not only known licenses. !3878
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 9ad86ed71c9..5cf70ea3bb7 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -28,16 +28,10 @@
           = downvotes
 
       - note_count = issue.notes.user.nonawards.count
-      - if note_count > 0
-        %li
-          = link_to issue_path(issue) + "#notes" do
-            = icon('comments')
-            = note_count
-      - else
-        %li
-          = link_to issue_path(issue) + "#notes", class: "issue-no-comments" do
-            = icon('comments')
-            = note_count
+      %li
+        = link_to issue_path(issue, anchor: 'notes'), class: ('issue-no-comments' if note_count.zero?) do
+          = icon('comments')
+          = note_count
 
   .issue-info
     #{issue.to_reference} &middot;
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index e740fe8c84d..73c6a95f5ca 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -36,16 +36,10 @@
           = downvotes
 
       - note_count = merge_request.mr_and_commit_notes.user.nonawards.count
-      - if note_count > 0
-        %li
-          = link_to merge_request_path(merge_request) + "#notes" do
-            = icon('comments')
-            = note_count
-      - else
-        %li
-          = link_to merge_request_path(merge_request) + "#notes", class: "merge-request-no-comments" do
-            = icon('comments')
-            = note_count
+      %li
+        = link_to merge_request_path(merge_request, anchor: 'notes'), class: ('merge-request-no-comments' if note_count.zero?) do
+          = icon('comments')
+          = note_count
 
   .merge-request-info
     #{merge_request.to_reference} &middot;
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 2057f9d77aa..8217e30fe25 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -67,7 +67,8 @@ Parameters:
     },
     "merge_when_build_succeeds": true,
     "merge_status": "can_be_merged",
-    "subscribed" : false
+    "subscribed" : false,
+    "user_notes_count": 1
   }
 ]
 ```
@@ -130,7 +131,8 @@ Parameters:
   },
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
-  "subscribed" : true
+  "subscribed" : true,
+  "user_notes_count": 1
 }
 ```
 
@@ -230,6 +232,7 @@ Parameters:
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
   "subscribed" : true,
+  "user_notes_count": 1,
   "changes": [
     {
     "old_path": "VERSION",
@@ -308,7 +311,8 @@ Parameters:
   },
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
-  "subscribed" : true
+  "subscribed" : true,
+  "user_notes_count": 0
 }
 ```
 
@@ -378,7 +382,8 @@ Parameters:
   },
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
-  "subscribed" : true
+  "subscribed" : true,
+  "user_notes_count": 1
 }
 ```
 
@@ -472,7 +477,8 @@ Parameters:
   },
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
-  "subscribed" : true
+  "subscribed" : true,
+  "user_notes_count": 1
 }
 ```
 
@@ -537,7 +543,8 @@ Parameters:
   },
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
-  "subscribed" : true
+  "subscribed" : true,
+  "user_notes_count": 1
 }
 ```
 
@@ -602,7 +609,8 @@ Example response:
       "title" : "Consequatur vero maxime deserunt laboriosam est voluptas dolorem.",
       "created_at" : "2016-01-04T15:31:51.081Z",
       "iid" : 6,
-      "labels" : []
+      "labels" : [],
+      "user_notes_count": 1
    },
 ]
 ```
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 42f623c5a3a..2870a6a40ef 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -187,10 +187,10 @@ module API
       expose :milestone, using: Entities::Milestone
       expose :merge_when_build_succeeds
       expose :merge_status
-
       expose :subscribed do |merge_request, options|
         merge_request.subscribed?(options[:current_user])
       end
+      expose :user_notes_count
     end
 
     class MergeRequestChanges < MergeRequest
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 008bcae1747..9dd43f4fab3 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -39,7 +39,7 @@ describe API::API, api: true  do
   let!(:empty_milestone) do
     create(:milestone, title: '2.0.0', project: project)
   end
-  let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) }
+  let!(:note) { create(:note_on_issue, author: user, project: project, noteable: issue) }
 
   before { project.team << [user, :reporter] }
 
@@ -129,13 +129,6 @@ describe API::API, api: true  do
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(0)
       end
-
-      it 'should return an count notes in issue' do
-        get api("/issues", user)
-        expect(response.status).to eq(200)
-        expect(json_response).to be_an Array
-        expect(json_response.first['user_notes_count']).to eq(1)
-      end
     end
   end
 
@@ -237,18 +230,31 @@ describe API::API, api: true  do
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(closed_issue.id)
     end
-
-    it 'should return an count notes in issue' do
-      get api("#{base_url}/issues", user)
-      expect(response.status).to eq(200)
-      expect(json_response).to be_an Array
-      expect(json_response.first['user_notes_count']).to eq(1)
-    end
   end
 
   describe "GET /projects/:id/issues/:issue_id" do
+    it 'exposes known attributes' do
+      get api("/projects/#{project.id}/issues/#{issue.id}", user)
+
+      expect(response.status).to eq(200)
+      expect(json_response['id']).to eq(issue.id)
+      expect(json_response['iid']).to eq(issue.iid)
+      expect(json_response['project_id']).to eq(issue.project.id)
+      expect(json_response['title']).to eq(issue.title)
+      expect(json_response['description']).to eq(issue.description)
+      expect(json_response['state']).to eq(issue.state)
+      expect(json_response['created_at']).to be_present
+      expect(json_response['updated_at']).to be_present
+      expect(json_response['labels']).to eq(issue.label_names)
+      expect(json_response['milestone']).to be_a Hash
+      expect(json_response['assignee']).to be_a Hash
+      expect(json_response['author']).to be_a Hash
+      expect(json_response['user_notes_count']).to be(1)
+    end
+
     it "should return a project issue by id" do
       get api("/projects/#{project.id}/issues/#{issue.id}", user)
+
       expect(response.status).to eq(200)
       expect(json_response['title']).to eq(issue.title)
       expect(json_response['iid']).to eq(issue.iid)
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 1fa7e76894f..4b0111df149 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -113,6 +113,34 @@ describe API::API, api: true  do
   end
 
   describe "GET /projects/:id/merge_requests/:merge_request_id" do
+    it 'exposes known attributes' do
+      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
+
+      expect(response.status).to eq(200)
+      expect(json_response['id']).to eq(merge_request.id)
+      expect(json_response['iid']).to eq(merge_request.iid)
+      expect(json_response['project_id']).to eq(merge_request.project.id)
+      expect(json_response['title']).to eq(merge_request.title)
+      expect(json_response['description']).to eq(merge_request.description)
+      expect(json_response['state']).to eq(merge_request.state)
+      expect(json_response['created_at']).to be_present
+      expect(json_response['updated_at']).to be_present
+      expect(json_response['labels']).to eq(merge_request.label_names)
+      expect(json_response['milestone']).to be_nil
+      expect(json_response['assignee']).to be_a Hash
+      expect(json_response['author']).to be_a Hash
+      expect(json_response['target_branch']).to eq(merge_request.target_branch)
+      expect(json_response['source_branch']).to eq(merge_request.source_branch)
+      expect(json_response['upvotes']).to eq(0)
+      expect(json_response['downvotes']).to eq(0)
+      expect(json_response['source_project_id']).to eq(merge_request.source_project.id)
+      expect(json_response['target_project_id']).to eq(merge_request.target_project.id)
+      expect(json_response['work_in_progress']).to be_falsy
+      expect(json_response['merge_when_build_succeeds']).to be_falsy
+      expect(json_response['merge_status']).to eq('can_be_merged')
+      expect(json_response['user_notes_count']).to be(2)
+    end
+
     it "should return merge_request" do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
       expect(response.status).to eq(200)

From 32811d98fe2893a0671fe22c4aebf8bd254b7709 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 9 May 2016 11:58:20 -0300
Subject: [PATCH 0218/1431] Make model sanitization methods one liners

---
 CHANGELOG               | 1 +
 app/models/label.rb     | 5 ++---
 app/models/milestone.rb | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 925740e5d98..fe56dd97ee6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.8.0 (unreleased)
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
   - Updated search UI
   - Display informative message when new milestone is created
+  - Sanitize milestones and labels titles
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitLab Enterprise support from EE
diff --git a/app/models/label.rb b/app/models/label.rb
index 0b34911a4e9..c551ceef64e 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -117,9 +117,8 @@ class Label < ActiveRecord::Base
     LabelsHelper::text_color_for_bg(self.color)
   end
 
-  def title= value
-    value = Sanitize.clean(value.to_s) if value
-    write_attribute(:title, Sanitize.clean(value))
+  def title=(value)
+    write_attribute(:title, Sanitize.clean(value.to_s)) if value.present?
   end
 
   private
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index ed81791c69c..15a786210fa 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -129,9 +129,8 @@ class Milestone < ActiveRecord::Base
     nil
   end
 
-  def title= value
-    value = Sanitize.clean(value.to_s) if value
-    write_attribute(:title, value)
+  def title=(value)
+    write_attribute(:title, Sanitize.clean(value.to_s)) if value.present?
   end
 
   # Sorts the issues for the given IDs.

From 63c45fa75b2fb6519106417d58fe879db352b812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 9 May 2016 15:21:23 +0000
Subject: [PATCH 0219/1431] Revert "Merge branch 'patch-1' into 'master'"

This reverts merge request !4030
---
 doc/api/notes.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/api/notes.md b/doc/api/notes.md
index a6b5b1787fd..7aa1c2155bf 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -15,7 +15,7 @@ GET /projects/:id/issues/:issue_id/notes
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The IID of an issue (not ID)
+- `issue_id` (required) - The ID of an issue
 
 ```json
 [
@@ -73,7 +73,7 @@ GET /projects/:id/issues/:issue_id/notes/:note_id
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The IID of a project issue (not ID)
+- `issue_id` (required) - The ID of a project issue
 - `note_id` (required) - The ID of an issue note
 
 ### Create new issue note
@@ -87,7 +87,7 @@ POST /projects/:id/issues/:issue_id/notes
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The IID of an issue (not ID)
+- `issue_id` (required) - The ID of an issue
 - `body` (required) - The content of a note
 - `created_at` (optional) - Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z
 
@@ -102,7 +102,7 @@ PUT /projects/:id/issues/:issue_id/notes/:note_id
 Parameters:
 
 - `id` (required) - The ID of a project
-- `issue_id` (required) - The IID of an issue (not ID)
+- `issue_id` (required) - The ID of an issue
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
@@ -120,7 +120,7 @@ Parameters:
 | Attribute | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `id` | integer | yes | The ID of a project |
-| `issue_id` | integer | yes | The IID of an issue |
+| `issue_id` | integer | yes | The ID of an issue |
 | `note_id` | integer | yes | The ID of a note |
 
 ```bash

From f1479b56b71bef63517b90fcde99e6508e9c54af Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Mon, 9 May 2016 18:00:28 +0200
Subject: [PATCH 0220/1431] Remove the annotate gem and delete old annotations

In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.

Fixes: #17382
---
 Gemfile                                       |  1 -
 Gemfile.lock                                  |  6 +-
 app/models/abuse_report.rb                    | 12 ----
 app/models/appearance.rb                      | 13 ----
 app/models/application_setting.rb             | 52 ---------------
 app/models/audit_event.rb                     | 14 ----
 app/models/broadcast_message.rb               | 14 ----
 app/models/ci/build.rb                        | 37 -----------
 app/models/ci/commit.rb                       | 22 -------
 app/models/ci/runner.rb                       | 19 ------
 app/models/ci/runner_project.rb               | 12 ----
 app/models/ci/trigger.rb                      | 13 ----
 app/models/ci/trigger_request.rb              | 12 ----
 app/models/ci/variable.rb                     | 14 ----
 app/models/commit_status.rb                   | 37 -----------
 app/models/deploy_key.rb                      | 15 -----
 app/models/deploy_keys_project.rb             | 11 ----
 app/models/email.rb                           | 11 ----
 app/models/event.rb                           | 16 -----
 app/models/forked_project_link.rb             | 11 ----
 app/models/generic_commit_status.rb           | 37 -----------
 app/models/group.rb                           | 17 -----
 app/models/hooks/project_hook.rb              | 22 -------
 app/models/hooks/service_hook.rb              | 22 -------
 app/models/hooks/system_hook.rb               | 22 -------
 app/models/hooks/web_hook.rb                  | 22 -------
 app/models/identity.rb                        | 12 ----
 app/models/issue.rb                           | 24 -------
 app/models/key.rb                             | 15 -----
 app/models/label.rb                           | 14 ----
 app/models/label_link.rb                      | 12 ----
 app/models/lfs_object.rb                      | 12 ----
 app/models/lfs_objects_project.rb             | 11 ----
 app/models/member.rb                          | 19 ------
 app/models/members/group_member.rb            | 19 ------
 app/models/members/project_member.rb          | 19 ------
 app/models/merge_request.rb                   | 30 ---------
 app/models/merge_request_diff.rb              | 15 -----
 app/models/milestone.rb                       | 15 -----
 app/models/namespace.rb                       | 17 -----
 app/models/note.rb                            | 21 ------
 app/models/notification_setting.rb            | 13 ----
 app/models/oauth_access_token.rb              | 15 -----
 app/models/personal_snippet.rb                | 16 -----
 app/models/project.rb                         | 45 -------------
 app/models/project_group_link.rb              | 12 ----
 app/models/project_import_data.rb             | 12 ----
 app/models/project_services/asana_service.rb  | 24 -------
 .../project_services/assembla_service.rb      | 24 -------
 app/models/project_services/bamboo_service.rb | 24 -------
 .../project_services/buildkite_service.rb     | 24 -------
 .../project_services/builds_email_service.rb  | 24 -------
 .../project_services/campfire_service.rb      | 24 -------
 app/models/project_services/ci_service.rb     | 24 -------
 .../custom_issue_tracker_service.rb           | 24 -------
 .../project_services/drone_ci_service.rb      | 24 -------
 .../emails_on_push_service.rb                 | 24 -------
 .../project_services/external_wiki_service.rb | 24 -------
 .../project_services/flowdock_service.rb      | 24 -------
 .../project_services/gemnasium_service.rb     | 24 -------
 .../project_services/gitlab_ci_service.rb     | 24 -------
 .../gitlab_issue_tracker_service.rb           | 24 -------
 .../project_services/hipchat_service.rb       | 24 -------
 app/models/project_services/irker_service.rb  | 24 -------
 .../project_services/issue_tracker_service.rb | 24 -------
 app/models/project_services/jira_service.rb   | 24 -------
 .../pivotaltracker_service.rb                 | 24 -------
 .../project_services/pushover_service.rb      | 24 -------
 .../project_services/redmine_service.rb       | 24 -------
 app/models/project_services/slack_service.rb  | 24 -------
 .../project_services/teamcity_service.rb      | 24 -------
 app/models/project_snippet.rb                 | 16 -----
 app/models/protected_branch.rb                | 12 ----
 app/models/release.rb                         | 12 ----
 app/models/security_event.rb                  | 14 ----
 app/models/sent_notification.rb               | 14 ----
 app/models/service.rb                         | 24 -------
 app/models/snippet.rb                         | 16 -----
 app/models/spam_log.rb                        | 17 -----
 app/models/subscription.rb                    | 13 ----
 app/models/todo.rb                            | 18 -----
 app/models/user.rb                            | 65 -------------------
 app/models/users_star_project.rb              | 11 ----
 spec/factories/abuse_reports.rb               | 12 ----
 spec/factories/broadcast_messages.rb          | 14 ----
 spec/factories/forked_project_links.rb        | 11 ----
 spec/factories/label_links.rb                 | 12 ----
 spec/factories/labels.rb                      | 13 ----
 spec/factories/lfs_objects.rb                 | 12 ----
 spec/factories/lfs_objects_projects.rb        | 11 ----
 spec/factories/merge_requests.rb              | 29 ---------
 spec/factories/notes.rb                       | 21 ------
 spec/factories/oauth_access_tokens.rb         | 15 -----
 spec/factories/projects.rb                    | 39 -----------
 spec/factories/releases.rb                    | 12 ----
 spec/factories/todos.rb                       | 18 -----
 spec/models/abuse_report_spec.rb              | 12 ----
 spec/models/application_setting_spec.rb       | 46 -------------
 spec/models/broadcast_message_spec.rb         | 14 ----
 spec/models/ci/commit_spec.rb                 | 18 -----
 spec/models/ci/runner_project_spec.rb         | 12 ----
 spec/models/ci/runner_spec.rb                 | 19 ------
 spec/models/ci/trigger_spec.rb                | 13 ----
 spec/models/ci/variable_spec.rb               | 14 ----
 spec/models/commit_status_spec.rb             | 34 ----------
 spec/models/deploy_key_spec.rb                | 15 -----
 spec/models/deploy_keys_project_spec.rb       | 11 ----
 spec/models/email_spec.rb                     | 11 ----
 spec/models/event_spec.rb                     | 16 -----
 spec/models/forked_project_link_spec.rb       | 11 ----
 spec/models/generic_commit_status_spec.rb     | 34 ----------
 spec/models/group_spec.rb                     | 15 -----
 spec/models/identity_spec.rb                  | 12 ----
 spec/models/issue_spec.rb                     | 20 ------
 spec/models/key_spec.rb                       | 15 -----
 spec/models/label_link_spec.rb                | 12 ----
 spec/models/label_spec.rb                     | 13 ----
 spec/models/member_spec.rb                    | 19 ------
 spec/models/merge_request_spec.rb             | 29 ---------
 spec/models/milestone_spec.rb                 | 15 -----
 spec/models/namespace_spec.rb                 | 15 -----
 spec/models/note_spec.rb                      | 21 ------
 spec/models/project_snippet_spec.rb           | 16 -----
 spec/models/project_spec.rb                   | 39 -----------
 spec/models/protected_branch_spec.rb          | 12 ----
 spec/models/release_spec.rb                   | 12 ----
 spec/models/service_spec.rb                   | 21 ------
 spec/models/snippet_spec.rb                   | 16 -----
 spec/models/todo_spec.rb                      | 18 -----
 spec/models/user_spec.rb                      | 63 ------------------
 130 files changed, 1 insertion(+), 2541 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1137ef4d72b..3e5c604ae06 100644
--- a/Gemfile
+++ b/Gemfile
@@ -242,7 +242,6 @@ group :development do
   gem "foreman"
   gem 'brakeman', '~> 3.2.0', require: false
 
-  gem "annotate", "~> 2.7.0"
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'quiet_assets', '~> 1.0.2'
   gem 'rerun', '~> 0.11.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe083c2b566..86b9142ef27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,9 +51,6 @@ GEM
       activerecord (>= 3.0)
     akismet (2.0.0)
     allocations (1.0.4)
-    annotate (2.7.0)
-      activerecord (>= 3.2, < 6.0)
-      rake (~> 10.4)
     arel (6.0.3)
     asana (0.4.0)
       faraday (~> 0.9)
@@ -893,7 +890,6 @@ DEPENDENCIES
   after_commit_queue
   akismet (~> 2.0)
   allocations (~> 1.0)
-  annotate (~> 2.7.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
   attr_encrypted (~> 1.3.4)
@@ -1061,4 +1057,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.12.1
+   1.12.3
diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index b61f5123127..b01a244032d 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: abuse_reports
-#
-#  id          :integer          not null, primary key
-#  reporter_id :integer
-#  user_id     :integer
-#  message     :text
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 class AbuseReport < ActiveRecord::Base
   belongs_to :reporter, class_name: 'User'
   belongs_to :user
diff --git a/app/models/appearance.rb b/app/models/appearance.rb
index 4528760fefa..4cf8dd9a8ce 100644
--- a/app/models/appearance.rb
+++ b/app/models/appearance.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: appearances
-#
-#  id          :integer          not null, primary key
-#  title       :string
-#  description :text
-#  header_logo :string
-#  logo        :string
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#
-
 class Appearance < ActiveRecord::Base
   validates :title,       presence: true
   validates :description, presence: true
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 72ec91d2909..7039db2d41e 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -1,55 +1,3 @@
-# == Schema Information
-#
-# Table name: application_settings
-#
-#  id                                :integer          not null, primary key
-#  default_projects_limit            :integer
-#  signup_enabled                    :boolean
-#  signin_enabled                    :boolean
-#  gravatar_enabled                  :boolean
-#  sign_in_text                      :text
-#  created_at                        :datetime
-#  updated_at                        :datetime
-#  home_page_url                     :string
-#  default_branch_protection         :integer          default(2)
-#  restricted_visibility_levels      :text
-#  version_check_enabled             :boolean          default(TRUE)
-#  max_attachment_size               :integer          default(10), not null
-#  default_project_visibility        :integer
-#  default_snippet_visibility        :integer
-#  restricted_signup_domains         :text
-#  user_oauth_applications           :boolean          default(TRUE)
-#  after_sign_out_path               :string
-#  session_expire_delay              :integer          default(10080), not null
-#  import_sources                    :text
-#  help_page_text                    :text
-#  admin_notification_email          :string
-#  shared_runners_enabled            :boolean          default(TRUE), not null
-#  max_artifacts_size                :integer          default(100), not null
-#  runners_registration_token        :string
-#  require_two_factor_authentication :boolean          default(FALSE)
-#  two_factor_grace_period           :integer          default(48)
-#  metrics_enabled                   :boolean          default(FALSE)
-#  metrics_host                      :string           default("localhost")
-#  metrics_pool_size                 :integer          default(16)
-#  metrics_timeout                   :integer          default(10)
-#  metrics_method_call_threshold     :integer          default(10)
-#  recaptcha_enabled                 :boolean          default(FALSE)
-#  recaptcha_site_key                :string
-#  recaptcha_private_key             :string
-#  metrics_port                      :integer          default(8089)
-#  metrics_sample_interval           :integer          default(15)
-#  sentry_enabled                    :boolean          default(FALSE)
-#  sentry_dsn                        :string
-#  akismet_enabled                   :boolean          default(FALSE)
-#  akismet_api_key                   :string
-#  email_author_in_body              :boolean          default(FALSE)
-#  default_group_visibility          :integer
-#  repository_checks_enabled         :boolean          default(FALSE)
-#  metrics_packet_size               :integer          default(1)
-#  shared_runners_text               :text
-#
-
 class ApplicationSetting < ActiveRecord::Base
   include TokenAuthenticatable
   add_authentication_token_field :runners_registration_token
diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb
index 44b090260e7..967ffd46db0 100644
--- a/app/models/audit_event.rb
+++ b/app/models/audit_event.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: audit_events
-#
-#  id          :integer          not null, primary key
-#  author_id   :integer          not null
-#  type        :string           not null
-#  entity_id   :integer          not null
-#  entity_type :string           not null
-#  details     :text
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 class AuditEvent < ActiveRecord::Base
   serialize :details, Hash
 
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb
index 075ac733bfc..61498140f27 100644
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: broadcast_messages
-#
-#  id         :integer          not null, primary key
-#  message    :text             not null
-#  starts_at  :datetime
-#  ends_at    :datetime
-#  created_at :datetime
-#  updated_at :datetime
-#  color      :string
-#  font       :string
-#
-
 class BroadcastMessage < ActiveRecord::Base
   include Sortable
 
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 4bc3a225e2c..c9506dd3057 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -1,40 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_builds
-#
-#  id                 :integer          not null, primary key
-#  project_id         :integer
-#  status             :string
-#  finished_at        :datetime
-#  trace              :text
-#  created_at         :datetime
-#  updated_at         :datetime
-#  started_at         :datetime
-#  runner_id          :integer
-#  coverage           :float
-#  commit_id          :integer
-#  commands           :text
-#  job_id             :integer
-#  name               :string
-#  deploy             :boolean          default(FALSE)
-#  options            :text
-#  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string
-#  trigger_request_id :integer
-#  stage_idx          :integer
-#  tag                :boolean
-#  ref                :string
-#  user_id            :integer
-#  type               :string
-#  target_url         :string
-#  description        :string
-#  artifacts_file     :text
-#  gl_project_id      :integer
-#  artifacts_metadata :text
-#  erased_by_id       :integer
-#  erased_at          :datetime
-#
-
 module Ci
   class Build < CommitStatus
     belongs_to :runner, class_name: 'Ci::Runner'
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 4ac4e0fb8b2..f4b61c75ab6 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -1,25 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_commits
-#
-#  id            :integer          not null, primary key
-#  project_id    :integer
-#  ref           :string
-#  sha           :string
-#  before_sha    :string
-#  push_data     :text
-#  created_at    :datetime
-#  updated_at    :datetime
-#  tag           :boolean          default(FALSE)
-#  yaml_errors   :text
-#  committed_at  :datetime
-#  gl_project_id :integer
-#  status        :string
-#  started_at    :datetime
-#  finished_at   :datetime
-#  duration      :integer
-#
-
 module Ci
   class Commit < ActiveRecord::Base
     extend Ci::Model
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index add59a08892..0cdb64d6c33 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_runners
-#
-#  id           :integer          not null, primary key
-#  token        :string
-#  created_at   :datetime
-#  updated_at   :datetime
-#  description  :string
-#  contacted_at :datetime
-#  active       :boolean          default(TRUE), not null
-#  is_shared    :boolean          default(FALSE)
-#  name         :string
-#  version      :string
-#  revision     :string
-#  platform     :string
-#  architecture :string
-#
-
 module Ci
   class Runner < ActiveRecord::Base
     extend Ci::Model
diff --git a/app/models/ci/runner_project.rb b/app/models/ci/runner_project.rb
index 7b16f207a26..4b44ffa886e 100644
--- a/app/models/ci/runner_project.rb
+++ b/app/models/ci/runner_project.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_runner_projects
-#
-#  id            :integer          not null, primary key
-#  runner_id     :integer          not null
-#  project_id    :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  gl_project_id :integer
-#
-
 module Ci
   class RunnerProject < ActiveRecord::Base
     extend Ci::Model
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 4f3f4d79fac..a0b19b51a12 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_triggers
-#
-#  id            :integer          not null, primary key
-#  token         :string
-#  project_id    :integer
-#  deleted_at    :datetime
-#  created_at    :datetime
-#  updated_at    :datetime
-#  gl_project_id :integer
-#
-
 module Ci
   class Trigger < ActiveRecord::Base
     extend Ci::Model
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index 9973d2e5ade..872d5fb31de 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_trigger_requests
-#
-#  id         :integer          not null, primary key
-#  trigger_id :integer          not null
-#  variables  :text
-#  created_at :datetime
-#  updated_at :datetime
-#  commit_id  :integer
-#
-
 module Ci
   class TriggerRequest < ActiveRecord::Base
     extend Ci::Model
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 4229fe085a1..10802f64813 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_variables
-#
-#  id                   :integer          not null, primary key
-#  project_id           :integer
-#  key                  :string
-#  value                :text
-#  encrypted_value      :text
-#  encrypted_value_salt :string
-#  encrypted_value_iv   :string
-#  gl_project_id        :integer
-#
-
 module Ci
   class Variable < ActiveRecord::Base
     extend Ci::Model
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 1260c448de3..cacbc13b391 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -1,40 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_builds
-#
-#  id                 :integer          not null, primary key
-#  project_id         :integer
-#  status             :string
-#  finished_at        :datetime
-#  trace              :text
-#  created_at         :datetime
-#  updated_at         :datetime
-#  started_at         :datetime
-#  runner_id          :integer
-#  coverage           :float
-#  commit_id          :integer
-#  commands           :text
-#  job_id             :integer
-#  name               :string
-#  deploy             :boolean          default(FALSE)
-#  options            :text
-#  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string
-#  trigger_request_id :integer
-#  stage_idx          :integer
-#  tag                :boolean
-#  ref                :string
-#  user_id            :integer
-#  type               :string
-#  target_url         :string
-#  description        :string
-#  artifacts_file     :text
-#  gl_project_id      :integer
-#  artifacts_metadata :text
-#  erased_by_id       :integer
-#  erased_at          :datetime
-#
-
 class CommitStatus < ActiveRecord::Base
   include Statuseable
 
diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index 43cf625f770..2c525d4cd7a 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: keys
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  key         :text
-#  title       :string
-#  type        :string
-#  fingerprint :string
-#  public      :boolean          default(FALSE), not null
-#
-
 class DeployKey < Key
   has_many :deploy_keys_projects, dependent: :destroy
   has_many :projects, through: :deploy_keys_projects
diff --git a/app/models/deploy_keys_project.rb b/app/models/deploy_keys_project.rb
index 18db521741f..ae8486bd9ac 100644
--- a/app/models/deploy_keys_project.rb
+++ b/app/models/deploy_keys_project.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: deploy_keys_projects
-#
-#  id            :integer          not null, primary key
-#  deploy_key_id :integer          not null
-#  project_id    :integer          not null
-#  created_at    :datetime
-#  updated_at    :datetime
-#
-
 class DeployKeysProject < ActiveRecord::Base
   belongs_to :project
   belongs_to :deploy_key
diff --git a/app/models/email.rb b/app/models/email.rb
index eae2472f337..32a412ab878 100644
--- a/app/models/email.rb
+++ b/app/models/email.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: emails
-#
-#  id         :integer          not null, primary key
-#  user_id    :integer          not null
-#  email      :string           not null
-#  created_at :datetime
-#  updated_at :datetime
-#
-
 class Email < ActiveRecord::Base
   include Sortable
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 25c7c3e6dc7..17ee48b91a8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,19 +1,3 @@
-# == Schema Information
-#
-# Table name: events
-#
-#  id          :integer          not null, primary key
-#  target_type :string
-#  target_id   :integer
-#  title       :string
-#  data        :text
-#  project_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  action      :integer
-#  author_id   :integer
-#
-
 class Event < ActiveRecord::Base
   include Sortable
   default_scope { where.not(author_id: nil) }
diff --git a/app/models/forked_project_link.rb b/app/models/forked_project_link.rb
index 9b0c6263a96..9803bae0bee 100644
--- a/app/models/forked_project_link.rb
+++ b/app/models/forked_project_link.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: forked_project_links
-#
-#  id                     :integer          not null, primary key
-#  forked_to_project_id   :integer          not null
-#  forked_from_project_id :integer          not null
-#  created_at             :datetime
-#  updated_at             :datetime
-#
-
 class ForkedProjectLink < ActiveRecord::Base
   belongs_to :forked_to_project, class_name: Project
   belongs_to :forked_from_project, class_name: Project
diff --git a/app/models/generic_commit_status.rb b/app/models/generic_commit_status.rb
index d4afd8cbe84..fa54e3540d0 100644
--- a/app/models/generic_commit_status.rb
+++ b/app/models/generic_commit_status.rb
@@ -1,40 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_builds
-#
-#  id                 :integer          not null, primary key
-#  project_id         :integer
-#  status             :string
-#  finished_at        :datetime
-#  trace              :text
-#  created_at         :datetime
-#  updated_at         :datetime
-#  started_at         :datetime
-#  runner_id          :integer
-#  coverage           :float
-#  commit_id          :integer
-#  commands           :text
-#  job_id             :integer
-#  name               :string
-#  deploy             :boolean          default(FALSE)
-#  options            :text
-#  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string
-#  trigger_request_id :integer
-#  stage_idx          :integer
-#  tag                :boolean
-#  ref                :string
-#  user_id            :integer
-#  type               :string
-#  target_url         :string
-#  description        :string
-#  artifacts_file     :text
-#  gl_project_id      :integer
-#  artifacts_metadata :text
-#  erased_by_id       :integer
-#  erased_at          :datetime
-#
-
 class GenericCommitStatus < CommitStatus
   before_validation :set_default_values
 
diff --git a/app/models/group.rb b/app/models/group.rb
index cff76877958..aec92e335e6 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,20 +1,3 @@
-# == Schema Information
-#
-# Table name: namespaces
-#
-#  id                    :integer          not null, primary key
-#  name                  :string           not null
-#  path                  :string           not null
-#  owner_id              :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  type                  :string
-#  description           :string           default(""), not null
-#  avatar                :string
-#  share_with_group_lock :boolean          default(FALSE)
-#  visibility_level      :integer          default(20), not null
-#
-
 require 'carrierwave/orm/activerecord'
 
 class Group < Namespace
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb
index 2b8f34a0568..ba42a8eeb70 100644
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
@@ -1,25 +1,3 @@
-# == Schema Information
-#
-# Table name: web_hooks
-#
-#  id                      :integer          not null, primary key
-#  url                     :string(2000)
-#  project_id              :integer
-#  created_at              :datetime
-#  updated_at              :datetime
-#  type                    :string           default("ProjectHook")
-#  service_id              :integer
-#  push_events             :boolean          default(TRUE), not null
-#  issues_events           :boolean          default(FALSE), not null
-#  merge_requests_events   :boolean          default(FALSE), not null
-#  tag_push_events         :boolean          default(FALSE)
-#  note_events             :boolean          default(FALSE), not null
-#  enable_ssl_verification :boolean          default(TRUE)
-#  build_events            :boolean          default(FALSE), not null
-#  wiki_page_events        :boolean          default(FALSE), not null
-#  token                   :string
-#
-
 class ProjectHook < WebHook
   belongs_to :project
 
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb
index 0e176de5ef8..eef24052a06 100644
--- a/app/models/hooks/service_hook.rb
+++ b/app/models/hooks/service_hook.rb
@@ -1,25 +1,3 @@
-# == Schema Information
-#
-# Table name: web_hooks
-#
-#  id                      :integer          not null, primary key
-#  url                     :string(2000)
-#  project_id              :integer
-#  created_at              :datetime
-#  updated_at              :datetime
-#  type                    :string           default("ProjectHook")
-#  service_id              :integer
-#  push_events             :boolean          default(TRUE), not null
-#  issues_events           :boolean          default(FALSE), not null
-#  merge_requests_events   :boolean          default(FALSE), not null
-#  tag_push_events         :boolean          default(FALSE)
-#  note_events             :boolean          default(FALSE), not null
-#  enable_ssl_verification :boolean          default(TRUE)
-#  build_events            :boolean          default(FALSE), not null
-#  wiki_page_events        :boolean          default(FALSE), not null
-#  token                   :string
-#
-
 class ServiceHook < WebHook
   belongs_to :service
 
diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb
index ad508cbbcb8..777bad1e724 100644
--- a/app/models/hooks/system_hook.rb
+++ b/app/models/hooks/system_hook.rb
@@ -1,25 +1,3 @@
-# == Schema Information
-#
-# Table name: web_hooks
-#
-#  id                      :integer          not null, primary key
-#  url                     :string(2000)
-#  project_id              :integer
-#  created_at              :datetime
-#  updated_at              :datetime
-#  type                    :string           default("ProjectHook")
-#  service_id              :integer
-#  push_events             :boolean          default(TRUE), not null
-#  issues_events           :boolean          default(FALSE), not null
-#  merge_requests_events   :boolean          default(FALSE), not null
-#  tag_push_events         :boolean          default(FALSE)
-#  note_events             :boolean          default(FALSE), not null
-#  enable_ssl_verification :boolean          default(TRUE)
-#  build_events            :boolean          default(FALSE), not null
-#  wiki_page_events        :boolean          default(FALSE), not null
-#  token                   :string
-#
-
 class SystemHook < WebHook
   def async_execute(data, hook_name)
     Sidekiq::Client.enqueue(SystemHookWorker, id, data, hook_name)
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 8e58c9583ab..fde05f729dc 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -1,25 +1,3 @@
-# == Schema Information
-#
-# Table name: web_hooks
-#
-#  id                      :integer          not null, primary key
-#  url                     :string(2000)
-#  project_id              :integer
-#  created_at              :datetime
-#  updated_at              :datetime
-#  type                    :string           default("ProjectHook")
-#  service_id              :integer
-#  push_events             :boolean          default(TRUE), not null
-#  issues_events           :boolean          default(FALSE), not null
-#  merge_requests_events   :boolean          default(FALSE), not null
-#  tag_push_events         :boolean          default(FALSE)
-#  note_events             :boolean          default(FALSE), not null
-#  enable_ssl_verification :boolean          default(TRUE)
-#  build_events            :boolean          default(FALSE), not null
-#  wiki_page_events        :boolean          default(FALSE), not null
-#  token                   :string
-#
-
 class WebHook < ActiveRecord::Base
   include Sortable
   include HTTParty
diff --git a/app/models/identity.rb b/app/models/identity.rb
index ef4d5f99091..3bacc450e6e 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: identities
-#
-#  id         :integer          not null, primary key
-#  extern_uid :string
-#  provider   :string
-#  user_id    :integer
-#  created_at :datetime
-#  updated_at :datetime
-#
-
 class Identity < ActiveRecord::Base
   include Sortable
   include CaseSensitivity
diff --git a/app/models/issue.rb b/app/models/issue.rb
index abaa509707c..2d4a9b9f19a 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: issues
-#
-#  id            :integer          not null, primary key
-#  title         :string
-#  assignee_id   :integer
-#  author_id     :integer
-#  project_id    :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  position      :integer          default(0)
-#  branch_name   :string
-#  description   :text
-#  milestone_id  :integer
-#  state         :string
-#  iid           :integer
-#  updated_by_id :integer
-#  moved_to_id   :integer
-#  confidential  :boolean          default(FALSE)
-#  deleted_at    :datetime
-#  due_date      :date
-#
-
 require 'carrierwave/orm/activerecord'
 
 class Issue < ActiveRecord::Base
diff --git a/app/models/key.rb b/app/models/key.rb
index b2b57849f8a..d52afda67d1 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: keys
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  key         :text
-#  title       :string
-#  type        :string
-#  fingerprint :string
-#  public      :boolean          default(FALSE), not null
-#
-
 require 'digest/md5'
 
 class Key < ActiveRecord::Base
diff --git a/app/models/label.rb b/app/models/label.rb
index 9a22398d952..83375db88cc 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: labels
-#
-#  id          :integer          not null, primary key
-#  title       :string
-#  color       :string
-#  project_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  template    :boolean          default(FALSE)
-#  description :string
-#
-
 class Label < ActiveRecord::Base
   include Referable
   include Subscribable
diff --git a/app/models/label_link.rb b/app/models/label_link.rb
index 7b8e872b6dd..47bd6eaf35f 100644
--- a/app/models/label_link.rb
+++ b/app/models/label_link.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: label_links
-#
-#  id          :integer          not null, primary key
-#  label_id    :integer
-#  target_id   :integer
-#  target_type :string
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 class LabelLink < ActiveRecord::Base
   belongs_to :target, polymorphic: true
   belongs_to :label
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index 927e764af92..18657c3e1c8 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: lfs_objects
-#
-#  id         :integer          not null, primary key
-#  oid        :string           not null
-#  size       :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
-#  file       :string
-#
-
 class LfsObject < ActiveRecord::Base
   has_many :lfs_objects_projects, dependent: :destroy
   has_many :projects, through: :lfs_objects_projects
diff --git a/app/models/lfs_objects_project.rb b/app/models/lfs_objects_project.rb
index 890736bfc80..0fd5f089db9 100644
--- a/app/models/lfs_objects_project.rb
+++ b/app/models/lfs_objects_project.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: lfs_objects_projects
-#
-#  id            :integer          not null, primary key
-#  lfs_object_id :integer          not null
-#  project_id    :integer          not null
-#  created_at    :datetime
-#  updated_at    :datetime
-#
-
 class LfsObjectsProject < ActiveRecord::Base
   belongs_to :project
   belongs_to :lfs_object
diff --git a/app/models/member.rb b/app/models/member.rb
index cca82da89f1..d3060f07fc0 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: members
-#
-#  id                 :integer          not null, primary key
-#  access_level       :integer          not null
-#  source_id          :integer          not null
-#  source_type        :string           not null
-#  user_id            :integer
-#  notification_level :integer          not null
-#  type               :string
-#  created_at         :datetime
-#  updated_at         :datetime
-#  created_by_id      :integer
-#  invite_email       :string
-#  invite_token       :string
-#  invite_accepted_at :datetime
-#
-
 class Member < ActiveRecord::Base
   include Sortable
   include Gitlab::Access
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index a48c1943e6f..f63a0debf1a 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: members
-#
-#  id                 :integer          not null, primary key
-#  access_level       :integer          not null
-#  source_id          :integer          not null
-#  source_type        :string           not null
-#  user_id            :integer
-#  notification_level :integer          not null
-#  type               :string
-#  created_at         :datetime
-#  updated_at         :datetime
-#  created_by_id      :integer
-#  invite_email       :string
-#  invite_token       :string
-#  invite_accepted_at :datetime
-#
-
 class GroupMember < Member
   SOURCE_TYPE = 'Namespace'
 
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 143350a0b55..8dae3bb2ef2 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: members
-#
-#  id                 :integer          not null, primary key
-#  access_level       :integer          not null
-#  source_id          :integer          not null
-#  source_type        :string           not null
-#  user_id            :integer
-#  notification_level :integer          not null
-#  type               :string
-#  created_at         :datetime
-#  updated_at         :datetime
-#  created_by_id      :integer
-#  invite_email       :string
-#  invite_token       :string
-#  invite_accepted_at :datetime
-#
-
 class ProjectMember < Member
   SOURCE_TYPE = 'Project'
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 4175e1e5fba..5460935366c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1,33 +1,3 @@
-# == Schema Information
-#
-# Table name: merge_requests
-#
-#  id                        :integer          not null, primary key
-#  target_branch             :string           not null
-#  source_branch             :string           not null
-#  source_project_id         :integer          not null
-#  author_id                 :integer
-#  assignee_id               :integer
-#  title                     :string
-#  created_at                :datetime
-#  updated_at                :datetime
-#  milestone_id              :integer
-#  state                     :string
-#  merge_status              :string
-#  target_project_id         :integer          not null
-#  iid                       :integer
-#  description               :text
-#  position                  :integer          default(0)
-#  locked_at                 :datetime
-#  updated_by_id             :integer
-#  merge_error               :string
-#  merge_params              :text
-#  merge_when_build_succeeds :boolean          default(FALSE), not null
-#  merge_user_id             :integer
-#  merge_commit_sha          :string
-#  deleted_at                :datetime
-#
-
 class MergeRequest < ActiveRecord::Base
   include InternalId
   include Issuable
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 8951e92a0b8..eb42c07b9b9 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: merge_request_diffs
-#
-#  id               :integer          not null, primary key
-#  state            :string
-#  st_commits       :text
-#  st_diffs         :text
-#  merge_request_id :integer          not null
-#  created_at       :datetime
-#  updated_at       :datetime
-#  base_commit_sha  :string
-#  real_size        :string
-#
-
 class MergeRequestDiff < ActiveRecord::Base
   include Sortable
 
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 5ee8a965ad8..97705a374d7 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: milestones
-#
-#  id          :integer          not null, primary key
-#  title       :string           not null
-#  project_id  :integer          not null
-#  description :text
-#  due_date    :date
-#  created_at  :datetime
-#  updated_at  :datetime
-#  state       :string
-#  iid         :integer
-#
-
 class Milestone < ActiveRecord::Base
   # Represents a "No Milestone" state used for filtering Issues and Merge
   # Requests that have no milestone assigned.
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 741e912171d..9c942a8f4e3 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -1,20 +1,3 @@
-# == Schema Information
-#
-# Table name: namespaces
-#
-#  id                    :integer          not null, primary key
-#  name                  :string           not null
-#  path                  :string           not null
-#  owner_id              :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  type                  :string
-#  description           :string           default(""), not null
-#  avatar                :string
-#  share_with_group_lock :boolean          default(FALSE)
-#  visibility_level      :integer          default(20), not null
-#
-
 class Namespace < ActiveRecord::Base
   include Sortable
   include Gitlab::ShellAdapter
diff --git a/app/models/note.rb b/app/models/note.rb
index deee2b9e885..f26aa1bf63f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,24 +1,3 @@
-# == Schema Information
-#
-# Table name: notes
-#
-#  id            :integer          not null, primary key
-#  note          :text
-#  noteable_type :string
-#  author_id     :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  project_id    :integer
-#  attachment    :string
-#  line_code     :string
-#  commit_id     :string
-#  noteable_id   :integer
-#  system        :boolean          default(FALSE), not null
-#  st_diff       :text
-#  updated_by_id :integer
-#  is_award      :boolean          default(FALSE), not null
-#
-
 require 'carrierwave/orm/activerecord'
 
 class Note < ActiveRecord::Base
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 846773752a6..5001738f411 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: notification_settings
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer          not null
-#  source_id   :integer          not null
-#  source_type :string           not null
-#  level       :integer          default(0), not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#
-
 class NotificationSetting < ActiveRecord::Base
   enum level: { disabled: 0,  participating: 1,  watch: 2,  global: 3, mention: 4 }
 
diff --git a/app/models/oauth_access_token.rb b/app/models/oauth_access_token.rb
index c78c7f4aa0e..116fb71ac08 100644
--- a/app/models/oauth_access_token.rb
+++ b/app/models/oauth_access_token.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: oauth_access_tokens
-#
-#  id                :integer          not null, primary key
-#  resource_owner_id :integer
-#  application_id    :integer
-#  token             :string           not null
-#  refresh_token     :string
-#  expires_in        :integer
-#  revoked_at        :datetime
-#  created_at        :datetime         not null
-#  scopes            :string
-#
-
 class OauthAccessToken < ActiveRecord::Base
   belongs_to :resource_owner, class_name: 'User'
   belongs_to :application, class_name: 'Doorkeeper::Application'
diff --git a/app/models/personal_snippet.rb b/app/models/personal_snippet.rb
index 1d5f4c50254..82c1c4de3a0 100644
--- a/app/models/personal_snippet.rb
+++ b/app/models/personal_snippet.rb
@@ -1,18 +1,2 @@
-# == Schema Information
-#
-# Table name: snippets
-#
-#  id               :integer          not null, primary key
-#  title            :string
-#  content          :text
-#  author_id        :integer          not null
-#  project_id       :integer
-#  created_at       :datetime
-#  updated_at       :datetime
-#  file_name        :string
-#  type             :string
-#  visibility_level :integer          default(0), not null
-#
-
 class PersonalSnippet < Snippet
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 05e14185a3e..418b85e028a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,48 +1,3 @@
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                           :integer          not null, primary key
-#  name                         :string
-#  path                         :string
-#  description                  :text
-#  created_at                   :datetime
-#  updated_at                   :datetime
-#  creator_id                   :integer
-#  issues_enabled               :boolean          default(TRUE), not null
-#  merge_requests_enabled       :boolean          default(TRUE), not null
-#  wiki_enabled                 :boolean          default(TRUE), not null
-#  namespace_id                 :integer
-#  issues_tracker               :string           default("gitlab"), not null
-#  issues_tracker_id            :string
-#  snippets_enabled             :boolean          default(TRUE), not null
-#  last_activity_at             :datetime
-#  import_url                   :string
-#  visibility_level             :integer          default(0), not null
-#  archived                     :boolean          default(FALSE), not null
-#  avatar                       :string
-#  import_status                :string
-#  repository_size              :float            default(0.0)
-#  star_count                   :integer          default(0), not null
-#  import_type                  :string
-#  import_source                :string
-#  commit_count                 :integer          default(0)
-#  import_error                 :text
-#  ci_id                        :integer
-#  builds_enabled               :boolean          default(TRUE), not null
-#  shared_runners_enabled       :boolean          default(TRUE), not null
-#  runners_token                :string
-#  build_coverage_regex         :string
-#  build_allow_git_fetch        :boolean          default(TRUE), not null
-#  build_timeout                :integer          default(3600), not null
-#  pending_delete               :boolean          default(FALSE)
-#  public_builds                :boolean          default(TRUE), not null
-#  main_language                :string
-#  pushes_since_gc              :integer          default(0)
-#  last_repository_check_failed :boolean
-#  last_repository_check_at     :datetime
-#
-
 require 'carrierwave/orm/activerecord'
 
 class Project < ActiveRecord::Base
diff --git a/app/models/project_group_link.rb b/app/models/project_group_link.rb
index 66f5a609bf5..e52a6bd7c84 100644
--- a/app/models/project_group_link.rb
+++ b/app/models/project_group_link.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: project_group_links
-#
-#  id           :integer          not null, primary key
-#  project_id   :integer          not null
-#  group_id     :integer          not null
-#  created_at   :datetime
-#  updated_at   :datetime
-#  group_access :integer          default(30), not null
-#
-
 class ProjectGroupLink < ActiveRecord::Base
   GUEST     = 10
   REPORTER  = 20
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index 7830f764ed3..e2f9ffb69ac 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: project_import_data
-#
-#  id                         :integer          not null, primary key
-#  project_id                 :integer
-#  data                       :text
-#  encrypted_credentials      :text
-#  encrypted_credentials_iv   :string
-#  encrypted_credentials_salt :string
-#
-
 require 'carrierwave/orm/activerecord'
 
 class ProjectImportData < ActiveRecord::Base
diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 368485a060a..7c23b766763 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 require 'asana'
 
 class AsanaService < Service
diff --git a/app/models/project_services/assembla_service.rb b/app/models/project_services/assembla_service.rb
index ffb7455b014..d839221d315 100644
--- a/app/models/project_services/assembla_service.rb
+++ b/app/models/project_services/assembla_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class AssemblaService < Service
   include HTTParty
 
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb
index c36ee95e378..1d1780dcfbf 100644
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class BambooService < CiService
   include HTTParty
 
diff --git a/app/models/project_services/buildkite_service.rb b/app/models/project_services/buildkite_service.rb
index f9f4897a065..86a06321e21 100644
--- a/app/models/project_services/buildkite_service.rb
+++ b/app/models/project_services/buildkite_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 require "addressable/uri"
 
 class BuildkiteService < CiService
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index 20cdfcaffb2..54da4d74fc5 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class BuildsEmailService < Service
   prop_accessor :recipients
   boolean_accessor :add_pusher
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index 28c969fe57f..511b2eac792 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class CampfireService < Service
   prop_accessor :token, :subdomain, :room
   validates :token, presence: true, if: :activated?
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb
index 9bc8f982da6..596c00705ad 100644
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 # Base class for CI services
 # List methods you need to implement to get your CI service
 # working with GitLab Merge Requests
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
index 4d1319eb6f8..6b2b1daa724 100644
--- a/app/models/project_services/custom_issue_tracker_service.rb
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class CustomIssueTrackerService < IssueTrackerService
 
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb
index d8e00e018cc..966dbc41d73 100644
--- a/app/models/project_services/drone_ci_service.rb
+++ b/app/models/project_services/drone_ci_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class DroneCiService < CiService
 
   prop_accessor :drone_url, :token, :enable_ssl_verification
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index 2dbd29062df..e0083c43adb 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class EmailsOnPushService < Service
   prop_accessor :send_from_committer_email
   prop_accessor :disable_diffs
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index 5469049bb5e..f042bfc5210 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class ExternalWikiService < Service
   include HTTParty
 
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index 3dc1e0fbe8b..dd00275187f 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 require "flowdock-git-hook"
 
 class FlowdockService < Service
diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb
index b4c311cf664..598aca5e06d 100644
--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 require "gemnasium/gitlab_service"
 
 class GemnasiumService < Service
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index a92f7226083..bbc312f5215 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 # TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed
 class GitlabCiService < CiService
   # We override the active accessor to always make GitLabCiService disabled
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb
index 1adaeeb3b2b..5d17c358330 100644
--- a/app/models/project_services/gitlab_issue_tracker_service.rb
+++ b/app/models/project_services/gitlab_issue_tracker_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class GitlabIssueTrackerService < IssueTrackerService
   include Gitlab::Routing.url_helpers
 
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index f9ddf588722..0ff4f4c8dd2 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class HipchatService < Service
   MAX_COMMITS = 3
 
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index b9a592d7096..91015e6c9b1 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 require 'uri'
 
 class IrkerService < Service
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index 98a3a7c6b86..6ae9b16d3ce 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class IssueTrackerService < Service
 
   validates :project_url, :issues_url, :new_issue_url, presence: true, url: true, if: :activated?
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index ba68658f0bd..beda89d3963 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class JiraService < IssueTrackerService
   include HTTParty
   include Gitlab::Routing.url_helpers
diff --git a/app/models/project_services/pivotaltracker_service.rb b/app/models/project_services/pivotaltracker_service.rb
index acaa0c39365..ad19b7795da 100644
--- a/app/models/project_services/pivotaltracker_service.rb
+++ b/app/models/project_services/pivotaltracker_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class PivotaltrackerService < Service
   include HTTParty
 
diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index a640c8cb440..3dd878e4c7d 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class PushoverService < Service
   include HTTParty
   base_uri 'https://api.pushover.net/1'
diff --git a/app/models/project_services/redmine_service.rb b/app/models/project_services/redmine_service.rb
index e2137e92c62..11cce3e0561 100644
--- a/app/models/project_services/redmine_service.rb
+++ b/app/models/project_services/redmine_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class RedmineService < IssueTrackerService
 
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 83ffa53a407..cf9e4d5a8b6 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class SlackService < Service
   prop_accessor :webhook, :username, :channel
   boolean_accessor :notify_only_broken_builds
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index 4015da31509..b0dcb52eba1 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 class TeamcityService < CiService
   include HTTParty
 
diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb
index b4b2807eba4..5fba6baa204 100644
--- a/app/models/project_snippet.rb
+++ b/app/models/project_snippet.rb
@@ -1,19 +1,3 @@
-# == Schema Information
-#
-# Table name: snippets
-#
-#  id               :integer          not null, primary key
-#  title            :string
-#  content          :text
-#  author_id        :integer          not null
-#  project_id       :integer
-#  created_at       :datetime
-#  updated_at       :datetime
-#  file_name        :string
-#  type             :string
-#  visibility_level :integer          default(0), not null
-#
-
 class ProjectSnippet < Snippet
   belongs_to :project
   belongs_to :author, class_name: "User"
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 3d2052c892c..33cf046fa75 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: protected_branches
-#
-#  id                  :integer          not null, primary key
-#  project_id          :integer          not null
-#  name                :string           not null
-#  created_at          :datetime
-#  updated_at          :datetime
-#  developers_can_push :boolean          default(FALSE), not null
-#
-
 class ProtectedBranch < ActiveRecord::Base
   include Gitlab::ShellAdapter
 
diff --git a/app/models/release.rb b/app/models/release.rb
index dc700d1ea5a..e196b84eb18 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: releases
-#
-#  id          :integer          not null, primary key
-#  tag         :string
-#  description :text
-#  project_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 class Release < ActiveRecord::Base
   belongs_to :project
 
diff --git a/app/models/security_event.rb b/app/models/security_event.rb
index 0bee03974f1..d131c11cb6c 100644
--- a/app/models/security_event.rb
+++ b/app/models/security_event.rb
@@ -1,16 +1,2 @@
-# == Schema Information
-#
-# Table name: audit_events
-#
-#  id          :integer          not null, primary key
-#  author_id   :integer          not null
-#  type        :string           not null
-#  entity_id   :integer          not null
-#  entity_type :string           not null
-#  details     :text
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 class SecurityEvent < AuditEvent
 end
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 99279a2e083..375f195dba7 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: sent_notifications
-#
-#  id            :integer          not null, primary key
-#  project_id    :integer
-#  noteable_id   :integer
-#  noteable_type :string
-#  recipient_id  :integer
-#  commit_id     :string
-#  reply_key     :string           not null
-#  line_code     :string
-#
-
 class SentNotification < ActiveRecord::Base
   belongs_to :project
   belongs_to :noteable, polymorphic: true
diff --git a/app/models/service.rb b/app/models/service.rb
index bf16a545307..de3fd24584a 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -1,27 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string
-#  title                 :string
-#  project_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  active                :boolean          not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#  category              :string           default("common"), not null
-#  default               :boolean          default(FALSE)
-#  wiki_page_events      :boolean          default(TRUE)
-#
-
 # To add new service you should build a class inherited from Service
 # and implement a set of methods
 class Service < ActiveRecord::Base
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 2f905a90942..0a3c3b57669 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -1,19 +1,3 @@
-# == Schema Information
-#
-# Table name: snippets
-#
-#  id               :integer          not null, primary key
-#  title            :string
-#  content          :text
-#  author_id        :integer          not null
-#  project_id       :integer
-#  created_at       :datetime
-#  updated_at       :datetime
-#  file_name        :string
-#  type             :string
-#  visibility_level :integer          default(0), not null
-#
-
 class Snippet < ActiveRecord::Base
   include Gitlab::VisibilityLevel
   include Linguist::BlobHelper
diff --git a/app/models/spam_log.rb b/app/models/spam_log.rb
index f49eb7d88e2..12df68ef83b 100644
--- a/app/models/spam_log.rb
+++ b/app/models/spam_log.rb
@@ -1,20 +1,3 @@
-# == Schema Information
-#
-# Table name: spam_logs
-#
-#  id            :integer          not null, primary key
-#  user_id       :integer
-#  source_ip     :string
-#  user_agent    :string
-#  via_api       :boolean
-#  project_id    :integer
-#  noteable_type :string
-#  title         :string
-#  description   :text
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#
-
 class SpamLog < ActiveRecord::Base
   belongs_to :user
 
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 242faa7d32e..3b8aa1eb866 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: subscriptions
-#
-#  id                :integer          not null, primary key
-#  user_id           :integer
-#  subscribable_id   :integer
-#  subscribable_type :string
-#  subscribed        :boolean
-#  created_at        :datetime
-#  updated_at        :datetime
-#
-
 class Subscription < ActiveRecord::Base
   belongs_to :user
   belongs_to :subscribable, polymorphic: true
diff --git a/app/models/todo.rb b/app/models/todo.rb
index d85f7bfdf57..f8b59fe4126 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -1,21 +1,3 @@
-# == Schema Information
-#
-# Table name: todos
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer          not null
-#  project_id  :integer          not null
-#  target_id   :integer
-#  target_type :string           not null
-#  author_id   :integer
-#  action      :integer          not null
-#  state       :string           not null
-#  created_at  :datetime
-#  updated_at  :datetime
-#  note_id     :integer
-#  commit_id   :string
-#
-
 class Todo < ActiveRecord::Base
   ASSIGNED  = 1
   MENTIONED = 2
diff --git a/app/models/user.rb b/app/models/user.rb
index 56d6de610f0..1e4814641d1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,68 +1,3 @@
-# == Schema Information
-#
-# Table name: users
-#
-#  id                          :integer          not null, primary key
-#  email                       :string           default(""), not null
-#  encrypted_password          :string           default(""), not null
-#  reset_password_token        :string
-#  reset_password_sent_at      :datetime
-#  remember_created_at         :datetime
-#  sign_in_count               :integer          default(0)
-#  current_sign_in_at          :datetime
-#  last_sign_in_at             :datetime
-#  current_sign_in_ip          :string
-#  last_sign_in_ip             :string
-#  created_at                  :datetime
-#  updated_at                  :datetime
-#  name                        :string
-#  admin                       :boolean          default(FALSE), not null
-#  projects_limit              :integer          default(10)
-#  skype                       :string           default(""), not null
-#  linkedin                    :string           default(""), not null
-#  twitter                     :string           default(""), not null
-#  authentication_token        :string
-#  theme_id                    :integer          default(1), not null
-#  bio                         :string
-#  failed_attempts             :integer          default(0)
-#  locked_at                   :datetime
-#  username                    :string
-#  can_create_group            :boolean          default(TRUE), not null
-#  can_create_team             :boolean          default(TRUE), not null
-#  state                       :string
-#  color_scheme_id             :integer          default(1), not null
-#  notification_level          :integer          default(1), not null
-#  password_expires_at         :datetime
-#  created_by_id               :integer
-#  last_credential_check_at    :datetime
-#  avatar                      :string
-#  confirmation_token          :string
-#  confirmed_at                :datetime
-#  confirmation_sent_at        :datetime
-#  unconfirmed_email           :string
-#  hide_no_ssh_key             :boolean          default(FALSE)
-#  website_url                 :string           default(""), not null
-#  notification_email          :string
-#  hide_no_password            :boolean          default(FALSE)
-#  password_automatically_set  :boolean          default(FALSE)
-#  location                    :string
-#  encrypted_otp_secret        :string
-#  encrypted_otp_secret_iv     :string
-#  encrypted_otp_secret_salt   :string
-#  otp_required_for_login      :boolean          default(FALSE), not null
-#  otp_backup_codes            :text
-#  public_email                :string           default(""), not null
-#  dashboard                   :integer          default(0)
-#  project_view                :integer          default(0)
-#  consumed_timestep           :integer
-#  layout                      :integer          default(0)
-#  hide_project_limit          :boolean          default(FALSE)
-#  unlock_token                :string
-#  otp_grace_period_started_at :datetime
-#  ldap_email                  :boolean          default(FALSE), not null
-#  external                    :boolean          default(FALSE)
-#
-
 require 'carrierwave/orm/activerecord'
 
 class User < ActiveRecord::Base
diff --git a/app/models/users_star_project.rb b/app/models/users_star_project.rb
index 413f3f485a8..0dfe597317e 100644
--- a/app/models/users_star_project.rb
+++ b/app/models/users_star_project.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: users_star_projects
-#
-#  id         :integer          not null, primary key
-#  project_id :integer          not null
-#  user_id    :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
-#
-
 class UsersStarProject < ActiveRecord::Base
   belongs_to :project, counter_cache: :star_count, touch: true
   belongs_to :user
diff --git a/spec/factories/abuse_reports.rb b/spec/factories/abuse_reports.rb
index d0e8c778518..8f6422a7825 100644
--- a/spec/factories/abuse_reports.rb
+++ b/spec/factories/abuse_reports.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: abuse_reports
-#
-#  id          :integer          not null, primary key
-#  reporter_id :integer
-#  user_id     :integer
-#  message     :text
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 FactoryGirl.define do
   factory :abuse_report do
     reporter factory: :user
diff --git a/spec/factories/broadcast_messages.rb b/spec/factories/broadcast_messages.rb
index c80e7366551..efe9803b1a7 100644
--- a/spec/factories/broadcast_messages.rb
+++ b/spec/factories/broadcast_messages.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: broadcast_messages
-#
-#  id         :integer          not null, primary key
-#  message    :text             not null
-#  starts_at  :datetime
-#  ends_at    :datetime
-#  created_at :datetime
-#  updated_at :datetime
-#  color      :string(255)
-#  font       :string(255)
-#
-
 FactoryGirl.define do
   factory :broadcast_message do
     message "MyText"
diff --git a/spec/factories/forked_project_links.rb b/spec/factories/forked_project_links.rb
index 19a54946fe0..b16c1272e68 100644
--- a/spec/factories/forked_project_links.rb
+++ b/spec/factories/forked_project_links.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: forked_project_links
-#
-#  id                     :integer          not null, primary key
-#  forked_to_project_id   :integer          not null
-#  forked_from_project_id :integer          not null
-#  created_at             :datetime
-#  updated_at             :datetime
-#
-
 FactoryGirl.define do
   factory :forked_project_link do
     association :forked_to_project, factory: :project
diff --git a/spec/factories/label_links.rb b/spec/factories/label_links.rb
index 2939d4307c5..3580174e873 100644
--- a/spec/factories/label_links.rb
+++ b/spec/factories/label_links.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: label_links
-#
-#  id          :integer          not null, primary key
-#  label_id    :integer
-#  target_id   :integer
-#  target_type :string(255)
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 FactoryGirl.define do
   factory :label_link do
     label
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index ea2be8928d5..eb489099854 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: labels
-#
-#  id         :integer          not null, primary key
-#  title      :string(255)
-#  color      :string(255)
-#  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  template   :boolean          default(FALSE)
-#
-
 FactoryGirl.define do
   factory :label do
     sequence(:title) { |n| "label#{n}" }
diff --git a/spec/factories/lfs_objects.rb b/spec/factories/lfs_objects.rb
index 327858ce435..a81645acd2b 100644
--- a/spec/factories/lfs_objects.rb
+++ b/spec/factories/lfs_objects.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: lfs_objects
-#
-#  id         :integer          not null, primary key
-#  oid        :string(255)      not null
-#  size       :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
-#  file       :string(255)
-#
-
 include ActionDispatch::TestProcess
 
 FactoryGirl.define do
diff --git a/spec/factories/lfs_objects_projects.rb b/spec/factories/lfs_objects_projects.rb
index 50b45843c99..1ed0355c8e4 100644
--- a/spec/factories/lfs_objects_projects.rb
+++ b/spec/factories/lfs_objects_projects.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: lfs_objects_projects
-#
-#  id            :integer          not null, primary key
-#  lfs_object_id :integer          not null
-#  project_id    :integer          not null
-#  created_at    :datetime
-#  updated_at    :datetime
-#
-
 FactoryGirl.define do
   factory :lfs_objects_project do
     lfs_object
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index e281e2f227b..c6a08d78b78 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -1,32 +1,3 @@
-# == Schema Information
-#
-# Table name: merge_requests
-#
-#  id                        :integer          not null, primary key
-#  target_branch             :string(255)      not null
-#  source_branch             :string(255)      not null
-#  source_project_id         :integer          not null
-#  author_id                 :integer
-#  assignee_id               :integer
-#  title                     :string(255)
-#  created_at                :datetime
-#  updated_at                :datetime
-#  milestone_id              :integer
-#  state                     :string(255)
-#  merge_status              :string(255)
-#  target_project_id         :integer          not null
-#  iid                       :integer
-#  description               :text
-#  position                  :integer          default(0)
-#  locked_at                 :datetime
-#  updated_by_id             :integer
-#  merge_error               :string(255)
-#  merge_params              :text
-#  merge_when_build_succeeds :boolean          default(FALSE), not null
-#  merge_user_id             :integer
-#  merge_commit_sha          :string
-#
-
 FactoryGirl.define do
   factory :merge_request do
     title
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index e5dcb159014..840b13196a6 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -1,24 +1,3 @@
-# == Schema Information
-#
-# Table name: notes
-#
-#  id            :integer          not null, primary key
-#  note          :text
-#  noteable_type :string(255)
-#  author_id     :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  project_id    :integer
-#  attachment    :string(255)
-#  line_code     :string(255)
-#  commit_id     :string(255)
-#  noteable_id   :integer
-#  system        :boolean          default(FALSE), not null
-#  st_diff       :text
-#  updated_by_id :integer
-#  is_award      :boolean          default(FALSE), not null
-#
-
 require_relative '../support/repo_helpers'
 
 include ActionDispatch::TestProcess
diff --git a/spec/factories/oauth_access_tokens.rb b/spec/factories/oauth_access_tokens.rb
index 7700b15d538..ccf02d0719b 100644
--- a/spec/factories/oauth_access_tokens.rb
+++ b/spec/factories/oauth_access_tokens.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: oauth_access_tokens
-#
-#  id                :integer          not null, primary key
-#  resource_owner_id :integer
-#  application_id    :integer
-#  token             :string           not null
-#  refresh_token     :string
-#  expires_in        :integer
-#  revoked_at        :datetime
-#  created_at        :datetime         not null
-#  scopes            :string
-#
-
 FactoryGirl.define do
   factory :oauth_access_token do
     resource_owner
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 4d61345696a..da8d97c9f82 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -1,42 +1,3 @@
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)
-#  path                   :string(255)
-#  description            :text
-#  created_at             :datetime
-#  updated_at             :datetime
-#  creator_id             :integer
-#  issues_enabled         :boolean          default(TRUE), not null
-#  merge_requests_enabled :boolean          default(TRUE), not null
-#  wiki_enabled           :boolean          default(TRUE), not null
-#  namespace_id           :integer
-#  issues_tracker         :string(255)      default("gitlab"), not null
-#  issues_tracker_id      :string(255)
-#  snippets_enabled       :boolean          default(TRUE), not null
-#  last_activity_at       :datetime
-#  import_url             :string(255)
-#  visibility_level       :integer          default(0), not null
-#  archived               :boolean          default(FALSE), not null
-#  avatar                 :string(255)
-#  import_status          :string(255)
-#  repository_size        :float            default(0.0)
-#  star_count             :integer          default(0), not null
-#  import_type            :string(255)
-#  import_source          :string(255)
-#  commit_count           :integer          default(0)
-#  import_error           :text
-#  ci_id                  :integer
-#  builds_enabled         :boolean          default(TRUE), not null
-#  shared_runners_enabled :boolean          default(TRUE), not null
-#  runners_token          :string
-#  build_coverage_regex   :string
-#  build_allow_git_fetch  :boolean          default(TRUE), not null
-#  build_timeout          :integer          default(3600), not null
-#
-
 FactoryGirl.define do
   # Project without repository
   #
diff --git a/spec/factories/releases.rb b/spec/factories/releases.rb
index 7f331c37256..74497dc82c0 100644
--- a/spec/factories/releases.rb
+++ b/spec/factories/releases.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: releases
-#
-#  id          :integer          not null, primary key
-#  tag         :string(255)
-#  description :text
-#  project_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 FactoryGirl.define do
   factory :release do
     tag "v1.1.0"
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb
index 7ae06c27840..e3681ae93a5 100644
--- a/spec/factories/todos.rb
+++ b/spec/factories/todos.rb
@@ -1,21 +1,3 @@
-# == Schema Information
-#
-# Table name: todos
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer          not null
-#  project_id  :integer          not null
-#  target_id   :integer
-#  target_type :string           not null
-#  author_id   :integer
-#  action      :integer          not null
-#  state       :string           not null
-#  created_at  :datetime
-#  updated_at  :datetime
-#  note_id     :integer
-#  commit_id   :string
-#
-
 FactoryGirl.define do
   factory :todo do
     project
diff --git a/spec/models/abuse_report_spec.rb b/spec/models/abuse_report_spec.rb
index ac12ab6c757..305f8bc88cc 100644
--- a/spec/models/abuse_report_spec.rb
+++ b/spec/models/abuse_report_spec.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: abuse_reports
-#
-#  id          :integer          not null, primary key
-#  reporter_id :integer
-#  user_id     :integer
-#  message     :text
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 require 'rails_helper'
 
 RSpec.describe AbuseReport, type: :model do
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 520cf1b75de..1ce22feed5c 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -1,49 +1,3 @@
-# == Schema Information
-#
-# Table name: application_settings
-#
-#  id                                :integer          not null, primary key
-#  default_projects_limit            :integer
-#  signup_enabled                    :boolean
-#  signin_enabled                    :boolean
-#  gravatar_enabled                  :boolean
-#  sign_in_text                      :text
-#  created_at                        :datetime
-#  updated_at                        :datetime
-#  home_page_url                     :string(255)
-#  default_branch_protection         :integer          default(2)
-#  restricted_visibility_levels      :text
-#  version_check_enabled             :boolean          default(TRUE)
-#  max_attachment_size               :integer          default(10), not null
-#  default_project_visibility        :integer
-#  default_snippet_visibility        :integer
-#  restricted_signup_domains         :text
-#  user_oauth_applications           :boolean          default(TRUE)
-#  after_sign_out_path               :string(255)
-#  session_expire_delay              :integer          default(10080), not null
-#  import_sources                    :text
-#  help_page_text                    :text
-#  admin_notification_email          :string(255)
-#  shared_runners_enabled            :boolean          default(TRUE), not null
-#  max_artifacts_size                :integer          default(100), not null
-#  runners_registration_token        :string
-#  require_two_factor_authentication :boolean          default(FALSE)
-#  two_factor_grace_period           :integer          default(48)
-#  metrics_enabled                   :boolean          default(FALSE)
-#  metrics_host                      :string           default("localhost")
-#  metrics_username                  :string
-#  metrics_password                  :string
-#  metrics_pool_size                 :integer          default(16)
-#  metrics_timeout                   :integer          default(10)
-#  metrics_method_call_threshold     :integer          default(10)
-#  recaptcha_enabled                 :boolean          default(FALSE)
-#  recaptcha_site_key                :string
-#  recaptcha_private_key             :string
-#  metrics_port                      :integer          default(8089)
-#  sentry_enabled                    :boolean          default(FALSE)
-#  sentry_dsn                        :string
-#
-
 require 'spec_helper'
 
 describe ApplicationSetting, models: true do
diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb
index f6f84db57e6..6ad8bfef4f2 100644
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: broadcast_messages
-#
-#  id         :integer          not null, primary key
-#  message    :text             not null
-#  starts_at  :datetime
-#  ends_at    :datetime
-#  created_at :datetime
-#  updated_at :datetime
-#  color      :string(255)
-#  font       :string(255)
-#
-
 require 'spec_helper'
 
 describe BroadcastMessage, models: true do
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index a747aa08447..dc071ad1c90 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -1,21 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_commits
-#
-#  id            :integer          not null, primary key
-#  project_id    :integer
-#  ref           :string(255)
-#  sha           :string(255)
-#  before_sha    :string(255)
-#  push_data     :text
-#  created_at    :datetime
-#  updated_at    :datetime
-#  tag           :boolean          default(FALSE)
-#  yaml_errors   :text
-#  committed_at  :datetime
-#  gl_project_id :integer
-#
-
 require 'spec_helper'
 
 describe Ci::Commit, models: true do
diff --git a/spec/models/ci/runner_project_spec.rb b/spec/models/ci/runner_project_spec.rb
index 000a732db77..95fc160b238 100644
--- a/spec/models/ci/runner_project_spec.rb
+++ b/spec/models/ci/runner_project_spec.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_runner_projects
-#
-#  id            :integer          not null, primary key
-#  runner_id     :integer          not null
-#  project_id    :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  gl_project_id :integer
-#
-
 require 'spec_helper'
 
 describe Ci::RunnerProject, models: true do
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 25e9e5eca48..eaa94228922 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_runners
-#
-#  id           :integer          not null, primary key
-#  token        :string(255)
-#  created_at   :datetime
-#  updated_at   :datetime
-#  description  :string(255)
-#  contacted_at :datetime
-#  active       :boolean          default(TRUE), not null
-#  is_shared    :boolean          default(FALSE)
-#  name         :string(255)
-#  version      :string(255)
-#  revision     :string(255)
-#  platform     :string(255)
-#  architecture :string(255)
-#
-
 require 'spec_helper'
 
 describe Ci::Runner, models: true do
diff --git a/spec/models/ci/trigger_spec.rb b/spec/models/ci/trigger_spec.rb
index 159be939300..474b0b1621d 100644
--- a/spec/models/ci/trigger_spec.rb
+++ b/spec/models/ci/trigger_spec.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_triggers
-#
-#  id            :integer          not null, primary key
-#  token         :string(255)
-#  project_id    :integer
-#  deleted_at    :datetime
-#  created_at    :datetime
-#  updated_at    :datetime
-#  gl_project_id :integer
-#
-
 require 'spec_helper'
 
 describe Ci::Trigger, models: true do
diff --git a/spec/models/ci/variable_spec.rb b/spec/models/ci/variable_spec.rb
index 71e84091cb7..c712d211b0f 100644
--- a/spec/models/ci/variable_spec.rb
+++ b/spec/models/ci/variable_spec.rb
@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_variables
-#
-#  id                   :integer          not null, primary key
-#  project_id           :integer
-#  key                  :string(255)
-#  value                :text
-#  encrypted_value      :text
-#  encrypted_value_salt :string(255)
-#  encrypted_value_iv   :string(255)
-#  gl_project_id        :integer
-#
-
 require 'spec_helper'
 
 describe Ci::Variable, models: true do
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 971e6750375..434e58cfd06 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -1,37 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_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
-#  coverage           :float
-#  commit_id          :integer
-#  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
-#  stage_idx          :integer
-#  tag                :boolean
-#  ref                :string(255)
-#  user_id            :integer
-#  type               :string(255)
-#  target_url         :string(255)
-#  description        :string(255)
-#  artifacts_file     :text
-#  gl_project_id      :integer
-#
-
 require 'spec_helper'
 
 describe CommitStatus, models: true do
diff --git a/spec/models/deploy_key_spec.rb b/spec/models/deploy_key_spec.rb
index 64ba778afea..6a90598a629 100644
--- a/spec/models/deploy_key_spec.rb
+++ b/spec/models/deploy_key_spec.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: keys
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  key         :text
-#  title       :string(255)
-#  type        :string(255)
-#  fingerprint :string(255)
-#  public      :boolean          default(FALSE), not null
-#
-
 require 'spec_helper'
 
 describe DeployKey, models: true do
diff --git a/spec/models/deploy_keys_project_spec.rb b/spec/models/deploy_keys_project_spec.rb
index 8aedbfb8636..8a1e337c1a3 100644
--- a/spec/models/deploy_keys_project_spec.rb
+++ b/spec/models/deploy_keys_project_spec.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: deploy_keys_projects
-#
-#  id            :integer          not null, primary key
-#  deploy_key_id :integer          not null
-#  project_id    :integer          not null
-#  created_at    :datetime
-#  updated_at    :datetime
-#
-
 require 'spec_helper'
 
 describe DeployKeysProject, models: true do
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
index a20a6149649..5d0bd31db5a 100644
--- a/spec/models/email_spec.rb
+++ b/spec/models/email_spec.rb
@@ -1,14 +1,3 @@
-# == 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
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 0c3cd13f399..b0e76fec693 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -1,19 +1,3 @@
-# == Schema Information
-#
-# Table name: events
-#
-#  id          :integer          not null, primary key
-#  target_type :string(255)
-#  target_id   :integer
-#  title       :string(255)
-#  data        :text
-#  project_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  action      :integer
-#  author_id   :integer
-#
-
 require 'spec_helper'
 
 describe Event, models: true do
diff --git a/spec/models/forked_project_link_spec.rb b/spec/models/forked_project_link_spec.rb
index d90fbfe1ea5..3b817608ce0 100644
--- a/spec/models/forked_project_link_spec.rb
+++ b/spec/models/forked_project_link_spec.rb
@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: forked_project_links
-#
-#  id                     :integer          not null, primary key
-#  forked_to_project_id   :integer          not null
-#  forked_from_project_id :integer          not null
-#  created_at             :datetime
-#  updated_at             :datetime
-#
-
 require 'spec_helper'
 
 describe ForkedProjectLink, "add link on fork" do
diff --git a/spec/models/generic_commit_status_spec.rb b/spec/models/generic_commit_status_spec.rb
index 5b0883d8702..0caf5869c24 100644
--- a/spec/models/generic_commit_status_spec.rb
+++ b/spec/models/generic_commit_status_spec.rb
@@ -1,37 +1,3 @@
-# == Schema Information
-#
-# Table name: ci_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
-#  coverage           :float
-#  commit_id          :integer
-#  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
-#  stage_idx          :integer
-#  tag                :boolean
-#  ref                :string(255)
-#  user_id            :integer
-#  type               :string(255)
-#  target_url         :string(255)
-#  description        :string(255)
-#  artifacts_file     :text
-#  gl_project_id      :integer
-#
-
 require 'spec_helper'
 
 describe GenericCommitStatus, models: true do
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 7bfca1e72c3..6fa16be7f04 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: namespaces
-#
-#  id          :integer          not null, primary key
-#  name        :string(255)      not null
-#  path        :string(255)      not null
-#  owner_id    :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  type        :string(255)
-#  description :string(255)      default(""), not null
-#  avatar      :string(255)
-#
-
 require 'spec_helper'
 
 describe Group, models: true do
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 5afe042e154..1b987588f59 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: identities
-#
-#  id         :integer          not null, primary key
-#  extern_uid :string(255)
-#  provider   :string(255)
-#  user_id    :integer
-#  created_at :datetime
-#  updated_at :datetime
-#
-
 require 'spec_helper'
 
 RSpec.describe Identity, models: true do
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 060e6599104..8ab00c70f9d 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -1,23 +1,3 @@
-# == Schema Information
-#
-# Table name: issues
-#
-#  id            :integer          not null, primary key
-#  title         :string(255)
-#  assignee_id   :integer
-#  author_id     :integer
-#  project_id    :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  position      :integer          default(0)
-#  branch_name   :string(255)
-#  description   :text
-#  milestone_id  :integer
-#  state         :string(255)
-#  iid           :integer
-#  updated_by_id :integer
-#
-
 require 'spec_helper'
 
 describe Issue, models: true do
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index c962b83644a..26fbedbef2f 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: keys
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  key         :text
-#  title       :string(255)
-#  type        :string(255)
-#  fingerprint :string(255)
-#  public      :boolean          default(FALSE), not null
-#
-
 require 'spec_helper'
 
 describe Key, models: true do
diff --git a/spec/models/label_link_spec.rb b/spec/models/label_link_spec.rb
index dc7510b1de3..5e6f8ca1528 100644
--- a/spec/models/label_link_spec.rb
+++ b/spec/models/label_link_spec.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: label_links
-#
-#  id          :integer          not null, primary key
-#  label_id    :integer
-#  target_id   :integer
-#  target_type :string(255)
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 require 'spec_helper'
 
 describe LabelLink, models: true do
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
index 0614ca1e7c9..eff8ee222ac 100644
--- a/spec/models/label_spec.rb
+++ b/spec/models/label_spec.rb
@@ -1,16 +1,3 @@
-# == Schema Information
-#
-# Table name: labels
-#
-#  id         :integer          not null, primary key
-#  title      :string(255)
-#  color      :string(255)
-#  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  template   :boolean          default(FALSE)
-#
-
 require 'spec_helper'
 
 describe Label, models: true do
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 2d8f1cc1ad3..6e51730eecd 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: members
-#
-#  id                 :integer          not null, primary key
-#  access_level       :integer          not null
-#  source_id          :integer          not null
-#  source_type        :string(255)      not null
-#  user_id            :integer
-#  notification_level :integer          not null
-#  type               :string(255)
-#  created_at         :datetime
-#  updated_at         :datetime
-#  created_by_id      :integer
-#  invite_email       :string(255)
-#  invite_token       :string(255)
-#  invite_accepted_at :datetime
-#
-
 require 'spec_helper'
 
 describe Member, models: true do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d7884cea336..c8578749b21 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1,32 +1,3 @@
-# == Schema Information
-#
-# Table name: merge_requests
-#
-#  id                        :integer          not null, primary key
-#  target_branch             :string(255)      not null
-#  source_branch             :string(255)      not null
-#  source_project_id         :integer          not null
-#  author_id                 :integer
-#  assignee_id               :integer
-#  title                     :string(255)
-#  created_at                :datetime
-#  updated_at                :datetime
-#  milestone_id              :integer
-#  state                     :string(255)
-#  merge_status              :string(255)
-#  target_project_id         :integer          not null
-#  iid                       :integer
-#  description               :text
-#  position                  :integer          default(0)
-#  locked_at                 :datetime
-#  updated_by_id             :integer
-#  merge_error               :string(255)
-#  merge_params              :text
-#  merge_when_build_succeeds :boolean          default(FALSE), not null
-#  merge_user_id             :integer
-#  merge_commit_sha          :string
-#
-
 require 'spec_helper'
 
 describe MergeRequest, models: true do
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 72a4ea70228..26bfd2e1241 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: milestones
-#
-#  id          :integer          not null, primary key
-#  title       :string(255)      not null
-#  project_id  :integer          not null
-#  description :text
-#  due_date    :date
-#  created_at  :datetime
-#  updated_at  :datetime
-#  state       :string(255)
-#  iid         :integer
-#
-
 require 'spec_helper'
 
 describe Milestone, models: true do
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 3c3a580942a..4074f966299 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -1,18 +1,3 @@
-# == Schema Information
-#
-# Table name: namespaces
-#
-#  id          :integer          not null, primary key
-#  name        :string(255)      not null
-#  path        :string(255)      not null
-#  owner_id    :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#  type        :string(255)
-#  description :string(255)      default(""), not null
-#  avatar      :string(255)
-#
-
 require 'spec_helper'
 
 describe Namespace, models: true do
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 6b18936edb1..4b788b57882 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -1,24 +1,3 @@
-# == Schema Information
-#
-# Table name: notes
-#
-#  id            :integer          not null, primary key
-#  note          :text
-#  noteable_type :string(255)
-#  author_id     :integer
-#  created_at    :datetime
-#  updated_at    :datetime
-#  project_id    :integer
-#  attachment    :string(255)
-#  line_code     :string(255)
-#  commit_id     :string(255)
-#  noteable_id   :integer
-#  system        :boolean          default(FALSE), not null
-#  st_diff       :text
-#  updated_by_id :integer
-#  is_award      :boolean          default(FALSE), not null
-#
-
 require 'spec_helper'
 
 describe Note, models: true do
diff --git a/spec/models/project_snippet_spec.rb b/spec/models/project_snippet_spec.rb
index e0feb606f78..d9d7c0b0aaa 100644
--- a/spec/models/project_snippet_spec.rb
+++ b/spec/models/project_snippet_spec.rb
@@ -1,19 +1,3 @@
-# == Schema Information
-#
-# Table name: snippets
-#
-#  id               :integer          not null, primary key
-#  title            :string(255)
-#  content          :text
-#  author_id        :integer          not null
-#  project_id       :integer
-#  created_at       :datetime
-#  updated_at       :datetime
-#  file_name        :string(255)
-#  type             :string(255)
-#  visibility_level :integer          default(0), not null
-#
-
 require 'spec_helper'
 
 describe ProjectSnippet, models: true do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 3a8a6c2c166..f6e5b132643 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1,42 +1,3 @@
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)
-#  path                   :string(255)
-#  description            :text
-#  created_at             :datetime
-#  updated_at             :datetime
-#  creator_id             :integer
-#  issues_enabled         :boolean          default(TRUE), not null
-#  merge_requests_enabled :boolean          default(TRUE), not null
-#  wiki_enabled           :boolean          default(TRUE), not null
-#  namespace_id           :integer
-#  issues_tracker         :string(255)      default("gitlab"), not null
-#  issues_tracker_id      :string(255)
-#  snippets_enabled       :boolean          default(TRUE), not null
-#  last_activity_at       :datetime
-#  import_url             :string(255)
-#  visibility_level       :integer          default(0), not null
-#  archived               :boolean          default(FALSE), not null
-#  avatar                 :string(255)
-#  import_status          :string(255)
-#  repository_size        :float            default(0.0)
-#  star_count             :integer          default(0), not null
-#  import_type            :string(255)
-#  import_source          :string(255)
-#  commit_count           :integer          default(0)
-#  import_error           :text
-#  ci_id                  :integer
-#  builds_enabled         :boolean          default(TRUE), not null
-#  shared_runners_enabled :boolean          default(TRUE), not null
-#  runners_token          :string
-#  build_coverage_regex   :string
-#  build_allow_git_fetch  :boolean          default(TRUE), not null
-#  build_timeout          :integer          default(3600), not null
-#
-
 require 'spec_helper'
 
 describe Project, models: true do
diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb
index 7e956cf6779..b523834c6e9 100644
--- a/spec/models/protected_branch_spec.rb
+++ b/spec/models/protected_branch_spec.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: protected_branches
-#
-#  id                  :integer          not null, primary key
-#  project_id          :integer          not null
-#  name                :string(255)      not null
-#  created_at          :datetime
-#  updated_at          :datetime
-#  developers_can_push :boolean          default(FALSE), not null
-#
-
 require 'spec_helper'
 
 describe ProtectedBranch, models: true do
diff --git a/spec/models/release_spec.rb b/spec/models/release_spec.rb
index 72ecb442a36..527005b2b69 100644
--- a/spec/models/release_spec.rb
+++ b/spec/models/release_spec.rb
@@ -1,15 +1,3 @@
-# == Schema Information
-#
-# Table name: releases
-#
-#  id          :integer          not null, primary key
-#  tag         :string(255)
-#  description :text
-#  project_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
-#
-
 require 'rails_helper'
 
 RSpec.describe Release, type: :model do
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 173628c08d0..8592e112c50 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -1,24 +1,3 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id                    :integer          not null, primary key
-#  type                  :string(255)
-#  title                 :string(255)
-#  project_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  active                :boolean          default(FALSE), not null
-#  properties            :text
-#  template              :boolean          default(FALSE)
-#  push_events           :boolean          default(TRUE)
-#  issues_events         :boolean          default(TRUE)
-#  merge_requests_events :boolean          default(TRUE)
-#  tag_push_events       :boolean          default(TRUE)
-#  note_events           :boolean          default(TRUE), not null
-#  build_events          :boolean          default(FALSE), not null
-#
-
 require 'spec_helper'
 
 describe Service, models: true do
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index 5077ac7b62b..7a613e360d4 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -1,19 +1,3 @@
-# == Schema Information
-#
-# Table name: snippets
-#
-#  id               :integer          not null, primary key
-#  title            :string(255)
-#  content          :text
-#  author_id        :integer          not null
-#  project_id       :integer
-#  created_at       :datetime
-#  updated_at       :datetime
-#  file_name        :string(255)
-#  type             :string(255)
-#  visibility_level :integer          default(0), not null
-#
-
 require 'spec_helper'
 
 describe Snippet, models: true do
diff --git a/spec/models/todo_spec.rb b/spec/models/todo_spec.rb
index d9b86b9368f..623b82c01d8 100644
--- a/spec/models/todo_spec.rb
+++ b/spec/models/todo_spec.rb
@@ -1,21 +1,3 @@
-# == Schema Information
-#
-# Table name: todos
-#
-#  id          :integer          not null, primary key
-#  user_id     :integer          not null
-#  project_id  :integer          not null
-#  target_id   :integer
-#  target_type :string           not null
-#  author_id   :integer
-#  action      :integer          not null
-#  state       :string           not null
-#  created_at  :datetime
-#  updated_at  :datetime
-#  note_id     :integer
-#  commit_id   :string
-#
-
 require 'spec_helper'
 
 describe Todo, models: true do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8b2fb77e28e..26d4e139396 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,66 +1,3 @@
-# == Schema Information
-#
-# Table name: users
-#
-#  id                          :integer          not null, primary key
-#  email                       :string(255)      default(""), not null
-#  encrypted_password          :string(255)      default(""), not null
-#  reset_password_token        :string(255)
-#  reset_password_sent_at      :datetime
-#  remember_created_at         :datetime
-#  sign_in_count               :integer          default(0)
-#  current_sign_in_at          :datetime
-#  last_sign_in_at             :datetime
-#  current_sign_in_ip          :string(255)
-#  last_sign_in_ip             :string(255)
-#  created_at                  :datetime
-#  updated_at                  :datetime
-#  name                        :string(255)
-#  admin                       :boolean          default(FALSE), not null
-#  projects_limit              :integer          default(10)
-#  skype                       :string(255)      default(""), not null
-#  linkedin                    :string(255)      default(""), not null
-#  twitter                     :string(255)      default(""), not null
-#  authentication_token        :string(255)
-#  theme_id                    :integer          default(1), not null
-#  bio                         :string(255)
-#  failed_attempts             :integer          default(0)
-#  locked_at                   :datetime
-#  username                    :string(255)
-#  can_create_group            :boolean          default(TRUE), not null
-#  can_create_team             :boolean          default(TRUE), not null
-#  state                       :string(255)
-#  color_scheme_id             :integer          default(1), not null
-#  notification_level          :integer          default(1), not null
-#  password_expires_at         :datetime
-#  created_by_id               :integer
-#  last_credential_check_at    :datetime
-#  avatar                      :string(255)
-#  confirmation_token          :string(255)
-#  confirmed_at                :datetime
-#  confirmation_sent_at        :datetime
-#  unconfirmed_email           :string(255)
-#  hide_no_ssh_key             :boolean          default(FALSE)
-#  website_url                 :string(255)      default(""), not null
-#  notification_email          :string(255)
-#  hide_no_password            :boolean          default(FALSE)
-#  password_automatically_set  :boolean          default(FALSE)
-#  location                    :string(255)
-#  encrypted_otp_secret        :string(255)
-#  encrypted_otp_secret_iv     :string(255)
-#  encrypted_otp_secret_salt   :string(255)
-#  otp_required_for_login      :boolean          default(FALSE), not null
-#  otp_backup_codes            :text
-#  public_email                :string(255)      default(""), not null
-#  dashboard                   :integer          default(0)
-#  project_view                :integer          default(0)
-#  consumed_timestep           :integer
-#  layout                      :integer          default(0)
-#  hide_project_limit          :boolean          default(FALSE)
-#  unlock_token                :string
-#  otp_grace_period_started_at :datetime
-#
-
 require 'spec_helper'
 
 describe User, models: true do

From baef6728fa4e8e515ccdeba1ea54da996f322aab Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 19:59:45 +0300
Subject: [PATCH 0221/1431] Send trace to a browser incrementally when build is
 running

We send a state of ansi2html to client, client needs to send this state back.
The state describes the configuration of generator and position within trace.
---
 app/controllers/projects/builds_controller.rb |  15 +++
 app/models/ci/build.rb                        |   8 +-
 app/views/projects/builds/show.html.haml      |   7 +-
 config/routes.rb                              |   1 +
 lib/ci/ansi2html.rb                           |  78 ++++++++----
 spec/lib/ci/ansi2html_spec.rb                 | 111 ++++++++++++------
 6 files changed, 162 insertions(+), 58 deletions(-)

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index b8b9e78427d..3c9a52a5ddd 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -38,6 +38,14 @@ class Projects::BuildsController < Projects::ApplicationController
     end
   end
 
+  def trace
+    respond_to do |format|
+      format.json do
+        render json: @build.trace_with_state(params_state).merge!(id: @build.id, status: @build.status)
+      end
+    end
+  end
+
   def retry
     unless @build.retryable?
       return render_404
@@ -72,6 +80,13 @@ class Projects::BuildsController < Projects::ApplicationController
 
   private
 
+  def params_state
+    begin
+      JSON.parse(params[:state], symbolize_names: true)
+    rescue
+    end
+  end
+
   def build
     @build ||= project.builds.unscoped.find_by!(id: params[:id])
   end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 4bc3a225e2c..1eb6a0d9023 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -132,8 +132,12 @@ module Ci
     end
 
     def trace_html
-      html = Ci::Ansi2html::convert(trace) if trace.present?
-      html || ''
+      trace_with_state[:html]
+    end
+
+    def trace_with_state(state = nil)
+      trace_with_state = Ci::Ansi2html::convert(trace, state) if trace.present?
+      trace_with_state || {}
     end
 
     def timeout
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index c0f7a7686f0..0da0477bdd0 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -1,5 +1,6 @@
 - page_title "#{@build.name} (##{@build.id})", "Builds"
 = render "header_title"
+- trace = build.trace_for_state
 
 .build-page
   .row-content-block.top-block
@@ -85,7 +86,9 @@
         %pre.trace#build-trace
           %code.bash
             = preserve do
-              = raw @build.trace_html
+              = raw trace[:html]
+              - if @build.active?
+                %i{:class => "fa fa-refresh fa-spin"}
 
       %div#down-build-trace
 
@@ -216,4 +219,4 @@
 
 
   :javascript
-    new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}")
+    new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}", "#{trace[:state]}")
diff --git a/config/routes.rb b/config/routes.rb
index dafecc94648..e5c7d656da7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -672,6 +672,7 @@ Rails.application.routes.draw do
             post :cancel
             post :retry
             post :erase
+            get :trace
             get :raw
           end
 
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb
index ac6d667cf8d..d29e68570ff 100644
--- a/lib/ci/ansi2html.rb
+++ b/lib/ci/ansi2html.rb
@@ -23,8 +23,8 @@ module Ci
       cross:      0x10,
     }
 
-    def self.convert(ansi)
-      Converter.new().convert(ansi)
+    def self.convert(ansi, state = nil)
+      Converter.new.convert(ansi, state)
     end
 
     class Converter
@@ -84,22 +84,36 @@ module Ci
       def on_107(s) set_bg_color(7, 'l') end
       def on_109(s) set_bg_color(9, 'l') end
 
-      def convert(ansi)
-        @out = ""
-        @n_open_tags = 0
-        reset()
+      attr_accessor :offset, :n_open_tags, :fg_color, :bg_color, :style_mask
 
-        s = StringScanner.new(ansi.gsub("<", "&lt;"))
+      STATE_PARAMS = [:offset, :n_open_tags, :fg_color, :bg_color, :style_mask]
+
+      def convert(raw, new_state)
+        reset_state
+        restore_state(new_state) if new_state && new_state[:offset].to_i < raw.length
+
+        start = @offset
+        ansi = raw[@offset..-1]
+
+        open_new_tag
+
+        s = StringScanner.new(ansi)
         while(!s.eos?)
           if s.scan(/\e([@-_])(.*?)([@-~])/)
             handle_sequence(s)
+          elsif s.scan(/\e(([@-_])(.*?)?)?$/)
+            break
+          elsif s.scan(/</)
+            @out << '&lt;'
           else
             @out << s.scan(/./m)
           end
+          @offset += s.matched_size
         end
 
         close_open_tags()
-        @out
+
+        { state: state, html: @out, text: ansi[0, @offset - start], append: start > 0 }
       end
 
       def handle_sequence(s)
@@ -121,6 +135,20 @@ module Ci
 
         evaluate_command_stack(commands)
 
+        open_new_tag
+      end
+
+      def evaluate_command_stack(stack)
+        return unless command = stack.shift()
+
+        if self.respond_to?("on_#{command}", true)
+          self.send("on_#{command}", stack)
+        end
+
+        evaluate_command_stack(stack)
+      end
+
+      def open_new_tag
         css_classes = []
 
         unless @fg_color.nil?
@@ -138,20 +166,8 @@ module Ci
           css_classes << "term-#{css_class}" if @style_mask & flag != 0
         end
 
-        open_new_tag(css_classes) if css_classes.length > 0
-      end
+        return if css_classes.empty?
 
-      def evaluate_command_stack(stack)
-        return unless command = stack.shift()
-
-        if self.respond_to?("on_#{command}", true)
-          self.send("on_#{command}", stack)
-        end
-
-        evaluate_command_stack(stack)
-      end
-
-      def open_new_tag(css_classes)
         @out << %{<span class="#{css_classes.join(' ')}">}
         @n_open_tags += 1
       end
@@ -163,6 +179,26 @@ module Ci
         end
       end
 
+      def reset_state
+        @offset = 0
+        @n_open_tags = 0
+        @out = ''
+        reset
+      end
+
+      def state
+        STATE_PARAMS.inject({}) do |h, param|
+          h[param] = send(param)
+          h
+        end
+      end
+
+      def restore_state(new_state)
+        STATE_PARAMS.each do |param|
+          send("#{param}=".to_sym, new_state[param])
+        end
+      end
+
       def reset
         @fg_color = nil
         @bg_color = nil
diff --git a/spec/lib/ci/ansi2html_spec.rb b/spec/lib/ci/ansi2html_spec.rb
index 3a2b568f4c7..04afbd06929 100644
--- a/spec/lib/ci/ansi2html_spec.rb
+++ b/spec/lib/ci/ansi2html_spec.rb
@@ -4,131 +4,176 @@ describe Ci::Ansi2html, lib: true do
   subject { Ci::Ansi2html }
 
   it "prints non-ansi as-is" do
-    expect(subject.convert("Hello")).to eq('Hello')
+    expect(subject.convert("Hello")[:html]).to eq('Hello')
   end
 
   it "strips non-color-changing controll sequences" do
-    expect(subject.convert("Hello \e[2Kworld")).to eq('Hello world')
+    expect(subject.convert("Hello \e[2Kworld")[:html]).to eq('Hello world')
   end
 
   it "prints simply red" do
-    expect(subject.convert("\e[31mHello\e[0m")).to eq('<span class="term-fg-red">Hello</span>')
+    expect(subject.convert("\e[31mHello\e[0m")[:html]).to eq('<span class="term-fg-red">Hello</span>')
   end
 
   it "prints simply red without trailing reset" do
-    expect(subject.convert("\e[31mHello")).to eq('<span class="term-fg-red">Hello</span>')
+    expect(subject.convert("\e[31mHello")[:html]).to eq('<span class="term-fg-red">Hello</span>')
   end
 
   it "prints simply yellow" do
-    expect(subject.convert("\e[33mHello\e[0m")).to eq('<span class="term-fg-yellow">Hello</span>')
+    expect(subject.convert("\e[33mHello\e[0m")[:html]).to eq('<span class="term-fg-yellow">Hello</span>')
   end
 
   it "prints default on blue" do
-    expect(subject.convert("\e[39;44mHello")).to eq('<span class="term-bg-blue">Hello</span>')
+    expect(subject.convert("\e[39;44mHello")[:html]).to eq('<span class="term-bg-blue">Hello</span>')
   end
 
   it "prints red on blue" do
-    expect(subject.convert("\e[31;44mHello")).to eq('<span class="term-fg-red term-bg-blue">Hello</span>')
+    expect(subject.convert("\e[31;44mHello")[:html]).to eq('<span class="term-fg-red term-bg-blue">Hello</span>')
   end
 
   it "resets colors after red on blue" do
-    expect(subject.convert("\e[31;44mHello\e[0m world")).to eq('<span class="term-fg-red term-bg-blue">Hello</span> world')
+    expect(subject.convert("\e[31;44mHello\e[0m world")[:html]).to eq('<span class="term-fg-red term-bg-blue">Hello</span> world')
   end
 
   it "performs color change from red/blue to yellow/blue" do
-    expect(subject.convert("\e[31;44mHello \e[33mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-blue">world</span>')
+    expect(subject.convert("\e[31;44mHello \e[33mworld")[:html]).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-blue">world</span>')
   end
 
   it "performs color change from red/blue to yellow/green" do
-    expect(subject.convert("\e[31;44mHello \e[33;42mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-green">world</span>')
+    expect(subject.convert("\e[31;44mHello \e[33;42mworld")[:html]).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-green">world</span>')
   end
 
   it "performs color change from red/blue to reset to yellow/green" do
-    expect(subject.convert("\e[31;44mHello\e[0m \e[33;42mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello</span> <span class="term-fg-yellow term-bg-green">world</span>')
+    expect(subject.convert("\e[31;44mHello\e[0m \e[33;42mworld")[:html]).to eq('<span class="term-fg-red term-bg-blue">Hello</span> <span class="term-fg-yellow term-bg-green">world</span>')
   end
 
   it "ignores unsupported codes" do
-    expect(subject.convert("\e[51mHello\e[0m")).to eq('Hello')
+    expect(subject.convert("\e[51mHello\e[0m")[:html]).to eq('Hello')
   end
 
   it "prints light red" do
-    expect(subject.convert("\e[91mHello\e[0m")).to eq('<span class="term-fg-l-red">Hello</span>')
+    expect(subject.convert("\e[91mHello\e[0m")[:html]).to eq('<span class="term-fg-l-red">Hello</span>')
   end
 
   it "prints default on light red" do
-    expect(subject.convert("\e[101mHello\e[0m")).to eq('<span class="term-bg-l-red">Hello</span>')
+    expect(subject.convert("\e[101mHello\e[0m")[:html]).to eq('<span class="term-bg-l-red">Hello</span>')
   end
 
   it "performs color change from red/blue to default/blue" do
-    expect(subject.convert("\e[31;44mHello \e[39mworld")).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
+    expect(subject.convert("\e[31;44mHello \e[39mworld")[:html]).to eq('<span class="term-fg-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
   end
 
   it "performs color change from light red/blue to default/blue" do
-    expect(subject.convert("\e[91;44mHello \e[39mworld")).to eq('<span class="term-fg-l-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
+    expect(subject.convert("\e[91;44mHello \e[39mworld")[:html]).to eq('<span class="term-fg-l-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>')
   end
 
   it "prints bold text" do
-    expect(subject.convert("\e[1mHello")).to eq('<span class="term-bold">Hello</span>')
+    expect(subject.convert("\e[1mHello")[:html]).to eq('<span class="term-bold">Hello</span>')
   end
 
   it "resets bold text" do
-    expect(subject.convert("\e[1mHello\e[21m world")).to eq('<span class="term-bold">Hello</span> world')
-    expect(subject.convert("\e[1mHello\e[22m world")).to eq('<span class="term-bold">Hello</span> world')
+    expect(subject.convert("\e[1mHello\e[21m world")[:html]).to eq('<span class="term-bold">Hello</span> world')
+    expect(subject.convert("\e[1mHello\e[22m world")[:html]).to eq('<span class="term-bold">Hello</span> world')
   end
 
   it "prints italic text" do
-    expect(subject.convert("\e[3mHello")).to eq('<span class="term-italic">Hello</span>')
+    expect(subject.convert("\e[3mHello")[:html]).to eq('<span class="term-italic">Hello</span>')
   end
 
   it "resets italic text" do
-    expect(subject.convert("\e[3mHello\e[23m world")).to eq('<span class="term-italic">Hello</span> world')
+    expect(subject.convert("\e[3mHello\e[23m world")[:html]).to eq('<span class="term-italic">Hello</span> world')
   end
 
   it "prints underlined text" do
-    expect(subject.convert("\e[4mHello")).to eq('<span class="term-underline">Hello</span>')
+    expect(subject.convert("\e[4mHello")[:html]).to eq('<span class="term-underline">Hello</span>')
   end
 
   it "resets underlined text" do
-    expect(subject.convert("\e[4mHello\e[24m world")).to eq('<span class="term-underline">Hello</span> world')
+    expect(subject.convert("\e[4mHello\e[24m world")[:html]).to eq('<span class="term-underline">Hello</span> world')
   end
 
   it "prints concealed text" do
-    expect(subject.convert("\e[8mHello")).to eq('<span class="term-conceal">Hello</span>')
+    expect(subject.convert("\e[8mHello")[:html]).to eq('<span class="term-conceal">Hello</span>')
   end
 
   it "resets concealed text" do
-    expect(subject.convert("\e[8mHello\e[28m world")).to eq('<span class="term-conceal">Hello</span> world')
+    expect(subject.convert("\e[8mHello\e[28m world")[:html]).to eq('<span class="term-conceal">Hello</span> world')
   end
 
   it "prints crossed-out text" do
-    expect(subject.convert("\e[9mHello")).to eq('<span class="term-cross">Hello</span>')
+    expect(subject.convert("\e[9mHello")[:html]).to eq('<span class="term-cross">Hello</span>')
   end
 
   it "resets crossed-out text" do
-    expect(subject.convert("\e[9mHello\e[29m world")).to eq('<span class="term-cross">Hello</span> world')
+    expect(subject.convert("\e[9mHello\e[29m world")[:html]).to eq('<span class="term-cross">Hello</span> world')
   end
 
   it "can print 256 xterm fg colors" do
-    expect(subject.convert("\e[38;5;16mHello")).to eq('<span class="xterm-fg-16">Hello</span>')
+    expect(subject.convert("\e[38;5;16mHello")[:html]).to eq('<span class="xterm-fg-16">Hello</span>')
   end
 
   it "can print 256 xterm fg colors on normal magenta background" do
-    expect(subject.convert("\e[38;5;16;45mHello")).to eq('<span class="xterm-fg-16 term-bg-magenta">Hello</span>')
+    expect(subject.convert("\e[38;5;16;45mHello")[:html]).to eq('<span class="xterm-fg-16 term-bg-magenta">Hello</span>')
   end
 
   it "can print 256 xterm bg colors" do
-    expect(subject.convert("\e[48;5;240mHello")).to eq('<span class="xterm-bg-240">Hello</span>')
+    expect(subject.convert("\e[48;5;240mHello")[:html]).to eq('<span class="xterm-bg-240">Hello</span>')
   end
 
   it "can print 256 xterm bg colors on normal magenta foreground" do
-    expect(subject.convert("\e[48;5;16;35mHello")).to eq('<span class="term-fg-magenta xterm-bg-16">Hello</span>')
+    expect(subject.convert("\e[48;5;16;35mHello")[:html]).to eq('<span class="term-fg-magenta xterm-bg-16">Hello</span>')
   end
 
   it "prints bold colored text vividly" do
-    expect(subject.convert("\e[1;31mHello\e[0m")).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
+    expect(subject.convert("\e[1;31mHello\e[0m")[:html]).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
   end
 
   it "prints bold light colored text correctly" do
-    expect(subject.convert("\e[1;91mHello\e[0m")).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
+    expect(subject.convert("\e[1;91mHello\e[0m")[:html]).to eq('<span class="term-fg-l-red term-bold">Hello</span>')
+  end
+
+  it "prints &lt;" do
+    expect(subject.convert("<")[:html]).to eq('&lt;')
+  end
+
+  describe "incremental update" do
+    shared_examples 'stateable converter' do
+      let(:pass1) { subject.convert(pre_text) }
+      let(:pass2) { subject.convert(pre_text + text, pass1[:state]) }
+
+      it "to returns html to append" do
+        expect(pass2[:append]).to be_truthy
+        expect(pass2[:html]).to eq(html)
+        expect(pass1[:text] + pass2[:text]).to eq(pre_text + text)
+        expect(pass1[:html] + pass2[:html]).to eq(pre_html + html)
+      end
+    end
+
+    context "with split word" do
+      let(:pre_text) { "\e[1mHello" }
+      let(:pre_html) { "<span class=\"term-bold\">Hello</span>" }
+      let(:text) { "\e[1mWorld" }
+      let(:html) { "<span class=\"term-bold\"></span><span class=\"term-bold\">World</span>" }
+
+      it_behaves_like 'stateable converter'
+    end
+
+    context "with split sequence" do
+      let(:pre_text) { "\e[1m" }
+      let(:pre_html) { "<span class=\"term-bold\"></span>" }
+      let(:text) { "Hello" }
+      let(:html) { "<span class=\"term-bold\">Hello</span>" }
+
+      it_behaves_like 'stateable converter'
+    end
+
+    context "with partial sequence" do
+      let(:pre_text) { "Hello\e" }
+      let(:pre_html) { "Hello" }
+      let(:text) { "[1m World" }
+      let(:html) { "<span class=\"term-bold\"> World</span>" }
+
+      it_behaves_like 'stateable converter'
+    end
   end
 end

From 74520f23db51c95b4aea8856fb51c4246785f776 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:19:27 +0300
Subject: [PATCH 0222/1431] Encode state as base64 string

---
 app/assets/javascripts/ci/build.coffee        | 21 ++++++++++++-------
 app/controllers/projects/builds_controller.rb |  9 +-------
 app/views/projects/builds/show.html.haml      |  6 +++---
 lib/ci/ansi2html.rb                           | 13 ++++++++----
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index 7afe8bf79e2..fca0c3bae5c 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -1,9 +1,12 @@
 class CiBuild
   @interval: null
+  @state: null
 
-  constructor: (build_url, build_status) ->
+  constructor: (build_url, build_status, build_state) ->
     clearInterval(CiBuild.interval)
 
+    @state = build_state
+
     @initScrollButtonAffix()
 
     if build_status == "running" || build_status == "pending"
@@ -26,14 +29,18 @@ class CiBuild
       CiBuild.interval = setInterval =>
         if window.location.href.split("#").first() is build_url
           $.ajax
-            url: build_url
+            url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
             dataType: "json"
-            success: (build) =>
-              if build.status == "running"
-                $('#build-trace code').html build.trace_html
-                $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
+            success: (log) =>
+              @state = log.state
+              if log.status is "running"
+                if log.append
+                  $('.fa-refresh').before log.html
+                else
+                  $('#build-trace code').html log.html
+                  $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
                 @checkAutoscroll()
-              else if build.status != build_status
+              else if log.status isnt build_status
                 Turbolinks.visit build_url
       , 4000
 
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 3c9a52a5ddd..bb1f6c5e980 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -41,7 +41,7 @@ class Projects::BuildsController < Projects::ApplicationController
   def trace
     respond_to do |format|
       format.json do
-        render json: @build.trace_with_state(params_state).merge!(id: @build.id, status: @build.status)
+        render json: @build.trace_with_state(params[:state]).merge!(id: @build.id, status: @build.status)
       end
     end
   end
@@ -80,13 +80,6 @@ class Projects::BuildsController < Projects::ApplicationController
 
   private
 
-  def params_state
-    begin
-      JSON.parse(params[:state], symbolize_names: true)
-    rescue
-    end
-  end
-
   def build
     @build ||= project.builds.unscoped.find_by!(id: params[:id])
   end
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 0da0477bdd0..c7b9c36a3ab 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -1,6 +1,6 @@
 - page_title "#{@build.name} (##{@build.id})", "Builds"
 = render "header_title"
-- trace = build.trace_for_state
+- trace_with_state = @build.trace_with_state
 
 .build-page
   .row-content-block.top-block
@@ -86,7 +86,7 @@
         %pre.trace#build-trace
           %code.bash
             = preserve do
-              = raw trace[:html]
+              = raw trace_with_state[:html]
               - if @build.active?
                 %i{:class => "fa fa-refresh fa-spin"}
 
@@ -219,4 +219,4 @@
 
 
   :javascript
-    new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}", "#{trace[:state]}")
+    new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}", "#{trace_with_state[:state]}")
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb
index d29e68570ff..5fed43aaebd 100644
--- a/lib/ci/ansi2html.rb
+++ b/lib/ci/ansi2html.rb
@@ -90,7 +90,7 @@ module Ci
 
       def convert(raw, new_state)
         reset_state
-        restore_state(new_state) if new_state && new_state[:offset].to_i < raw.length
+        restore_state(raw, new_state) if new_state
 
         start = @offset
         ansi = raw[@offset..-1]
@@ -187,15 +187,20 @@ module Ci
       end
 
       def state
-        STATE_PARAMS.inject({}) do |h, param|
+        state = STATE_PARAMS.inject({}) do |h, param|
           h[param] = send(param)
           h
         end
+        Base64.urlsafe_encode64(state.to_json)
       end
 
-      def restore_state(new_state)
+      def restore_state(raw, new_state)
+        state = Base64.urlsafe_decode64(new_state)
+        state = JSON.parse(state, symbolize_names: true)
+        return if state[:offset].to_i > raw.length
+
         STATE_PARAMS.each do |param|
-          send("#{param}=".to_sym, new_state[param])
+          send("#{param}=".to_sym, state[param])
         end
       end
 

From 10d4d5842bed749fa3477fb8808ec1c7cc05be75 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Mon, 9 May 2016 12:20:18 -0500
Subject: [PATCH 0223/1431] Add if exists to drop command

---
 lib/tasks/gitlab/db.rake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 1c706dc11b3..e473b756023 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -29,10 +29,12 @@ namespace :gitlab do
       tables.delete 'schema_migrations'
       # Truncate schema_migrations to ensure migrations re-run
       connection.execute('TRUNCATE schema_migrations')
+
       # Drop tables with cascade to avoid dependent table errors
       # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html
       # MySQL: http://dev.mysql.com/doc/refman/5.7/en/drop-table.html
-      tables.each { |t| connection.execute("DROP TABLE #{t} CASCADE") }
+      # Add `IF EXISTS` because cascade could have already deleted a table.
+      tables.each { |t| connection.execute("DROP TABLE IF EXISTS #{t} CASCADE") }
     end
   end
 end

From 51a8811e262c48e2d3aaa426b3c87693dda87b37 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:26:14 +0300
Subject: [PATCH 0224/1431] Revert "Eager load `lib/api`"

This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
---
 config/application.rb |   2 -
 config/routes.rb      |   1 +
 lib/api/api.rb        |   4 +-
 lib/api/api_guard.rb  | 306 +++++++++++++++++++++---------------------
 lib/ci/api/api.rb     |   2 +-
 5 files changed, 157 insertions(+), 158 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index d4b86bb38bb..b602e2b6168 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -102,8 +102,6 @@ module Gitlab
     # This is needed for gitlab-shell
     ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
 
-    config.eager_load_paths += ["#{Rails.root}/lib"]
-
     config.generators do |g|
       g.factory_girl false
     end
diff --git a/config/routes.rb b/config/routes.rb
index bfc6818a8d8..3c855cfafd0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
 require 'sidekiq/web'
 require 'sidekiq/cron/web'
+require 'api/api'
 
 Rails.application.routes.draw do
   if Gitlab::Sherlock.enabled?
diff --git a/lib/api/api.rb b/lib/api/api.rb
index d41b4b71865..6ddfe11d98e 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -1,6 +1,8 @@
+Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
+
 module API
   class API < Grape::API
-    include ::API::APIGuard
+    include APIGuard
     version 'v3', using: :path
 
     rescue_from ActiveRecord::RecordNotFound do
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb
index 6dfd6e4396b..b9994fcefda 100644
--- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb
@@ -2,173 +2,171 @@
 
 require 'rack/oauth2'
 
-module API
-  module APIGuard
-    extend ActiveSupport::Concern
+module APIGuard
+  extend ActiveSupport::Concern
 
-    included do |base|
-      # OAuth2 Resource Server Authentication
-      use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
-        # The authenticator only fetches the raw token string
+  included do |base|
+    # OAuth2 Resource Server Authentication
+    use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
+      # The authenticator only fetches the raw token string
 
-        # Must yield access token to store it in the env
-        request.access_token
-      end
-
-      helpers HelperMethods
-
-      install_error_responders(base)
+      # Must yield access token to store it in the env
+      request.access_token
     end
 
-    # Helper Methods for Grape Endpoint
-    module HelperMethods
-      # Invokes the doorkeeper guard.
-      #
-      # If token is presented and valid, then it sets @current_user.
-      #
-      # If the token does not have sufficient scopes to cover the requred scopes,
-      # then it raises InsufficientScopeError.
-      #
-      # If the token is expired, then it raises ExpiredError.
-      #
-      # If the token is revoked, then it raises RevokedError.
-      #
-      # If the token is not found (nil), then it raises TokenNotFoundError.
-      #
-      # Arguments:
-      #
-      #   scopes: (optional) scopes required for this guard.
-      #           Defaults to empty array.
-      #
-      def doorkeeper_guard!(scopes: [])
-        if (access_token = find_access_token).nil?
-          raise TokenNotFoundError
+    helpers HelperMethods
 
-        else
-          case validate_access_token(access_token, scopes)
-            when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-              raise InsufficientScopeError.new(scopes)
-            when Oauth2::AccessTokenValidationService::EXPIRED
-              raise ExpiredError
-            when Oauth2::AccessTokenValidationService::REVOKED
-              raise RevokedError
-            when Oauth2::AccessTokenValidationService::VALID
-              @current_user = User.find(access_token.resource_owner_id)
-          end
-        end
-      end
-
-      def doorkeeper_guard(scopes: [])
-        if access_token = find_access_token
-          case validate_access_token(access_token, scopes)
-            when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-              raise InsufficientScopeError.new(scopes)
-
-            when Oauth2::AccessTokenValidationService::EXPIRED
-              raise ExpiredError
-
-            when Oauth2::AccessTokenValidationService::REVOKED
-              raise RevokedError
-
-            when Oauth2::AccessTokenValidationService::VALID
-              @current_user = User.find(access_token.resource_owner_id)
-          end
-        end
-      end
-
-      def current_user
-        @current_user
-      end
-
-      private
-      def find_access_token
-        @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
-      end
-
-      def doorkeeper_request
-        @doorkeeper_request ||= ActionDispatch::Request.new(env)
-      end
-
-      def validate_access_token(access_token, scopes)
-        Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
-      end
-    end
-
-    module ClassMethods
-      # Installs the doorkeeper guard on the whole Grape API endpoint.
-      #
-      # Arguments:
-      #
-      #   scopes: (optional) scopes required for this guard.
-      #           Defaults to empty array.
-      #
-      def guard_all!(scopes: [])
-        before do
-          guard! scopes: scopes
-        end
-      end
-
-      private
-      def install_error_responders(base)
-        error_classes = [ MissingTokenError, TokenNotFoundError,
-                          ExpiredError, RevokedError, InsufficientScopeError]
-
-        base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
-      end
-
-      def oauth2_bearer_token_error_handler
-        Proc.new do |e|
-          response =
-              case e
-                when MissingTokenError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
-
-                when TokenNotFoundError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-                      :invalid_token,
-                      "Bad Access Token.")
-
-                when ExpiredError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-                      :invalid_token,
-                      "Token is expired. You can either do re-authorization or token refresh.")
-
-                when RevokedError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-                      :invalid_token,
-                      "Token was revoked. You have to re-authorize from the user.")
-
-                when InsufficientScopeError
-                  # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
-                  # does not include WWW-Authenticate header, which breaks the standard.
-                  Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
-                      :insufficient_scope,
-                      Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
-                      { scope: e.scopes })
-              end
-
-          response.finish
-        end
-      end
-    end
+    install_error_responders(base)
+  end
 
+  # Helper Methods for Grape Endpoint
+  module HelperMethods
+    # Invokes the doorkeeper guard.
     #
-    # Exceptions
+    # If token is presented and valid, then it sets @current_user.
     #
+    # If the token does not have sufficient scopes to cover the requred scopes,
+    # then it raises InsufficientScopeError.
+    #
+    # If the token is expired, then it raises ExpiredError.
+    #
+    # If the token is revoked, then it raises RevokedError.
+    #
+    # If the token is not found (nil), then it raises TokenNotFoundError.
+    #
+    # Arguments:
+    #
+    #   scopes: (optional) scopes required for this guard.
+    #           Defaults to empty array.
+    #
+    def doorkeeper_guard!(scopes: [])
+      if (access_token = find_access_token).nil?
+        raise TokenNotFoundError
 
-    class MissingTokenError < StandardError; end
+      else
+        case validate_access_token(access_token, scopes)
+        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+          raise InsufficientScopeError.new(scopes)
+        when Oauth2::AccessTokenValidationService::EXPIRED
+          raise ExpiredError
+        when Oauth2::AccessTokenValidationService::REVOKED
+          raise RevokedError
+        when Oauth2::AccessTokenValidationService::VALID
+          @current_user = User.find(access_token.resource_owner_id)
+        end
+      end
+    end
 
-    class TokenNotFoundError < StandardError; end
+    def doorkeeper_guard(scopes: [])
+      if access_token = find_access_token
+        case validate_access_token(access_token, scopes)
+        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+          raise InsufficientScopeError.new(scopes)
 
-    class ExpiredError < StandardError; end
+        when Oauth2::AccessTokenValidationService::EXPIRED
+          raise ExpiredError
 
-    class RevokedError < StandardError; end
+        when Oauth2::AccessTokenValidationService::REVOKED
+          raise RevokedError
 
-    class InsufficientScopeError < StandardError
-      attr_reader :scopes
-      def initialize(scopes)
-        @scopes = scopes
+        when Oauth2::AccessTokenValidationService::VALID
+          @current_user = User.find(access_token.resource_owner_id)
+        end
+      end
+    end
+
+    def current_user
+      @current_user
+    end
+
+    private
+    def find_access_token
+      @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
+    end
+
+    def doorkeeper_request
+      @doorkeeper_request ||= ActionDispatch::Request.new(env)
+    end
+
+    def validate_access_token(access_token, scopes)
+      Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
+    end
+  end
+
+  module ClassMethods
+    # Installs the doorkeeper guard on the whole Grape API endpoint.
+    #
+    # Arguments:
+    #
+    #   scopes: (optional) scopes required for this guard.
+    #           Defaults to empty array.
+    #
+    def guard_all!(scopes: [])
+      before do
+        guard! scopes: scopes
+      end
+    end
+
+    private
+    def install_error_responders(base)
+      error_classes = [ MissingTokenError, TokenNotFoundError,
+                        ExpiredError, RevokedError, InsufficientScopeError]
+
+      base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
+    end
+
+    def oauth2_bearer_token_error_handler
+      Proc.new do |e|
+        response =
+          case e
+          when MissingTokenError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
+
+          when TokenNotFoundError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+              :invalid_token,
+              "Bad Access Token.")
+
+          when ExpiredError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+              :invalid_token,
+              "Token is expired. You can either do re-authorization or token refresh.")
+
+          when RevokedError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+              :invalid_token,
+              "Token was revoked. You have to re-authorize from the user.")
+
+          when InsufficientScopeError
+            # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
+            # does not include WWW-Authenticate header, which breaks the standard.
+            Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
+              :insufficient_scope,
+              Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
+              { scope: e.scopes })
+          end
+
+        response.finish
       end
     end
   end
-end
\ No newline at end of file
+
+  #
+  # Exceptions
+  #
+
+  class MissingTokenError < StandardError; end
+
+  class TokenNotFoundError < StandardError; end
+
+  class ExpiredError < StandardError; end
+
+  class RevokedError < StandardError; end
+
+  class InsufficientScopeError < StandardError
+    attr_reader :scopes
+    def initialize(scopes)
+      @scopes = scopes
+    end
+  end
+end
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index 7cd8b6fbae2..353c4ddebf8 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -3,7 +3,7 @@ Dir["#{Rails.root}/lib/ci/api/*.rb"].each {|file| require file}
 module Ci
   module API
     class API < Grape::API
-      include ::API::APIGuard
+      include APIGuard
       version 'v1', using: :path
 
       rescue_from ActiveRecord::RecordNotFound do

From 0094d8f19644152a66b9d21b8cd86f797199311f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:29:57 +0300
Subject: [PATCH 0225/1431] Rename `images` to `container_registry`

---
 app/controllers/projects_controller.rb               |  2 +-
 app/models/ability.rb                                | 12 ++++++++----
 app/models/ci/build.rb                               |  1 -
 app/models/project.rb                                |  8 +++++---
 app/views/projects/edit.html.haml                    |  8 ++++----
 config/gitlab.yml.example                            |  1 +
 config/initializers/1_settings.rb                    | 12 ++++++------
 .../20160407120251_add_images_enabled_for_project.rb |  2 +-
 db/schema.rb                                         |  2 +-
 doc/permissions/permissions.md                       |  2 ++
 lib/api/entities.rb                                  |  2 +-
 lib/api/projects.rb                                  | 10 +++++-----
 12 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 52f7b993343..f4ec60ad2c7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -235,7 +235,7 @@ class ProjectsController < Projects::ApplicationController
   def project_params
     params.require(:project).permit(
       :name, :path, :description, :issues_tracker, :tag_list, :runners_token,
-      :issues_enabled, :merge_requests_enabled, :snippets_enabled, :images_enabled,
+      :issues_enabled, :merge_requests_enabled, :snippets_enabled, :container_registry_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,
diff --git a/app/models/ability.rb b/app/models/ability.rb
index ba27b9a9b14..59d5195f5b9 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -203,7 +203,7 @@ class Ability
         :admin_label,
         :read_commit_status,
         :read_build,
-        :read_image,
+        :read_container_registry,
       ]
     end
 
@@ -218,8 +218,8 @@ class Ability
         :create_merge_request,
         :create_wiki,
         :push_code,
-        :create_image,
-        :update_image,
+        :create_container_registry,
+        :update_container_registry,
       ]
     end
 
@@ -246,7 +246,7 @@ class Ability
         :admin_project,
         :admin_commit_status,
         :admin_build,
-        :admin_image
+        :admin_container_registry,
       ]
     end
 
@@ -291,6 +291,10 @@ class Ability
         rules += named_abilities('build')
       end
 
+      unless project.container_registry_enabled
+        rules += named_abilities('container_registry')
+      end
+
       rules
     end
 
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 2fea8047147..4bc3a225e2c 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -426,7 +426,6 @@ module Ci
       variables << { key: :CI_BUILD_NAME, value: name, public: true }
       variables << { key: :CI_BUILD_STAGE, value: stage, public: true }
       variables << { key: :CI_BUILD_TRIGGERED, value: 'true', public: true } if trigger_request
-      variables << { key: :CI_DOCKER_REGISTRY, value: project.registry_repository_url, public: true } if project.registry_repository_url
       variables
     end
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index bce25455373..ab9ee9bad0a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -69,7 +69,7 @@ class Project < ActiveRecord::Base
   default_value_for :wiki_enabled, gitlab_config_features.wiki
   default_value_for :wall_enabled, false
   default_value_for :snippets_enabled, gitlab_config_features.snippets
-  default_value_for :images_enabled, gitlab_config_features.images
+  default_value_for :container_registry_enabled, gitlab_config_features.container_registry
   default_value_for(:shared_runners_enabled) { current_application_settings.shared_runners_enabled }
 
   # set last_activity_at to the same as created_at
@@ -375,8 +375,10 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
-  def registry_repository_url
-    "#{Gitlab.config.registry.host_with_port}/#{path_with_namespace}" if images_enabled? && Gitlab.config.registry.enabled
+  def container_registry_url
+    if container_registry_enabled? && Gitlab.config.registry.enabled
+      "#{Gitlab.config.registry.host_with_port}/#{path_with_namespace}"
+    end
   end
 
   def commit(id = 'HEAD')
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 5c7960031e0..f6a53fddf17 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -88,11 +88,11 @@
               .form-group
                 .col-sm-offset-2.col-sm-10
                   .checkbox
-                    = f.label :images_enabled do
-                      = f.check_box :images_enabled
-                      %strong Images
+                    = f.label :container_registry_enabled do
+                      = f.check_box :container_registry_enabled
+                      %strong Container Registry
                       %br
-                      %span.descr Use Docker Registry for this repository
+                      %span.descr Enable Container Registry for this repository
 
           = render 'builds_settings', f: f
 
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index cbb7c656fe7..f7a58753421 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -98,6 +98,7 @@ production: &base
       wiki: true
       snippets: false
       builds: true
+      container_registry: true
 
     ## Webhook settings
     # Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index b94f3f2f901..140d086054a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -230,12 +230,12 @@ Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10
 Settings.gitlab['session_expire_delay'] ||= 10080
-Settings.gitlab.default_projects_features['issues']         = true if Settings.gitlab.default_projects_features['issues'].nil?
-Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
-Settings.gitlab.default_projects_features['wiki']           = true if Settings.gitlab.default_projects_features['wiki'].nil?
-Settings.gitlab.default_projects_features['snippets']       = false if Settings.gitlab.default_projects_features['snippets'].nil?
-Settings.gitlab.default_projects_features['builds']         = true if Settings.gitlab.default_projects_features['builds'].nil?
-Settings.gitlab.default_projects_features['images']         = true if Settings.gitlab.default_projects_features['images'].nil?
+Settings.gitlab.default_projects_features['issues']             = true if Settings.gitlab.default_projects_features['issues'].nil?
+Settings.gitlab.default_projects_features['merge_requests']     = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
+Settings.gitlab.default_projects_features['wiki']               = true if Settings.gitlab.default_projects_features['wiki'].nil?
+Settings.gitlab.default_projects_features['snippets']           = false if Settings.gitlab.default_projects_features['snippets'].nil?
+Settings.gitlab.default_projects_features['builds']             = true if Settings.gitlab.default_projects_features['builds'].nil?
+Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil?
 Settings.gitlab.default_projects_features['visibility_level']    = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
 Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') if Settings.gitlab['repository_downloads_path'].nil?
 Settings.gitlab['restricted_signup_domains'] ||= []
diff --git a/db/migrate/20160407120251_add_images_enabled_for_project.rb b/db/migrate/20160407120251_add_images_enabled_for_project.rb
index 6a221a7fb03..47f0ca8e8de 100644
--- a/db/migrate/20160407120251_add_images_enabled_for_project.rb
+++ b/db/migrate/20160407120251_add_images_enabled_for_project.rb
@@ -1,5 +1,5 @@
 class AddImagesEnabledForProject < ActiveRecord::Migration
   def change
-    add_column :projects, :images_enabled, :boolean
+    add_column :projects, :container_registry_enabled, :boolean
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 7ea16e21358..103a18d3621 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -760,7 +760,7 @@ ActiveRecord::Schema.define(version: 20160421130527) do
     t.integer  "pushes_since_gc",              default: 0
     t.boolean  "last_repository_check_failed"
     t.datetime "last_repository_check_at"
-    t.boolean  "images_enabled"
+    t.boolean  "container_registry_enabled"
   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 6219693b8a8..6be5ea0b486 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -27,6 +27,7 @@ documentation](../workflow/add-user/add-user.md).
 | Manage issue tracker                  |         | ✓          | ✓           | ✓        | ✓      |
 | Manage labels                         |         | ✓          | ✓           | ✓        | ✓      |
 | See a commit status                   |         | ✓          | ✓           | ✓        | ✓      |
+| See a container registry              |         | ✓          | ✓           | ✓        | ✓      |
 | Manage merge requests                 |         |            | ✓           | ✓        | ✓      |
 | Create new merge request              |         |            | ✓           | ✓        | ✓      |
 | Create new branches                   |         |            | ✓           | ✓        | ✓      |
@@ -37,6 +38,7 @@ documentation](../workflow/add-user/add-user.md).
 | Write a wiki                          |         |            | ✓           | ✓        | ✓      |
 | Cancel and retry builds               |         |            | ✓           | ✓        | ✓      |
 | Create or update commit status        |         |            | ✓           | ✓        | ✓      |
+| Update a container registry           |         |            | ✓           | ✓        | ✓      |
 | Create new milestones                 |         |            |             | ✓        | ✓      |
 | Add new team members                  |         |            |             | ✓        | ✓      |
 | Push to protected branches            |         |            |             | ✓        | ✓      |
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 95c3597b03c..d62575e0a30 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -66,7 +66,7 @@ module API
       expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group }
       expose :name, :name_with_namespace
       expose :path, :path_with_namespace
-      expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :builds_enabled, :snippets_enabled, :images_enabled
+      expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :builds_enabled, :snippets_enabled, :container_registry_enabled
       expose :created_at, :last_activity_at
       expose :shared_runners_enabled
       expose :creator_id
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 6f85bc4b1b9..d14b28e17fd 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -94,7 +94,7 @@ module API
       #   builds_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
-      #   images_enabled (optional)
+      #   container_registry_enabled (optional)
       #   shared_runners_enabled (optional)
       #   namespace_id (optional) - defaults to user namespace
       #   public (optional) - if true same as setting visibility_level = 20
@@ -113,7 +113,7 @@ module API
                                      :builds_enabled,
                                      :wiki_enabled,
                                      :snippets_enabled,
-                                     :images_enabled,
+                                     :container_registry_enabled,
                                      :shared_runners_enabled,
                                      :namespace_id,
                                      :public,
@@ -145,7 +145,7 @@ module API
       #   builds_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
-      #   images_enabled (optional)
+      #   container_registry_enabled (optional)
       #   shared_runners_enabled (optional)
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional)
@@ -209,7 +209,7 @@ module API
       #   builds_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
-      #   images_enabled (optional)
+      #   container_registry_enabled (optional)
       #   shared_runners_enabled (optional)
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional) - visibility level of a project
@@ -226,7 +226,7 @@ module API
                                      :builds_enabled,
                                      :wiki_enabled,
                                      :snippets_enabled,
-                                     :images_enabled,
+                                     :container_registry_enabled,
                                      :shared_runners_enabled,
                                      :public,
                                      :visibility_level,

From 1dea54c2201ec5f51bcd8772757dbc6612cc9fdc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:35:01 +0300
Subject: [PATCH 0226/1431] Remove unused parts

---
 config/gitlab.yml.example         |   1 -
 config/initializers/1_settings.rb |   1 -
 lib/api/api.rb                    |   1 -
 lib/api/auth.rb                   | 187 ------------------------------
 4 files changed, 190 deletions(-)
 delete mode 100644 lib/api/auth.rb

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index f7a58753421..37639e52e66 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -184,7 +184,6 @@ production: &base
     # internal_host: localhost
     # key: config/registry.key
     # issuer: omnibus-certificate
-    # path: shared/registry
 
   #
   # 2. GitLab CI settings
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 140d086054a..1040d840e30 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -272,7 +272,6 @@ Settings.artifacts['max_size']    ||= 100 # in megabytes
 #
 Settings['registry'] ||= Settingslogic.new({})
 Settings.registry['registry']     = false if Settings.registry['enabled'].nil?
-Settings.registry['path']         = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], "registry"), Rails.root)
 Settings.registry['host']         ||= "example.com"
 Settings.registry['internal_host']||= "localhost"
 Settings.registry['key']          ||= nil
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 6ddfe11d98e..cc1004f8005 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -58,6 +58,5 @@ module API
     mount Variables
     mount Runners
     mount Licenses
-    mount Auth
   end
 end
diff --git a/lib/api/auth.rb b/lib/api/auth.rb
deleted file mode 100644
index dab04bca818..00000000000
--- a/lib/api/auth.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-module API
-  # Projects builds API
-  class Auth < Grape::API
-    namespace 'auth' do
-      get 'token' do
-        required_attributes! [:service]
-        keys = attributes_for_keys [:offline_token, :scope, :service]
-
-        case keys[:service]
-        when 'docker'
-          docker_token_auth(keys[:scope], keys[:offline_token])
-        else
-          not_found!
-        end
-      end
-    end
-
-    helpers do
-      def docker_token_auth(scope, offline_token)
-        auth!
-
-        if offline_token
-          forbidden! unless @user
-        elsif scope
-          @type, @path, actions = scope.split(':', 3)
-          bad_request!("invalid type: #{@type}") unless @type == 'repository'
-
-          @actions = actions.split(',')
-          bad_request!('missing actions') if @actions.empty?
-
-          @project = Project.find_with_namespace(@path)
-          not_found!('Project') unless @project
-
-          authorize_actions!(@actions)
-        end
-
-        { token: encode(docker_payload) }
-      end
-
-      def auth!
-        auth = BasicRequest.new(request.env)
-        return unless auth.provided?
-
-        return bad_request unless auth.basic?
-
-        # Authentication with username and password
-        login, password = auth.credentials
-
-        if ci_request?(login, password)
-          @ci = true
-          return
-        end
-
-        @user = authenticate_user(login, password)
-
-        if @user
-          request.env['REMOTE_USER'] = @user.username
-        end
-      end
-
-      def ci_request?(login, password)
-        matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
-
-        if @project && matched_login.present?
-          underscored_service = matched_login['s'].underscore
-
-          if underscored_service == 'gitlab_ci'
-            return @project.valid_build_token?(password)
-          end
-        end
-
-        false
-      end
-
-      def authenticate_user(login, password)
-        user = Gitlab::Auth.new.find(login, password)
-
-        # If the user authenticated successfully, we reset the auth failure count
-        # from Rack::Attack for that IP. A client may attempt to authenticate
-        # with a username and blank password first, and only after it receives
-        # a 401 error does it present a password. Resetting the count prevents
-        # false positives from occurring.
-        #
-        # Otherwise, we let Rack::Attack know there was a failed authentication
-        # attempt from this IP. This information is stored in the Rails cache
-        # (Redis) and will be used by the Rack::Attack middleware to decide
-        # whether to block requests from this IP.
-        config = Gitlab.config.rack_attack.git_basic_auth
-
-        if config.enabled
-          if user
-            # A successful login will reset the auth failure count from this IP
-            Rack::Attack::Allow2Ban.reset(@request.ip, config)
-          else
-            banned = Rack::Attack::Allow2Ban.filter(@request.ip, config) do
-              # Unless the IP is whitelisted, return true so that Allow2Ban
-              # increments the counter (stored in Rails.cache) for the IP
-              if config.ip_whitelist.include?(@request.ip)
-                false
-              else
-                true
-              end
-            end
-
-            if banned
-              Rails.logger.info "IP #{@request.ip} failed to login " \
-              "as #{login} but has been temporarily banned from Git auth"
-            end
-          end
-        end
-
-        user
-      end
-
-      def docker_payload
-        issued_at = Time.now
-        {
-          access: [
-            type: @type,
-            name: @path,
-            actions: @actions
-          ],
-          iss: Gitlab.config.registry.issuer,
-          aud: "docker",
-          sub: @user.try(:username),
-          aud: @service,
-          iat: issued_at,
-          nbf: issued_at - 5.seconds,
-          exp: issued_at + 60.minutes,
-          jti: SecureRandom.uuid,
-          exp: Time.now.to_i + 3600
-        }.compact
-      end
-
-      def private_key
-        @private_key ||= OpenSSL::PKey::RSA.new File.read Gitlab.config.registry.key
-      end
-
-      def encode(payload)
-        headers = {
-          kid: kid(private_key)
-        }
-        JWT.encode(payload, private_key, 'RS256', headers)
-      end
-
-      def authorize_actions!(actions)
-        actions.each do |action|
-          forbidden! unless can_access?(action)
-        end
-      end
-
-      def can_access?(action)
-        case action
-        when 'pull'
-          @ci || can?(@user, :download_code, @project)
-        when 'push'
-          @ci || can?(@user, :push_code, @project)
-        else
-          false
-        end
-      end
-
-      def kid(private_key)
-        sha256 = Digest::SHA256.new
-        sha256.update(private_key.public_key.to_der)
-        payload = StringIO.new(sha256.digest).read(30)
-        Base32.encode(payload).split("").each_slice(4).each_with_object([]) do |slice, mem|
-          mem << slice.join
-        end.join(":")
-      end
-
-      class BasicRequest < Rack::Auth::AbstractRequest
-        def basic?
-          "basic" == scheme
-        end
-
-        def credentials
-          @credentials ||= params.unpack("m*").first.split(/:/, 2)
-        end
-
-        def username
-          credentials.first
-        end
-      end
-    end
-  end
-end

From 04badd28f969ea2cf7b2d767f34fa67f0dcdc980 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:35:10 +0300
Subject: [PATCH 0227/1431] Added CHANGELOG entry

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

diff --git a/CHANGELOG b/CHANGELOG
index fed3caef7e8..7cccb9c9462 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.8.0 (unreleased)
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
   - Update SVG sanitizer to conform to SVG 1.1
   - Updated search UI
+  - Added authentication service for Container Registry
   - Display informative message when new milestone is created
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view

From 9f679ac2079dc1d412aaaed806c3d06bdc071046 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:35:25 +0300
Subject: [PATCH 0228/1431] Update docs/api/projects.md with container registry
 enabled option

---
 doc/api/projects.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/api/projects.md b/doc/api/projects.md
index de1faadebf5..f5f195b97df 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -424,6 +424,7 @@ Parameters:
 - `builds_enabled` (optional)
 - `wiki_enabled` (optional)
 - `snippets_enabled` (optional)
+- `container_registry_enabled` (optional)
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `import_url` (optional)
@@ -447,6 +448,7 @@ Parameters:
 - `builds_enabled` (optional)
 - `wiki_enabled` (optional)
 - `snippets_enabled` (optional)
+- `container_registry_enabled` (optional)
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `import_url` (optional)
@@ -472,6 +474,7 @@ Parameters:
 - `builds_enabled` (optional)
 - `wiki_enabled` (optional)
 - `snippets_enabled` (optional)
+- `container_registry_enabled` (optional)
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `public_builds` (optional)

From daca2144c80546169fb35fcf76b1f3d052b643cc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 20:47:06 +0300
Subject: [PATCH 0229/1431] Make code more clear in what is done

---
 app/controllers/jwt_controller.rb              |  9 +++++----
 .../jwt/docker_authentication_service.rb       | 18 +++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 2a92627cb1b..9bf1ddbba21 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -8,8 +8,9 @@ class JwtController < ApplicationController
 
   def auth
     @authenticated = authenticate_with_http_basic do |login, password|
-      @ci_project = ci_project(login, password)
-      @user = authenticate_user(login, password) unless @ci_project
+      # if it's possible we first try to authenticate project with login and password
+      @project = authenticate_project(login, password)
+      @user = authenticate_user(login, password) unless @project
     end
 
     unless @authenticated
@@ -19,7 +20,7 @@ class JwtController < ApplicationController
     service = SERVICES[params[:service]]
     head :not_found unless service
 
-    result = service.new(@ci_project, @user, auth_params).execute
+    result = service.new(@project, @user, auth_params).execute
     return head result[:http_status] if result[:http_status]
 
     render json: result
@@ -31,7 +32,7 @@ class JwtController < ApplicationController
     params.permit(:service, :scope, :offline_token, :account, :client_id)
   end
 
-  def ci_project(login, password)
+  def authenticate_project(login, password)
     matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
 
     if matched_login.present?
diff --git a/app/services/jwt/docker_authentication_service.rb b/app/services/jwt/docker_authentication_service.rb
index ce28085e5d6..fb0c41a12f7 100644
--- a/app/services/jwt/docker_authentication_service.rb
+++ b/app/services/jwt/docker_authentication_service.rb
@@ -5,12 +5,12 @@ module Jwt
         return error('forbidden', 403) unless current_user
       end
 
-      { token: token.encoded }
+      { token: authorized_token.encoded }
     end
 
     private
 
-    def token
+    def authorized_token
       token = ::Jwt::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = params[:service]
@@ -37,22 +37,22 @@ module Jwt
     end
 
     def process_repository_access(type, name, actions)
-      current_project = Project.find_with_namespace(name)
-      return unless current_project
+      requested_project = Project.find_with_namespace(name)
+      return unless requested_project
 
       actions = actions.select do |action|
-        can_access?(current_project, action)
+        can_access?(requested_project, action)
       end
 
       { type: type, name: name, actions: actions } if actions
     end
 
-    def can_access?(current_project, action)
-      case action
+    def can_access?(requested_project, requested_action)
+      case requested_action
       when 'pull'
-        current_project == project || can?(current_user, :download_code, current_project)
+        requested_project.public? || requested_project == project || can?(current_user, :download_code, requested_project)
       when 'push'
-        current_project == project || can?(current_user, :push_code, current_project)
+        requested_project == project || can?(current_user, :push_code, requested_project)
       else
         false
       end

From b180d79cdca2ce0f6aa7425baf47db5b9c1ec2e3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:04:42 +0300
Subject: [PATCH 0230/1431] Rename DockerAuthenticationService to
 ContainerRegistryAuthenticationService

---
 app/controllers/jwt_controller.rb             |  2 +-
 ...tainer_registry_authentication_service.rb} | 22 +++++++++++--------
 lib/jwt/token.rb                              | 14 +++++-------
 3 files changed, 20 insertions(+), 18 deletions(-)
 rename app/services/jwt/{docker_authentication_service.rb => container_registry_authentication_service.rb} (68%)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 9bf1ddbba21..0048a1a31ea 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -3,7 +3,7 @@ class JwtController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   SERVICES = {
-    'docker' => Jwt::DockerAuthenticationService,
+    'container_registry' => Jwt::ContainerRegistryAuthenticationService,
   }
 
   def auth
diff --git a/app/services/jwt/docker_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
similarity index 68%
rename from app/services/jwt/docker_authentication_service.rb
rename to app/services/jwt/container_registry_authentication_service.rb
index fb0c41a12f7..b9fcd380475 100644
--- a/app/services/jwt/docker_authentication_service.rb
+++ b/app/services/jwt/container_registry_authentication_service.rb
@@ -1,16 +1,18 @@
 module Jwt
-  class DockerAuthenticationService < BaseService
+  class ContainerRegistryAuthenticationService < BaseService
     def execute
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
       end
 
-      { token: authorized_token.encoded }
+      return error('forbidden', 401) if scopes.empty?
+
+      { token: authorized_token(scopes).encoded }
     end
 
     private
 
-    def authorized_token
+    def authorized_token(access)
       token = ::Jwt::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = params[:service]
@@ -19,11 +21,13 @@ module Jwt
       token
     end
 
-    def access
+    def scopes
       return unless params[:scope]
 
-      scope = process_scope(params[:scope])
-      [scope].compact
+      @scopes ||= begin
+        scope = process_scope(params[:scope])
+        [scope].compact
+      end
     end
 
     def process_scope(scope)
@@ -44,15 +48,15 @@ module Jwt
         can_access?(requested_project, action)
       end
 
-      { type: type, name: name, actions: actions } if actions
+      { type: type, name: name, actions: actions } if actions.present?
     end
 
     def can_access?(requested_project, requested_action)
       case requested_action
       when 'pull'
-        requested_project.public? || requested_project == project || can?(current_user, :download_code, requested_project)
+        requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
       when 'push'
-        requested_project == project || can?(current_user, :push_code, requested_project)
+        requested_project == project || can?(current_user, :create_container_registry, requested_project)
       else
         false
       end
diff --git a/lib/jwt/token.rb b/lib/jwt/token.rb
index 38cbc8004e7..765ab0d60c7 100644
--- a/lib/jwt/token.rb
+++ b/lib/jwt/token.rb
@@ -4,19 +4,21 @@ module Jwt
     attr_accessor :issued_at, :not_before, :expire_time
 
     def initialize
-      @payload = {}
       @id = SecureRandom.uuid
       @issued_at = Time.now
+      # we give a few seconds for time shift
       @not_before = issued_at - 5.seconds
+      # default 60 seconds should be more than enough for this authentication token
       @expire_time = issued_at + 1.minute
+      @custom_payload = {}
     end
 
     def [](key)
-      @payload[key]
+      @custom_payload[key]
     end
 
     def []=(key, value)
-      @payload[key] = value
+      @custom_payload[key] = value
     end
 
     def encoded
@@ -24,11 +26,7 @@ module Jwt
     end
 
     def payload
-      @payload.merge(default_payload)
-    end
-
-    def to_json
-      payload.to_json
+      @custom_payload.merge(default_payload)
     end
 
     private

From c78b97df0eb275415d6ed5ef297841ee2f61b473 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:06:32 +0300
Subject: [PATCH 0231/1431] Added rspec for testing container registry
 authentication service

---
 spec/lib/jwt/rsa_token_spec.rb                |  31 +++
 spec/lib/jwt/token_spec.rb                    |  18 ++
 ...er_registry_authentication_service_spec.rb | 192 ++++++++++++++++++
 3 files changed, 241 insertions(+)
 create mode 100644 spec/lib/jwt/rsa_token_spec.rb
 create mode 100644 spec/lib/jwt/token_spec.rb
 create mode 100644 spec/services/jwt/container_registry_authentication_service_spec.rb

diff --git a/spec/lib/jwt/rsa_token_spec.rb b/spec/lib/jwt/rsa_token_spec.rb
new file mode 100644
index 00000000000..710801923e7
--- /dev/null
+++ b/spec/lib/jwt/rsa_token_spec.rb
@@ -0,0 +1,31 @@
+describe Jwt::RSAToken do
+  let(:rsa_key) { generate_key }
+  let(:rsa_token) { described_class.new(nil) }
+  let(:rsa_encoded) { rsa_token.encoded }
+
+  before { allow_any_instance_of(described_class).to receive(:key).and_return(rsa_key) }
+
+  context 'token' do
+    context 'for valid key to be validated' do
+      before { rsa_token['key'] = 'value' }
+
+      subject { JWT.decode(rsa_encoded, rsa_key) }
+
+      it { expect{subject}.to_not raise_error }
+      it { expect(subject.first).to include('key' => 'value') }
+    end
+
+    context 'for invalid key to raise an exception' do
+      let(:new_key) { generate_key }
+      subject { JWT.decode(rsa_encoded, new_key) }
+
+      it { expect{subject}.to raise_error(JWT::DecodeError) }
+    end
+  end
+
+  private
+
+  def generate_key
+    OpenSSL::PKey::RSA.generate(512)
+  end
+end
diff --git a/spec/lib/jwt/token_spec.rb b/spec/lib/jwt/token_spec.rb
new file mode 100644
index 00000000000..a56b4cf39b5
--- /dev/null
+++ b/spec/lib/jwt/token_spec.rb
@@ -0,0 +1,18 @@
+describe Jwt::Token do
+  let(:token) { described_class.new }
+
+  context 'custom parameters' do
+    let(:value) { 'value' }
+    before { token[:key] = value }
+
+    it { expect(token[:key]).to eq(value) }
+    it { expect(token.payload).to include(key: value) }
+  end
+
+  context 'embeds default payload' do
+    subject { token.payload }
+    let(:default) { token.send(:default_payload) }
+
+    it { is_expected.to include(default) }
+  end
+end
diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/jwt/container_registry_authentication_service_spec.rb
new file mode 100644
index 00000000000..ea91f499d0a
--- /dev/null
+++ b/spec/services/jwt/container_registry_authentication_service_spec.rb
@@ -0,0 +1,192 @@
+require 'spec_helper'
+
+describe Jwt::ContainerRegistryAuthenticationService, services: true do
+  let(:current_project) { nil }
+  let(:current_user) { nil }
+  let(:current_params) { {} }
+  let(:rsa_key) { OpenSSL::PKey::RSA.generate(512) }
+  let(:registry_settings) {
+    {
+      issuer: 'rspec',
+      key: nil
+    }
+  }
+  let(:payload) { JWT.decode(subject[:token], rsa_key).first }
+
+  subject { described_class.new(current_project, current_user, current_params).execute }
+
+  before do
+    allow(Gitlab.config.registry).to receive_messages(registry_settings)
+    allow_any_instance_of(Jwt::RSAToken).to receive(:key).and_return(rsa_key)
+  end
+
+  shared_examples 'an authenticated' do
+    it { is_expected.to include(:token) }
+    it { expect(payload).to include('access') }
+  end
+
+  shared_examples 'a accessible' do
+    let(:access) {
+      [{
+         'type' => 'repository',
+         'name' => project.path_with_namespace,
+         'actions' => actions,
+       }]
+    }
+
+    it_behaves_like 'an authenticated'
+    it { expect(payload).to include('access' => access) }
+  end
+
+  shared_examples 'a pullable' do
+    it_behaves_like 'a accessible' do
+      let(:actions) { ['pull'] }
+    end
+  end
+
+  shared_examples 'a pushable' do
+    it_behaves_like 'a accessible' do
+      let(:actions) { ['push'] }
+    end
+  end
+
+  shared_examples 'a pullable and pushable' do
+    it_behaves_like 'a accessible' do
+      let(:actions) { ['pull', 'push'] }
+    end
+  end
+
+  shared_examples 'a forbidden' do
+    it { is_expected.to include(http_status: 401) }
+    it { is_expected.to_not include(:token) }
+  end
+
+  context 'user authorization' do
+    let(:project) { create(:project) }
+    let(:current_user) { create(:user) }
+
+    context 'allow developer to push images' do
+      before { project.team << [current_user, :developer] }
+
+      let(:current_params) {
+        { scope: "repository:#{project.path_with_namespace}:push" }
+      }
+
+      it_behaves_like 'a pushable'
+    end
+
+    context 'allow reporter to pull images' do
+      before { project.team << [current_user, :reporter] }
+
+      let(:current_params) {
+        { scope: "repository:#{project.path_with_namespace}:pull" }
+      }
+
+      it_behaves_like 'a pullable'
+    end
+
+    context 'return a least of privileges' do
+      before { project.team << [current_user, :reporter] }
+
+      let(:current_params) {
+        { scope: "repository:#{project.path_with_namespace}:push,pull" }
+      }
+
+      it_behaves_like 'a pullable'
+    end
+
+    context 'disallow guest to pull or push images' do
+      before { project.team << [current_user, :guest] }
+
+      let(:current_params) {
+        { scope: "repository:#{project.path_with_namespace}:pull,push" }
+      }
+
+      it_behaves_like 'a forbidden'
+    end
+  end
+
+  context 'project authorization' do
+    let(:current_project) { create(:empty_project) }
+
+    context 'allow to pull and push images' do
+      let(:current_params) {
+        { scope: "repository:#{current_project.path_with_namespace}:pull,push" }
+      }
+
+      it_behaves_like 'a pullable and pushable' do
+        let(:project) { current_project }
+      end
+    end
+
+    context 'for other projects' do
+      context 'when pulling' do
+        let(:current_params) {
+          { scope: "repository:#{project.path_with_namespace}:pull" }
+        }
+
+        context 'allow for public' do
+          let(:project) { create(:empty_project, :public) }
+          it_behaves_like 'a pullable'
+        end
+
+        context 'disallow for private' do
+          let(:project) { create(:empty_project, :private) }
+          it_behaves_like 'a forbidden'
+        end
+      end
+
+      context 'when pushing' do
+        let(:current_params) {
+          { scope: "repository:#{project.path_with_namespace}:push" }
+        }
+
+        context 'disallow for all' do
+          let(:project) { create(:empty_project, :public) }
+          it_behaves_like 'a forbidden'
+        end
+      end
+
+    end
+  end
+
+  context 'unauthorized' do
+    context 'for invalid scope' do
+      let(:current_params) {
+        { scope: 'invalid:aa:bb' }
+      }
+
+      it_behaves_like 'a forbidden'
+    end
+
+    context 'for private project' do
+      let(:project) { create(:empty_project, :private) }
+
+      let(:current_params) {
+        { scope: "repository:#{project.path_with_namespace}:pull" }
+      }
+
+      it_behaves_like 'a forbidden'
+    end
+
+    context 'for public project' do
+      let(:project) { create(:empty_project, :public) }
+
+      context 'when pulling and pushing' do
+        let(:current_params) {
+          { scope: "repository:#{project.path_with_namespace}:pull,push" }
+        }
+
+        it_behaves_like 'a pullable'
+      end
+
+      context 'when pushing' do
+        let(:current_params) {
+          { scope: "repository:#{project.path_with_namespace}:push" }
+        }
+
+        it_behaves_like 'a forbidden'
+      end
+    end
+  end
+end

From 08396be619eee2e71c2f5f7aa27eea6f5ddf10ff Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:14:46 +0300
Subject: [PATCH 0232/1431] Rename ImageRegistry to ContainerRegistry

---
 .../projects/container_registry_controller.rb            | 9 +++------
 app/models/project.rb                                    | 8 +++++---
 lib/{image_registry => container_registry}/blob.rb       | 2 +-
 lib/{image_registry => container_registry}/client.rb     | 2 +-
 lib/{image_registry => container_registry}/config.rb     | 2 +-
 lib/{image_registry => container_registry}/registry.rb   | 6 +++---
 lib/{image_registry => container_registry}/repository.rb | 6 +++---
 lib/{image_registry => container_registry}/tag.rb        | 8 ++++----
 8 files changed, 21 insertions(+), 22 deletions(-)
 rename lib/{image_registry => container_registry}/blob.rb (97%)
 rename lib/{image_registry => container_registry}/client.rb (98%)
 rename lib/{image_registry => container_registry}/config.rb (90%)
 rename lib/{image_registry => container_registry}/registry.rb (53%)
 rename lib/{image_registry => container_registry}/repository.rb (89%)
 rename lib/{image_registry => container_registry}/tag.rb (86%)

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index ffd455e6476..94f7580f0ea 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -5,10 +5,7 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
   layout 'project'
 
   def index
-    @tags = container_registry.tags
-
-    other_repository = container_registry.registry["gitlab/gitlab-test3"]
-    container_registry.copy_to(other_repository)
+    @tags = container_registry_repository.tags
   end
 
   def destroy
@@ -21,8 +18,8 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
 
   private
 
-  def container_registry
-    @container_registry ||= project.container_registry
+  def container_registry_repository
+    @container_registry_repository ||= project.container_registry_repository
   end
 
   def tag
diff --git a/app/models/project.rb b/app/models/project.rb
index f81d9a52628..d384c58ca36 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -376,9 +376,11 @@ class Project < ActiveRecord::Base
   end
 
   def container_registry
-    @registry_token ||= Jwt::DockerAuthenticationService.full_access_token(path_with_namespace)
-    @registry ||= ImageRegistry::Registry.new(Gitlab.config.registry.api_url, token: @registry_token)
-    @container_registry ||= ImageRegistry::Repository.new(@registry, path_with_namespace)
+    @container_registry_repository ||= begin
+      token = Jwt::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
+      registry = ContainerRegistry::Registry.new(Gitlab.config.registry.api_url, token: token)
+      registry[path_with_namespace]
+    end
   end
 
   def container_registry_url
diff --git a/lib/image_registry/blob.rb b/lib/container_registry/blob.rb
similarity index 97%
rename from lib/image_registry/blob.rb
rename to lib/container_registry/blob.rb
index 43665149e23..e0d9923f217 100644
--- a/lib/image_registry/blob.rb
+++ b/lib/container_registry/blob.rb
@@ -1,4 +1,4 @@
-module ImageRegistry
+module ContainerRegistry
   class Blob
     attr_reader :repository, :config
 
diff --git a/lib/image_registry/client.rb b/lib/container_registry/client.rb
similarity index 98%
rename from lib/image_registry/client.rb
rename to lib/container_registry/client.rb
index a4432059097..b823428344b 100644
--- a/lib/image_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -1,7 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
 
-module ImageRegistry
+module ContainerRegistry
   class Client
     attr_accessor :uri
 
diff --git a/lib/image_registry/config.rb b/lib/container_registry/config.rb
similarity index 90%
rename from lib/image_registry/config.rb
rename to lib/container_registry/config.rb
index 1c2abec1bfa..626b36cbaa9 100644
--- a/lib/image_registry/config.rb
+++ b/lib/container_registry/config.rb
@@ -1,4 +1,4 @@
-module ImageRegistry
+module ContainerRegistry
   class Config
     attr_reader :tag, :blob, :data
 
diff --git a/lib/image_registry/registry.rb b/lib/container_registry/registry.rb
similarity index 53%
rename from lib/image_registry/registry.rb
rename to lib/container_registry/registry.rb
index d8de8e392e9..f866862db22 100644
--- a/lib/image_registry/registry.rb
+++ b/lib/container_registry/registry.rb
@@ -1,14 +1,14 @@
-module ImageRegistry
+module ContainerRegistry
   class Registry
     attr_reader :uri, :client
 
     def initialize(uri, options = {})
       @uri = URI.parse(uri)
-      @client = ImageRegistry::Client.new(uri, options)
+      @client = ContainerRegistry::Client.new(uri, options)
     end
 
     def [](name)
-      ImageRegistry::Repository.new(self, name)
+      ContainerRegistry::Repository.new(self, name)
     end
   end
 end
diff --git a/lib/image_registry/repository.rb b/lib/container_registry/repository.rb
similarity index 89%
rename from lib/image_registry/repository.rb
rename to lib/container_registry/repository.rb
index 43e8e7720db..c930878d265 100644
--- a/lib/image_registry/repository.rb
+++ b/lib/container_registry/repository.rb
@@ -1,4 +1,4 @@
-module ImageRegistry
+module ContainerRegistry
   class Repository
     attr_reader :registry, :name
 
@@ -11,7 +11,7 @@ module ImageRegistry
     end
 
     def [](tag)
-      ImageRegistry::Tag.new(self, tag)
+      ContainerRegistry::Tag.new(self, tag)
     end
 
     def manifest
@@ -27,7 +27,7 @@ module ImageRegistry
       return @tags if defined?(@tags)
       return [] unless manifest && manifest['tags']
       @tags = manifest['tags'].map do |tag|
-        ImageRegistry::Tag.new(self, tag)
+        ContainerRegistry::Tag.new(self, tag)
       end
       @tags ||= []
     end
diff --git a/lib/image_registry/tag.rb b/lib/container_registry/tag.rb
similarity index 86%
rename from lib/image_registry/tag.rb
rename to lib/container_registry/tag.rb
index 76946a6ce5b..324778bdf2a 100644
--- a/lib/image_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -1,4 +1,4 @@
-module ImageRegistry
+module ContainerRegistry
   class Tag
     attr_reader :repository, :name
 
@@ -28,12 +28,12 @@ module ImageRegistry
     def config_blob
       return @config_blob if defined?(@config_blob)
       return unless manifest && manifest['config']
-      @config_blob = ImageRegistry::Blob.new(repository, manifest['config'])
+      @config_blob = ContainerRegistry::Blob.new(repository, manifest['config'])
     end
 
     def config
       return unless config_blob
-      @config ||= ImageRegistry::Config.new(self, config_blob)
+      @config ||= ContainerRegistry::Config.new(self, config_blob)
     end
 
     def created_at
@@ -45,7 +45,7 @@ module ImageRegistry
       return @layers if defined?(@layers)
       return unless manifest
       @layers = manifest['layers'].map do |layer|
-        ImageRegistry::Blob.new(repository, layer)
+        ContainerRegistry::Blob.new(repository, layer)
       end
     end
 

From d7b91fb596e50411c0adb5aa8fb17341087f3f57 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:27:06 +0300
Subject: [PATCH 0233/1431] Simplify Container Registry view implementation

---
 app/models/project.rb                         | 10 +++--
 .../container_registry/index.html.haml        | 41 ++++++++++---------
 lib/container_registry/blob.rb                |  4 ++
 lib/container_registry/registry.rb            |  3 +-
 lib/container_registry/repository.rb          |  4 ++
 lib/container_registry/tag.rb                 |  4 ++
 6 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index d384c58ca36..36ce472f3a3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -375,17 +375,19 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
-  def container_registry
+  def container_registry_repository
     @container_registry_repository ||= begin
       token = Jwt::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
-      registry = ContainerRegistry::Registry.new(Gitlab.config.registry.api_url, token: token)
+      url = Gitlab.config.registry.api_url
+      host_port = Gitlab.config.registry.host_port
+      registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
       registry[path_with_namespace]
     end
   end
 
-  def container_registry_url
+  def container_registry_repository_url
     if container_registry_enabled? && Gitlab.config.registry.enabled
-      "#{Gitlab.config.registry.host_with_port}/#{path_with_namespace}"
+      "#{Gitlab.config.registry.host_port}/#{path_with_namespace}"
     end
   end
 
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 1ac3a62f54e..5b7dd27ace6 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -1,35 +1,36 @@
 - page_title "Container Registry"
 = render "header_title"
 
-.light.prepend-top-default
-  %p
-    A 'container image' is a snapshot of a container.
-    You can host your 'container images' with GitLab.
-    %br
-    To start using container images hosted on GitLab you first need to login:
-    %pre
-      %code
-        docker login #{Gitlab.config.registry.host_port}
-    %br
-    Then you are free to create and upload a container images with build and push commands:
-    %pre
-      docker build -t #{Gitlab.config.registry.host_port}/#{@project.path_with_namespace} .
-      %br
-      docker push #{Gitlab.config.registry.host_port}/#{@project.path_with_namespace}
-
 %hr
 
 %ul.content-list
   - if @tags.blank?
     %li
-      .nothing-here-block No images to show
+      .nothing-here-block No images in Container Registry for this project.
+
+    .light.prepend-top-default
+      %p
+        A 'container image' is a snapshot of a container.
+        You can host your container images with GitLab.
+        %br
+        To start using container images hosted on GitLab you first need to login:
+        %pre
+          %code
+            docker login #{Gitlab.config.registry.host_port}
+        %br
+        Then you are free to create and upload a container images with build and push commands:
+        %pre
+          docker build -t #{escape_once(@project.container_registry_repository_url)} .
+          %br
+          docker push #{escape_once(@project.container_registry_repository_url)}
+
   - else
     .table-holder
       %table.table.builds
         %thead
           %tr
             %th Name
-            %th Digest
+            %th Image ID
             %th Size
             %th Created
             %th
@@ -37,8 +38,8 @@
         - @tags.each do |tag|
           %tr
             %td
-              #{tag.repository.name}:#{tag.name}
-              = clipboard_button(clipboard_text: "docker pull #{Gitlab.config.registry.host_port}/#{tag.repository.name}:#{tag.name}")
+              = escape_once(tag.name)
+              = clipboard_button(clipboard_text: "docker pull #{tag.path}")
             %td
               - if layer = tag.layers.first
                 %span.has-tooltip(title="#{layer.revision}")
diff --git a/lib/container_registry/blob.rb b/lib/container_registry/blob.rb
index e0d9923f217..16e3f853418 100644
--- a/lib/container_registry/blob.rb
+++ b/lib/container_registry/blob.rb
@@ -11,6 +11,10 @@ module ContainerRegistry
       digest.present?
     end
 
+    def path
+      "#{repository.path}@#{digest}"
+    end
+
     def digest
       config['digest']
     end
diff --git a/lib/container_registry/registry.rb b/lib/container_registry/registry.rb
index f866862db22..a86ddb9326a 100644
--- a/lib/container_registry/registry.rb
+++ b/lib/container_registry/registry.rb
@@ -1,8 +1,9 @@
 module ContainerRegistry
   class Registry
-    attr_reader :uri, :client
+    attr_reader :uri, :client, :path
 
     def initialize(uri, options = {})
+      @path = uri || options[:path]
       @uri = URI.parse(uri)
       @client = ContainerRegistry::Client.new(uri, options)
     end
diff --git a/lib/container_registry/repository.rb b/lib/container_registry/repository.rb
index c930878d265..f01330f3648 100644
--- a/lib/container_registry/repository.rb
+++ b/lib/container_registry/repository.rb
@@ -10,6 +10,10 @@ module ContainerRegistry
       @client ||= registry.client
     end
 
+    def path
+      [registry.path, name].compact.join('/')
+    end
+
     def [](tag)
       ContainerRegistry::Tag.new(self, tag)
     end
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index 324778bdf2a..14cee8be889 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -15,6 +15,10 @@ module ContainerRegistry
       @manifest = client.repository_manifest(repository.name, name)
     end
 
+    def path
+      "#{repository.path}:#{name}"
+    end
+
     def [](key)
       return unless manifest
       manifest[key]

From 60869580023da553613ee18bcdbc8682ebdde2cf Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:34:10 +0300
Subject: [PATCH 0234/1431] Rename image to container_registry

---
 app/controllers/projects/container_registry_controller.rb | 6 +++---
 app/helpers/projects_helper.rb                            | 4 ++--
 app/views/layouts/nav/_project.html.haml                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index 94f7580f0ea..82c621b29e4 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -1,6 +1,6 @@
 class Projects::ContainerRegistryController < Projects::ApplicationController
-  before_action :authorize_read_image!
-  before_action :authorize_update_image!, only: [:destroy]
+  before_action :authorize_read_container_registry!
+  before_action :authorize_update_container_registry!, only: [:destroy]
   before_action :tag, except: [:index]
   layout 'project'
 
@@ -23,6 +23,6 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
   end
 
   def tag
-    @tag ||= container_registry[params[:id]]
+    @tag ||= container_registry_repository[params[:id]]
   end
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a76b5e22600..664fdb6d745 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,8 +152,8 @@ module ProjectsHelper
       nav_tabs << :builds
     end
 
-    if can?(current_user, :read_image, project)
-      nav_tabs << :images
+    if can?(current_user, :read_container_registry, project)
+      nav_tabs << :container_registry
     end
 
     if can?(current_user, :admin_project, project)
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 8448599c1cc..d3d715aad3b 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -46,9 +46,9 @@
           Builds
           %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
-  - if project_nav_tab? :images
+  - if project_nav_tab? :container_registry
     = nav_link(controller: %w(container_registry)) do
-      = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-images' do
+      = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
         = icon('hdd-o fw')
         %span
           Container Registry

From b5043d5d33ed2a213889dfe52c819addd0d847ef Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:34:24 +0300
Subject: [PATCH 0235/1431] Fix review comments

---
 doc/permissions/permissions.md   |  1 +
 lib/container_registry/blob.rb   |  1 -
 lib/container_registry/client.rb | 33 ++++++++++++++++++--------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index 6be5ea0b486..30f6c75e1cf 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -39,6 +39,7 @@ documentation](../workflow/add-user/add-user.md).
 | Cancel and retry builds               |         |            | ✓           | ✓        | ✓      |
 | Create or update commit status        |         |            | ✓           | ✓        | ✓      |
 | Update a container registry           |         |            | ✓           | ✓        | ✓      |
+| Remove a container registry images    |         |            | ✓           | ✓        | ✓      |
 | Create new milestones                 |         |            |             | ✓        | ✓      |
 | Add new team members                  |         |            |             | ✓        | ✓      |
 | Push to protected branches            |         |            |             | ✓        | ✓      |
diff --git a/lib/container_registry/blob.rb b/lib/container_registry/blob.rb
index 16e3f853418..d59792a383e 100644
--- a/lib/container_registry/blob.rb
+++ b/lib/container_registry/blob.rb
@@ -44,7 +44,6 @@ module ContainerRegistry
     end
 
     def data
-      return @data if defined?(@data)
       @data ||= client.blob(repository.name, digest, type)
     end
 
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index b823428344b..41d9cb46ae9 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -9,20 +9,8 @@ module ContainerRegistry
 
     def initialize(base_uri, options = {})
       @base_uri = base_uri
-      @faraday = Faraday.new(@base_uri) do |builder|
-        builder.request :json
-        builder.headers['Accept'] = MANIFEST_VERSION
-
-        builder.response :json, :content_type => /\bjson$/
-        builder.response :json, :content_type => 'application/vnd.docker.distribution.manifest.v1+prettyjws'
-
-        if options[:user] && options[:password]
-          builder.request(:basic_auth, options[:user].to_s, options[:password].to_s)
-        elsif options[:token]
-          builder.request(:authorization, :bearer, options[:token].to_s)
-        end
-
-        builder.adapter :net_http
+      @faraday = Faraday.new(@base_uri) do |conn|
+        initialize_connection(conn)
       end
     end
 
@@ -60,5 +48,22 @@ module ContainerRegistry
     def delete_blob(name, digest)
       @faraday.delete("/v2/#{name}/blobs/#{digest}").success?
     end
+    
+    private
+    
+    def initialize_connection(conn)
+      conn.request :json
+      conn.headers['Accept'] = MANIFEST_VERSION
+
+      conn.response :json, :content_type => /\bjson$/
+
+      if options[:user] && options[:password]
+        conn.request(:basic_auth, options[:user].to_s, options[:password].to_s)
+      elsif options[:token]
+        conn.request(:authorization, :bearer, options[:token].to_s)
+      end
+
+      conn.adapter :net_http
+    end
   end
 end

From d5d8e76bd79cd9d61c66539a5069104cf46be2bd Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 22:41:48 +0300
Subject: [PATCH 0236/1431] Block renaming project or repository if it has
 container registry tags

---
 app/models/namespace.rb                   |  8 ++++++++
 app/models/project.rb                     | 11 +++++++++++
 app/services/projects/transfer_service.rb |  5 +++++
 3 files changed, 24 insertions(+)

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 741e912171d..0f61cee7888 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -127,6 +127,10 @@ class Namespace < ActiveRecord::Base
     # Ensure old directory exists before moving it
     gitlab_shell.add_namespace(path_was)
 
+    if any_project_has_container_registry_tags?
+      raise Exception.new('namespace cannot be moved, because at least one project has tags in container registry')
+    end
+
     if gitlab_shell.mv_namespace(path_was, path)
       Gitlab::UploadsTransfer.new.rename_namespace(path_was, path)
 
@@ -148,6 +152,10 @@ class Namespace < ActiveRecord::Base
     end
   end
 
+  def any_project_has_container_registry_tags?
+    projects.any?(:has_container_registry_tags?)
+  end
+
   def send_update_instructions
     projects.each do |project|
       project.send_move_instructions("#{path_was}/#{project.path}")
diff --git a/app/models/project.rb b/app/models/project.rb
index 36ce472f3a3..d3ae7803bea 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -391,6 +391,12 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def has_container_registry_tags?
+    if container_registry_enabled? && Gitlab.config.registry.enabled
+      container_registry_repository.tags.any?
+    end
+  end
+
   def commit(id = 'HEAD')
     repository.commit(id)
   end
@@ -806,6 +812,11 @@ class Project < ActiveRecord::Base
 
     expire_caches_before_rename(old_path_with_namespace)
 
+    if has_container_registry_tags?
+      # we currently doesn't support renaming repository if it contains tags in container registry
+      raise Exception.new('repository cannot be renamed, due to tags in container registry')
+    end
+
     if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
       # If repository moved successfully we need to send update instructions to users.
       # However we cannot allow rollback since we moved repository
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 111b3ec05ea..0d72286dec7 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -34,6 +34,11 @@ module Projects
           raise TransferError.new("Project with same path in target namespace already exists")
         end
 
+        if project.has_container_registry_tags?
+          # we currently doesn't support renaming repository if it contains tags in container registry
+          raise TransferError.new('Repository cannot be renamed, due to tags in container registry')
+        end
+
         project.expire_caches_before_rename(old_path)
 
         # Apply new namespace id and visibility level

From 849cc380d8f2ed895bde11c01987e6633bc3d567 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 7 May 2016 10:56:08 -0700
Subject: [PATCH 0237/1431] Use a case-insensitive comparison in sanitizing URI
 schemes

Closes #1625
---
 CHANGELOG                                          | 1 +
 lib/banzai/filter/sanitization_filter.rb           | 2 +-
 spec/lib/banzai/filter/sanitization_filter_spec.rb | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63077523aaa..917f9ed3a87 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.8.0 (unreleased)
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
+  - Use a case-insensitive comparison in sanitizing URI schemes
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
   - Improve multiple branch push performance by memoizing permission checking
diff --git a/lib/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb
index 42dbab9d27e..ca80aac5a08 100644
--- a/lib/banzai/filter/sanitization_filter.rb
+++ b/lib/banzai/filter/sanitization_filter.rb
@@ -63,7 +63,7 @@ module Banzai
 
           begin
             uri = Addressable::URI.parse(node['href'])
-            uri.scheme.strip! if uri.scheme
+            uri.scheme = uri.scheme.strip.downcase if uri.scheme
 
             node.remove_attribute('href') if UNSAFE_PROTOCOLS.include?(uri.scheme)
           rescue Addressable::URI::InvalidURIError
diff --git a/spec/lib/banzai/filter/sanitization_filter_spec.rb b/spec/lib/banzai/filter/sanitization_filter_spec.rb
index 27ce312b11c..b38e3b17e64 100644
--- a/spec/lib/banzai/filter/sanitization_filter_spec.rb
+++ b/spec/lib/banzai/filter/sanitization_filter_spec.rb
@@ -22,6 +22,12 @@ describe Banzai::Filter::SanitizationFilter, lib: true do
       expect(filter(act).to_html).to eq exp
     end
 
+    it 'sanitizes mixed-cased javascript in attributes' do
+      act = %q(<a href="javaScript:alert('foo')">Text</a>)
+      exp = '<a>Text</a>'
+      expect(filter(act).to_html).to eq exp
+    end
+
     it 'allows whitelisted HTML tags from the user' do
       exp = act = "<dl>\n<dt>Term</dt>\n<dd>Definition</dd>\n</dl>"
       expect(filter(act).to_html).to eq exp

From d05f0030a3de42ab3ec6d8c8be290b74698bb929 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 23:32:18 +0300
Subject: [PATCH 0238/1431] Added Docker Registry View tests

---
 app/controllers/jwt_controller.rb             |  2 +-
 ...ntainer_registry_authentication_service.rb |  6 ++-
 app/services/projects/destroy_service.rb      |  2 +-
 .../container_registry/_tag.html.haml         | 20 +++++++++
 .../container_registry/index.html.haml        | 23 +---------
 lib/container_registry/client.rb              |  4 +-
 spec/features/container_registry_spec.rb      | 43 +++++++++++++++++++
 .../container_registry/config_blob.json       |  1 +
 .../container_registry/tag_manifest.json      |  1 +
 spec/support/stub_gitlab_calls.rb             | 12 ++++++
 10 files changed, 87 insertions(+), 27 deletions(-)
 create mode 100644 app/views/projects/container_registry/_tag.html.haml
 create mode 100644 spec/features/container_registry_spec.rb
 create mode 100644 spec/fixtures/container_registry/config_blob.json
 create mode 100644 spec/fixtures/container_registry/tag_manifest.json

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 0048a1a31ea..07a842970b8 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -3,7 +3,7 @@ class JwtController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   SERVICES = {
-    'container_registry' => Jwt::ContainerRegistryAuthenticationService,
+    Jwt::ContainerRegistryAuthenticationService::AUDIENCE => Jwt::ContainerRegistryAuthenticationService,
   }
 
   def auth
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
index 88af4f8361b..2edee1f0ab0 100644
--- a/app/services/jwt/container_registry_authentication_service.rb
+++ b/app/services/jwt/container_registry_authentication_service.rb
@@ -1,5 +1,7 @@
 module Jwt
   class ContainerRegistryAuthenticationService < BaseService
+    AUDIENCE = 'container_registry'
+
     def execute
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
@@ -14,7 +16,7 @@ module Jwt
       registry = Gitlab.config.registry
       token = ::Jwt::RSAToken.new(registry.key)
       token.issuer = registry.issuer
-      token.audience = 'docker'
+      token.audience = AUDIENCE
       token[:access] = names.map do |name|
         { type: 'repository', name: name, actions: %w(pull push) }
       end
@@ -26,7 +28,7 @@ module Jwt
     def authorized_token(access)
       token = ::Jwt::RSAToken.new(registry.key)
       token.issuer = registry.issuer
-      token.audience = params[:service]
+      token.audience = AUDIENCE
       token.subject = current_user.try(:username)
       token[:access] = access
       token
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index a8b31f95c4c..8e2e46346ca 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -27,7 +27,7 @@ module Projects
         project.destroy!
 
         unless remove_registry_tags
-          raise_error('Failed to remove project image registry. Please try again or contact administrator')
+          raise_error('Failed to remove project container registry. Please try again or contact administrator')
         end
 
         unless remove_repository(repo_path)
diff --git a/app/views/projects/container_registry/_tag.html.haml b/app/views/projects/container_registry/_tag.html.haml
new file mode 100644
index 00000000000..f97988d20cf
--- /dev/null
+++ b/app/views/projects/container_registry/_tag.html.haml
@@ -0,0 +1,20 @@
+%tr.tag
+  %td
+    = escape_once(tag.name)
+    = clipboard_button(clipboard_text: "docker pull #{tag.path}")
+  %td
+    - if layer = tag.layers.first
+      %span.has-tooltip(title="#{layer.revision}")
+        = layer.short_revision
+    - else
+      \-
+  %td
+    = number_to_human_size(tag.total_size)
+    &middot;
+    = pluralize(tag.layers.size, "layer")
+  %td
+    = time_ago_in_words(tag.created_at)
+  %td.content
+    .controls.hidden-xs.pull-right
+      = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
+        = icon("trash cred")
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 5b7dd27ace6..701f1a86b56 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -26,7 +26,7 @@
 
   - else
     .table-holder
-      %table.table.builds
+      %table.table.tags
         %thead
           %tr
             %th Name
@@ -36,23 +36,4 @@
             %th
 
         - @tags.each do |tag|
-          %tr
-            %td
-              = escape_once(tag.name)
-              = clipboard_button(clipboard_text: "docker pull #{tag.path}")
-            %td
-              - if layer = tag.layers.first
-                %span.has-tooltip(title="#{layer.revision}")
-                  = layer.short_revision
-              - else
-                \-
-            %td
-              = number_to_human_size(tag.total_size)
-              &middot;
-              = pluralize(tag.layers.size, "layer")
-            %td
-              = time_ago_in_words(tag.created_at)
-            %td.content
-              .controls.hidden-xs.pull-right
-                = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
-                  = icon("trash cred")
+          = render 'tag', tag: tag
\ No newline at end of file
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index 41d9cb46ae9..0bfb6baffd4 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -10,7 +10,7 @@ module ContainerRegistry
     def initialize(base_uri, options = {})
       @base_uri = base_uri
       @faraday = Faraday.new(@base_uri) do |conn|
-        initialize_connection(conn)
+        initialize_connection(conn, options)
       end
     end
 
@@ -51,7 +51,7 @@ module ContainerRegistry
     
     private
     
-    def initialize_connection(conn)
+    def initialize_connection(conn, options)
       conn.request :json
       conn.headers['Accept'] = MANIFEST_VERSION
 
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
new file mode 100644
index 00000000000..7bef7a2ee81
--- /dev/null
+++ b/spec/features/container_registry_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe "Container Registry" do
+  let(:project) { create(:empty_project) }
+  let(:repository) { project.container_registry_repository }
+  let(:tag_name) { 'latest' }
+  let(:tags) { [tag_name] }
+
+  before do
+  end
+
+  before do
+    login_as(:user)
+    project.team << [@user, :developer]
+    stub_container_registry(*tags)
+  end
+
+  describe 'GET /:project/container_registry' do
+    before do
+      visit namespace_project_container_registry_index_path(project.namespace, project)
+    end
+
+    context 'when no tags' do
+      let(:tags) { [] }
+      it { expect(page).to have_content('No images in Container Registry for this project') }
+    end
+
+    context 'when there are tags' do
+      it { expect(page).to have_content(tag_name)}
+    end
+  end
+
+  describe 'DELETE /:project/container_registry/tag' do
+    before do
+      visit namespace_project_container_registry_index_path(project.namespace, project)
+    end
+
+    it do
+      expect_any_instance_of(::ContainerRegistry::Tag).to receive(:delete).and_return(true)
+      click_on 'Remove'
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/fixtures/container_registry/config_blob.json b/spec/fixtures/container_registry/config_blob.json
new file mode 100644
index 00000000000..1028c994a24
--- /dev/null
+++ b/spec/fixtures/container_registry/config_blob.json
@@ -0,0 +1 @@
+{"architecture":"amd64","config":{"Hostname":"b14cd8298755","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"container":"b14cd82987550b01af9a666a2f4c996280a6152e66873134fae5a0f223dc5976","container_config":{"Hostname":"b14cd8298755","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["/bin/sh","-c","#(nop) ADD file:033ab063740d9ff4dcfb1c69eccf25f91d88729f57cd5a73050e014e3e094aa0 in /"],"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"created":"2016-04-01T20:53:00.160300546Z","docker_version":"1.9.1","history":[{"created":"2016-04-01T20:53:00.160300546Z","created_by":"/bin/sh -c #(nop) ADD file:033ab063740d9ff4dcfb1c69eccf25f91d88729f57cd5a73050e014e3e094aa0 in /"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:c56b7dabbc7aa730eeab07668bdcbd7e3d40855047ca9a0cc1bfed23a2486111"]}}
diff --git a/spec/fixtures/container_registry/tag_manifest.json b/spec/fixtures/container_registry/tag_manifest.json
new file mode 100644
index 00000000000..1b6008e2872
--- /dev/null
+++ b/spec/fixtures/container_registry/tag_manifest.json
@@ -0,0 +1 @@
+{"schemaVersion":2,"mediaType":"application/vnd.docker.distribution.manifest.v2+json","config":{"mediaType":"application/octet-stream","size":1145,"digest":"sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac"},"layers":[{"mediaType":"application/vnd.docker.image.rootfs.diff.tar.gzip","size":2319870,"digest":"sha256:420890c9e918b6668faaedd9000e220190f2493b0693ee563ebd7b4cc754a57d"}]}
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index eec2e681117..6b3a4010063 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -25,6 +25,18 @@ module StubGitlabCalls
     allow_any_instance_of(Project).to receive(:builds_enabled?).and_return(false)
   end
 
+  def stub_container_registry(*tags)
+    allow_any_instance_of(ContainerRegistry::Client).to receive(:repository_tags).and_return(
+      { "tags" => tags }
+    )
+    allow_any_instance_of(ContainerRegistry::Client).to receive(:repository_manifest).and_return(
+      JSON.load(File.read(Rails.root + 'spec/fixtures/container_registry/tag_manifest.json'))
+    )
+    allow_any_instance_of(ContainerRegistry::Client).to receive(:blob).and_return(
+      File.read(Rails.root + 'spec/fixtures/container_registry/config_blob.json')
+    )
+  end
+
   private
 
   def gitlab_url

From 1ad0c968d579fe6ac0b2fc00a1dae32449ceb2c3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 9 May 2016 23:39:48 +0300
Subject: [PATCH 0239/1431] Make a build views nicer

---
 app/models/commit_status.rb                   |  2 +-
 app/views/projects/ci/builds/_build.html.haml | 52 +++++++++++++------
 .../projects/ci/commits/_commit.html.haml     |  6 ++-
 .../projects/commit/_ci_commit.html.haml      | 28 +++++-----
 app/views/projects/pipelines/index.html.haml  |  7 ++-
 5 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index aa56314aa16..c0ae30820ee 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -89,7 +89,7 @@ class CommitStatus < ActiveRecord::Base
 
   def self.stages
     order_by = 'max(stage_idx)'
-    group('stage').order(order_by).pluck(:stage, order_by).map(&:first).compact
+    CommitStatus.where(id: all).group('stage').order(order_by).pluck(:stage, order_by).map(&:first).compact
   end
 
   def self.stages_status
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 745ff461d76..7e7e54c68a3 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -42,25 +42,43 @@
   %td
     = build.name
 
-    .label-container
-      - if build.tags.any?
-        - build.tags.each do |tag|
-          %span.label.label-primary
-            = tag
-      - if build.try(:trigger_request)
-        %span.label.label-info triggered
-      - if build.try(:allow_failure)
-        %span.label.label-danger allowed to fail
-      - if defined?(retried) && retried
-        %span.label.label-warning retried
+    .pull-right
+      .label-container
+        - if build.tags.any?
+          - build.tags.each do |tag|
+            %span.label.label-primary
+              = tag
+        - if build.try(:trigger_request)
+          %span.label.label-info triggered
+        - if build.try(:allow_failure)
+          %span.label.label-danger allowed to fail
+        - if defined?(retried) && retried
+          %span.label.label-warning retried
 
-  %td.duration
-    - if build.duration
-      #{duration_in_words(build.finished_at, build.started_at)}
+  - if defined?(new_duration) && new_duration
+    %td.duration
+      - if build.duration
+        %p
+          %i.fa.fa-clock-o
+          &nbsp;
+          #{duration_in_words(build.finished_at, build.started_at)}
+      - if build.finished_at
+        %p
+          %i.fa.fa-calendar
+          &nbsp;
+          #{time_ago_with_tooltip(build.finished_at)}
+  - else
+    %td.duration
+      - if build.duration
+        %i.fa.fa-clock-o
+        &nbsp;
+        #{duration_in_words(build.finished_at, build.started_at)}
 
-  %td.timestamp
-    - if build.finished_at
-      %span #{time_ago_with_tooltip(build.finished_at)}
+    %td.timestamp
+      - if build.finished_at
+        %i.fa.fa-calendar
+        &nbsp;
+        %span #{time_ago_with_tooltip(build.finished_at)}
 
   - if defined?(coverage) && coverage
     %td.coverage
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 32f85cb8f8c..d5dd6c7b0aa 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -35,7 +35,8 @@
     - stages.each do |stage|
       %td
         - if status = stages_status[stage]
-          %span.has-tooltip(title="#{stage.titleize}: #{status}"){class: "ci-status-icon-#{status}"}
+          - tooltip = "#{stage.titleize}: #{status}"
+          %span.has-tooltip(title="#{tooltip}"){class: "ci-status-icon-#{status}"}
             = ci_icon_for_status(status)
 
   %td
@@ -52,7 +53,7 @@
 
   %td
     .controls.hidden-xs.pull-right
-      - artifacts = commit.builds.latest
+      - artifacts = commit.builds.latest.select { |b| b.artifacts? }
       - if artifacts.present?
         .dropdown.inline
           %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
@@ -66,6 +67,7 @@
                   %span #{build.name}
 
       - if can?(current_user, :update_pipeline, @project)
+        &nbsp;
         - if commit.retryable? && commit.builds.failed.any?
           = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 21a30080868..ba0baa1e2a2 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -36,17 +36,19 @@
 
 .table-holder
   %table.table.builds
-    %thead
-      %tr
-        %th Status
-        %th Build ID
-        %th Stage
-        %th Name
-        %th Duration
-        %th Finished at
-        - if @project.build_coverage_enabled?
-          %th Coverage
-        %th
     - builds = ci_commit.statuses.latest.ordered
-    = render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
-    = render ci_commit.retried, coverage: @project.build_coverage_enabled?, stage: true, ref: false, retried: true
+    - CommitStatus.where(id: builds).stages.each do |stage|
+      - stage_builds = builds.where(stage: stage)
+      %tr
+        %th{colspan: 10}
+          %strong
+            - stage_status = CommitStatus.where(id: stage_builds.ids).status
+            %span{class: "ci-status-link ci-status-icon-#{stage_status}"}
+              = ci_icon_for_status(stage_status)
+            &nbsp;
+            = stage.titleize.pluralize
+        = render stage_builds, coverage: @project.build_coverage_enabled?, tage: false, ref: false, allow_retry: true
+        = render ci_commit.retried.select { |build| build.stage == stage }, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
+      %tr
+        %td{colspan: 10}
+          &nbsp;
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 838b2986d4f..0e08753fd3b 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -38,7 +38,12 @@
         %span CI Lint
 
 .gray-content-block
-  Pipelines for #{(@scope || 'changes')} on this project
+  - if @scope == 'running'
+    Running pipelines for this project
+  - elsif @scope.nil?
+    Pipelines for this project
+  - else
+    #{@scope.titleize} for this project
 
 %ul.content-list
   - stages = @pipelines.stages

From 504a1fac95a2af2cf90f00f310d244d8d37f0015 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 10 May 2016 00:58:53 +0300
Subject: [PATCH 0240/1431] Fix SQL queries for calculating stages status

---
 app/models/commit_status.rb                    | 12 +++++++-----
 app/views/projects/commit/_ci_commit.html.haml |  5 ++---
 app/views/projects/commit/_ci_stage.html.haml  | 10 +++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index b031259e252..0c0c3d38f94 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -51,7 +51,7 @@ class CommitStatus < ActiveRecord::Base
   alias_attribute :author, :user
 
   scope :latest, -> { where(id: unscope(:select).select('max(id)').group(:name, :commit_id)) }
-  scope :ordered, -> { order(:ref, :stage_idx, :name) }
+  scope :ordered, -> { order(:name) }
   scope :ignored, -> { where(allow_failure: true, status: [:failed, :canceled]) }
 
   state_machine :status, initial: :pending do
@@ -91,13 +91,15 @@ class CommitStatus < ActiveRecord::Base
   end
 
   def self.stages
-    order_by = 'max(stage_idx)'
-    CommitStatus.where(id: all).group('stage').order(order_by).pluck(:stage, order_by).map(&:first).compact
+    # We group by stage name, but order stages by their's index
+    unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').pluck('sg.stage')
   end
 
   def self.stages_status
-    all.stages.inject({}) do |h, stage|
-      h[stage] = all.where(stage: stage).status
+    # We execute subquery for each of the stages which calculates an Stage Status
+    statuses = unscoped.from(all, :sg).group('stage').pluck('sg.stage', all.where('stage=sg.stage').status_sql)
+    statuses.inject({}) do |h, k|
+      h[k.first] = k.last
       h
     end
   end
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 1a17d1b4ed6..c8443763613 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -36,6 +36,5 @@
 
 .table-holder
   %table.table.builds
-    - stages = ci_commit.statuses.latest.stages_status
-    - stages.each do |stage, status|
-      = render 'ci_stage', stage: stage, status: status
+    - ci_commit.statuses.stages.each do |stage|
+      = render 'projects/commit/ci_stage', stage: stage, statuses: ci_commit.statuses.where(stage: stage)
diff --git a/app/views/projects/commit/_ci_stage.html.haml b/app/views/projects/commit/_ci_stage.html.haml
index 0fb428dcd26..f9f2757dc34 100644
--- a/app/views/projects/commit/_ci_stage.html.haml
+++ b/app/views/projects/commit/_ci_stage.html.haml
@@ -1,15 +1,15 @@
-- statuses = ci_commit.statuses.where(stage: stage).to_a
-- retried = statuses.select(&:retried?)
-- latest = statuses - retried
+- latest = statuses.latest
+- retried = statuses.where.not(id: latest)
 %tr
   %th{colspan: 10}
     %strong
+      - status = latest.status
       %span{class: "ci-status-link ci-status-icon-#{status}"}
         = ci_icon_for_status(status)
       &nbsp;
       = stage.titleize.pluralize
-  = render latest, coverage: @project.build_coverage_enabled?, tage: false, ref: false, allow_retry: true
-  = render retried, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
+  = render latest.ordered, coverage: @project.build_coverage_enabled?, tage: false, ref: false, allow_retry: true
+  = render retried.ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
   %tr
     %td{colspan: 10}
       &nbsp;

From e56e3cdc62f96541b9bd8b7814204e92f1909253 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 9 May 2016 19:35:37 -0300
Subject: [PATCH 0241/1431] Fix api leaking notes when user is not authorized
 to read noteable

---
 CHANGELOG                       |  1 +
 lib/api/notes.rb                | 29 +++++++++++++++++------------
 spec/requests/api/notes_spec.rb | 19 +++++++++++++++++++
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63077523aaa..2c44944f66b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.8.0 (unreleased)
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
+  - Fix API leak of notes of unauthorized issues, snippets and merge requests
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 71a53e6f0d6..4ac08a3e8c4 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -20,19 +20,24 @@ module API
         #   GET /projects/:id/snippets/:noteable_id/notes
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes" do
           @noteable = user_project.send(:"#{noteables_str}").find(params[:"#{noteable_id_str}"])
+          read_ability_name = "read_#{@noteable.class.to_s.underscore.downcase}".to_sym
 
-          # We exclude notes that are cross-references and that cannot be viewed
-          # by the current user. By doing this exclusion at this level and not
-          # at the DB query level (which we cannot in that case), the current
-          # page can have less elements than :per_page even if
-          # there's more than one page.
-          notes =
-            # paginate() only works with a relation. This could lead to a
-            # mismatch between the pagination headers info and the actual notes
-            # array returned, but this is really a edge-case.
-            paginate(@noteable.notes).
-            reject { |n| n.cross_reference_not_visible_for?(current_user) }
-          present notes, with: Entities::Note
+          if can?(current_user, read_ability_name, @noteable)
+            # We exclude notes that are cross-references and that cannot be viewed
+            # by the current user. By doing this exclusion at this level and not
+            # at the DB query level (which we cannot in that case), the current
+            # page can have less elements than :per_page even if
+            # there's more than one page.
+            notes =
+              # paginate() only works with a relation. This could lead to a
+              # mismatch between the pagination headers info and the actual notes
+              # array returned, but this is really a edge-case.
+              paginate(@noteable.notes).
+              reject { |n| n.cross_reference_not_visible_for?(current_user) }
+            present notes, with: Entities::Note
+          else
+            render_api_error!("Not found.", 404)
+          end
         end
 
         # Get a single +noteable+ note
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 49091fc0f49..f5b31be1ba3 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -57,6 +57,15 @@ describe API::API, api: true  do
           expect(json_response).to be_empty
         end
 
+        context "and issue is confidential" do
+          before { ext_issue.update_attributes(confidential: true) }
+
+          it "returns 404" do
+            get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
+            expect(response.status).to eq(404)
+          end
+        end
+
         context "and current user can view the note" do
           it "should return an empty array" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", private_user)
@@ -80,6 +89,11 @@ describe API::API, api: true  do
         get api("/projects/#{project.id}/snippets/42/notes", user)
         expect(response.status).to eq(404)
       end
+
+      it "returns 404 when not authorized" do
+        get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", private_user)
+        expect(response.status).to eq(404)
+      end
     end
 
     context "when noteable is a Merge Request" do
@@ -94,6 +108,11 @@ describe API::API, api: true  do
         get api("/projects/#{project.id}/merge_requests/4444/notes", user)
         expect(response.status).to eq(404)
       end
+
+      it "returns 404 when not authorized" do
+        get api("/projects/#{project.id}/merge_requests/4444/notes", private_user)
+        expect(response.status).to eq(404)
+      end
     end
   end
 

From bf0fd3ea1bcbf0245c973411d8e5b28a15ef206f Mon Sep 17 00:00:00 2001
From: Benedikt Huss <benedikt.huss@gmail.com>
Date: Thu, 5 May 2016 01:16:16 +0200
Subject: [PATCH 0242/1431] Links for redmine issue references are generated
 correctly again

---
 CHANGELOG                                   | 1 +
 lib/banzai/filter/issue_reference_filter.rb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 63077523aaa..1c6e24bc10f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ v 8.8.0 (unreleased)
 v 8.7.4
   - Fix always showing build notification message when switching between merge requests
   - Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
+  - Links for Redmine issue references are generated correctly again (Benedikt Huss)
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/lib/banzai/filter/issue_reference_filter.rb b/lib/banzai/filter/issue_reference_filter.rb
index 2732e0b5145..59c5e89c546 100644
--- a/lib/banzai/filter/issue_reference_filter.rb
+++ b/lib/banzai/filter/issue_reference_filter.rb
@@ -10,6 +10,9 @@ module Banzai
       end
 
       def self.user_can_see_reference?(user, node, context)
+        # It is not possible to check access rights for external issue trackers
+        return true if context[:project].try(:external_issue_tracker)
+ 
         issue = Issue.find(node.attr('data-issue')) rescue nil
         Ability.abilities.allowed?(user, :read_issue, issue)
       end

From fe2137d871b978033007a3375cf6f1edf0f04cd4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 10 May 2016 02:26:13 +0300
Subject: [PATCH 0243/1431] Improve pipelines design

---
 .../projects/pipelines_controller.rb          | 65 +++++--------------
 app/finders/pipelines_finder.rb               | 38 +++++++++++
 app/helpers/ci_status_helper.rb               | 12 ++--
 app/models/ci/commit.rb                       |  8 +++
 app/services/ci/create_pipeline_service.rb    | 42 ++++++++++++
 app/views/layouts/nav/_project.html.haml      |  6 +-
 app/views/projects/ci/builds/_build.html.haml | 18 ++---
 .../projects/ci/commits/_commit.html.haml     |  8 +--
 spec/models/project_spec.rb                   |  2 +-
 9 files changed, 129 insertions(+), 70 deletions(-)
 create mode 100644 app/finders/pipelines_finder.rb
 create mode 100644 app/services/ci/create_pipeline_service.rb

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index aba64e4a730..a261d03f4d0 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -4,63 +4,28 @@ class Projects::PipelinesController < Projects::ApplicationController
   before_action :authorize_read_pipeline!
   before_action :authorize_create_pipeline!, only: [:new, :create]
   before_action :authorize_update_pipeline!, only: [:retry, :cancel]
-  layout 'project'
 
   def index
     @scope = params[:scope]
     @all_pipelines = project.ci_commits
-    @pipelines = @all_pipelines.order(id: :desc)
-    @pipelines =
-      case @scope
-      when 'running'
-        @pipelines.running_or_pending
-      when 'branches'
-        @branches = project.repository.branches.map(&:name)
-        @branches_ids = @all_pipelines.where(ref: @branches).group(:ref).select('max(id)')
-        @pipelines.where(id: @branches_ids)
-      when 'tags'
-        @tags = project.repository.tags.map(&:name)
-        @tags_ids = @all_pipelines.where(ref: @tags).group(:ref).select('max(id)')
-        @pipelines.where(id: @tags_ids)
-      else
-        @pipelines
-      end
-    @pipelines = @pipelines.page(params[:page]).per(30)
+    @pipelines = PipelinesFinder.new(project).execute(@all_pipelines, @scope)
+    @pipelines = @pipelines.order(id: :desc).page(params[:page]).per(30)
   end
 
   def new
   end
 
   def create
-    ref_names = project.repository.ref_names
-    unless ref_names.include?(params[:ref])
-      @error = 'Reference not found'
-      render action: 'new'
-      return
+    begin
+      pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute
+      redirect_to namespace_project_pipeline_path(project.namespace, project, pipeline)
+    rescue ArgumentError => e
+      @error = e.message
+      render 'new'
+    rescue => e
+      @error = 'Undefined error'
+      render 'new'
     end
-
-    commit = project.commit(params[:ref])
-    unless commit
-      @error = 'Commit not found'
-      render action: 'new'
-      return
-    end
-
-    pipeline = project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
-
-    # Skip creating ci_commit when no gitlab-ci.yml is found
-    unless pipeline.config_processor
-      @error = pipeline.yaml_errors || 'Missing .gitlab-ci.yml file'
-      render action: 'new'
-      return
-    end
-
-    Ci::Commit.transaction do
-      commit.save!
-      commit.create_builds(current_user)
-    end
-
-    redirect_to builds_namespace_project_commit_path(project.namespace, project, commit.id)
   end
 
   def show
@@ -70,19 +35,23 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def retry
-    pipeline.builds.latest.failed.select(&:retryable?).each(&:retry)
+    pipeline.retry_failed
 
     redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
   end
 
   def cancel
-    pipeline.builds.running_or_pending.each(&:cancel)
+    pipeline.cancel_running
 
     redirect_back_or_default default: namespace_project_pipelines_path(project.namespace, project)
   end
 
   private
 
+  def create_params
+    params.permit(:ref)
+  end
+
   def pipeline
     @pipeline ||= project.ci_commits.find_by!(id: params[:id])
   end
diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb
new file mode 100644
index 00000000000..c19a795d467
--- /dev/null
+++ b/app/finders/pipelines_finder.rb
@@ -0,0 +1,38 @@
+class PipelinesFinder
+  attr_reader :project
+
+  def initialize(project)
+    @project = project
+  end
+
+  def execute(pipelines, scope)
+    case scope
+    when 'running'
+      pipelines.running_or_pending
+    when 'branches'
+      from_ids(pipelines, ids_for_ref(pipelines, branches))
+    when 'tags'
+      from_ids(pipelines, ids_for_ref(pipelines, tags))
+    else
+      pipelines
+    end
+  end
+
+  private
+
+  def ids_for_ref(pipelines, refs)
+    pipelines.where(ref: refs).group(:ref).select('max(id)')
+  end
+
+  def from_ids(pipelines, ids)
+    pipelines.unscoped.where(id: ids)
+  end
+
+  def branches
+    project.repository.branches.map(&:name)
+  end
+
+  def tags
+    project.repository.tags.map(&:name)
+  end
+end
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index acc01b008bf..cfad17dcacf 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -50,6 +50,13 @@ module CiStatusHelper
     render_status_with_link('pipeline', pipeline.status, path, tooltip_placement)
   end
 
+  def no_runners_for_project?(project)
+    project.runners.blank? &&
+      Ci::Runner.shared.blank?
+  end
+
+  private
+
   def render_status_with_link(type, status, path, tooltip_placement)
     link_to ci_icon_for_status(status),
             path,
@@ -57,9 +64,4 @@ module CiStatusHelper
             title: "#{type.titleize}: #{ci_label_for_status(status)}",
             data: { toggle: 'tooltip', placement: tooltip_placement }
   end
-
-  def no_runners_for_project?(project)
-    project.runners.blank? &&
-      Ci::Runner.shared.blank?
-  end
 end
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 759c31b0055..71696a3923c 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -89,6 +89,14 @@ module Ci
       end
     end
 
+    def cancel_running
+      builds.running_or_pending.each(&:cancel)
+    end
+
+    def retry_failed
+      builds.latest.failed.select(&:retryable?).each(&:retry)
+    end
+
     def latest?
       return false unless ref
       commit = project.commit(ref)
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
new file mode 100644
index 00000000000..40414b49864
--- /dev/null
+++ b/app/services/ci/create_pipeline_service.rb
@@ -0,0 +1,42 @@
+module Ci
+  class CreatePipelineService < BaseService
+    def execute
+      unless ref_names.include?(params[:ref])
+        raise ArgumentError, 'Reference not found'
+      end
+
+      unless commit
+        raise ArgumentError, 'Commit not found'
+      end
+
+      unless can?(current_user, :create_pipeline, project)
+        raise RuntimeError, 'Insufficient permissions to create a new pipeline'
+      end
+
+      Ci::Commit.transaction do
+        unless pipeline.config_processor
+          raise ArgumentError, pipeline.yaml_errors || 'Missing .gitlab-ci.yml file'
+        end
+
+        pipeline.save!
+        pipeline.create_builds(current_user)
+      end
+
+      pipeline
+    end
+
+    private
+
+    def ref_names
+      @ref_names ||= project.repository.ref_names
+    end
+
+    def commit
+      @commit ||= project.commit(params[:ref])
+    end
+
+    def pipeline
+      @pipeline ||= project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 6c3f8efc74e..8f5739cf92e 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -39,12 +39,12 @@
           Commits
 
   - if project_nav_tab? :builds
-    = nav_link(controller: %w(pipelines)) do
-      = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-builds' do
+    = nav_link(controller: :pipelines) do
+      = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
         = icon('ship fw')
         %span
           Pipelines
-          %span.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count(:all))
+          %span.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
 
     = nav_link(controller: %w(builds)) do
       = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 161436e5333..7384bfa1a7a 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -13,9 +13,9 @@
       %strong ##{build.id}
 
     - if build.stuck?
-      %i.fa.fa-warning.text-warning.has-tooltip(title="Build is stuck. Check runners.")
+      = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
     - if defined?(retried) && retried
-      %i.fa.fa-warning.has-tooltip(title="Build was retried")
+      = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
 
   - if defined?(commit_sha) && commit_sha
     %td
@@ -59,24 +59,24 @@
     %td.duration
       - if build.duration
         %p
-          %i.fa.fa-clock-o
+          = icon("clock-o")
           &nbsp;
           #{duration_in_words(build.finished_at, build.started_at)}
       - if build.finished_at
         %p
-          %i.fa.fa-calendar
+          = icon("calendar")
           &nbsp;
           #{time_ago_with_tooltip(build.finished_at)}
   - else
     %td.duration
       - if build.duration
-        %i.fa.fa-clock-o
+        = icon("clock-o")
         &nbsp;
         #{duration_in_words(build.finished_at, build.started_at)}
 
     %td.timestamp
       - if build.finished_at
-        %i.fa.fa-calendar
+        = icon("calendar")
         &nbsp;
         %span #{time_ago_with_tooltip(build.finished_at)}
 
@@ -89,11 +89,11 @@
     .pull-right
       - if can?(current_user, :read_build, build) && build.artifacts?
         = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts', class: 'btn btn-build' do
-          %i.fa.fa-download
+          = icon('download')
       - if can?(current_user, :update_build, build)
         - if build.active?
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
-            %i.fa.fa-remove.cred
+            = icon('remove', class: 'cred')
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
           = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
-            %i.fa.fa-refresh
+            = icon('refresh')
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index d5dd6c7b0aa..c6359c7c981 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -42,12 +42,12 @@
   %td
     - if commit.started_at && commit.finished_at
       %p
-        %i.fa.fa-clock-o
+        = icon("clock-o")
         &nbsp;
         #{duration_in_words(commit.finished_at, commit.started_at)}
     - if commit.finished_at
       %p
-        %i.fa.fa-calendar
+        = icon("calendar")
         &nbsp;
         #{time_ago_with_tooltip(commit.finished_at)}
 
@@ -63,7 +63,7 @@
             - artifacts.each do |build|
               %li
                 = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
-                  %i.fa.fa-download
+                  = icon("download")
                   %span #{build.name}
 
       - if can?(current_user, :update_pipeline, @project)
@@ -74,4 +74,4 @@
         &nbsp;
         - if commit.active?
           = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
-            = icon("remove cred")
+            = icon("remove", class: "cred")
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 970cc95ad35..5b1cf71337e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -62,7 +62,7 @@ describe Project, models: true do
     it { is_expected.to have_one(:pushover_service).dependent(:destroy) }
     it { is_expected.to have_one(:asana_service).dependent(:destroy) }
     it { is_expected.to have_many(:commit_statuses) }
-    it { is_expected.to have_many(:pipelines) }
+    it { is_expected.to have_many(:ci_commits) }
     it { is_expected.to have_many(:builds) }
     it { is_expected.to have_many(:runner_projects) }
     it { is_expected.to have_many(:runners) }

From 3953e5fcd7060e77405327e670f92ebd7d0ee5a0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 10 May 2016 02:38:25 +0300
Subject: [PATCH 0244/1431] Update generic commit status to make it look like a
 build

---
 app/models/commit_status.rb                   |  4 +--
 app/views/projects/ci/builds/_build.html.haml | 33 ++++++-------------
 .../_generic_commit_status.html.haml          |  9 +++++
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 0c0c3d38f94..2d09edf3ca1 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -91,12 +91,12 @@ class CommitStatus < ActiveRecord::Base
   end
 
   def self.stages
-    # We group by stage name, but order stages by their's index
+    # We group by stage name, but order stages by theirs' index
     unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').pluck('sg.stage')
   end
 
   def self.stages_status
-    # We execute subquery for each of the stages which calculates an Stage Status
+    # We execute subquery for each stage to calculate a stage status
     statuses = unscoped.from(all, :sg).group('stage').pluck('sg.stage', all.where('stage=sg.stage').status_sql)
     statuses.inject({}) do |h, k|
       h[k.first] = k.last
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 7384bfa1a7a..962b9fb2595 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -55,30 +55,17 @@
         - if defined?(retried) && retried
           %span.label.label-warning retried
 
-  - if defined?(new_duration) && new_duration
-    %td.duration
-      - if build.duration
-        %p
-          = icon("clock-o")
-          &nbsp;
-          #{duration_in_words(build.finished_at, build.started_at)}
-      - if build.finished_at
-        %p
-          = icon("calendar")
-          &nbsp;
-          #{time_ago_with_tooltip(build.finished_at)}
-  - else
-    %td.duration
-      - if build.duration
-        = icon("clock-o")
-        &nbsp;
-        #{duration_in_words(build.finished_at, build.started_at)}
+  %td.duration
+    - if build.duration
+      = icon("clock-o")
+      &nbsp;
+      #{duration_in_words(build.finished_at, build.started_at)}
 
-    %td.timestamp
-      - if build.finished_at
-        = icon("calendar")
-        &nbsp;
-        %span #{time_ago_with_tooltip(build.finished_at)}
+  %td.timestamp
+    - if build.finished_at
+      = icon("calendar")
+      &nbsp;
+      %span #{time_ago_with_tooltip(build.finished_at)}
 
   - if defined?(coverage) && coverage
     %td.coverage
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index f21c864e35c..8129514964a 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -12,6 +12,9 @@
     - else
       %strong ##{generic_commit_status.id}
 
+    - if defined?(retried) && retried
+      = icon('warning', class: 'text-warning has-tooltip', title: 'Status was retried.')
+
   - if defined?(commit_sha) && commit_sha
     %td
       = link_to generic_commit_status.short_sha, namespace_project_commit_path(generic_commit_status.project.namespace, generic_commit_status.project, generic_commit_status.sha), class: "monospace"
@@ -42,13 +45,19 @@
         - generic_commit_status.tags.each do |tag|
           %span.label.label-primary
             = tag
+      - if defined?(retried) && retried
+        %span.label.label-warning retried
 
   %td.duration
     - if generic_commit_status.duration
+      = icon("clock-o")
+      &nbsp;
       #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)}
 
   %td.timestamp
     - if generic_commit_status.finished_at
+      = icon("calendar")
+      &nbsp;
       %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
 
   - if defined?(coverage) && coverage

From 86cedb082576ceca3522c33c10d367d765e02cf8 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 10 May 2016 02:41:18 +0300
Subject: [PATCH 0245/1431] Use pipeline permissions instead of build

---
 app/views/projects/commit/_ci_commit.html.haml | 2 +-
 app/views/projects/pipelines/index.html.haml   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index c8443763613..0ff679d0e3d 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -1,6 +1,6 @@
 .row-content-block.build-content.middle-block
   .pull-right
-    - if can?(current_user, :update_build, @project)
+    - if can?(current_user, :update_pipeline, @project)
       - if ci_commit.builds.latest.failed.any?(&:retryable?)
         = link_to "Retry failed", retry_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post
 
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 0e08753fd3b..d247ea445ea 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -29,7 +29,6 @@
         = icon('plus')
         New
 
-    - if can?(current_user, :update_build, @project)
       - unless @repository.gitlab_ci_yml
         = link_to 'Get started with Pipelines', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
 
@@ -54,7 +53,7 @@
     .table-holder
       %table.table.builds
         %tbody
-          %th Pipeline ID
+          %th ID
           %th Commit
           - @pipelines.stages.each do |stage|
             %th

From 8eb31c40fc854ee5c1290c429d71ceb77bc5f6ba Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 9 May 2016 18:53:25 -0500
Subject: [PATCH 0246/1431] Hide navbar on mobile

---
 app/assets/javascripts/application.js.coffee  |  1 +
 app/assets/javascripts/sidebar.js.coffee      |  2 +-
 app/assets/stylesheets/framework/header.scss  | 50 +++++++++++++++++--
 app/assets/stylesheets/framework/sidebar.scss | 40 +++++++++++++++
 .../stylesheets/framework/variables.scss      |  1 +
 app/assets/stylesheets/pages/profile.scss     |  2 +-
 app/views/layouts/header/_default.html.haml   |  5 +-
 7 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 5bac8eef1cb..bffce5a0c0f 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -204,6 +204,7 @@ $ ->
     $('.header-content .title').toggle()
     $('.header-content .navbar-collapse').toggle()
     $('.navbar-toggle').toggleClass('active')
+    $('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
 
   # Show/hide comments on diff
   $("body").on "click", ".js-toggle-diff-comments", (e) ->
diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee
index 860d4f438d0..ea4ac52da31 100644
--- a/app/assets/javascripts/sidebar.js.coffee
+++ b/app/assets/javascripts/sidebar.js.coffee
@@ -12,7 +12,7 @@ toggleSidebar = ->
     niceScrollBars.updateScrollBar();
   ), 300
 
-$(document).on("click", '.toggle-nav-collapse', (e) ->
+$(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
   e.preventDefault()
 
   toggleSidebar()
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 97f9d582007..3bcaa17fa75 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -8,7 +8,7 @@ header {
   &.navbar-empty {
     height: 58px;
     background: #fff;
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid $btn-gray-hover;
 
     .center-logo {
       margin: 11px 0;
@@ -30,6 +30,10 @@ header {
     border: none;
     border-bottom: 1px solid $border-color;
 
+    @media (max-width: $screen-xs-min) {
+      padding: 0 16px;
+    }
+
     &.with-horizontal-nav {
       border-bottom: none;
     }
@@ -60,16 +64,44 @@ header {
         margin: 6px 0;
         border-radius: 0;
         position: absolute;
-        right: 2px;
+        right: -10px;
+        padding: 6px 10px;
 
         &:hover {
-          background-color: #eee;
+          background-color: $btn-gray-hover;
         }
+
         &.active {
           color: $gl-icon-color;
         }
       }
     }
+
+    &.header-collapsed {
+      padding: 0 16px;
+    }
+
+    .side-nav-toggle {
+      display: none;
+      position: absolute;
+      left: -10px;
+      margin: 6px 0;
+      padding: 6px 10px;
+      border: none;
+      background-color: $background-color;
+
+      &:hover {
+        background-color: $btn-gray-hover;
+      }
+
+      &:focus {
+        outline: none;
+      }
+
+      @media (max-width: $screen-xs-min) {
+        display: block;
+      }
+    }
   }
 
   .header-content {
@@ -77,6 +109,10 @@ header {
     height: $header-height;
     padding-right: 40px;
 
+    @media (max-width: $screen-xs-min) {
+      padding-left: 40px;
+    }
+
     @media (min-width: $screen-sm-min) {
       padding-right: 0;
     }
@@ -145,6 +181,10 @@ header {
   @media (min-width: $screen-md-min) {
     @include collapsed-header;
   }
+
+  @media (max-width: $screen-xs-min) {
+    margin-left: 0;
+  }
 }
 
 .header-expanded {
@@ -153,6 +193,10 @@ header {
   @media (min-width: $screen-md-min) {
     margin-left: $sidebar_width;
   }
+
+  @media (max-width: $screen-xs-min) {
+    margin-left: 0;
+  }
 }
 
 @media (max-width: $screen-xs-max) {
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index e940fd7286e..f4b79911b66 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -210,15 +210,33 @@
   }
 }
 
+.sidebar-wrapper {
+  &.hidden-nav {
+    width: 0;
+  }
+}
+
 .page-sidebar-collapsed {
   padding-left: $sidebar_collapsed_width;
 
+  @media (max-width: $screen-xs-min) {
+    padding-left: 0;
+  }
+
   .sidebar-wrapper {
     width: $sidebar_collapsed_width;
 
+    @media (max-width: $screen-xs-min) {
+      width: 0;
+    }
+
     .header-logo {
       width: $sidebar_collapsed_width;
 
+      @media (max-width: $screen-xs-min) {
+        width: 0;
+      }
+
       a {
         padding-left: ($sidebar_collapsed_width - 36) / 2;
 
@@ -244,12 +262,22 @@
 
     .collapse-nav a {
       width: $sidebar_collapsed_width;
+
+      @media (max-width: $screen-xs-min) {
+        width: 0;
+      }
     }
 
     .sidebar-user {
       padding-left: ($sidebar_collapsed_width - 36) / 2;
       width: $sidebar_collapsed_width;
 
+      @media (max-width: $screen-xs-min) {
+        width: 0;
+        padding-left: 0;
+        padding-right: 0;
+      }
+
       .username {
         display: none;
       }
@@ -258,6 +286,10 @@
 
   .layout-nav {
     padding-right: $sidebar_collapsed_width;
+
+    @media (max-width: $screen-xs-min) {
+      padding-right: 0;;
+    }
   }
 }
 
@@ -268,6 +300,10 @@
     padding-left: $sidebar_width;
   }
 
+  @media (max-width: $screen-xs-min) {
+    padding-left: 0;
+  }
+
   .sidebar-wrapper {
     width: $sidebar_width;
 
@@ -288,6 +324,10 @@
 
   .layout-nav {
     padding-right: $sidebar_width;
+
+    @media (max-width: $screen-xs-min) {
+      padding-right: 0;;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index ccb4e5381b7..84e74db06b0 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -215,6 +215,7 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
 $btn-active-gray: #ececec;
 $btn-placeholder-gray: #c7c7c7;
 $btn-white-active: #848484;
+$btn-gray-hover: #eee;
 
 /*
  *  Award emoji
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index abc5a0e9877..843379a3f54 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -218,7 +218,7 @@
 
       .btn {
         display: inline-block;
-        width: 48%;
+        width: 46%;
       }
     }
   }
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 86930d4eaaf..172579dafda 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -1,9 +1,12 @@
 %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
   %div{ class: fluid_layout ? "container-fluid" : "container-fluid" }
     .header-content
-      %button.navbar-toggle{type: 'button'}
+      %button.side-nav-toggle{type: 'button'}
         %span.sr-only Toggle navigation
         = icon('bars')
+      %button.navbar-toggle{type: 'button'}
+        %span.sr-only Toggle navigation
+        = icon('angle-left')
 
       .navbar-collapse.collapse
         %ul.nav.navbar-nav

From 36f60982ce2361844e405052c597b23f66299897 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 9 May 2016 19:34:41 -0500
Subject: [PATCH 0247/1431] Fix media queries for absolutely positioned nav
 element

---
 app/assets/stylesheets/framework/header.scss  |  2 +-
 app/assets/stylesheets/framework/nav.scss     |  6 +++++-
 app/assets/stylesheets/framework/sidebar.scss | 10 ++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 3bcaa17fa75..51b54ceb4bd 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -22,7 +22,7 @@ header {
   }
 
   &.navbar-gitlab {
-    padding: 0 20px;
+    padding: 0 16px;
     z-index: 100;
     margin-bottom: 0;
     min-height: $header-height;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 7c18e93a261..f2d7dc625e0 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -201,9 +201,13 @@
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;
 
+  .container-fluid {
+    position: relative;
+  }
+
   .controls {
     float: right;
-    padding: 7px 5px 0 0;
+    padding: 7px 0 0;
 
     i {
       color: $layout-link-gray;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f4b79911b66..593f65aaf63 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -323,11 +323,17 @@
   }
 
   .layout-nav {
-    padding-right: $sidebar_width;
-
     @media (max-width: $screen-xs-min) {
       padding-right: 0;;
     }
+
+    @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
+      padding-right: 62px;
+    }
+
+    @media (min-width: $screen-md-min) {
+      padding-right: $sidebar_width;
+    }
   }
 }
 

From dd1ad6bf3e5a378eb8698e95b73e58f935eb0956 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Tue, 10 May 2016 09:56:12 +0700
Subject: [PATCH 0248/1431] Code improve

---
 app/views/snippets/index.html.haml | 22 +++++++++++-----------
 config/routes.rb                   | 15 ++++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 8aa3d490fa3..7e4918a6085 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,13 +1,13 @@
- - page_title "By #{@user.name}", "Snippets"
+- page_title "By #{@user.name}", "Snippets"
 
- %ol.breadcrumb
-   %li
-     = link_to snippets_path do
-       Snippets
-   %li
-     = @user.name
-   .pull-right.hidden-xs
-     = link_to user_path(@user) do
-       #{@user.name} profile page
+%ol.breadcrumb
+  %li
+    = link_to snippets_path do
+      Snippets
+  %li
+    = @user.name
+  .pull-right.hidden-xs
+    = link_to user_path(@user) do
+      #{@user.name} profile page
 
- = render 'snippets'
+= render 'snippets'
diff --git a/config/routes.rb b/config/routes.rb
index 594bab204fd..881de37f10e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -344,15 +344,16 @@ Rails.application.routes.draw do
   end
 
   scope(path: 'u/:username',
+        as: :user,
         constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
         controller: :users) do
-    get :calendar, action: :calendar, as: :user_calendar
-    get :calendar_activities, action: :calendar_activities, as: :user_calendar_activities
-    get :groups, action: :groups, as: :user_groups
-    get :projects, action: :projects, as: :user_projects
-    get :contributed, action: :contributed, as: :user_contributed_projects
-    get :snippets, action: :snippets, as: :user_snippets
-    get '/', action: :show, as: :user
+    get :calendar
+    get :calendar_activities
+    get :groups
+    get :projects
+    get :contributed, as: :contributed_projects
+    get :snippets
+    get '/', action: :show
   end
 
   #

From 22db5e14f2158665bbeb24921678bb71de2014f3 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Tue, 10 May 2016 07:36:44 +0200
Subject: [PATCH 0249/1431] Remove the annotate rake task

---
 lib/tasks/auto_annotate_models.rake | 44 -----------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 lib/tasks/auto_annotate_models.rake

diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
deleted file mode 100644
index 16bad4bd2bd..00000000000
--- a/lib/tasks/auto_annotate_models.rake
+++ /dev/null
@@ -1,44 +0,0 @@
-if Rails.env.development?
-  task :set_annotation_options do
-    # You can override any of these by setting an environment variable of the
-    # same name.
-    Annotate.set_defaults(
-      'routes'                  => 'false',
-      'position_in_routes'      => 'before',
-      'position_in_class'       => 'before',
-      'position_in_test'        => 'before',
-      'position_in_fixture'     => 'before',
-      'position_in_factory'     => 'before',
-      'position_in_serializer'  => 'before',
-      'show_foreign_keys'       => 'true',
-      'show_indexes'            => 'false',
-      'simple_indexes'          => 'false',
-      'model_dir'               => 'app/models',
-      'root_dir'                => '',
-      'include_version'         => 'false',
-      'require'                 => '',
-      'exclude_tests'           => 'true',
-      'exclude_fixtures'        => 'true',
-      'exclude_factories'       => 'true',
-      'exclude_serializers'     => 'true',
-      'exclude_scaffolds'       => 'true',
-      'exclude_controllers'     => 'true',
-      'exclude_helpers'         => 'true',
-      'ignore_model_sub_dir'    => 'false',
-      'ignore_columns'          => nil,
-      'ignore_unknown_models'   => 'false',
-      'hide_limit_column_types' => 'integer,boolean',
-      'skip_on_db_migrate'      => 'false',
-      'format_bare'             => 'true',
-      'format_rdoc'             => 'false',
-      'format_markdown'         => 'false',
-      'sort'                    => 'false',
-      'force'                   => 'false',
-      'trace'                   => 'false',
-      'wrapper_open'            => nil,
-      'wrapper_close'           => nil,
-    )
-  end
-
-  Annotate.load_tasks
-end

From f52a15e022fb451fa9074495897cdd10dbeeceb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 10 May 2016 10:56:58 +0200
Subject: [PATCH 0250/1431] Revert "Merge branch 'wiki-fix' into 'master'
"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817, reversing
changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                           | 1 -
 app/models/project_wiki.rb          | 2 +-
 lib/gitlab/url_builder.rb           | 2 +-
 spec/lib/gitlab/url_builder_spec.rb | 2 +-
 spec/models/project_wiki_spec.rb    | 4 +---
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1c6e24bc10f..6a5b1dce5c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,7 +39,6 @@ v 8.8.0 (unreleased)
 
 v 8.7.4
   - Fix always showing build notification message when switching between merge requests
-  - Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
   - Links for Redmine issue references are generated correctly again (Benedikt Huss)
 
 v 8.7.3
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index c91cb70ae25..7c1a61bb0bf 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -40,7 +40,7 @@ class ProjectWiki
   end
 
   def wiki_base_path
-    [Gitlab.config.gitlab.url, "/", @project.path_with_namespace, "/wikis"].join('')
+    ["/", @project.path_with_namespace, "/wikis"].join('')
   end
 
   # Returns the Gollum::Wiki object.
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index 67a09d5abf5..2bbbd3074e8 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -62,7 +62,7 @@ module Gitlab
     end
 
     def wiki_page_url
-      "#{object.wiki.wiki_base_path}/#{object.slug}"
+      "#{Gitlab.config.gitlab.url}#{object.wiki.wiki_base_path}/#{object.slug}"
     end
   end
 end
diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb
index c8d3bc01395..bf11472407a 100644
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
@@ -112,7 +112,7 @@ describe Gitlab::UrlBuilder, lib: true do
         wiki_page = build(:wiki_page)
         url = described_class.build(wiki_page)
 
-        expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki_page.wiki.project.path_with_namespace}/wikis/#{wiki_page.slug}"
+        expect(url).to eq "#{Gitlab.config.gitlab.url}#{wiki_page.wiki.wiki_base_path}/#{wiki_page.slug}"
       end
     end
   end
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index ea659f417f2..532e3f013fd 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -38,9 +38,7 @@ describe ProjectWiki, models: true do
 
   describe "#wiki_base_path" do
     it "returns the wiki base path" do
-      gitlab_url = Gitlab.config.gitlab.url
-      wiki_base_path = "#{gitlab_url}/#{project.path_with_namespace}/wikis"
-
+      wiki_base_path = "/#{project.path_with_namespace}/wikis"
       expect(subject.wiki_base_path).to eq(wiki_base_path)
     end
   end

From 1322c981a0aa0752feb16b95e43a1839094a6262 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 10 May 2016 11:10:51 +0200
Subject: [PATCH 0251/1431] create import data in service

---
 app/services/projects/create_service.rb          | 2 ++
 lib/gitlab/bitbucket_import/project_creator.rb   | 7 ++-----
 lib/gitlab/fogbugz_import/project_creator.rb     | 9 +++------
 lib/gitlab/google_code_import/project_creator.rb | 9 +++------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 501e58c1407..a77652480b2 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -6,6 +6,7 @@ module Projects
 
     def execute
       forked_from_project_id = params.delete(:forked_from_project_id)
+      import_data = params.delete(:import_data)
 
       @project = Project.new(params)
 
@@ -50,6 +51,7 @@ module Projects
       end
 
       Project.transaction do
+        @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
         @project.save
 
         if @project.persisted? && !@project.import?
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb
index 941f818b847..b90ef0b0fba 100644
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
@@ -11,7 +11,7 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(
+        ::Projects::CreateService.new(
           current_user,
           name: repo["name"],
           path: repo["slug"],
@@ -21,11 +21,8 @@ module Gitlab
           import_type: "bitbucket",
           import_source: "#{repo["owner"]}/#{repo["slug"]}",
           import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git",
+          import_data: { credentials: { bb_session: session_data } }
         ).execute
-
-        project.create_or_update_import_data(credentials: { bb_session: session_data })
-
-        project
       end
     end
   end
diff --git a/lib/gitlab/fogbugz_import/project_creator.rb b/lib/gitlab/fogbugz_import/project_creator.rb
index 3840765db87..1918d5b208d 100644
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
@@ -12,7 +12,7 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(
+        ::Projects::CreateService.new(
           current_user,
           name: repo.safe_name,
           path: repo.path,
@@ -21,12 +21,9 @@ module Gitlab
           visibility_level: Gitlab::VisibilityLevel::INTERNAL,
           import_type: 'fogbugz',
           import_source: repo.name,
-          import_url: Project::UNKNOWN_IMPORT_URL
+          import_url: Project::UNKNOWN_IMPORT_URL,
+          import_data: { data: { 'repo' => repo.raw_data, 'user_map' => user_map }, credentials: { fb_session: fb_session } }
         ).execute
-
-        project.create_or_update_import_data(data: { 'repo' => repo.raw_data, 'user_map' => user_map }, credentials: { fb_session: fb_session })
-
-        project
       end
     end
   end
diff --git a/lib/gitlab/google_code_import/project_creator.rb b/lib/gitlab/google_code_import/project_creator.rb
index 0abb7a64c17..326cfcaa8af 100644
--- a/lib/gitlab/google_code_import/project_creator.rb
+++ b/lib/gitlab/google_code_import/project_creator.rb
@@ -11,7 +11,7 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(
+        ::Projects::CreateService.new(
           current_user,
           name: repo.name,
           path: repo.name,
@@ -21,12 +21,9 @@ module Gitlab
           visibility_level: Gitlab::VisibilityLevel::PUBLIC,
           import_type: "google_code",
           import_source: repo.name,
-          import_url: repo.import_url
+          import_url: repo.import_url,
+          import_data: { data: { 'repo' => repo.raw_data, 'user_map' => user_map } }
         ).execute
-
-        project.create_or_update_import_data(data: { 'repo' => repo.raw_data, 'user_map' => user_map })
-
-        project
       end
     end
   end

From ebf80db3abcaf4a0e08273bf180aa33368610b8a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 10 May 2016 11:14:46 +0200
Subject: [PATCH 0252/1431] Remove extra sanitization

Robert Speicher and I believe this string gets sanitized further down
the stack anyway. Doing this in a model class feels wrong.
---
 app/models/hooks/web_hook.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 818abbf4cc4..a5ac8bee6b9 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -59,7 +59,7 @@ class WebHook < ActiveRecord::Base
                               basic_auth: auth)
     end
 
-    [response.code, ActionView::Base.full_sanitizer.sanitize(response.to_s)]
+    [response.code, response.to_s]
   rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e
     logger.error("WebHook Error => #{e}")
     [false, e.to_s]

From f95a8e450c37e89b2d03b1c7bd2ca609a1d288e7 Mon Sep 17 00:00:00 2001
From: Calin Seciu <calinseciu@gmail.com>
Date: Tue, 16 Feb 2016 13:13:47 +0200
Subject: [PATCH 0253/1431] Replace text field with textarea in 'New Tag' view
 and display tag message in `<pre>`

---
 app/views/projects/tags/new.html.haml  | 2 +-
 app/views/projects/tags/show.html.haml | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index b40a6e5cb2d..f9306453297 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -23,7 +23,7 @@
   .form-group
     = label_tag :message, nil, class: 'control-label'
     .col-sm-10
-      = text_field_tag :message, nil, required: false, tabindex: 3, class: 'form-control'
+      = text_area_tag :message, nil, required: false, tabindex: 3, class: 'form-control', rows: 5
       .help-block Optionally, enter a message to create an annotated tag.
   %hr
   .form-group
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 9c916fd02de..0442b339582 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -19,14 +19,13 @@
           %i.fa.fa-trash-o
   .title
     %span.item-title= @tag.name
-    - if @tag.message.present?
-      %span.light
-        &nbsp;
-        = strip_gpg_signature(@tag.message)
   - if @commit
     = render 'projects/branches/commit', commit: @commit, project: @project
   - else
     Cant find HEAD commit for this tag
+  - if @tag.message.present?
+    %pre.body
+      = strip_gpg_signature(@tag.message)
 
 
 .append-bottom-default.prepend-top-default

From 1026f2ad0982493cb5465404ef4ebe71a0082bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 20 Apr 2016 14:34:28 +0200
Subject: [PATCH 0254/1431] Add integration specs for tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                     |  1 +
 app/views/projects/tags/show.html.haml        |  1 -
 features/project/commits/tags.feature         | 46 ----------
 features/steps/project/commits/tags.rb        | 90 -------------------
 spec/features/tags/master_creates_tag_spec.rb | 62 +++++++++++++
 spec/features/tags/master_deletes_tag_spec.rb | 41 +++++++++
 spec/features/tags/master_updates_tag_spec.rb | 42 +++++++++
 spec/features/tags/master_views_tags_spec.rb  | 73 +++++++++++++++
 8 files changed, 219 insertions(+), 137 deletions(-)
 delete mode 100644 features/project/commits/tags.feature
 delete mode 100644 features/steps/project/commits/tags.rb
 create mode 100644 spec/features/tags/master_creates_tag_spec.rb
 create mode 100644 spec/features/tags/master_deletes_tag_spec.rb
 create mode 100644 spec/features/tags/master_updates_tag_spec.rb
 create mode 100644 spec/features/tags/master_views_tags_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 1c6e24bc10f..8159d3258a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ v 8.8.0 (unreleased)
   - Updated search UI
   - Display informative message when new milestone is created
   - Sanitize milestones and labels titles
+  - Support multi-line tag messages. !3833 (Calin Seciu)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 0442b339582..9f1424aecc7 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -27,7 +27,6 @@
     %pre.body
       = strip_gpg_signature(@tag.message)
 
-
 .append-bottom-default.prepend-top-default
   - if @release.description.present?
     .description
diff --git a/features/project/commits/tags.feature b/features/project/commits/tags.feature
deleted file mode 100644
index a4be39b2d40..00000000000
--- a/features/project/commits/tags.feature
+++ /dev/null
@@ -1,46 +0,0 @@
-@project_commits
-Feature: Project Commits Tags
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    Given I visit project tags page
-
-  Scenario: I can see all git tags
-    Then I should see "Shop" all tags list
-
-  Scenario: I create a tag
-    And I click new tag link
-    And I submit new tag form
-    Then I should see new tag created
-
-  Scenario: I create a tag with release notes
-    Given I click new tag link
-    And I submit new tag form with release notes
-    Then I should see new tag created
-    And I should see tag release notes
-
-  Scenario: I create a tag with invalid name
-    And I click new tag link
-    And I submit new tag form with invalid name
-    Then I should see new an error that tag is invalid
-
-  Scenario: I create a tag with invalid reference
-    And I click new tag link
-    And I submit new tag form with invalid reference
-    Then I should see new an error that tag ref is invalid
-
-  Scenario: I create a tag that already exists
-    And I click new tag link
-    And I submit new tag form with tag that already exists
-    Then I should see new an error that tag already exists
-
-  Scenario: I delete a tag
-    Given I visit tag 'v1.1.0' page
-    Given I delete tag 'v1.1.0'
-    Then I should not see tag 'v1.1.0'
-
-  Scenario: I add release notes to the tag
-    Given I visit tag 'v1.1.0' page
-    When I click edit tag link
-    And I fill release notes and submit form
-    Then I should see tag release notes
diff --git a/features/steps/project/commits/tags.rb b/features/steps/project/commits/tags.rb
deleted file mode 100644
index 912ba580efd..00000000000
--- a/features/steps/project/commits/tags.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-class Spinach::Features::ProjectCommitsTags < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedPaths
-
-  step 'I should see "Shop" all tags list' do
-    expect(page).to have_content "Tags"
-    expect(page).to have_content "v1.0.0"
-  end
-
-  step 'I click new tag link' do
-    click_link 'New tag'
-  end
-
-  step 'I submit new tag form' do
-    fill_in 'tag_name', with: 'v7.0'
-    fill_in 'ref', with: 'master'
-    click_button 'Create tag'
-  end
-
-  step 'I submit new tag form with release notes' do
-    fill_in 'tag_name', with: 'v7.0'
-    fill_in 'ref', with: 'master'
-    fill_in 'release_description', with: 'Awesome release notes'
-    click_button 'Create tag'
-  end
-
-  step 'I fill release notes and submit form' do
-    fill_in 'release_description', with: 'Awesome release notes'
-    click_button 'Save changes'
-  end
-
-  step 'I submit new tag form with invalid name' do
-    fill_in 'tag_name', with: 'v 1.0'
-    fill_in 'ref', with: 'master'
-    click_button 'Create tag'
-  end
-
-  step 'I submit new tag form with invalid reference' do
-    fill_in 'tag_name', with: 'foo'
-    fill_in 'ref', with: 'foo'
-    click_button 'Create tag'
-  end
-
-  step 'I submit new tag form with tag that already exists' do
-    fill_in 'tag_name', with: 'v1.0.0'
-    fill_in 'ref', with: 'master'
-    click_button 'Create tag'
-  end
-
-  step 'I should see new tag created' do
-    expect(page).to have_content 'v7.0'
-  end
-
-  step 'I should see new an error that tag is invalid' do
-    expect(page).to have_content 'Tag name invalid'
-  end
-
-  step 'I should see new an error that tag ref is invalid' do
-    expect(page).to have_content 'Target foo is invalid'
-  end
-
-  step 'I should see new an error that tag already exists' do
-    expect(page).to have_content 'Tag v1.0.0 already exists'
-  end
-
-  step "I visit tag 'v1.1.0' page" do
-    click_link 'v1.1.0'
-  end
-
-  step "I delete tag 'v1.1.0'" do
-    page.within('.content') do
-      first('.btn-remove').click
-    end
-  end
-
-  step "I should not see tag 'v1.1.0'" do
-    page.within '.tags' do
-      expect(page).not_to have_link 'v1.1.0'
-    end
-  end
-
-  step 'I click edit tag link' do
-    click_link 'Edit release notes'
-  end
-
-  step 'I should see tag release notes' do
-    expect(page).to have_content 'Awesome release notes'
-  end
-end
diff --git a/spec/features/tags/master_creates_tag_spec.rb b/spec/features/tags/master_creates_tag_spec.rb
new file mode 100644
index 00000000000..08a97085a9c
--- /dev/null
+++ b/spec/features/tags/master_creates_tag_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+feature 'Master creates tag', feature: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+
+  before do
+    project.team << [user, :master]
+    login_with(user)
+    visit namespace_project_tags_path(project.namespace, project)
+  end
+
+  scenario 'with an invalid name displays an error' do
+    create_tag_in_form(tag: 'v 1.0', ref: 'master')
+
+    expect(page).to have_content 'Tag name invalid'
+  end
+
+  scenario 'with an invalid reference displays an error' do
+    create_tag_in_form(tag: 'v2.0', ref: 'foo')
+
+    expect(page).to have_content 'Target foo is invalid'
+  end
+
+  scenario 'that already exists displays an error' do
+    create_tag_in_form(tag: 'v1.1.0', ref: 'master')
+
+    expect(page).to have_content 'Tag v1.1.0 already exists'
+  end
+
+  scenario 'with multiline message displays the message in a <pre> block' do
+    create_tag_in_form(tag: 'v3.0', ref: 'master', message: "Awesome tag message\n\n- hello\n- world")
+
+    expect(current_path).to eq(
+      namespace_project_tag_path(project.namespace, project, 'v3.0'))
+    expect(page).to have_content 'v3.0'
+    page.within 'pre.body' do
+      expect(page).to have_content "Awesome tag message\n\n- hello\n- world"
+    end
+  end
+
+  scenario 'with multiline release notes parses the release note as Markdown' do
+    create_tag_in_form(tag: 'v4.0', ref: 'master', desc: "Awesome release notes\n\n- hello\n- world")
+
+    expect(current_path).to eq(
+      namespace_project_tag_path(project.namespace, project, 'v4.0'))
+    expect(page).to have_content 'v4.0'
+    page.within '.description' do
+      expect(page).to have_content 'Awesome release notes'
+      expect(page).to have_selector('ul li', count: 2)
+    end
+  end
+
+  def create_tag_in_form(tag:, ref:, message: nil, desc: nil)
+    click_link 'New tag'
+    fill_in 'tag_name', with: tag
+    fill_in 'ref', with: ref
+    fill_in 'message', with: message unless message.nil?
+    fill_in 'release_description', with: desc unless desc.nil?
+    click_button 'Create tag'
+  end
+end
diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb
new file mode 100644
index 00000000000..f0990118e3c
--- /dev/null
+++ b/spec/features/tags/master_deletes_tag_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+feature 'Master deletes tag', feature: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+
+  before do
+    project.team << [user, :master]
+    login_with(user)
+    visit namespace_project_tags_path(project.namespace, project)
+  end
+
+  context 'from the tags list page' do
+    scenario 'deletes the tag' do
+      expect(page).to have_content 'v1.1.0'
+
+      page.within('.content') do
+        first('.btn-remove').click
+      end
+
+      expect(current_path).to eq(
+        namespace_project_tags_path(project.namespace, project))
+      expect(page).not_to have_content 'v1.1.0'
+    end
+
+  end
+
+  context 'from a specific tag page' do
+    scenario 'deletes the tag' do
+      click_on 'v1.0.0'
+      expect(current_path).to eq(
+        namespace_project_tag_path(project.namespace, project, 'v1.0.0'))
+
+      click_on 'Delete tag'
+
+      expect(current_path).to eq(
+        namespace_project_tags_path(project.namespace, project))
+      expect(page).not_to have_content 'v1.0.0'
+    end
+  end
+end
diff --git a/spec/features/tags/master_updates_tag_spec.rb b/spec/features/tags/master_updates_tag_spec.rb
new file mode 100644
index 00000000000..c926e9841f3
--- /dev/null
+++ b/spec/features/tags/master_updates_tag_spec.rb
@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+feature 'Master updates tag', feature: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+
+  before do
+    project.team << [user, :master]
+    login_with(user)
+    visit namespace_project_tags_path(project.namespace, project)
+  end
+
+  context 'from the tags list page' do
+    scenario 'updates the release notes' do
+      page.within(first('.controls')) do
+        click_link 'Edit release notes'
+      end
+
+      fill_in 'release_description', with: 'Awesome release notes'
+      click_button 'Save changes'
+
+      expect(current_path).to eq(
+        namespace_project_tag_path(project.namespace, project, 'v1.1.0'))
+      expect(page).to have_content 'v1.1.0'
+      expect(page).to have_content 'Awesome release notes'
+    end
+  end
+
+  context 'from a specific tag page' do
+    scenario 'updates the release notes' do
+      click_on 'v1.1.0'
+      click_link 'Edit release notes'
+      fill_in 'release_description', with: 'Awesome release notes'
+      click_button 'Save changes'
+
+      expect(current_path).to eq(
+        namespace_project_tag_path(project.namespace, project, 'v1.1.0'))
+      expect(page).to have_content 'v1.1.0'
+      expect(page).to have_content 'Awesome release notes'
+    end
+  end
+end
diff --git a/spec/features/tags/master_views_tags_spec.rb b/spec/features/tags/master_views_tags_spec.rb
new file mode 100644
index 00000000000..29d2c244720
--- /dev/null
+++ b/spec/features/tags/master_views_tags_spec.rb
@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+feature 'Master views tags', feature: true do
+  let(:user) { create(:user) }
+
+  before do
+    project.team << [user, :master]
+    login_with(user)
+  end
+
+  context 'when project has no tags' do
+    let(:project) { create(:project_empty_repo) }
+    before do
+      visit namespace_project_path(project.namespace, project)
+      click_on 'README'
+      fill_in :commit_message, with: 'Add a README file', visible: true
+      # Remove pre-receive hook so we can push without auth
+      FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
+      click_button 'Commit Changes'
+      visit namespace_project_tags_path(project.namespace, project)
+    end
+
+    scenario 'displays a specific message' do
+      expect(page).to have_content 'Repository has no tags yet.'
+    end
+  end
+
+  context 'when project has tags' do
+    let(:project) { create(:project, namespace: user.namespace) }
+    before do
+      visit namespace_project_tags_path(project.namespace, project)
+    end
+
+    scenario 'views the tags list page' do
+      expect(page).to have_content 'v1.0.0'
+    end
+
+    scenario 'views a specific tag page' do
+      click_on 'v1.0.0'
+
+      expect(current_path).to eq(
+        namespace_project_tag_path(project.namespace, project, 'v1.0.0'))
+      expect(page).to have_content 'v1.0.0'
+      expect(page).to have_content 'This tag has no release notes.'
+    end
+
+    describe 'links on the tag page' do
+      scenario 'has a button to browse files' do
+        click_on 'v1.0.0'
+
+        expect(current_path).to eq(
+          namespace_project_tag_path(project.namespace, project, 'v1.0.0'))
+
+        click_on 'Browse files'
+
+        expect(current_path).to eq(
+          namespace_project_tree_path(project.namespace, project, 'v1.0.0'))
+      end
+
+      scenario 'has a button to browse commits' do
+        click_on 'v1.0.0'
+
+        expect(current_path).to eq(
+          namespace_project_tag_path(project.namespace, project, 'v1.0.0'))
+
+        click_on 'Browse commits'
+
+        expect(current_path).to eq(
+          namespace_project_commits_path(project.namespace, project, 'v1.0.0'))
+      end
+    end
+  end
+end

From 6da3388569b3bf31ac72663a4c13dba83d064356 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 5 Apr 2016 09:43:48 -0700
Subject: [PATCH 0255/1431] Add eager load paths to help prevent dependency
 load issues with Sidekiq workers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Attempts to address #13521, #14825

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG             |  2 ++
 config/application.rb | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6a5b1dce5c7..80ed7d2020a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -91,6 +91,8 @@ v 8.7.0
   - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524
   - Improved Markdown rendering performance !3389
   - Make shared runners text in box configurable
+  - Add eager load paths to help prevent dependency load issues with Sidekiq workers (Stan Hu)
+  - Improved Markdown rendering performance !3389 (Yorick Peterse)
   - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu)
   - API: Ability to subscribe and unsubscribe from issues and merge requests (Robert Schilling)
   - Expose project badges in project settings
diff --git a/config/application.rb b/config/application.rb
index b602e2b6168..b33e57f5fcd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,12 +12,19 @@ module Gitlab
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths.push(*%W(#{config.root}/lib
-                                   #{config.root}/app/models/hooks
-                                   #{config.root}/app/models/concerns
-                                   #{config.root}/app/models/project_services
-                                   #{config.root}/app/models/members))
+    # Sidekiq uses eager loading, but directories not in the standard Rails
+    # directories must be added to the eager load paths:
+    # https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code
+    # Also, there is no need to add `lib` to autoload_paths since autoloading is
+    # configured to check for eager loaded paths:
+    # https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/engine.rb#L687
+    # This is a nice reference article on autoloading/eager loading:
+    # http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload
+    config.eager_load_paths.push(*%W(#{config.root}/lib
+                                     #{config.root}/app/models/hooks
+                                     #{config.root}/app/models/concerns
+                                     #{config.root}/app/models/project_services
+                                     #{config.root}/app/models/members))
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

From 5589dcf8db0daf2235158724f6b18115a9abfa42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 15 Apr 2016 17:35:40 +0200
Subject: [PATCH 0256/1431] Fix a few places where autoloading would fail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix naming of API::CommitStatuses
- Ensure we use require_dependency instead of require
- Ensure the namespace is right in lib/api/api.rb, otherwise, we
  might require Grape::API::Helpers which defines the `#params` method.
  This is to avoid requiring a file multiple times and getting an "Already
  initialized constant" error.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                     |   3 +-
 app/models/repository.rb                      |   2 +-
 config/application.rb                         |  12 +-
 config/initializers/1_settings.rb             |   2 +-
 config/initializers/5_backend.rb              |   6 +-
 lib/api/api.rb                                |  67 ++--
 lib/api/api_guard.rb                          | 302 +++++++++---------
 lib/api/commit_statuses.rb                    |   2 +-
 lib/ci/api/api.rb                             |  10 +-
 lib/gitlab.rb                                 |   2 +-
 ...status_spec.rb => commit_statuses_spec.rb} |   2 +-
 11 files changed, 205 insertions(+), 205 deletions(-)
 rename spec/requests/api/{commit_status_spec.rb => commit_statuses_spec.rb} (99%)

diff --git a/CHANGELOG b/CHANGELOG
index 80ed7d2020a..1cd428323d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 8.8.0 (unreleased)
   - API: Expose Issue#user_notes_count. !3126 (Anton Popov)
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
+  - Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
   - Added multiple colors for labels in dropdowns when dups happen.
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
@@ -91,8 +92,6 @@ v 8.7.0
   - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524
   - Improved Markdown rendering performance !3389
   - Make shared runners text in box configurable
-  - Add eager load paths to help prevent dependency load issues with Sidekiq workers (Stan Hu)
-  - Improved Markdown rendering performance !3389 (Yorick Peterse)
   - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu)
   - API: Ability to subscribe and unsubscribe from issues and merge requests (Robert Schilling)
   - Expose project badges in project settings
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 7aebfe279fb..a4b42d7226d 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -81,7 +81,7 @@ class Repository
   def commit(id = 'HEAD')
     return nil unless exists?
     commit = Gitlab::Git::Commit.find(raw_repository, id)
-    commit = Commit.new(commit, @project) if commit
+    commit = ::Commit.new(commit, @project) if commit
     commit
   rescue Rugged::OdbError
     nil
diff --git a/config/application.rb b/config/application.rb
index b33e57f5fcd..cba80f38f1f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,13 +1,13 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
-require 'devise'
-I18n.config.enforce_available_locales = false
+
 Bundler.require(:default, Rails.env)
-require_relative '../lib/gitlab/redis'
 
 module Gitlab
   class Application < Rails::Application
+    require_dependency Rails.root.join('lib/gitlab/redis')
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -21,10 +21,10 @@ module Gitlab
     # This is a nice reference article on autoloading/eager loading:
     # http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload
     config.eager_load_paths.push(*%W(#{config.root}/lib
+                                     #{config.root}/app/models/ci
                                      #{config.root}/app/models/hooks
-                                     #{config.root}/app/models/concerns
-                                     #{config.root}/app/models/project_services
-                                     #{config.root}/app/models/members))
+                                     #{config.root}/app/models/members
+                                     #{config.root}/app/models/project_services))
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8db2c05fe45..23c8cea038a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,4 +1,4 @@
-require 'gitlab' # Load lib/gitlab.rb as soon as possible
+require_dependency Rails.root.join('lib/gitlab') # Load Gitlab as soon as possible
 
 class Settings < Settingslogic
   source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" }
diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb
index 80d641d73a3..e026151a032 100644
--- a/config/initializers/5_backend.rb
+++ b/config/initializers/5_backend.rb
@@ -1,11 +1,11 @@
 # GIT over HTTP
-require Rails.root.join("lib", "gitlab", "backend", "grack_auth")
+require_dependency Rails.root.join('lib/gitlab/backend/grack_auth')
 
 # GIT over SSH
-require Rails.root.join("lib", "gitlab", "backend", "shell")
+require_dependency Rails.root.join('lib/gitlab/backend/shell')
 
 # GitLab shell adapter
-require Rails.root.join("lib", "gitlab", "backend", "shell_adapter")
+require_dependency Rails.root.join('lib/gitlab/backend/shell_adapter')
 
 required_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version_required)
 current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)
diff --git a/lib/api/api.rb b/lib/api/api.rb
index cc1004f8005..5fd9c30cb42 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -1,5 +1,3 @@
-Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
-
 module API
   class API < Grape::API
     include APIGuard
@@ -25,38 +23,39 @@ module API
     format :json
     content_type :txt, "text/plain"
 
-    helpers Helpers
+    # Ensure the namespace is right, otherwise we might load Grape::API::Helpers
+    helpers ::API::Helpers
 
-    mount Groups
-    mount GroupMembers
-    mount Users
-    mount Projects
-    mount Repositories
-    mount Issues
-    mount Milestones
-    mount Session
-    mount MergeRequests
-    mount Notes
-    mount Internal
-    mount SystemHooks
-    mount ProjectSnippets
-    mount ProjectMembers
-    mount DeployKeys
-    mount ProjectHooks
-    mount Services
-    mount Files
-    mount Commits
-    mount CommitStatus
-    mount Namespaces
-    mount Branches
-    mount Labels
-    mount Settings
-    mount Keys
-    mount Tags
-    mount Triggers
-    mount Builds
-    mount Variables
-    mount Runners
-    mount Licenses
+    mount ::API::Groups
+    mount ::API::GroupMembers
+    mount ::API::Users
+    mount ::API::Projects
+    mount ::API::Repositories
+    mount ::API::Issues
+    mount ::API::Milestones
+    mount ::API::Session
+    mount ::API::MergeRequests
+    mount ::API::Notes
+    mount ::API::Internal
+    mount ::API::SystemHooks
+    mount ::API::ProjectSnippets
+    mount ::API::ProjectMembers
+    mount ::API::DeployKeys
+    mount ::API::ProjectHooks
+    mount ::API::Services
+    mount ::API::Files
+    mount ::API::Commits
+    mount ::API::CommitStatuses
+    mount ::API::Namespaces
+    mount ::API::Branches
+    mount ::API::Labels
+    mount ::API::Settings
+    mount ::API::Keys
+    mount ::API::Tags
+    mount ::API::Triggers
+    mount ::API::Builds
+    mount ::API::Variables
+    mount ::API::Runners
+    mount ::API::Licenses
   end
 end
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb
index b9994fcefda..7e67edb203a 100644
--- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb
@@ -2,171 +2,175 @@
 
 require 'rack/oauth2'
 
-module APIGuard
-  extend ActiveSupport::Concern
+module API
+  module APIGuard
+    extend ActiveSupport::Concern
 
-  included do |base|
-    # OAuth2 Resource Server Authentication
-    use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
-      # The authenticator only fetches the raw token string
+    included do |base|
+      # OAuth2 Resource Server Authentication
+      use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
+        # The authenticator only fetches the raw token string
 
-      # Must yield access token to store it in the env
-      request.access_token
-    end
-
-    helpers HelperMethods
-
-    install_error_responders(base)
-  end
-
-  # Helper Methods for Grape Endpoint
-  module HelperMethods
-    # Invokes the doorkeeper guard.
-    #
-    # If token is presented and valid, then it sets @current_user.
-    #
-    # If the token does not have sufficient scopes to cover the requred scopes,
-    # then it raises InsufficientScopeError.
-    #
-    # If the token is expired, then it raises ExpiredError.
-    #
-    # If the token is revoked, then it raises RevokedError.
-    #
-    # If the token is not found (nil), then it raises TokenNotFoundError.
-    #
-    # Arguments:
-    #
-    #   scopes: (optional) scopes required for this guard.
-    #           Defaults to empty array.
-    #
-    def doorkeeper_guard!(scopes: [])
-      if (access_token = find_access_token).nil?
-        raise TokenNotFoundError
-
-      else
-        case validate_access_token(access_token, scopes)
-        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-          raise InsufficientScopeError.new(scopes)
-        when Oauth2::AccessTokenValidationService::EXPIRED
-          raise ExpiredError
-        when Oauth2::AccessTokenValidationService::REVOKED
-          raise RevokedError
-        when Oauth2::AccessTokenValidationService::VALID
-          @current_user = User.find(access_token.resource_owner_id)
-        end
+        # Must yield access token to store it in the env
+        request.access_token
       end
+
+      helpers HelperMethods
+
+      install_error_responders(base)
     end
 
-    def doorkeeper_guard(scopes: [])
-      if access_token = find_access_token
-        case validate_access_token(access_token, scopes)
-        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-          raise InsufficientScopeError.new(scopes)
+    # Helper Methods for Grape Endpoint
+    module HelperMethods
+      # Invokes the doorkeeper guard.
+      #
+      # If token is presented and valid, then it sets @current_user.
+      #
+      # If the token does not have sufficient scopes to cover the requred scopes,
+      # then it raises InsufficientScopeError.
+      #
+      # If the token is expired, then it raises ExpiredError.
+      #
+      # If the token is revoked, then it raises RevokedError.
+      #
+      # If the token is not found (nil), then it raises TokenNotFoundError.
+      #
+      # Arguments:
+      #
+      #   scopes: (optional) scopes required for this guard.
+      #           Defaults to empty array.
+      #
+      def doorkeeper_guard!(scopes: [])
+        if (access_token = find_access_token).nil?
+          raise TokenNotFoundError
 
-        when Oauth2::AccessTokenValidationService::EXPIRED
-          raise ExpiredError
-
-        when Oauth2::AccessTokenValidationService::REVOKED
-          raise RevokedError
-
-        when Oauth2::AccessTokenValidationService::VALID
-          @current_user = User.find(access_token.resource_owner_id)
-        end
-      end
-    end
-
-    def current_user
-      @current_user
-    end
-
-    private
-    def find_access_token
-      @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
-    end
-
-    def doorkeeper_request
-      @doorkeeper_request ||= ActionDispatch::Request.new(env)
-    end
-
-    def validate_access_token(access_token, scopes)
-      Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
-    end
-  end
-
-  module ClassMethods
-    # Installs the doorkeeper guard on the whole Grape API endpoint.
-    #
-    # Arguments:
-    #
-    #   scopes: (optional) scopes required for this guard.
-    #           Defaults to empty array.
-    #
-    def guard_all!(scopes: [])
-      before do
-        guard! scopes: scopes
-      end
-    end
-
-    private
-    def install_error_responders(base)
-      error_classes = [ MissingTokenError, TokenNotFoundError,
-                        ExpiredError, RevokedError, InsufficientScopeError]
-
-      base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
-    end
-
-    def oauth2_bearer_token_error_handler
-      Proc.new do |e|
-        response =
-          case e
-          when MissingTokenError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
-
-          when TokenNotFoundError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-              :invalid_token,
-              "Bad Access Token.")
-
-          when ExpiredError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-              :invalid_token,
-              "Token is expired. You can either do re-authorization or token refresh.")
-
-          when RevokedError
-            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-              :invalid_token,
-              "Token was revoked. You have to re-authorize from the user.")
-
-          when InsufficientScopeError
-            # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
-            # does not include WWW-Authenticate header, which breaks the standard.
-            Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
-              :insufficient_scope,
-              Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
-              { scope: e.scopes })
+        else
+          case validate_access_token(access_token, scopes)
+          when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+            raise InsufficientScopeError.new(scopes)
+          when Oauth2::AccessTokenValidationService::EXPIRED
+            raise ExpiredError
+          when Oauth2::AccessTokenValidationService::REVOKED
+            raise RevokedError
+          when Oauth2::AccessTokenValidationService::VALID
+            @current_user = User.find(access_token.resource_owner_id)
           end
+        end
+      end
 
-        response.finish
+      def doorkeeper_guard(scopes: [])
+        if access_token = find_access_token
+          case validate_access_token(access_token, scopes)
+          when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+            raise InsufficientScopeError.new(scopes)
+
+          when Oauth2::AccessTokenValidationService::EXPIRED
+            raise ExpiredError
+
+          when Oauth2::AccessTokenValidationService::REVOKED
+            raise RevokedError
+
+          when Oauth2::AccessTokenValidationService::VALID
+            @current_user = User.find(access_token.resource_owner_id)
+          end
+        end
+      end
+
+      def current_user
+        @current_user
+      end
+
+      private
+
+      def find_access_token
+        @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
+      end
+
+      def doorkeeper_request
+        @doorkeeper_request ||= ActionDispatch::Request.new(env)
+      end
+
+      def validate_access_token(access_token, scopes)
+        Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
       end
     end
-  end
 
-  #
-  # Exceptions
-  #
+    module ClassMethods
+      # Installs the doorkeeper guard on the whole Grape API endpoint.
+      #
+      # Arguments:
+      #
+      #   scopes: (optional) scopes required for this guard.
+      #           Defaults to empty array.
+      #
+      def guard_all!(scopes: [])
+        before do
+          guard! scopes: scopes
+        end
+      end
 
-  class MissingTokenError < StandardError; end
+      private
 
-  class TokenNotFoundError < StandardError; end
+      def install_error_responders(base)
+        error_classes = [ MissingTokenError, TokenNotFoundError,
+                          ExpiredError, RevokedError, InsufficientScopeError]
 
-  class ExpiredError < StandardError; end
+        base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
+      end
 
-  class RevokedError < StandardError; end
+      def oauth2_bearer_token_error_handler
+        Proc.new do |e|
+          response =
+            case e
+            when MissingTokenError
+              Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
 
-  class InsufficientScopeError < StandardError
-    attr_reader :scopes
-    def initialize(scopes)
-      @scopes = scopes
+            when TokenNotFoundError
+              Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+                :invalid_token,
+                "Bad Access Token.")
+
+            when ExpiredError
+              Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+                :invalid_token,
+                "Token is expired. You can either do re-authorization or token refresh.")
+
+            when RevokedError
+              Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+                :invalid_token,
+                "Token was revoked. You have to re-authorize from the user.")
+
+            when InsufficientScopeError
+              # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
+              # does not include WWW-Authenticate header, which breaks the standard.
+              Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
+                :insufficient_scope,
+                Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
+                { scope: e.scopes })
+            end
+
+          response.finish
+        end
+      end
+    end
+
+    #
+    # Exceptions
+    #
+
+    class MissingTokenError < StandardError; end
+
+    class TokenNotFoundError < StandardError; end
+
+    class ExpiredError < StandardError; end
+
+    class RevokedError < StandardError; end
+
+    class InsufficientScopeError < StandardError
+      attr_reader :scopes
+      def initialize(scopes)
+        @scopes = scopes
+      end
     end
   end
 end
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 7388ed2f4ea..9bcd33ff19e 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -2,7 +2,7 @@ require 'mime/types'
 
 module API
   # Project commit statuses API
-  class CommitStatus < Grape::API
+  class CommitStatuses < Grape::API
     resource :projects do
       before { authenticate! }
 
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index 353c4ddebf8..17bb99a2ae5 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -1,9 +1,7 @@
-Dir["#{Rails.root}/lib/ci/api/*.rb"].each {|file| require file}
-
 module Ci
   module API
     class API < Grape::API
-      include APIGuard
+      include ::API::APIGuard
       version 'v1', using: :path
 
       rescue_from ActiveRecord::RecordNotFound do
@@ -31,9 +29,9 @@ module Ci
       helpers ::API::Helpers
       helpers Gitlab::CurrentSettings
 
-      mount Builds
-      mount Runners
-      mount Triggers
+      mount ::Ci::API::Builds
+      mount ::Ci::API::Runners
+      mount ::Ci::API::Triggers
     end
   end
 end
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 7479e729db1..37f4c34054f 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,4 +1,4 @@
-require 'gitlab/git'
+require_dependency 'gitlab/git'
 
 module Gitlab
   def self.com?
diff --git a/spec/requests/api/commit_status_spec.rb b/spec/requests/api/commit_statuses_spec.rb
similarity index 99%
rename from spec/requests/api/commit_status_spec.rb
rename to spec/requests/api/commit_statuses_spec.rb
index f3785b19362..633927c8c3e 100644
--- a/spec/requests/api/commit_status_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe API::CommitStatus, api: true do
+describe API::CommitStatuses, api: true do
   include ApiHelpers
 
   let!(:project) { create(:project) }

From dccf8a9fc8d4dde91942944f6b47387bfb13c380 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Mon, 25 Apr 2016 20:10:20 +0200
Subject: [PATCH 0257/1431] Add tests on Awardables and Award Emoji

---
 app/assets/javascripts/awards_handler.coffee  | 20 ++++----
 app/assets/javascripts/notes.js.coffee        |  2 +-
 app/controllers/projects/notes_controller.rb  |  3 +-
 app/helpers/issues_helper.rb                  | 11 ++---
 app/models/merge_request.rb                   |  1 -
 db/schema.rb                                  | 19 ++++++-
 features/steps/project/issues/issues.rb       | 10 ++--
 features/steps/project/merge_requests.rb      | 10 ++--
 .../projects/issues_controller_spec.rb        | 14 ++++++
 spec/factories/award_emoji.rb                 | 11 +++++
 spec/features/issues_spec.rb                  |  2 +-
 spec/features/notes_on_merge_requests_spec.rb |  4 +-
 spec/models/concerns/awardable_spec.rb        | 49 +++++++++++++++++++
 spec/models/concerns/issuable_spec.rb         |  4 ++
 spec/models/user_spec.rb                      |  1 +
 spec/services/notes/create_service_spec.rb    | 20 +++-----
 spec/services/todo_service_spec.rb            | 17 ++++---
 .../toggle_award_emoji_service_spec.rb        | 39 +++++++++++++++
 18 files changed, 181 insertions(+), 56 deletions(-)
 create mode 100644 spec/models/concerns/awardable_spec.rb
 create mode 100644 spec/services/toggle_award_emoji_service_spec.rb

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 4c0a274b793..589caf011ed 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -4,21 +4,21 @@ class @AwardsHandler
 
     $(document)
       .off "click", ".js-add-award"
-      .on "click", ".js-add-award", (event) =>
-        event.stopPropagation()
-        event.preventDefault()
+      .on "click", ".js-add-award", (e) =>
+        e.stopPropagation()
+        e.preventDefault()
 
-        @showEmojiMenu $(event.currentTarget)
+        @showEmojiMenu $(e.currentTarget)
 
-    $("html").on 'click', (event) ->
-      if !$(event.target).closest(".emoji-menu").length
+    $("html").on 'click', (e) ->
+      if !$(e.target).closest(".emoji-menu").length
         if $(".emoji-menu").is(":visible")
           $('.js-add-award.is-active').removeClass 'is-active'
           $(".emoji-menu").removeClass "is-visible"
 
     $(document)
       .off "click", ".js-emoji-btn"
-      .on "click", ".js-emoji-btn", (e) => @handleClick(e)
+      .on "click", ".js-emoji-btn", @handleClick.bind(@)
 
   handleClick: (e) ->
     e.preventDefault()
@@ -31,7 +31,8 @@ class @AwardsHandler
     else if $votesBlock.length is 0
       $votesBlock = $addAwardBtn.closest('.js-awards-block')
 
-    $votesBlock.addClass 'js-awards-block-current'
+    @currentVoteBlock = $votesBlock
+
     awardUrl = $votesBlock.data 'award-url'
     emoji = $emojiBtn
       .find(".icon")
@@ -103,7 +104,6 @@ class @AwardsHandler
     emoji = @normilizeEmojiName(emoji)
     @postEmoji awardUrl, emoji, =>
       @addAwardToEmojiBar(emoji)
-      $('.js-awards-block').removeClass 'js-awards-block-current'
 
     $(".emoji-menu").removeClass "is-visible"
 
@@ -210,7 +210,7 @@ class @AwardsHandler
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']")
+    @currentVoteBlock.find(".js-emoji-btn [data-emoji='#{emoji}']")
 
   scrollToAwards: ->
     $('body, html').animate({
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index ae8c1f22e4c..74ae897b84a 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -150,7 +150,7 @@ class @Notes
   renderNote: (note) ->
     unless note.valid
       if note.award
-        flash = new Flash('You have already awarded this emoji, and it we\'ve removed it', 'alert')
+        flash = new Flash('You have already awarded this emoji, it has been removed', 'alert')
         flash.pinTo('.header-content')
       return
 
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 9000e0adf63..eb5137fe999 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -22,7 +22,7 @@ class Projects::NotesController < Projects::ApplicationController
   def create
     @note = Notes::CreateService.new(project, current_user, note_params).execute
 
-    @note = note.is_a?(AwardEmoji) ? @note.to_note_json : note_json(@note)
+    @note = @note.is_a?(AwardEmoji) ? @note.to_note_json : note_json(@note)
 
     respond_to do |format|
       format.json { render json: @note }
@@ -63,7 +63,6 @@ class Projects::NotesController < Projects::ApplicationController
   def note
     @note ||= @project.notes.find(params[:id])
   end
-  alias_method :awardable, :note
 
   def note_to_html(note)
     render_to_string(
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 38de0b442ca..ac6c6fb25bb 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -131,7 +131,7 @@ module IssuesHelper
         class: "icon emoji-icon emoji-#{unicode}",
         title: name,
         data: data
-    else 
+    else
       # Emoji icons displayed separately, used for the awards already given
       # to an issue or merge request.
       content_tag :img, "",
@@ -145,12 +145,9 @@ module IssuesHelper
   end
 
   def award_user_list(awards, current_user)
-    list = 
-      awards.map do |award|
-        award.user == current_user ? "me" : award.user.name
-      end
-
-    list.join(", ")
+    awards.map do |award|
+      award.user == current_user ? 'me' : award.user.name
+    end.join(', ')
   end
 
   def award_active_class(awards, current_user)
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 2cb3e8b0176..e410febdfff 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -36,7 +36,6 @@ class MergeRequest < ActiveRecord::Base
   include Referable
   include Sortable
   include Taskable
-  include Awardable
 
   belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
   belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
diff --git a/db/schema.rb b/db/schema.rb
index 354d7390a5b..7dc7b78ec6c 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: 20160416190505) do
+ActiveRecord::Schema.define(version: 20160421130527) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -77,7 +77,9 @@ ActiveRecord::Schema.define(version: 20160416190505) do
     t.string   "akismet_api_key"
     t.boolean  "email_author_in_body",              default: false
     t.integer  "default_group_visibility"
-    t.boolean  "repository_checks_enabled",         default: true
+    t.boolean  "repository_checks_enabled",         default: false
+    t.integer  "metrics_packet_size",               default: 1
+    t.text     "shared_runners_text"
   end
 
   create_table "audit_events", force: :cascade do |t|
@@ -182,14 +184,21 @@ ActiveRecord::Schema.define(version: 20160416190505) do
     t.text     "yaml_errors"
     t.datetime "committed_at"
     t.integer  "gl_project_id"
+    t.string   "status"
+    t.datetime "started_at"
+    t.datetime "finished_at"
+    t.integer  "duration"
   end
 
+  add_index "ci_commits", ["gl_project_id", "sha"], name: "index_ci_commits_on_gl_project_id_and_sha", using: :btree
+  add_index "ci_commits", ["gl_project_id", "status"], name: "index_ci_commits_on_gl_project_id_and_status", using: :btree
   add_index "ci_commits", ["gl_project_id"], name: "index_ci_commits_on_gl_project_id", using: :btree
   add_index "ci_commits", ["project_id", "committed_at", "id"], name: "index_ci_commits_on_project_id_and_committed_at_and_id", using: :btree
   add_index "ci_commits", ["project_id", "committed_at"], name: "index_ci_commits_on_project_id_and_committed_at", using: :btree
   add_index "ci_commits", ["project_id", "sha"], name: "index_ci_commits_on_project_id_and_sha", using: :btree
   add_index "ci_commits", ["project_id"], name: "index_ci_commits_on_project_id", using: :btree
   add_index "ci_commits", ["sha"], name: "index_ci_commits_on_sha", using: :btree
+  add_index "ci_commits", ["status"], name: "index_ci_commits_on_status", using: :btree
 
   create_table "ci_events", force: :cascade do |t|
     t.integer  "project_id"
@@ -433,6 +442,7 @@ ActiveRecord::Schema.define(version: 20160416190505) do
     t.integer  "moved_to_id"
     t.boolean  "confidential",  default: false
     t.datetime "deleted_at"
+    t.date     "due_date"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -442,6 +452,7 @@ ActiveRecord::Schema.define(version: 20160416190505) do
   add_index "issues", ["created_at"], name: "index_issues_on_created_at", using: :btree
   add_index "issues", ["deleted_at"], name: "index_issues_on_deleted_at", using: :btree
   add_index "issues", ["description"], name: "index_issues_on_description_trigram", using: :gin, opclasses: {"description"=>"gin_trgm_ops"}
+  add_index "issues", ["due_date"], name: "index_issues_on_due_date", using: :btree
   add_index "issues", ["milestone_id"], name: "index_issues_on_milestone_id", using: :btree
   add_index "issues", ["project_id", "iid"], name: "index_issues_on_project_id_and_iid", unique: true, using: :btree
   add_index "issues", ["project_id"], name: "index_issues_on_project_id", using: :btree
@@ -635,12 +646,14 @@ ActiveRecord::Schema.define(version: 20160416190505) do
     t.boolean  "system",        default: false, null: false
     t.text     "st_diff"
     t.integer  "updated_by_id"
+    t.boolean  "is_award",      default: false, null: false
   end
 
   add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
   add_index "notes", ["commit_id"], name: "index_notes_on_commit_id", using: :btree
   add_index "notes", ["created_at", "id"], name: "index_notes_on_created_at_and_id", using: :btree
   add_index "notes", ["created_at"], name: "index_notes_on_created_at", using: :btree
+  add_index "notes", ["is_award"], name: "index_notes_on_is_award", using: :btree
   add_index "notes", ["line_code"], name: "index_notes_on_line_code", using: :btree
   add_index "notes", ["note"], name: "index_notes_on_note_trigram", using: :gin, opclasses: {"note"=>"gin_trgm_ops"}
   add_index "notes", ["noteable_id", "noteable_type"], name: "index_notes_on_noteable_id_and_noteable_type", using: :btree
@@ -829,6 +842,7 @@ ActiveRecord::Schema.define(version: 20160416190505) do
     t.boolean  "build_events",          default: false,    null: false
     t.string   "category",              default: "common", null: false
     t.boolean  "default",               default: false
+    t.boolean  "wiki_page_events",      default: true
   end
 
   add_index "services", ["category"], name: "index_services_on_category", using: :btree
@@ -1023,6 +1037,7 @@ ActiveRecord::Schema.define(version: 20160416190505) do
     t.boolean  "note_events",                          default: false,         null: false
     t.boolean  "enable_ssl_verification",              default: true
     t.boolean  "build_events",                         default: false,         null: false
+    t.boolean  "wiki_page_events",                     default: false,         null: false
   end
 
   add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index fc12843ea5c..78ddaee8771 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -191,15 +191,15 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   end
 
   step 'issue "Release 0.4" have 2 upvotes and 1 downvote' do
-    issue = Issue.find_by(title: 'Release 0.4')
-    create_list(:upvote_note, 2, project: project, noteable: issue)
-    create(:downvote_note, project: project, noteable: issue)
+    awardable = Issue.find_by(title: 'Release 0.4')
+    create_list(:upvote, 2, project: project, awardable: awardable)
+    create(:downvote, project: project, awardable: awardable)
   end
 
   step 'issue "Tweet control" have 1 upvote and 2 downvotes' do
     issue = Issue.find_by(title: 'Tweet control')
-    create(:upvote_note, project: project, noteable: issue)
-    create_list(:downvote_note, 2, project: project, noteable: issue)
+    create(:upvote, project: project, noteable: issue)
+    create_list(:downvote, 2, project: project, noteable: issue)
   end
 
   step 'The list should be sorted by "Least popular"' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 4f883fe7c27..1d619a11d23 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -179,14 +179,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'merge request "Bug NS-04" have 2 upvotes and 1 downvote' do
     merge_request = MergeRequest.find_by(title: 'Bug NS-04')
-    create_list(:upvote_note, 2, project: project, noteable: merge_request)
-    create(:downvote_note, project: project, noteable: merge_request)
+    create_list(:upvote, 2, project: project, awardable: merge_request)
+    create(:downvote, project: project, awardable: merge_request)
   end
 
   step 'merge request "Bug NS-06" have 1 upvote and 2 downvotes' do
-    merge_request = MergeRequest.find_by(title: 'Bug NS-06')
-    create(:upvote_note, project: project, noteable: merge_request)
-    create_list(:downvote_note, 2, project: project, noteable: merge_request)
+    awardable = MergeRequest.find_by(title: 'Bug NS-06')
+    create(:upvote, project: project, awardable: awardable)
+    create_list(:downvote, 2, project: project, awardable: awardable)
   end
 
   step 'The list should be sorted by "Least popular"' do
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index d6e4cd71ce6..f7cb7ca8a40 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -211,4 +211,18 @@ describe Projects::IssuesController do
       end
     end
   end
+
+  describe 'POST #toggle_award_emoji' do
+    before do
+      sign_in(user)
+      project.team << [user, :developer]
+    end
+
+    it "yields status code 200" do
+      post(:toggle_award_emoji, namespace_id: project.namespace.path,
+                                project_id: project.path, id: issue.iid, name: "thumbsup")
+
+      expect(response.status).to eq(200)
+    end
+  end
 end
diff --git a/spec/factories/award_emoji.rb b/spec/factories/award_emoji.rb
index a1173834b29..b09f8b0bc74 100644
--- a/spec/factories/award_emoji.rb
+++ b/spec/factories/award_emoji.rb
@@ -3,5 +3,16 @@ FactoryGirl.define do
     name "thumbsup"
     user
     awardable factory: :issue
+
+    trait :thumbs_up
+    trait :upvote
+
+    trait :thumbs_down do
+      name "thumbsdown"
+    end
+
+    trait :downvote do
+      name "thumbsdown"
+    end
   end
 end
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 1ce0024e93c..7da87c2d174 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -67,7 +67,7 @@ describe 'Issues', feature: true do
   describe 'Issue info' do
     it 'excludes award_emoji from comment count' do
       issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
-      create(:upvote_note, noteable: issue)
+      create(:award_emoji, awardable: issue)
 
       visit namespace_project_issues_path(project.namespace, project, assignee_id: @user.id)
 
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 389812ff7e1..9e2bdd7f5bb 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -8,7 +8,7 @@ describe 'Comments', feature: true do
     it 'excludes award_emoji from comment count' do
       merge_request = create(:merge_request)
       project = merge_request.source_project
-      create(:upvote_note, noteable: merge_request, project: project)
+      create(:award_emoji, awardable: merge_request, project: project)
 
       login_as :admin
       visit namespace_project_merge_requests_path(project.namespace, project)
@@ -146,7 +146,7 @@ describe 'Comments', feature: true do
 
     describe 'comment info' do
       it 'excludes award_emoji from comment count' do
-        create(:upvote_note, noteable: merge_request, project: project)
+        create(:award_emoji, awardable: merge_request, project: project)
 
         visit namespace_project_merge_request_path(project.namespace, project, merge_request)
 
diff --git a/spec/models/concerns/awardable_spec.rb b/spec/models/concerns/awardable_spec.rb
new file mode 100644
index 00000000000..6851d068367
--- /dev/null
+++ b/spec/models/concerns/awardable_spec.rb
@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Issue, "Awardable" do
+  let!(:issue)        { create(:issue) }
+  let!(:award_emoji)  { create(:award_emoji, :downvote, awardable: issue) }
+
+  describe "Associations" do
+    it { is_expected.to have_many(:award_emoji).dependent(:destroy) }
+  end
+
+  describe "ClassMethods" do
+    let!(:issue2) { create(:issue) }
+
+    before do
+      create(:award_emoji, awardable: issue2)
+    end
+
+    it "orders on upvotes" do
+      expect(Issue.order_upvotes_desc.to_a).to eq [issue2, issue]
+    end
+
+    it "orders on downvotes" do
+      expect(Issue.order_downvotes_desc.to_a).to eq [issue, issue2]
+    end
+  end
+
+  describe "#upvotes" do
+    it "counts the number of upvotes" do
+      expect(issue.upvotes).to be 0
+    end
+  end
+
+  describe "#downvotes" do
+    it "counts the number of downvotes" do
+      expect(issue.downvotes).to be 1
+    end
+  end
+
+  describe "#toggle_award_emoji" do
+    it "adds an emoji if it isn't awarded yet" do
+      expect { issue.toggle_award_emoji("thumbsup", award_emoji.user) }.to change { AwardEmoji.count }.by 1
+    end
+
+    it "toggles already awarded emoji" do
+
+      expect { issue.toggle_award_emoji("thumbsdown", award_emoji.user) }.to change { AwardEmoji.count }.by -1
+    end
+  end
+end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index d5435916ea1..86ad9de883f 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -12,6 +12,10 @@ describe Issue, "Issuable" do
     it { is_expected.to have_many(:todos).dependent(:destroy) }
   end
 
+  describe 'Included modules' do
+    it { is_expected.to include_module(Awardable) }
+  end
+
   describe "Validation" do
     before do
       allow(subject).to receive(:set_iid).and_return(false)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8b2fb77e28e..de1a233dfff 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -93,6 +93,7 @@ describe User, models: true do
     it { is_expected.to have_one(:abuse_report) }
     it { is_expected.to have_many(:spam_logs).dependent(:destroy) }
     it { is_expected.to have_many(:todos).dependent(:destroy) }
+    it { is_expected.to have_many(:award_emoji).dependent(:destroy) }
   end
 
   describe 'validations' do
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index ff23f13e1cb..93e8a7094e2 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -14,7 +14,7 @@ describe Notes::CreateService, services: true do
           noteable_type: 'Issue',
           noteable_id: issue.id
         }
-        
+
         @note = Notes::CreateService.new(project, user, opts).execute
       end
 
@@ -28,18 +28,16 @@ describe Notes::CreateService, services: true do
       project.team << [user, :master]
     end
 
-    it "creates emoji note" do
+    it "creates an award emoji" do
       opts = {
         note: ':smile: ',
         noteable_type: 'Issue',
         noteable_id: issue.id
       }
+      note = Notes::CreateService.new(project, user, opts).execute
 
-      @note = Notes::CreateService.new(project, user, opts).execute
-
-      expect(@note).to be_valid
-      expect(@note.note).to eq('smile')
-      expect(@note.is_award).to be_truthy
+      expect(note).to be_valid
+      expect(note.name).to eq('smile')
     end
 
     it "creates regular note if emoji name is invalid" do
@@ -48,12 +46,10 @@ describe Notes::CreateService, services: true do
         noteable_type: 'Issue',
         noteable_id: issue.id
       }
+      note = Notes::CreateService.new(project, user, opts).execute
 
-      @note = Notes::CreateService.new(project, user, opts).execute
-
-      expect(@note).to be_valid
-      expect(@note.note).to eq(opts[:note])
-      expect(@note.is_award).to be_falsy
+      expect(note).to be_valid
+      expect(note.note).to eq(opts[:note])
     end
   end
 end
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 82b7fbfa816..455b19c89cc 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -137,7 +137,6 @@ describe TodoService, services: true do
       let(:note_on_commit) { create(:note_on_commit, project: project, author: john_doe, note: mentions) }
       let(:note_on_confidential_issue) { create(:note_on_issue, noteable: confidential_issue, project: project, note: mentions) }
       let(:note_on_project_snippet) { create(:note_on_project_snippet, project: project, author: john_doe, note: mentions) }
-      let(:award_note) { create(:note, :award, project: project, noteable: issue, author: john_doe, note: 'thumbsup') }
       let(:system_note) { create(:system_note, project: project, noteable: issue) }
 
       it 'mark related pending todos to the noteable for the note author as done' do
@@ -150,13 +149,6 @@ describe TodoService, services: true do
         expect(second_todo.reload).to be_done
       end
 
-      it 'mark related pending todos to the noteable for the award note author as done' do
-        service.new_note(award_note, john_doe)
-
-        expect(first_todo.reload).to be_done
-        expect(second_todo.reload).to be_done
-      end
-
       it 'does not mark related pending todos it is a system note' do
         service.new_note(system_note, john_doe)
 
@@ -286,6 +278,15 @@ describe TodoService, services: true do
         expect(second_todo.reload).to be_done
       end
     end
+
+    describe '#new_award_emoji' do
+      it 'marks related pending todos to the target for the user as done' do
+        todo = create(:todo, user: john_doe, project: project, target: mr_assigned, author: author)
+        service.new_award_emoji(mr_assigned, john_doe)
+
+        expect(todo.reload).to be_done
+      end
+    end
   end
 
   def should_create_todo(attributes = {})
diff --git a/spec/services/toggle_award_emoji_service_spec.rb b/spec/services/toggle_award_emoji_service_spec.rb
new file mode 100644
index 00000000000..3d2f497fdec
--- /dev/null
+++ b/spec/services/toggle_award_emoji_service_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ToggleAwardEmoji, services: true do
+  let(:project) { create(:project) }
+  let(:user)    { create(:user) }
+  let(:issue)   { create(:issue, project: project) }
+
+  before do
+    project.team << [user, :master]
+  end
+
+  describe '#execute' do
+    it 'removes related todos' do
+      expect_any_instance_of(TodoService).to receive(:new_award_emoji).with(issue, user)
+
+      ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsdown")
+    end
+
+    it 'normalizes the emoji name' do
+      expect(issue).to receive(:toggle_award_emoji).with("thumbsup", user)
+
+      ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:")
+    end
+
+    context 'when the emoji is set' do
+      it 'removes the emoji' do
+        create(:award_emoji, awardable: issue, user: user)
+
+        expect { ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:") }.to change { AwardEmoji.count }.by(-1)
+      end
+    end
+
+    context 'when the award is not set yet' do
+      it 'awards the emoji' do
+        expect { ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:") }.to change { AwardEmoji.count }.by(1)
+      end
+    end
+  end
+end

From bbc94e15a3f66852ac3283388327e25d92ae9c0a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 10 May 2016 13:07:14 +0200
Subject: [PATCH 0258/1431] Use abbrevation in runners table in admin area

---
 app/views/admin/runners/_runner.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 97b6ec1f85d..36b21eefdee 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -14,7 +14,7 @@
     = runner.description
   %td
     - if runner.shared?
-      = '-'
+      n/a
     - else
       = runner.projects.count(:all)
   %td

From 0f1cf1d87b74aa1e6ca2c28fdfa21d189bd68181 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 10 May 2016 13:16:09 +0200
Subject: [PATCH 0259/1431] Minor consistency fixes to sidebar & header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/header.scss  | 2 +-
 app/assets/stylesheets/framework/sidebar.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 51b54ceb4bd..8190a97ed58 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -25,7 +25,7 @@ header {
     padding: 0 16px;
     z-index: 100;
     margin-bottom: 0;
-    min-height: $header-height;
+    height: $header-height;
     background-color: $background-color;
     border: none;
     border-bottom: 1px solid $border-color;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 593f65aaf63..bd91f51708c 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -98,7 +98,7 @@
   }
 
   .sidebar-user {
-    padding: 9px 22px;
+    padding: 7px 22px;
     position: fixed;
     bottom: 40px;
     width: $sidebar_width;

From 98d8e3fe9ff4d120469378490c41381ae751597e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 10 May 2016 13:24:53 +0200
Subject: [PATCH 0260/1431] Change dashboard button color to white on hover

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index c83cf881596..dc4668877f2 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -24,6 +24,10 @@
         background-color: $color-darker;
         a {
           color: #fff;
+
+          h3 {
+            color: #fff;
+          }
         }
       }
     }

From 4c506c4498192b6d60a3731ad5428e2354b777cb Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 7 May 2016 21:28:04 +0200
Subject: [PATCH 0261/1431] Fix using link to uploads in global snippets

Closes #17342, closes #17363
---
 lib/banzai/filter/upload_link_filter.rb        |  4 +++-
 .../banzai/filter/upload_link_filter_spec.rb   | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/banzai/filter/upload_link_filter.rb b/lib/banzai/filter/upload_link_filter.rb
index 7edfe5ade2d..483d40c46df 100644
--- a/lib/banzai/filter/upload_link_filter.rb
+++ b/lib/banzai/filter/upload_link_filter.rb
@@ -31,7 +31,9 @@ module Banzai
       end
 
       def build_url(uri)
-        File.join(Gitlab.config.gitlab.url, context[:project].path_with_namespace, uri)
+        return '#' unless project = context[:project]
+
+        File.join(Gitlab.config.gitlab.url, project.path_with_namespace, uri)
       end
 
       # Ensure that a :project key exists in context
diff --git a/spec/lib/banzai/filter/upload_link_filter_spec.rb b/spec/lib/banzai/filter/upload_link_filter_spec.rb
index 3b073a90a95..7a7103079ea 100644
--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
@@ -8,6 +8,10 @@ describe Banzai::Filter::UploadLinkFilter, lib: true do
       project: project
     })
 
+    raw_filter(doc, contexts)
+  end
+
+  def raw_filter(doc, contexts = {})
     described_class.call(doc, contexts)
   end
 
@@ -70,4 +74,18 @@ describe Banzai::Filter::UploadLinkFilter, lib: true do
       expect(doc.at_css('img')['src']).to match "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/%ED%95%9C%EA%B8%80.png"
     end
   end
+
+  context 'when project context does not exist' do
+    let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
+
+    it 'does not raise error' do
+      expect { raw_filter(upload_link, project: nil) }.to_not raise_error
+    end
+
+    it 'provides an empty link' do
+      doc = raw_filter(upload_link, project: nil)
+
+      expect(doc.at_css('a')['href']).to eq '#'
+    end
+  end
 end

From c97a81d274ff0e7b792ed409385318c4ec25d92e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 7 May 2016 21:34:30 +0200
Subject: [PATCH 0262/1431] Add Changelog entry for upload link in snippet fix

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

diff --git a/CHANGELOG b/CHANGELOG
index b07b7da3300..841f5870d55 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.8.0 (unreleased)
+  - Fix error when using link to uploads in global snippets
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages

From 535be93a77ec677dbb561f8c1545a60d0d908832 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 10 May 2016 13:46:04 +0200
Subject: [PATCH 0263/1431] Do not process upload links if no project context

---
 lib/banzai/filter/upload_link_filter.rb           | 8 ++++++--
 spec/lib/banzai/filter/upload_link_filter_spec.rb | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/banzai/filter/upload_link_filter.rb b/lib/banzai/filter/upload_link_filter.rb
index 483d40c46df..c0f503c9af3 100644
--- a/lib/banzai/filter/upload_link_filter.rb
+++ b/lib/banzai/filter/upload_link_filter.rb
@@ -8,6 +8,8 @@ module Banzai
     #
     class UploadLinkFilter < HTML::Pipeline::Filter
       def call
+        return doc unless project
+
         doc.search('a').each do |el|
           process_link_attr el.attribute('href')
         end
@@ -31,11 +33,13 @@ module Banzai
       end
 
       def build_url(uri)
-        return '#' unless project = context[:project]
-
         File.join(Gitlab.config.gitlab.url, project.path_with_namespace, uri)
       end
 
+      def project
+        context[:project]
+      end
+
       # Ensure that a :project key exists in context
       #
       # Note that while the key might exist, its value could be nil!
diff --git a/spec/lib/banzai/filter/upload_link_filter_spec.rb b/spec/lib/banzai/filter/upload_link_filter_spec.rb
index 7a7103079ea..b83be54746c 100644
--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
@@ -79,13 +79,13 @@ describe Banzai::Filter::UploadLinkFilter, lib: true do
     let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
 
     it 'does not raise error' do
-      expect { raw_filter(upload_link, project: nil) }.to_not raise_error
+      expect { raw_filter(upload_link, project: nil) }.not_to raise_error
     end
 
-    it 'provides an empty link' do
+    it 'does not rewrite link' do
       doc = raw_filter(upload_link, project: nil)
 
-      expect(doc.at_css('a')['href']).to eq '#'
+      expect(doc.to_html).to eq upload_link
     end
   end
 end

From 732e98eee7da718d282903844649d02f935fd2be Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 9 May 2016 12:47:44 +0200
Subject: [PATCH 0264/1431] Reuse runners edit form in admin and project area

---
 app/views/admin/runners/show.html.haml     | 22 +++---------------
 app/views/projects/runners/_form.html.haml | 25 +++++++++++++++++++++
 app/views/projects/runners/edit.html.haml  | 26 +---------------------
 3 files changed, 29 insertions(+), 44 deletions(-)
 create mode 100644 app/views/projects/runners/_form.html.haml

diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index 8700b4820cd..4dfb3ed05bb 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -22,25 +22,9 @@
     %h4 This runner will process builds only from ASSIGNED projects
     %p You can't make this a shared runner.
 %hr
-= form_for @runner, url: admin_runner_path(@runner), html: { class: 'form-horizontal' } do |f|
-  .form-group
-    = label_tag :token, class: 'control-label' do
-      Token
-    .col-sm-10
-      = f.text_field :token, class: 'form-control', readonly: true
-  .form-group
-    = label_tag :description, class: 'control-label' do
-      Description
-    .col-sm-10
-      = f.text_field :description, class: 'form-control'
-  .form-group
-    = label_tag :tag_list, class: 'control-label' do
-      Tags
-    .col-sm-10
-      = f.text_field :tag_list, value: @runner.tag_list.to_s, class: 'form-control'
-      .help-block You can setup builds to only use runners with specific tags
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
+
+.append-bottom-20
+  = render '/projects/runners/form', runner: @runner, runner_form_url: admin_runner_path(@runner)
 
 .row
   .col-md-6
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
new file mode 100644
index 00000000000..2d6c964ae94
--- /dev/null
+++ b/app/views/projects/runners/_form.html.haml
@@ -0,0 +1,25 @@
+= form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
+  .form-group
+    = label :active, "Active", class: 'control-label'
+    .col-sm-10
+      .checkbox
+        = f.check_box :active
+        %span.light Paused runners don't accept new builds
+  .form-group
+    = label_tag :token, class: 'control-label' do
+      Token
+    .col-sm-10
+      = f.text_field :token, class: 'form-control', readonly: true
+  .form-group
+    = label_tag :description, class: 'control-label' do
+      Description
+    .col-sm-10
+      = f.text_field :description, class: 'form-control'
+  .form-group
+    = label_tag :tag_list, class: 'control-label' do
+      Tags
+    .col-sm-10
+      = f.text_field :tag_list, value: runner.tag_list.to_s, class: 'form-control'
+      .help-block You can setup jobs to only use runners with specific tags
+  .form-actions
+    = f.submit 'Save changes', class: 'btn btn-save'
diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml
index eba03028af8..771947d7908 100644
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
@@ -2,28 +2,4 @@
 
 %h4 Runner ##{@runner.id}
 %hr
-= form_for @runner, url: runner_path(@runner), html: { class: 'form-horizontal' } do |f|
-  .form-group
-    = label :active, "Active", class: 'control-label'
-    .col-sm-10
-      .checkbox
-        = f.check_box :active
-        %span.light Paused runners don't accept new builds
-  .form-group
-    = label_tag :token, class: 'control-label' do
-      Token
-    .col-sm-10
-      = f.text_field :token, class: 'form-control', readonly: true
-  .form-group
-    = label_tag :description, class: 'control-label' do
-      Description
-    .col-sm-10
-      = f.text_field :description, class: 'form-control'
-  .form-group
-    = label_tag :tag_list, class: 'control-label' do
-      Tags
-    .col-sm-10
-      = f.text_field :tag_list, value: @runner.tag_list.to_s, class: 'form-control'
-      .help-block You can setup jobs to only use runners with specific tags
-  .form-actions
-    = f.submit 'Save changes', class: 'btn btn-save'
+ = render 'form', runner: @runner, runner_form_url: runner_path(@runner)

From 7d6d3421d64085c05c8b7a17dcf0b70fbdd478b5 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 9 May 2016 13:07:10 +0200
Subject: [PATCH 0265/1431] Share form editable attributes mf runner via model

---
 app/controllers/admin/runners_controller.rb    | 2 +-
 app/controllers/projects/runners_controller.rb | 2 +-
 app/models/ci/runner.rb                        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index a701d49b844..8b8a7320072 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -58,6 +58,6 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   def runner_params
-    params.require(:runner).permit(:token, :description, :tag_list, :active)
+    params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
   end
 end
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index 0dd2d6a99be..3a9d67aff64 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -64,6 +64,6 @@ class Projects::RunnersController < Projects::ApplicationController
   end
 
   def runner_params
-    params.require(:runner).permit(:description, :tag_list, :active)
+    params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
   end
 end
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index add59a08892..d27963e8ec5 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -23,6 +23,7 @@ module Ci
 
     LAST_CONTACT_TIME = 5.minutes.ago
     AVAILABLE_SCOPES = ['specific', 'shared', 'active', 'paused', 'online']
+    FORM_EDITABLE = [:description, :tag_list, :active]
 
     has_many :builds, class_name: 'Ci::Build'
     has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject'

From 67dc3b9c1131b5a7f3f861a0fe35169fda5cd398 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 22 Apr 2016 09:50:08 -0700
Subject: [PATCH 0266/1431] Add the health_check gem end expose the
 health_check route

---
 Gemfile                             |  3 +++
 Gemfile.lock                        |  3 +++
 config/initializers/health_check.rb | 28 ++++++++++++++++++++++++++++
 config/routes.rb                    |  3 +++
 4 files changed, 37 insertions(+)
 create mode 100644 config/initializers/health_check.rb

diff --git a/Gemfile b/Gemfile
index 3e5c604ae06..204d19f7115 100644
--- a/Gemfile
+++ b/Gemfile
@@ -333,3 +333,6 @@ gem 'oauth2', '~> 1.0.0'
 
 # Soft deletion
 gem "paranoia", "~> 2.0"
+
+# Health check
+gem 'health_check', '~> 1.5.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 86b9142ef27..de0f536641b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -402,6 +402,8 @@ GEM
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashie (3.4.3)
+    health_check (1.5.1)
+      rails (>= 2.3.0)
     highline (1.7.8)
     hipchat (1.5.2)
       httparty
@@ -947,6 +949,7 @@ DEPENDENCIES
   grape (~> 0.13.0)
   grape-entity (~> 0.4.2)
   haml-rails (~> 0.9.0)
+  health_check (~> 1.5.1)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
   httparty (~> 0.13.3)
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb
new file mode 100644
index 00000000000..c111cfdf5ce
--- /dev/null
+++ b/config/initializers/health_check.rb
@@ -0,0 +1,28 @@
+# HealthCheck.setup do |config|
+#   # Text output upon success
+#   config.success = 'success'
+#
+#   # Timeout in seconds used when checking smtp server
+#   config.smtp_timeout = 30.0
+#
+#   # http status code used when plain text error message is output
+#   # Set to 200 if you want your want to distinguish between partial (text does not include success) and
+#   # total failure of rails application (http status of 500 etc)
+#   config.http_status_for_error_text = 500
+#
+#   # http status code used when an error object is output (json or xml)
+#   # Set to 200 if you want your want to distinguish between partial (healthy property == false) and
+#   # total failure of rails application (http status of 500 etc)
+#   config.http_status_for_error_object = 500
+#
+#   # You can customize which checks happen on a standard health check
+#   config.standard_checks = [ 'database', 'migrations', 'custom' ]
+#
+#   # You can set what tests are run with the 'full' or 'all' parameter
+#   config.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
+#
+#   # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
+#   config.add_custom_check do
+#      any code that returns blank on success and non blank string upon failure
+#   end
+# end
diff --git a/config/routes.rb b/config/routes.rb
index dafecc94648..cac800b9a9c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,6 +73,9 @@ Rails.application.routes.draw do
     mount Sidekiq::Web, at: '/admin/sidekiq', as: :sidekiq
   end
 
+  # Health check
+  health_check_routes
+
   # Enable Grack support
   mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post, :put]
 

From 9898f9b4e6b80edaa914675edfa9b229498b31fe Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 5 May 2016 12:25:02 -0700
Subject: [PATCH 0267/1431] Set the standard health_check options to include
 the cache check.

---
 config/initializers/health_check.rb | 31 +++--------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb
index c111cfdf5ce..a93e4273030 100644
--- a/config/initializers/health_check.rb
+++ b/config/initializers/health_check.rb
@@ -1,28 +1,3 @@
-# HealthCheck.setup do |config|
-#   # Text output upon success
-#   config.success = 'success'
-#
-#   # Timeout in seconds used when checking smtp server
-#   config.smtp_timeout = 30.0
-#
-#   # http status code used when plain text error message is output
-#   # Set to 200 if you want your want to distinguish between partial (text does not include success) and
-#   # total failure of rails application (http status of 500 etc)
-#   config.http_status_for_error_text = 500
-#
-#   # http status code used when an error object is output (json or xml)
-#   # Set to 200 if you want your want to distinguish between partial (healthy property == false) and
-#   # total failure of rails application (http status of 500 etc)
-#   config.http_status_for_error_object = 500
-#
-#   # You can customize which checks happen on a standard health check
-#   config.standard_checks = [ 'database', 'migrations', 'custom' ]
-#
-#   # You can set what tests are run with the 'full' or 'all' parameter
-#   config.full_checks = ['database', 'migrations', 'custom', 'email', 'cache']
-#
-#   # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
-#   config.add_custom_check do
-#      any code that returns blank on success and non blank string upon failure
-#   end
-# end
+HealthCheck.setup do |config|
+  config.standard_checks = [ 'database', 'migrations', 'cache' ]
+end

From 160ef66d1bbbbc593516c7575d6b02ddb019c000 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Mon, 9 May 2016 16:21:22 -0700
Subject: [PATCH 0268/1431] Add health_check access token, and enforce on the
 health_check endpoint

Also added a health check page to the admin section for resetting the token.
---
 .../admin/application_settings_controller.rb  |  6 +++
 .../admin/health_check_controller.rb          |  9 +++++
 app/controllers/health_check_controller.rb    | 13 ++++++
 app/models/application_setting.rb             |  6 +++
 app/views/admin/health_check/show.html.haml   | 40 +++++++++++++++++++
 app/views/layouts/nav/_admin.html.haml        |  5 +++
 config/routes.rb                              |  4 +-
 ...ck_access_token_to_application_settings.rb |  5 +++
 db/schema.rb                                  |  3 +-
 9 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/admin/health_check_controller.rb
 create mode 100644 app/controllers/health_check_controller.rb
 create mode 100644 app/views/admin/health_check/show.html.haml
 create mode 100644 db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index ec22548ddeb..7b9a88cd319 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -19,6 +19,12 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     redirect_to admin_runners_path
   end
 
+  def reset_health_check_token
+    @application_setting.reset_health_check_access_token!
+    flash[:notice] = 'New health check access token has been generated!'
+    redirect_to :back
+  end
+
   def clear_repository_check_states
     RepositoryCheck::ClearWorker.perform_async
 
diff --git a/app/controllers/admin/health_check_controller.rb b/app/controllers/admin/health_check_controller.rb
new file mode 100644
index 00000000000..3153a765e35
--- /dev/null
+++ b/app/controllers/admin/health_check_controller.rb
@@ -0,0 +1,9 @@
+class Admin::HealthCheckController < Admin::ApplicationController
+  def show
+    begin
+      @errors = HealthCheck::Utils.process_checks('standard')
+    rescue => e
+      @errors = e.message.blank? ? e.class.to_s : e.message.to_s
+    end
+  end
+end
diff --git a/app/controllers/health_check_controller.rb b/app/controllers/health_check_controller.rb
new file mode 100644
index 00000000000..b974489836f
--- /dev/null
+++ b/app/controllers/health_check_controller.rb
@@ -0,0 +1,13 @@
+class HealthCheckController < HealthCheck::HealthCheckController
+  before_action :validate_health_check_access!
+
+  protected
+
+  def validate_health_check_access!
+    return render_404 unless params[:token].presence && params[:token] == current_application_settings.health_check_access_token
+  end
+
+  def render_404
+    render file: Rails.root.join("public", "404"), layout: false, status: "404"
+  end
+end
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 7039db2d41e..bf88326c116 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -1,6 +1,7 @@
 class ApplicationSetting < ActiveRecord::Base
   include TokenAuthenticatable
   add_authentication_token_field :runners_registration_token
+  add_authentication_token_field :health_check_access_token
 
   CACHE_KEY = 'application_setting.last'
 
@@ -70,6 +71,7 @@ class ApplicationSetting < ActiveRecord::Base
   end
 
   before_save :ensure_runners_registration_token
+  before_save :ensure_health_check_access_token
 
   after_commit do
     Rails.cache.write(CACHE_KEY, self)
@@ -133,4 +135,8 @@ class ApplicationSetting < ActiveRecord::Base
   def runners_registration_token
     ensure_runners_registration_token!
   end
+
+  def health_check_access_token
+    ensure_health_check_access_token!
+  end
 end
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
new file mode 100644
index 00000000000..70e5d04e356
--- /dev/null
+++ b/app/views/admin/health_check/show.html.haml
@@ -0,0 +1,40 @@
+- page_title "Health Check"
+
+%h3.page-title
+  Health Check
+%p.light
+  Health information can be reteived as plain text, json, or xml using:
+  %ul
+    %li
+      %code= "/health_check?token=#{current_application_settings.health_check_access_token}"
+    %li
+      %code= "/health_check.json?token=#{current_application_settings.health_check_access_token}"
+    %li
+      %code= "/health_check.xml?token=#{current_application_settings.health_check_access_token}"
+
+.bs-callout.clearfix
+  .pull-left
+    %p
+      You can reset the health check access token by pressing the button below.
+    %p
+      = button_to reset_health_check_token_admin_application_settings_path,
+        method: :put, class: 'btn btn-default',
+        data: { confirm: 'Are you sure you want to reset the health check token?' } do
+        = icon('refresh')
+        Reset health check access token
+
+%hr
+.panel.panel-default
+  .panel-heading
+    Current Status:
+    - if @errors.blank?
+      = icon('circle', class: 'cgreen')
+      Healthy
+    - else
+      = icon('warning', class: 'cred')
+      Unhealthy
+  .panel-body
+    - if @errors.blank?
+      No Health Problems Detected
+    - else
+      = @errors
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 280a1b93729..f292730fe45 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -41,6 +41,11 @@
       = icon('file-text fw')
       %span
         Logs
+  = nav_link(controller: :health_check) do
+    = link_to admin_health_check_path, title: 'Health Check' do
+      = icon('medkit fw')
+      %span
+        Health Check
   = nav_link(controller: :broadcast_messages) do
     = link_to admin_broadcast_messages_path, title: 'Messages' do
       = icon('bullhorn fw')
diff --git a/config/routes.rb b/config/routes.rb
index cac800b9a9c..c81bf294a53 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,7 +74,7 @@ Rails.application.routes.draw do
   end
 
   # Health check
-  health_check_routes
+  get 'health_check(/:checks)(.:format)'  => 'health_check#index'
 
   # Enable Grack support
   mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post, :put]
@@ -256,6 +256,7 @@ Rails.application.routes.draw do
     end
 
     resource :logs, only: [:show]
+    resource :health_check, controller: 'health_check', only: [:show]
     resource :background_jobs, controller: 'background_jobs', only: [:show]
 
     resources :namespaces, path: '/projects', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
@@ -287,6 +288,7 @@ Rails.application.routes.draw do
     resource :application_settings, only: [:show, :update] do
       resources :services
       put :reset_runners_token
+      put :reset_health_check_token
       put :clear_repository_check_states
     end
 
diff --git a/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb b/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb
new file mode 100644
index 00000000000..9d729fec189
--- /dev/null
+++ b/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb
@@ -0,0 +1,5 @@
+class AddHealthCheckAccessTokenToApplicationSettings < ActiveRecord::Migration
+  def change
+    add_column :application_settings, :health_check_access_token, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 71d953afe30..8ac3eeae62d 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: 20160508194200) do
+ActiveRecord::Schema.define(version: 20160509201028) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -80,6 +80,7 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.boolean  "repository_checks_enabled",         default: false
     t.text     "shared_runners_text"
     t.integer  "metrics_packet_size",               default: 1
+    t.string   "health_check_access_token"
   end
 
   create_table "audit_events", force: :cascade do |t|

From a278b36ab0f30e8bfa491256bddf9de1c0572382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 22 Apr 2016 18:32:08 +0200
Subject: [PATCH 0269/1431] Fix an issue when filtering merge requests with
 more than one label
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                     |   1 +
 app/models/concerns/issuable.rb               |   4 +-
 .../user_lists_merge_requests_spec.rb         | 137 ++++++++++++++++++
 3 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/merge_requests/user_lists_merge_requests_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 1c21ad36b69..499febdfd08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.8.0 (unreleased)
 v 8.7.4
   - Fix always showing build notification message when switching between merge requests
   - Links for Redmine issue references are generated correctly again (Benedikt Huss)
+  - Fix an issue when filtering merge requests with more than one label. !3886
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 7a3db742030..c1248b53031 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -124,8 +124,8 @@ module Issuable
     end
 
     def with_label(title)
-      if title.is_a?(Array) && title.count > 1
-        joins(:labels).where(labels: { title: title }).group('issues.id').having("count(distinct labels.title) = #{title.count}")
+      if title.is_a?(Array) && title.size > 1
+        joins(:labels).where(labels: { title: title }).group(arel_table[:id]).having("COUNT(DISTINCT labels.title) = #{title.size}")
       else
         joins(:labels).where(labels: { title: title })
       end
diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
new file mode 100644
index 00000000000..cc7f78e7325
--- /dev/null
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe 'Projects > Merge requests > User lists merge requests', feature: true do
+  include SortingHelper
+
+  let(:project) { create(:project, :public) }
+  let(:user) { create(:user) }
+
+  before do
+    @fix = create(:merge_request,
+                  title: 'fix',
+                  source_project: project,
+                  source_branch: 'fix',
+                  assignee: user,
+                  milestone: create(:milestone, due_date: '2013-12-11'),
+                  created_at: 1.minute.ago,
+                  updated_at: 1.minute.ago)
+    create(:merge_request,
+           title: 'markdown',
+           source_project: project,
+           source_branch: 'markdown',
+           assignee: user,
+           milestone: create(:milestone, due_date: '2013-12-12'),
+           created_at: 2.minutes.ago,
+           updated_at: 2.minutes.ago)
+    create(:merge_request,
+           title: 'lfs',
+           source_project: project,
+           source_branch: 'lfs',
+           created_at: 3.minutes.ago,
+           updated_at: 10.seconds.ago)
+  end
+
+  it 'filters on no assignee' do
+    visit_merge_requests(project, assignee_id: IssuableFinder::NONE)
+
+    expect(current_path).to eq(namespace_project_merge_requests_path(project.namespace, project))
+    expect(page).to have_content 'lfs'
+    expect(page).not_to have_content 'fix'
+    expect(page).not_to have_content 'markdown'
+  end
+
+  it 'filters on a specific assignee' do
+    visit_merge_requests(project, assignee_id: user.id)
+
+    expect(page).not_to have_content 'lfs'
+    expect(page).to have_content 'fix'
+    expect(page).to have_content 'markdown'
+  end
+
+  it 'sorts by newest' do
+    visit_merge_requests(project, sort: sort_value_recently_created)
+
+    expect(first_merge_request).to include('lfs')
+    expect(last_merge_request).to include('fix')
+  end
+
+  it 'sorts by oldest' do
+    visit_merge_requests(project, sort: sort_value_oldest_created)
+
+    expect(first_merge_request).to include('fix')
+    expect(last_merge_request).to include('lfs')
+  end
+
+  it 'sorts by last updated' do
+    visit_merge_requests(project, sort: sort_value_recently_updated)
+
+    expect(first_merge_request).to include('lfs')
+  end
+
+  it 'sorts by oldest updated' do
+    visit_merge_requests(project, sort: sort_value_oldest_updated)
+
+    expect(first_merge_request).to include('markdown')
+  end
+
+  it 'sorts by milestone due soon' do
+    visit_merge_requests(project, sort: sort_value_milestone_soon)
+
+    expect(first_merge_request).to include('fix')
+  end
+
+  it 'sorts by milestone due later' do
+    visit_merge_requests(project, sort: sort_value_milestone_later)
+
+    expect(first_merge_request).to include('markdown')
+  end
+
+  it 'filters on one label and sorts by due soon' do
+    label = create(:label, project: project)
+    create(:label_link, label: label, target: @fix)
+
+    visit_merge_requests(project, label_name: [label.name],
+                                  sort: sort_value_due_date_soon)
+
+    expect(first_merge_request).to include('fix')
+  end
+
+  context 'while filtering on two labels' do
+    let(:label) { create(:label, project: project) }
+    let(:label2) { create(:label, project: project) }
+
+    before do
+      create(:label_link, label: label, target: @fix)
+      create(:label_link, label: label2, target: @fix)
+    end
+
+    it 'sorts by due soon' do
+      visit_merge_requests(project, label_name: [label.name, label2.name],
+                                    sort: sort_value_due_date_soon)
+
+      expect(first_merge_request).to include('fix')
+    end
+
+    context 'filter on assignee and' do
+      it 'sorts by due soon' do
+        visit_merge_requests(project, label_name: [label.name, label2.name],
+                                      assignee_id: user.id,
+                                      sort: sort_value_due_date_soon)
+
+        expect(first_merge_request).to include('fix')
+      end
+    end
+  end
+
+  def visit_merge_requests(project, opts = {})
+    visit namespace_project_merge_requests_path(project.namespace, project, opts)
+  end
+
+  def first_merge_request
+    page.all('ul.mr-list > li').first.text
+  end
+
+  def last_merge_request
+    page.all('ul.mr-list > li').last.text
+  end
+end

From 97424ea544d0954e582a356586270e983d3bbb7a Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 10 May 2016 18:03:55 +0100
Subject: [PATCH 0270/1431] Restrict starred projects to viewable ones

`User#starred_projects` doesn't perform any visibility checks. This has
a couple of problems:

1. It assumes a user can always view all of their starred projects in
   perpetuity (project not changed to private, access revoked, etc.).
2. It assumes that we'll only ever allow a user to star a project they
   can view. This is currently the case, but bugs happen.

Add `User#viewable_starred_projects` to filter the starred projects by
those the user either has explicit access to, or are public or
internal. Then use that in all places where we list the user's starred
projects.
---
 .../dashboard/projects_controller.rb          |  2 +-
 app/controllers/dashboard_controller.rb       |  2 +-
 app/models/user.rb                            |  5 ++++
 lib/api/projects.rb                           |  2 +-
 spec/models/user_spec.rb                      | 24 +++++++++++++++++++
 spec/requests/api/projects_spec.rb            | 21 +++++++---------
 6 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 71acc244a91..c08eb811532 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -28,7 +28,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   end
 
   def starred
-    @projects = current_user.starred_projects.sorted_by_activity
+    @projects = current_user.viewable_starred_projects.sorted_by_activity
     @projects = filter_projects(@projects)
     @projects = @projects.includes(:namespace, :forked_from_project, :tags)
     @projects = @projects.sort(@sort = params[:sort])
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 1dce4a21729..4dda4e51f6a 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -25,7 +25,7 @@ class DashboardController < Dashboard::ApplicationController
   def load_events
     projects =
       if params[:filter] == "starred"
-        current_user.starred_projects
+        current_user.viewable_starred_projects
       else
         current_user.authorized_projects
       end
diff --git a/app/models/user.rb b/app/models/user.rb
index 1e4814641d1..a0115957f00 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -381,6 +381,11 @@ class User < ActiveRecord::Base
     Project.where("projects.id IN (#{projects_union.to_sql})")
   end
 
+  def viewable_starred_projects
+    starred_projects.where("projects.visibility_level IN (?) OR projects.id IN (#{projects_union.to_sql})",
+                           [Gitlab::VisibilityLevel::PUBLIC, Gitlab::VisibilityLevel::INTERNAL])
+  end
+
   def owned_projects
     @owned_projects ||=
       Project.where('namespace_id IN (?) OR namespace_id = ?',
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index cc2c7a0c503..9b595772675 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -44,7 +44,7 @@ module API
       # Example Request:
       #   GET /projects/starred
       get '/starred' do
-        @projects = current_user.starred_projects
+        @projects = current_user.viewable_starred_projects
         @projects = filter_projects(@projects)
         @projects = paginate @projects
         present @projects, with: Entities::Project
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 26d4e139396..06d1ca3b7da 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -233,6 +233,8 @@ describe User, models: true do
       @project = create :project, namespace: @user.namespace
       @project_2 = create :project, group: create(:group) # Grant MASTER access to the user
       @project_3 = create :project, group: create(:group) # Grant DEVELOPER access to the user
+      @project_4 = create :project, group: create(:group)
+      @project_5 = create :project, group: create(:group)
 
       @project_2.team << [@user, :master]
       @project_3.team << [@user, :developer]
@@ -782,4 +784,26 @@ describe User, models: true do
 
     it { is_expected.to eq([private_project]) }
   end
+
+  describe '#viewable_starred_projects' do
+    let(:user) { create(:user) }
+    let(:public_project) { create(:project, :public) }
+    let(:private_project) { create(:project, :private) }
+    let(:private_viewable_project) { create(:project, :private) }
+    let(:viewable?) { -> (project) { user.can?(:read_project, project) } }
+    let(:projects) { [public_project, private_project, private_viewable_project] }
+
+    before do
+      private_viewable_project.team << [user, Gitlab::Access::MASTER]
+      projects.each { |project| user.toggle_star(project) }
+    end
+
+    it 'returns only starred projects the user can view' do
+      expect(user.viewable_starred_projects).to all(satisfy(&viewable?))
+    end
+
+    it 'rejects only starred projects the user can not view' do
+      expect(projects - user.viewable_starred_projects).not_to include(satisfy(&viewable?))
+    end
+  end
 end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 66193eac051..f167813e07d 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -10,20 +10,20 @@ describe API::API, api: true  do
   let(:admin) { create(:admin) }
   let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
   let(:project2) { create(:project, path: 'project2', creator_id: user.id, namespace: user.namespace) }
-  let(:project3) { create(:project, path: 'project3', creator_id: user.id, namespace: user.namespace) }
   let(:snippet) { create(:project_snippet, :public, author: user, project: project, title: 'example') }
   let(:project_member) { create(:project_member, :master, user: user, project: project) }
   let(:project_member2) { create(:project_member, :developer, user: user3, project: project) }
   let(:user4) { create(:user) }
   let(:project3) do
     create(:project,
+    :private,
     name: 'second_project',
     path: 'second_project',
     creator_id: user.id,
     namespace: user.namespace,
     merge_requests_enabled: false,
     issues_enabled: false, wiki_enabled: false,
-    snippets_enabled: false, visibility_level: 0)
+    snippets_enabled: false)
   end
   let(:project_member3) do
     create(:project_member,
@@ -164,21 +164,18 @@ describe API::API, api: true  do
   end
 
   describe 'GET /projects/starred' do
+    let(:public_project) { create(:project, :public) }
+
     before do
-      admin.starred_projects << project
-      admin.save!
+      project_member2
+      user3.update_attributes(starred_projects: [project, project2, project3, public_project])
     end
 
-    it 'should return the starred projects' do
-      get api('/projects/all', admin)
+    it 'should return the starred projects viewable by the user' do
+      get api('/projects/starred', user3)
       expect(response.status).to eq(200)
       expect(json_response).to be_an Array
-
-      expect(json_response).to satisfy do |response|
-        response.one? do |entry|
-          entry['name'] == project.name
-        end
-      end
+      expect(json_response.map { |project| project['id'] }).to contain_exactly(project.id, public_project.id)
     end
   end
 

From 53568da9ed6e2c4bae3c06b0fb1d595033921334 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 16:15:01 -0500
Subject: [PATCH 0271/1431] Update Ace Editor

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

diff --git a/Gemfile b/Gemfile
index 3e5c604ae06..77d351419f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -197,7 +197,7 @@ gem 'licensee', '~> 8.0.0'
 gem "rack-attack", '~> 4.3.1'
 
 # Ace editor
-gem 'ace-rails-ap', '~> 2.0.1'
+gem 'ace-rails-ap', '~> 4.0.2'
 
 # Keyboard shortcuts
 gem 'mousetrap-rails', '~> 1.4.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 86b9142ef27..c02698bcca7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (2.3.2)
     RedCloth (4.2.9)
-    ace-rails-ap (2.0.1)
+    ace-rails-ap (4.0.2)
     actionmailer (4.2.6)
       actionpack (= 4.2.6)
       actionview (= 4.2.6)
@@ -882,7 +882,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth (~> 4.2.9)
-  ace-rails-ap (~> 2.0.1)
+  ace-rails-ap (~> 4.0.2)
   activerecord-deprecated_finders (~> 1.0.3)
   activerecord-session_store (~> 0.1.0)
   acts-as-taggable-on (~> 3.4)

From 93ca5c9964a26fbf31fcc794348b30193f4dff9f Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 10 May 2016 16:06:02 -0300
Subject: [PATCH 0272/1431] Fix notes API calls symbol convertions

---
 lib/api/notes.rb                |  6 +++---
 spec/requests/api/notes_spec.rb | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 4ac08a3e8c4..f0116acd90f 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -19,7 +19,7 @@ module API
         #   GET /projects/:id/issues/:noteable_id/notes
         #   GET /projects/:id/snippets/:noteable_id/notes
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes" do
-          @noteable = user_project.send(:"#{noteables_str}").find(params[:"#{noteable_id_str}"])
+          @noteable = user_project.send(noteables_str.to_sym).find(params[noteable_id_str.to_sym])
           read_ability_name = "read_#{@noteable.class.to_s.underscore.downcase}".to_sym
 
           if can?(current_user, read_ability_name, @noteable)
@@ -36,7 +36,7 @@ module API
               reject { |n| n.cross_reference_not_visible_for?(current_user) }
             present notes, with: Entities::Note
           else
-            render_api_error!("Not found.", 404)
+            not_found!("Notes")
           end
         end
 
@@ -50,7 +50,7 @@ module API
         #   GET /projects/:id/issues/:noteable_id/notes/:note_id
         #   GET /projects/:id/snippets/:noteable_id/notes/:note_id
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id" do
-          @noteable = user_project.send(:"#{noteables_str}").find(params[:"#{noteable_id_str}"])
+          @noteable = user_project.send(noteables_str.to_sym).find(params[noteable_id_str.to_sym])
           @note = @noteable.notes.find(params[:note_id])
 
           if @note.cross_reference_not_visible_for?(current_user)
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index f5b31be1ba3..f9bfee94424 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -39,6 +39,7 @@ describe API::API, api: true  do
     context "when noteable is an Issue" do
       it "should return an array of issue notes" do
         get api("/projects/#{project.id}/issues/#{issue.id}/notes", user)
+
         expect(response.status).to eq(200)
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(issue_note.note)
@@ -46,12 +47,14 @@ describe API::API, api: true  do
 
       it "should return a 404 error when issue id not found" do
         get api("/projects/#{project.id}/issues/12345/notes", user)
+
         expect(response.status).to eq(404)
       end
 
       context "that references a private issue" do
         it "should return an empty array" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
+
           expect(response.status).to eq(200)
           expect(json_response).to be_an Array
           expect(json_response).to be_empty
@@ -62,6 +65,7 @@ describe API::API, api: true  do
 
           it "returns 404" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
+
             expect(response.status).to eq(404)
           end
         end
@@ -69,6 +73,7 @@ describe API::API, api: true  do
         context "and current user can view the note" do
           it "should return an empty array" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", private_user)
+
             expect(response.status).to eq(200)
             expect(json_response).to be_an Array
             expect(json_response.first['body']).to eq(cross_reference_note.note)
@@ -80,6 +85,7 @@ describe API::API, api: true  do
     context "when noteable is a Snippet" do
       it "should return an array of snippet notes" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
+
         expect(response.status).to eq(200)
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(snippet_note.note)
@@ -87,11 +93,13 @@ describe API::API, api: true  do
 
       it "should return a 404 error when snippet id not found" do
         get api("/projects/#{project.id}/snippets/42/notes", user)
+
         expect(response.status).to eq(404)
       end
 
       it "returns 404 when not authorized" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes", private_user)
+
         expect(response.status).to eq(404)
       end
     end
@@ -99,6 +107,7 @@ describe API::API, api: true  do
     context "when noteable is a Merge Request" do
       it "should return an array of merge_requests notes" do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/notes", user)
+
         expect(response.status).to eq(200)
         expect(json_response).to be_an Array
         expect(json_response.first['body']).to eq(merge_request_note.note)
@@ -106,11 +115,13 @@ describe API::API, api: true  do
 
       it "should return a 404 error if merge request id not found" do
         get api("/projects/#{project.id}/merge_requests/4444/notes", user)
+
         expect(response.status).to eq(404)
       end
 
       it "returns 404 when not authorized" do
         get api("/projects/#{project.id}/merge_requests/4444/notes", private_user)
+
         expect(response.status).to eq(404)
       end
     end
@@ -120,24 +131,28 @@ describe API::API, api: true  do
     context "when noteable is an Issue" do
       it "should return an issue note by id" do
         get api("/projects/#{project.id}/issues/#{issue.id}/notes/#{issue_note.id}", user)
+
         expect(response.status).to eq(200)
         expect(json_response['body']).to eq(issue_note.note)
       end
 
       it "should return a 404 error if issue note not found" do
         get api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user)
+
         expect(response.status).to eq(404)
       end
 
       context "that references a private issue" do
         it "should return a 404 error" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", user)
+
           expect(response.status).to eq(404)
         end
 
         context "and current user can view the note" do
           it "should return an issue note by id" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", private_user)
+
             expect(response.status).to eq(200)
             expect(json_response['body']).to eq(cross_reference_note.note)
           end
@@ -148,12 +163,14 @@ describe API::API, api: true  do
     context "when noteable is a Snippet" do
       it "should return a snippet note by id" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes/#{snippet_note.id}", user)
+
         expect(response.status).to eq(200)
         expect(json_response['body']).to eq(snippet_note.note)
       end
 
       it "should return a 404 error if snippet note not found" do
         get api("/projects/#{project.id}/snippets/#{snippet.id}/notes/12345", user)
+
         expect(response.status).to eq(404)
       end
     end
@@ -163,6 +180,7 @@ describe API::API, api: true  do
     context "when noteable is an Issue" do
       it "should create a new issue note" do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes", user), body: 'hi!'
+
         expect(response.status).to eq(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
@@ -170,11 +188,13 @@ describe API::API, api: true  do
 
       it "should return a 400 bad request error if body not given" do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes", user)
+
         expect(response.status).to eq(400)
       end
 
       it "should return a 401 unauthorized error if user not authenticated" do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes"), body: 'hi!'
+
         expect(response.status).to eq(401)
       end
 
@@ -183,6 +203,7 @@ describe API::API, api: true  do
           creation_time = 2.weeks.ago
           post api("/projects/#{project.id}/issues/#{issue.id}/notes", user),
             body: 'hi!', created_at: creation_time
+
           expect(response.status).to eq(201)
           expect(json_response['body']).to eq('hi!')
           expect(json_response['author']['username']).to eq(user.username)
@@ -195,6 +216,7 @@ describe API::API, api: true  do
     context "when noteable is a Snippet" do
       it "should create a new snippet note" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user), body: 'hi!'
+
         expect(response.status).to eq(201)
         expect(json_response['body']).to eq('hi!')
         expect(json_response['author']['username']).to eq(user.username)
@@ -202,11 +224,13 @@ describe API::API, api: true  do
 
       it "should return a 400 bad request error if body not given" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user)
+
         expect(response.status).to eq(400)
       end
 
       it "should return a 401 unauthorized error if user not authenticated" do
         post api("/projects/#{project.id}/snippets/#{snippet.id}/notes"), body: 'hi!'
+
         expect(response.status).to eq(401)
       end
     end
@@ -246,6 +270,7 @@ describe API::API, api: true  do
       it 'should return modified note' do
         put api("/projects/#{project.id}/issues/#{issue.id}/"\
                   "notes/#{issue_note.id}", user), body: 'Hello!'
+
         expect(response.status).to eq(200)
         expect(json_response['body']).to eq('Hello!')
       end
@@ -253,12 +278,14 @@ describe API::API, api: true  do
       it 'should return a 404 error when note id not found' do
         put api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user),
                 body: 'Hello!'
+
         expect(response.status).to eq(404)
       end
 
       it 'should return a 400 bad request error if body not given' do
         put api("/projects/#{project.id}/issues/#{issue.id}/"\
                   "notes/#{issue_note.id}", user)
+
         expect(response.status).to eq(400)
       end
     end
@@ -267,6 +294,7 @@ describe API::API, api: true  do
       it 'should return modified note' do
         put api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/#{snippet_note.id}", user), body: 'Hello!'
+
         expect(response.status).to eq(200)
         expect(json_response['body']).to eq('Hello!')
       end
@@ -274,6 +302,7 @@ describe API::API, api: true  do
       it 'should return a 404 error when note id not found' do
         put api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                   "notes/12345", user), body: "Hello!"
+
         expect(response.status).to eq(404)
       end
     end
@@ -282,6 +311,7 @@ describe API::API, api: true  do
       it 'should return modified note' do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\
                   "notes/#{merge_request_note.id}", user), body: 'Hello!'
+
         expect(response.status).to eq(200)
         expect(json_response['body']).to eq('Hello!')
       end
@@ -289,6 +319,7 @@ describe API::API, api: true  do
       it 'should return a 404 error when note id not found' do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\
                   "notes/12345", user), body: "Hello!"
+
         expect(response.status).to eq(404)
       end
     end

From 77f1b9dcd44d5017502a6a0807ccdab643a32ede Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 16:15:08 -0500
Subject: [PATCH 0273/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 1c21ad36b69..5490af3a147 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@ v 8.8.0 (unreleased)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
   - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
   - Fix adding a todo for private group members (Ahmad Sherif)
+  - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
 
 v 8.7.4
   - Fix always showing build notification message when switching between merge requests

From e689d9fb70d7484de708f8f436b294b40a9f6486 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 10 May 2016 16:32:59 -0500
Subject: [PATCH 0274/1431] Reduce width of side nav

---
 app/assets/stylesheets/framework/sidebar.scss   | 11 +++++++----
 app/assets/stylesheets/framework/variables.scss |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index bd91f51708c..a509ef2f149 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -63,7 +63,7 @@
       float: left;
       height: $header-height;
       width: 100%;
-      padding-left: 22px;
+      padding-left: 16px;
       overflow: hidden;
       outline: none;
       transition-duration: .3s;
@@ -78,7 +78,7 @@
       }
 
       .gitlab-text-container {
-        width: 230px;
+        width: 220px;
 
         h3 {
           width: 158px;
@@ -146,12 +146,12 @@
 
     a {
       padding: 7px 15px;
+      transition-duration: .3s;
       font-size: $gl-font-size;
       line-height: 24px;
       color: $gray;
       display: block;
       text-decoration: none;
-      padding-left: 23px;
       font-weight: normal;
       outline: none;
 
@@ -253,6 +253,9 @@
         width: auto;
 
         a {
+          padding-left: 23px;
+          transition-duration: .3s;
+
           span {
             display: none;
           }
@@ -312,7 +315,7 @@
     }
 
     .nav-sidebar li a {
-      width: 230px;
+      width: 220px;
 
       &.back-link {
         i {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 84e74db06b0..5fa4c266607 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -2,7 +2,7 @@
  * Layout
  */
 $sidebar_collapsed_width: 62px;
-$sidebar_width: 230px;
+$sidebar_width: 220px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
 $gutter_inner_width: 258px;

From a51064906bd4dcb29ea61c2278e2c32e848a5de6 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 10 May 2016 16:51:57 -0500
Subject: [PATCH 0275/1431] No extra link padding at xs screen size

---
 app/assets/stylesheets/framework/sidebar.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index a509ef2f149..c243dd8a424 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -253,8 +253,10 @@
         width: auto;
 
         a {
-          padding-left: 23px;
-          transition-duration: .3s;
+          @media (min-width: $screen-xs-min) {
+            padding-left: 23px;
+            transition-duration: .3s;
+          }
 
           span {
             display: none;

From 0e0caf4d17c28b6b0f3488b25efa265ce2804cc4 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Tue, 10 May 2016 16:19:16 -0700
Subject: [PATCH 0276/1431] Add tests for the health check feature

---
 app/views/admin/health_check/show.html.haml   |  3 +
 .../health_check_controller_spec.rb           | 90 +++++++++++++++++++
 .../features/admin/admin_health_check_spec.rb | 55 ++++++++++++
 spec/routing/admin_routing_spec.rb            |  7 ++
 spec/routing/routing_spec.rb                  | 10 +++
 5 files changed, 165 insertions(+)
 create mode 100644 spec/controllers/health_check_controller_spec.rb
 create mode 100644 spec/features/admin/admin_health_check_spec.rb

diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
index 70e5d04e356..23a931995ab 100644
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -2,6 +2,9 @@
 
 %h3.page-title
   Health Check
+%p.light
+  Access token is
+  %code{ id:'health-check-token' }= "#{current_application_settings.health_check_access_token}"
 %p.light
   Health information can be reteived as plain text, json, or xml using:
   %ul
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb
new file mode 100644
index 00000000000..3b9cc5c98f5
--- /dev/null
+++ b/spec/controllers/health_check_controller_spec.rb
@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe HealthCheckController do
+  let(:token) { current_application_settings.health_check_access_token }
+  let(:json_response) { JSON.parse(response.body) }
+  let(:xml_response) { Hash.from_xml(response.body)['hash'] }
+
+  describe 'GET #index' do
+    context 'when services are up but NO access token' do
+      it 'returns a not found page' do
+        get :index
+        expect(response).to be_not_found
+      end
+    end
+
+    context 'when services are up and an access token is provided' do
+      it 'supports successful plaintest response' do
+        get :index, token: token
+        expect(response).to be_success
+        expect(response.content_type).to eq 'text/plain'
+      end
+
+      it 'supports successful json response' do
+        get :index, token: token, format: :json
+        expect(response).to be_success
+        expect(response.content_type).to eq 'application/json'
+        expect(json_response['healthy']).to be true
+      end
+
+      it 'supports successful xml response' do
+        get :index, token: token, format: :xml
+        expect(response).to be_success
+        expect(response.content_type).to eq 'application/xml'
+        expect(xml_response['healthy']).to be true
+      end
+
+      it 'supports successful responses for specific checks' do
+        get :index, token: token, checks: 'email', format: :json
+        expect(response).to be_success
+        expect(response.content_type).to eq 'application/json'
+        expect(json_response['healthy']).to be true
+      end
+    end
+
+    context 'when a service is down but NO access token' do
+      it 'returns a not found page' do
+        get :index
+        expect(response).to be_not_found
+      end
+    end
+
+    context 'when a service is down and an access token is provided' do
+      before do
+        allow(HealthCheck::Utils).to receive(:process_checks).with('standard').and_return('The server is on fire')
+        allow(HealthCheck::Utils).to receive(:process_checks).with('email').and_return('Email is on fire')
+      end
+
+      it 'supports failure plaintest response' do
+        get :index, token: token
+        expect(response.status).to eq(500)
+        expect(response.content_type).to eq 'text/plain'
+        expect(response.body).to include('The server is on fire')
+      end
+
+      it 'supports failure json response' do
+        get :index, token: token, format: :json
+        expect(response.status).to eq(500)
+        expect(response.content_type).to eq 'application/json'
+        expect(json_response['healthy']).to be false
+        expect(json_response['message']).to include('The server is on fire')
+      end
+
+      it 'supports failure xml response' do
+        get :index, token: token, format: :xml
+        expect(response.status).to eq(500)
+        expect(response.content_type).to eq 'application/xml'
+        expect(xml_response['healthy']).to be false
+        expect(xml_response['message']).to include('The server is on fire')
+      end
+
+      it 'supports failure responses for specific checks' do
+        get :index, token: token, checks: 'email', format: :json
+        expect(response.status).to eq(500)
+        expect(response.content_type).to eq 'application/json'
+        expect(json_response['healthy']).to be false
+        expect(json_response['message']).to include('Email is on fire')
+      end
+    end
+  end
+end
diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb
new file mode 100644
index 00000000000..4fde04b609b
--- /dev/null
+++ b/spec/features/admin/admin_health_check_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+feature "Admin Health Check", feature: true do
+  include WaitForAjax
+
+  before do
+    login_as :admin
+  end
+
+  describe '#show' do
+    before do
+      visit admin_health_check_path
+    end
+
+    it { page.has_text? 'Health Check' }
+    it { page.has_text? 'Health information can be reteived' }
+
+    it 'has a health check access token' do
+      token = current_application_settings.health_check_access_token
+      expect(page).to have_content("Access token is #{token}")
+      expect(page).to have_selector('#health-check-token', text: token)
+    end
+
+    describe 'reload access token', js: true do
+      it 'changes the access token' do
+        orig_token = current_application_settings.health_check_access_token
+        click_button 'Reset health check access token'
+        wait_for_ajax
+        expect(find('#health-check-token').text).not_to eq orig_token
+      end
+    end
+  end
+
+  context 'when services are up' do
+    before do
+      visit admin_health_check_path
+    end
+
+    it 'shows healthy status' do
+      expect(page).to have_content('Current Status: Healthy')
+    end
+  end
+
+  context 'when a service is down' do
+    before do
+      allow(HealthCheck::Utils).to receive(:process_checks).and_return('The server is on fire')
+      visit admin_health_check_path
+    end
+
+    it 'shows unhealthy status' do
+      expect(page).to have_content('Current Status: Unhealthy')
+      expect(page).to have_content('The server is on fire')
+    end
+  end
+end
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb
index cd16a8e6322..b5ed8584c8a 100644
--- a/spec/routing/admin_routing_spec.rb
+++ b/spec/routing/admin_routing_spec.rb
@@ -118,3 +118,10 @@ describe Admin::DashboardController, "routing" do
     expect(get("/admin")).to route_to('admin/dashboard#index')
   end
 end
+
+# admin_health_check GET    /admin/health_check(.:format) admin/health_check#show
+describe Admin::HealthCheckController, "routing" do
+  it "to #show" do
+    expect(get("/admin/health_check")).to route_to('admin/health_check#show')
+  end
+end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 1527eddfa48..e4dfd4bca35 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -243,3 +243,13 @@ describe "Groups", "routing" do
     expect(get('/1')).to route_to('namespaces#show', id: '1')
   end
 end
+
+describe HealthCheckController, 'routing' do
+  it 'to #index' do
+    expect(get('/health_check')).to route_to('health_check#index')
+  end
+
+  it 'also supports passing checks in the url' do
+    expect(get('/health_check/email')).to route_to('health_check#index', checks: 'email')
+  end
+end

From 377583a361988d9884808a3c3f5375497a9d5b56 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 27 Apr 2016 16:52:32 -0600
Subject: [PATCH 0277/1431] Enable Rubocop Casecmp Performance Cop.

Also fixes the errors caused by enabling the cop. casecmp is more performant than `.downcase` and `==`.
---
 .rubocop.yml                | 3 +--
 app/models/repository.rb    | 2 +-
 lib/gitlab/database.rb      | 4 ++--
 lib/gitlab/markup_helper.rb | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9f179efa3ce..f07d2184be4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -937,10 +937,9 @@ Lint/Void:
 
 ##################### Performance ############################
 
-# TODO: Enable Casecmp Cop.
 # Use `casecmp` rather than `downcase ==`.
 Performance/Casecmp:
-  Enabled: false
+  Enabled: true
 
 # TODO: Enable DoubleStartEndWith Cop.
 # Use `str.{start,end}_with?(x, ..., y, ...)` instead of
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 7aebfe279fb..5f562750d1f 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -453,7 +453,7 @@ class Repository
   def version
     cache.fetch(:version) do
       tree(:head).blobs.find do |file|
-        file.name.downcase == 'version'
+        file.name.casecmp('version').zero?
       end
     end
   end
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 6f9da69983a..42bec913a45 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -5,11 +5,11 @@ module Gitlab
     end
 
     def self.mysql?
-      adapter_name.downcase == 'mysql2'
+      adapter_name.casecmp('mysql2').zero?
     end
 
     def self.postgresql?
-      adapter_name.downcase == 'postgresql'
+      adapter_name.casecmp('postgresql').zero?
     end
 
     def self.version
diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb
index a5f767b134d..dda371e6554 100644
--- a/lib/gitlab/markup_helper.rb
+++ b/lib/gitlab/markup_helper.rb
@@ -40,7 +40,7 @@ module Gitlab
     # Returns boolean
     def plain?(filename)
       filename.downcase.end_with?('.txt') ||
-        filename.downcase == 'readme'
+        filename.casecmp('readme').zero?
     end
 
     def previewable?(filename)

From 976a70522f47bd57f3545efe5d71a58bb2596649 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 8 May 2016 15:44:14 -0600
Subject: [PATCH 0278/1431] Removes jquery-scrollto-rails.

Instead the script is now included directly from the vendor directory.

Resolves #17166.
---
 Gemfile                                      |   1 -
 Gemfile.lock                                 |   3 -
 vendor/assets/javascripts/jquery.scrollTo.js | 210 +++++++++++++++++++
 3 files changed, 210 insertions(+), 4 deletions(-)
 create mode 100755 vendor/assets/javascripts/jquery.scrollTo.js

diff --git a/Gemfile b/Gemfile
index 77d351419f0..2854bf8a57b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -218,7 +218,6 @@ gem 'gitlab_emoji',       '~> 0.3.0'
 gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 4.1.0'
-gem 'jquery-scrollto-rails', '~> 1.4.3'
 gem 'jquery-ui-rails',    '~> 5.0.0'
 gem 'raphael-rails',      '~> 2.1.2'
 gem 'request_store',      '~> 1.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c02698bcca7..bc47533e5bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -432,8 +432,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-scrollto-rails (1.4.3)
-      railties (> 3.1, < 5.0)
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
@@ -953,7 +951,6 @@ DEPENDENCIES
   influxdb (~> 0.2)
   jquery-atwho-rails (~> 1.3.2)
   jquery-rails (~> 4.1.0)
-  jquery-scrollto-rails (~> 1.4.3)
   jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
   kaminari (~> 0.16.3)
diff --git a/vendor/assets/javascripts/jquery.scrollTo.js b/vendor/assets/javascripts/jquery.scrollTo.js
new file mode 100755
index 00000000000..7ba17766b70
--- /dev/null
+++ b/vendor/assets/javascripts/jquery.scrollTo.js
@@ -0,0 +1,210 @@
+/*!
+ * jQuery.scrollTo
+ * Copyright (c) 2007-2015 Ariel Flesler - aflesler<a>gmail<d>com | http://flesler.blogspot.com
+ * Licensed under MIT
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ * @projectDescription Lightweight, cross-browser and highly customizable animated scrolling with jQuery
+ * @author Ariel Flesler
+ * @version 2.1.2
+ */
+;(function(factory) {
+	'use strict';
+	if (typeof define === 'function' && define.amd) {
+		// AMD
+		define(['jquery'], factory);
+	} else if (typeof module !== 'undefined' && module.exports) {
+		// CommonJS
+		module.exports = factory(require('jquery'));
+	} else {
+		// Global
+		factory(jQuery);
+	}
+})(function($) {
+	'use strict';
+
+	var $scrollTo = $.scrollTo = function(target, duration, settings) {
+		return $(window).scrollTo(target, duration, settings);
+	};
+
+	$scrollTo.defaults = {
+		axis:'xy',
+		duration: 0,
+		limit:true
+	};
+
+	function isWin(elem) {
+		return !elem.nodeName ||
+			$.inArray(elem.nodeName.toLowerCase(), ['iframe','#document','html','body']) !== -1;
+	}		
+
+	$.fn.scrollTo = function(target, duration, settings) {
+		if (typeof duration === 'object') {
+			settings = duration;
+			duration = 0;
+		}
+		if (typeof settings === 'function') {
+			settings = { onAfter:settings };
+		}
+		if (target === 'max') {
+			target = 9e9;
+		}
+
+		settings = $.extend({}, $scrollTo.defaults, settings);
+		// Speed is still recognized for backwards compatibility
+		duration = duration || settings.duration;
+		// Make sure the settings are given right
+		var queue = settings.queue && settings.axis.length > 1;
+		if (queue) {
+			// Let's keep the overall duration
+			duration /= 2;
+		}
+		settings.offset = both(settings.offset);
+		settings.over = both(settings.over);
+
+		return this.each(function() {
+			// Null target yields nothing, just like jQuery does
+			if (target === null) return;
+
+			var win = isWin(this),
+				elem = win ? this.contentWindow || window : this,
+				$elem = $(elem),
+				targ = target, 
+				attr = {},
+				toff;
+
+			switch (typeof targ) {
+				// A number will pass the regex
+				case 'number':
+				case 'string':
+					if (/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(targ)) {
+						targ = both(targ);
+						// We are done
+						break;
+					}
+					// Relative/Absolute selector
+					targ = win ? $(targ) : $(targ, elem);
+					/* falls through */
+				case 'object':
+					if (targ.length === 0) return;
+					// DOMElement / jQuery
+					if (targ.is || targ.style) {
+						// Get the real position of the target
+						toff = (targ = $(targ)).offset();
+					}
+			}
+
+			var offset = $.isFunction(settings.offset) && settings.offset(elem, targ) || settings.offset;
+
+			$.each(settings.axis.split(''), function(i, axis) {
+				var Pos	= axis === 'x' ? 'Left' : 'Top',
+					pos = Pos.toLowerCase(),
+					key = 'scroll' + Pos,
+					prev = $elem[key](),
+					max = $scrollTo.max(elem, axis);
+
+				if (toff) {// jQuery / DOMElement
+					attr[key] = toff[pos] + (win ? 0 : prev - $elem.offset()[pos]);
+
+					// If it's a dom element, reduce the margin
+					if (settings.margin) {
+						attr[key] -= parseInt(targ.css('margin'+Pos), 10) || 0;
+						attr[key] -= parseInt(targ.css('border'+Pos+'Width'), 10) || 0;
+					}
+
+					attr[key] += offset[pos] || 0;
+
+					if (settings.over[pos]) {
+						// Scroll to a fraction of its width/height
+						attr[key] += targ[axis === 'x'?'width':'height']() * settings.over[pos];
+					}
+				} else {
+					var val = targ[pos];
+					// Handle percentage values
+					attr[key] = val.slice && val.slice(-1) === '%' ?
+						parseFloat(val) / 100 * max
+						: val;
+				}
+
+				// Number or 'number'
+				if (settings.limit && /^\d+$/.test(attr[key])) {
+					// Check the limits
+					attr[key] = attr[key] <= 0 ? 0 : Math.min(attr[key], max);
+				}
+
+				// Don't waste time animating, if there's no need.
+				if (!i && settings.axis.length > 1) {
+					if (prev === attr[key]) {
+						// No animation needed
+						attr = {};
+					} else if (queue) {
+						// Intermediate animation
+						animate(settings.onAfterFirst);
+						// Don't animate this axis again in the next iteration.
+						attr = {};
+					}
+				}
+			});
+
+			animate(settings.onAfter);
+
+			function animate(callback) {
+				var opts = $.extend({}, settings, {
+					// The queue setting conflicts with animate()
+					// Force it to always be true
+					queue: true,
+					duration: duration,
+					complete: callback && function() {
+						callback.call(elem, targ, settings);
+					}
+				});
+				$elem.animate(attr, opts);
+			}
+		});
+	};
+
+	// Max scrolling position, works on quirks mode
+	// It only fails (not too badly) on IE, quirks mode.
+	$scrollTo.max = function(elem, axis) {
+		var Dim = axis === 'x' ? 'Width' : 'Height',
+			scroll = 'scroll'+Dim;
+
+		if (!isWin(elem))
+			return elem[scroll] - $(elem)[Dim.toLowerCase()]();
+
+		var size = 'client' + Dim,
+			doc = elem.ownerDocument || elem.document,
+			html = doc.documentElement,
+			body = doc.body;
+
+		return Math.max(html[scroll], body[scroll]) - Math.min(html[size], body[size]);
+	};
+
+	function both(val) {
+		return $.isFunction(val) || $.isPlainObject(val) ? val : { top:val, left:val };
+	}
+
+	// Add special hooks so that window scroll properties can be animated
+	$.Tween.propHooks.scrollLeft = 
+	$.Tween.propHooks.scrollTop = {
+		get: function(t) {
+			return $(t.elem)[t.prop]();
+		},
+		set: function(t) {
+			var curr = this.get(t);
+			// If interrupt is true and user scrolled, stop animating
+			if (t.options.interrupt && t._last && t._last !== curr) {
+				return $(t.elem).stop();
+			}
+			var next = Math.round(t.now);
+			// Don't waste CPU
+			// Browsers don't render floating point scroll
+			if (curr !== next) {
+				$(t.elem)[t.prop](next);
+				t._last = this.get(t);
+			}
+		}
+	};
+
+	// AMD requirement
+	return $scrollTo;
+});

From 4995302df64b71846370aa80f5b12a2d73112421 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 27 Apr 2016 18:22:46 -0600
Subject: [PATCH 0279/1431] Enable the StringReplacement cop.

Also fix one use of `gsub` that would be faster as `delete`.

Use `tr` instead of `gsub` when you are replacing the same number of
characters. Use `delete` instead of `gsub` when you are deleting
characters.
---
 .rubocop.yml              | 3 ++-
 lib/gitlab/diff/parser.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9f179efa3ce..c96c7123c16 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -990,11 +990,12 @@ Performance/RedundantSortBy:
 # string.
 Performance/StartWith:
   Enabled: false
+
 # Use `tr` instead of `gsub` when you are replacing the same number of
 # characters. Use `delete` instead of `gsub` when you are deleting
 # characters.
 Performance/StringReplacement:
-  Enabled: false
+  Enabled: true
 
 # TODO: Enable TimesMap Cop.
 # Checks for `.times.map` calls.
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb
index d0815fc7eea..6fe7faa547a 100644
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
@@ -18,7 +18,7 @@ module Gitlab
           @lines.each do |line|
             next if filename?(line)
   
-            full_line = line.gsub(/\n/, '')
+            full_line = line.delete("\n")
   
             if line.match(/^@@ -/)
               type = "match"

From b42f39d2c27ec2a87e21dea7414d9845f2512144 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 28 Apr 2016 19:44:56 -0600
Subject: [PATCH 0280/1431] Remove activerecord-deprecated_finders gem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t use any of the deprecated finders, so it should be safe to
remove.

Resolves #17015.
---
 Gemfile      | 1 -
 Gemfile.lock | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 77d351419f0..8de96025100 100644
--- a/Gemfile
+++ b/Gemfile
@@ -324,7 +324,6 @@ gem "mail_room", "~> 0.7"
 gem 'email_reply_parser', '~> 0.5.8'
 
 ## CI
-gem 'activerecord-deprecated_finders', '~> 1.0.3'
 gem 'activerecord-session_store', '~> 0.1.0'
 gem "nested_form", '~> 0.3.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c02698bcca7..45d6de18f26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,6 @@ GEM
       activemodel (= 4.2.6)
       activesupport (= 4.2.6)
       arel (~> 6.0)
-    activerecord-deprecated_finders (1.0.4)
     activerecord-session_store (0.1.2)
       actionpack (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
@@ -883,7 +882,6 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.2.9)
   ace-rails-ap (~> 4.0.2)
-  activerecord-deprecated_finders (~> 1.0.3)
   activerecord-session_store (~> 0.1.0)
   acts-as-taggable-on (~> 3.4)
   addressable (~> 2.3.8)

From 51e198fb38428387a976385cae2d5e4fc455ee9e Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 10 May 2016 21:56:40 -0600
Subject: [PATCH 0281/1431] Don't show the Todo count if there aren't any
 Todos.

When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying.

Follow-up on !4077.
---
 app/views/layouts/header/_default.html.haml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 172579dafda..c33740e23fa 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -27,8 +27,9 @@
             %li
               = link_to dashboard_todos_path, title: 'Todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = icon('bell fw')
-                %span.badge.todos-pending-count
-                  = todos_pending_count
+                - unless todos_pending_count == 0
+                  %span.badge.todos-pending-count
+                    = todos_pending_count
             - if current_user.can_create_project?
               %li
                 = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do

From f2548f3f2b3dcd1c6ecbae20af28933f3ab88fdd Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 10 May 2016 22:07:13 -0700
Subject: [PATCH 0282/1431] Improve log message when a project is destroyed to
 include the namespace

---
 app/services/projects/destroy_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 19aab999e00..48a6131b444 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -35,7 +35,7 @@ module Projects
         end
       end
 
-      log_info("Project \"#{project.name}\" was removed")
+      log_info("Project \"#{project.path_with_namespace}\" was removed")
       system_hook_service.execute_hooks_for(project, :destroy)
       true
     end

From acd8930c46c06312f87c5ea0bb549b5435feece8 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 11 May 2016 09:03:23 +0100
Subject: [PATCH 0283/1431] Tidy up user project specs

---
 app/models/user.rb       |  2 +-
 spec/models/user_spec.rb | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index a0115957f00..489bff3fa4a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -383,7 +383,7 @@ class User < ActiveRecord::Base
 
   def viewable_starred_projects
     starred_projects.where("projects.visibility_level IN (?) OR projects.id IN (#{projects_union.to_sql})",
-                           [Gitlab::VisibilityLevel::PUBLIC, Gitlab::VisibilityLevel::INTERNAL])
+                           [Project::PUBLIC, Project::INTERNAL])
   end
 
   def owned_projects
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 06d1ca3b7da..10e7e693571 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -233,8 +233,6 @@ describe User, models: true do
       @project = create :project, namespace: @user.namespace
       @project_2 = create :project, group: create(:group) # Grant MASTER access to the user
       @project_3 = create :project, group: create(:group) # Grant DEVELOPER access to the user
-      @project_4 = create :project, group: create(:group)
-      @project_5 = create :project, group: create(:group)
 
       @project_2.team << [@user, :master]
       @project_3.team << [@user, :developer]
@@ -787,23 +785,20 @@ describe User, models: true do
 
   describe '#viewable_starred_projects' do
     let(:user) { create(:user) }
-    let(:public_project) { create(:project, :public) }
-    let(:private_project) { create(:project, :private) }
-    let(:private_viewable_project) { create(:project, :private) }
-    let(:viewable?) { -> (project) { user.can?(:read_project, project) } }
-    let(:projects) { [public_project, private_project, private_viewable_project] }
+    let(:public_project) { create(:empty_project, :public) }
+    let(:private_project) { create(:empty_project, :private) }
+    let(:private_viewable_project) { create(:empty_project, :private) }
 
     before do
       private_viewable_project.team << [user, Gitlab::Access::MASTER]
-      projects.each { |project| user.toggle_star(project) }
+
+      [public_project, private_project, private_viewable_project].each do |project|
+        user.toggle_star(project)
+      end
     end
 
     it 'returns only starred projects the user can view' do
-      expect(user.viewable_starred_projects).to all(satisfy(&viewable?))
-    end
-
-    it 'rejects only starred projects the user can not view' do
-      expect(projects - user.viewable_starred_projects).not_to include(satisfy(&viewable?))
+      expect(user.viewable_starred_projects).not_to include(private_project)
     end
   end
 end

From 5f27e26bb4d073c04fd6d3f4116fc1a122db8c00 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 6 May 2016 13:16:53 +0100
Subject: [PATCH 0284/1431] Only generate repository push email once

The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)
---
 CHANGELOG                                     |  1 +
 app/mailers/emails/projects.rb                |  5 +-
 app/workers/emails_on_push_worker.rb          | 25 +++++--
 lib/gitlab/email/message/repository_push.rb   |  4 +-
 .../email/message/repository_push_spec.rb     |  2 +-
 spec/mailers/notify_spec.rb                   | 36 ++--------
 spec/workers/emails_on_push_worker_spec.rb    | 65 +++++++++++++++----
 7 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1c21ad36b69..96643fc88a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ v 8.8.0 (unreleased)
   - Fix error when visiting commit builds page before build was updated
   - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project
   - Update SVG sanitizer to conform to SVG 1.1
+  - Speed up push emails with multiple recipients by only generating the email once
   - Updated search UI
   - Display informative message when new milestone is created
   - Sanitize milestones and labels titles
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 377c2999d6c..5489283432b 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -59,9 +59,9 @@ module Emails
            subject: subject("Project was moved"))
     end
 
-    def repository_push_email(project_id, recipient, opts = {})
+    def repository_push_email(project_id, opts = {})
       @message =
-        Gitlab::Email::Message::RepositoryPush.new(self, project_id, recipient, opts)
+        Gitlab::Email::Message::RepositoryPush.new(self, project_id, opts)
 
       # used in notify layout
       @target_url = @message.target_url
@@ -72,7 +72,6 @@ module Emails
 
       mail(from:      sender(@message.author_id, @message.send_from_committer_email?),
            reply_to:  @message.reply_to,
-           to:        @message.recipient,
            subject:   @message.subject)
     end
   end
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index c4d8595d45d..6ebcba5f39b 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -1,6 +1,8 @@
 class EmailsOnPushWorker
   include Sidekiq::Worker
 
+  attr_reader :email, :skip_premailer
+
   def perform(project_id, recipients, push_data, options = {})
     options.symbolize_keys!
     options.reverse_merge!(
@@ -41,11 +43,11 @@ class EmailsOnPushWorker
       end
     end
 
-    recipients.split(" ").each do |recipient|
+    recipients.split.each do |recipient|
       begin
-        Notify.repository_push_email(
-          project_id,
+        send_email(
           recipient,
+          project_id,
           author_id:                  author_id,
           ref:                        ref,
           action:                     action,
@@ -53,14 +55,29 @@ class EmailsOnPushWorker
           reverse_compare:            reverse_compare,
           send_from_committer_email:  send_from_committer_email,
           disable_diffs:              disable_diffs
-        ).deliver_now
+        )
+
       # These are input errors and won't be corrected even if Sidekiq retries
       rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e
         logger.info("Failed to send e-mail for project '#{project.name_with_namespace}' to #{recipient}: #{e}")
       end
     end
   ensure
+    @email = nil
     compare = nil
     GC.start
   end
+
+  private
+
+  def send_email(recipient, project_id, options)
+    # Generating the body of this email can be expensive, so only do it once
+    @skip_premailer ||= email.present?
+    @email ||= Notify.repository_push_email(project_id, options)
+
+    email.to = recipient
+    email.add_message_id
+    email.header[:skip_premailer] = true if skip_premailer
+    email.deliver_now
+  end
 end
diff --git a/lib/gitlab/email/message/repository_push.rb b/lib/gitlab/email/message/repository_push.rb
index 8f9be6cd9a3..2c91a0487c3 100644
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
@@ -2,7 +2,6 @@ module Gitlab
   module Email
     module Message
       class RepositoryPush
-        attr_accessor :recipient
         attr_reader :author_id, :ref, :action
 
         include Gitlab::Routing.url_helpers
@@ -11,13 +10,12 @@ module Gitlab
         delegate :name, to: :author, prefix: :author
         delegate :username, to: :author, prefix: :author
 
-        def initialize(notify, project_id, recipient, opts = {})
+        def initialize(notify, project_id, opts = {})
           raise ArgumentError, 'Missing options: author_id, ref, action' unless
             opts[:author_id] && opts[:ref] && opts[:action]
 
           @notify = notify
           @project_id = project_id
-          @recipient = recipient
           @opts = opts.dup
 
           @author_id = @opts.delete(:author_id)
diff --git a/spec/lib/gitlab/email/message/repository_push_spec.rb b/spec/lib/gitlab/email/message/repository_push_spec.rb
index b2d7a799810..7d6cce6daec 100644
--- a/spec/lib/gitlab/email/message/repository_push_spec.rb
+++ b/spec/lib/gitlab/email/message/repository_push_spec.rb
@@ -8,7 +8,7 @@ describe Gitlab::Email::Message::RepositoryPush do
   let!(:author) { create(:author, name: 'Author') }
 
   let(:message) do
-    described_class.new(Notify, project.id, 'recipient@example.com', opts)
+    described_class.new(Notify, project.id, opts)
   end
 
   context 'new commits have been pushed to repository' do
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 495c5cbac00..5f7e4a526e6 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -593,7 +593,7 @@ describe Notify do
     let(:user) { create(:user) }
     let(:tree_path) { namespace_project_tree_path(project.namespace, project, "master") }
 
-    subject { Notify.repository_push_email(project.id, 'devs@company.name', author_id: user.id, ref: 'refs/heads/master', action: :create) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :create) }
 
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -606,10 +606,6 @@ describe Notify do
       expect(sender.address).to eq(gitlab_sender)
     end
 
-    it 'is sent to recipient' do
-      is_expected.to deliver_to 'devs@company.name'
-    end
-
     it 'has the correct subject' do
       is_expected.to have_subject /Pushed new branch master/
     end
@@ -624,7 +620,7 @@ describe Notify do
     let(:user) { create(:user) }
     let(:tree_path) { namespace_project_tree_path(project.namespace, project, "v1.0") }
 
-    subject { Notify.repository_push_email(project.id, 'devs@company.name', author_id: user.id, ref: 'refs/tags/v1.0', action: :create) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/tags/v1.0', action: :create) }
 
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -637,10 +633,6 @@ describe Notify do
       expect(sender.address).to eq(gitlab_sender)
     end
 
-    it 'is sent to recipient' do
-      is_expected.to deliver_to 'devs@company.name'
-    end
-
     it 'has the correct subject' do
       is_expected.to have_subject /Pushed new tag v1\.0/
     end
@@ -654,7 +646,7 @@ describe Notify do
     let(:example_site_path) { root_path }
     let(:user) { create(:user) }
 
-    subject { Notify.repository_push_email(project.id, 'devs@company.name', author_id: user.id, ref: 'refs/heads/master', action: :delete) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :delete) }
 
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -667,10 +659,6 @@ describe Notify do
       expect(sender.address).to eq(gitlab_sender)
     end
 
-    it 'is sent to recipient' do
-      is_expected.to deliver_to 'devs@company.name'
-    end
-
     it 'has the correct subject' do
       is_expected.to have_subject /Deleted branch master/
     end
@@ -680,7 +668,7 @@ describe Notify do
     let(:example_site_path) { root_path }
     let(:user) { create(:user) }
 
-    subject { Notify.repository_push_email(project.id, 'devs@company.name', author_id: user.id, ref: 'refs/tags/v1.0', action: :delete) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/tags/v1.0', action: :delete) }
 
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -693,10 +681,6 @@ describe Notify do
       expect(sender.address).to eq(gitlab_sender)
     end
 
-    it 'is sent to recipient' do
-      is_expected.to deliver_to 'devs@company.name'
-    end
-
     it 'has the correct subject' do
       is_expected.to have_subject /Deleted tag v1\.0/
     end
@@ -710,7 +694,7 @@ describe Notify do
     let(:diff_path) { namespace_project_compare_path(project.namespace, project, from: Commit.new(compare.base, project), to: Commit.new(compare.head, project)) }
     let(:send_from_committer_email) { false }
 
-    subject { Notify.repository_push_email(project.id, 'devs@company.name', author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, reverse_compare: false, send_from_committer_email: send_from_committer_email) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, reverse_compare: false, send_from_committer_email: send_from_committer_email) }
 
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -723,10 +707,6 @@ describe Notify do
       expect(sender.address).to eq(gitlab_sender)
     end
 
-    it 'is sent to recipient' do
-      is_expected.to deliver_to 'devs@company.name'
-    end
-
     it 'has the correct subject' do
       is_expected.to have_subject /\[#{project.path_with_namespace}\]\[master\] #{commits.length} commits:/
     end
@@ -818,7 +798,7 @@ describe Notify do
     let(:commits) { Commit.decorate(compare.commits, nil) }
     let(:diff_path) { namespace_project_commit_path(project.namespace, project, commits.first) }
 
-    subject { Notify.repository_push_email(project.id, 'devs@company.name', author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare) }
 
     it_behaves_like 'it should show Gmail Actions View Commit link'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -831,10 +811,6 @@ describe Notify do
       expect(sender.address).to eq(gitlab_sender)
     end
 
-    it 'is sent to recipient' do
-      is_expected.to deliver_to 'devs@company.name'
-    end
-
     it 'has the correct subject' do
       is_expected.to have_subject /#{commits.first.title}/
     end
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index 3600c771075..439da765c2c 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -6,29 +6,66 @@ describe EmailsOnPushWorker do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:data) { Gitlab::PushDataBuilder.build_sample(project, user) }
+  let(:recipients) { user.email }
+  let(:perform) { subject.perform(project.id, recipients, data.stringify_keys) }
 
   subject { EmailsOnPushWorker.new }
 
-  before do
-    allow(Project).to receive(:find).and_return(project)
-  end
-
   describe "#perform" do
-    it "sends mail" do
-      subject.perform(project.id, user.email, data.stringify_keys)
+    context "when there are no errors in sending" do
+      let(:email) { ActionMailer::Base.deliveries.last }
 
-      email = ActionMailer::Base.deliveries.last
-      expect(email.subject).to include('Change some files')
-      expect(email.to).to eq([user.email])
+      before { perform }
+
+      it "sends a mail with the correct subject" do
+        expect(email.subject).to include('Change some files')
+      end
+
+      it "sends the mail to the correct recipient" do
+        expect(email.to).to eq([user.email])
+      end
     end
 
-    it "gracefully handles an input SMTP error" do
-      ActionMailer::Base.deliveries.clear
-      allow(Notify).to receive(:repository_push_email).and_raise(Net::SMTPFatalError)
+    context "when there is an SMTP error" do
+      before do
+        ActionMailer::Base.deliveries.clear
+        allow(Notify).to receive(:repository_push_email).and_raise(Net::SMTPFatalError)
+        perform
+      end
 
-      subject.perform(project.id, user.email, data.stringify_keys)
+      it "gracefully handles an input SMTP error" do
+        expect(ActionMailer::Base.deliveries.count).to eq(0)
+      end
+    end
 
-      expect(ActionMailer::Base.deliveries.count).to eq(0)
+    context "when there are multiple recipients" do
+      let(:recipients) do
+        1.upto(5).map { |i| user.email.sub('@', "+#{i}@") }.join("\n")
+      end
+
+      before do
+        # This is a hack because we modify the mail object before sending, for efficency,
+        # but the TestMailer adapter just appends the objects to an array. To clone a mail
+        # object, create a new one!
+        #   https://github.com/mikel/mail/issues/314#issuecomment-12750108
+        allow_any_instance_of(Mail::TestMailer).to receive(:deliver!).and_wrap_original do |original, mail|
+          original.call(Mail.new(mail.encoded))
+        end
+
+        ActionMailer::Base.deliveries.clear
+      end
+
+      it "sends the mail to each of the recipients" do
+        perform
+        expect(ActionMailer::Base.deliveries.count).to eq(5)
+        expect(ActionMailer::Base.deliveries.map(&:to).flatten).to contain_exactly(*recipients.split)
+      end
+
+      it "only generates the mail once" do
+        expect(Notify).to receive(:repository_push_email).once.and_call_original
+        expect(Premailer::Rails::CustomizedPremailer).to receive(:new).once.and_call_original
+        perform
+      end
     end
   end
 end

From d9574a7b93de7e88c77ed1351650843749da60f0 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 5 May 2016 10:00:31 +0100
Subject: [PATCH 0285/1431] Group commits by date in server timezone

`Time#to_date` just takes the (timezone-less) year, date, and month, and
creates a new date from that. Because the commits in the list are
grouped by date, rather than chunked when the date changes, a commit can
be shown in the wrong order if its CommitDate has a timezone-less date
that's different to other commits around it.

Convert all CommitDates to the server timezone before grouping, as that
will at least produce consistent results. Users can still see a
timestamp on the commit that doesn't match the date it's grouped under,
because the timestamp shown uses the user's local timezone, and the
grouping uses the server's timezone, but that was an issue anyway.
---
 CHANGELOG                                     | 1 +
 app/views/projects/commits/_commits.html.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e989e622b97..ab41545548b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.8.0 (unreleased)
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Added multiple colors for labels in dropdowns when dups happen.
+  - Always group commits by server timezone, not commit timestamp
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 64e8da9201d..82f39e59284 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -3,7 +3,7 @@
 
 - commits, hidden = limited_commits(@commits)
 
-- commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
+- commits.group_by { |c| c.committed_date.in_time_zone.to_date }.sort.reverse.each do |day, commits|
   .row.commits-row
     .col-md-2.hidden-xs.hidden-sm
       %h5.commits-row-date

From 68aca6f6635090a33cf4d96c6dbc7ceab6ac2385 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 11 May 2016 11:37:49 +0200
Subject: [PATCH 0286/1431] trying to fix timing issue with import status

---
 app/controllers/projects/imports_controller.rb | 5 ++++-
 app/models/project.rb                          | 5 -----
 app/services/projects/create_service.rb        | 6 ++++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index 7756f0f0ed3..c70b9bf2f5a 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -19,7 +19,10 @@ class Projects::ImportsController < Projects::ApplicationController
       if @project.import_failed?
         @project.import_retry
       else
-        @project.import_start
+        Project.transaction do
+          @project.import_start
+        end
+        @project.add_import_job if @project.persisted?
       end
     end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 05e14185a3e..d807802ce1c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -246,7 +246,6 @@ class Project < ActiveRecord::Base
     state :finished
     state :failed
 
-    after_transition any => :started, do: :schedule_add_import_job
     after_transition any => :finished, do: :clear_import_data
   end
 
@@ -385,10 +384,6 @@ class Project < ActiveRecord::Base
     id && persisted?
   end
 
-  def schedule_add_import_job
-    run_after_commit(:add_import_job)
-  end
-
   def add_import_job
     if forked?
       job_id = RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path)
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index a77652480b2..53a16e95f5b 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -59,6 +59,10 @@ module Projects
         end
       end
 
+      Project.transaction do
+        @project.import_start if @project.import?
+      end
+
       after_create_actions if @project.persisted?
 
       @project
@@ -95,8 +99,6 @@ module Projects
       unless @project.group
         @project.team << [current_user, :master, current_user]
       end
-
-      @project.import_start if @project.import?
     end
   end
 end

From 941301339dd8d1e282c3e225808875ef86b45f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 11 May 2016 12:32:48 +0200
Subject: [PATCH 0287/1431] Remove Rails monkey-patches now that we're using
 Rails 4.2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/monkey_patch.rb | 48 -----------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 config/initializers/monkey_patch.rb

diff --git a/config/initializers/monkey_patch.rb b/config/initializers/monkey_patch.rb
deleted file mode 100644
index 62b05a55285..00000000000
--- a/config/initializers/monkey_patch.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-## This patch is from rails 4.2-stable. Remove it when 4.2.6 is released
-## https://github.com/rails/rails/issues/21108
-
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractMysqlAdapter < AbstractAdapter
-      # SHOW VARIABLES LIKE 'name'
-      def show_variable(name)
-        variables = select_all("select @@#{name} as 'Value'", 'SCHEMA')
-        variables.first['Value'] unless variables.empty?
-      rescue ActiveRecord::StatementInvalid
-        nil
-      end
-
-      
-      # MySQL is too stupid to create a temporary table for use subquery, so we have
-      # to give it some prompting in the form of a subsubquery. Ugh!
-      def subquery_for(key, select)
-        subsubselect = select.clone
-        subsubselect.projections = [key]
-
-        subselect = Arel::SelectManager.new(select.engine)
-        subselect.project Arel.sql(key.name)
-        # Materialized subquery by adding distinct
-        # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on'
-        subselect.from subsubselect.distinct.as('__active_record_temp')
-      end
-    end
-  end
-end
-
-module ActiveRecord
-  module ConnectionAdapters
-    class MysqlAdapter < AbstractMysqlAdapter
-      ADAPTER_NAME = 'MySQL'.freeze
-
-      # Get the client encoding for this database
-      def client_encoding
-        return @client_encoding if @client_encoding
-
-        result = exec_query(
-          "select @@character_set_client",
-          'SCHEMA')
-        @client_encoding = ENCODINGS[result.rows.last.last]
-      end
-    end
-  end
-end

From a2934f45317ed64beb948b8487199251a987c4a1 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 11 May 2016 12:39:07 +0200
Subject: [PATCH 0288/1431] Use % notation for arrays in runner model constants

---
 app/models/ci/runner.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index d27963e8ec5..e598a132869 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -22,8 +22,8 @@ module Ci
     extend Ci::Model
 
     LAST_CONTACT_TIME = 5.minutes.ago
-    AVAILABLE_SCOPES = ['specific', 'shared', 'active', 'paused', 'online']
-    FORM_EDITABLE = [:description, :tag_list, :active]
+    AVAILABLE_SCOPES = %w[specific shared active paused online]
+    FORM_EDITABLE = %i[description tag_list active]
 
     has_many :builds, class_name: 'Ci::Build'
     has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject'

From e43d773a6c23098718164dcdc3ddcd06547ae92a Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 11 May 2016 14:17:11 +0300
Subject: [PATCH 0289/1431] Fix right sidebar to the top of the page.

---
 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 1cf3023ecc9..4607f773be2 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -125,7 +125,7 @@
 
 .right-sidebar {
   position: fixed;
-  top: 58px;
+  top: 50px;
   bottom: 0;
   right: 0;
   z-index: 10;

From 29f1cc85f2360bf03db424950518ce420e771edc Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 11 May 2016 14:55:04 +0300
Subject: [PATCH 0290/1431] Fix typo in right sidebar open state check.

---
 app/assets/javascripts/right_sidebar.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/right_sidebar.js.coffee b/app/assets/javascripts/right_sidebar.js.coffee
index 2d084b76cfe..8c4f1142713 100644
--- a/app/assets/javascripts/right_sidebar.js.coffee
+++ b/app/assets/javascripts/right_sidebar.js.coffee
@@ -76,7 +76,7 @@ class @Sidebar
       @triggerOpenSidebar() if not @isOpen()
 
     if action is 'hide'
-      @triggerOpenSidebar() is @isOpen()
+      @triggerOpenSidebar() if @isOpen()
 
   isOpen: ->
     @sidebar.is('.right-sidebar-expanded')

From c446a86510a6586c69a306ae09e41053f20d11a1 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 11 May 2016 14:19:30 +0200
Subject: [PATCH 0291/1431] Updated 8.7.4 CHANGELOG entries

[ci skip]
---
 CHANGELOG | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 54c79551b1d..caa0923573a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,9 +43,13 @@ v 8.8.0 (unreleased)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
 
 v 8.7.4
-  - Fix always showing build notification message when switching between merge requests
-  - Links for Redmine issue references are generated correctly again (Benedikt Huss)
-  - Fix an issue when filtering merge requests with more than one label. !3886
+  - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
+  - Fix setting trusted proxies !3970
+  - Fix BitBucket importer bug when throwing exceptions !3941
+  - Use sign out path only if not empty !3989
+  - Running rake gitlab:db:drop_tables now drops tables with cascade !4020
+  - Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
+  - Use a case-insensitive comparison in sanitizing URI schemes
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From 5c59ba35c9ae6a7e5d6d6cd20d0b2ba51166f60f Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 11 May 2016 15:08:27 +0200
Subject: [PATCH 0292/1431] fix complexity of method

---
 app/services/projects/create_service.rb | 30 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 53a16e95f5b..1693ae609cf 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -50,18 +50,9 @@ module Projects
         @project.build_forked_project_link(forked_from_project_id: forked_from_project_id)
       end
 
-      Project.transaction do
-        @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
-        @project.save
+      process_import_data(import_data)
 
-        if @project.persisted? && !@project.import?
-          raise 'Failed to create repository' unless @project.create_repository
-        end
-      end
-
-      Project.transaction do
-        @project.import_start if @project.import?
-      end
+      start_import if @project.import?
 
       after_create_actions if @project.persisted?
 
@@ -100,5 +91,22 @@ module Projects
         @project.team << [current_user, :master, current_user]
       end
     end
+
+    def start_import
+      Project.transaction do
+        @project.import_start
+      end
+    end
+
+    def process_import_data(import_data)
+      Project.transaction do
+        @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
+        @project.save
+
+        if @project.persisted? && !@project.import?
+          raise 'Failed to create repository' unless @project.create_repository
+        end
+      end
+    end
   end
 end

From 973cd0fec7b69d1398a86df67d10f7c38a9a4ced Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Wed, 11 May 2016 18:08:17 +0300
Subject: [PATCH 0293/1431] Update 8.8 guides

---
 doc/install/installation.md |   2 +-
 doc/update/8.7-to-8.8.md    | 154 ++++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 doc/update/8.7-to-8.8.md

diff --git a/doc/install/installation.md b/doc/install/installation.md
index e3af3022262..44ae0be406c 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -269,7 +269,7 @@ 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-7-stable gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-8-stable gitlab
 
 **Note:** You can change `8-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
diff --git a/doc/update/8.7-to-8.8.md b/doc/update/8.7-to-8.8.md
new file mode 100644
index 00000000000..b4d9212289c
--- /dev/null
+++ b/doc/update/8.7-to-8.8.md
@@ -0,0 +1,154 @@
+# From 8.7 to 8.8
+
+Make sure you view this update guide from the tag (version) of GitLab you would
+like to install. In most cases this should be the highest numbered production
+tag (without rc in it). You can select the tag in the version dropdown at the
+top left corner of GitLab (below the menu bar).
+
+If the highest number stable branch is unclear please check the
+[GitLab Blog](https://about.gitlab.com/blog/archives.html) for installation
+guide links by version.
+
+### 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-8-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 8-8-stable-ee
+```
+
+### 4. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch --all --tags
+sudo -u git -H git checkout v2.7.2
+```
+
+### 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 v0.7.1
+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
+
+# Optional: clean up old gems
+sudo -u git -H bundle clean
+
+# 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. Update configuration files
+
+#### Git configuration
+
+Disable `git gc --auto` because GitLab runs `git gc` for us already.
+
+```sh
+sudo -u git -H git config --global gc.auto 0
+```
+
+#### Nginx configuration
+
+Ensure you're still up-to-date with the latest NGINX configuration changes:
+
+```sh
+# For HTTPS configurations
+git diff origin/8-7-stable:lib/support/nginx/gitlab-ssl origin/8-8-stable:lib/support/nginx/gitlab-ssl
+
+# For HTTP configurations
+git diff origin/8-7-stable:lib/support/nginx/gitlab origin/8-8-stable:lib/support/nginx/gitlab
+```
+
+If you are using Apache instead of NGINX please see the updated [Apache templates].
+Also note that because Apache does not support upstreams behind Unix sockets you
+will need to let gitlab-workhorse listen on a TCP port. You can do this
+via [/etc/default/gitlab].
+
+[Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
+[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/lib/support/init.d/gitlab.default.example#L37
+
+#### Init script
+
+Ensure you're still up-to-date with the latest init script changes:
+
+    sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+
+### 8. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 9. 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.6)
+
+### 1. Revert the code to the previous version
+
+Follow the [upgrade guide from 8.6 to 8.7](8.6-to-8.7.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 b523dec83dc832029c6e40daaeb121920bbcd394 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 8 May 2016 14:11:28 -0400
Subject: [PATCH 0294/1431] Remove unused `icon_for_event` helper

---
 app/helpers/events_helper.rb | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 592bad8ba24..0bf328e7d19 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -39,15 +39,6 @@ module EventsHelper
     end
   end
 
-  def icon_for_event
-    {
-      EventFilter.push     => 'upload',
-      EventFilter.merged   => 'check-square-o',
-      EventFilter.comments => 'comments',
-      EventFilter.team     => 'user',
-    }
-  end
-
   def event_preposition(event)
     if event.push? || event.commented? || event.target
       "at"

From d8c27e4e2b332cb9ece780bfb06155c3d1739d92 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Wed, 11 May 2016 22:33:27 +0200
Subject: [PATCH 0295/1431] merge awards-handler.coffee from another branch

---
 app/assets/javascripts/awards_handler.coffee | 97 ++++++++++----------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index c18c9984c1f..043ad697dfe 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,26 +1,26 @@
 class @AwardsHandler
   constructor: ->
-    @aliases = gl.emoji.emojiAliases()
+    @aliases = emojiAliases()
 
     $(document)
       .off "click", ".js-add-award"
-      .on "click", ".js-add-award", (e) =>
-        e.stopPropagation()
-        e.preventDefault()
+      .on "click", ".js-add-award", (event) =>
+        event.stopPropagation()
+        event.preventDefault()
 
-        @showEmojiMenu $(e.currentTarget)
+        @showEmojiMenu $(event.currentTarget)
 
-    $("html").on 'click', (e) ->
-      if !$(e.target).closest(".emoji-menu").length
+    $("html").on 'click', (event) ->
+      if !$(event.target).closest(".emoji-menu").length
         if $(".emoji-menu").is(":visible")
           $('.js-add-award.is-active').removeClass 'is-active'
           $(".emoji-menu").removeClass "is-visible"
 
     $(document)
       .off "click", ".js-emoji-btn"
-      .on "click", ".js-emoji-btn", @handleClick.bind(@)
+      .on "click", ".js-emoji-btn", @handleClick
 
-  handleClick: (e) ->
+  handleClick: (e) =>
     e.preventDefault()
     $emojiBtn = $(e.currentTarget)
     $addAwardBtn = $('.js-add-award.is-active')
@@ -31,27 +31,16 @@ class @AwardsHandler
     else if $votesBlock.length is 0
       $votesBlock = $addAwardBtn.closest('.js-awards-block')
 
-    @currentVoteBlock = $votesBlock
-
+    $votesBlock.addClass 'js-awards-block-current'
     awardUrl = $votesBlock.data 'award-url'
     emoji = $emojiBtn
       .find(".icon")
       .data "emoji"
-
-    if emoji is "thumbsup" and @didUserClickEmoji $emojiBtn, "thumbsdown"
-      @addAward awardUrl, "thumbsdown"
-
-    else if emoji is "thumbsdown" and @didUserClickEmoji $emojiBtn, "thumbsup"
-      @addAward awardUrl, "thumbsup"
-
     @addAward awardUrl, emoji
 
-  didUserClickEmoji: (emojiBtn, emoji) ->
-    if emojiBtn.siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title")
-      emojiBtn.siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title").indexOf('me') > -1
-
   showEmojiMenu: ($addBtn) ->
     $menu = $('.emoji-menu')
+
     if $menu.length
       $holder = $addBtn.closest('.js-award-holder')
 
@@ -60,7 +49,6 @@ class @AwardsHandler
         $menu.removeClass "is-visible"
         $("#emoji_search").blur()
       else
-        $(".emoji-menu").addClass "is-visible"
         $addBtn.addClass "is-active"
         @positionMenu($menu, $addBtn)
 
@@ -77,6 +65,7 @@ class @AwardsHandler
         @positionMenu($menu, $addBtn)
 
         @renderFrequentlyUsedBlock()
+
         setTimeout =>
           $menu.addClass "is-visible"
           $("#emoji_search").focus()
@@ -101,16 +90,18 @@ class @AwardsHandler
     $menu.css(css)
 
   addAward: (awardUrl, emoji) ->
-    emoji = @normilizeEmojiName(emoji)
+    emoji = @normalizeEmojiName(emoji)
     @postEmoji awardUrl, emoji, =>
       @addAwardToEmojiBar(emoji)
 
-    $('.emoji-menu').removeClass 'is-visible'
+      $('.js-awards-block-current').removeClass 'js-awards-block-current'
+
+    $(".emoji-menu").removeClass "is-visible"
 
   addAwardToEmojiBar: (emoji) ->
     @addEmojiToFrequentlyUsedList(emoji)
 
-    emoji = @normilizeEmojiName(emoji)
+    emoji = @normalizeEmojiName(emoji)
     $emojiBtn = @findEmojiIcon(emoji).parent()
 
     if $emojiBtn.length > 0
@@ -146,12 +137,16 @@ class @AwardsHandler
 
     $emojiBtn.removeClass("active")
 
+    if !isntNoteBody and $awardsBlock.children('.js-emoji-btn').length is 0
+      # If this is a note body, we just hide the award emoji row like the initial state
+      $awardsBlock.addClass 'hidden'
+
   removeMeFromUserList: ($emojiBtn, emoji) ->
     award_block = $emojiBtn
     authors = award_block
       .attr("data-original-title")
       .split(", ")
-    authors.splice(authors.indexOf("me"), 1)
+    authors.splice(authors.indexOf("me"),1)
     award_block
       .closest(".js-emoji-btn")
       .attr("data-original-title", authors.join(", "))
@@ -164,17 +159,18 @@ class @AwardsHandler
     if origTitle
       users = origTitle.split(', ')
     users.push("me")
-    award_block.attr("data-original-title", users.join(", "))
+    award_block.attr("title", users.join(", "))
     @resetTooltip(award_block)
 
   resetTooltip: (award) ->
-    award.tooltip('destroy')
+    award.tooltip("destroy")
 
     # "destroy" call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
     setTimeout (->
       award.tooltip()
     ), 200
 
+
   createEmoji: (emoji) ->
     emojiCssClass = @resolveNameToCssClass(emoji)
 
@@ -194,13 +190,13 @@ class @AwardsHandler
       $currentBlock.removeClass 'hidden'
 
   resolveNameToCssClass: (emoji) ->
-    emojiIcon = $(".emoji-menu-content [data-emoji='#{emoji}']")
+    emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
-    if emojiIcon.length > 0
-      unicodeName = emojiIcon.data('unicode-name')
+    if emoji_icon.length > 0
+      unicodeName = emoji_icon.data("unicode-name")
     else
       # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name')
+      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
 
     "emoji-#{unicodeName}"
 
@@ -210,49 +206,52 @@ class @AwardsHandler
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    @currentVoteBlock.find(".js-emoji-btn [data-emoji='#{emoji}']")
+    $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']")
 
   scrollToAwards: ->
     $('body, html').animate({
       scrollTop: $('.awards').offset().top - 80
     }, 200)
 
+  normalizeEmojiName: (emoji) ->
+    @aliases[emoji] || emoji
+
   addEmojiToFrequentlyUsedList: (emoji) ->
-    frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
-    frequentlyUsedEmojis.push(emoji)
-    $.cookie('frequently_used_emojis', frequentlyUsedEmojis.join(','), { expires: 365 })
+    frequently_used_emojis = @getFrequentlyUsedEmojis()
+    frequently_used_emojis.push(emoji)
+    $.cookie('frequently_used_emojis', frequently_used_emojis.join(","), { expires: 365 })
 
   getFrequentlyUsedEmojis: ->
-    frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') || '').split(',')
-    _.compact(_.uniq(frequentlyUsedEmojis))
+    frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
+    _.compact(_.uniq(frequently_used_emojis))
 
   renderFrequentlyUsedBlock: ->
     if $.cookie('frequently_used_emojis')
-      frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
+      frequently_used_emojis = @getFrequentlyUsedEmojis()
 
       ul = $("<ul class='clearfix emoji-menu-list'>")
 
       for emoji in frequently_used_emojis
         $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
 
-      $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
+      $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
 
   setupSearch: ->
-    $('input.emoji-search').keyup (ev) =>
+    $("input.emoji-search").on 'keyup', (ev) =>
       term = $(ev.target).val()
 
       # Clean previous search results
-      $('ul.emoji-menu-search, h5.emoji-search').remove()
+      $("ul.emoji-menu-search, h5.emoji-search").remove()
 
       if term
         # Generate a search result block
-        h5 = $('<h5>').text('Search results').addClass('emoji-search')
-        foundEmojis = @searchEmojis(term).show()
-        ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis)
-        $('.emoji-menu-content ul, .emoji-menu-content h5').hide()
-        $('.emoji-menu-content').append(h5).append(ul)
+        h5 = $("<h5>").text("Search results").addClass("emoji-search")
+        found_emojis = @searchEmojis(term).show()
+        ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
+        $(".emoji-menu-content ul, .emoji-menu-content h5").hide()
+        $(".emoji-menu-content").append(h5).append(ul)
       else
-        $('.emoji-menu-content').children().show()
+        $(".emoji-menu-content").children().show()
 
   searchEmojis: (term)->
     $(".emoji-menu-content [data-emoji*='#{term}']").closest("li").clone()

From 4558b5b9fe9f648903ad0dc01089e6118fe0af34 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Wed, 11 May 2016 22:43:58 +0200
Subject: [PATCH 0296/1431] Incorporate feedback

---
 app/models/concerns/awardable.rb              | 10 +++---
 app/models/note.rb                            |  4 ---
 app/models/user.rb                            |  2 +-
 app/services/notes/create_service.rb          |  2 +-
 app/services/toggle_award_emoji_service.rb    | 12 -------
 app/views/award_emoji/_awards_block.html.haml |  4 +--
 app/views/projects/issues/_issue.html.haml    | 14 +++-----
 .../merge_requests/_merge_request.html.haml   | 14 +++-----
 ...82152_convert_award_note_to_emoji_award.rb | 10 ------
 lib/api/entities.rb                           |  3 +-
 .../projects/issues_controller_spec.rb        |  6 ++--
 spec/features/issues/award_emoji_spec.rb      |  2 --
 spec/models/concerns/issuable_spec.rb         | 35 ++-----------------
 spec/requests/api/issues_spec.rb              |  1 -
 spec/requests/api/merge_requests_spec.rb      |  1 -
 15 files changed, 23 insertions(+), 97 deletions(-)

diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index b4e3e9eb3dd..aa4b4201250 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -34,23 +34,23 @@ module Awardable
     end
   end
 
-  def grouped_awards(with_thumbs = true)
+  def grouped_awards(with_thumbs: true)
     awards = award_emoji.group_by(&:name)
 
     if with_thumbs
-      awards[AwardEmoji::UPVOTE_NAME]   ||= AwardEmoji.none
-      awards[AwardEmoji::DOWNVOTE_NAME] ||= AwardEmoji.none
+      awards[AwardEmoji::UPVOTE_NAME]   ||= []
+      awards[AwardEmoji::DOWNVOTE_NAME] ||= []
     end
 
     awards
   end
 
   def downvotes
-    award_emoji.where(name: AwardEmoji::DOWNVOTE_NAME).count
+    award_emoji.downvotes.count
   end
 
   def upvotes
-    award_emoji.where(name: AwardEmoji::UPVOTE_NAME).count
+    award_emoji.upvotes.count
   end
 
   def emoji_awardable?
diff --git a/app/models/note.rb b/app/models/note.rb
index 0b038edb47b..f9040f9f364 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -323,10 +323,6 @@ class Note < ActiveRecord::Base
     award_emoji_supported? && contains_emoji_only?
   end
 
-  def create_award_emoji
-    self.noteable.award_emoji(award_emoji_name, author)
-  end
-
   def clear_blank_line_code!
     self.line_code = nil if self.line_code.blank?
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5ca53e7c64a..52847212619 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -79,7 +79,7 @@ class User < ActiveRecord::Base
   has_many :builds,                   dependent: :nullify, class_name: 'Ci::Build'
   has_many :todos,                    dependent: :destroy
   has_many :notification_settings,    dependent: :destroy
-  has_many :award_emoji, 							as: :awardable, dependent: :destroy
+  has_many :award_emoji,              as: :awardable, dependent: :destroy
 
   #
   # Validations
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index da2a774b70d..bbf7889166d 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -7,7 +7,7 @@ module Notes
 
       if note.award_emoji?
         return ToggleAwardEmojiService.new(project, current_user, params).
-                                        execute(note.noteable, note.note)
+                                        execute(note.award_emoji_name, note.note)
       end
 
       return unless valid_project?(note)
diff --git a/app/services/toggle_award_emoji_service.rb b/app/services/toggle_award_emoji_service.rb
index b77b4e79bf2..1820f57f564 100644
--- a/app/services/toggle_award_emoji_service.rb
+++ b/app/services/toggle_award_emoji_service.rb
@@ -1,21 +1,9 @@
 require_relative 'base_service'
 
 class ToggleAwardEmojiService < BaseService
-  # For an award emoji being posted we should:
-  # - Mark the TODO as done for this issuable (skip on snippets)
-  # - Save the award emoji
   def execute(awardable, emoji)
     todo_service.new_award_emoji(awardable, current_user)
 
-    # Needed if its posted as a note containing only :+1:
-    emoji = award_emoji_name(emoji) if emoji.start_with? ':'
     awardable.toggle_award_emoji(emoji, current_user)
   end
-
-  private
-
-  def award_emoji_name(emoji)
-    original_name = emoji.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
-    Gitlab::AwardEmoji.normalize_emoji_name(original_name)
-  end
 end
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index b57c9afcbd2..86931c70f33 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -1,7 +1,7 @@
-- grouped_emojis = awardable.grouped_awards(inline)
+- grouped_emojis = awardable.grouped_awards(with_thumbs: inline)
 .awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
   - awards_sort(grouped_emojis).each do |emoji, awards|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)),data: { placement: "bottom", original_title:  award_user_list(awards, current_user)} }
+    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)),data: { placement: "bottom", title:  award_user_list(awards, current_user) } }
       = emoji_icon(emoji)
       %span.award-control-text.js-counter
         = awards.count
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 57ad2ec1852..dec3e8809ce 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -28,16 +28,10 @@
           = downvotes
 
       - note_count = issue.notes.user.count
-      - if note_count > 0
-        %li
-          = link_to issue_path(issue) + "#notes" do
-            = icon('comments')
-            = note_count
-      - else
-        %li
-          = link_to issue_path(issue) + "#notes", class: "issue-no-comments" do
-            = icon('comments')
-            = note_count
+      %li
+        = link_to issue_path(issue, anchor: 'notes'), class: ('issue-no-comments' if note_count.zero?) do
+          = icon('comments')
+          = note_count
 
   .issue-info
     #{issue.to_reference} &middot;
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 391193eed6c..eaee5180176 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -36,16 +36,10 @@
           = downvotes
 
       - note_count = merge_request.mr_and_commit_notes.user.count
-      - if note_count > 0
-        %li
-          = link_to merge_request_path(merge_request) + "#notes" do
-            = icon('comments')
-            = note_count
-      - else
-        %li
-          = link_to merge_request_path(merge_request) + "#notes", class: "merge-request-no-comments" do
-            = icon('comments')
-            = note_count
+      %li
+         = link_to merge_request_path(merge_request, anchor: 'notes'), class: ('merge-request-no-comments' if note_count.zero?) do
+           = icon('comments')
+           = note_count
 
   .merge-request-info
     #{merge_request.to_reference} &middot;
diff --git a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
index 76f4a3aa6ae..d2efbd0abea 100644
--- a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
+++ b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
@@ -3,15 +3,5 @@ class ConvertAwardNoteToEmojiAward < ActiveRecord::Migration
     def up
       execute "INSERT INTO award_emoji (awardable_type, awardable_id, user_id, name, created_at, updated_at) (SELECT noteable_type, noteable_id, author_id, note, created_at, updated_at FROM notes WHERE is_award = true)"
     end
-
-    def down
-      execute <<-SQL
-      INSERT INTO notes (noteable_type, noteable_id, author_id, note, created_at, updated_at, is_award) 
-        (SELECT awardable_type, awardable_id, user_id, name, created_at, updated_at, TRUE 
-         FROM award_emoji 
-         WHERE awardable_type IN ('Issue', 'MergeRequest')
-        )
-      SQL
-    end
   end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index f91ca9d5805..c210cfe513f 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -174,7 +174,7 @@ module API
       expose :subscribed do |issue, options|
         issue.subscribed?(options[:current_user])
       end
-      expose :user_notes_count
+      expose :upvotes, :downvotes
     end
 
     class MergeRequest < ProjectEntity
@@ -191,7 +191,6 @@ module API
       expose :subscribed do |merge_request, options|
         merge_request.subscribed?(options[:current_user])
       end
-      expose :user_notes_count
     end
 
     class MergeRequestChanges < MergeRequest
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 30d296fdad0..706f538f262 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -257,9 +257,9 @@ describe Projects::IssuesController do
       project.team << [user, :developer]
     end
 
-    it "yields status code 200" do
-      post(:toggle_award_emoji, namespace_id: project.namespace.path,
-                                project_id: project.path, id: issue.iid, name: "thumbsup")
+    it "toggles the award emoji" do
+      expect { post(:toggle_award_emoji, namespace_id: project.namespace.path,
+                                project_id: project.path, id: issue.iid, name: "thumbsup") }.to change { AwardEmoji.count }.by(1)
 
       expect(response.status).to eq(200)
     end
diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
index 41af789aae2..07a854ea014 100644
--- a/spec/features/issues/award_emoji_spec.rb
+++ b/spec/features/issues/award_emoji_spec.rb
@@ -28,7 +28,6 @@ describe 'Awards Emoji', feature: true do
     end
 
     context 'click the thumbsup emoji' do
-
       it 'should increment the thumbsup emoji', js: true do
         find('[data-emoji="thumbsup"]').click
         sleep 2
@@ -41,7 +40,6 @@ describe 'Awards Emoji', feature: true do
     end
 
     context 'click the thumbsdown emoji' do
-
       it 'should increment the thumbsdown emoji', js: true do
         find('[data-emoji="thumbsdown"]').click
         sleep 2
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 568bf4c9324..ebc3968023d 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -203,11 +203,10 @@ describe Issue, "Issuable" do
     end
   end
 
-  # TODO ZJ
   describe "votes" do
     before do
-      create!(:award_emoji, :upvote, awardable: issue)
-      create!(:award_emoji, :downvote, awardable: issue)
+      create(:award_emoji, :upvote, awardable: issue)
+      create(:award_emoji, :downvote, awardable: issue)
     end
 
     it "returns correct values" do
@@ -215,34 +214,4 @@ describe Issue, "Issuable" do
       expect(issue.downvotes).to eq(1)
     end
   end
-
-  describe ".with_label" do
-    let(:project) { create(:project, :public) }
-    let(:bug) { create(:label, project: project, title: 'bug') }
-    let(:feature) { create(:label, project: project, title: 'feature') }
-    let(:enhancement) { create(:label, project: project, title: 'enhancement') }
-    let(:issue1) { create(:issue, title: "Bugfix1", project: project) }
-    let(:issue2) { create(:issue, title: "Bugfix2", project: project) }
-    let(:issue3) { create(:issue, title: "Feature1", project: project) }
-
-    before(:each) do
-      issue1.labels << bug
-      issue1.labels << feature
-      issue2.labels << bug
-      issue2.labels << enhancement
-      issue3.labels << feature
-    end
-
-    it 'finds the correct issue containing just enhancement label' do
-      expect(Issue.with_label(enhancement.title)).to match_array([issue2])
-    end
-
-    it 'finds the correct issues containing the same label' do
-      expect(Issue.with_label(bug.title)).to match_array([issue1, issue2])
-    end
-
-    it 'finds the correct issues containing only both labels' do
-      expect(Issue.with_label([bug.title, enhancement.title])).to match_array([issue2])
-    end
-  end
 end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 9dd43f4fab3..7bc7e319ff1 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -249,7 +249,6 @@ describe API::API, api: true  do
       expect(json_response['milestone']).to be_a Hash
       expect(json_response['assignee']).to be_a Hash
       expect(json_response['author']).to be_a Hash
-      expect(json_response['user_notes_count']).to be(1)
     end
 
     it "should return a project issue by id" do
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 4b0111df149..6392bdb1c91 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -138,7 +138,6 @@ describe API::API, api: true  do
       expect(json_response['work_in_progress']).to be_falsy
       expect(json_response['merge_when_build_succeeds']).to be_falsy
       expect(json_response['merge_status']).to eq('can_be_merged')
-      expect(json_response['user_notes_count']).to be(2)
     end
 
     it "should return merge_request" do

From 2bbe781d8b45fb9677f5fbe60cf86b2452ef3af4 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Wed, 11 May 2016 22:49:47 +0200
Subject: [PATCH 0297/1431] revert front end changes

---
 app/assets/javascripts/awards_handler.coffee  | 298 ++++++++----------
 app/assets/javascripts/dispatcher.js.coffee   |   2 -
 .../lib/emoji_aliases.js.coffee.erb           |   9 -
 app/assets/javascripts/notes.js.coffee        |   6 +-
 app/assets/stylesheets/pages/awards.scss      |  13 +-
 app/assets/stylesheets/pages/notes.scss       |  41 +--
 6 files changed, 140 insertions(+), 229 deletions(-)
 delete mode 100644 app/assets/javascripts/lib/emoji_aliases.js.coffee.erb

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 043ad697dfe..bf95e06b4e5 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,169 +1,126 @@
 class @AwardsHandler
-  constructor: ->
-    @aliases = emojiAliases()
+  constructor: (@getEmojisUrl, @postEmojiUrl, @noteableType, @noteableId, @unicodes) ->
+    $('.js-add-award').on 'click', (event) =>
+      event.stopPropagation()
+      event.preventDefault()
 
-    $(document)
-      .off "click", ".js-add-award"
-      .on "click", ".js-add-award", (event) =>
-        event.stopPropagation()
-        event.preventDefault()
+      @showEmojiMenu()
 
-        @showEmojiMenu $(event.currentTarget)
+    $('html').on 'click', (event) ->
+      if !$(event.target).closest('.emoji-menu').length
+        if $('.emoji-menu').is(':visible')
+          $('.emoji-menu').removeClass 'is-visible'
 
-    $("html").on 'click', (event) ->
-      if !$(event.target).closest(".emoji-menu").length
-        if $(".emoji-menu").is(":visible")
-          $('.js-add-award.is-active').removeClass 'is-active'
-          $(".emoji-menu").removeClass "is-visible"
+    $('.awards')
+      .off 'click'
+      .on 'click', '.js-emoji-btn', @handleClick
 
-    $(document)
-      .off "click", ".js-emoji-btn"
-      .on "click", ".js-emoji-btn", @handleClick
+    @renderFrequentlyUsedBlock()
 
-  handleClick: (e) =>
+  handleClick: (e) ->
     e.preventDefault()
-    $emojiBtn = $(e.currentTarget)
-    $addAwardBtn = $('.js-add-award.is-active')
-    $votesBlock = $($addAwardBtn.closest('.js-award-holder').data('target'))
+    emoji = $(this)
+      .find('.icon')
+      .data 'emoji'
 
-    if $addAwardBtn.length is 0
-      $votesBlock = $emojiBtn.closest('.js-awards-block')
-    else if $votesBlock.length is 0
-      $votesBlock = $addAwardBtn.closest('.js-awards-block')
+    if emoji is 'thumbsup' and awardsHandler.didUserClickEmoji $(this), 'thumbsdown'
+      awardsHandler.addAward 'thumbsdown'
 
-    $votesBlock.addClass 'js-awards-block-current'
-    awardUrl = $votesBlock.data 'award-url'
-    emoji = $emojiBtn
-      .find(".icon")
-      .data "emoji"
-    @addAward awardUrl, emoji
+    else if emoji is 'thumbsdown' and awardsHandler.didUserClickEmoji $(this), 'thumbsup'
+      awardsHandler.addAward 'thumbsup'
 
-  showEmojiMenu: ($addBtn) ->
-    $menu = $('.emoji-menu')
+    awardsHandler.addAward emoji
 
-    if $menu.length
-      $holder = $addBtn.closest('.js-award-holder')
+    $(this).trigger 'blur'
 
-      if $menu.is ".is-visible"
-        $addBtn.removeClass "is-active"
-        $menu.removeClass "is-visible"
-        $("#emoji_search").blur()
+  didUserClickEmoji: (that, emoji) ->
+    if $(that).siblings("button:has([data-emoji=#{emoji}])").attr('data-original-title')
+      $(that).siblings("button:has([data-emoji=#{emoji}])").attr('data-original-title').indexOf('me') > -1
+
+  showEmojiMenu: ->
+    if $('.emoji-menu').length
+      if $('.emoji-menu').is '.is-visible'
+        $('.emoji-menu').removeClass 'is-visible'
+        $('#emoji_search').blur()
       else
-        $addBtn.addClass "is-active"
-        @positionMenu($menu, $addBtn)
-
-        $menu.addClass "is-visible"
-        $("#emoji_search").focus()
+        $('.emoji-menu').addClass 'is-visible'
+        $('#emoji_search').focus()
     else
-      $addBtn.addClass "is-loading is-active"
-      $.get $addBtn.data('award-menu-url'), (response) =>
-        $addBtn.removeClass "is-loading"
-        $('body').append response
-
-        $menu = $(".emoji-menu")
-
-        @positionMenu($menu, $addBtn)
-
-        @renderFrequentlyUsedBlock()
-
+      $('.js-add-award').addClass 'is-loading'
+      $.get @getEmojisUrl, (response) =>
+        $('.js-add-award').removeClass 'is-loading'
+        $('.js-award-holder').append response
         setTimeout =>
-          $menu.addClass "is-visible"
-          $("#emoji_search").focus()
+          $('.emoji-menu').addClass 'is-visible'
+          $('#emoji_search').focus()
           @setupSearch()
         , 200
 
-  positionMenu: ($menu, $addBtn) ->
-    position = $addBtn.data('position')
-
-    # The menu could potentially be off-screen or in a hidden overflow element
-    # So we position the element absolute in the body
-    css =
-      top: "#{$addBtn.offset().top + $addBtn.outerHeight()}px"
-
-    if position? and position is 'right'
-      css.left = "#{($addBtn.offset().left - $menu.outerWidth()) + 20}px"
-      $menu.addClass "is-aligned-right"
-    else
-      css.left = "#{$addBtn.offset().left}px"
-      $menu.removeClass "is-aligned-right"
-
-    $menu.css(css)
-
-  addAward: (awardUrl, emoji) ->
-    emoji = @normalizeEmojiName(emoji)
-    @postEmoji awardUrl, emoji, =>
+  addAward: (emoji) ->
+    @postEmoji emoji, =>
       @addAwardToEmojiBar(emoji)
 
-      $('.js-awards-block-current').removeClass 'js-awards-block-current'
-
-    $(".emoji-menu").removeClass "is-visible"
+    $('.emoji-menu').removeClass 'is-visible'
 
   addAwardToEmojiBar: (emoji) ->
     @addEmojiToFrequentlyUsedList(emoji)
 
-    emoji = @normalizeEmojiName(emoji)
-    $emojiBtn = @findEmojiIcon(emoji).parent()
-
-    if $emojiBtn.length > 0
-      if @isActive($emojiBtn)
-        @decrementCounter($emojiBtn, emoji)
+    if @exist(emoji)
+      if @isActive(emoji)
+        @decrementCounter(emoji)
       else
-        $counter = $emojiBtn.find('.js-counter')
-        $counter.text(parseInt($counter.text()) + 1)
-        $emojiBtn.addClass("active")
-        @addMeToUserList(emoji)
+        counter = @findEmojiIcon(emoji).siblings('.js-counter')
+        counter.text(parseInt(counter.text()) + 1)
+        counter.parent().addClass('active')
+        @addMeToAuthorList(emoji)
     else
       @createEmoji(emoji)
 
-  isActive: ($emojiBtn) ->
-    $emojiBtn.hasClass("active")
+  exist: (emoji) ->
+    @findEmojiIcon(emoji).length > 0
 
-  decrementCounter: ($emojiBtn, emoji) ->
-    $awardsBlock = $emojiBtn.closest('.js-awards-block')
-    isntNoteBody = $emojiBtn.closest('.note-body').length is 0
-    counter = $('.js-counter', $emojiBtn)
-    counterNumber = parseInt(counter.text())
+  isActive: (emoji) ->
+    @findEmojiIcon(emoji).parent().hasClass('active')
 
-    if counterNumber > 1
-      counter.text(counterNumber - 1)
-      @removeMeFromUserList($emojiBtn, emoji)
-    else if (emoji == "thumbsup" || emoji == "thumbsdown") && isntNoteBody
-      $emojiBtn.tooltip("destroy")
-      counter.text('0')
-      @removeMeFromUserList($emojiBtn, emoji)
+  decrementCounter: (emoji) ->
+    counter = @findEmojiIcon(emoji).siblings('.js-counter')
+    emojiIcon = counter.parent()
+    if parseInt(counter.text()) > 1
+      counter.text(parseInt(counter.text()) - 1)
+      emojiIcon.removeClass('active')
+      @removeMeFromAuthorList(emoji)
+    else if emoji == 'thumbsup' || emoji == 'thumbsdown'
+      emojiIcon.tooltip('destroy')
+      counter.text(0)
+      emojiIcon.removeClass('active')
+      @removeMeFromAuthorList(emoji)
     else
-      $emojiBtn.tooltip("destroy")
-      $emojiBtn.remove()
+      emojiIcon.tooltip('destroy')
+      emojiIcon.remove()
 
-    $emojiBtn.removeClass("active")
+  removeMeFromAuthorList: (emoji) ->
+    awardBlock = @findEmojiIcon(emoji).parent()
+    authors = awardBlock
+      .attr('data-original-title')
+      .split(', ')
+    authors.splice(authors.indexOf('me'),1)
+    awardBlock
+      .closest('.js-emoji-btn')
+      .attr('data-original-title', authors.join(', '))
+    @resetTooltip(awardBlock)
 
-    if !isntNoteBody and $awardsBlock.children('.js-emoji-btn').length is 0
-      # If this is a note body, we just hide the award emoji row like the initial state
-      $awardsBlock.addClass 'hidden'
-
-  removeMeFromUserList: ($emojiBtn, emoji) ->
-    award_block = $emojiBtn
-    authors = award_block
-      .attr("data-original-title")
-      .split(", ")
-    authors.splice(authors.indexOf("me"),1)
-    award_block
-      .closest(".js-emoji-btn")
-      .attr("data-original-title", authors.join(", "))
-    @resetTooltip(award_block)
-
-  addMeToUserList: (emoji) ->
-    award_block = @findEmojiIcon(emoji).parent()
-    origTitle = award_block.attr("data-original-title").trim()
-    users = []
+  addMeToAuthorList: (emoji) ->
+    awardBlock = @findEmojiIcon(emoji).parent()
+    origTitle = awardBlock.attr('data-original-title').trim()
+    authors = []
     if origTitle
-      users = origTitle.split(', ')
-    users.push("me")
-    award_block.attr("title", users.join(", "))
-    @resetTooltip(award_block)
+      authors = origTitle.split(', ')
+    authors.push('me')
+    awardBlock.attr('data-original-title', authors.join(', '))
+    @resetTooltip(awardBlock)
 
   resetTooltip: (award) ->
-    award.tooltip("destroy")
+    award.tooltip('destroy')
 
     # "destroy" call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
     setTimeout (->
@@ -174,84 +131,85 @@ class @AwardsHandler
   createEmoji: (emoji) ->
     emojiCssClass = @resolveNameToCssClass(emoji)
 
-    buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
-      <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
-      <span class='award-control-text js-counter'>1</span>
-    </button>"
+    nodes = []
+    nodes.push(
+      "<button class='btn award-control js-emoji-btn has-tooltip active' data-original-title='me'>",
+      "<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>",
+      "<span class='award-control-text js-counter'>1</span>",
+      "</button>"
+    )
 
-    emoji_node = $(buttonHtml)
-      .insertBefore(".js-awards-block-current .js-award-holder:not(.js-award-action-btn)")
-      .find(".emoji-icon")
-      .data("emoji", emoji)
+    $(nodes.join("\n"))
+      .insertBefore('.js-award-holder')
+      .find('.emoji-icon')
+      .data('emoji', emoji)
     $('.award-control').tooltip()
 
-    $currentBlock = $('.js-awards-block-current')
-    if $currentBlock.is('.hidden')
-      $currentBlock.removeClass 'hidden'
-
   resolveNameToCssClass: (emoji) ->
-    emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
+    emojiIcon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
-    if emoji_icon.length > 0
-      unicodeName = emoji_icon.data("unicode-name")
+    if emojiIcon.length > 0
+      unicodeName = emojiIcon.data('unicode-name')
     else
       # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
+      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name')
 
     "emoji-#{unicodeName}"
 
-  postEmoji: (awardUrl, emoji, callback) ->
-    $.post awardUrl, { name: emoji }, (data) ->
+  postEmoji: (emoji, callback) ->
+    $.post @postEmojiUrl, { note: {
+      note: ":#{emoji}:"
+      noteable_type: @noteableType
+      noteable_id: @noteableId
+    }},(data) ->
       if data.ok
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']")
+    $(".awards > .js-emoji-btn [data-emoji='#{emoji}']")
 
   scrollToAwards: ->
     $('body, html').animate({
       scrollTop: $('.awards').offset().top - 80
     }, 200)
 
-  normalizeEmojiName: (emoji) ->
-    @aliases[emoji] || emoji
-
   addEmojiToFrequentlyUsedList: (emoji) ->
-    frequently_used_emojis = @getFrequentlyUsedEmojis()
-    frequently_used_emojis.push(emoji)
-    $.cookie('frequently_used_emojis', frequently_used_emojis.join(","), { expires: 365 })
+    frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
+    frequentlyUsedEmojis.push(emoji)
+    $.cookie('frequently_used_emojis', frequentlyUsedEmojis.join(','), { expires: 365 })
 
   getFrequentlyUsedEmojis: ->
-    frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
-    _.compact(_.uniq(frequently_used_emojis))
+    frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') || '').split(',')
+    _.compact(_.uniq(frequentlyUsedEmojis))
 
   renderFrequentlyUsedBlock: ->
     if $.cookie('frequently_used_emojis')
-      frequently_used_emojis = @getFrequentlyUsedEmojis()
+      frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
 
-      ul = $("<ul class='clearfix emoji-menu-list'>")
+      ul = $('<ul>')
 
-      for emoji in frequently_used_emojis
-        $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
+      for emoji in frequentlyUsedEmojis
+        do (emoji) ->
+          $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
 
-      $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
+      $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
 
   setupSearch: ->
-    $("input.emoji-search").on 'keyup', (ev) =>
+    $('input.emoji-search').keyup (ev) =>
       term = $(ev.target).val()
 
       # Clean previous search results
-      $("ul.emoji-menu-search, h5.emoji-search").remove()
+      $('ul.emoji-menu-search, h5.emoji-search').remove()
 
       if term
         # Generate a search result block
-        h5 = $("<h5>").text("Search results").addClass("emoji-search")
-        found_emojis = @searchEmojis(term).show()
-        ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
-        $(".emoji-menu-content ul, .emoji-menu-content h5").hide()
-        $(".emoji-menu-content").append(h5).append(ul)
+        h5 = $('<h5>').text('Search results').addClass('emoji-search')
+        foundEmojis = @searchEmojis(term).show()
+        ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis)
+        $('.emoji-menu-content ul, .emoji-menu-content h5').hide()
+        $('.emoji-menu-content').append(h5).append(ul)
       else
-        $(".emoji-menu-content").children().show()
+        $('.emoji-menu-content').children().show()
 
   searchEmojis: (term)->
     $(".emoji-menu-content [data-emoji*='#{term}']").closest("li").clone()
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index e00ca2984b9..f91aa3c5ad7 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -23,7 +23,6 @@ class Dispatcher
         new Issue()
         shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
-        awards_handler = new AwardsHandler()
       when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
         new Milestone()
       when 'dashboard:todos:index'
@@ -54,7 +53,6 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
-        awards_handler = new AwardsHandler()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
deleted file mode 100644
index e005ab3684e..00000000000
--- a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.emoji ?= {}
-
-  w.gl.emoji.emojiAliases = ->
-    JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>')
-
-) window
\ No newline at end of file
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index e8a92b8012d..efb3e8e2198 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -162,13 +162,13 @@ class @Notes
   renderNote: (note) ->
     unless note.valid
       if note.award
-        flash = new Flash('You have already awarded this emoji, it has been removed', 'alert')
+        flash = new Flash('You have already used this award emoji!', 'alert')
         flash.pinTo('.header-content')
       return
 
     if note.award
-      awards_handler.addAwardToEmojiBar(note.name)
-      awards_handler.scrollToAwards()
+      awardsHandler.addAwardToEmojiBar(note.note)
+      awardsHandler.scrollToAwards()
 
     # render note if it not present in loaded list
     # or skip if rendered
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 07d40f40556..37bf38fa65d 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -1,4 +1,6 @@
 .awards {
+  line-height: 34px;
+
   .emoji-icon {
     width: 20px;
     height: 20px;
@@ -7,6 +9,8 @@
 
 .emoji-menu {
   position: absolute;
+  top: 100%;
+  left: 0;
   margin-top: 3px;
   z-index: 1000;
   min-width: 160px;
@@ -19,12 +23,7 @@
   opacity: 0;
   transform: scale(.2);
   transform-origin: 0 -45px;
-  transition: .3s cubic-bezier(.87,-.41,.19,1.44);
-  transition-property: transform, opacity;
-
-  &.is-aligned-right {
-    transform-origin: 100% -45px;
-  }
+  transition: all .3s cubic-bezier(.87,-.41,.19,1.44);
 
   &.is-visible {
     pointer-events: all;
@@ -108,7 +107,7 @@
   }
 
   &.is-loading {
-    .award-control-icon-normal {
+    .award-control-icon {
       display: none;
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 8ad47a50541..624c8249f7e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -63,8 +63,7 @@ ul.notes {
     &.is-editting {
       .note-header,
       .note-text,
-      .edited-text,
-      .note-awards {
+      .edited-text {
         display: none;
       }
 
@@ -74,6 +73,8 @@ ul.notes {
     }
 
     .note-body {
+      overflow: auto;
+
       .note-text {
         overflow: auto;
         word-wrap: break-word;
@@ -323,42 +324,6 @@ ul.notes {
   }
 }
 
-.note-award-control {
-  display: block;
-
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-
-  .award-control-icon-loading {
-    display: none;
-  }
-
-  &.is-loading {
-    .award-control-icon-normal {
-      display: none;
-    }
-
-    .award-control-icon-loading {
-      display: block;
-    }
- }
-}
-
-.note-awards {
-  .awards {
-    padding-top: 10px;
-  }
-
-  .award-control {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    color: #8f8f8f;
-    font-size: 13px;
-  }
-}
-
 .disabled-comment {
   margin-left: -$gl-padding-top;
   margin-right: -$gl-padding-top;

From e2450ccfa49d53c8165847bc10506d8f1e6549b4 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 12 May 2016 00:37:40 +0300
Subject: [PATCH 0298/1431] Move sidebar related code from application.js to
 Sidebar class.

---
 app/assets/javascripts/application.js.coffee  | 32 -----------------
 .../javascripts/right_sidebar.js.coffee       | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index bffce5a0c0f..20126ff14c2 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -246,38 +246,6 @@ $ ->
         if $navIcon.hasClass('fa-angle-left')
           $navIconToggle.trigger('click')
 
-  $(document)
-    .off 'click', '.js-sidebar-toggle'
-    .on 'click', '.js-sidebar-toggle', (e, triggered) ->
-      e.preventDefault()
-      $this = $(this)
-      $thisIcon = $this.find 'i'
-      $allGutterToggleIcons = $('.js-sidebar-toggle i')
-      if $thisIcon.hasClass('fa-angle-double-right')
-        $allGutterToggleIcons
-          .removeClass('fa-angle-double-right')
-          .addClass('fa-angle-double-left')
-        $('aside.right-sidebar')
-          .removeClass('right-sidebar-expanded')
-          .addClass('right-sidebar-collapsed')
-        $('.page-with-sidebar')
-          .removeClass('right-sidebar-expanded')
-          .addClass('right-sidebar-collapsed')
-      else
-        $allGutterToggleIcons
-          .removeClass('fa-angle-double-left')
-          .addClass('fa-angle-double-right')
-        $('aside.right-sidebar')
-          .removeClass('right-sidebar-collapsed')
-          .addClass('right-sidebar-expanded')
-        $('.page-with-sidebar')
-          .removeClass('right-sidebar-collapsed')
-          .addClass('right-sidebar-expanded')
-      if not triggered
-        $.cookie("collapsed_gutter",
-          $('.right-sidebar')
-            .hasClass('right-sidebar-collapsed'), { path: '/' })
-
   fitSidebarForSize = ->
     oldBootstrapBreakpoint = bootstrapBreakpoint
     bootstrapBreakpoint = bp.getBreakpointSize()
diff --git a/app/assets/javascripts/right_sidebar.js.coffee b/app/assets/javascripts/right_sidebar.js.coffee
index 8c4f1142713..c9cb0f4bb32 100644
--- a/app/assets/javascripts/right_sidebar.js.coffee
+++ b/app/assets/javascripts/right_sidebar.js.coffee
@@ -10,6 +10,40 @@ class @Sidebar
     $('.dropdown').on('loading.gl.dropdown', @sidebarDropdownLoading)
     $('.dropdown').on('loaded.gl.dropdown', @sidebarDropdownLoaded)
 
+
+    $(document)
+      .off 'click', '.js-sidebar-toggle'
+      .on 'click', '.js-sidebar-toggle', (e, triggered) ->
+        e.preventDefault()
+        $this = $(this)
+        $thisIcon = $this.find 'i'
+        $allGutterToggleIcons = $('.js-sidebar-toggle i')
+        if $thisIcon.hasClass('fa-angle-double-right')
+          $allGutterToggleIcons
+            .removeClass('fa-angle-double-right')
+            .addClass('fa-angle-double-left')
+          $('aside.right-sidebar')
+            .removeClass('right-sidebar-expanded')
+            .addClass('right-sidebar-collapsed')
+          $('.page-with-sidebar')
+            .removeClass('right-sidebar-expanded')
+            .addClass('right-sidebar-collapsed')
+        else
+          $allGutterToggleIcons
+            .removeClass('fa-angle-double-left')
+            .addClass('fa-angle-double-right')
+          $('aside.right-sidebar')
+            .removeClass('right-sidebar-collapsed')
+            .addClass('right-sidebar-expanded')
+          $('.page-with-sidebar')
+            .removeClass('right-sidebar-collapsed')
+            .addClass('right-sidebar-expanded')
+        if not triggered
+          $.cookie("collapsed_gutter",
+            $('.right-sidebar')
+              .hasClass('right-sidebar-collapsed'), { path: '/' })
+
+
   sidebarDropdownLoading: (e) ->
     $sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
     img = $sidebarCollapsedIcon.find('img')

From b99471ca5de6e867c44ea21bf85252cd174ccec7 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 12 May 2016 00:38:01 +0300
Subject: [PATCH 0299/1431] Added specs for right sidebar.

---
 .../fixtures/right_sidebar.html.haml          | 13 ++++
 spec/javascripts/right_sidebar_spec.js.coffee | 69 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 spec/javascripts/fixtures/right_sidebar.html.haml
 create mode 100644 spec/javascripts/right_sidebar_spec.js.coffee

diff --git a/spec/javascripts/fixtures/right_sidebar.html.haml b/spec/javascripts/fixtures/right_sidebar.html.haml
new file mode 100644
index 00000000000..95efaff4b69
--- /dev/null
+++ b/spec/javascripts/fixtures/right_sidebar.html.haml
@@ -0,0 +1,13 @@
+%div
+  %div.page-gutter.page-with-sidebar
+
+  %aside.right-sidebar
+    %div.block.issuable-sidebar-header
+      %a.gutter-toggle.pull-right.js-sidebar-toggle
+        %i.fa.fa-angle-double-left
+
+    %form.issuable-context-form
+      %div.block.labels
+        %div.sidebar-collapsed-icon
+          %i.fa.fa-tags
+          %span 1
diff --git a/spec/javascripts/right_sidebar_spec.js.coffee b/spec/javascripts/right_sidebar_spec.js.coffee
new file mode 100644
index 00000000000..2075cacdb67
--- /dev/null
+++ b/spec/javascripts/right_sidebar_spec.js.coffee
@@ -0,0 +1,69 @@
+#= require right_sidebar
+#= require jquery
+#= require jquery.cookie
+
+@sidebar    = null
+$aside      = null
+$toggle     = null
+$icon       = null
+$page       = null
+$labelsIcon = null
+
+
+assertSidebarState = (state) ->
+
+  shouldBeExpanded  = state is 'expanded'
+  shouldBeCollapsed = state is 'collapsed'
+
+  expect($aside.hasClass('right-sidebar-expanded')).toBe shouldBeExpanded
+  expect($page.hasClass('right-sidebar-expanded')).toBe shouldBeExpanded
+  expect($icon.hasClass('fa-angle-double-right')).toBe shouldBeExpanded
+
+  expect($aside.hasClass('right-sidebar-collapsed')).toBe shouldBeCollapsed
+  expect($page.hasClass('right-sidebar-collapsed')).toBe shouldBeCollapsed
+  expect($icon.hasClass('fa-angle-double-left')).toBe shouldBeCollapsed
+
+
+describe 'RightSidebar', ->
+
+  fixture.preload 'right_sidebar.html'
+
+  beforeEach ->
+    fixture.load 'right_sidebar.html'
+
+    @sidebar    = new Sidebar
+    $aside      = $ '.right-sidebar'
+    $page       = $ '.page-with-sidebar'
+    $icon       = $aside.find 'i'
+    $toggle     = $aside.find '.js-sidebar-toggle'
+    $labelsIcon = $aside.find '.sidebar-collapsed-icon'
+
+
+  it 'should expand the sidebar when arrow is clicked', ->
+
+    $toggle.click()
+    assertSidebarState 'expanded'
+
+
+  it 'should collapse the sidebar when arrow is clicked', ->
+
+    $toggle.click()
+    assertSidebarState 'expanded'
+
+    $toggle.click()
+    assertSidebarState 'collapsed'
+
+
+  it 'should float over the page and when sidebar icons clicked', ->
+
+    $labelsIcon.click()
+    assertSidebarState 'expanded'
+
+
+  it 'should collapse when the icon arrow clicked while it is floating on page', ->
+
+    $labelsIcon.click()
+    assertSidebarState 'expanded'
+
+    $toggle.click()
+    assertSidebarState 'collapsed'

From c8f23bd2edc19f968446b149120df1f7798eb4b1 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 11 May 2016 17:27:08 -0700
Subject: [PATCH 0300/1431] Support token header for health check token, and
 general cleanup of the health_check feature.

---
 app/controllers/health_check_controller.rb    | 15 ++++++--
 app/views/admin/health_check/show.html.haml   | 36 +++++++++++--------
 config/initializers/health_check.rb           |  2 +-
 config/routes.rb                              |  2 +-
 .../health_check_controller_spec.rb           | 15 ++++++++
 5 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/app/controllers/health_check_controller.rb b/app/controllers/health_check_controller.rb
index b974489836f..037da7d2bce 100644
--- a/app/controllers/health_check_controller.rb
+++ b/app/controllers/health_check_controller.rb
@@ -1,13 +1,22 @@
 class HealthCheckController < HealthCheck::HealthCheckController
   before_action :validate_health_check_access!
 
-  protected
+  private
 
   def validate_health_check_access!
-    return render_404 unless params[:token].presence && params[:token] == current_application_settings.health_check_access_token
+    render_404 unless token_valid?
+  end
+
+  def token_valid?
+    token = params[:token].presence || request.headers['TOKEN']
+    token.present? &&
+      ActiveSupport::SecurityUtils.variable_size_secure_compare(
+        token,
+        current_application_settings.health_check_access_token
+      )
   end
 
   def render_404
-    render file: Rails.root.join("public", "404"), layout: false, status: "404"
+    render file: Rails.root.join('public', '404'), layout: false, status: '404'
   end
 end
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
index 23a931995ab..ed7025f7a0b 100644
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -2,29 +2,35 @@
 
 %h3.page-title
   Health Check
-%p.light
+.bs-callout.clearfix
+  .pull-left
+    %p
   Access token is
-  %code{ id:'health-check-token' }= "#{current_application_settings.health_check_access_token}"
+  %code#health-check-token= current_application_settings.health_check_access_token
+  = button_to reset_health_check_token_admin_application_settings_path,
+    method: :put, class: 'btn btn-default',
+    data: { confirm: 'Are you sure you want to reset the health check token?' } do
+    = icon('refresh')
+    Reset health check access token
 %p.light
   Health information can be reteived as plain text, json, or xml using:
   %ul
     %li
-      %code= "/health_check?token=#{current_application_settings.health_check_access_token}"
+      %code= health_check_url(token:current_application_settings.health_check_access_token)
     %li
-      %code= "/health_check.json?token=#{current_application_settings.health_check_access_token}"
+      %code= health_check_url(token:current_application_settings.health_check_access_token, format: :json)
     %li
-      %code= "/health_check.xml?token=#{current_application_settings.health_check_access_token}"
+      %code= health_check_url(token:current_application_settings.health_check_access_token, format: :xml)
 
-.bs-callout.clearfix
-  .pull-left
-    %p
-      You can reset the health check access token by pressing the button below.
-    %p
-      = button_to reset_health_check_token_admin_application_settings_path,
-        method: :put, class: 'btn btn-default',
-        data: { confirm: 'Are you sure you want to reset the health check token?' } do
-        = icon('refresh')
-        Reset health check access token
+%p.light
+  You can also ask for the status of specific services:
+  %ul
+    %li
+      %code= health_check_url(token:current_application_settings.health_check_access_token, checks: :cache)
+    %li
+      %code= health_check_url(token:current_application_settings.health_check_access_token, checks: :database)
+    %li
+      %code= health_check_url(token:current_application_settings.health_check_access_token, checks: :migrations)
 
 %hr
 .panel.panel-default
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb
index a93e4273030..79e2d23ab2e 100644
--- a/config/initializers/health_check.rb
+++ b/config/initializers/health_check.rb
@@ -1,3 +1,3 @@
 HealthCheck.setup do |config|
-  config.standard_checks = [ 'database', 'migrations', 'cache' ]
+  config.standard_checks = ['database', 'migrations', 'cache']
 end
diff --git a/config/routes.rb b/config/routes.rb
index c81bf294a53..f794a881f71 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,7 +74,7 @@ Rails.application.routes.draw do
   end
 
   # Health check
-  get 'health_check(/:checks)(.:format)'  => 'health_check#index'
+  get 'health_check(/:checks)'  => 'health_check#index', as: :health_check
 
   # Enable Grack support
   mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post, :put]
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb
index 3b9cc5c98f5..0d8a68bb51a 100644
--- a/spec/controllers/health_check_controller_spec.rb
+++ b/spec/controllers/health_check_controller_spec.rb
@@ -14,6 +14,13 @@ describe HealthCheckController do
     end
 
     context 'when services are up and an access token is provided' do
+      it 'supports passing the token in the header' do
+        request.headers['TOKEN'] = token
+        get :index
+        expect(response).to be_success
+        expect(response.content_type).to eq 'text/plain'
+      end
+
       it 'supports successful plaintest response' do
         get :index, token: token
         expect(response).to be_success
@@ -55,6 +62,14 @@ describe HealthCheckController do
         allow(HealthCheck::Utils).to receive(:process_checks).with('email').and_return('Email is on fire')
       end
 
+      it 'supports passing the token in the header' do
+        request.headers['TOKEN'] = token
+        get :index
+        expect(response.status).to eq(500)
+        expect(response.content_type).to eq 'text/plain'
+        expect(response.body).to include('The server is on fire')
+      end
+
       it 'supports failure plaintest response' do
         get :index, token: token
         expect(response.status).to eq(500)

From a59ad3936a0bdbfd64d9c54af631a272317fe680 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Thu, 5 May 2016 15:38:01 +0530
Subject: [PATCH 0301/1431] Add a spec for `WikiLinkFilter`

- And fix behavior for non-file hierarchical links.
---
 lib/banzai/filter/wiki_link_filter.rb         | 11 ++-
 .../banzai/filter/wiki_link_filter_spec.rb    | 77 +++++++++++++++++++
 2 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 spec/lib/banzai/filter/wiki_link_filter_spec.rb

diff --git a/lib/banzai/filter/wiki_link_filter.rb b/lib/banzai/filter/wiki_link_filter.rb
index 06d10c98501..7dc771afd71 100644
--- a/lib/banzai/filter/wiki_link_filter.rb
+++ b/lib/banzai/filter/wiki_link_filter.rb
@@ -25,7 +25,7 @@ module Banzai
       end
 
       def process_link_attr(html_attr)
-        return if html_attr.blank? || file_reference?(html_attr)
+        return if html_attr.blank? || file_reference?(html_attr) || hierarchical_link?(html_attr)
 
         uri = URI(html_attr.value)
         if uri.relative? && uri.path.present?
@@ -40,12 +40,17 @@ module Banzai
         uri
       end
 
+      def project_wiki
+        context[:project_wiki]
+      end
+
       def file_reference?(html_attr)
         !File.extname(html_attr.value).blank?
       end
 
-      def project_wiki
-        context[:project_wiki]
+      # Of the form `./link`, `../link`, or similar
+      def hierarchical_link?(html_attr)
+        html_attr.value[0] == '.'
       end
 
       def project_wiki_base_path
diff --git a/spec/lib/banzai/filter/wiki_link_filter_spec.rb b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
new file mode 100644
index 00000000000..56b1a267390
--- /dev/null
+++ b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Banzai::Filter::WikiLinkFilter, lib: true do
+  include FilterSpecHelper
+
+  let(:namespace) { build(:namespace, name: "wiki_link_ns") }
+  let(:project)   { build(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
+  let(:user) { double }
+  let(:project_wiki) { ProjectWiki.new(project, user) }
+
+  describe "links within the wiki (relative)" do
+    describe "hierarchical links to the current directory" do
+      it "doesn't rewrite non-file links" do
+        link = "<a href='./page'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('./page')
+      end
+
+      it "doesn't rewrite file links" do
+        link = "<a href='./page.md'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('./page.md')
+      end
+    end
+
+    describe "hierarchical links to the parent directory" do
+      it "doesn't rewrite non-file links" do
+        link = "<a href='../page'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('../page')
+      end
+
+      it "doesn't rewrite file links" do
+        link = "<a href='../page.md'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('../page.md')
+      end
+    end
+
+    describe "hierarchical links to a sub-directory" do
+      it "doesn't rewrite non-file links" do
+        link = "<a href='./subdirectory/page'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('./subdirectory/page')
+      end
+
+      it "doesn't rewrite file links" do
+        link = "<a href='./subdirectory/page.md'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('./subdirectory/page.md')
+      end
+    end
+
+    describe "non-hierarchical links" do
+      it 'rewrites non-file links to be at the scope of the wiki root' do
+        link = "<a href='page'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
+        expect(filtered_link.attribute('href').value).to match('/wiki_link_ns/wiki_link_project/wikis/page')
+      end
+
+      it "doesn't rewrite file links" do
+        link = "<a href='page.md'>Link to Page</a>"
+        filtered_link = filter(link, project_wiki: project_wiki).children[0]
+        expect(filtered_link.attribute('href').value).to eq('page.md')
+      end
+    end
+  end
+
+  describe "links outside the wiki (absolute)" do
+    it "doesn't rewrite links" do
+      link = "<a href='http://example.com/page'>Link to Page</a>"
+      filtered_link = filter(link, project_wiki: project_wiki).children[0]
+      expect(filtered_link.attribute('href').value).to eq('http://example.com/page')
+    end
+  end
+end

From a4ee7d25e398f9d2e2311703fbbcf5f6b9bdf728 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 9 May 2016 16:04:05 +0530
Subject: [PATCH 0302/1431] Implement @rymai's feedback after review.

- Separate 'exercise' and 'verify' steps of tests.
- Use `build_stubbed` instead of `build`
---
 spec/lib/banzai/filter/wiki_link_filter_spec.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/spec/lib/banzai/filter/wiki_link_filter_spec.rb b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
index 56b1a267390..185abbb2108 100644
--- a/spec/lib/banzai/filter/wiki_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Banzai::Filter::WikiLinkFilter, lib: true do
   include FilterSpecHelper
 
-  let(:namespace) { build(:namespace, name: "wiki_link_ns") }
-  let(:project)   { build(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
+  let(:namespace) { build_stubbed(:namespace, name: "wiki_link_ns") }
+  let(:project)   { build_stubbed(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
   let(:user) { double }
   let(:project_wiki) { ProjectWiki.new(project, user) }
 
@@ -13,12 +13,14 @@ describe Banzai::Filter::WikiLinkFilter, lib: true do
       it "doesn't rewrite non-file links" do
         link = "<a href='./page'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('./page')
       end
 
       it "doesn't rewrite file links" do
         link = "<a href='./page.md'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('./page.md')
       end
     end
@@ -27,12 +29,14 @@ describe Banzai::Filter::WikiLinkFilter, lib: true do
       it "doesn't rewrite non-file links" do
         link = "<a href='../page'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('../page')
       end
 
       it "doesn't rewrite file links" do
         link = "<a href='../page.md'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('../page.md')
       end
     end
@@ -41,12 +45,14 @@ describe Banzai::Filter::WikiLinkFilter, lib: true do
       it "doesn't rewrite non-file links" do
         link = "<a href='./subdirectory/page'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('./subdirectory/page')
       end
 
       it "doesn't rewrite file links" do
         link = "<a href='./subdirectory/page.md'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('./subdirectory/page.md')
       end
     end
@@ -62,6 +68,7 @@ describe Banzai::Filter::WikiLinkFilter, lib: true do
       it "doesn't rewrite file links" do
         link = "<a href='page.md'>Link to Page</a>"
         filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
         expect(filtered_link.attribute('href').value).to eq('page.md')
       end
     end
@@ -71,6 +78,7 @@ describe Banzai::Filter::WikiLinkFilter, lib: true do
     it "doesn't rewrite links" do
       link = "<a href='http://example.com/page'>Link to Page</a>"
       filtered_link = filter(link, project_wiki: project_wiki).children[0]
+
       expect(filtered_link.attribute('href').value).to eq('http://example.com/page')
     end
   end

From 555610b619b552ca058a7656f373743db4d34765 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 10 May 2016 09:04:14 +0530
Subject: [PATCH 0303/1431] Add CHANGELOG entry.

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d5ab79602f2..187011c6016 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -44,6 +44,9 @@ v 8.8.0 (unreleased)
   - Fix adding a todo for private group members (Ahmad Sherif)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
 
+v 8.7.5
+  - Fix relative links in wiki pages. !4050
+
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
   - Fix setting trusted proxies !3970

From 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Thu, 12 May 2016 09:23:21 +0200
Subject: [PATCH 0304/1431] Fix tests and wrong choices during merge

---
 app/models/concerns/issuable.rb               |  8 +++++
 app/models/note.rb                            |  2 +-
 app/services/notes/create_service.rb          |  2 +-
 .../projects/issues_controller_spec.rb        |  6 ++--
 spec/models/concerns/issuable_spec.rb         | 30 +++++++++++++++++++
 spec/services/notes/create_service_spec.rb    | 12 ++++++++
 .../toggle_award_emoji_service_spec.rb        | 10 ++-----
 7 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 9b77b88ca80..83d3bfe8e17 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -100,6 +100,14 @@ module Issuable
         order_by(method)
       end
     end
+
+    def with_label(title)
+      if title.is_a?(Array) && title.size > 1
+        joins(:labels).where(labels: { title: title }).group(arel_table[:id]).having("COUNT(DISTINCT labels.title) = #{title.size}")
+      else
+        joins(:labels).where(labels: { title: title })
+      end
+    end
   end
 
   def today?
diff --git a/app/models/note.rb b/app/models/note.rb
index f9040f9f364..7235274770d 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -343,6 +343,6 @@ class Note < ActiveRecord::Base
 
   def award_emoji_name
     original_name = note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
-    Gitlab::AwardEmoji.normilize_emoji_name(original_name)
+    Gitlab::AwardEmoji.normalize_emoji_name(original_name)
   end
 end
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index bbf7889166d..509deb898b1 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -7,7 +7,7 @@ module Notes
 
       if note.award_emoji?
         return ToggleAwardEmojiService.new(project, current_user, params).
-                                        execute(note.award_emoji_name, note.note)
+                                        execute(note.noteable, note.award_emoji_name)
       end
 
       return unless valid_project?(note)
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 706f538f262..13d9a498789 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -258,8 +258,10 @@ describe Projects::IssuesController do
     end
 
     it "toggles the award emoji" do
-      expect { post(:toggle_award_emoji, namespace_id: project.namespace.path,
-                                project_id: project.path, id: issue.iid, name: "thumbsup") }.to change { AwardEmoji.count }.by(1)
+      expect do 
+        post(:toggle_award_emoji, namespace_id: project.namespace.path,
+                                  project_id: project.path, id: issue.iid, name: "thumbsup") 
+      end.to change { AwardEmoji.count }.by(1)
 
       expect(response.status).to eq(200)
     end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index ebc3968023d..424b6f5e27f 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -214,4 +214,34 @@ describe Issue, "Issuable" do
       expect(issue.downvotes).to eq(1)
     end
   end
+
+  describe ".with_label" do
+    let(:project) { create(:project, :public) }
+    let(:bug) { create(:label, project: project, title: 'bug') }
+    let(:feature) { create(:label, project: project, title: 'feature') }
+    let(:enhancement) { create(:label, project: project, title: 'enhancement') }
+    let(:issue1) { create(:issue, title: "Bugfix1", project: project) }
+    let(:issue2) { create(:issue, title: "Bugfix2", project: project) }
+    let(:issue3) { create(:issue, title: "Feature1", project: project) }
+
+    before(:each) do
+      issue1.labels << bug
+      issue1.labels << feature
+      issue2.labels << bug
+      issue2.labels << enhancement
+      issue3.labels << feature
+    end
+
+    it 'finds the correct issue containing just enhancement label' do
+      expect(Issue.with_label(enhancement.title)).to match_array([issue2])
+    end
+
+    it 'finds the correct issues containing the same label' do
+      expect(Issue.with_label(bug.title)).to match_array([issue1, issue2])
+    end
+
+    it 'finds the correct issues containing only both labels' do
+      expect(Issue.with_label([bug.title, enhancement.title])).to match_array([issue2])
+    end
+  end
 end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 93e8a7094e2..4e62e3975ea 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -51,5 +51,17 @@ describe Notes::CreateService, services: true do
       expect(note).to be_valid
       expect(note.note).to eq(opts[:note])
     end
+
+    it "normalizes the emoji name" do
+      opts = {
+        note: ':+1:',
+        noteable_type: 'Issue',
+        noteable_id: issue.id
+      }
+
+      expect_any_instance_of(ToggleAwardEmojiService).to receive(:execute).with(issue, "thumbsup")
+
+      Notes::CreateService.new(project, user, opts).execute
+    end
   end
 end
diff --git a/spec/services/toggle_award_emoji_service_spec.rb b/spec/services/toggle_award_emoji_service_spec.rb
index 3d2f497fdec..b9d63bd70a7 100644
--- a/spec/services/toggle_award_emoji_service_spec.rb
+++ b/spec/services/toggle_award_emoji_service_spec.rb
@@ -16,23 +16,17 @@ describe ToggleAwardEmoji, services: true do
       ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsdown")
     end
 
-    it 'normalizes the emoji name' do
-      expect(issue).to receive(:toggle_award_emoji).with("thumbsup", user)
-
-      ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:")
-    end
-
     context 'when the emoji is set' do
       it 'removes the emoji' do
         create(:award_emoji, awardable: issue, user: user)
 
-        expect { ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:") }.to change { AwardEmoji.count }.by(-1)
+        expect { ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsup") }.to change { AwardEmoji.count }.by(-1)
       end
     end
 
     context 'when the award is not set yet' do
       it 'awards the emoji' do
-        expect { ToggleAwardEmojiService.new(project, user).execute(issue, ":+1:") }.to change { AwardEmoji.count }.by(1)
+        expect { ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsup") }.to change { AwardEmoji.count }.by(1)
       end
     end
   end

From ef7f793dc4f0425e1fd5e358c162f2b08a160142 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 10:12:29 +0200
Subject: [PATCH 0305/1431] fix silly typo

---
 app/services/projects/create_service.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 1693ae609cf..c61a515a6b9 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -56,6 +56,8 @@ module Projects
 
       after_create_actions if @project.persisted?
 
+      @project.add_import_job if @project.import?
+
       @project
     rescue => e
       message = "Unable to save project: #{e.message}"

From 7db3fb5a0b6c07b65c61c920e18f056f6c127932 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:05:34 +0300
Subject: [PATCH 0306/1431] disabled_oauth_sign_in_sources column

---
 ...disabled_oauth_sign_in_sources_to_application_settings.rb | 5 +++++
 db/schema.rb                                                 | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb

diff --git a/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb b/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb
new file mode 100644
index 00000000000..facd33875ba
--- /dev/null
+++ b/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb
@@ -0,0 +1,5 @@
+class AddDisabledOauthSignInSourcesToApplicationSettings < ActiveRecord::Migration
+  def change
+    add_column :application_settings, :disabled_oauth_sign_in_sources, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 71d953afe30..74facd12088 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -80,6 +80,7 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.boolean  "repository_checks_enabled",         default: false
     t.text     "shared_runners_text"
     t.integer  "metrics_packet_size",               default: 1
+    t.text     "disabled_oauth_sign_in_sources"
   end
 
   create_table "audit_events", force: :cascade do |t|

From ca288587256b8995105b601ef02850f388d59ff9 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:06:18 +0300
Subject: [PATCH 0307/1431] serialize the disabled_oauth_sign_in_sources

---
 app/models/application_setting.rb | 50 +++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 7039db2d41e..39f74b2082e 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -1,3 +1,52 @@
+# == Schema Information
+#
+# Table name: application_settings
+#
+#  id                                :integer          not null, primary key
+#  default_projects_limit            :integer
+#  signup_enabled                    :boolean
+#  signin_enabled                    :boolean
+#  gravatar_enabled                  :boolean
+#  sign_in_text                      :text
+#  created_at                        :datetime
+#  updated_at                        :datetime
+#  home_page_url                     :string(255)
+#  default_branch_protection         :integer          default(2)
+#  restricted_visibility_levels      :text
+#  version_check_enabled             :boolean          default(TRUE)
+#  max_attachment_size               :integer          default(10), not null
+#  default_project_visibility        :integer
+#  default_snippet_visibility        :integer
+#  default_group_visibility          :integer
+#  restricted_signup_domains         :text
+#  user_oauth_applications           :boolean          default(TRUE)
+#  after_sign_out_path               :string(255)
+#  session_expire_delay              :integer          default(10080), not null
+#  import_sources                    :text
+#  disabled_oauth_sign_in_sources    :text
+#  help_page_text                    :text
+#  admin_notification_email          :string(255)
+#  shared_runners_enabled            :boolean          default(TRUE), not null
+#  max_artifacts_size                :integer          default(100), not null
+#  runners_registration_token        :string
+#  require_two_factor_authentication :boolean          default(FALSE)
+#  two_factor_grace_period           :integer          default(48)
+#  metrics_enabled                   :boolean          default(FALSE)
+#  metrics_host                      :string           default("localhost")
+#  metrics_username                  :string
+#  metrics_password                  :string
+#  metrics_pool_size                 :integer          default(16)
+#  metrics_timeout                   :integer          default(10)
+#  metrics_method_call_threshold     :integer          default(10)
+#  recaptcha_enabled                 :boolean          default(FALSE)
+#  recaptcha_site_key                :string
+#  recaptcha_private_key             :string
+#  metrics_port                      :integer          default(8089)
+#  sentry_enabled                    :boolean          default(FALSE)
+#  sentry_dsn                        :string
+#  email_author_in_body              :boolean          default(FALSE)
+#
+
 class ApplicationSetting < ActiveRecord::Base
   include TokenAuthenticatable
   add_authentication_token_field :runners_registration_token
@@ -6,6 +55,7 @@ class ApplicationSetting < ActiveRecord::Base
 
   serialize :restricted_visibility_levels
   serialize :import_sources
+  serialize :disabled_oauth_sign_in_sources
   serialize :restricted_signup_domains, Array
   attr_accessor :restricted_signup_domains_raw
 

From e5ddd6d21eb6125605d3f47ea5db884b54514796 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:08:06 +0300
Subject: [PATCH 0308/1431] disabled_oauth_sign_in_sources parameter handling
 in ApplicationSettingsController

---
 .../admin/application_settings_controller.rb         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index ec22548ddeb..cebc01a2afc 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -53,6 +53,15 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       end
     end
 
+    disabled_oauth_sign_in_sources = params[:application_setting][:disabled_oauth_sign_in_sources]
+    if disabled_oauth_sign_in_sources.nil?
+      params[:application_setting][:disabled_oauth_sign_in_sources] = []
+    else
+      disabled_oauth_sign_in_sources.map! do |source|
+        source.to_str
+      end
+    end
+
     params.require(:application_setting).permit(
       :default_projects_limit,
       :default_branch_protection,
@@ -95,7 +104,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :repository_checks_enabled,
       :metrics_packet_size,
       restricted_visibility_levels: [],
-      import_sources: []
+      import_sources: [],
+      disabled_oauth_sign_in_sources: []
     )
   end
 end

From d8085d8e128e4ef50443f7a58bfbe7bf21565ab0 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:32:33 +0300
Subject: [PATCH 0309/1431] default value for disabled_oauth_sign_in_sources in
 create_from_defaults @ ApplicationSetting

---
 app/models/application_setting.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 39f74b2082e..a48deccb029 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -157,6 +157,7 @@ class ApplicationSetting < ActiveRecord::Base
       recaptcha_enabled: false,
       akismet_enabled: false,
       repository_checks_enabled: true,
+      disabled_oauth_sign_in_sources: []
     )
   end
 

From cf300443147f1a9ba3acf83ce839afdffa5173bd Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:33:33 +0300
Subject: [PATCH 0310/1431] OAuth Providers disable from the
 ApplicationSettings page

---
 app/helpers/application_settings_helper.rb        | 15 +++++++++++++++
 .../admin/application_settings/_form.html.haml    | 10 ++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 914b0ef6042..17d73899878 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -60,4 +60,19 @@ module ApplicationSettingsHelper
       end
     end
   end
+
+  def oauth_providers_checkboxes(help_block_id)
+    button_based_providers.map do |source|
+      checked = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s)
+      css_class = 'btn'
+      css_class += ' active' if checked
+      checkbox_name = 'application_setting[disabled_oauth_sign_in_sources][]'
+
+      label_tag(checkbox_name, class: css_class) do
+        check_box_tag(checkbox_name, source, checked,
+                      autocomplete: 'off',
+                      'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source)
+      end
+    end
+  end
 end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index e0d8d16a954..057b237c066 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -109,6 +109,16 @@
           = f.label :signin_enabled do
             = f.check_box :signin_enabled
             Sign-in enabled
+    .form-group
+      = f.label :disable_oauth_signin_sources, class: 'control-label col-sm-2'
+      .col-sm-10
+        - data_attrs = { toggle: 'buttons' }
+        .btn-group{ data: data_attrs }
+          - oauth_providers_checkboxes('oauth-providers-help').each do |source|
+            = source
+        %span.help-block#oauth-providers-help
+          Enabled OmniAuth must be configured for GitHub
+          = link_to "(?)", help_page_path("integration", "github")
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
       .col-sm-10

From 8d26836e945f3e66a46370905b9fb34244a0ff91 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:35:03 +0300
Subject: [PATCH 0311/1431] method to get the enabled_button_based_providers

---
 app/helpers/auth_helper.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index b4f80fd9b3e..24eb813d0ba 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -38,6 +38,12 @@ module AuthHelper
     auth_providers.reject { |provider| form_based_provider?(provider) }
   end
 
+  def enabled_button_based_providers
+    disabled_providers = current_application_settings.disabled_oauth_sign_in_sources || []
+
+    button_based_providers.map(&:to_s) - disabled_providers
+  end
+
   def provider_image_tag(provider, size = 64)
     label = label_for_provider(provider)
 

From d943e5f691ad9c59e349eab95f1a21bd0f85ab1b Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:36:15 +0300
Subject: [PATCH 0312/1431] method to check if oauth button based providers are
 enabled

---
 app/helpers/auth_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index 24eb813d0ba..3e1f4209254 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -44,6 +44,10 @@ module AuthHelper
     button_based_providers.map(&:to_s) - disabled_providers
   end
 
+  def button_based_providers_enabled?
+    !enabled_button_based_providers.empty?
+  end
+
   def provider_image_tag(provider, size = 64)
     label = label_for_provider(provider)
 

From 284eccb5e68c863ea8e1001a24af33dd0da5e201 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:36:57 +0300
Subject: [PATCH 0313/1431] render the omniauth_box if there are any
 button_based_providers

---
 app/views/devise/sessions/new.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index d65fa60025c..28194506acc 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -4,7 +4,7 @@
     = render 'devise/shared/signin_box'
 
   -# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
-  - if omniauth_enabled? && devise_mapping.omniauthable?
+  - if omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled?
     .clearfix.prepend-top-20
       = render 'devise/shared/omniauth_box'
 

From 28da3a88de339a95d49e171da87494f65219cb21 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 13:37:18 +0300
Subject: [PATCH 0314/1431] show only the eanbled oauth providers

---
 app/views/devise/shared/_omniauth_box.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml
index ecf680e7b23..de18bc2d844 100644
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -1,7 +1,7 @@
 %p
   %span.light
     Sign in with &nbsp;
-  - providers = button_based_providers
+  - providers = enabled_button_based_providers
   - providers.each do |provider|
     %span.light
       - has_icon = provider_has_icon?(provider)

From 7c7c5b7e40ff4fed64a9f62beed027064c292eaf Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 15:22:24 +0300
Subject: [PATCH 0315/1431] text for the disable_oauth_signin_sources label

---
 app/views/admin/application_settings/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 057b237c066..729c2ff563d 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -110,7 +110,7 @@
             = f.check_box :signin_enabled
             Sign-in enabled
     .form-group
-      = f.label :disable_oauth_signin_sources, class: 'control-label col-sm-2'
+      = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
       .col-sm-10
         - data_attrs = { toggle: 'buttons' }
         .btn-group{ data: data_attrs }

From 47ee5125e881694b7713f187b48589a2f4bbd747 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 15:57:00 +0300
Subject: [PATCH 0316/1431] validate disabled_oauth_sign_in_sources in
 ApplicationSe

---
 app/models/application_setting.rb       | 10 ++++++++++
 spec/models/application_setting_spec.rb |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index a48deccb029..d565dbc71d0 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -119,6 +119,16 @@ class ApplicationSetting < ActiveRecord::Base
     end
   end
 
+  validates_each :disabled_oauth_sign_in_sources do |record, attr, value|
+    unless value.nil?
+      value.each do |source|
+        unless Devise.omniauth_providers.include?(source.to_sym)
+          record.errors.add(attr, "'#{source}' is not an ouath sign-in source")
+        end
+      end
+    end
+  end
+
   before_save :ensure_runners_registration_token
 
   after_commit do
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 1ce22feed5c..fb3ea491df7 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -20,6 +20,9 @@ describe ApplicationSetting, models: true do
     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 allow_value([:github]).for(:disabled_oauth_sign_in_sources) }
+    it { is_expected.not_to allow_value([:test]).for(:disabled_oauth_sign_in_sources) }
+
     it { is_expected.to validate_presence_of(:max_attachment_size) }
 
     it do

From 8c2b72b1c80e8bbd082ac8e1aedb21a1aad07235 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 17:04:54 +0300
Subject: [PATCH 0317/1431] tests for enabled_button_based_providers helper
 method of AuthHelper

---
 spec/helpers/auth_helper_spec.rb | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index e47a54fdac5..5d66c92d26e 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -2,7 +2,9 @@ require "spec_helper"
 
 describe AuthHelper do
   describe "button_based_providers" do
-    it 'returns all enabled providers' do
+    let(:settings) { ApplicationSetting.create_from_defaults }
+
+    it 'returns all enabled providers from devise' do
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
       expect(helper.button_based_providers).to include(*[:twitter, :github])
     end
@@ -16,5 +18,23 @@ describe AuthHelper do
       allow(helper).to receive(:auth_providers) { [] }
       expect(helper.button_based_providers).to eq([])
     end
+
+    it 'returns all the enabled providers from settings' do
+      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
+      expect(helper.enabled_button_based_providers).to include(*['twitter', 'github'])
+    end
+
+    it 'should not return github as provider because it\'s disabled from settings' do
+      settings.update_attribute(
+        :disabled_oauth_sign_in_sources,
+        ['github']
+      )
+
+      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
+      allow(helper).to receive(:current_application_settings) {  settings }
+
+      expect(helper.enabled_button_based_providers).to include('twitter')
+      expect(helper.enabled_button_based_providers).to_not include('github')
+    end
   end
 end

From 6f69f6a1ab70bd2252803a64927d0c8df1d03612 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 4 May 2016 17:06:07 +0300
Subject: [PATCH 0318/1431] tests for button_based_providers_enabled? helper
 method of AuthHelper

---
 spec/helpers/auth_helper_spec.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index 5d66c92d26e..a6a366bc19a 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -36,5 +36,23 @@ describe AuthHelper do
       expect(helper.enabled_button_based_providers).to include('twitter')
       expect(helper.enabled_button_based_providers).to_not include('github')
     end
+
+    it 'returns true for button_based_providers_enabled? because there providers' do
+      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
+
+      expect(helper.button_based_providers_enabled?).to be true
+    end
+
+    it 'returns false for button_based_providers_enabled? because there providers' do
+      settings.update_attribute(
+        :disabled_oauth_sign_in_sources,
+        ['github', 'twitter']
+      )
+
+      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
+      allow(helper).to receive(:current_application_settings) {  settings }
+
+      expect(helper.button_based_providers_enabled?).to be false
+    end
   end
 end

From deca3da1a7f4e59c97c27bedf7aa26185a4d883b Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Thu, 5 May 2016 10:34:51 +0300
Subject: [PATCH 0319/1431] stub Devise.omniauth_providers to return GitHub
 even if the gitlab.yml has no omniauth provider enabled This will fix failing
 tests in case gitlab.yml file has no omniauth providers enabled

---
 spec/models/application_setting_spec.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index fb3ea491df7..d84f3e998f5 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -20,8 +20,14 @@ describe ApplicationSetting, models: true do
     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 allow_value([:github]).for(:disabled_oauth_sign_in_sources) }
-    it { is_expected.not_to allow_value([:test]).for(:disabled_oauth_sign_in_sources) }
+    describe 'disabled_oauth_sign_in_sources validations' do
+      before do
+        allow(Devise).to receive(:omniauth_providers).and_return([:github])
+      end
+
+      it { is_expected.to allow_value(['github']).for(:disabled_oauth_sign_in_sources) }
+      it { is_expected.not_to allow_value(['test']).for(:disabled_oauth_sign_in_sources) }
+    end
 
     it { is_expected.to validate_presence_of(:max_attachment_size) }
 

From 2e4c914ae88b77c8a3871f8415163a51e23254e5 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 10:31:25 +0300
Subject: [PATCH 0320/1431] between ""

---
 spec/helpers/auth_helper_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index a6a366bc19a..6dc1135927d 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -24,7 +24,7 @@ describe AuthHelper do
       expect(helper.enabled_button_based_providers).to include(*['twitter', 'github'])
     end
 
-    it 'should not return github as provider because it\'s disabled from settings' do
+    it "should not return github as provider because it's disabled from settings" do
       settings.update_attribute(
         :disabled_oauth_sign_in_sources,
         ['github']

From fc88527c9e21f99a9411423f1c8a6475957c02f3 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 10:40:27 +0300
Subject: [PATCH 0321/1431] use stub_application_setting instead

---
 spec/helpers/auth_helper_spec.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index 6dc1135927d..e6af074a780 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -2,8 +2,6 @@ require "spec_helper"
 
 describe AuthHelper do
   describe "button_based_providers" do
-    let(:settings) { ApplicationSetting.create_from_defaults }
-
     it 'returns all enabled providers from devise' do
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
       expect(helper.button_based_providers).to include(*[:twitter, :github])
@@ -25,13 +23,11 @@ describe AuthHelper do
     end
 
     it "should not return github as provider because it's disabled from settings" do
-      settings.update_attribute(
-        :disabled_oauth_sign_in_sources,
-        ['github']
+      stub_application_setting(
+        disabled_oauth_sign_in_sources: ['github']
       )
 
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
-      allow(helper).to receive(:current_application_settings) {  settings }
 
       expect(helper.enabled_button_based_providers).to include('twitter')
       expect(helper.enabled_button_based_providers).to_not include('github')
@@ -44,13 +40,11 @@ describe AuthHelper do
     end
 
     it 'returns false for button_based_providers_enabled? because there providers' do
-      settings.update_attribute(
-        :disabled_oauth_sign_in_sources,
-        ['github', 'twitter']
+      stub_application_setting(
+        disabled_oauth_sign_in_sources: ['github', 'twitter']
       )
 
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
-      allow(helper).to receive(:current_application_settings) {  settings }
 
       expect(helper.button_based_providers_enabled?).to be false
     end

From 3922e7ee2249bb5a683b7474b281d8e83d465740 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 10:42:57 +0300
Subject: [PATCH 0322/1431] enabled_button_based_providers into their own
 describe section

---
 spec/helpers/auth_helper_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index e6af074a780..04b51282795 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -16,7 +16,9 @@ describe AuthHelper do
       allow(helper).to receive(:auth_providers) { [] }
       expect(helper.button_based_providers).to eq([])
     end
+  end
 
+  describe 'enabled_button_based_providers' do
     it 'returns all the enabled providers from settings' do
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
       expect(helper.enabled_button_based_providers).to include(*['twitter', 'github'])

From 038dbb6803948e050484ed3f34c99b2f3bf7a6c5 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 10:51:24 +0300
Subject: [PATCH 0323/1431] DRYing enabled_button_based_providers tests

---
 spec/helpers/auth_helper_spec.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index 04b51282795..a6df8204213 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -19,8 +19,11 @@ describe AuthHelper do
   end
 
   describe 'enabled_button_based_providers' do
-    it 'returns all the enabled providers from settings' do
+    before do
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
+    end
+
+    it 'returns all the enabled providers from settings' do
       expect(helper.enabled_button_based_providers).to include(*['twitter', 'github'])
     end
 
@@ -29,15 +32,11 @@ describe AuthHelper do
         disabled_oauth_sign_in_sources: ['github']
       )
 
-      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
-
       expect(helper.enabled_button_based_providers).to include('twitter')
       expect(helper.enabled_button_based_providers).to_not include('github')
     end
 
     it 'returns true for button_based_providers_enabled? because there providers' do
-      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
-
       expect(helper.button_based_providers_enabled?).to be true
     end
 
@@ -46,8 +45,6 @@ describe AuthHelper do
         disabled_oauth_sign_in_sources: ['github', 'twitter']
       )
 
-      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
-
       expect(helper.button_based_providers_enabled?).to be false
     end
   end

From 3c3bc93747ebe5864a50d7b8203b357a40012ed4 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 19:32:01 +0300
Subject: [PATCH 0324/1431] if omniauth is enabled and if there are
 button_based_providers available show the disable OAuth sources

---
 .../application_settings/_form.html.haml      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 729c2ff563d..81c232b7e92 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -109,16 +109,17 @@
           = f.label :signin_enabled do
             = f.check_box :signin_enabled
             Sign-in enabled
-    .form-group
-      = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
-      .col-sm-10
-        - data_attrs = { toggle: 'buttons' }
-        .btn-group{ data: data_attrs }
-          - oauth_providers_checkboxes('oauth-providers-help').each do |source|
-            = source
-        %span.help-block#oauth-providers-help
-          Enabled OmniAuth must be configured for GitHub
-          = link_to "(?)", help_page_path("integration", "github")
+      - if omniauth_enabled? && !button_based_providers.empty?
+        .form-group
+          = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
+          .col-sm-10
+            - data_attrs = { toggle: 'buttons' }
+            .btn-group{ data: data_attrs }
+              - oauth_providers_checkboxes('oauth-providers-help').each do |source|
+                = source
+            %span.help-block#oauth-providers-help
+              Enabled OmniAuth must be configured for GitHub
+              = link_to "(?)", help_page_path("integration", "github")
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
       .col-sm-10

From dad501a2367a35f6d791efac9002e487176f2c9e Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 19:34:44 +0300
Subject: [PATCH 0325/1431] no need to show the help about Github or the other
 authentication sources

---
 app/views/admin/application_settings/_form.html.haml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 81c232b7e92..99f86e5244b 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -117,9 +117,6 @@
             .btn-group{ data: data_attrs }
               - oauth_providers_checkboxes('oauth-providers-help').each do |source|
                 = source
-            %span.help-block#oauth-providers-help
-              Enabled OmniAuth must be configured for GitHub
-              = link_to "(?)", help_page_path("integration", "github")
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
       .col-sm-10

From a2d4c349b5772231d7428cf32ac8a66d70beb627 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Mon, 9 May 2016 19:38:07 +0300
Subject: [PATCH 0326/1431] unindent 1 level the Disable OAuth form

---
 .../admin/application_settings/_form.html.haml   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 99f86e5244b..383f206079d 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -109,14 +109,14 @@
           = f.label :signin_enabled do
             = f.check_box :signin_enabled
             Sign-in enabled
-      - if omniauth_enabled? && !button_based_providers.empty?
-        .form-group
-          = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
-          .col-sm-10
-            - data_attrs = { toggle: 'buttons' }
-            .btn-group{ data: data_attrs }
-              - oauth_providers_checkboxes('oauth-providers-help').each do |source|
-                = source
+    - if omniauth_enabled? && !button_based_providers.empty?
+      .form-group
+        = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
+        .col-sm-10
+          - data_attrs = { toggle: 'buttons' }
+          .btn-group{ data: data_attrs }
+            - oauth_providers_checkboxes('oauth-providers-help').each do |source|
+              = source
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
       .col-sm-10

From 81d0a4a47390f3810b03528182d3eea68ab46112 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 10:21:14 +0300
Subject: [PATCH 0327/1431] typo

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

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index d565dbc71d0..667b45335b5 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -123,7 +123,7 @@ class ApplicationSetting < ActiveRecord::Base
     unless value.nil?
       value.each do |source|
         unless Devise.omniauth_providers.include?(source.to_sym)
-          record.errors.add(attr, "'#{source}' is not an ouath sign-in source")
+          record.errors.add(attr, "'#{source}' is not an OAuth sign-in source")
         end
       end
     end

From 96122034cfc2eb7039ae75b20b729f35e9aa832e Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 11:17:37 +0300
Subject: [PATCH 0328/1431] more readable specs for
 enabled_button_based_providers and button_based_providers_enabled?

---
 spec/helpers/auth_helper_spec.rb | 44 +++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index a6df8204213..16fbb5dcecb 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -23,29 +23,43 @@ describe AuthHelper do
       allow(helper).to receive(:auth_providers) { [:twitter, :github] }
     end
 
-    it 'returns all the enabled providers from settings' do
-      expect(helper.enabled_button_based_providers).to include(*['twitter', 'github'])
+    context 'all providers are enabled to sign in' do
+      it 'returns all the enabled providers from settings' do
+        expect(helper.enabled_button_based_providers).to include('twitter', 'github')
+      end
     end
 
-    it "should not return github as provider because it's disabled from settings" do
-      stub_application_setting(
-        disabled_oauth_sign_in_sources: ['github']
-      )
+    context 'GitHub OAuth sign in is disabled from application setting' do
+      it "doesn't return github as provider" do
+        stub_application_setting(
+          disabled_oauth_sign_in_sources: ['github']
+        )
 
-      expect(helper.enabled_button_based_providers).to include('twitter')
-      expect(helper.enabled_button_based_providers).to_not include('github')
+        expect(helper.enabled_button_based_providers).to include('twitter')
+        expect(helper.enabled_button_based_providers).to_not include('github')
+      end
+    end
+  end
+
+  describe 'button_based_providers_enabled?' do
+    before do
+      allow(helper).to receive(:auth_providers) { [:twitter, :github] }
     end
 
-    it 'returns true for button_based_providers_enabled? because there providers' do
-      expect(helper.button_based_providers_enabled?).to be true
+    context 'button based providers enabled' do
+      it 'returns true' do
+        expect(helper.button_based_providers_enabled?).to be true
+      end
     end
 
-    it 'returns false for button_based_providers_enabled? because there providers' do
-      stub_application_setting(
-        disabled_oauth_sign_in_sources: ['github', 'twitter']
-      )
+    context 'all the button based providers are disabled via application_setting' do
+      it 'returns false' do
+        stub_application_setting(
+          disabled_oauth_sign_in_sources: ['github', 'twitter']
+        )
 
-      expect(helper.button_based_providers_enabled?).to be false
+        expect(helper.button_based_providers_enabled?).to be false
+      end
     end
   end
 end

From 7818f7329a436d86b30dff003b60ab8a15a4f0db Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 11:29:19 +0300
Subject: [PATCH 0329/1431] On Application Settings Page let the user select
 the enabled OAuth Sign in sources instead of the disabled ones

---
 .../admin/application_settings_controller.rb     | 16 ++++++++--------
 app/helpers/application_settings_helper.rb       |  8 ++++----
 .../admin/application_settings/_form.html.haml   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index cebc01a2afc..d7a052700ac 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -53,14 +53,13 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       end
     end
 
-    disabled_oauth_sign_in_sources = params[:application_setting][:disabled_oauth_sign_in_sources]
-    if disabled_oauth_sign_in_sources.nil?
-      params[:application_setting][:disabled_oauth_sign_in_sources] = []
-    else
-      disabled_oauth_sign_in_sources.map! do |source|
-        source.to_str
-      end
-    end
+    enabled_oauth_sign_in_sources = params[:application_setting][:enabled_oauth_sign_in_sources]
+
+    params[:application_setting][:disabled_oauth_sign_in_sources] =
+      AuthHelper.button_based_providers.map(&:to_s) -
+      (enabled_oauth_sign_in_sources.nil? ? [] : enabled_oauth_sign_in_sources)
+
+    params[:application_setting].delete(:enabled_oauth_sign_in_sources)
 
     params.require(:application_setting).permit(
       :default_projects_limit,
@@ -105,6 +104,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :metrics_packet_size,
       restricted_visibility_levels: [],
       import_sources: [],
+      enabled_oauth_sign_in_sources: [],
       disabled_oauth_sign_in_sources: []
     )
   end
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 17d73899878..ced8e16de74 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -63,13 +63,13 @@ module ApplicationSettingsHelper
 
   def oauth_providers_checkboxes(help_block_id)
     button_based_providers.map do |source|
-      checked = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s)
+      disabled = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s)
       css_class = 'btn'
-      css_class += ' active' if checked
-      checkbox_name = 'application_setting[disabled_oauth_sign_in_sources][]'
+      css_class += ' active' unless disabled
+      checkbox_name = 'application_setting[enabled_oauth_sign_in_sources][]'
 
       label_tag(checkbox_name, class: css_class) do
-        check_box_tag(checkbox_name, source, checked,
+        check_box_tag(checkbox_name, source, !disabled,
                       autocomplete: 'off',
                       'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source)
       end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 383f206079d..ecd032acfd0 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -111,7 +111,7 @@
             Sign-in enabled
     - if omniauth_enabled? && !button_based_providers.empty?
       .form-group
-        = f.label :disable_oauth_signin_sources, 'Disable OAuth Sign-In sources', class: 'control-label col-sm-2'
+        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
         .col-sm-10
           - data_attrs = { toggle: 'buttons' }
           .btn-group{ data: data_attrs }

From bc099d799ea502c9fd8f1a09f07af70cdcf51156 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 11:50:53 +0300
Subject: [PATCH 0330/1431] Allow Admins to remove the Login with buttons for
 OAuth services and still be able to import on the changelog

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 187011c6016..8d70ef9944e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -55,6 +55,8 @@ v 8.7.4
   - Running rake gitlab:db:drop_tables now drops tables with cascade !4020
   - Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
   - Use a case-insensitive comparison in sanitizing URI schemes
+  - Merge request widget displays TeamCity build state and code coverage correctly again.
+  - Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From 3a91f5081eeeef8dca52a418aba2d786cbc8ddf4 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 11:53:22 +0300
Subject: [PATCH 0331/1431] documentation for enabling or disabling OAuth sign
 in

---
 .../img/enabled-oauth-sign-in-sources.png       | Bin 0 -> 49081 bytes
 doc/integration/omniauth.md                     |  14 ++++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 doc/integration/img/enabled-oauth-sign-in-sources.png

diff --git a/doc/integration/img/enabled-oauth-sign-in-sources.png b/doc/integration/img/enabled-oauth-sign-in-sources.png
new file mode 100644
index 0000000000000000000000000000000000000000..95f8bbdcd2489c4eb14c100c92dffadf3a1a65fc
GIT binary patch
literal 49081
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
T3O4XXNYA9j6~w-Z7zO<ocVfC0

literal 0
HcmV?d00001

diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index cab329c0dec..f0d7394005c 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -11,6 +11,7 @@ of the configured mechanisms.
 - [Supported Providers](#supported-providers)
 - [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user)
 - [OmniAuth configuration sample when using Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master#omniauth-google-twitter-github-login)
+- [Enable or disable Sign In with an OmniAuth provider without disabling import sources](#enable-or-disable-sign-in-with-an-omniauth-provider-without-disabling-import-sources)
 
 ## Supported Providers
 
@@ -191,3 +192,16 @@ experience [in the public Wiki](https://github.com/gitlabhq/gitlab-public-wiki/w
 
 While we can't officially support every possible authentication mechanism out there,
 we'd like to at least help those with specific needs.
+
+## Enable or disable Sign In with an OmniAuth provider without disabling import sources
+>**Note:**
+This setting was introduced with version 8.8 of GitLab
+
+Administrators are able to enable or disable Sign In via some OmniAuth providers.
+
+>**Note:**
+By default Sign In is enabled via all the OAuth Providers that have been configured in config/gitlab.yml.
+
+In order to enable/disable an OmniAuth provider go to Admin Area -> Settings-> Sign-in Restrictions section -> Enabled OAuth Sign-In sources and select the providers you want to enable or disable.
+
+![Enabled OAuth Sign-In sources](img/enabled-oauth-sign-in-sources.png)

From 2a99c51590da3c430b27538a1f570d34209d51c7 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:39:27 +0300
Subject: [PATCH 0332/1431] corrections to the Enable or disable Sign In with
 OmniAuth

---
 doc/integration/omniauth.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index f0d7394005c..f3e891fa457 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -194,14 +194,15 @@ While we can't officially support every possible authentication mechanism out th
 we'd like to at least help those with specific needs.
 
 ## Enable or disable Sign In with an OmniAuth provider without disabling import sources
+
 >**Note:**
-This setting was introduced with version 8.8 of GitLab
+This setting was introduced with version 8.8 of GitLab.
 
 Administrators are able to enable or disable Sign In via some OmniAuth providers.
 
 >**Note:**
 By default Sign In is enabled via all the OAuth Providers that have been configured in config/gitlab.yml.
 
-In order to enable/disable an OmniAuth provider go to Admin Area -> Settings-> Sign-in Restrictions section -> Enabled OAuth Sign-In sources and select the providers you want to enable or disable.
+In order to enable/disable an OmniAuth provider, go to Admin Area -> Settings -> Sign-in Restrictions section -> Enabled OAuth Sign-In sources and select the providers you want to enable or disable.
 
 ![Enabled OAuth Sign-In sources](img/enabled-oauth-sign-in-sources.png)

From 4372043392d735db506f1e696c213c3ece47bc1a Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:40:20 +0300
Subject: [PATCH 0333/1431] credits for !4034

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

diff --git a/CHANGELOG b/CHANGELOG
index 8d70ef9944e..7cd8f63321f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.8.0 (unreleased)
   - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
   - Fix adding a todo for private group members (Ahmad Sherif)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
+  - Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034. (Andrei Gliga)
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
@@ -55,8 +56,6 @@ v 8.7.4
   - Running rake gitlab:db:drop_tables now drops tables with cascade !4020
   - Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
   - Use a case-insensitive comparison in sanitizing URI schemes
-  - Merge request widget displays TeamCity build state and code coverage correctly again.
-  - Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From 9bfa74fcfe79c244fe4fd7d074b87bb22ba7971f Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:43:54 +0300
Subject: [PATCH 0334/1431] enabled_oauth_sign_in_sources param doesn't need
 permit

---
 app/controllers/admin/application_settings_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index d7a052700ac..a2dfed0b7a6 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -104,7 +104,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :metrics_packet_size,
       restricted_visibility_levels: [],
       import_sources: [],
-      enabled_oauth_sign_in_sources: [],
       disabled_oauth_sign_in_sources: []
     )
   end

From ab7f9c9ae1281857bef655a1af64774c628befa1 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:45:39 +0300
Subject: [PATCH 0335/1431] Array(enabled_oauth_sign_in_sources) instead of the
 if

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

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index a2dfed0b7a6..c3005602366 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -57,7 +57,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
     params[:application_setting][:disabled_oauth_sign_in_sources] =
       AuthHelper.button_based_providers.map(&:to_s) -
-      (enabled_oauth_sign_in_sources.nil? ? [] : enabled_oauth_sign_in_sources)
+      Array(enabled_oauth_sign_in_sources)
 
     params[:application_setting].delete(:enabled_oauth_sign_in_sources)
 

From 25ff3fd5bdd8645f45254aa52397f8d6b49386b5 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:46:40 +0300
Subject: [PATCH 0336/1431] button_based_providers.any? instead of
 !button_based_providers.empty?

---
 app/views/admin/application_settings/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index ecd032acfd0..909339f7bce 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -109,7 +109,7 @@
           = f.label :signin_enabled do
             = f.check_box :signin_enabled
             Sign-in enabled
-    - if omniauth_enabled? && !button_based_providers.empty?
+    - if omniauth_enabled? && button_based_providers.any?
       .form-group
         = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
         .col-sm-10

From e87c96eef6d8d837bf4475e2681f4c5c5e40488d Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:48:08 +0300
Subject: [PATCH 0337/1431] enabled_button_based_providers.any? instead of !
 empty? for button_based_providers_enabled?

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

diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index 3e1f4209254..b05fa0a14d6 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -45,7 +45,7 @@ module AuthHelper
   end
 
   def button_based_providers_enabled?
-    !enabled_button_based_providers.empty?
+    enabled_button_based_providers.any?
   end
 
   def provider_image_tag(provider, size = 64)

From 46064cb84c579bd1657baffe24f5a515759bff67 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:50:03 +0300
Subject: [PATCH 0338/1431] << instead of +=

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

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index ced8e16de74..878b1b254ce 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -65,7 +65,7 @@ module ApplicationSettingsHelper
     button_based_providers.map do |source|
       disabled = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s)
       css_class = 'btn'
-      css_class += ' active' unless disabled
+      css_class << ' active' unless disabled
       checkbox_name = 'application_setting[enabled_oauth_sign_in_sources][]'
 
       label_tag(checkbox_name, class: css_class) do

From 6bd8d3ad48b9151c0bcb69bfbce0bc2551cdf184 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Tue, 10 May 2016 18:53:02 +0300
Subject: [PATCH 0339/1431] inline btn-group{ data: { toggle: 'buttons' } }

---
 app/views/admin/application_settings/_form.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 909339f7bce..576509e3f2b 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -113,8 +113,7 @@
       .form-group
         = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
         .col-sm-10
-          - data_attrs = { toggle: 'buttons' }
-          .btn-group{ data: data_attrs }
+          .btn-group{ data: { toggle: 'buttons' } }
             - oauth_providers_checkboxes('oauth-providers-help').each do |source|
               = source
     .form-group

From 9079b56bf4f149054e347aa09ad151ab617ef123 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 11 May 2016 10:35:18 +0300
Subject: [PATCH 0340/1431] Revert "no need to show the help about Github or
 the other authentication sources"

This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03.

Show help only for the enabled OAuth Providers on oauth-providers-help block

aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id

provider and not p

a more simple approach to the OmniAuth helper links for oauth-providers-help
---
 app/helpers/application_settings_helper.rb           | 9 ++++++++-
 app/views/admin/application_settings/_form.html.haml | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 878b1b254ce..82056a4c977 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -71,8 +71,15 @@ module ApplicationSettingsHelper
       label_tag(checkbox_name, class: css_class) do
         check_box_tag(checkbox_name, source, !disabled,
                       autocomplete: 'off',
-                      'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source)
+                      aria: { describedby: help_block_id }) + Gitlab::OAuth::Provider.label_for(source)
       end
     end
   end
+
+  def oauth_providers_with_help_links
+    button_based_providers.map do |provider|
+      Gitlab::OAuth::Provider.label_for(provider) + ' ' +
+        link_to("(?)", help_page_path("integration", provider))
+    end
+  end
 end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 576509e3f2b..f3681bc96e3 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -116,6 +116,9 @@
           .btn-group{ data: { toggle: 'buttons' } }
             - oauth_providers_checkboxes('oauth-providers-help').each do |source|
               = source
+          %span.help-block#oauth-providers-help
+            Enabled OmniAuth must be configured for
+            = oauth_providers_with_help_links.to_sentence.html_safe
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
       .col-sm-10

From 2576a55e35f06d2d59783867be5e7e2ccbed982e Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 11 May 2016 19:52:06 +0300
Subject: [PATCH 0341/1431] config/gitlab.yml between ``

---
 doc/integration/omniauth.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index f3e891fa457..820f40f81a9 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -201,7 +201,7 @@ This setting was introduced with version 8.8 of GitLab.
 Administrators are able to enable or disable Sign In via some OmniAuth providers.
 
 >**Note:**
-By default Sign In is enabled via all the OAuth Providers that have been configured in config/gitlab.yml.
+By default Sign In is enabled via all the OAuth Providers that have been configured in `config/gitlab.yml`.
 
 In order to enable/disable an OmniAuth provider, go to Admin Area -> Settings -> Sign-in Restrictions section -> Enabled OAuth Sign-In sources and select the providers you want to enable or disable.
 

From c0c2cd4ed72cda88e182f3eafb472687d9d075f1 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 11 May 2016 19:55:24 +0300
Subject: [PATCH 0342/1431] new screenshot for the docs on how to
 enabled/disable OmniAuth Sign In

---
 .../img/enabled-oauth-sign-in-sources.png     | Bin 49081 -> 92674 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/doc/integration/img/enabled-oauth-sign-in-sources.png b/doc/integration/img/enabled-oauth-sign-in-sources.png
index 95f8bbdcd2489c4eb14c100c92dffadf3a1a65fc..08155a4fade75af85f36fdbe8cacff1af936280c 100644
GIT binary patch
literal 92674
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

literal 49081
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
T3O4XXNYA9j6~w-Z7zO<ocVfC0


From 9e5042e40f657c8e8145cbce95ad424ccad6e6aa Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 11 May 2016 20:20:27 +0300
Subject: [PATCH 0343/1431] Revert "disabled_oauth_sign_in_sources column" and
 keep on schema only the disabled_oauth_sign_in_sources column

This reverts commit 95358e0095403ad44149d11922d52e4590285a20.
---
 db/schema.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 74facd12088..b21cc162892 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -70,16 +70,16 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.string   "recaptcha_site_key"
     t.string   "recaptcha_private_key"
     t.integer  "metrics_port",                      default: 8089
-    t.boolean  "akismet_enabled",                   default: false
-    t.string   "akismet_api_key"
     t.integer  "metrics_sample_interval",           default: 15
     t.boolean  "sentry_enabled",                    default: false
     t.string   "sentry_dsn"
+    t.boolean  "akismet_enabled",                   default: false
+    t.string   "akismet_api_key"
     t.boolean  "email_author_in_body",              default: false
     t.integer  "default_group_visibility"
     t.boolean  "repository_checks_enabled",         default: false
-    t.text     "shared_runners_text"
     t.integer  "metrics_packet_size",               default: 1
+    t.text     "shared_runners_text"
     t.text     "disabled_oauth_sign_in_sources"
   end
 
@@ -427,10 +427,10 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.string   "state"
     t.integer  "iid"
     t.integer  "updated_by_id"
+    t.integer  "moved_to_id"
     t.boolean  "confidential",  default: false
     t.datetime "deleted_at"
     t.date     "due_date"
-    t.integer  "moved_to_id"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -717,8 +717,8 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.integer "project_id"
     t.text    "data"
     t.text    "encrypted_credentials"
-    t.string  "encrypted_credentials_iv"
-    t.string  "encrypted_credentials_salt"
+    t.text    "encrypted_credentials_iv"
+    t.text    "encrypted_credentials_salt"
   end
 
   create_table "projects", force: :cascade do |t|
@@ -816,9 +816,9 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.string   "type"
     t.string   "title"
     t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "active",                default: false,    null: false
+    t.datetime "created_at",                               null: false
+    t.datetime "updated_at",                               null: false
+    t.boolean  "active",                                   null: false
     t.text     "properties"
     t.boolean  "template",              default: false
     t.boolean  "push_events",           default: true

From 8313476f5e1f1b51b3857ba065a65a707f5ca8af Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Wed, 11 May 2016 23:39:07 +0300
Subject: [PATCH 0344/1431] no schema info for ApplicationSetting

---
 app/models/application_setting.rb | 49 -------------------------------
 1 file changed, 49 deletions(-)

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 667b45335b5..c143cf215e6 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -1,52 +1,3 @@
-# == Schema Information
-#
-# Table name: application_settings
-#
-#  id                                :integer          not null, primary key
-#  default_projects_limit            :integer
-#  signup_enabled                    :boolean
-#  signin_enabled                    :boolean
-#  gravatar_enabled                  :boolean
-#  sign_in_text                      :text
-#  created_at                        :datetime
-#  updated_at                        :datetime
-#  home_page_url                     :string(255)
-#  default_branch_protection         :integer          default(2)
-#  restricted_visibility_levels      :text
-#  version_check_enabled             :boolean          default(TRUE)
-#  max_attachment_size               :integer          default(10), not null
-#  default_project_visibility        :integer
-#  default_snippet_visibility        :integer
-#  default_group_visibility          :integer
-#  restricted_signup_domains         :text
-#  user_oauth_applications           :boolean          default(TRUE)
-#  after_sign_out_path               :string(255)
-#  session_expire_delay              :integer          default(10080), not null
-#  import_sources                    :text
-#  disabled_oauth_sign_in_sources    :text
-#  help_page_text                    :text
-#  admin_notification_email          :string(255)
-#  shared_runners_enabled            :boolean          default(TRUE), not null
-#  max_artifacts_size                :integer          default(100), not null
-#  runners_registration_token        :string
-#  require_two_factor_authentication :boolean          default(FALSE)
-#  two_factor_grace_period           :integer          default(48)
-#  metrics_enabled                   :boolean          default(FALSE)
-#  metrics_host                      :string           default("localhost")
-#  metrics_username                  :string
-#  metrics_password                  :string
-#  metrics_pool_size                 :integer          default(16)
-#  metrics_timeout                   :integer          default(10)
-#  metrics_method_call_threshold     :integer          default(10)
-#  recaptcha_enabled                 :boolean          default(FALSE)
-#  recaptcha_site_key                :string
-#  recaptcha_private_key             :string
-#  metrics_port                      :integer          default(8089)
-#  sentry_enabled                    :boolean          default(FALSE)
-#  sentry_dsn                        :string
-#  email_author_in_body              :boolean          default(FALSE)
-#
-
 class ApplicationSetting < ActiveRecord::Base
   include TokenAuthenticatable
   add_authentication_token_field :runners_registration_token

From b17cca1d9460a00510a2e9f04300f07cfb5eb95a Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Thu, 12 May 2016 09:37:15 +0300
Subject: [PATCH 0345/1431] delete the enabled_oauth_sign_in_sources after
 getting it's value into enabled_oauth_sign_in_sources

just delete enabled_oauth_sign_in_sources and get it's value
---
 app/controllers/admin/application_settings_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index c3005602366..b9eb7ae7921 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -53,14 +53,12 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       end
     end
 
-    enabled_oauth_sign_in_sources = params[:application_setting][:enabled_oauth_sign_in_sources]
+    enabled_oauth_sign_in_sources = params[:application_setting].delete(:enabled_oauth_sign_in_sources)
 
     params[:application_setting][:disabled_oauth_sign_in_sources] =
       AuthHelper.button_based_providers.map(&:to_s) -
       Array(enabled_oauth_sign_in_sources)
 
-    params[:application_setting].delete(:enabled_oauth_sign_in_sources)
-
     params.require(:application_setting).permit(
       :default_projects_limit,
       :default_branch_protection,

From 5553ad24e4fe42670ba0f4e2010819abac499e7d Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Thu, 12 May 2016 13:37:44 +0300
Subject: [PATCH 0346/1431] Revert "new screenshot for the docs on how to
 enabled/disable OmniAuth Sign In" [ci skip]

This reverts commit 7b295370efc124360d52e37e8e709914028f6443.
---
 .../img/enabled-oauth-sign-in-sources.png     | Bin 92674 -> 49081 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/doc/integration/img/enabled-oauth-sign-in-sources.png b/doc/integration/img/enabled-oauth-sign-in-sources.png
index 08155a4fade75af85f36fdbe8cacff1af936280c..95f8bbdcd2489c4eb14c100c92dffadf3a1a65fc 100644
GIT binary patch
literal 49081
zcmeEtg;!K<*Ec0dE2%V+N=kP~cXvv6cZU+v-67r0&?QnbFcL#|cL)p(-*9_B&+Yr(
zf5Erb%UUyYI9Hrq*WSOquj_;>%1fZ55TL-oz@SS>iYmjvAaKFJz@|S(gx=Y^I~#$4
zL3?E>BBCfIB0{F<WN&6^V+sQ!8J?tpq^UB5m#w4x9GT$-?Ax!L!d^*ByyHFMl5n4}
zK9H5n#ECtd4*K%^%a^LKnJKtI?H9FlaFEv8+`2kOJe!hsDY%{1YM<kcj28dVOy@1Z
z?a>8$L>MveWTDuocd)U&OfSTdZkVwX;?pSK3$4T;`b*Qhb$0W<dxs|U+V??kX)yqx
zSfwp(bnkrE^@Sxg1B3_@9>kTD02&RvdI8f+twTl+6Y%rd1tKdd0@fX#ks3MWbC@{#
zo?Vs-s-9978-~X4D9Gm-Oc<7=KCB}6T(WQwy-9H|7YbZh<uwrr=^Dce?;2K3qOiUf
z3WGyKpEcu9YAyHN9mgN>SY7F<Ba#F{Oj{&B9}EoRo79^<=4@Uq$0sllWQmY+ScNdt
zYR9uy%#T(qC?ba}#O2>jhDnC0kqHc}OCC~P$%oL=+I{cL$vQ^0MtlX68_@d;_4BJK
zEYq;MwRVXb1{vCm&kzfQYBDZ2gkluue2KOE&vyr5HE~=rtj#_7&B+<Zq^wp6{ix4F
zURAN3D=LZG1Vz%!DGf%%1ZcvpRozvj{(QNNB=)-VWj@CTrG`)S<lpTlKEaN$5X$n?
z__Hwqzl_9>7Gl(D2#edq0`X-wwrE14oK_s}?@Wo9F;Yl5zo7@057T&kZ&HmVW;cof
zJJrMIo4WQxw(<KTZy-3`&#24cA+!m&SXApV9oRUceLtF4xt_y!c4IOJJ_o4AqO!nN
z*LSs$J|sjTz~H?Ia_N4SOp&e>gRuLY6!Jdz`5p30{Ee9FYe|Wg+!uRYk(Q<%RFVnN
zc+&iJ-6~<u4sr|d?!CQ+$Imhtjw0J4Z{Fidm{Z+g--ii*hsm3Lg~?%(g`V-^<ROX?
zN1%n77a9M-0%LjYWj0nTa?JB-WTS7kFEFzu^CLA!R&Y`M4M!1Hh0yY!MVh3b7(=4w
zR{CQb;g5pbL>^*!N4wbrsq8RWPy6{l+F>Z(@{5eUYO-&<a}+?{KR$asMwd#*6<H%m
z?9JL~tS%^idS4|@bcJ?5hNbg``1`04P3_r?QpIcLT5L^JH)LMw9%H)Ia2Kk`Q9Opt
z<Y((A;<gopmA4gwkH&6O&*8tG`v$`uRlp5}oQ&WC@qUf7qNFaJL;y_@&t}!JQvp*P
z(J+#o$913q!jSW}C}u{ViOojX6=lSv-DMYgc$jFuX8{jK8KW!g3;N|STvL5`$f%|~
zy5lclp3#2G`U>k30L%QDdlpV&1+hIq@HuQ886IWeZq43nGNig}<gFmFT%5#UHACVO
z#Ec$}8temDBq3HV6!{?5l{Y(Z(>;3499})B%rHxV<Osr&&(Xh95QH%rebOWYgt4v#
zUQv9MWQ+e)KnB&}OLFJ9K1punKvfEzIK&N&jpt5S+%YZ`O>v=;q`wHRKN->Ds);o!
z8N0mMi}cF>YC+F~E+=vJ^GySSUZDC{*B!eCWd3k{(dvAo^JhF^u(Bk^hF+;uTanjB
zahfd2A;`7Yny=Nv!5_VA)vv0mjf^TtZ^N)1c}Bl8tlpq~TX*2d4h0RQtb?!Q+mVmE
ztJg43VejYy#ecrhe4&fn^GWmr&qwO7iHcG)!d$Xk=$G<LtHg1VCNJc|<Q?p(U$TZf
zhYg2kgx!YOez#jQULy+^9VgR@U66{S#48O@m7Wutlj9NIBfp3jh}|4&HPLZ`;Z6h6
z;3v=xwG9po@o$)KkaJUUQ*djvNODIn*t8@$&2MUNRt;YKKvzn9OO4|$O;43j7p5#W
zE5j|<BH>BF#8l06{6<hKo2E;#Q`)cVj{7?F7isA`Rp&A$*LP~7dcu{(03~~s<)0R8
z#_9MBY3f2c!q&N2dHlJ)in(-}ZxQGmaPVj+Y1!VM)3&Q7s<0`at7lee7HF1wD4u>X
z>Wa^duZ^$9lCkVmjv9Yim?0hf!^M<vQ*x7NbMr@AB8W~<gS_-r`Bk}ts<bMgG*j7A
zc3=n5#egTHGqp3zFMX+8T9sW1U42BAL1Qt0u9PRYD9@}KubM-qQv5JAJvH!s<m;YD
zn||qj*naf>V#m4l_5sHM2ErzHT~PDo-a5ErvSrV7?{>1f+<)BA>dM;0vSP|&s<}Gc
zI^9}+Dzj9p+*7;WzkSc6>Ga^#bR9FYEB~`qnzfkq$k<$wtCY2(js&lwPHu<rZK7Kj
zhRA>njf#2YsAHCZUTak-qk?<o5%Qv7s+Fw08Att>*&d>w6XU4k*t@pi{Yk=c&as#Y
zrm5v(|K$Lq6`NSInyK7H!*0cC<^_kUkNK;_6x<Z%`DpnU;^t9Hgc+}BUNOD5<M6Y~
zv%|7cHW{~Y0wtR5S*Dw7n|qB!T5Q=Qn*xR^hKbnSnL*6e@4JiwwYjuU=sC1p6v$*9
z(z<gLIaiCQz~l3EKkLSReZ}p42P~T@o88+K?F}Eo)==Q%JuPnxb_HCx?YD8f;~?kg
z<EZ4QwjHsZ1+W9A4=mhZ-B1s-5A<hsW}FYL5AC^s5`QC3=4#;eaddIQ;W=_WaAt9l
zcAVRBna~1r|L|-%<Hiq)h#7`U$!8?hBi2LJ#cY1qG}}$y1PmWuQzl3)NX^smyG^^B
zx7fSldo%MZ^8q}<_%HahvR$)d+R@s%^m*H}Ju^Jby^bM%yT*qU=iCQpOVeQYZ2Jt-
zE&Lsgt?AwBHPUT^!$&e9K{Ec__l9IY$sObkbzYFuvRSzP95FmJbaN0n5eicoY>$mr
zw6c)3aNWsgK4bo<Y0X7Ig4IcVr~gR_K`@USOB7L}D!iT46e|h;V%}tJqhyFZAxC^(
z6ci;uC=!$QvYu{BuR`JA$4r}Jkz-yn#G~)3^c4N{82b+E9oF}7Z0v0+ec5r@HL6C+
zg!uIYcS=n8)0{dx>0{N<(n1w`S=KZT>$&UQ^ojan(u}WM!R+gXDCAV+rW!xY)hWxP
z*;5HJTi?3|91iP){CZB;DmKp@7h7-_%q@>BaV<d;ixblYm!=+Os%GbBKAzxqjWpr3
z4Ay0HF*C3^x;c%>@i6&z!3NQ4`APj1aSKmNy;IvWyddR3E)cuD-ckUwYBL4tP)_o)
zaxO{?Pl{+!UXCaxDnE)fiXbpD$I~JC7yUzpO#O&CQ^tJ-ZSGDA_Z1N&6Vl@4j6dSb
z1@c~+x*oinygo!l!%L*!(R<bGu>IyoUWHgnL}dismt{tI%?0f|y}Fu>Q-wf5_T+bo
zC^GhpjyiRoZ#xs48l2M>>(GZglO2CBChDYUB>U@+>ieylXXKRok?6+(@|+9Tf6S?U
zSG!Z=RQIl0()y~aq<ZQhca>h$2y8U9UarchJ@P5^-Q2oJyvVy)E2}9>Mh_uWx4qKM
zQu6KSFE(2iuZ$Yz=v@9jJE^j-*5+Oh+4?n-12_RJ%n>v<mX0=8IT1SQtOAPX*PC+g
z`>s<$h|_t0xciiDPe-_mA0JpaSXs;zHd>of%+XpM%=5dtPm^@<Gk7yx+AR*uXmpYu
z;2%D&PbV7K6Fuku>G$(`Wl2Oll!K&*l+pS_x)~=rn>kyAPP}$&%qJpCdsl1zy9}`X
zg~Ubl6p;!q;1}1X$I$62wipfKJc8{#&4hx0UCx-_rRrL#HE{wjk3wj+fIIaHu(W>3
zTp`n0(EYr9|C$0nlZnm1rG3U_Xmxyb7$XJKoyUzs&#`rUd~+N;$6tEu5n~P-D)-X>
z>7sVJoqB!0I3jf9v|G&dQt^p!-oHLPn6Ey<S$f^tc0#hMKkHj~n}pdwGI?(YxfQ6*
zznT&03QZyD<7>T5y}#;9xTDGOmdPH^Ru`D?ojO^7T#t1IbXEx#-HqLTI58^eI#<{f
z<m_bg_1s~q?qWoz#5nK7>Ll>%xQpt~xM_me&m-j{lC}?fa-Me{1oww#k!A^I-zT2z
z&i({~3P5TGz|ICg^m{LRE^`mfZmhZj30O1^HU{*7=?j>j@hh{iOY5{Kb+;+1FJ`lp
zzI6M4tK&^qT^TA|LJesC4D+dnRhq#@{DsP@iql>61zbtiq9$S79UHHX7X7>Sz83;$
zm|bIt0h1`*_^T%;KZ{mZndZr7=V2N)hmL%)$iJ~Z;0-OJ=yGUgKKG0DhxN#?(Z1RH
z!3<3mkR2qooMB+_sGdHsQp%Jk&@3X`QdQGMQ%;u0*xr`$qlvwdDWiw21GF~`44(%N
z^wQSU<s+Ggt&N>Cj|cyozk2XMub*x+y&?Oni;Fe?8%;SyG7)<xQ!;i&Hb&+*0w`o;
zWPDC0W<1KG;(rf^{>T5u!o|gbhl$DE-JQ{$mC@eGoasF`H#ZYA3lj?q1GEQ&v!|WQ
zM-K)&XNupG{AV6fQ)go*O9vNAdpokHc|RK2ySnhddGqw3|Ni}^)6~QApC{Ql|IHSZ
zL8hk`ruU4@O#hu5I+X9}E{~$6hpCOGsHLr`oip?q0`Hl*nEC!1@UNzS9{I;mt$&8H
zz5gF0|7iJpBp=fg2Y+z%TU>wLh003+g^%gKvKK(Xs`q#YRR@u!sDdi=7w$<n&_8I}
z2SfY!FZ5cn6n3eC2?j<8MoLsz)dTim5!NNqJnQ(>U|#5BuH4~dq3!sVb{(U}`a7k`
z8paIcSzSj8ySYYgRYSth=byg4&DBEo$~Q}Dh`?%Z7<v1%2$hISHLhbYiO#8me*be@
z#J43|bz_FZA}ZVbD2_sSG}&F>r8MA%@3N;kOM(>35Rh|w(v$V96Lia$vyDEmEeJaE
zukxC|3nN8%Ap`^aKfVm%P<6!ujNvXx)Fl2_6HH(Y3@io-!vE<1)F<@>4uOl>2Y(#q
zUrl7)J*)vRaL>v9#}~GK0L;Lr;|~P?<L+Ob5V$-L|4r04)E6tMCwh|b|7r?=K?412
z{^znDfsTYLJI6=k^<CUFave&?Z!=0Qv9rBg2m&T{nzv+1v9GVw23<iZ+YxSW{-J_7
z8IFQv<vHTb#oT`N{#swGr9>b~k?a^c=am{)C0U=_XBVg2WsCLIdcfH*c%fF_RFvC>
znroJsOIFA5ji4ZQ%aNr!4*s9q3Vng2z*>2J;l96v`55YVm7mY!y>vS&;9n}xnXB!-
zbo~*R3e^pPx6w^1;$RiM{QKITnXR_=mY#<|CvRL<ka@%XD$V(?jeU0R&z)_Mx&6(q
z7R|@f4UQyWyNDPoirh|QP9y^L`B`t*%hwnD_!R$e6PpkB8j<V69$$?ZLz{d-pNf8m
zGP=xm>CgSLfY<GleMnq))ZJt90mh0pZ+NLnZVlH%xPB#-Z8_&mn{SN(ql6@AOFADo
zjiVS-Sr&mFtsIcs5+cf-;P;Qbg!1zPGK&(0#<Vzp+D`~wtZ)ED35D&Y^?o>l3P(s;
zT=j>MWvzS`_e6@x%4Bas@NR2oU9BG7)|KAz)@e2N>=2Md)81^CFU9f_SHseHpCu{M
ziJol23d7Ym*Ew`g8>3(TOpSfF)U@8XE9OTJm#1F{7~-gWskDoaBKC)c27W|E<L!3b
z5{gK7Yw3Lv=arbOVWB=WqP%kHb-lUmQZ~`CLaDv1+<35%t5pSSm3y1oc@LJ5jqRn$
z60H7}4%Tk8U<?<}w}G$5o*JU-UOgKY1cQan_CKTgPEo{O6*r5|b1?kMMo+vdbG(qs
zwT{_KzZ}?OQy;GF?>%E(0K|m04)8?6|G5NS;luT!I-C=0i1eCWw4^I4&6gB{oj2T{
z(c_@(0K4v(_-j2=)^)u7H?3^7-g9y$ziy_#Vh<0H2*@ug6p1kNG>>b<n$Grx6!@J7
z`|`}~`t23ewMJR#E5>hxtl#DvP75$tE)kY*Xg=dI;smY<3pDXZ94rw0qmsZ(oLA}r
z>%h(ntGRt$Lq*f%Sb9PyWT~!bTYt?MB97_gDXaOAHkxzJWA1CwNU?lAI3n=Kd;^<Z
zhq9094bSB+DuefC=A_bB28HUe$g2sO@4SnlB+AAErJ8zYZ@c3_wlS_;NPn(x<~MM?
z&mBIwRM@7G)NU`)>Q!VB;{D)vq)<W!W%5<M_2<(NE7gxJAzR8xg?o*_Re?Cb6!WXJ
z)3$93Uk=!z)(WXmJA3Fc)xE}98Qcaa00s4}qW)Rp-B-A;!~-aD`K|X&2xCf{i^MYU
zMhG}7(IA(52Qp0Mm+sX5y@f;X&JBtQ?c3G*#8_PpX(Iz~y+(Jgk4P?Zx=he2Ztnx_
zI_^1euRBt7BME6W#QH0Up)19t%H5tSa}Vvs{;bF9HU340Grr62IF%d(cMtQ6-E>>X
zz0Ie|>4{2wgClUu!x;<Jk8M_v&RFH!l-Wk}4rB+k(J+Ei7>U7##{F4VFYx3rn<^)M
z(hjCMULjGK3qQ$HSNf)T2S3wpU-t4&kmp11Ayd1&Skv-Xtop2DMZtV9<m(aPJs-}F
z%B2ib*(K*TunV^c(!bj;NITBZggcaD!@F+*YuOonu&lWS(oY9(yZm8o{f*sW2wZn&
z)1i=;3m0Fl4I<Jn1?&;OBrkeqbv3FJn{f{-t_F2hQOwo4rpRZyG8)!g1~4g?+*h8|
zCJojV?aphn&9|sTbTDp%mP?X!9^}u=MDr*YX)t$ACFJzu5Sq@C)b}C`$~bxZB0s41
zP0r~zea$@BHtQgMjl|UoWTYR7_F)ux#^uEuQ?fp!$CGq2ds5n7rtT_(XCW@l8Ue@S
zxpI85QI+r5Vu47?SPpDEPXqZVvmSzkYIJx>{B-s3nfBI>nReWLsb6q<#Bu*Z=eq@P
zj=+1BBU9SdJi}V_ZEd|jW}CL>xAx_!yPu!4VtD3!ugY#aQ8ydc9ejWDHJeo9J<56J
zRA6ye`900r@k`!mgQC8iTWf|)<KY+<6kCO+BlUYIftHs?{5+?+KJqCR_xGkr+Aa!}
zTO&>n887Y^?yW9~7Q1TEviaQ$uZjOyN<>&shF2oOa9N%|AwWr|rZRvyLh=qS?oH;c
zj^4HP<X9)IQ~-scleZ6R{5(aUw@20%Zi(Y`VXJ9z@~D^It#)TY2L^mKR^_EMc&1ZW
zq=-h!#WVhL(N$(^Lx8jV@YMv2L=FbuIqo4(k_Xv7B_ntbP;F&bccBu<*vS8r{`MV%
z`RmgzHF~@8FQ4lv>S^H25T*4ZM*DM;&xtRA(ai$3fb0<sFrebS@Zz2J;*wnuS=@Yc
zwF2Z0O`X1EotI>4D|m^Q7CoEOV}q`IY`Uv~wl3?KwvoTFRmWBO(lho8-Tnm__be2M
zzX2gi>Z+B^>FBXreg20KGO?jT=miovY@$6czoG-*RN|&{!wF+t3Xxy0P!+7lRE}@u
zlfY}%Us#+*sklOHtVD)X;fRu4FUA8af3@m;E6$$*3eB>eqa}Wtrnw>`rnzj<vX$tE
zjaE%5Iky^^Q{ze1zMM~tkW;i$3CdON(#mUGs1+S{`#9d4u3oPad4a?N6z;secDb~)
z9Tu0H8!OQZr&haq*SJ}VTWeBrw4d;pr6sq|8rXq|JtH$G3&Qj@OP*GlqOVr6y8Y?O
z2}ZfFxGiJnIXG4LY+iV1pMDrNKjQX%Xv?XYU*f^u1|gf@JA+I7pU6TsfDnSa@;uGf
zNW;?x+j>?N%x*mvR7Y9Q5Q67|i4%{m50~YwI$gJ{W|6ixLZ5J5j|c%jzt}&=%u(I1
z!mc`dr)nT5vkfxfI5tQ=2E<rC*lg<)Il4L~k+Gt8nSCr=x~zJGtLq^g>So6-W3oUK
zC65JcZly}w#d5D|`(ivBjRsG2l*L(5G-<m~`iu(FNHry!Pi0mVSN>I?-X`yX(RZWc
zcpRO2;6uq{Mf9Qn2jZhmBIF?Dj)A#`y_eI@s=8mnm<#2Y$-tlNDDQq=mOU&hJced3
zc(Vb{zZ-xpk{w6FRr|Gz#sCt&)7ls4d$ZWZvOC?^DoR?G0x11UXo%I|cB&kAApPq)
zg%OALJg?3r_i_a$!83)u)+%j=VZ<iW=r)0&Gvhq?)1lA#jdYCDYtZ24^$65q7sJ0;
zV~VkUthxsj>J(Zn0ea}cEclV?^9fUnWfnq6Q`4S^{y*MXH?FLcjvpSgH9j6j@c3DD
zU5;n`@;cP#6kG*NIc6*6>{y5R8&mu`5ZnJo_XnKhre&^x3Ehmndj#I9HF|^#xNe8C
z8@~#_S^FW+<*^Hf+^X-^_%=pXe;{nCR+19-vA@V*5Kn=Aj0LwA0L4=!v=H$-VO>3&
zV%4dp62Axf>3{**)#asvk<cuq=<zvq+h*^g!#yD8`d;$Sx1Rn{p1ds3=;jq;2`-b+
zg@v7nG0V{O7KCIiRE0!^5)b;-Pp;^gl?F~z=66nbPyXCPO9TUsCKp)`g|TCVJG-<G
z4`n*KW-%dqKd~{(*V8a51qKi>Ae9{&-nKC^WguzY$9ZiXUA1baWln?DL?XcDVW{IY
zji=v@!tu{vQ^Ano-T^f_PODiyo#?2U*Rb`8n;B+rhn>r8cYiL{w@*sc97^rksg)jI
z8C%Wxu&K8V3a@QS1|AvTR7b^pXP_wK;Fe9s*kE?VO+H`#4t(qvU!Qeu3Rr&mPa=>y
z1J{e;pt&4IV(BfU6DldHsI8RmeSBT;<4Z-gy~?eW=gQ{$Mc)#Wgn@a2hU@Pumz$;$
zI^cF@#})D_##L&Za=-OuE5GpR+!3Cy61JBWaqHd>2&{0**rx(?Rd!N{o{rlg5kO^L
zDAr)7ZW_wdf*1ysk4({LlKN{b?{X1k;J)O~pFCehlpys&==`zQQ12-`PAs~>D&m7%
zeleNeGB%$&eMS7KEQ7b9fqu-{u#Ii?V>bfV9uX{tdsUQZiq~c7&}*f|0y&uxr&w~o
zwJL?HyYn<5qhQupiyu{1Hq&+F@xur=@agKQgXReH*)>OaAF4@M1Apd2gi4U5Dwm9Y
z#c|QtaDV^6FVSE#qP~4*2B$qQD>S@sP|pQ&u%x))<RAcL=eOJi{Q*oq;SZ8^e{AG0
zn79R$xK<m}9*3{h7u7Op75tc`s(OuiT0DS`gN3FKr)TCVU4O50>C||nUz|o#&za|r
zoIP7iB^O-J6+$4}5ALHx*Xt<kLyL@G_`Yy(4nb_3!@teouwe~X?m!eDYc0Gb&}c%C
zS8s9LHmfHlfsL+9_hO*E*sW{SwpcMAFOX{e`S>N<cgx^n0y}Fo(CnNtK_hQuBdG?o
zv~$c>kFI@Ck1i`8WlLS$uXrVVc|>n!*(YD$@CMI4oYX|U%5M6L#nh-p*0>jOk8r1}
zfkDz-j`kLR{&%(NX7e{aXV}cyt{4hK2A0VS6|Xd%*57en7(nd~dCv~qXAP0kS`=qz
zI!X6jtGG||-3K>Jr%e|010}UK-cwMGI*a}`IY83#AGuuW&QqrHW&{(OCWS8Fdmr)~
z$a}2xtTRpTxt6nWt{x!8^mqjI$mj-8eAdG99he8Iy6On^Q(_)455Z&m4iIr#yuX~W
z#0u%}Zzqv!SlZ(rFJjlRy_EVHf{;>t?xwpKzd&)cU<2r-=#EnkUYCETAv3_!GLTL~
zYW-7O2T#-8X|&nM23i-o!pVRcpw<cK^+x)t3a1ayX~vLnh_#m{u|iC^-*N<r25k=<
zTG|@7wceM`*wI5+CU{AD05m0SYNX~l+Q*4yeF#<Ya<A$}Q63TG%fD8EYboE2o#AYA
z=lL7wpB{)24*luATF9B-z(&)Gm2^o+_+K@+9SW}A+j^gio@swXM7PHCU_uWkq@{e-
z{{0!(-PZg*WMf%>Ku-lQL$9Zq%4`^CrDr3DN{ZM9l#Sc!NqaMdRoGfBcX8>mmps}6
zxs8$L6({Rf($*?Q+Q+B$dn0%EEAdK~0D{L8(>B5hi2~RkEDp)EVK$b$XLK(0%(hnF
z%l_=FmgqK`_L69$_`P?pm8%s<w7t06s1Q({#<?L&UtBS5PcZ{Qcog?wP&idfFO;A=
zkcnyE!}A3lj8B@mS=KRF%bYi5rkgh`^h~QlRsAqaSOG8bM}Dvo)E$P%Wkg18@L~Iu
zV(xxJe_kG?R>2qv_rff>*XMREXi%aQ17~4a4*1>kY@|+0BgcekV97WpO^-Rce=in-
zmGlX|R5NZhxLN4Sfa}+#iJN0VU;QcNNE5-Sx+q=&uVOQN?(MXKJ(Hv?s2Exc#xZWM
z-x8a@SgA>_^8xHBuutR|Vnj*k<K@g!<pVt8XKBpCNGH(EA9rtgZWavdLatuFyr(wr
zcaj)I^DgZ(Rl6B(d(b6)ODFY;tv<(o^Ws%45s?T`+-Zrk&-`0&eFLD65}38gX!ois
z#&Dkhq4OK=uM+<jt?W9+&zo<@5c}*S4)t4cxSh|T^0=9e0K{ti0o$EK3|-)e-e<&m
z$v<lHHo5Ig8tQ{)im8e7(s?*60nQ8A{f2x3Y39EWB2Kq48}a<vkQnq^&~3OzMPgue
zd0b_-b#J2v-gSRGWKp{9+;@48)8ZW{<>+K}nF3ywHfozWu&Mi5TOZy5*y0La2`?`=
zsXm3pICCqJ;7y+%w0RM~F;M+uPVDBKW-CpLSW2F72qtuZHU41qEk8C%Ham6gUS1?t
zxwthuA}mJr4b9-!mz7Dk?0!hevX6^SOXQVZwJ&`knHMXZfAB=z+D(hZmB&Y(#SPGr
zi<!X|6c;$t24#<TTj%buB56-H45!`ZTe)T=kGO)+kara4@kat?Ni5&P<0km9^i;*H
z@)oG1SXft1t0FQ4$|q1Z_GMFo^@H|jj8D?#7st7${kB!-J_-sJ8dnP!Pv^EgHcT<v
zyV`**<G<LwmlDIa^IKJNlXjJMh&K<Q@UfHB+e&+g_AEM7NYr?*eq#1{R(|Hz91Zb$
ziBp~-c4swhhO#FLtCJtmmNf7NNseWmD%zx<nll0!*lNsYe96h74ATD=z4~WvPhHUc
z>KWG?j=)i0Ga>t7nU5V=tKE8L9xeG_g^~2~fkyTGhgb>NtC&F90Ozjj&kw6ZS6Y-J
zBTF@9oaw>IhL_}(b_YM7<$zk%;z{dG)~2-iTUYHQSSEij-Y=1A0Tg4ov)1?#1@~L;
zbCYI!iq`-LGTH}GuEa<nsWXAD56%(sdW5P9+k*Q)FCT?Nc|onxukIR~%ak&bJr8+U
z5QFb}thl0;y{P&4un*s?(ef1<^yeN@C_Y~4Y1R?1gsqv~9Ec6C;{Ji|7hXVfkWewa
zCW_$d54Q8uC4+!{D`|M9wyxQwdQ++T%rmY7n(w5ybbF1SBX{Iylm&VzfjUvrhTY)E
z--ORcO7rp|W`)BMDL2g>Sti;F5~%PWQ^Bozd2i^JEH>-7r_7Krd&5hda9PA3Je<Xe
z%++7kY*$2=^}8`-tjoV(h0={+E4!O^aw1D$DDA*>+%%ATNOGZ&cstM*tsd)KnSMDR
ztg%kj{a$l@mESvf+WFHzL0E|Kd8B7R{`R1V+3lnXN844;6ZtyG9W?G1;Qp&kCV+}f
zsDK){dZO-=45CeOdauhqR)?1=9Q@cfB>jm}9iHtud)9Y{l62i4w{|lB0(FOA<+Utk
z+3cj-sln`4ibdGUb@AToKFV2s$YihAMh%@*=zvY(OF5Q3Ex$Fy0*LH)?;AQoaOXE`
z4(T;-Pk$EZ%JH0B1{PUfX3DMW4JXWx0D41hRleVW=cYPUKUYntoVn<k_z{nF)iz{z
zT(zEH{DE+>wG2~XqhsNE;N)aDoCO1=FTaKYIWizH5-l7@`ZTxr2fJuEP@Lj&oL(91
zPFJbEZvK$)upAS;x4l@s^X)TgI?sjpqOx)sCNQg5@LDnr%N8oR!4)MQ*VpY<pO6?J
zLAC?ClMGqTwoR{Qdo&tW*x-rOUl@Ysc(^-7IZYXsEU==Jn@PXLM)Nnw#$*yKAdB@i
z?#*oIE@4;xu;|QQs@1QImMu61-CSWp%Rb*d>>9m)9K0E?C1*quyGb^Fxxx$*$?zmO
zc*&Gh4!+A^WlfUeCjnXI!GJt&2xSguWx58M;r=kfQ+g<-m)Op}u$q1J2HW2yZ>3N!
zzIju1_yjj+vv(%eb+#vwP>y=0CDGdv%d@=n5UXpW#m{xL%*Se%$DefAZ^x{Cc=C#k
zT0ak~RIcPU;K+8tv^rg@R5{-^1Fz3Ffuw8yGn?x5XpqEC(?f!lX6G0{m&y+Sbr<<h
z1tltJX&%j{RfuK7C)Mg>{wXtnx*H=FL0Y8|KO9m1Pe^A%OxkN9iTn|aF7=9qJoYoJ
zqOzzgLef}vkn#iv!^NO%W|?`#Nno(jb<>+dbC4dk-yhX<LnG7z;+38E!CCBp9(nK&
zb%qR1R;p*!dQf~z2gSFZ(fcZ-w9TEfoXeBPY|E2vT@&s&*;`Dd(|uYeC1~22O_J8v
zz-FrfW;h}<d-WLmwZb1@od%;S>s*4pDUnN#9|8)J?^I+Y>dgxAW1Pb?w9m6Ak8-5l
zm-z?cPS}q`_oJ4KTkXLV1er3*Wyx8DY{RDkt=S)))2e--kv^mNEA=b1CWU-gxoa;F
z5vKsy)<+k0&FrVB45`QAvHJEtXGz8Pj@;fGpNcuVY@~#NzH7e3bmBw~%0*!*-vRK?
znpwPD7B%_02!$Wn@N8o#s*jbguFaXW;r0JWGX~KE8{mk9&lqm7E}M3eMI1k?PcN5a
zg3{v*74g_~td77UW-=o^J^Ba^j^$cr%oFd|WQ<piNXV{7D&j}X)WhrBWm~NpkQj{B
znjFE=AD?kWsxCB*Cud(e1z+hhO|=wix10{Ar<hDB)l|!Pllp3N`an>(T3jSVyv|dH
zjvXhx!XoIv=Y?HU2d|HuD{eIfg^9g({9I>J+&qBlb)$S8zLnaTIgJ=deqX>A0H*A9
zT<oxHBmL0%;;}d5Elbv%g!RwjXK{DQ8B#a(#+D|K&KsxnsD%uJWO(HqhSot&6>~@T
ze2L{P_Yv>T214U248Mh_5w2t5dm~OF3Qe3wLIN++wF8V@pd|<XKT8gVd8h@rD~dJH
z5Iwb%>q~Eje}Y@SX6$_4>7Fv^zkZSKa*f_Gc~N~+I~3|TMLf$qeT_|dE90B{VlwbT
zreQc~xE5M>bN4&%Xm#A9)a&$_)faK*8`{`N&3ijhydU!IgC3zEz%et&OOGg}kjuhR
zKjFy!FCTDtA!&PJ+V$r1`YIxq?3mu|RJmt$eQ!j0Mx&)=+J65%wf(@a=62#Ksluej
z)=Q>$7onW^d+F9o%FHLN`d$wjH@h)F_3C0olB4ELCSlfKlg6P<Lm3XsBvSxIl@^!6
z@!RZ=PUD)GDw6m7pq;iDKZ(#BXMywZWLFP{(pt03$)<&BLEmYYj)yrJudNw{^IyD=
zA7r*uH07Q@LTxhCy+dlsGe&BOpkoH2t*c+zRrY{A;<J5z($?jF`kHvIONPegu*uBI
zmXoz{!Qak!8uA?^;^~_8@C)?Abr@a6<@6%OWselIY(3YxQ=<7}VFbAL<Hv7lyuF7p
zU!nNyc(&e^BJ>Zu3f)RNha+0ug6t0(8%$5-!^8KiVx_{Gv<>B~EU`_zW6TN+((ns#
zDO1%|FYLOpiP{=HFO%|etzCBC5stV&SS2oAPlV#oIcQ*nRt^T8ufrASn)nKv6H$6t
zt=hVVYV*Hz*oqKqaJpMqYPp1nSG!f{C2=+5GXl*Yre9BnEm91PBc@T2?T>H_jMm5<
z{OAc@>oY^1`Zj}A@#LYp8>)|aOE1s~L#xcs5u-Kg8}~-#-Z_KTUJV1xfAL+>H98KX
zNU)eloB^3Ey)kf@&zEOt1-y^MPk8?fGn$64V523iy@BUv_8Gg|y~xgq>XnlzDI+ph
zau(asjaIb^*zZ+tn;Hjb5+Yl3mi%(k)^ZFDU-MgrO&hUhK#KuWal2DgUWC=cGIboH
z)iT@cS*?Z6RUH`l<I%EkL`6>7%Qq=tOY^g!nH9mQ5XEW?pMC2&*B{(xZy=sQ@HtvR
zbw}kF>1q}^&M%a=zgAMG42&UYP<hOoCx7rU&-&4>;q-}VkH1r|oP)RNTNKj><rq6R
zU!HK#lMog@>XGh@8ynb6jk$2$<67O!q10y%5HE&Jn#j(R?2SRar*)UDo75!5Sb253
zI%aj7PL(W^V=?CNL}L8h^2`puw<G#0`kxrKq`L;5C=P<?y0xL;vhp*=HP3lRQKB^M
z$3vP}&Xf)4Q*dxl#{em7a7TVEr_bhvm(SweRZqFA_)6q!2lhhFl`lyLd?ioC2JX=`
zB1>?ey6!@5;iQdP>qnEOcXGvcyP4M3;&&_7lyfifS57isztRDsp?Nd+=%Zdbc0no)
z7`LTyt?>pRpG?o)NG6UJy@7S%8x&`2POSOctl{S8pRBPCz^B22KQH|pW}J7yhPJ+C
zC6&|LN7;l;6T>Uq!4e(CmuZ=}-dR!%NP-*^o75?Nt(uGxPx2aEHL%~D<Sr?`JWw-d
zk@qjP!e>ysXxCcuZyWoPI$dk$eK`bwb4$}@zn8<syhq2VaTrgf&D=JqKJh)Y_d<4m
z`HPYl1gq(b!k<|@*HadcNJxMJDZf0R^J>|y&_|Y?YFqZr(!aV)VcQMSQPp)Rx1(cZ
z;YL9Ok)~1TtaSv!S*OpP56u@&>kAg6;(v&q$HBp&by;=yTH1KV-MYN-%+bfnPl^q-
z+n1zEK{HS>S7DKfuR1$LU&T=SYtgeC+*CF>PW+UeXm{LF=1d6+@K%}+VF$n0uGrZ!
z-Tk}vL+UKfP5I7UYTTp+yX@Q7A{Ynj$2h8>G=qI$J=3o8s$9Cy1AD#mz{tBa&roSI
z$}~7EgP*DG*gN}Us33Ptz@u9EeNksq*Zd@BYda0NEYf%0_`-kW++daM;u1;K<E%~g
z-d-h6aPg*iZZwX|o-Mm0t_0uok4@lM{=k>04kr1?#qMk+7b`0ogSd1fcz`qITL75e
zg}EMvAhRAOL=z<;io;3a4;%a~+gI9#YfxwG^bIc|wU%{G+`n;XqL!_&5N1p!$Q)uJ
zHSw@hZKjj5(ISATu<=K&{%=UtpV0js-2s885l}@10Dk{5QM<UYE6E-a3`Tb3t-;CQ
zdz~T9q0sNKXS4T5HR~@(EmVafy8sg^rP|^)WEddQ`L0p05$HUx1sY|Yj{-1QyV#Ix
z>n>Kv$qe%;Y|H(d@GdxPuI{nI3$ySa&Kx@ao6@%W@9hV_M}K`_wAI^Q+8aOkHfH9w
zN-J%S5q7vm^v6d0?@er>DFkY}01;tgE3Ld}O{{2G5rZ@<!OOS42lvNgkssy(3}17-
zy!|TuA5Mi2d3@es@O2;*I;NZ<{^8huyK)mHLpUU^NbQqI67BJVD~G;-5)jSu^%)OS
zj_111hpjJt4BGV$>fb=u{}lfJbJgF}{T*5l1(>xAL8>|TPiD`*`W7a6tps*WW#(D#
z8US(s2p7M#&TNN3?H6DiP}j8I?B}u*=I4~hI;4v}w9N#*r4uOoA$W^D!gv~!5uN+y
z-(!6OGm#x;kb?sKIv#E^T3^K%$;L6J2ftM*vc5t8obJXTC3>h%^v6E`U&4w-h2ws`
zGWa?AEBe2tjBSO1jh?LJ!u|(k|Hn8=p)HPc?^RL%)ufD1)*aW1YyK~-baUa7b-$PA
z4Y4Bs=d8is3fqHwi^QexcfC0&vnl&8gAg)Ad-mKRlANRI!+(VPANLVB_EM6&`#n!n
zvFg8vkvYS{5v36-!~I*YS^+Q;$-Dvc|63dZLR-*7DJ+}?|30oVSO?{q-W{gt4@mx-
zoIoIyJQF)f<bO-h6iR{C5sY2TKe^`LS833*DT52KSpVVVzk(zihEh<s0J}i)-&_CT
zn&nBhE#y>x_=vv+nEXUR3w$&GzgcAz3ZQTnk^ZMp|MyiO{SyUFNDkirlH8y!R6JWD
ziT_(qFmPIUPzp9NRv`aowFN33Ao^R_e^FgW52aw3xcl%A6#tus|5Fgu7)<_8K`{Tf
zf}ra*_WxE8EW-c)E-ugq$73^!?j{GMKlbQ*`o(XNro&OH^_^H)(}?G^Lh{2;Cf{>N
z`9-+9L8VSr7f)X~H~N2lCYc7*k#AUm#u=eb*)S6&^Qa|{#{VH%9@1VpG%cx-F&J`T
zz$2(3o7j7EJgzgInOA<^f~lWBD~7;5{(eLEKdzi?8UZ?wcFZ`*(>z3|nyj20M7}b`
z27WpTD9SmFaV1hyHqpc6mXJyfOW#fQbu(%SgUi?Vkf8HX_mRZMInl=L`@5IVEtYSP
z8ZJ#I*3R5ZTJp6_C&sOPbFFirXV`w2GqyDri4o$BNLL4-fsW>;^R_xb8OnC5zB=Vw
z_@{>El0P>8iW2!`LIK7&if^%=xa`)+T{kD^_xtswNM2g7`4lp*&eePE3|7+^^1A$H
zy8FPbQGO&sZN-u&D16~^|DnqV;@NTM)t$&E#o1mj>E6B_!&Yt*(thOj*O5I}jLAIR
z%C>3CqUmr7Z3Ps<WjNSFEuG?f^Ga>J@>1gjvtr_v8Dlu2+ujlSD!ZwoLQ~_pjVk_q
zaQkD+34eJ;lclBBYU)x>#&1v(`vn@sR1>+7o@g}`ML2qVpt}FXUP?9src`(6eaOL`
zX};N$B%gBJ`Es6PA5YRXOu7B)Yfk5=$c>py=r?2KY8Kx@?Yk9tZLYRKNU1NGbq9ZY
zPer8=hVzGR;0iNrbO$_av>En_q(34OY;>jvjs?O~%<e8hd9m_JO&{eibWwxq<1<f{
zrYWk;&6yV%)wJX#L)s;B10+?LI`Z!*csyGJuabr0uGIW;)Lf0up(jm)kysu&w3_jl
z(ZBdK(5FUs(KNjE_U5zCw7{9%<<cPMqH>zHJBKxO{WbQ@<^U1`*RT8>ORA?Q3jv<6
zLmN`F;FAxMfFt!fkFQcNt|8S+HhRWsm*uC$i>GIgm7rf}uHRXJ`*>f6f`Vf5jH@Dt
zGiV${@+uHU;?c5FZ;6M?xmTm873pX!blEop<%9iR(ss_+SAHGWH$08K8ifoB3=@%>
zf+4`V<ZTyuay|E9dR$z*?*gl222VC`4VtifvfjYjCzuFWT6kI%gVurE)ZLDH>981d
zgQw~{bpZOz3QQacM!SdA<MXbzYF7lV(KMKWp_k7c&U2Q&ZdM{u+;5am_8-!zuD#6P
z;W<y0!n>ZU!4luP5Q$BRqUnxHS(MNJ3yAbXLC!#Gg0l$psbv1o#*rOFQ;I%)Aotyi
zS(-{YYG*{doG|DrMe3Zc-bX=Yw;V5+L5q$<ad0`*vW|Z%USy7wvG|UouuVsdw&bC^
zPm%^-R%MkfW=HZ$C87HqSnay?IR%GVO1T(!sUkkDX+Pxc(OGdx4KvmZGUSp@*(uPI
zsg9O<W;);h7R+>^{b;JkvAN(fK)T;+Dwd6`sN((W1IjrP@DBSdq2Qsm)gu%87C8Av
z8}yLPdUMIj^eSUGovl)_k5w*j>W#mZ+Alu3g3hDu^Kye6wJuAKW?;OavSs*k+abX3
zE%RlJ%dimEEWSRw8zRU(;h}l0_nq{NIW%YYzI54#9&lVId2Yb_lxRQnaHqf2E63qy
zzuQA`IAG)El1(Wx#@dmlL6S)40JI|BdY?!53+8LcwV{>SF=m%uj=WQj(eeUw)trB!
z%;#Xn_$}O|rvw2^tcv)gMcY7Ccp^yQ+v8?Potr<zOD@AFY1E)Kugl|HEUS%0uG4bj
z8!K0y5e5Frs|AK{8nxOAm1%?>V$#)tqr_#_;Xs(v-)DK(tM-q13PLk@aYiOzx(D5(
z8#Ds=8&yBEAj=X0<%xW^MEon=0RA5y8}2jayk_zf#|dmLwF+JzX@++!APhi=-h}Uw
z9th-8MYVmS`krH4U0gcAX||8F>?awT!%ONvuqNH;<NDdGu!USA_qG|p*PvBQk9rx?
zr5j~%o43_WV1JyFK9$v4zLIl((O;SEtGL)KCbNyk$V1RBCR7}AFfpo!<T{nlP5mJ+
zz2DwyjL3UUYv0N{AYV4B(tS5Y!AAy(U#@KOrfHaM0+&{bz56{;hUD#y>qc#8<3-89
znW}Epczv;vIszAB&hzNMa)bU9s3=dtq?3P%(h}A^fP!G~#H!&U?V|FgHz&0qW+W3!
zU~?bIV64;MTV`6%zk^yXn`mCD@5Z43jtCN1qh{x6o6zZTX>+UvJB3`8^A#~Ku*%o0
z4b%}`e&^S9bJH%qzs05#VC+DHk@Mw#+m)k-YW16(!`3caFzb{n<WLCPRwBJU3ew}#
zOf7O3Gb`<0JS)xFS15Czb=%P1w~Ox|Y{YIiU%(CM4(}N4Tr<iN^yYY|o8c9xT&UAK
zI}ncl`I_IwK0&^3RLV!u*lk&hZJ6Y1So#%EEIaO{#z)+_X74Ct%fya{@Eg-+4&|p>
zW?}G<qzyY|_s8Cq7k@cpU1X?()L0ZYeR2{Dcs0<S;vRImz#XueeNxj>w9P$%9D!BG
zqd671?|MR<(jKS{zSVx)p8c@(gC4Kxm#UU60;DO)XIwaY>hm2@JRg}B?XjZ#j_Pl&
zGSdjGh_Zdi=E?_-v<ma#O>c+s_pPn*tU}(h%}kflbdKlc!waMOgROi`h2t1QipnY5
z58m)d0yKaKhF0oUV*|_8yI;2(FXt<H2nY-CGVaKB?In14U@>ya_DCj+w>ouH7(2_>
z1wB3x1JY<7_RJcY7@RqP`%M8-Fgl#6FjE@p`L37#%JpVA1YL|14`!@%Ml0WbCCzo%
z>C-ct9;axInE?iVAmQ!aH_1)Q3|y8Ku3H@BUy*$f3f1159J9<?(*Ung-JHd=Yj7?q
z=5iWbwUF5RiLS;}#K_=VZ-;yanD><*-<4I}W**(0w8<@Z*vXP8SQ%CO`z!+aS!=jE
zj4QQm$I$&fD@k;f-}dIEWZ&cS-&=(8*gC$3BT}b13w}ylnMt6YI&wh&tNc^kh(>9K
zC(@|W9gD|ouLSvjFYfJXEwR6=9&X*+vo?7qScI!PMN-eUN!(fPx?9<#cE96aay-5=
zo@hZvDa~#Ki=kpza~pePe{gbD#m`c6Kbhr>y`jy#4y0_sI*{STX}bN=;`k_4A3WSY
zh{4!r_WDOrTLM~qgxc~=Q@Xvuu%X%OhEy%Yu|S9eVjlGU3);%5ekLZhaNiHXmR5i5
z1CmCFr@ltrCt}6RySMV^Z|M*w#FTg=)cMPcztgUBWPqn$VV;lxhr6#DtOKw(>ZV8Y
z?$R{Bfu3fq#62^fztuj@;{KUeqzCWyKwxWaV3Lf8{_x35!Rk_hafeBORpBA1=dxD<
zx{11+UI`D1<Za$SbGQOx<=OkW#(mKpt23d7+;~6Z3b8fLZb3W)iqXL1YH(UjjB{7@
zU+fDF2hXv;*nBnWy!kHH;CF8P3Kv>0$p0q&^)KM04|fC;nk007nl9x98i_m9BNcoo
za?5PR!f?2o=B2Uj@h%F9xSsmR`uV{;g+HZ8^q4gs7NZ;(o2FEIJ0{^;!^(3WvGn$r
zHuMD!*UQm}Vdpp-vb`%HYakSt9OxGrJ_3tx0Eg)Y8ziO~StcZ`!U2JnWWBG$qHO~5
zHRY(kZrMx=3DCdVW9dmX(_t<Wkr~!idco^iBV(PyhH0~`Q&tp>o_^@)wR}1-S#xc1
zCGCBC2<iNiG}me7;3jdv@z<svH_HrDmC`_w81y~+13pl2E~G*)Pts5O66>}1a@xv(
zQ2bc4QGDvmJ}LgnV0VAEvsjtp{Dk$!D47xXEK-VPP88aKas96%d*CS*6ifPCAT<g@
zYa&kC-NY+3PBw|Mg4NNWPL+h}mLCWl1&xm<ty)!1VvmPaguQrO9@jxfo@?Nf@x-?(
z#r+I&;XzR@0TkMH{vgZylig#h$M7AS;2oMN>r#Sw9kv08t6yDU34fQw0vWq*g)dnq
zeYcWTa*j=`246QxZVl$iVWYg8P1jOe^pJTe7q(TaIm^s35u1!aG8+ALY?<6R*aS9O
z5k$_Q!^&J<<WY+(kV-{HEwpv@mNwS3-G^+*TFtmEc_jQ`a&0Fi-K?HBdLTa4uy~5e
zGMsXPjg^ZBh=vjKO8Oufwmx`7hRJPzb~|Tc7XMKMl(`c*^2uRt{?^rlI{GGqia*0f
z#*3wv+YZhs0}0M()0ME%PFSkK7Xp9lylRtiPapl;s0OQ`0p#Gu+5HLVR3o&*5!q++
z77H?X$~;yAW^Asl;y>%R=bfc2Petxmjp=ACP3gtB?-z0whq%kt+N17=5LUuSoC|yv
ziisxm(2h9}eCcbw(x|MHt^ai=n{Ws*Z;!v|Rvo&6BYW28oo=@s;SVMehr$u_AcyvP
z=*;`<h$+T1)ufBiim-*1*)ujwAW8{aPZ%zIPgwI!8Yf(qS;l1Yy*??G56EEA#K~LK
ztyXG|X$(sl*#W`Z^=<|8yn~cTz9vDsfZ6;7Sz~8?l}l>HQXZ}|g@StB4d(I|Mm;O&
z*Wf7M*3#*a5```D^f3KfD-uoR4V(EDZlb?|y)ATQ%^txXJyqg1;sW@)KeEqDQxdd$
zC~Yr!h+H@q@AUBIe++sqeJl7N9&^uDvX6?o?k4A0ALSN6;nrms18MXX@wW9&oI~1%
z@~j>mMoca7y(dtONgx4uy2|b@5g!T3R-aGNcC{i)Gq$vi;8@_NbDLK+7oUO0fdpEN
z!${Z^C&w*`QO(*s+cxa9aV$^AA8lxy_Ox(!^^3pa^!}xMdl3%DN$>`GDogoS?rcwA
zvi-!uLh*Rr<$f^f$v%?V?aYq3+pX&Ds8u+W0Zu7(|6B8L_RJhno29~@EYAupws{~u
zf%jBgk2My*MzFcV?=vn!kSB=Wg;@go1o1h4Lwxs5<C<R%nV1MT9%q>(H|J3|=SX(X
zz1vT;71?zR#tPm}^wx7Ov=udvEj^bO^d^fR?!BKKe6;I~GcYI)972+|CR?<3gVPdd
z#tvf_Vx((R%F3!eQ~*YPd1q^BfR}-bRqAh54}*m+DssPglj46I$Bx>6YMhL`+n<)s
zN{6LeXOKht!jM#PASXeaUoIJ&*wZ2nfFbG<KSENox1U;Qh}8h_a}G2KG9L1?qs@N%
z*nO7VJ_=t*iRv(e-K|}WuVG<&&wn#mkryahOirxnU+sooVd8{{$^sS4<LW$u>{4uN
zU^_W*MG``P`Wni5K==0-(B$I%O}O?`d77L2<kU6=7*aD1HhU|5J}@WMmp=5;<4mpt
z7j4HH%vp9`G<5T$XL+xWvkH8^U!@W_RJpRmPUY2cVWnP|T4`1Y&AiHCLRok7d}DKL
z$gIGPUHbtfHcPm-May2G2NmcUN~TGsu;oILQuO#kSd?wDdB2qJ16kfv>5Fo2dXm==
zTHZnTVl1U5mK?|-010Wi%53GBxg#y?`Dpi&)({{g)o@;0;#K(w28|3cZziSPm{4W>
zfgN@mhg3kX0DQkW;L_J+@q>mRhIiXyJ^4WnRR%bIhH}=K-G`74^T$0krnJeDl$dYE
z6!22|{a)rQtExdCANTL-t6}6*G=I<4Bm(uNzqD2!jt$0{3=&W(EIu6$pg3tFOE6^$
zl0Jaus3CK2RoHxQ&dF1XH2XfuPHqS;Q}X+1Y{6n!zy8)r<6rGsIjp*tZfjItcQEfX
z2M-HfAgi{r$E@?I+Ur9`^}c%=f|Wtj`eVmTpH!JIcov<U<4}tGjw7*J?5%<~WZ{YU
zC4gk^)|8;It~#Ydx&@sO>0<W^js2cM)z2HS(a^W=mU6X7<n{z@;{yRCL}cu3l`g4^
z>hY%MY`mW<INM4@RXWr;(>8JHJ5p3;Zr^%kwi_UhN)xQS0tzcl)Tu<6wU9>VY8};z
zdLvP<aRtLbI%UA$(<C`8?^$bV1)0p=DSzu$+Qz`X;(2A6S#PWK@$VxigPl*l^AeW*
zNo2pop|uM$otXp;HgH9JjojMvrezc>-BuT=l%Spyj@kqo1q>w45bbm$YWtlaEmOzG
z%yP9$@|ZXmg4UiR3hl*aS3{aeWiY#7$urZ@b~1HG=uWGJ+P>j8nOh7pDWp8udcH!&
zI=(&wQ!GQq2+D5R$}bRMr!_4Y2<$!-<3Mg?Os!^TD|%{uB#SR?6!#xSHIovMxMY#p
zqi)9YxZ#Jn5E)sAU8XWjdBzMsR~t2EYqN5yo8`gZ9$;A`Wq@@$%UW0$0ud(!&0E<E
z3q(Hy26~pNu6QsP-uJ;sY+5C}aJ4gWPaaGncO{w0OV*3)j=jj9SXy%LWqn=t(A$XY
zM*1_pUk@Ip$d39_rk>(5;*_sNq?|)MSm_AR$GG`>pCYj0X=A|)U-1dHlldd)d#-=^
zZ}ADZGC?=^ab&9|h*-nG*Y&E)gh$<B-AOXtcVA80z%$COWr>}ga<-2o=Yqsvww#01
z)o+bS?cz>QZTFDVdVEvE_17RQ@gdP5mQ|LPjT_l)11&)J&92bog`BtNh0&sxUuaRf
zQHAQOt^dc~R|dt^ZEYq5f)m_bgF|p9f#4e4-Q8U}xCeK4clY29!QI{6VY<nC=lf>v
z%)j|FRk!L?S9MpNv-e(m$+Mod&TcQs@X*2}(>P#KeF=xAX@-*-F@cPhsEz_Z#MWEK
z6<e-;{plq)SitBy`nlQus?iu*vbb$V5Op^$chonD*Uq0~RjFv9Cw-jDLr!7*Rs8sf
zon5(Y;A>UWGbP6c#CjCZ3x%@~t#}eMre-9SsnS7NM61%IgKWFUc|2#05%66(p7I~j
zHTFKVCMJJ8gI1_ay!A@wzi%CNBzjJlxbxeIm&xs^*CTM>2R0hj{OUKWdMA7br<KT9
zC^6sN)>AP}5vHY8Hc#f+llDtzk==)0arp_Ywn*ztQ?ludi^uND%`imYXfwqkq$d9L
z?<=j^+)%(A=~F8|9w<lRMrL2O`!4<RM4Ni#q842qw6$5WyCvfHd$3XG*=e8FL~26e
zVF|K);wWqQC(gv<jRXF;lB(nU$F&LR7R{mQ7K_v)9O*d}-ri3ysY6^XVm0kb>Xph`
zs<kpqzq6IyzV&yDa~?Gk`?Dd!?<+5U;j#UV)n74N+*0&oIUvG6Y-14<kKq$I+YyE<
zt`dvoL>0$*wLZ5Ld^_3!M_Ic{waO?_ecyats!oY?z(Kq<G(d`}E063)oyFnOnUT$a
zPS+{<6G47!>nXA(@?*zj&S?WSHtS-VczcplUGXq00GKHroXQVfpbM{kR>X?<V6@0B
zwMGl#kluq=kpgQ@;%7_fAo{`Ry%~AmtNTsx%V~(xl^GM(Mws|{H3#y&ay4riTOsSq
zcnRX&-m%gl%4r+tW+INwEzHgSUBu0y+bSOo6IRD&U;ahXn904-P7m3KS_=2j)q`nL
z3ZAQ918g>f*~8#g3MEsMW;=<Wd<<tJA0Zv_81JzhEv?}!vz45ZFK{3S%Po$_mzko;
z>H;;lJ&$KI>&lC}u18uE%QF}9==V?NF{W*$^_=<5$M}#b$*|WdJgF5uCbjnGQ<EL0
z@FLIR&9*Tp`cqcky@N6VodtlyY-M=h!mL}%tagp>ya9d8X_`KS^gMMX=};QC^t?+|
zwGFgat=~!kqkEZd$*3o(e|iq))+9)=_jt>!yd0`O+S&?PeNLa3&3%ETzFHrTus`jv
zjliznKFCtu8k%v+tzB?_J$`s`!iOJY4not#BV~c!zq@Il*y-~5Ra?p>`MN-itBBQA
zQAt-_W@qJv>$y5yQCOmuKQ;!te@K3(M@wy6M{A4z8uC``>~ID}U3^yn=Ud@2R1Ltd
zRj&Dbe5#-w7v?*fD%Z)iQkZOXm&!r*qr~GckIC*{*Pf-hTEGU)z1m{TDuMUZc=w2L
z9r1dWgOC<X=TkV|yKE-^gTZ-J84tpBY|n31?6hI@sNWPFfEqt6lDRzkPWW<Ea-Cno
z%PK<i{<+awZS_1{O`cf~69DhjCGh_Gs>Sqx^*cnS-Jcjh8<s-xuZO1QYc;#E!psn=
zhIK=<`v4TdFV$kM&DTZq`*j`WvFZ%Zc`*{MWA^(al!^hq_SFMSx*_ZA4*n*fo)7Wz
zl*uV4357jfK%=nih8z27ztvk72c@q8tftO1d&9h~ek;J+V@)fwE`PS)O+ZRKTkTUK
z7ILHueo%aNs5F}!7Yc;{Ub;iR;@^7-86tr}T4HM@`{eBh6p@a&fX*$aJ!7pL-_^%k
z{7H{u{K`LeN#Lmpre3CrM{bUxr$Q)en5)kM$8VN^*slRZzKx6ZHE{pXC<*U`1yXN5
zm2g+qNk9Lb=bgse+T*j6_{7G8y!frQp-D73F0VS(ybedwn`Duv<N2Q~LJ9bo`-RII
zoVUjeL%2pHS{M^>m^PPdZO5WDIb0-vaZ$X!pnv(EdQ*~T2)p1|4RPF^*s8-a!YbE8
zie+)az`?#Gi<|uJfA-0Bh=4d9O3^`3HV2Fq5P&k^X+>XOCx}L`3bStBPp{(fb?F7d
z_I37s#Zzt<Y%V!wl`zgL%+{!ewhs02%!K(Xr7cjDUOLrN4SZuMR=|f@Yf@hwRofr7
zy$b42Q|8~zJTxl4EQTmN2%k>78I8!V7o32986@oVei)%6pi0R4ZBk|-A$&iB`maL$
zJvGpQcs-`Y{qG$DznFmKdD}c{6DSa%eADlLKK^sde<b!Fh53)Y{4ajt|4Vmq_6h+!
zhv@Z{M}O-4Uk4B!wSIDz-%h-Jh4`IL>PzUuFF`{MokVLAsa&$IwA|vSJ8!51P@;q}
zMzxl00AFZfG54Ccs3WuA|M~dS7J8155LH#*z-0c%QA80eoqPwYDb2^EZ@z@G-!LWm
z!M$!1IgEBVj7FctzeEq5r5^sYGaS9#_2eCk?f}*p8q@L9hhW_!-$DQS_luv6eB1|2
zm@SPbNeYaV|KF}Pa(;jhEC5`@``@mNMU;$=iR1iV9|+$g|NE8E(aG}f&jbE4ehe+M
zws#}f{~k0S{#z33lM9EZ+4Qo_(suQ}fsbn!EE&QHUE^Q$KJ9%7wSRZ(o=MT>;wG&R
zw})kDfll(@1{0A7LuE&HFyx>EO(0MXtnaXFGvBIy-FSI-ZxVKoa?t;VB5Kw_mZOGm
zcEP(ck>_kqqm_X?npl_=P9^TYmV_Mk4kBDISvEWX^xH;)H+o~`lQvGc*A<5=g&#pJ
zlCg*?vv4sirk(gF8tNl7wn$v~T9&&zrnQ~Ls`Wjb{)fBgmgYqQwJND2)f-etchXi(
zJV4dpm#thOLqN4FM(~g$;rF8DFSWQsMms_?{E*^Gr&Pl8;c|Zl35T^b0MLoc))S7u
z-WNx|?Gfq6_b|9Yj1jmHpiQ%f1&eKWTKCJIja=fgwGjwsxy8|ozz3eR`Jh65);*W@
z`6al3JoUl!tH!mP^Q(0J*#udB%@WQBtI_U2`W3*^x`58C+DMvhjAiMc(thEdI-_3}
zN)>X)M=iZg&CjXA#7l80b8R)4&10t9)iSD$FnYx3>~$d>m5a+din3UWBLlGYmr|5U
ztsYo|j$V6~#RcXccD8bz#G1{0{}H0Dq&JvwNl-N(XeSx~(A?*PEG=G0BEi;dLFASN
zUd%e#M$*zG3$2HoXR|&4j66}>a4A<7`QxsLLF)Azwc`befzFcr^xs>IiGy;}^V7hC
z^16zdF*g@aEWJW)8k?h`5Rlj%_rQb`p>QLGt$`{OoT!)nS7n2QfrD?1Pznoz6xc?5
z?GUHzYfWIFttIAfAvHCeHeN92wIPp+<8GFxTP@e7?+B7>;}<r@wtZH+4&faW*7hXm
zB})Y8eI-G#=k#``KIgd}*L3%+?g6`t)`XwX)CPYohY`OtH$Ur0s^+6-bxahp&tv{$
zPxjtG-9hNkQ+P81KtGiGcB2_4BB0vJTzsNCOzojw_j34sR6-5p%iRPE_q{1~R8&+3
zH15KoE$rE2KIhjpWA5<WODgwB97>nZo(Er-JRVC$Y&AL?<-EGvjt_0-ppHcn16h)H
zbPF*2#OrF^1IZhH#YKh;Uy+_hpV&+;A4jklz~EMrkG}k4ri6$<^#Sys+5Mf86a|AK
zcz6vI1cKz2v0bh1$QEw{(~w-_ky85FYw@ueGJBHX8v6n?nDFNLNP<%3EYnTQx00nh
zQvXF`)al2xc;6_D#aQ{O$<C@yI#PZ>Htc$}+1sPvBQqdnbm;u<Wc#}j6Qqbi9XjTc
zHjV0c&0M^Fx4rp|l5Uq<Xx!H!LOHql*-ob`D^TI1$m~V+^s&AnX=kA{922?<ITWf5
zs^fd+H`)?n-(8EsI5#}0pe4+tvUaYp*vUjqO&=KG#$Lca-c-k(23*-kR80PvgOVN+
zy+|~YlMolcdpYZTY?zx1Rx~j>3#8vXX^~h2FVGpWfO^!^^$~1mp7IR*B$f6(8?MO7
zl(Wiz6_B!y@MuHHN+GK9$(HBq(f;M{?;SaCz45RoLWUjpXX7>;I5KVzs0X83F)kAc
zH$uGy?x7<$J$nfps^H<YQ9c5B#g%0rPiIo%YBLtoX@g9d@OFwGxQra`IM|sVdEHMx
zq_oX_u5}~vP)0v#;DHQB-2BsIYEshWb~>}>o=rM@oEog7GJp5OlKenlO(CeQG+0#V
zT6Ep-&73mSkb$n1Ha|=V<PP|6NfFCBGA$(=3$3W@c(~scdbq9~)E?f=*m-@Oyq3?&
z$!j8EheJ-Ku)dRu5usELl@#yA((rX~P_z)TX`}!nHPEGG9l_gFDz9`U@KjfXCXox!
zdVlQ`Lu@|B47vXcJOg&CCj6tzUIKvjuq}v<^#$ticCjXk3C(QKNVh<NT6PiMnqcW=
zZ*i@J$CrgVt%uPfWhS14fb8{2BeWJyqSnQ<2VFwk^#k8$6|1580)6<M&}$6p6o<Y_
zvmx{&o*kt65{>*V$)1R~5y3nHIfb=;0nr}jme&pGircQ@8FJFyBSHD6A$5HmXtgWk
zb!c2E+=Z5pV<$X2t7Yy{eA%e0sl2_K@4k^BaKGx6@EKPtR$WBe-6X`LK_IBLJpKAB
zwPZw~)FjD+4WmF(BSx%%!S(;8!^V1?cr)@C(LRr(HFUB|cj42zTXFcwLIj85UF+l3
zd0I{u&k+qkz#*>I(T6Ks75b7oruv{{g-rP834?+yJFc;D#pPaZ0x?j!haz9&HmOEG
z7Hn9mcPFMI1v9C(uH6)my6-NIE7!ta4vv^F=`lXX`bEJPGbnNl$k%d^QNt>YErg(^
z8UCoS9uZo~4<xO9RLscvqsh+T#PcDxIL{4b&@~N9;>T8LSb>fyznh$Q>|$I(9Z%uS
zA_2-`pvKTnXL9pQx#Sq6%J*E`?h*x=;=Y~SkP0?T<Xj#YTo||&(0YMkf(sZ8o0elH
zv_ZDH*9I;R=t5+x0ng&uHjk|v;}LGh78R%+do^r;<$F?#pm=mFMTxMy$1F72-&-sv
zaJ@b-0Gm(&gH*3oewKkoC@$q9o!Ha+w0Wpky*^Kq#ml@3>7;mg{^S#4EmOYHpYG?S
z`2|ZLcOuT8s^#w47I*49Y+rZJ-Aj%HbMu2<gPWQEx=8ZlP<j(0Q#&vAvqpZ!<|>u-
z_+h`HsOPUy-YVu`R(7&Rvr78LVsysyVHB^BrOf@`d8)mN<g!Q)bC(#pi%hpJ*=X`R
znw-eTm1l*Cm>y<cDI7H)wqqe%BT9(BiI3n9(=8u(p7bXN&QG=hWb5G_DPlbyr!guV
zfqe}pp}}GjY<}8vj5ZkscZ{L!kB*7);_O%H^cg>bYHUzrb(T}Ot&)qL6&Gv1DI~{d
zEfve;XdnDGVz@7E6gl1&yv{uStaiwCZuD|sk&xk=h#TL8w$g<B6wUWRdW_CjyEBmw
zuXA*lN;Y@z3o3id<Zqn64%boy7?0Ren3E(x@n|{LTVbui^O@6d^_~O&)fDE&Ydn;o
zZ6+9>$L%W$-;Ze3N{za_rI<e`vkSb!6LwxgT`a3Jr~*)o%JxYeMDTS}CtWCHv8=0o
zTnsid=1<FaHkhXKhT3yT!zvbqXu?h1n<8DOS7;`g=LIQiRe$V$ipQA?L>j+O&(L+q
zsb*;3&|>)NP^ZE2*{cB6pKAr*h$Z0}dG);(Y7pzjX!ZJDFNAXAYW7La)>t3xn1oDk
z+4Zz{7%X~+TsNS{Y(_f;-!F5aB-S2vv`;!MMLW2rU|uf#Pbnu>pS-y;n_S&9COt;@
z>4Lw%?CNh{b+a@$41|(|kn28fD)07pI)+iii$0!L(p9lNY&IuSMRoK7_m<_~NMv!x
zoU_^GAD<WESt|Kwe5F42P-}JMtnc(r>xId|7^qE0Kh#mlX(X0rAqSmdn!%~Iv+7FU
zPtFw;;~uLp#eKa07k+CB1qNU`fw6E=AV^*7CDBG>2P!?i#Bmrs!X@tM!|zP$IrpO`
zwY591zT3_mdh%wXXZ?2H`Pa5-N3-Csl}r!_rIPW2^5$+Q97m;9tB_GzHHbZ*mUrWK
zi4&?#T@8~v<Q?Kl)v%_FC==RUv-gu-eYz%gzkeR@;$PS-NivTS@lg=V0jR9)3F4?0
zRoXiydNNxfh*8Jug@$=gS?{^fINxNr6&%dTC(FU0>uw@z*#~q&zz0-lcUI$P5}Fm6
zvm}}z^S5l9TdI;m?;TYwpHLtS6jzPLD1A@G2uhlW4t-$REJ8molt4<SVx$;j5}Eca
z?vSPZEs{tVs+@lR@T)&VnCy$lq&Dh#o@!J;oXc%3s`m9LS^t&7#mclu;}3GI>x(t`
zH^jn!O9l+#kE3|B6hJ5quoUi~vNq;m^}lTo9t^M&O4sBOoO>7d(nmI5W{dagv_N=!
zxAM5h#C^Bnayt{_IWXX<CI<(VN^6aI%qn&<pmqGj;Yh&R=E0U`Jc}DsLfxk<9Ch2J
zJzA8s+O?vhkh-l6CLC_gr-HD|cXLy^T!2tX1(pB<;es;kS=}+=!rE|fqjQ4Hqf2fU
z7x*c9LaCd6lA014yWPbVY&MAOkin^hV&S*`r96^>;X|F5^P+L#@2dIjH2oxEFnKZX
zfH40J%9V{6Ir-6yo2~S-_4Kigu~WRS(<&YW0l*V^VT$e0&DCUJZ(_%Ua`6R!kct`#
zz~a&(^IZ6{xpr6c<k3G(h+NF(Uas*z^)VtH&W!j8?feSV7(38a@;n#gW-@8O2ymU8
zV9BoQar+1J?1_OKZ4~b#IY@vwq28$-Ho1k+w+L2Uuc?t_!fj$z<2#293lALrdDq_-
zug4gV{ZvyLqmFo4zVo2Z1k<U41x!Q?sRRhPIqDvtboB~9)FPTW@<MN_BScqQgn1Wu
z;YHA?7F&5#-V14Xob37r?216zDo$@&(SBg?I3$?zoJ5c97<DJad3u=UvsN5nEZk0m
z3gR~?N#`QX+~MTOG_+2>PSSzGy`By@OXu<eJS(gSlFwKgqzAA(khHi=VE-VYg25>7
zjNarfCa-u-vL>R~1!wH*<qz^!Awyyavpon8#CLu7XX-+1c(^v+o;a2MmG>U{AIRGc
z3B;G@jGt<Lf&#B46j)J5CcLsZ>B66-(7d5|MlW?fZl0B2(A?}Z&nIAMUeypE{!Bhg
zNmhb|)OD;Mm**lhE50If#n?%}k|nK)HXDN#cM#!_vWnvewKh#A5<?Sswdgld3>ZJ#
zl)Pv{T*-gxPm~Scp0sOSPRgbr#=!UqgS!%~nu9SPE?Z*NcNXyldMq(wN=NZg{v+;{
zqU2QJ%x%4j6?s9&gtx}_Y9|8AVxGLX&6c)(rv~QD1i}$3f{IE0S&m9346aKxl?*G#
zqJ_Hlqr%Ebmd=xbc{JlJJo*UAzPq0ec*s9VGk-h?T#(JpQ-Wl$lmOm#vBUz$uqzy6
z?S@gtnQE<R@;jK)hhcjZV9B0OU#ETWV7Iqi-p=LP<!TxnyS9zKb}Q{->!O_Q@Zx5J
zACKl1aU9w|Zy7WBZRcJJ7Kshp#l=S^R|vkJ)rX~Oq=V+R0KsevETFg&U3jI`2OUDs
zb%2!!Zm@T5NoE3EwKRNQ`#{M>FL>?ORxui15_sSl+7Sx_H4cIYEd)AL4Ej$f+?i-0
z7(<$FAC$J>VS8!FvLp@X0(ri+x@E8c4wXV|S)@5nJ8<Fk4O@u;iMVJ7nnkA=9byy0
zs_iK}i?XS`Prw%s8yuwpU1GkcAkXRz-b4-D_GO11W41TAApoYeYAuQ23*kDbh`O1Z
znv?b2mc3m4Yw{NF-EP*`eyk<P)zwGF7u!bqhx}Y3(F=NIX-UQdGo|?fV&M_6_EZdN
zzy}!=rXtx7fK-Kup0H`RGy8ePWE55IF*}%$^VIw3jGXH;?!c&q47QV2@OnN@pgc~z
zx7L(Tbv8anp-Am~rbuy?gmp$)GHg{P1PJhIQ8jXKH}n5sD1PFQs59S|S)7e>PP%mR
z?E^39I)IFKjv!DZp_;mxt|cwBJbyT7RCb$-e$~_6|2T}d$@NG^h<N*fcDD~D>at6&
zUi-zACQ&<HHwH}DI^13CjT;$Hg#u=tQq|wpKqARVMsePVHFJI?{*_aRG$@Y3QRADP
zuF-n%l8uM5Sg*x*b-K#8HG^7;6<<K^#e?arquK`%-dm*Mypx~4kr>=qk<weJ3|G*X
zWJnoA`+=)i)q&&SN|xh5{*t3QxZ)x`k8pp3!~G!<R&>CmA2TlKN?z;t54iwn8f$(j
zSrzj90!$P2knYHIlsXauQ?)QD#=wqsN!|k|=JNb9*I+Sg014#wVjRh=Aq-B0_|K`}
z)+WXs@Y2qiP^uiFZ|A~c!%&L#rk6irPOn9{i_Ua4z1)TWp@7b%fe_|t42hN$<l}sa
zWbWNK&~Nq}NQda4$pX80cqOMA9FMWfYHJ!If{rKiBh;3lYFWPjWIIbds&dvfmqzvK
z>8%d+))YT}PeZ42${{8%B|=H(h8=w|jPt!_=ODtWFAGNN$MBg{_pe~7`LrKL^JyDi
zOU9oCx<XK8QWtL6i#t<}jV)v+gfwe4Qp~MbM{sF0FQqZrrmE6K2d8JJvR2R5MU?V5
z8%8*1t--@lMKPNP;u#c+3-K^ob{@Cc%~Q~EnSXxhPgebTI)V!uy<J6Xl4vge1w19@
zXU|-Xeu||s6rh(9iM&V1Hz;LMPX6Zwhh8S!>STB|K1=)q5!WQf`oxcB$ZGLA*T;eA
z7CM8x7P{Y;dxkWsCQ$VJZZo0vA6EY59xy;;SPx3a$r}g}A_kFKG<<XZn*<)=D;t^f
zLAa{S0pyNXNAr`<6qp2(OUAMG;Chz(00Y0)UyL2d*vKVSBh?QAV|o+SkR#Hh6Z#Xr
zZjqOMI(y5m_`;u#Iy<Sl7Gtw)i+cSPm|E4SesV6xiTFKbsbHq_feri#je`+*iNnPj
z5Q($k@Cktb?y5B%CTR}%K+EzuT?6JBRRR8EjXLIJ8!OE7L}<k81@Dc;YH*jWx>-2s
zo_ZO@-qaw3K^fY(=2vipRdh5C8FDYGG*@lhKT+xh&(HWJ%Qkazt9M+!9qV*)Q2|)h
zFgA8#U!t&A`{D*$n~d{#Bs(`8k{L$rewQ{kxVkg^xRAZ@als^UVGf-ye?yBfi6vk(
z?&e>F4B!MWV<XOAGCk&~@*mZ|;}6!y5X}~s6`1udqv1j@F?jv?eD!jK@^rpNzje1+
zod)@^iVFNsoIC%2k~|>cFfl?Ny7QLgIZ;@*oN#(RIO2rQc!cw|a^JI0rQoiIN)I(=
zJ~z&M3>`TF^qm~|F(%@nu!VZ!6y2;nZmXdMOgZa1jR?>C8~xgS{DW)yTf&YPLi%|#
zIX+Xj{9L0=Be`v?3dV5VEreXJU~y6*TF7u;81OKN?Q~#5d2FNTvq+$UqwWxJ<`u_X
zyxYYfq;IDn<uQ@=v0kOTT<BY%NTp7ybW9aFR_*@8ZDd$SCi&$RT1|Vha@9w>KGm$B
z*a$kEKaFBpcKPSy9QrR|&}i9fDpAKy*g}vTdG5CNjZ41Wx7bEo>nn}jmGGGL77S7U
z6MF4gfIe7*=fhF@Tj=EnQzh;5dfw+;c^Gm?iO~)mntjUV0MnVsV*Mym6c%{_f5)S>
z7i6`vQr#7a<LOb$yf$9$w24uE6aWr4*Ye{R-!<c~+Zu1Xeg;qoui2Vp9Q$o(#8Q|>
z;S0<b&js2<j&zOEycV4RG->VDM_iSG^$LT=jdzb!(_)Wgu8&MqRE#`a)3*$v&1*M(
z9UnRToyJ1wbq~Li>2{jcThk{2<|o?$5@brEKtM8BhF#)ZfNFWcQ7zNx{>5ECg}vr}
z_3TK~ES(bh`vq!R%8S91>%6)7v^{0eTwzQgo|cB6=qOx?`v$D@_G-GFaFX-Lj3w^9
z^4&5-1HGDTR||wXvGx-|v^Qh6Zpd(|(z<ng30D*3*t0z~uRK^_DEW`73r4*gb9X(7
zJhqE2=a0$RVLW3$WR#!a@Y~1y2>MwuEu7_sShe$t=3H>r{{rN9(A|6>e8VSP^AE8A
z3(bymVDqvm9Z9+<q%J8b(zI^~hjYNNs|+>S=AVsIslDy#WFp+@{$%~4ye3wi61(ok
z;`M;>bi(Hu+}a06U-yo>p0?9kul;AavF>VPN<lFfeX`sG(ZDqL)nub^q|ea2_X1P=
zI6bXsxUS^yieZV*oMM74sn@ma^c2hF1CeE-&yXZ`1*sJ}mQ`(e*h&w%14xZ@aM9c(
zfCop`sevTaFS_|OqDv`^a0t&LYIY$zPO7a;yGg&?<-Vwod}&)hCP;5IX#0me2iy_z
z14wvx0E&Oz7b*997J_f@6;IW{9tF5q5NnmswSy=Y-T~^fNx8ou{FTBR1Rw_82&PQ)
zHyZMT9aCg%m7fi5YMa!)IB+)^my(9XC=CjhEHYz=Nr{Q;w2}Qcx_%rOJJ&e>DHQ+`
z5D@`-Ul|<_xuk101=~sbf*x!+oI{OET=4klG!A)wFc%k~7Vm@x1^FHQi)99Z5GD`^
zak(+(db0@rdSaQ^CR~B$n+)CR5BGi$4Y^}zB54ZlS1U;Jg({L{ncJMA#shos5Li}!
zQ4EM9C42{b$oq~ny?+pW;77oL$5?jBg?3;bPrlP|`U$~0QWi16Up5{jqz-s-Z?Hai
zu4`QOzvIRu{n9foezC?SXn8f7Vq+e7U$Ib3kE_-HZ4@t?fr<@hUzVFTXQ+4NEiHW$
zo(N$u_-AWDB)Vi!;_z=*AUtqVmFvTrpc($#l?CDyP}i$W{ttH&0_K3|6bWba=r4cx
zzuo+wVgE~J{}J+k>DGT#>VMkc|3d>p1)Jr2#l@gg@6H{PY}j~$D=jS@lzZc7fyK`8
zd?%}%ygY4fS8V^4BYt2NuW6OgnDH&4vIEfy_uzlrLF&3^30|gQ_WgQ5&RX-iq&ZQ_
z4dlKEX}}682l`t*z?mm}=-<>DFb70LNL({VL2rn_87y6VOKAF$g3NT2%9VmF(<+_x
zs>8wEvvp+1f7R7hmb5#Jb@xEr?bN*S<mGd%m2|sRBgZQh?Mffldk2r(qgda=^jrSw
zzy>-coCk4c;T5fjE49sYUh;*v++aBo$hMtuyVazEhHJtCTvpL;17GXBI-%VVio&EH
zEjt)5x?MImW@dZ$e)>K0Njb9{c<IZtYol4=W!Va(aTGx`zd91bOs!$eqh?)RO#`9Y
zsd|HjGrB)K7Ov9GA574yMD#(GT^C0VR?xRVCNMAO+Ydnc>3!idscDx1wdHtcSheV(
zH;4bGk$P=j&12qJ_hYn@YL(#GXBU`Ix6K2(?sgHvaA-`k#Rk(n(_0=_^7X1}tOdnb
z`iLfyaAE$*w>VG<3`rs-_gltq-^!p{t{<J2UhfHh{SiL8`fg>6P<k*`bZf&yh>h{f
zdwQK|#cXy+iAU4`GUw`MlxvosKgJy~A3T($G%<e}=agp_ziPC+arTx+3kxrwBtr#M
z75n83bo!(#DYk;3Z;18a2n0OqbtBg1@cA={%q6o8cu?@Lq8&#^_qhDWmqNQNPS00U
zyq1vT%8&~I>K}+Es`yh7q3U{Tjr@NpG2D!@S0)&OA`<@wFy)B6vl~WwL&8gl4B+8_
z=f@;mwPHE5mI$0K6OnFk`CaK|wiT^*PrUfDnuf(@%F=Yv@d^}9;*$h45keu*%r(Pm
z%QV6qqyQvBD8GTsHMj^rC{BO*8=wNQ-V3ZT;Hq_HDwHQN`giE4>lqSq9WcC~o}a{)
z!{gn2i5^NL`3VUxa)Z(o%2BV$WsZqM2#_L19L1g;bYGY{I*9}mrT`c*y{#Tp*Vf_J
zMf$6`qeR+JxJi18)%m-DG9!_-FB7gzxJ#q^iKX39-Usinv-};Wv)F3P1U41wIl`|{
zZ@CvsAxhuP^3xcFd3^syIF8LW(_A+LPZR+rOsfC4pwB4;jFWwLm8^fmG&ndMK)?<p
z>xLrYfEm)%MW~Km71^$V$>A?2@HPU?nk`%QYTVA+MaP`u_}GV?8o#_E`BRXfNUaMF
zmk=*LTX)ZIP2hrZU|=f*NoIb$4+um7?uda?_t!HE#OYOVFr~Eao?Y@YlO*huepI)6
zso^8=a_w1O8ezM3g2kP=-{pjgXB~1td*AF(7L2pdO0*@rwpXO0+YXco8!=EMY#SwZ
z!yo~Te+SLi!F+$oaYA1(Q*C;GGHG@N=eNJjG;TX=I&-5N!I#e?z`2=yrPdBq@152N
z0!|kLMP|0KvNx=_t}Tqu|CcZzJA@*183<mMWPrN2Br`eE`KBYY$PC~J)0HeKs+*?l
z)xEW5w1%h0MB40by$W`BHEvz!#a0bRmW~B_{QLlcWUn&7&A3sjGUE75^$ko-Z*8q5
zlnW}mE+fg256JepfzP%k`->pEL%oTt3&Kl@%rTX^3R%jMYz{nzLk)y=P#98pvVX2$
zVJQjBjjz<#)_z4}2UeQ4)3hvJrdcvZ8XZ<jPs3iE$pFfTz(v@Um)RVzC?76NEAN7a
z;`+Y~1&5Pz^1QQRZ5md*-i<w*fYley>Br9=zIq=LcGA{>zzM;DvkwLqSz-swmKeSs
zMFA@V{y^S)(?8V}Aq6yhU1`E!9ht#6NfkQ4J!H9wtLnQ!lu6|+ZM&hZJ1?!XnI>kJ
z2MC0$G3;oynqG(9vz09vxkvIVfn@Dy^(33kR^z6ZDz~<GfTi~e+DK&3M*cCkD|y?<
z9#Hws+FT)D(M~^%uc*-8S^@jq$%@_G-@v~sUqd0X%lh4zhx>pA^X3lVD~U_VrKN|}
zRUb8U_fLM(Lv=Ke=IJ`lL4wrS8Dx-R|IHwwW-D_AaH<RUW5VGeWzg8+B0-ftGeTg&
zuervB?Zw#N2G4%*sv=T~Si64I2O79-oY36KL?F#&06q-r1M)w_rac0H9}E(2addrg
zx^#}i6BvP973aK+Py+2iYdgZyb^|R3F#+iHJIwF?0`ZJ!Pz#TKhRuw6PIx*?RKPc-
z6v@vcm1KzfocSF(A&~@c>Lw2yDG)}H^>4DE4Q$c~z>Dp^r}@zbwAYQ{=P>3dky#Fi
za2yi{Ymm@1Ks_W%WA7f{3KKYiz#+TSjzsYIfW0uS_{a|Sk!8T`3~EAV2lo2_oPnJP
zB=|;ttf0;&{-3~#d1MAk@h9rHr|Xsn2;ynv9HxK?XO)46hX5ldK5))~eJcB;$tly#
zGU|07DF3X`$_-Vz8(R9(a#fnm%gvof$~SX@8N?d&i-%PNg`-*(3f&)lNr`$-8lf3z
z6u%VEhG#<GdFbfgmJL;q`<^AA@8cg!A;&zDV7$tGXNqwP@bDS(lwzwGE#Ccp>zp30
znTjJb-bZxSV;%r0B@baa)F)3`>JryT)ZnS}Lj*A4Nk2Q|mXA4~M)*}vMU3q&=9Pz?
zX2UBET_fJ4-_)o(2GT5ipk@*6wB%OeW0W_1i}^!9aV@+veswn3n-Np(+6;x;yv$>O
z7OOLz(gNk?p!@ho_lUPxVd$I5HdSa)VTY_=ZuQXm$qFMH&di9Q+de0b>G?`C#d&;F
z#F}~R`ju1<ZI|#`xv&RP;(p`+Ih_iMLlrqQ#d{m(UA%NF3;s+k+AxRT7al1^*A++0
zZiHX#gx138cXW-5l7kx~<FJv6#AI{5l9XDI4Wj*%hq~{%u5bC<I}@!1>-0C=?JHU6
zcff?znCMa-p>{_#_@jYgSlY6E3Kebu8?cV`VPeSgu5|ZoFr<9r=Zks&@+1STSD?lK
zVtVbyk1m56lU&zpA3g0rt&CDBW_3%)`uXD3cW@HN>Q+tnN6Ez2&YsAVwiN5@zeis=
zLZ{9{ayurL?B5eir*`>;NE$m1v>%E-GpywiVZJDJt&7xZK(jktp|w2JRU&_3Fjzs=
zpTmG}LRU?Vw{DzoMIHy9T~7W@lxBx(F9YRH=S_jY=szNa0Tt*3WH^ju3dtB5?p6YU
zKic~KvLD@Ex*k2*uCq1)O2q7fYjc^fxCX@5-K;;eVTJ_P?qsq_!Gv>xO-oS@(*%7F
zUawBLPiLn5GYI$Om(9{+UmcYXL}71elf%U7Wi7h|?^G}x*86s~DRiuNWEMr@!pEHW
z1=AqQJ|3yPlE~xR(?c!(=J2aNn*zS4UkLSXlnQBKkmp-+azdcRAu;-*d2`5oz`-dX
zC>MvpNkTb<%<#q`KU|l>nqBsJ=4*?~Mra^5K+~k3`srg^oEbWOlG%5tIU^BU<ZdF}
z4ia?6j@^oz-|zbP=fsdk^3VR{J>N+j@={_{@1lQv#+y-hlX)n0#7SnhCEf`qK<Ynp
z^uUJ=VEfTWj}9h$>1Wz<lgwt5N7*md-+;2(@QM$&pPyyXn@n%@O(FVR1)H4rfk7x?
z@J_HqJ4^n!GrppHp%t0IcEdcB0BOJ7&>wzXOOJ7NT`gLfj6?(I|B=mJIIuy%78H8B
zpX9By{HvBVtyl$32-8y1!?{|P)z*wl7W`bcxxS4i=6ip*RN@VR?m`<|D$BcMk3&~-
z&Jw%Yg@B#a9`F!27IRuK;)Ps9l9AcJbBAQA$H&2-`TbH+(}qi<ejm|b)$l^#Ja1Yf
zQHPDi_no7fs>0pYv0`-NB=Ny5<E`OMcFp*dv`28wm^Vbrayf(v@T?MjKTy9Mf^{45
zbJog&CnS~rq=&+_@T-$#r;i?!go8VRSrvP0gmQ{zEAV9fn(DDhDOG%Yk2|wAUWrnd
z6~RTKFvrJ*&%_Q-S+v$ETsPt^u3Mq-7R?cVWEd<sg{Z0e=Ib4GPoee5;5uXa@`(f#
zs!@@s6FxiKNSfpiPD-8R%ztL~<XcFb5KZsVZQ~l4vYeH8Q`-7uU2I_Y!FU+Z>p?NP
z6zN6t=@Fd}M1G7%UogFmD*YrN6xMlWpUmLVd?EW%vWZ}Ii^i_*0LkDq;96jV<AM@$
zzQ%SD$yh;<M4#IE`ech!htIrZY4HVDxy2H%7eW+C_VvM(M%8VO+m55U!r)$iu>i)d
z^QQf>w2NlIPnSS+^86mbTq_pJV>@_!*N|i1a*2}xT8S>Li{R67*TXU|onOf8+JFu3
zMBlV>$fq$6^3|MtA~v?k>Q)MCC!5>uJ^~=oTe%<9)Iqc;t{Hnwwu{OX{c$<?i7}f|
zcTRF|_L7s%i)yhX{OMB>y>pu^q-EEK%aZ_sdDros7H_+B&FEvYf&M|;I}3wzjuMju
z($#}cw?!mkeMKFSG+=!ssO)80?Fh$XjS=*XU%$((HCP`hwAgmnAX}TQD2KLruv=n}
zf0|9E-+U_M+Zd0GPWy~gxi{lR&`~c`_zG2%xqigqLPx!xNAp@rGl&bhc(bWS{|*9S
z+bAb_<;U7y9*S@^Fk=H2M^V|oNmL)qNzktTOl<TJm<mkq!*g<OR$j9nM33FLF_)FK
z3oyQ1=eOyRW*9I${G}BmEK`{U;im64s3?gdI`C~JLt4f`F<OR{Z{XvAG;$C9wZ~xv
zHF&s?xhBJ>Ua8Wb_tcg8KSx%cdri4tC9p=NK6hR0NA9>y>`;1Y@xB0KKd1NvI(w1V
zGcrONt1qmL@@d*ntL@}$`cOu7=UbMR3!x9>qn?P7Czxj(C8+FhX$veslQsntmSbUU
zb04qgp}c2B9cds?srxns(NcGe#;h+L)m_XAJf8Kv>S?So0SvApd(b2AABRz>@NNxQ
zTr6NjegdVXx>B46b2ZGYzoWm<LGSOU{d$h`=X_fCxwWaRL@PzUW_0e3w{g<kv#Qk?
z{Wz7z>(_LNK_;80SkLxFXj{*`?ljrffxQk`_CsRva>vLYW6M%-3<I7ZY)cVPBb|hq
z*pWGZyY5D?cJ-aZrNj8~2KT;~T3%2b_Mm80U}XOC1U#c~zv~xmBtzmpi}H<jp^=#Y
zI0w6`siTf#p_Q3f<d#GNil9dU-xW7HkK1@ine#QP#9&RO%6wYXj|NP>hD&g<D_00u
zr6JZ>2`ij~u;LzQqiTu+3KpJaUf0g)pF*PE1+7zGPK-0_K0dYBN3zWyZcM-WPCTza
zM>NZ>IJT|pJihE-R%z;2=Kj-O*v}y=MEGs;2T~GuBAcyDn*j&$^u0SD<jy%|Yk%pS
zs@)GMHI7XU$gb*kZ@_bj-GsDfoPDP3dR$Br!dL~T&ahz@;=!%Al{?-mN4<TjwN*Bi
zwQ|Y=QB|#el7X3M1HW3TRDUPdiBkKNycM{xS~6*H%ZhIomsj4dp@_ix2d{{B<i7dn
zZ^%*I^7Q5I%@I<8YsO|4LYFMk^een2A56_+SK07~N)62GX=*rZ%5LE3)SIYoZoduk
zLw>OuF?B*77Qt&bhQ_7%zUMkZZEujVcTU;=qdrc#5yG|nYznz2?}q8O`$7h-U*1C3
z-MpuCTijNp-`(o%Gg`)2r0NPqU@hOz?9xVPjDxYwXmLs7$kD|GSDg&fAw0?f+hfhj
z1S_j{*DtFPICMc4QF8TGFt}Zo-{VL`%8-t8vY2)aj#(PL93S%Fx+{j&)<ml1GOyBN
z?)RqY(N6Y%vA8R0b^T%bgNt=nye=^8V&kiEoc{XLznJ#K1t)=Msp_cFr4MzB{0}JM
zg_7VU20>yeP<#O&mkF0VJ3tn#;FltrxIkw&)E;WG+6W8d`~C2IPzTlOmr|%K$BQCR
z+LprYID^+$MypnFo6y%&bCVdwhQ_DLilUgV?%-^f7pE<?^Qc_uSZ=cDKcTq(1jEfi
zwCG%{)rH0mta!M<rvZ<Z{;_(=>Lo<k#^n)Os<*1#`iYOO_$m-HZs8t+gWXZt2(7Mz
zNR)qw47wnafI+;WJPBX-F_7aMQLZ)->tJNfOrcDDJ}S+MH(B;dXZGcctMkX;Cx-2G
zs2DzhS{2I4tQ2BBolUnxYOADEtnIr#H@Y=p@tK7xS}GME4!vVPMy<t%)VX!Z8>$Hg
z*x3>ReM;e&^bdtr@i8oOoM+V(xllN)BR1&;n<Wc0&=R*zArhr?KTSlf)*#6axp)o5
z^E<shecn9m7;DTO^7X*s0c68Zx33(8tcYL-1?+~$OUfR*h}sUslQ!mXAqoyu68-EM
zijwO}w)<0OV&`Io5FQSLE0*J(!vp{8HXE%^(*;R*3HV37@v?X;UtKmCPx3gQW^tx9
zE9LP<Eg<BqUyUF8F=|t;d4X<;3al^JwB@SWXT^e|9*sBj(QdI3+4LBtJ<a3NV4x7m
zoveU^gOk{rnJwkFniam#HOJ#il>e5_K}>mKowCU#GVs(F{nmwS$g|{n>BTaVoMnH}
z==SjSyi12<+2@^dn~H-Jhx>+AicbSQ-R-o3{$Zn;<QpT&7oU68xd2*6T<fW3Rz9Lw
z3CwmdHS!d@D=zTm_`Lfb`b(q+OMX~#y>*99f}j{2@HJKGjlJRp!FNnZC-ZOe{#1xL
z{cKoDHmu4~y}&ATqkc-^#DWL4%nuWK+yt0l5-rN`mIsZX^|L&YuPhjTg=rV$T6Or`
zdJC=@3k1eyf+WCyYze?)O$z(NToo*~ov^@oAZ*OugaxbUnj$y(p_xqw78gDW&JMta
zwbLEtkiez5ENwB%F5{#P5mz$Hv3Ro`b4=Njc1*dE6K}2@P`Pia)oT=YBT4+7(ElI~
zJ2$kjELY=H4S34@aQ&_9crq#y6>G4JPOQxl6-%%T+Zf4|Nrc>m?87D*CX;+bRz<Py
z1I-<$t>S6aW~c`eo2o)U7r@{D9Ul#_B?#9qB`Vgh*y#8>e*{Nl=sdGGA`<Sw-NLP%
z<q2)&>UZfi>)_9o-!aI%Lw`at7})Qnd$=u(I3I3HvajDz#L|AoLt^Jl(w~~D*NrxL
zcTh<1VgMJQ^jLV?9g|4)*gEhzfgCR2&IA9*2jq~TaEnlAl4BT-3EKSnh1PL0J0%_k
zmwzHt1G@Mk0>@Y<H5O8%x^M91kkz_w_D1Sa`ZSlrNp`=L=BaZ(eDZ6ukaRZN9Xi{w
zV1fVU!34EQkQN?kBGetao5)Ch+q|W}#<c3lTwC|(DMNRHZ~I=ji0|A@-~AU&J{r%T
z@X26e5MYJdXnD(guRy4)6Bs=Zw1n^FFm!ijg|piaQ5~PuAP`(VzVtLshty9UMINK8
zEuZ4LpfI{EurVCeb%MJ77t7ncYu&<RAUa$HOH;dw@q!-ax;AYdD_$C|@&%kl!)vc=
z2^&dC0o$16Vp*J)FLfqD3Kp7FeS6p+L^`MZ#<VY#>>?M$!;QIX@C?ju4@utd49!G9
z3nhqd%F-m%BlBX+0I)*Rh1Lty0Mtg-`m0j%2RiL(odGTqB_>>cb1mPIZT&X`*zl3v
z(x#6q=lwGmiUUOt9{SVURl$jeSkdIJe0T(cCZL^htpp^|q&#e4#!8opLgW#2o-l2<
zUL6*SYgwS3mUuoQ+!K^6yLUxK_(_j+@2Nd*4rk(hF6Z7W%YTj~>#Hq;xol93ewS09
zL5A(&d@vhn(cV6=C|z;>{@VGa^E-P%yyMo`Z$A1&I7u!OlY-wNtMq+eJtEo3>3VM|
z46^2@3AzHfmXKH{aI3#~LjgryD&jfnQH%UaX9^bZ{oNVgC=+tsdvFAktbKLbQLRSr
z)z+IjI%HCk(-j-cg}%wQItxO(EvSa)FO{NUYYDWXLaptZ7Q;3(Z9%jT=QTx4$8<$?
zWUCyD6s+*(^)vnh98-_8ZL|bRXJkvZa(wK35AUo__`sar1wJ+|R~ESTyo>*<ho&{Y
z1by!uAs>_t3{8tmq4T9YXkNo#(1ouyU8BBSoUv&|^|M=GM4A)r$9hr=={p;$*HT82
zW|!`UZ}cdwIwr?+>yx&*&c<6Gj=$d{Q~PELyxB_r(eO|z$hbim+D*oSt#>x@vNT-O
zj8COkOZitoW>s9$;cMut=P}`E;L9(ra~)K%pN_{42WvxfTE`)RSW#-;<;$@??_0~W
z+jcCTgu*^o1^uqViAE>;amS_=X;C_Rc4BqA=}THu*A~TOYh%@!+R!*l!CvFU*U}s>
z_>lBPTB?`v@bk=p=jmH+_Jnxx;mx~YgS^{#5rX-6mdb{Ad6LQfSn)xFY3)Ca$C8fw
zMPKg)ay276UwuFRw?^T^`baulWk!s{2$v0}5`^OUd-1Om8w5I|>>(e@$S+V~FN2k`
z%%dXpC2LoEIh0a8b26N_VH5N@3~Sf-go6H@1>&l%1WQW063d5Mse8kmCT6RAR;h=X
z;SUkIH+(g@H(cf61STcPSd~yPhMm26E$6a<u0=lSY~q-bHw>nQXzz=<N%+4a@rD}e
zn9RO_#~`MVvH7tz7M5i4XN9@6k-=nH^Lk!vflnrty!Eg&<&a6Rl_c-49IV%}tx3Wn
zlz4(2egd9HqdH96!gJ?@8BhIMS?>XXpB|(ItbxxnW8^97htZ-D4bx^qYaKdf?}g8^
zVP4;Qzm64f@|H@u0oB!m>_LMW0--#C5RAVD9AWIKW@B#@<Gk)ML<b26KVDA$=z=Rj
zFsR>fW=q0MLDIs(za!Fj>38AhnwRE3G+D#s&&F!|j&Gz1-_u<HNC9DS2O6W#L^98<
zRQ2sLVioaB+c_e4Ep}Ia`zuK|;7CQ&BjUfP#yze)#8Z6~B(^p-9Vo0{;g_4yz)amn
zf_As4Ur$w{wo#7As94BfK#26^a%fAXIR6tj+oC4$M+kjmanr7~(UhB2%rdlk<U}rT
z>6A=(RGj{?4#7YKY>hGwyu$)x<?A+eKr50^{mP>S$8>Kzbr(0ew#<pM1U+uy)uQjL
zrYjZ&T3DA=bL_qmbVId>FVW&rHSeF9W)LHYK>fAtjRV{R<q$th59YvWO%G{`!li=+
z8O*P~Gkgxi^YDDHc%UWs$R#cIHF*&odLmt;Zt=OBu@d!g=b;WzFq*FLB$He;PbPJW
zkUptKDOJA9MKSH^1rRVmY4EuBf04cS*SrjY7s_iv<?sB>5|uHzHRC!gH&iRUW-U_Y
z?~tYrf8cC!>H~vB1(_&3zrfhpT$_zhOrZX=>qN++t`OW}wnESX*p+ey1(gjC?4-=#
zCN};h5)0v)6I}Xv*KF){)bHTK;@RopEmb6&7-bN8;;Vfnl+8>d95?SIcB*Q)0+U_r
z$6B>o%lC?wYCqSJOLbeO9wxA=^C=ukA74X@ScP_XmoTk})%A$2Nq0Bag<)vj4wKJE
z%f0+Qr6d&_c{cLe5$zsEN1i_4a5<CuHniTTDG!gR3PK-tt(}&Rni|34dLC2nq_`cT
zwYYwZfP*4&3jD!BCnYP};~Tk2(0dnYsFR_PvbWrR|4wwkllpyGo0IlMy^veIYXL$n
zUbV~^JZq6;Bs8uN?9J><wbjOVo~X&DWn%Tk1*X*l=Nb$CPyMWfhe`~JA(D%(TSoSE
zPoWFnnG=T+Ba{^TV(brF6CO)tXDl-o3=K9YOSX%Em~h&;Zl=bF_p|k#&MxE|waf;r
zBlsr3Ojo|Qm65To_6mzbuYr4kK_6l9QnPd%wUtq9#C2hPO)B=d<C2a$*%AzIx-^n;
zyO6#+8#6lJy$#<Jjuqn&;2$q87}e5#|E&%zAq#Oz1a;b`nsenM>;>jtNGk&W+&p3*
zHXc|x{1FwW_3eVqSgVtZTz9#t(Yip2^(j^HG*H1Ng9i-qqKC+{cMH*Nv2LZn!$cOj
zN}-QS$uuW8>~n_Y<oRMAa*0Mcd?&k^-#4CHX8oko!m4Neyb;;bBA)dx*9(QK{i56o
zkY0WkYEGL1uigk-sIeLDqsl!&aOUkvq*I<@MGnuiVkNz}Pe$^!mC>G~rNbzD9unXP
zw5Pwh2b#5ExRg)=9zL*eab$vr%8Xs#(5|9>8f;MD+wW`lI!1}VBp&tHxIdU5OJuE`
zK8HeRzd?&urSGo`RN`JFMie?h%r#wt#>GMgeCa_3{Gm|;u<ok?<QJE3iT4WBg5(1h
z!c_`(g&vD0Ei}!9f*8teqolg>G0x8$?byA}QQV1N2^z+8Ub}EIkA)&4$DE1<!&|n(
zaG~i}!y3a`zI0Xec(8nT?MIL5Gk^`kCo<SbWfLVfe9E>PZLO69=agQ7Z|0bMV5c^?
zIWSmYA^<k-G4;N^8;Gd%w#&fkQ=)1c1QQ7-ft-Uoja2oY@&#c+Kz7>$;)~rbeMP&N
z91K_s&1n6=J#3uS*RU7{3lu2B_9RRuZyrwqH(U25&jqIo2pZPpqMAOecusL69N{EY
zyWj*>wsu*pK;T<)7P9sEBL0%Y2`rN0p6i9H&1?s^0|W5zu68pPR0o(Pzk_CfYNynG
z%S>~_hB0eXa9g0Zc0P8@EIUASe6goRP>VC@)D0TMG7_`}uWSc3HHq*A33ZoEbH#Vm
z1c`ZA>RAQ!nyXR+^AxM8^qw`o?61AM7VtzD&YvMro>-H>0#1EVnrW#<*dGoMTI@t^
zAxK@?8l605z@b;H+lQs3KEEfKvhzSzko^|L&r2stc<fk(DQCHGLa0WKuUM~GVBzo$
zA)G%veG&b-8-2j%%z`7Vw_dcPV&(<Aa1-O0mdbI{Jgx<u%kw^s{-;39JvoU=E}3r6
zmW<l2Afm6UrOZJ=ht0k@%L?xWtCZ&1b~(esjV7(Gd_x`4#=T<n{NRk@{Kk3hFEwr&
z2XfKWb=JNdW1q?r2Zv@Ac0HJU3E^E5Adf>!wW2VH^A_MaK>;4|Eqy_lWQ1Q4{@@tv
z1<6%3tQDKjZp+ZLMhEw34CzQPd0fHnt;6A^st|3L9uZ7CM!1-oz?86=#|zuj=}bo)
zLHgWseC5c&(p6n56vBCK5yUvSKYPQznODhP;k?Wl3X8@@y<9k;9{D41Iyr3$?^vYI
zWM2+X;5RgG+kFvN6D*&4V^_Vyci$?9DCsUAO#@@J2kZ(Jsn+>oSV78rrn615Ngh$5
z!w9|WTdE95Xd>b8HVt0j>-A(MEM=pBrj>6{xG3Um+9wJ2w}d{gp&xP5BV^B5-M5jS
z>0H73R7Ce0G15*gqGj*SNT3|P>@~7&C$CURhZVr$##zlC?{F088QMI6GLq5r+l3s?
zmi}K><N40*UvJ}}tx<rR0}l{bwvBXObmq2w?SD6OKu|xhFrQJL+HlC+8}aVl=RME?
zL@4ZAQ;|xJYrbu%zcEFAToCHRy@LJ0k?wF?F!im&u}B0Duh>yTyCV(S1G2kQqk8ZU
zRWmN~2jGb83v_GoIGUYUPHsEKxfy&UuCMDcnH@;>Rd;VKdQG6-P@=qYJt@&Xy!1_5
zF;TzU7~}yZMm-|@lrx0^^b<wGwW4{y0I_QlR)t;3UbMJNitT?$U+FK>a^T+>9!HRH
z{X&Kq$(U568Y+%tW$(%11?y5gGZ&`!k#LErEVN{fc>XX8UvSdg4jpD-Z#VL_$+Dl$
zb|K1#=N&V@Tp#f=l9?)`9)hE@Gb8M5YEFMn&^{EQV#SXa%tA{O%(Bd&>>tAMrD9PP
ztz#>VJeCxa2y9MhmQGhTZ14FFQ)rhlTAEW?%;SmcP^DkGT4a_#slUq7OIu^?0rAR%
zsOzr!;R0sGKYuvv%xMZ7VIbsuM?ATuulu9;ov}5-(N@7|!hGk&6#TXN=~px|n$dh6
zA6NK;ghGq&96-|PD>BcEy7ZN?-BW>S^))X(I6`c8PG$^g#is=d086M6O0nvWsKt;J
zD$MoL9`Ttflh~YAX@2;U>uzhqu6TV{<iUMuuFx~#x5Y4gl5{I^W+69X_Mg*{wfLX0
zsc~1<V@yunF^7S<VCWh{|M^?tbAkdyE^UT$km1?8ORO^FYb)N{C8Ye1_Rjh%u4ha8
z!Ga{XdvHq#1Z&*g-7UCla1X(0G`K@>0t9#0pur(nAV6?;nbV#7o%_yx|Ad*f&M(lc
zL)F>4s!r|tJWty^CiPO|rDQZ5BY<z`G)*RT6w~Bf$YP8xTaF>ZgtF|?T)!n!*pkir
zc{;inwcS43dKv;$cvrb-*vq-ngYQc1cRdpa#54Lc&hhf8SJdgP+PKa#GWB;>2kp4@
zCFj9|AQaiE!=Y-4H&b<w6K7iI`@-WEyY<9-)pgeP=ngO5ILqzZ?mO-=%_1RIC{=kL
zbH2v{Q@UUJ9@O3`fS9qtWT(5Jpe3L<C8_Y872I`k#9vfJu$n43<cst5qNMpTpL=Vq
z12HIOyo%d{SfZr2Lqc)wnKcciNj6y=#kPMi-y>^P0=7&i(uH2Oq<Uf%DBF#Vbea{L
z?%s@hxwl5ROTl$g$M*AP(c53aEwTQoIR{M7^}Vi=uNR23j>b8Pv`3|L0aL<g;80Hj
z9#O4Jq@2V#IRl=}Ev%yL5dGtbD!qB(HjJ}~r7ygJP2lK{dh2VF2kM{d>@Q5-=n79i
zE-^WZ39N4U5K-JTht7w%`)h}Dol|{aL!ssxw!GtJMP|lQerLCW;~+r#q17!YVOAYv
zw#Y#~tR~((#^6YQ>>&#gLnuRwgKK}|r-rz?6(%?8dVzzx=Z2neX5lUJX;viP7Bgjg
znKIT)MuG6>W19Z=&2wCRsj!`1ET>=#VlaymwJyxojxG#)Wb0e?wdydgm3MAjV;fpZ
zdh5%~aq4Oj>MlM--&4vO9d~ZTJ!X@|M5S34cVuH3KNlux%An!ZbZ**xr#7WuQiE!9
zrPow7YM&E<-!BAx=IjobZ012nd#zXV{K`|&iFG)b!Lr1L(Y7%9oBS@~b?vd$NZYtz
zZu%T72Voh5j(D9Ru0U-X>iqQ%?Eajakr}S>Z$WwCAAK&@YFJd%G({99TC_h@`ERgV
zALzLXImqb8<y!j7T`3!YiXS|2c4g+8-SzO_O$&QA7N$`LGwh%hgY&RRb;dWNVUE&g
zXc?9)i2=C+iv4Y?S)Y{Q?7WbFftbua96s`x7gjx(MrA)BN$B{Ka%A?7B^ypP{0YVY
z!ID|+_I4%L=PV}dsX0e2(m9_K*)@d&fsg2<;G7}zA-pT)caAmH7w&?qVOcb0lT3Tq
zO(KcJz;#t9D81#osTWy5Gg*-+;;3v}{H;{BM<;}ae*wID0qD_qL)svA8qx_mrHDre
z(XoSSX2BA5!}o{!CVhp+Tbfq4MXdn$U&=%JCbs6vo~mm|VQJ_P3TiC`dg^#yrXW3%
z5LF7+mZ6xHGC<-GTb)t*!~xVIjH$Z5^ckyX3KneUZw|<^xD{L2M6%kt)QU!c#))ya
z7xo)V!nu|&<Q3X7SU23gLRKRG5tby33z-t`Gi681JecYXTG5$(9=}$2Gg;cSTh+Et
zUcCe=?0Lu8_B$YXgBX7>2^%hoS~y)f!fa}Qp3d7+Jrls@B|Y3KF%KvN>KTvOrC>)8
zBw$DQ)NGkV-GmHV5WJH{`!(81TD6&IP{gp|Msz(-sbj=a(<JlOLBsfJ9{G~Ju;NCn
zAr|%~@2$RUhE#cRPGW&{j&IK*t2OWgoN31frfTRs8te)1y4ByF)k$s1KJ~I2ZhbK2
z$(86W{z55X)x|Vx0&cTIY*L;BQGtR2BJw4baY3dTbq*0Gx@MsIUyCbVT!p@D<W_#|
zc5L9bW?ad!rk}1Op73fgJ%;oX;BcT?yMUJO&gT3ppFptNu?uIu^rN*?#%Gn4rM0p2
zrf~{)JmW=v?UiOro==(vE9ei7nm0dJ?dyE0&5Z7!9(AKgb{2Mx*iFGf(pV>j^9HS~
zj9On$fbFa@NqZRn=%DFOek+vI(7Pg8I|28Xx`zCe>9d=-#(4@;;jf*~|KvNLmyF7=
zAd`5C$H=NEu(?;*bR;+X*}@0b7wX*4G2J;z%)tgBlN_Ww6p>WilY@M8bay@~v6#J+
zAeLm{Rs8kkO=Z^(55tE2NLsuDVav4tf&5ye|3-;Lc)2t&H`ywg;16mc&P<-L<SR{Y
z<xPdedon7Yr<D?$6xdLFYzIh+1;FC~r-L{IZVjcK>w`lB$@Yg#hn@k+B=~#R!*V03
zMn2z3d#hE`l<t%i?I)ZOuNB}i5n29G=1{wL9$gt7p!w>CPbLkOu=BP`#AS37UYoCs
zN+~FG-`&+4Ieb=xmtxS1l2-(?MGUJ`5>PjrG#F6(OCWFIMhE6sj(`8F&N28Ra(@Q<
zpZc8UyQ<BrLD8F}cLbpmDQ6s(`sT*{-3tU91zZB$carz-AM9!9KJwK^$(Lc?tJB57
z$nwR(NOUEV;K;Y&Hx!&p?9Id+r)ysRD#znCYNZY`S}x`GdN1dcXlhGyJFfyrp{L^S
zqT=i4n&HZ-P1~L{$OWsvSPGEc`-iOWhtE}i7!X!G#CC{ugAMiMjdjy=a$3N?c0Q$x
zSATjbp_m@Eo~J7g9FVWm*KgtAtgo~<v%Ie08q*~2%UVXH!RxttSFvHFYbz&hEWR6$
zv43(y)r-rDR%#`Fv@#^6AltKMEE@N<oWG)BCu)HUZG(AjytqXO(SIyj!9Lce76DD_
z9v~Mw_HoJiv=Uf0>-C0U*wuo;ob1zczZBJr+TzG`QsaI}MPKo#<iex5G`4NsFY}jR
z^xWxnm83m?`LwGwSo!YE3WF366rft!7W_bmnygZ9u!*;J$oo7mx1LB+G2;@nlLhmA
zl>#2E?Pt!?VQ+Cc`}v=#7a#oZ$<+*x>$0gakzL@#s6AS$fA&UqQn+zsdZ}iZ{a&TJ
zdCg#l<m@osuOx}Gn8uu2zoiJO$dZdsj9hSeVca;KOR`%pdz5!-;oz}=PNW^s-SW-x
z%ON$9S9I^ZUTAtOQCA!vJzNj<yHTnN?PtTf$xOKJPj<Pz;>EgZVtGS@qU*~IRNAx0
z14ZEVXl#p-&u?tx>XzvVhI|@^oVtjkHiGJ&hu|2k)J_@*cQevP1UBB4xl`_Knd))-
zqjU)Rz-C*1#Bth!37?&i%HX|4G4NfY>!Cp<46j^H{rKp+=(yg44N^Jq4iUy`JIQ(L
zCCVmDij9C4jbsQZ2?)Vz0OO)u?DbJu{oBtzXp2|h*V{<2Xgll`vJA8yw)EwjE$z#6
zZt17)Sa?GMIEIRw3V&yc!#iq7!}gypCyBtUM7VTFWZdN@4M=7i27JD4xLTw-yRKE#
zakMmH$l}0qwI)aK&^~ijJ7AQ&K|AvofK#&z?WA~9H~rqk3b~s_p6?QR*w>y(zE#1C
zEjuSY9lR}A3S-AkLwzCM)3}SimMgvor-A(&<r85YXa_HSA0CZR2I@y)y(FQmO#}EN
ziDVuHOun?9jxJ9|-81hFE33Bq`CtrpS@9^q*p@32C~K{FYMv;a7;(au<BN5_y>`82
z7B6)rT46M(snPY?$6?a+h)>*M#9VcH6>c_rQfY%t2j$YmKCub&>m)viJ>rs15&l<t
zh7*1vZnSzH-?Sxi3zda<OKiS`q0fcg60OT`B)KbOOlzD#P<F1fcChoxB6HhERKXgg
zrBZ}nMk`5f(j;#31yz_J>($;uU*pFy`R{!V<jl3pA~|kWZ83C#qBRvImv8px-6?ZY
zjOqmm-R09ls(Yqd$;&W_F3~<Pfe(E!9lX&tPG((J>4QFI6BsdDc_v4N#|Xf_p&tZx
zN-7ig8h;eMa~AEHEzicx+aGpy^K@&aXgN@Z3)LT}hC<J-*&nF0G+OWWGCg`oaj_bo
z$2;`Yh8|uaeUf3Fp}o67QiNAVpmRA-`k@`W1XKrI9N`0pBq3=sF$Ae8JhQ&l5D?Qo
zs7}jKad|{9_ki77-qzb1#4Pz9N4Hw5YiLdRoe=kPN|v3Ed%@@Fdgc3c+x)7>B6e{F
zHBS^pg{OCZcDB(<3A!@!7p{pVUzp;&cX8FU@&yX?3?@bR__qagCFj)rk)A9jYuYU%
z%C+aeS-&gqDgJMrSx5ieNV2AkhJg7<R<uLZP^~Q{%r4kIc|+Viz5T&`Ziu1Rz2gcL
z?{@)*>EC-(7d5)<sO4Xmv)hSw?^;Hq(^JeeaG;RMjfnm;*`|IJN81Q2z*>51ILggS
zn-oU>Zk8&7UE`>SjZ#eO#1wa=^J-H|Et#54|CfR}<6eQvY<M&LIoR58H7vgF?xC4u
zHiKu?O|rC^soA>fSFTFqRN>Z$$nVpk6$i!#qI#bRC10c#_ea>fnJM|icMMo<XY=>m
zjfzkGKd$Jn$AzP#+SC*`cgwIh74odyb|={<$!d&0-FkNl;>#YN5Zb{%adXMgJaTZt
zhK6n++$7x{ubY78OrP{UPjhsgwlxpCb}%(gROIsru5rLGj@m;sS3rNbtV9pfD5c-9
zJ$vII@rA^_<O6xX6?Mh-3fAOia0|Z!anfw2Ma(+BcZ^5FbAp&D`!?*=+gW}~-b+S5
zzs(Gv*KUH0MWOU}G}D{Wp4dg}csC(_9ULe^)@Va*_*eK~lsos2#vk1v8wCwCv>94<
z!_Mj_fhZHYaRdyWcqf~~%*O4kNk{tDT23|dkEXg4A9w3t<tNO(@UYuv0xg*O80m%P
zNRfEkamn=XcJz*;>rygDz4z1Ps5WOSMSny=oEd!XenSoH0#}WG@%w+m4(WW4`AThR
ziDUIIxaifukJ_XgU$>>pW>>qu&+D+}E?H)LWx{E?xqN-=dsDR^-2G{{;W(X3aei7_
zM8W`u)@Ri3p~M7*oxH;0_qJu__BOrJJHQyJ(PnsqARV(miNY)kdZdWs(F)Pf1=0hw
zKc-n{=1lAVrxk=BY9naW)uh_Be%n2x*lm)Yzygwu2kFe9*c>Ezsb#kZu`h6~?Q*^B
z30?G9^&+(pB^~qsxnEx+{aEAf($4}Caa$A9A0_l*B*y-+*^w;`7fLaO*@#}|x!%rY
zD~lD9J@nLT-|U$Z%;4@P2y@`Xt*q-yl>KEncqN-7-(LbRB*fIjs^SY~okgGLAG%eR
zh$(i*D%&N?IgzSb;-Muxy4|-~14ZBbY7bQ8zmYkR(Vk@xSySA&|9~2=oriIPgKn<Z
zeYn4D$<z!XTRon?y<Yae$MKFKJXQKz8*k54c|<)+Xr#fA4eSY+nB51&HOWr$L3`eH
z`l7m(rY{LtFiIZov0Mn$yF2Q6oYsF836b9*EIco8(`e~>ZE4g0spg_F=_h&HSAEe_
z`H!qhf}HGH97`5<08`o+#kr98!>t1U`AfH)HhHT9$=z!J^E*asMIDn(cD#uw58gCr
zywoO+zeDfr3@ljzjyLiS8l4Q9Um?evF@@Kc-xj#(w4^cEjmm!;`#SgzyJg91oi-Hi
zK&L%!%)RWq3{}R@JOs44ni=qxd`ZCfm7tApca?J4R1TX>0?&|&h0$F<?!?y}J}7h@
zHpW*4HIu8N5(?}AqX+_mgD@Bv4tMd`jiBYE>GypfX|e{fhvt4IA9FsR{T4Y!F@Xy!
zxve#((M^E?l%aG3sWLFDULpt6LV0Y=GzM9yV8j9<oz|vaKm+KkVEDwJBuV$IeyB6w
z!#N|*vF%iVYItGOifNUf*^RIsB-`euri?cLHj&=Zm4KUg2f*ne{Ix!d^nc>?&1nHh
zBrhV`iq1FX-*mZ~gD;k@R<+J}{Pddf;=}tMh8Y?AO1Vv%7d<Xl6@Zm}5&3JnTIBRe
zKE$po$vh2746@-)IX;03aK%0Y;CJyavkhR5??RgHc;v&Y;4j8;deu?&tYOe8eQt9q
zW`#G1@#3|iG-r$bj2vLc-P^qM29PCjn#3&-muyG|QoU<`O-c?A9YMcLRxAM@#m;D9
zK*1T!I!;1^-1`Qi_xwJ@iYPk2&COx?==y{dgMoVk8iOF~HOPNVUH<m_6uzn{1><j6
zhH9&@Aq7!K;MsJ2f~-Fm@H#|F7oi*1YY&3??YYuuTC)be>(?T9&W8k_l$#c$wo4fF
z1r;-mU=Y9x0R#i`V!PMMYhfEh1y(S~&_2V94M7h<CjJ0RnJbS9rxetG0RzIm3z=eV
zoc*QWS&z5?N)$pE*w^BAp8$-3D-BTV)0fWng-BF8Q6Zw2_lh0`U~+(&H$V^PX@-*Z
zV*1D=_&~Jz06HEsrbZ+kvg>#y4A2Qu6X7$VxX?#cJtvw6W`+V$%9^kP;sEU*1GJ`h
zqkMuE(qAbhAY@ps?=OJ&XrTF0`xmjr`H>JnU26JsrxSqR_fi3kIRP=%LM3Qei9qAw
zGqrrR;&=c(0hTvE_3jR|@mL>d9QA;xo<Ov$d}AnfQ2GiU&}C2w(`k@v{4Z%fJQm37
zd?zrA-&>@G$e$g4k>7ARR0!JnL$-$6X~|CeOo(J_aeHy*+U0OV_D}`~<g@Pq)!$7*
zsuGLA3j$DmQ$TX3ZioNC0X!gx0UNY=HHo8&&a-?i?KD;^m@tkF8!uZwCY-f8iWcl5
z5iIM>9c7yf6powopu!m9aj>!J0pv3FahF+@QQ(H$2{LH3wII=Uv*u=j{1he#Ro;Or
z{hklVTkS0I4ly}uW$K7duzWq?!qPF7>~wq<UB+l{nQe81I-poqiK1WHm|KB(U^dd>
z^ud3yLn<c{nP5-1rPM!a5cOd3$F4|Ek-U_=bbqqs@?;-gjW^`KG&%vpuF+{LjS9Nd
zG1ECdc8h0x<&RvUw0}u9ze?Pf%hM3TW~0~g(~<}S6Q=B}D1syeuGqJxqK!RJ6q_wd
zP!AC^*L<Cs8pAfzhH|A(R&#=pa=@;qhQ)Spjkz{aA398;#UV2Q$12Gi$is7GfEi^d
z_IjfJ3aZR=SBdv&S->B9xNSU|p+_5)QeRU#YH@wG|1&9IeV-7$?rN7DP%sHhWpvzz
zd_T++C58J*nM`3@Y$J3x!gDlxCE?#1FZ3D-5REl*%{JBda|mx(pK<6tlp|Cy<KGq)
zzB;Ouysg;KnjaQ`R+l6oY9xtFPjEU^M;X>xXH!uu;5po;{v}e*r~&eRi=hs?IGgx$
zNis+AXhr!TG#b*0XUHkQ@MSq$<AprASAhf=jm)c?hOq~X$;@2R>;o33qZT$Vz0B~T
zci@LjONnDtCWf1uVmUWQq~gj8O?v~mjgSx!X4t%SD8m7{(f@k|9*O`1)IF79QTktY
zFp!)5_k|G)4DbNUYk+R%gJrhh7r0kN9m{eEt~Y-5;kaUuj1?;t+}>qe%bv5<rV8?X
z%quduWiefKYMGWrRT)RH$j4@`5L03Np_*X(y`G&jk6VcFh>e<pe|bvN_rmG^<lM75
zpDSefktS-0%-VkLx7b0bzsSMDnd9&)@1jB~CT|>PwyDwIiSEo6a8RpFx9s}~;y*p#
z90v}#9pS4MRA)ZjE}|<_(S@*k@pM--n3<Tm(TYr{d2K-h4_OTVUP6tK9fWMeZ>d+g
z$hCkg@r+i}UCIGHsi(NdZ3*Gv1vU>rZ2F>Rp{g9UtfqdnCC&td9`6zlt|yiahkI3Q
z(|G$UkCGPoQ}n-a2ociNzoqX#eD0a?4)=39?fda>2=fP4Kc+NhU)ySPXyfDP6))D1
z2`+eHXg+wwqkltDzKn^X8fTXvTs0?LHSlJ>VUsyo{$nC$z}lg+3;s3m)QF{CPs**t
z{$$0+PBB-R)r9+xg~LDL3JV5eA!S+p8kw3taQA?cGbIrwJ+KfbJd6cVpdt^ZMNDae
z10@}$Uy_?%TN7N3R`W9FGF4qIMBU{y3T36N#)}v5CT>~1OLlrc2k3@COffa5%AhJD
z#5WNlW92BXvoqcx5LG+$O%?N*mw`O);7p@<qggqJueUyt7-}e&%zq7I8)JOU#2i{$
zLr?1A5IGESsFR$!3*h>9#z0f&fD-VX)1TK0hsO#NlEqCLV-79Ewyf;_^^Wf}ny-Mi
zX+p_`q{UD#{NY!{cxiF3DGkoX_12f-d7Ek2(}=B&IEU!IH9zJIzq{n?p~bd#sqn;b
ztp+P*k}T$*{_X&8Sevd2dV#(yh*I(4!w$c7hL|a}@PRDT?qGIAk+~mf1L|H3Q_*Ty
zy}v(RC=FIYu`B6T)QOfh%?8sI_$`7ezQD&J!%=bTw{)fGb^!44uwt-Xxe|h$N(NKp
zb*F+E>B_95Hh4uQyfUF?xugf~sE1>s34-^mQPSqr#*A#0Kly7>11;=9#&}L9kX^Od
zBxP|z-55Zn5t}B+_-o%uk{;HD!b{T9&0<SXFv5$hPxZWF-oNoR*HWc*3WAS*m+}WR
z(d@NRN&-}hmUH%7@(@OzYe@@_MP%L}(W83Dbs0X-RmW`1MSUpH_ru0!7O>r%Yub3d
zBub>L?~BmXl$zCC$iqNya05$=%4IPI0HT-xASwn<?CzUC-vqfYr}6)$U)K5E{`Pf6
zZ-U8)GSSz5FVG#TcyklCV#hsnN`my@@0GI*=?5_>Q@l_RM(i70Su@#BbX%`pM9$qa
z^`l;hQNa`CGRSl(2czz73B?Jv&W!w~R_t$1H8?4lLIAhEw`EE<#bh=LU!m{Z&6Lgg
zPGG=W!L>gBe0t+X5`R6Xey@*JonXY3t$3kE1RhOs3|t;gqs8G~Ugrs=fc{B!V2TQZ
z1zt3i1BPj(b96BsXWsXT(j0%8loMW$8elQ&){L_vHlGNBW6J9E;?MpB;0o++ss)l{
zjP;2Wx-oi4l43}LK|KP)uq;byg8m#?sTeXVEOV(8x-Ny0lg!ChrcyHT)J3w}U2VjD
z6uOSHp7m?fhq{6BGM~&9D9F;;5DY)>U_7@=Av`7hX99svBd)YSt1_h%?BayDXeLx@
z&=m*WP;5}f%3H&)@2nD7nBS^~M@^7;bGL~pvazbin~l9pe63pF@jBt2EGsx&o4!I1
z!DK*U8-;|Me(4*DryojC->h>r$6TvfumAAKhx_a$-#qXr1G0SfH)+c>n(oO}lVPp_
z3bvh-Z*B)?Z2vKNLo~m^l)c;3jvp}`In+#+LN4aL<usY6oh;<V`Z`8tV!YKA-p0KX
zR)mY&iJieBb)H|=z#A4@W2ucD!v&4l-N`j9HVZ2-S1-wJl)<Fz6)VE7%0B6u+8PA*
zL6D{@zXt<{Q;oXA-W%K$-mZ)qG2b!hI{xoPBybQ|q{1=?ZDNH)upK#O*9VU-*YS0)
z(lcEgvXEVZd!~()F$>`ftrI_Tb4d&&L_Nm?$xYIB*<Os5diwl5fF>NB<!4+ubxvT%
zSm>Eydmk0bJgrXN)&6viaH$)dpZCqN7cZaG;NPw;&}<cfAY&02*$IGSOAf+-dxb<F
znxO!4Ov)sFWo1@mT_``X&gph#Vk=%!f~>3gR~~L@vv8+)837G@@8>-i_g~bVGpw81
z$7yV=0ps(LGpc2knin;)?u~+1_`=gtkwSobUbe(a`DglcTZghrmt-rSzf6IWGI{%A
z;Gxd$U;Lnm8RnaLj`NJG!;cxEi)-%xkukAC5L1BQf$%R7S+b+ghKkz$m8~vo9-6h=
z8__>#isq;VIPXUb>DGCl&4%vooV}<z&GAbq@5`;^ts;`0_2#UE9_~s%O-X<q3_>E>
zyq?EUVhV2+Q%Zqg5skj#QhwXViR-h-JIE|ih*brKAmZJGr=CK2$+1|!2i5x^^|k*@
z8%GGUoQ(55PACs6mXC1!txjM%*_{BenG-bL?2M3XqbtObX73?+lO_yK(x;XDzKexe
zyP@=?4i=sH$o8{<2<*@w6wzj2z0!P3w~NdmL^k|8__H2OXy3`fcjfAqVcia2OcIs0
z6MDQ6U1WW8VHrQxEN}C88s|JrM9%h?_mz??6uR-TY2Yyg=Li`kfdM{&2IDcWX}#Uh
zeL2Hm$>qT9lO9p7^}E&daJeIobK~iQo{zGO{0=;-pvm;@|7m?=4>6Fi-(1+9mli^5
zZNF7Ma!W|e2v2#Mc<Lr?KogDMqXZxNA@5xgQ;OoraF%y#Ehqmy3+ZQjC9a^C`s99P
zq~y$`Kz^gBc6h-r3bq~4vR?ojW0Hw^cHS2~k!gRexjs0o0A1(a$R)eIAbBV8fj7$g
z2k8xcmVWSCG{qh|j*fwG|7N&Dpzdx~CzfydF6M*JAY*6uQ%Bn!Vss7K#<Rzlgx0nb
zSfVOeJ2`7c$)=bj1+s9=A{eg&&8x!llw6O|ou<0bNaeZ&U-ePShrXn2#^FH--J7U;
z6(){?N)%5?fs5VPC7X86JXf%2e(EV8>pl0=+p{BkwdVZ$-Q$Yt+X0u*?5H|k*%Oxy
z=Mg{ux{J+JH}0CVq>L2;!5aw@|HlQ7T_eTUPd~yO#`VMYbgOR%iZ;sTB)Jp^$l;MN
zUI_&}gMo!d+BX#Hs`eLM6<YIu<9Ki{>2x`KSx4Y4$?bJ2XY&*>M(1BXplGNtuzl9T
z_u<Q#&23EILTbZ?)YZ((YM08$G0}R%m}v6Ibj>ZU%J%t+HA{zA%`R|L2OCTNM;AM@
zmvo2iJVX{cn(=&Xo?rJSL4u@gx((Z|{@>0XE(J(O`y_lEz09|_$}`DZubTBEe%{f&
z{deOq=92@0ObmU{Xk$f<eoIg>>o*ge%{4e|?u>9?0bfgoo$z+Q-KB4|-`(kOuc@)_
zEGTjo|Ga;`x5UHdw9j(2bMmH*xKi`isRjAKr?O?5A*qa%M-~G@{YXUvUqQ~V2u=P}
zKgLkSvaR?FFQ&i)wQf&Y(O0@L_L+A4%@^%1cFWXkk2<Z~7b-8^a9Ll>`9-~LPmMNo
z&;3J67>TW_>g40v=<BU;=Em-q5*g{@9+`T`_J=$@>`Fn=p5M9Qu4o1OpXZG6>bMvd
z1uXg5g(NT-cJ$)2R%;!J4L>5~qd|0*C>$%_{OaTQT~=y(^|wZhj@9s;J*$2llBnGE
zE{|3hRWN^yot<a32bG_01ZWyReE>{C81*%49Y#`cKZbMc18dTgUL;(M-F-V;g$wE9
zoXf-BrO18t^sTF*V)<8zmn38nk91_NNxc5!)-`m`LqhVOI`a5zUuV<(D-AGSDd`Dy
zDf>L@{r7L69}&XikPvDpKL=9fzjNmQ{`mi%24wd5zubUMq5m2e{|lbRBh1~!#&U8v
T3O4XXNYA9j6~w-Z7zO<ocVfC0

literal 92674
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


From 6cdce04937837de8014b1c044c91ed5b32bdc90a Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Thu, 12 May 2016 13:40:24 +0300
Subject: [PATCH 0347/1431] Revert "Revert "no need to show the help about
 Github or the other authentication sources""

This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
---
 app/helpers/application_settings_helper.rb           | 9 +--------
 app/views/admin/application_settings/_form.html.haml | 3 ---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 82056a4c977..878b1b254ce 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -71,15 +71,8 @@ module ApplicationSettingsHelper
       label_tag(checkbox_name, class: css_class) do
         check_box_tag(checkbox_name, source, !disabled,
                       autocomplete: 'off',
-                      aria: { describedby: help_block_id }) + Gitlab::OAuth::Provider.label_for(source)
+                      'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source)
       end
     end
   end
-
-  def oauth_providers_with_help_links
-    button_based_providers.map do |provider|
-      Gitlab::OAuth::Provider.label_for(provider) + ' ' +
-        link_to("(?)", help_page_path("integration", provider))
-    end
-  end
 end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index f3681bc96e3..576509e3f2b 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -116,9 +116,6 @@
           .btn-group{ data: { toggle: 'buttons' } }
             - oauth_providers_checkboxes('oauth-providers-help').each do |source|
               = source
-          %span.help-block#oauth-providers-help
-            Enabled OmniAuth must be configured for
-            = oauth_providers_with_help_links.to_sentence.html_safe
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
       .col-sm-10

From 260c88a75865a1b849a4bac8a14c897fbe522047 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Thu, 12 May 2016 13:43:12 +0300
Subject: [PATCH 0348/1431] no need to define the help block since there's no
 help block

---
 app/helpers/application_settings_helper.rb           | 5 ++---
 app/views/admin/application_settings/_form.html.haml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 878b1b254ce..03080d25931 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -61,7 +61,7 @@ module ApplicationSettingsHelper
     end
   end
 
-  def oauth_providers_checkboxes(help_block_id)
+  def oauth_providers_checkboxes
     button_based_providers.map do |source|
       disabled = current_application_settings.disabled_oauth_sign_in_sources.include?(source.to_s)
       css_class = 'btn'
@@ -70,8 +70,7 @@ module ApplicationSettingsHelper
 
       label_tag(checkbox_name, class: css_class) do
         check_box_tag(checkbox_name, source, !disabled,
-                      autocomplete: 'off',
-                      'aria-describedby' => help_block_id) + Gitlab::OAuth::Provider.label_for(source)
+                      autocomplete: 'off') + Gitlab::OAuth::Provider.label_for(source)
       end
     end
   end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 576509e3f2b..f7c799c968f 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -114,7 +114,7 @@
         = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
         .col-sm-10
           .btn-group{ data: { toggle: 'buttons' } }
-            - oauth_providers_checkboxes('oauth-providers-help').each do |source|
+            - oauth_providers_checkboxes.each do |source|
               = source
     .form-group
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'

From d66833bca5ae0347751ceab99062b638965eab78 Mon Sep 17 00:00:00 2001
From: Andrei Gliga <otzy_007@yahoo.com>
Date: Thu, 12 May 2016 13:56:04 +0300
Subject: [PATCH 0349/1431] =?UTF-8?q?schema=20fix=20=F0=9F=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index b21cc162892..74facd12088 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -70,16 +70,16 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.string   "recaptcha_site_key"
     t.string   "recaptcha_private_key"
     t.integer  "metrics_port",                      default: 8089
+    t.boolean  "akismet_enabled",                   default: false
+    t.string   "akismet_api_key"
     t.integer  "metrics_sample_interval",           default: 15
     t.boolean  "sentry_enabled",                    default: false
     t.string   "sentry_dsn"
-    t.boolean  "akismet_enabled",                   default: false
-    t.string   "akismet_api_key"
     t.boolean  "email_author_in_body",              default: false
     t.integer  "default_group_visibility"
     t.boolean  "repository_checks_enabled",         default: false
-    t.integer  "metrics_packet_size",               default: 1
     t.text     "shared_runners_text"
+    t.integer  "metrics_packet_size",               default: 1
     t.text     "disabled_oauth_sign_in_sources"
   end
 
@@ -427,10 +427,10 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.string   "state"
     t.integer  "iid"
     t.integer  "updated_by_id"
-    t.integer  "moved_to_id"
     t.boolean  "confidential",  default: false
     t.datetime "deleted_at"
     t.date     "due_date"
+    t.integer  "moved_to_id"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -717,8 +717,8 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.integer "project_id"
     t.text    "data"
     t.text    "encrypted_credentials"
-    t.text    "encrypted_credentials_iv"
-    t.text    "encrypted_credentials_salt"
+    t.string  "encrypted_credentials_iv"
+    t.string  "encrypted_credentials_salt"
   end
 
   create_table "projects", force: :cascade do |t|
@@ -816,9 +816,9 @@ ActiveRecord::Schema.define(version: 20160508194200) do
     t.string   "type"
     t.string   "title"
     t.integer  "project_id"
-    t.datetime "created_at",                               null: false
-    t.datetime "updated_at",                               null: false
-    t.boolean  "active",                                   null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                default: false,    null: false
     t.text     "properties"
     t.boolean  "template",              default: false
     t.boolean  "push_events",           default: true

From e867099091e19e8cae47d928761b869ec20db2c3 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 9 May 2016 14:14:32 +0200
Subject: [PATCH 0350/1431] Added helper methods for database migrations

These helpers can be used to perform migrations without taking down the
entire application.

For example, the method "add_column_with_default" can be used to add a
new column with a default value without locking the entire table.
---
 lib/gitlab/database/migration_helpers.rb      | 132 ++++++++++++++++++
 .../gitlab/database/migration_helpers_spec.rb | 124 ++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 lib/gitlab/database/migration_helpers.rb
 create mode 100644 spec/lib/gitlab/database/migration_helpers_spec.rb

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
new file mode 100644
index 00000000000..7aa8c90e6d1
--- /dev/null
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -0,0 +1,132 @@
+module Gitlab
+  module Database
+    module MigrationHelpers
+      # Creates a new index, concurrently when supported
+      #
+      # On PostgreSQL this method creates an index concurrently, on MySQL this
+      # creates a regular index.
+      #
+      # Example:
+      #
+      #     add_concurrent_index :users, :some_column
+      #
+      # See Rails' `add_index` for more info on the available arguments.
+      def add_concurrent_index(*args)
+        if transaction_open?
+          raise 'add_concurrent_index can not be run inside a transaction, ' \
+            'you can disable transactions by calling disable_ddl_transaction! ' \
+            'in the body of your migration class'
+        end
+
+        if Database.postgresql?
+          args << { algorithm: :concurrently }
+        end
+
+        add_index(*args)
+      end
+
+      # Updates the value of a column in batches.
+      #
+      # This method updates the table in batches of 5% of the total row count.
+      # Any data inserted while running this method (or after it has finished
+      # running) is _not_ updated automatically.
+      #
+      # This method _only_ updates rows where the column's value is set to NULL.
+      #
+      # table - The name of the table.
+      # column - The name of the column to update.
+      # value - The value for the column.
+      def update_column_in_batches(table, column, value)
+        quoted_table = quote_table_name(table)
+        quoted_column = quote_column_name(column)
+        quoted_value = quote(value)
+        processed = 0
+
+        total = exec_query("SELECT COUNT(*) AS count FROM #{quoted_table}").
+          to_hash.
+          first['count'].
+          to_i
+
+        # Update in batches of 5% with an upper limit of 5000 rows.
+        batch_size = ((total / 100.0) * 5.0).ceil
+
+        while processed < total
+          start_row = exec_query(%Q{
+            SELECT id
+            FROM #{quoted_table}
+            ORDER BY id ASC
+            LIMIT 1 OFFSET #{processed}
+          }).to_hash.first
+
+          stop_row = exec_query(%Q{
+            SELECT id
+            FROM #{quoted_table}
+            ORDER BY id ASC
+            LIMIT 1 OFFSET #{processed + batch_size}
+          }.strip_heredoc).to_hash.first
+
+          query = %Q{
+            UPDATE #{quoted_table}
+            SET #{quoted_column} = #{quoted_value}
+            WHERE id >= #{start_row['id']}
+          }
+
+          if stop_row
+            query += " AND id < #{stop_row['id']}"
+          end
+
+          execute(query.strip_heredoc)
+
+          processed += batch_size
+        end
+      end
+
+      # Adds a column with a default value without locking an entire table.
+      #
+      # This method runs the following steps:
+      #
+      # 1. Add the column with a default value of NULL.
+      # 2. Update all existing rows in batches.
+      # 3. Change the default value of the column to the specified value.
+      # 4. Update any remaining rows.
+      #
+      # These steps ensure a column can be added to a large and commonly used
+      # table without locking the entire table for the duration of the table
+      # modification.
+      #
+      # table - The name of the table to update.
+      # column - The name of the column to add.
+      # type - The column type (e.g. `:integer`).
+      # default - The default value for the column.
+      # allow_null - When set to `true` the column will allow NULL values, the
+      #              default is to not allow NULL values.
+      def add_column_with_default(table, column, type, default:, allow_null: false)
+        if transaction_open?
+          raise 'add_column_with_default can not be run inside a transaction, ' \
+            'you can disable transactions by calling disable_ddl_transaction! ' \
+            'in the body of your migration class'
+        end
+
+        transaction do
+          add_column(table, column, type, default: nil)
+
+          # Changing the default before the update ensures any newly inserted
+          # rows already use the proper default value.
+          change_column_default(table, column, default)
+        end
+
+        begin
+          transaction do
+            update_column_in_batches(table, column, default)
+          end
+        rescue Exception => error
+          remove_column(table, column)
+
+          raise error
+        end
+
+        change_column_null(table, column, false) unless allow_null
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
new file mode 100644
index 00000000000..ad2f3cb7e45
--- /dev/null
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -0,0 +1,124 @@
+require 'spec_helper'
+
+describe Gitlab::Database::MigrationHelpers, lib: true do
+  let(:model) do
+    Class.new do
+      include Gitlab::Database::MigrationHelpers
+
+      def method_missing(name, *args, &block)
+        ActiveRecord::Base.connection.send(name, *args, &block)
+      end
+    end.new
+  end
+
+  describe '#add_concurrent_index' do
+    context 'outside a transaction' do
+      before do
+        expect(model).to receive(:transaction_open?).and_return(false)
+      end
+
+      context 'using PostgreSQL' do
+        it 'creates the index concurrently' do
+          expect(Gitlab::Database).to receive(:postgresql?).and_return(true)
+
+          expect(model).to receive(:add_index).
+            with(:users, :foo, algorithm: :concurrently)
+
+          model.add_concurrent_index(:users, :foo)
+        end
+      end
+
+      context 'using MySQL' do
+        it 'creates a regular index' do
+          expect(Gitlab::Database).to receive(:postgresql?).and_return(false)
+
+          expect(model).to receive(:add_index).
+            with(:users, :foo)
+
+          model.add_concurrent_index(:users, :foo)
+        end
+      end
+    end
+
+    context 'inside a transaction' do
+      it 'raises RuntimeError' do
+        expect(model).to receive(:transaction_open?).and_return(true)
+
+        expect { model.add_concurrent_index(:users, :foo) }.
+          to raise_error(RuntimeError)
+      end
+    end
+  end
+
+  describe '#update_column_in_batches' do
+    before do
+      create_list(:empty_project, 5)
+    end
+
+    it 'updates all the rows in a table' do
+      model.update_column_in_batches(:projects, :import_error, 'foo')
+
+      expect(Project.where(import_error: 'foo').count).to eq(5)
+    end
+  end
+
+  describe '#add_column_with_default' do
+    context 'outside of a transaction' do
+      before do
+        expect(model).to receive(:transaction_open?).and_return(false)
+
+        expect(model).to receive(:transaction).twice.and_yield
+
+        expect(model).to receive(:add_column).
+          with(:projects, :foo, :integer, default: nil)
+
+        expect(model).to receive(:change_column_default).
+          with(:projects, :foo, 10)
+      end
+
+      it 'adds the column while allowing NULL values' do
+        expect(model).to receive(:update_column_in_batches).
+          with(:projects, :foo, 10)
+
+        expect(model).not_to receive(:change_column_null)
+
+        model.add_column_with_default(:projects, :foo, :integer,
+                                      default: 10,
+                                      allow_null: true)
+      end
+
+      it 'adds the column while not allowing NULL values' do
+        expect(model).to receive(:update_column_in_batches).
+          with(:projects, :foo, 10)
+
+        expect(model).to receive(:change_column_null).
+          with(:projects, :foo, false)
+
+        model.add_column_with_default(:projects, :foo, :integer, default: 10)
+      end
+
+      it 'removes the added column whenever updating the rows fails' do
+        expect(model).to receive(:update_column_in_batches).
+          with(:projects, :foo, 10).
+          and_raise(RuntimeError)
+
+        expect(model).to receive(:remove_column).
+          with(:projects, :foo)
+
+        expect {
+          model.add_column_with_default(:projects, :foo, :integer, default: 10)
+        }.to raise_error(RuntimeError)
+      end
+    end
+
+    context 'inside a transaction' do
+      it 'raises RuntimeError' do
+        expect(model).to receive(:transaction_open?).and_return(true)
+
+        expect {
+          model.add_column_with_default(:projects, :foo, :integer, default: 10)
+        }.to raise_error(RuntimeError)
+      end
+    end
+  end
+end

From d7cfe1a5bf671774a2fb7ffdb483fdbadf9f3228 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 9 May 2016 14:31:39 +0200
Subject: [PATCH 0351/1431] Added custom migration generator templates

This allows us to automatically include
Gitlab::Database::MigrationHelpers into newly generated migrations.
---
 .../migration/create_table_migration.rb       | 32 ++++++++++++
 .../active_record/migration/migration.rb      | 52 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 lib/templates/active_record/migration/create_table_migration.rb
 create mode 100644 lib/templates/active_record/migration/migration.rb

diff --git a/lib/templates/active_record/migration/create_table_migration.rb b/lib/templates/active_record/migration/create_table_migration.rb
new file mode 100644
index 00000000000..1235ecd8e6e
--- /dev/null
+++ b/lib/templates/active_record/migration/create_table_migration.rb
@@ -0,0 +1,32 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # When using the methods "add_concurrent_index" or "add_column_with_default"
+  # you must disable the use of transactions as these methods can not run in an
+  # existing transaction. When using "add_concurrent_index" make sure that this
+  # method is the _only_ method called in the migration, any other changes
+  # should go in a separate migration. This ensures that upon failure _only_ the
+  # index creation failes and can be re-tried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+  def change
+    create_table :<%= table_name %> do |t|
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+      t.string :password_digest<%= attribute.inject_options %>
+<% else -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
+<% end -%>
+<% if options[:timestamps] %>
+      t.timestamps null: false
+<% end -%>
+    end
+<% attributes_with_index.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+<% end -%>
+  end
+end
diff --git a/lib/templates/active_record/migration/migration.rb b/lib/templates/active_record/migration/migration.rb
new file mode 100644
index 00000000000..3cde953d15f
--- /dev/null
+++ b/lib/templates/active_record/migration/migration.rb
@@ -0,0 +1,52 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # When using the methods "add_concurrent_index" or "add_column_with_default"
+  # you must disable the use of transactions as these methods can not run in an
+  # existing transaction. When using "add_concurrent_index" make sure that this
+  # method is the _only_ method called in the migration, any other changes
+  # should go in a separate migration. This ensures that upon failure _only_ the
+  # index creation failes and can be re-tried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+<%- if migration_action == 'add' -%>
+  def change
+<% attributes.each do |attribute| -%>
+  <%- if attribute.reference? -%>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- if attribute.has_index? -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>
+  end
+<%- elsif migration_action == 'join' -%>
+  def change
+    create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
+    <%- attributes.each do |attribute| -%>
+      <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+    end
+  end
+<%- else -%>
+  def change
+<% attributes.each do |attribute| -%>
+<%- if migration_action -%>
+  <%- if attribute.reference? -%>
+    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    <%- if attribute.has_index? -%>
+    remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+    remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+  <%- end -%>
+<%- end -%>
+<%- end -%>
+  end
+<%- end -%>
+end

From e8efaca23ce0b5aa347dfa053091d0b48e746fb8 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 9 May 2016 15:05:19 +0200
Subject: [PATCH 0352/1431] Updated migration styleguide for new helpers

---
 doc/development/migration_style_guide.md | 46 ++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 28dedf3978c..1c13b094582 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -8,7 +8,10 @@ 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.
+Migrations should not require GitLab installations to be taken offline unless
+_absolutely_ necessary. If a migration requires downtime this should be
+clearly mentioned during the review process as well as being documented in the
+monthly release post.
 
 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
@@ -58,6 +61,45 @@ remove_index :namespaces, column: :name if index_exists?(:namespaces, :name)
 
 If you need to add an unique index please keep in mind there is possibility of existing duplicates. If it is possible write a separate migration for handling this situation. It can be just removing or removing with overwriting all references to these duplicates depend on situation.
 
+When adding an index make sure to use the method `add_concurrent_index` instead
+of the regular `add_index` method. The `add_concurrent_index` method
+automatically creates concurrent indexes when using PostgreSQL, removing the
+need for downtime. To use this method you must disable transactions by calling
+the method `disable_ddl_transaction!` in the body of your migration class like
+so:
+
+```
+class MyMigration < ActiveRecord::Migration
+  disable_ddl_transaction!
+
+  def change
+
+  end
+end
+```
+
+## Adding Columns With Default Values
+
+When adding columns with default values you should use the method
+`add_column_with_default`. This method ensures the table is updated without
+requiring downtime. This method is not reversible so you must manually define
+the `up` and `down` methods in your migration class.
+
+For example, to add the column `foo` to the `projects` table with a default
+value of `10` you'd write the following:
+
+```
+class MyMigration < ActiveRecord::Migration
+  def up
+    add_column_with_default(:projects, :foo, :integer, 10)
+  end
+
+  def down
+    remove_column(:projects, :foo)
+  end
+end
+```
+
 ## Testing
 
 Make sure that your migration works with MySQL and PostgreSQL with data. An empty database does not guarantee that your migration is correct.
@@ -89,4 +131,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 d890807939a7b5ae9306cc347f87a1f53d46728e Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 9 May 2016 15:06:22 +0200
Subject: [PATCH 0353/1431] Link to migration guide in migration templates

---
 .../active_record/migration/create_table_migration.rb          | 3 +++
 lib/templates/active_record/migration/migration.rb             | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lib/templates/active_record/migration/create_table_migration.rb b/lib/templates/active_record/migration/create_table_migration.rb
index 1235ecd8e6e..4b7e39e057f 100644
--- a/lib/templates/active_record/migration/create_table_migration.rb
+++ b/lib/templates/active_record/migration/create_table_migration.rb
@@ -1,3 +1,6 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
 class <%= migration_class_name %> < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
diff --git a/lib/templates/active_record/migration/migration.rb b/lib/templates/active_record/migration/migration.rb
index 3cde953d15f..ae88593cd12 100644
--- a/lib/templates/active_record/migration/migration.rb
+++ b/lib/templates/active_record/migration/migration.rb
@@ -1,3 +1,6 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
 class <%= migration_class_name %> < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 

From 443c3aa5972fda2f9899fe3618ebfb9a31f59e1f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 11 May 2016 12:43:54 +0200
Subject: [PATCH 0354/1431] Tell Rubocop to ignore lib/templates

---
 .rubocop.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9f179efa3ce..5d56be65f1d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,6 +21,7 @@ AllCops:
     - 'lib/email_validator.rb'
     - 'lib/gitlab/upgrader.rb'
     - 'lib/gitlab/seeder.rb'
+    - 'lib/templates/**/*'
 
 
 ##################### Style ##################################
@@ -276,7 +277,7 @@ Style/IdenticalConditionalBranches:
   Enabled: false
 
 # Checks the indentation of the first line of the right-hand-side of a
-# multi-line assignment. 
+# multi-line assignment.
 Style/IndentAssignment:
   Enabled: false
 

From 36083b4d0ee6787da6be13b45cc7144de704c308 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 11 May 2016 14:11:04 +0200
Subject: [PATCH 0355/1431] Fixed styling per Rubocop pedantics

---
 lib/gitlab/database/migration_helpers.rb           | 4 +++-
 spec/lib/gitlab/database/migration_helpers_spec.rb | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 7aa8c90e6d1..4773a88d0c1 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -119,7 +119,9 @@ module Gitlab
           transaction do
             update_column_in_batches(table, column, default)
           end
-        rescue Exception => error
+        # We want to rescue _all_ exceptions here, even those that don't inherit
+        # from StandardError.
+        rescue Exception => error # rubocop: disable all
           remove_column(table, column)
 
           raise error
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index ad2f3cb7e45..ec43165bb53 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -105,9 +105,9 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         expect(model).to receive(:remove_column).
           with(:projects, :foo)
 
-        expect {
+        expect do
           model.add_column_with_default(:projects, :foo, :integer, default: 10)
-        }.to raise_error(RuntimeError)
+        end.to raise_error(RuntimeError)
       end
     end
 
@@ -115,9 +115,9 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       it 'raises RuntimeError' do
         expect(model).to receive(:transaction_open?).and_return(true)
 
-        expect {
+        expect do
           model.add_column_with_default(:projects, :foo, :integer, default: 10)
-        }.to raise_error(RuntimeError)
+        end.to raise_error(RuntimeError)
       end
     end
   end

From 945c5b3fe6e0552f77da8b1a1efe75cd04434f53 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 12 May 2016 15:14:14 +0200
Subject: [PATCH 0356/1431] Removed tracking of total method execution times

Because method call timings are inclusive (that is, they include the
time of any sub method calls) this would lead to the total method
execution time often being far greater than the total transaction time.
Because this is incredibly confusing it's best to simply _not_ track the
total method execution time, after all it's not that useful to begin
with.

Fixes gitlab-org/gitlab-ce#17239
---
 CHANGELOG                                       | 1 +
 lib/gitlab/metrics/instrumentation.rb           | 2 --
 spec/lib/gitlab/metrics/instrumentation_spec.rb | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 187011c6016..985e25aab37 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.8.0 (unreleased)
   - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
   - Fix adding a todo for private group members (Ahmad Sherif)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
+  - Total method execution timings are no longer tracked
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/lib/gitlab/metrics/instrumentation.rb b/lib/gitlab/metrics/instrumentation.rb
index 708ef79f304..0f115893a15 100644
--- a/lib/gitlab/metrics/instrumentation.rb
+++ b/lib/gitlab/metrics/instrumentation.rb
@@ -154,8 +154,6 @@ module Gitlab
               duration = (Time.now - start) * 1000.0
 
               if duration >= Gitlab::Metrics.method_call_threshold
-                trans.increment(:method_duration, duration)
-
                 trans.add_metric(Gitlab::Metrics::Instrumentation::SERIES,
                                  { duration: duration },
                                  method: #{label.inspect})
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index 5c885a7a982..7b86450a223 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -56,9 +56,6 @@ describe Gitlab::Metrics::Instrumentation do
         allow(described_class).to receive(:transaction).
           and_return(transaction)
 
-        expect(transaction).to receive(:increment).
-          with(:method_duration, a_kind_of(Numeric))
-
         expect(transaction).to receive(:add_metric).
           with(described_class::SERIES, an_instance_of(Hash),
                method: 'Dummy.foo')
@@ -139,9 +136,6 @@ describe Gitlab::Metrics::Instrumentation do
         allow(described_class).to receive(:transaction).
           and_return(transaction)
 
-        expect(transaction).to receive(:increment).
-          with(:method_duration, a_kind_of(Numeric))
-
         expect(transaction).to receive(:add_metric).
           with(described_class::SERIES, an_instance_of(Hash),
                method: 'Dummy#bar')

From 5bd356eb31fb4684199f6f681f4901ebe025ed92 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 12 May 2016 09:27:58 -0500
Subject: [PATCH 0357/1431] Fix specs

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

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 01236b8e3c7..4a3f92ad34a 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -95,7 +95,7 @@ module Ci
     end
 
     def trace_html
-      trace_with_state[:html]
+      trace_with_state[:html] || ''
     end
 
     def trace_with_state(state = nil)

From f4ab8ea4968b97fc2c918b85c534978aaa954c94 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 17:16:35 +0200
Subject: [PATCH 0358/1431] rename method

---
 app/services/projects/create_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index c61a515a6b9..e0081e5162f 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -50,7 +50,7 @@ module Projects
         @project.build_forked_project_link(forked_from_project_id: forked_from_project_id)
       end
 
-      process_import_data(import_data)
+      save_project_and_import_data(import_data)
 
       start_import if @project.import?
 
@@ -100,7 +100,7 @@ module Projects
       end
     end
 
-    def process_import_data(import_data)
+    def save_project_and_import_data(import_data)
       Project.transaction do
         @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
         @project.save

From 827fbc10f6147c3c86278ed7f1675b085cc2a3cb Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 3 May 2016 13:58:50 +0100
Subject: [PATCH 0359/1431] Only show forks for users who can download code

The ForksController enforces this, so don't show the link if it won't go
anywhere.
---
 CHANGELOG                      | 1 +
 app/helpers/projects_helper.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 187011c6016..878453e861b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 8.8.0 (unreleased)
   - Backport GitHub Enterprise import support from EE
   - Create tags using Rugged for performance reasons. !3745
   - API: Expose Issue#user_notes_count. !3126 (Anton Popov)
+  - Don't show forks button when user can't view forks
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 85f8854d2eb..e1ab78df69e 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -138,10 +138,10 @@ module ProjectsHelper
   private
 
   def get_project_nav_tabs(project, current_user)
-    nav_tabs = [:home, :forks]
+    nav_tabs = [:home]
 
     if !project.empty_repo? && can?(current_user, :download_code, project)
-      nav_tabs << [:files, :commits, :network, :graphs]
+      nav_tabs << [:files, :commits, :network, :graphs, :forks]
     end
 
     if project.repo_exists? && can?(current_user, :read_merge_request, project)

From 7c32488dc0170547720b36b11f9d8b7f6466c309 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 17:22:43 +0200
Subject: [PATCH 0360/1431] added changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4841361482d..f8fd6a8ee27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,9 @@ v 8.8.0 (unreleased)
   - Fix adding a todo for private group members (Ahmad Sherif)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
 
+v 8.7.5
+  - Fix Bitbucket imports not finding the import data
+
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
   - Fix setting trusted proxies !3970

From f27d7b2c642e66a45b2b3644e955250786ae07fa Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 18:03:16 +0200
Subject: [PATCH 0361/1431] updated changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index f8fd6a8ee27..8dc52cde60f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -44,7 +44,7 @@ v 8.8.0 (unreleased)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
 
 v 8.7.5
-  - Fix Bitbucket imports not finding the import data
+  - Fix external imports not finding the import data
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)

From ad77ab0376fabf3dfadea86c716358964b526956 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 12 May 2016 09:04:04 -0700
Subject: [PATCH 0362/1431] Add Changelog entry

and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
---
 CHANGELOG                                        |  1 +
 app/controllers/admin/health_check_controller.rb |  6 +-----
 app/views/admin/health_check/show.html.haml      | 12 ++++++------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7d5f424eaec..7ded902776c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.8.0 (unreleased)
   - Reduce delay in destroying a project from 1-minute to immediately
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
+  - Added /health_check endpoint for checking service status
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
diff --git a/app/controllers/admin/health_check_controller.rb b/app/controllers/admin/health_check_controller.rb
index 3153a765e35..241c7be0ea1 100644
--- a/app/controllers/admin/health_check_controller.rb
+++ b/app/controllers/admin/health_check_controller.rb
@@ -1,9 +1,5 @@
 class Admin::HealthCheckController < Admin::ApplicationController
   def show
-    begin
-      @errors = HealthCheck::Utils.process_checks('standard')
-    rescue => e
-      @errors = e.message.blank? ? e.class.to_s : e.message.to_s
-    end
+    @errors = HealthCheck::Utils.process_checks('standard')
   end
 end
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
index ed7025f7a0b..ad79fd26d0b 100644
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -16,21 +16,21 @@
   Health information can be reteived as plain text, json, or xml using:
   %ul
     %li
-      %code= health_check_url(token:current_application_settings.health_check_access_token)
+      %code= health_check_url(token: current_application_settings.health_check_access_token)
     %li
-      %code= health_check_url(token:current_application_settings.health_check_access_token, format: :json)
+      %code= health_check_url(token: current_application_settings.health_check_access_token, format: :json)
     %li
-      %code= health_check_url(token:current_application_settings.health_check_access_token, format: :xml)
+      %code= health_check_url(token: current_application_settings.health_check_access_token, format: :xml)
 
 %p.light
   You can also ask for the status of specific services:
   %ul
     %li
-      %code= health_check_url(token:current_application_settings.health_check_access_token, checks: :cache)
+      %code= health_check_url(token: current_application_settings.health_check_access_token, checks: :cache)
     %li
-      %code= health_check_url(token:current_application_settings.health_check_access_token, checks: :database)
+      %code= health_check_url(token: current_application_settings.health_check_access_token, checks: :database)
     %li
-      %code= health_check_url(token:current_application_settings.health_check_access_token, checks: :migrations)
+      %code= health_check_url(token: current_application_settings.health_check_access_token, checks: :migrations)
 
 %hr
 .panel.panel-default

From 0641fe6f72a3d42f94062fd00b1cf8a0d643e6a4 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 12 May 2016 18:11:03 +0200
Subject: [PATCH 0363/1431] Updated CHANGELOG for 8.7.5

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

diff --git a/CHANGELOG b/CHANGELOG
index 1d8712ae925..5dc5e057057 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -48,6 +48,8 @@ v 8.8.0 (unreleased)
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
+  - Fix always showing build notification message when switching between merge requests !4086
+  - Fix an issue when filtering merge requests with more than one label. !3886
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)

From cacbecd05c4edc7d27c458462463f2ee65383ea5 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 18:27:20 +0200
Subject: [PATCH 0364/1431] more changes based on MR feedback

---
 app/controllers/projects/imports_controller.rb | 2 +-
 app/services/projects/create_service.rb        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index c70b9bf2f5a..d353a390340 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -22,7 +22,7 @@ class Projects::ImportsController < Projects::ApplicationController
         Project.transaction do
           @project.import_start
         end
-        @project.add_import_job if @project.persisted?
+        @project.add_import_job
       end
     end
 
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index e0081e5162f..2687544ae62 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -103,9 +103,8 @@ module Projects
     def save_project_and_import_data(import_data)
       Project.transaction do
         @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
-        @project.save
 
-        if @project.persisted? && !@project.import?
+        if @project.save && !@project.import?
           raise 'Failed to create repository' unless @project.create_repository
         end
       end

From 18fdbf0a035b6feec3b576c01ee1a2f3a95e4305 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Wed, 11 May 2016 23:46:19 +0900
Subject: [PATCH 0365/1431] Fix a description for default scope on builds

---
 CHANGELOG                                 | 1 +
 app/views/admin/builds/index.html.haml    | 2 +-
 app/views/projects/builds/index.html.haml | 2 +-
 spec/features/admin/admin_builds_spec.rb  | 1 +
 spec/features/builds_spec.rb              | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 777b211daab..8d993e3013e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 8.7.5
   - Fix relative links in wiki pages. !4050
   - Fix always showing build notification message when switching between merge requests !4086
   - Fix an issue when filtering merge requests with more than one label. !3886
+  - Fix short note for the default scope on build page (Takuya Noguchi)
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 804d7851bdb..ed24757087b 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -20,7 +20,7 @@
       = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
 
 .row-content-block.second-block
-  #{(@scope || 'running').capitalize} builds
+  #{(@scope || 'all').capitalize} builds
 
 %ul.content-list
   - if @builds.blank?
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 2e8015d119b..98f4a9416e5 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -36,7 +36,7 @@
         %span CI Lint
 
 .row-content-block
-  #{(@scope || 'running').capitalize} builds from this project
+  #{(@scope || 'all').capitalize} builds from this project
 
 %ul.content-list
   - if @builds.blank?
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index 2e9851fb442..7bbe20fec43 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -19,6 +19,7 @@ describe 'Admin Builds' do
           visit admin_builds_path
 
           expect(page).to have_selector('.nav-links li.active', text: 'All')
+          expect(page).to have_selector('.row-content-block', text: 'All builds')
           expect(page.all('.build-link').size).to eq(4)
           expect(page).to have_link 'Cancel all'
         end
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 090a941958f..f83a78308e3 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -43,6 +43,7 @@ describe "Builds" do
       end
 
       it { expect(page).to have_selector('.nav-links li.active', text: 'All') }
+      it { expect(page).to have_selector('.row-content-block', text: 'All builds from this project') }
       it { expect(page).to have_content @build.short_sha }
       it { expect(page).to have_content @build.ref }
       it { expect(page).to have_content @build.name }

From bade0ed63e55a8168b9c2c1ddd16edbcfcd9dcd7 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 18:39:10 +0200
Subject: [PATCH 0366/1431] looks like 8.7.6

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

diff --git a/CHANGELOG b/CHANGELOG
index 8dc52cde60f..1b246919a11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,7 +43,7 @@ v 8.8.0 (unreleased)
   - Fix adding a todo for private group members (Ahmad Sherif)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
 
-v 8.7.5
+v 8.7.6
   - Fix external imports not finding the import data
 
 v 8.7.4

From 491a312724076f5113766b5fb55f38fee316dd38 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 12 May 2016 18:40:50 +0200
Subject: [PATCH 0367/1431] fix merge conflict

---
 CHANGELOG | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 986f465327a..5412e4c19bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,14 +47,14 @@ v 8.8.0 (unreleased)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
   - Total method execution timings are no longer tracked
 
+v 8.7.6
+  - Fix external imports not finding the import data
+
 v 8.7.5
   - Fix relative links in wiki pages. !4050
   - Fix always showing build notification message when switching between merge requests !4086
   - Fix an issue when filtering merge requests with more than one label. !3886
 
-v 8.7.6
-  - Fix external imports not finding the import data
-
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
   - Fix setting trusted proxies !3970

From fc2d985bfaa156ad052858cd2025b0300327ff95 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 12 May 2016 12:47:55 -0500
Subject: [PATCH 0368/1431] Fix CI tests

---
 app/controllers/jwt_controller.rb             |  2 +-
 ...ntainer_registry_authentication_service.rb |  6 +-
 config/initializers/1_settings.rb             |  2 +-
 lib/jwt/rsa_token.rb                          |  2 +-
 lib/jwt/token.rb                              |  4 +-
 spec/lib/jwt/rsa_token_spec.rb                |  2 +-
 spec/lib/jwt/token_spec.rb                    |  2 +-
 ...er_registry_authentication_service_spec.rb | 56 +++++++++----------
 8 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 0048a1a31ea..599f62bd121 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -3,7 +3,7 @@ class JwtController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   SERVICES = {
-    'container_registry' => Jwt::ContainerRegistryAuthenticationService,
+    'container_registry' => JWT::ContainerRegistryAuthenticationService,
   }
 
   def auth
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
index b9fcd380475..0ab3e6d02ba 100644
--- a/app/services/jwt/container_registry_authentication_service.rb
+++ b/app/services/jwt/container_registry_authentication_service.rb
@@ -1,11 +1,11 @@
-module Jwt
+module JWT
   class ContainerRegistryAuthenticationService < BaseService
     def execute
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
       end
 
-      return error('forbidden', 401) if scopes.empty?
+      return error('forbidden', 401) if scopes.blank?
 
       { token: authorized_token(scopes).encoded }
     end
@@ -13,7 +13,7 @@ module Jwt
     private
 
     def authorized_token(access)
-      token = ::Jwt::RSAToken.new(registry.key)
+      token = ::JWT::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = params[:service]
       token.subject = current_user.try(:username)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 1040d840e30..3853845fee8 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -271,7 +271,7 @@ Settings.artifacts['max_size']    ||= 100 # in megabytes
 # Registry
 #
 Settings['registry'] ||= Settingslogic.new({})
-Settings.registry['registry']     = false if Settings.registry['enabled'].nil?
+Settings.registry['enabled']     = false if Settings.registry['enabled'].nil?
 Settings.registry['host']         ||= "example.com"
 Settings.registry['internal_host']||= "localhost"
 Settings.registry['key']          ||= nil
diff --git a/lib/jwt/rsa_token.rb b/lib/jwt/rsa_token.rb
index cc265e3b31a..0438135ad54 100644
--- a/lib/jwt/rsa_token.rb
+++ b/lib/jwt/rsa_token.rb
@@ -1,4 +1,4 @@
-module Jwt
+module JWT
   class RSAToken < Token
     attr_reader :key_file
 
diff --git a/lib/jwt/token.rb b/lib/jwt/token.rb
index 765ab0d60c7..f13abf2b71f 100644
--- a/lib/jwt/token.rb
+++ b/lib/jwt/token.rb
@@ -1,4 +1,4 @@
-module Jwt
+module JWT
   class Token
     attr_accessor :issuer, :subject, :audience, :id
     attr_accessor :issued_at, :not_before, :expire_time
@@ -43,4 +43,4 @@ module Jwt
       }.compact
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/lib/jwt/rsa_token_spec.rb b/spec/lib/jwt/rsa_token_spec.rb
index 710801923e7..a5b1d3a67dc 100644
--- a/spec/lib/jwt/rsa_token_spec.rb
+++ b/spec/lib/jwt/rsa_token_spec.rb
@@ -1,4 +1,4 @@
-describe Jwt::RSAToken do
+describe JWT::RSAToken do
   let(:rsa_key) { generate_key }
   let(:rsa_token) { described_class.new(nil) }
   let(:rsa_encoded) { rsa_token.encoded }
diff --git a/spec/lib/jwt/token_spec.rb b/spec/lib/jwt/token_spec.rb
index a56b4cf39b5..92fdc3f1b7c 100644
--- a/spec/lib/jwt/token_spec.rb
+++ b/spec/lib/jwt/token_spec.rb
@@ -1,4 +1,4 @@
-describe Jwt::Token do
+describe JWT::Token do
   let(:token) { described_class.new }
 
   context 'custom parameters' do
diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/jwt/container_registry_authentication_service_spec.rb
index ea91f499d0a..1873ea2639b 100644
--- a/spec/services/jwt/container_registry_authentication_service_spec.rb
+++ b/spec/services/jwt/container_registry_authentication_service_spec.rb
@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-describe Jwt::ContainerRegistryAuthenticationService, services: true do
+describe JWT::ContainerRegistryAuthenticationService, services: true do
   let(:current_project) { nil }
   let(:current_user) { nil }
   let(:current_params) { {} }
   let(:rsa_key) { OpenSSL::PKey::RSA.generate(512) }
-  let(:registry_settings) {
+  let(:registry_settings) do
     {
       issuer: 'rspec',
       key: nil
     }
-  }
+  end
   let(:payload) { JWT.decode(subject[:token], rsa_key).first }
 
   subject { described_class.new(current_project, current_user, current_params).execute }
 
   before do
     allow(Gitlab.config.registry).to receive_messages(registry_settings)
-    allow_any_instance_of(Jwt::RSAToken).to receive(:key).and_return(rsa_key)
+    allow_any_instance_of(JWT::RSAToken).to receive(:key).and_return(rsa_key)
   end
 
   shared_examples 'an authenticated' do
@@ -26,13 +26,13 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
   end
 
   shared_examples 'a accessible' do
-    let(:access) {
+    let(:access) do
       [{
          'type' => 'repository',
          'name' => project.path_with_namespace,
          'actions' => actions,
        }]
-    }
+    end
 
     it_behaves_like 'an authenticated'
     it { expect(payload).to include('access' => access) }
@@ -68,9 +68,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
     context 'allow developer to push images' do
       before { project.team << [current_user, :developer] }
 
-      let(:current_params) {
+      let(:current_params) do
         { scope: "repository:#{project.path_with_namespace}:push" }
-      }
+      end
 
       it_behaves_like 'a pushable'
     end
@@ -78,9 +78,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
     context 'allow reporter to pull images' do
       before { project.team << [current_user, :reporter] }
 
-      let(:current_params) {
+      let(:current_params) do
         { scope: "repository:#{project.path_with_namespace}:pull" }
-      }
+      end
 
       it_behaves_like 'a pullable'
     end
@@ -88,9 +88,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
     context 'return a least of privileges' do
       before { project.team << [current_user, :reporter] }
 
-      let(:current_params) {
+      let(:current_params) do
         { scope: "repository:#{project.path_with_namespace}:push,pull" }
-      }
+      end
 
       it_behaves_like 'a pullable'
     end
@@ -98,9 +98,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
     context 'disallow guest to pull or push images' do
       before { project.team << [current_user, :guest] }
 
-      let(:current_params) {
+      let(:current_params) do
         { scope: "repository:#{project.path_with_namespace}:pull,push" }
-      }
+      end
 
       it_behaves_like 'a forbidden'
     end
@@ -110,9 +110,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
     let(:current_project) { create(:empty_project) }
 
     context 'allow to pull and push images' do
-      let(:current_params) {
+      let(:current_params) do
         { scope: "repository:#{current_project.path_with_namespace}:pull,push" }
-      }
+      end
 
       it_behaves_like 'a pullable and pushable' do
         let(:project) { current_project }
@@ -121,9 +121,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
 
     context 'for other projects' do
       context 'when pulling' do
-        let(:current_params) {
+        let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:pull" }
-        }
+        end
 
         context 'allow for public' do
           let(:project) { create(:empty_project, :public) }
@@ -137,9 +137,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
       end
 
       context 'when pushing' do
-        let(:current_params) {
+        let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:push" }
-        }
+        end
 
         context 'disallow for all' do
           let(:project) { create(:empty_project, :public) }
@@ -152,9 +152,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
 
   context 'unauthorized' do
     context 'for invalid scope' do
-      let(:current_params) {
+      let(:current_params) do
         { scope: 'invalid:aa:bb' }
-      }
+      end
 
       it_behaves_like 'a forbidden'
     end
@@ -162,9 +162,9 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
     context 'for private project' do
       let(:project) { create(:empty_project, :private) }
 
-      let(:current_params) {
+      let(:current_params) do
         { scope: "repository:#{project.path_with_namespace}:pull" }
-      }
+      end
 
       it_behaves_like 'a forbidden'
     end
@@ -173,17 +173,17 @@ describe Jwt::ContainerRegistryAuthenticationService, services: true do
       let(:project) { create(:empty_project, :public) }
 
       context 'when pulling and pushing' do
-        let(:current_params) {
+        let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:pull,push" }
-        }
+        end
 
         it_behaves_like 'a pullable'
       end
 
       context 'when pushing' do
-        let(:current_params) {
+        let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:push" }
-        }
+        end
 
         it_behaves_like 'a forbidden'
       end

From 5c2f2fd2890b7efd7a63f9a371b2f795f2e9fa43 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 12 May 2016 13:03:04 -0500
Subject: [PATCH 0369/1431] Fix CI tests

---
 .../projects/container_registry_controller.rb        |  1 -
 app/helpers/gitlab_routing_helper.rb                 |  2 +-
 app/models/ability.rb                                |  2 +-
 app/models/namespace.rb                              |  2 +-
 app/models/project.rb                                |  4 ++--
 .../jwt/container_registry_authentication_service.rb |  2 +-
 app/services/projects/destroy_service.rb             |  4 +++-
 app/services/projects/transfer_service.rb            |  2 +-
 app/views/projects/container_registry/_tag.html.haml |  9 +++++----
 .../projects/container_registry/index.html.haml      |  5 +++--
 lib/container_registry/client.rb                     |  2 +-
 lib/container_registry/repository.rb                 |  4 +++-
 spec/features/container_registry_spec.rb             | 12 +++++++++---
 13 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index 82c621b29e4..c470789a5bb 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -1,7 +1,6 @@
 class Projects::ContainerRegistryController < Projects::ApplicationController
   before_action :authorize_read_container_registry!
   before_action :authorize_update_container_registry!, only: [:destroy]
-  before_action :tag, except: [:index]
   layout 'project'
 
   def index
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index dd9536b1460..2ce2d4e694f 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -34,7 +34,7 @@ module GitlabRoutingHelper
   end
 
   def project_container_registry_path(project, *args)
-    namespace_project_container_registry_index_url(project.namespace, project, *args)
+    namespace_project_container_registry_index_path(project.namespace, project, *args)
   end
 
   def activity_project_path(project, *args)
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 59d5195f5b9..2465c1f424c 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -291,7 +291,7 @@ class Ability
         rules += named_abilities('build')
       end
 
-      unless project.container_registry_enabled
+      unless project.container_registry_enabled && Gitlab.config.registry.enabled
         rules += named_abilities('container_registry')
       end
 
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 0f61cee7888..62ef6de5db1 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -128,7 +128,7 @@ class Namespace < ActiveRecord::Base
     gitlab_shell.add_namespace(path_was)
 
     if any_project_has_container_registry_tags?
-      raise Exception.new('namespace cannot be moved, because at least one project has tags in container registry')
+      raise Exception.new('Namespace cannot be moved, because at least one project has tags in container registry')
     end
 
     if gitlab_shell.mv_namespace(path_was, path)
diff --git a/app/models/project.rb b/app/models/project.rb
index d3ae7803bea..e5ace7d755b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -377,7 +377,7 @@ class Project < ActiveRecord::Base
 
   def container_registry_repository
     @container_registry_repository ||= begin
-      token = Jwt::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
+      token = JWT::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
       url = Gitlab.config.registry.api_url
       host_port = Gitlab.config.registry.host_port
       registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
@@ -814,7 +814,7 @@ class Project < ActiveRecord::Base
 
     if has_container_registry_tags?
       # we currently doesn't support renaming repository if it contains tags in container registry
-      raise Exception.new('repository cannot be renamed, due to tags in container registry')
+      raise Exception.new('Project cannot be renamed, because tags are present in its container registry')
     end
 
     if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
index bc7e663caa6..91bad347278 100644
--- a/app/services/jwt/container_registry_authentication_service.rb
+++ b/app/services/jwt/container_registry_authentication_service.rb
@@ -14,7 +14,7 @@ module JWT
 
     def self.full_access_token(*names)
       registry = Gitlab.config.registry
-      token = ::Jwt::RSAToken.new(registry.key)
+      token = ::JWT::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = AUDIENCE
       token[:access] = names.map do |name|
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 8e2e46346ca..0ff2bc3cb81 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -64,7 +64,9 @@ module Projects
     end
 
     def remove_registry_tags
-      project.image_registry.delete_tags
+      return unless Gitlab.config.registry.enabled
+
+      project.container_registry_repository.delete_tags
     end
 
     def raise_error(message)
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 0d72286dec7..03b57dea51e 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -36,7 +36,7 @@ module Projects
 
         if project.has_container_registry_tags?
           # we currently doesn't support renaming repository if it contains tags in container registry
-          raise TransferError.new('Repository cannot be renamed, due to tags in container registry')
+          raise TransferError.new('Project cannot be transferred, because tags are present in its container registry')
         end
 
         project.expire_caches_before_rename(old_path)
diff --git a/app/views/projects/container_registry/_tag.html.haml b/app/views/projects/container_registry/_tag.html.haml
index f97988d20cf..bf816d109b6 100644
--- a/app/views/projects/container_registry/_tag.html.haml
+++ b/app/views/projects/container_registry/_tag.html.haml
@@ -14,7 +14,8 @@
     = pluralize(tag.layers.size, "layer")
   %td
     = time_ago_in_words(tag.created_at)
-  %td.content
-    .controls.hidden-xs.pull-right
-      = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
-        = icon("trash cred")
+  - if can?(current_user, :update_container_registry, @project)
+    %td.content
+      .controls.hidden-xs.pull-right
+        = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
+          = icon("trash cred")
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 701f1a86b56..ea7c4faaaec 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -18,7 +18,7 @@
           %code
             docker login #{Gitlab.config.registry.host_port}
         %br
-        Then you are free to create and upload a container images with build and push commands:
+        Then you are free to create and upload a container image with build and push commands:
         %pre
           docker build -t #{escape_once(@project.container_registry_repository_url)} .
           %br
@@ -33,7 +33,8 @@
             %th Image ID
             %th Size
             %th Created
-            %th
+            - if can?(current_user, :update_container_registry, @project)
+              %th
 
         - @tags.each do |tag|
           = render 'tag', tag: tag
\ No newline at end of file
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index 0bfb6baffd4..c250a4b6946 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -55,7 +55,7 @@ module ContainerRegistry
       conn.request :json
       conn.headers['Accept'] = MANIFEST_VERSION
 
-      conn.response :json, :content_type => /\bjson$/
+      conn.response :json, content_type: /\bjson$/
 
       if options[:user] && options[:password]
         conn.request(:basic_auth, options[:user].to_s, options[:password].to_s)
diff --git a/lib/container_registry/repository.rb b/lib/container_registry/repository.rb
index f01330f3648..b30cb527b60 100644
--- a/lib/container_registry/repository.rb
+++ b/lib/container_registry/repository.rb
@@ -30,19 +30,21 @@ module ContainerRegistry
     def tags
       return @tags if defined?(@tags)
       return [] unless manifest && manifest['tags']
+
       @tags = manifest['tags'].map do |tag|
         ContainerRegistry::Tag.new(self, tag)
       end
-      @tags ||= []
     end
 
     def delete_tags
       return unless tags
+
       tags.each(:delete)
     end
 
     def mount_blob(blob)
       return unless blob
+
       client.repository_mount_blob(name, blob.digest, blob.repository.name)
     end
 
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index 7bef7a2ee81..6c4d675fd6a 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -5,14 +5,18 @@ describe "Container Registry" do
   let(:repository) { project.container_registry_repository }
   let(:tag_name) { 'latest' }
   let(:tags) { [tag_name] }
-
-  before do
+  let(:registry_settings) do
+    {
+      enabled: true
+    }
   end
 
   before do
     login_as(:user)
     project.team << [@user, :developer]
     stub_container_registry(*tags)
+    allow(Gitlab.config.registry).to receive_messages(registry_settings)
+    allow(JWT::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token')
   end
 
   describe 'GET /:project/container_registry' do
@@ -22,6 +26,7 @@ describe "Container Registry" do
 
     context 'when no tags' do
       let(:tags) { [] }
+
       it { expect(page).to have_content('No images in Container Registry for this project') }
     end
 
@@ -37,7 +42,8 @@ describe "Container Registry" do
 
     it do
       expect_any_instance_of(::ContainerRegistry::Tag).to receive(:delete).and_return(true)
+
       click_on 'Remove'
     end
   end
-end
\ No newline at end of file
+end

From 0d43b9270677106f3aa37112da1dd0482ed40b55 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 12 May 2016 13:08:18 -0500
Subject: [PATCH 0370/1431] Fix CI tests

---
 app/controllers/projects/pipelines_controller.rb | 8 +++++---
 app/models/project.rb                            | 2 +-
 app/services/ci/create_pipeline_service.rb       | 2 +-
 app/views/projects/commit/_ci_stage.html.haml    | 5 +++--
 app/views/projects/pipelines/index.html.haml     | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index a261d03f4d0..bdb5722c55f 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -7,8 +7,10 @@ class Projects::PipelinesController < Projects::ApplicationController
 
   def index
     @scope = params[:scope]
-    @all_pipelines = project.ci_commits
-    @pipelines = PipelinesFinder.new(project).execute(@all_pipelines, @scope)
+    all_pipelines = project.ci_commits
+    @pipelines_count = all_pipelines.count
+    @running_or_pending_count = all_pipelines.running_or_pending.count
+    @pipelines = PipelinesFinder.new(project).execute(all_pipelines, @scope)
     @pipelines = @pipelines.order(id: :desc).page(params[:page]).per(30)
   end
 
@@ -22,7 +24,7 @@ class Projects::PipelinesController < Projects::ApplicationController
     rescue ArgumentError => e
       @error = e.message
       render 'new'
-    rescue => e
+    rescue
       @error = 'Undefined error'
       render 'new'
     end
diff --git a/app/models/project.rb b/app/models/project.rb
index dfd1e54ecf7..82489235a3f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -354,7 +354,7 @@ class Project < ActiveRecord::Base
       join_body = "INNER JOIN (
         SELECT project_id, COUNT(*) AS amount
         FROM notes
-        WHERE created_at >= #{sanitize(since)}
+        WHERE created_at >= #{sanitize(since)}project.ci_commits
         GROUP BY project_id
       ) join_note_counts ON projects.id = join_note_counts.project_id"
 
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 40414b49864..223514968fc 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -39,4 +39,4 @@ module Ci
       @pipeline ||= project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/projects/commit/_ci_stage.html.haml b/app/views/projects/commit/_ci_stage.html.haml
index f9f2757dc34..bdadf2944c4 100644
--- a/app/views/projects/commit/_ci_stage.html.haml
+++ b/app/views/projects/commit/_ci_stage.html.haml
@@ -6,8 +6,9 @@
       - status = latest.status
       %span{class: "ci-status-link ci-status-icon-#{status}"}
         = ci_icon_for_status(status)
-      &nbsp;
-      = stage.titleize.pluralize
+      - if stage
+        &nbsp;
+        = stage.titleize.pluralize
   = render latest.ordered, coverage: @project.build_coverage_enabled?, tage: false, ref: false, allow_retry: true
   = render retried.ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
   %tr
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index d247ea445ea..574941ed5f2 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -7,13 +7,13 @@
       = link_to project_pipelines_path(@project) do
         All
         %span.badge.js-totalbuilds-count
-          = number_with_delimiter(@all_pipelines.count)
+          = number_with_delimiter(@pipelines_count)
 
     %li{class: ('active' if @scope == 'running')}
       = link_to project_pipelines_path(@project, scope: :running) do
         Running
         %span.badge.js-running-count
-          = number_with_delimiter(@all_pipelines.running_or_pending.count)
+          = number_with_delimiter(@running_or_pending_count)
 
     %li{class: ('active' if @scope == 'branches')}
       = link_to project_pipelines_path(@project, scope: :branches) do

From 0c22698bd4dbe7d0d3e4a6c8bc946ac6f5de1c12 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Thu, 12 May 2016 22:48:09 +0200
Subject: [PATCH 0371/1431] Add API endpoints for un/subscribing from/to a
 label

Closes #15638
---
 CHANGELOG                                 |  1 +
 app/models/concerns/subscribable.rb       |  6 ++
 doc/api/labels.md                         | 70 +++++++++++++++++++
 lib/api/api.rb                            |  1 +
 lib/api/entities.rb                       |  4 ++
 lib/api/helpers.rb                        | 11 +++
 lib/api/issues.rb                         | 39 +----------
 lib/api/labels.rb                         |  6 +-
 lib/api/merge_requests.rb                 | 36 ----------
 lib/api/subscriptions.rb                  | 60 +++++++++++++++++
 spec/models/concerns/subscribable_spec.rb | 10 +++
 spec/requests/api/issues_spec.rb          | 12 ++++
 spec/requests/api/labels_spec.rb          | 82 +++++++++++++++++++++++
 13 files changed, 261 insertions(+), 77 deletions(-)
 create mode 100644 lib/api/subscriptions.rb

diff --git a/CHANGELOG b/CHANGELOG
index efb6dc6f610..aedd9f8ebdf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,7 @@ v 8.8.0 (unreleased)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
   - Total method execution timings are no longer tracked
   - Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034. (Andrei Gliga)
+  - Add API endpoints for un/subscribing from/to a label. !4051 (Ahmad Sherif)
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/app/models/concerns/subscribable.rb b/app/models/concerns/subscribable.rb
index d5a881b2445..083257f1005 100644
--- a/app/models/concerns/subscribable.rb
+++ b/app/models/concerns/subscribable.rb
@@ -36,6 +36,12 @@ module Subscribable
       update(subscribed: !subscribed?(user))
   end
 
+  def subscribe(user)
+    subscriptions.
+      find_or_initialize_by(user_id: user.id).
+      update(subscribed: true)
+  end
+
   def unsubscribe(user)
     subscriptions.
       find_or_initialize_by(user_id: user.id).
diff --git a/doc/api/labels.md b/doc/api/labels.md
index 3730c07c5a7..b857d81768e 100644
--- a/doc/api/labels.md
+++ b/doc/api/labels.md
@@ -165,3 +165,73 @@ Example response:
    "description": "Documentation"
 }
 ```
+
+## Subscribe to a label
+
+Subscribes the authenticated user to a label to receive notifications. If the
+operation is successful, status code `201` together with the updated label is
+returned. If the user is already subscribed to the label, the status code `304`
+is returned. If the project or label is not found, status code `404` is
+returned.
+
+```
+POST /projects/:id/labels/:label_id/subscription
+```
+
+| Attribute  | Type              | Required | Description                          |
+| ---------- | ----------------- | -------- | ------------------------------------ |
+| `id`       | integer           | yes      | The ID of a project                  |
+| `label_id` | integer or string | yes      | The ID or title of a project's label |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/labels/1/subscription
+```
+
+Example response:
+
+```json
+{
+    "name": "Docs",
+    "color": "#cc0033",
+    "description": "",
+    "open_issues_count": 0,
+    "closed_issues_count": 0,
+    "open_merge_requests_count": 0,
+    "subscribed": true
+}
+```
+
+## Unsubscribe from a label
+
+Unsubscribes the authenticated user from a label to not receive notifications
+from it. If the operation is successful, status code `200` together with the
+updated label is returned. If the user is not subscribed to the label, the
+status code `304` is returned. If the project or label is not found, status code
+`404` is returned.
+
+```
+DELETE /projects/:id/labels/:label_id/subscription
+```
+
+| Attribute  | Type              | Required | Description                          |
+| ---------- | ----------------- | -------- | ------------------------------------ |
+| `id`       | integer           | yes      | The ID of a project                  |
+| `label_id` | integer or string | yes      | The ID or title of a project's label |
+
+```bash
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/labels/1/subscription
+```
+
+Example response:
+
+```json
+{
+    "name": "Docs",
+    "color": "#cc0033",
+    "description": "",
+    "open_issues_count": 0,
+    "closed_issues_count": 0,
+    "open_merge_requests_count": 0,
+    "subscribed": false
+}
+```
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 5fd9c30cb42..360fb41a721 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -57,5 +57,6 @@ module API
     mount ::API::Variables
     mount ::API::Runners
     mount ::API::Licenses
+    mount ::API::Subscriptions
   end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 2870a6a40ef..406f5ea9139 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -307,6 +307,10 @@ module API
     class Label < Grape::Entity
       expose :name, :color, :description
       expose :open_issues_count, :closed_issues_count, :open_merge_requests_count
+
+      expose :subscribed do |label, options|
+        label.subscribed?(options[:current_user])
+      end
     end
 
     class Compare < Grape::Entity
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 40c967453fb..5e638dbe16a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -95,6 +95,17 @@ module API
       end
     end
 
+    def find_project_label(id)
+      label = user_project.labels.find_by_id(id) || user_project.labels.find_by_title(id)
+      label || not_found!('Label')
+    end
+
+    def find_project_issue(id)
+      issue = user_project.issues.find(id)
+      not_found! unless can?(current_user, :read_issue, issue)
+      issue
+    end
+
     def paginate(relation)
       relation.page(params[:page]).per(params[:per_page].to_i).tap do |data|
         add_pagination_headers(data)
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 40928749481..f59a4d6c012 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -103,8 +103,7 @@ module API
       # Example Request:
       #   GET /projects/:id/issues/:issue_id
       get ":id/issues/:issue_id" do
-        @issue = user_project.issues.find(params[:issue_id])
-        not_found! unless can?(current_user, :read_issue, @issue)
+        @issue = find_project_issue(params[:issue_id])
         present @issue, with: Entities::Issue, current_user: current_user
       end
 
@@ -234,42 +233,6 @@ module API
         authorize!(:destroy_issue, issue)
         issue.destroy
       end
-
-      # Subscribes to a project issue
-      #
-      # Parameters:
-      #  id (required)       - The ID of a project
-      #  issue_id (required) - The ID of a project issue
-      # Example Request:
-      #   POST /projects/:id/issues/:issue_id/subscription
-      post ':id/issues/:issue_id/subscription' do
-        issue = user_project.issues.find(params[:issue_id])
-
-        if issue.subscribed?(current_user)
-          not_modified!
-        else
-          issue.toggle_subscription(current_user)
-          present issue, with: Entities::Issue, current_user: current_user
-        end
-      end
-
-      # Unsubscribes from a project issue
-      #
-      # Parameters:
-      #  id (required)       - The ID of a project
-      #  issue_id (required) - The ID of a project issue
-      # Example Request:
-      #   DELETE /projects/:id/issues/:issue_id/subscription
-      delete ':id/issues/:issue_id/subscription' do
-        issue = user_project.issues.find(params[:issue_id])
-
-        if issue.subscribed?(current_user)
-          issue.unsubscribe(current_user)
-          present issue, with: Entities::Issue, current_user: current_user
-        else
-          not_modified!
-        end
-      end
     end
   end
 end
diff --git a/lib/api/labels.rb b/lib/api/labels.rb
index 4af6bef0fa7..c806829d69e 100644
--- a/lib/api/labels.rb
+++ b/lib/api/labels.rb
@@ -11,7 +11,7 @@ module API
       # Example Request:
       #   GET /projects/:id/labels
       get ':id/labels' do
-        present user_project.labels, with: Entities::Label
+        present user_project.labels, with: Entities::Label, current_user: current_user
       end
 
       # Creates a new label
@@ -36,7 +36,7 @@ module API
         label = user_project.labels.create(attrs)
 
         if label.valid?
-          present label, with: Entities::Label
+          present label, with: Entities::Label, current_user: current_user
         else
           render_validation_error!(label)
         end
@@ -90,7 +90,7 @@ module API
         attrs[:name] = attrs.delete(:new_name) if attrs.key?(:new_name)
 
         if label.update(attrs)
-          present label, with: Entities::Label
+          present label, with: Entities::Label, current_user: current_user
         else
           render_validation_error!(label)
         end
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 7e78609ecb9..4e7de8867b4 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -327,42 +327,6 @@ module API
           issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
           present paginate(issues), with: Entities::Issue, current_user: current_user
         end
-
-        # Subscribes to a merge request
-        #
-        # Parameters:
-        #  id (required)               - The ID of a project
-        #  merge_request_id (required) - The ID of a merge request
-        # Example Request:
-        #   POST /projects/:id/issues/:merge_request_id/subscription
-        post "#{path}/subscription" do
-          merge_request = user_project.merge_requests.find(params[:merge_request_id])
-
-          if merge_request.subscribed?(current_user)
-            not_modified!
-          else
-            merge_request.toggle_subscription(current_user)
-            present merge_request, with: Entities::MergeRequest, current_user: current_user
-          end
-        end
-
-        # Unsubscribes from a merge request
-        #
-        # Parameters:
-        #  id (required)               - The ID of a project
-        #  merge_request_id (required) - The ID of a merge request
-        # Example Request:
-        #   DELETE /projects/:id/merge_requests/:merge_request_id/subscription
-        delete "#{path}/subscription" do
-          merge_request = user_project.merge_requests.find(params[:merge_request_id])
-
-          if merge_request.subscribed?(current_user)
-            merge_request.unsubscribe(current_user)
-            present merge_request, with: Entities::MergeRequest, current_user: current_user
-          else
-            not_modified!
-          end
-        end
       end
     end
   end
diff --git a/lib/api/subscriptions.rb b/lib/api/subscriptions.rb
new file mode 100644
index 00000000000..c49e2a21b82
--- /dev/null
+++ b/lib/api/subscriptions.rb
@@ -0,0 +1,60 @@
+module API
+  class Subscriptions < Grape::API
+    before { authenticate! }
+
+    subscribable_types = {
+      'merge_request' => proc { |id| user_project.merge_requests.find(id) },
+      'merge_requests' => proc { |id| user_project.merge_requests.find(id) },
+      'issues' => proc { |id| find_project_issue(id) },
+      'labels' => proc { |id| find_project_label(id) },
+    }
+
+    resource :projects do
+      subscribable_types.each do |type, finder|
+        type_singularized = type.singularize
+        type_id_str = :"#{type_singularized}_id"
+        entity_class = Entities.const_get(type_singularized.camelcase)
+
+        # Subscribe to a resource
+        #
+        # Parameters:
+        #   id (required) - The ID of a project
+        #   subscribable_id (required) - The ID of a resource
+        # Example Request:
+        #   POST /projects/:id/labels/:subscribable_id/subscription
+        #   POST /projects/:id/issues/:subscribable_id/subscription
+        #   POST /projects/:id/merge_requests/:subscribable_id/subscription
+        post ":id/#{type}/:#{type_id_str}/subscription" do
+          resource = instance_exec(params[type_id_str], &finder)
+
+          if resource.subscribed?(current_user)
+            not_modified!
+          else
+            resource.subscribe(current_user)
+            present resource, with: entity_class, current_user: current_user
+          end
+        end
+
+        # Unsubscribe from a resource
+        #
+        # Parameters:
+        #   id (required) - The ID of a project
+        #   subscribable_id (required) - The ID of a resource
+        # Example Request:
+        #   DELETE /projects/:id/labels/:subscribable_id/subscription
+        #   DELETE /projects/:id/issues/:subscribable_id/subscription
+        #   DELETE /projects/:id/merge_requests/:subscribable_id/subscription
+        delete ":id/#{type}/:#{type_id_str}/subscription" do
+          resource = instance_exec(params[type_id_str], &finder)
+
+          if !resource.subscribed?(current_user)
+            not_modified!
+          else
+            resource.unsubscribe(current_user)
+            present resource, with: entity_class, current_user: current_user
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/concerns/subscribable_spec.rb b/spec/models/concerns/subscribable_spec.rb
index e31fdb0bffb..b7fc5a92497 100644
--- a/spec/models/concerns/subscribable_spec.rb
+++ b/spec/models/concerns/subscribable_spec.rb
@@ -44,6 +44,16 @@ describe Subscribable, 'Subscribable' do
     end
   end
 
+  describe '#subscribe' do
+    it 'subscribes the given user' do
+      expect(resource.subscribed?(user)).to be_falsey
+
+      resource.subscribe(user)
+
+      expect(resource.subscribed?(user)).to be_truthy
+    end
+  end
+
   describe '#unsubscribe' do
     it 'unsubscribes the given current user' do
       resource.subscriptions.create(user: user, subscribed: true)
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 9dd43f4fab3..37ab9cc8cfe 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -623,6 +623,12 @@ describe API::API, api: true  do
 
       expect(response.status).to eq(404)
     end
+
+    it 'returns 404 if the issue is confidential' do
+      post api("/projects/#{project.id}/issues/#{confidential_issue.id}/subscription", non_member)
+
+      expect(response.status).to eq(404)
+    end
   end
 
   describe 'DELETE :id/issues/:issue_id/subscription' do
@@ -644,5 +650,11 @@ describe API::API, api: true  do
 
       expect(response.status).to eq(404)
     end
+
+    it 'returns 404 if the issue is confidential' do
+      delete api("/projects/#{project.id}/issues/#{confidential_issue.id}/subscription", non_member)
+
+      expect(response.status).to eq(404)
+    end
   end
 end
diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
index 6943ff9d26c..b2c7f8d9acb 100644
--- a/spec/requests/api/labels_spec.rb
+++ b/spec/requests/api/labels_spec.rb
@@ -190,4 +190,86 @@ describe API::API, api: true  do
       expect(json_response['message']['color']).to eq(['must be a valid color code'])
     end
   end
+
+  describe "POST /projects/:id/labels/:label_id/subscription" do
+    context "when label_id is a label title" do
+      it "should subscribe to the label" do
+        post api("/projects/#{project.id}/labels/#{label1.title}/subscription", user)
+
+        expect(response.status).to eq(201)
+        expect(json_response["name"]).to eq(label1.title)
+        expect(json_response["subscribed"]).to be_truthy
+      end
+    end
+
+    context "when label_id is a label ID" do
+      it "should subscribe to the label" do
+        post api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
+
+        expect(response.status).to eq(201)
+        expect(json_response["name"]).to eq(label1.title)
+        expect(json_response["subscribed"]).to be_truthy
+      end
+    end
+
+    context "when user is already subscribed to label" do
+      before { label1.subscribe(user) }
+
+      it "should return 304" do
+        post api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
+
+        expect(response.status).to eq(304)
+      end
+    end
+
+    context "when label ID is not found" do
+      it "should a return 404 error" do
+        post api("/projects/#{project.id}/labels/1234/subscription", user)
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
+  describe "DELETE /projects/:id/labels/:label_id/subscription" do
+    before { label1.subscribe(user) }
+
+    context "when label_id is a label title" do
+      it "should unsubscribe from the label" do
+        delete api("/projects/#{project.id}/labels/#{label1.title}/subscription", user)
+
+        expect(response.status).to eq(200)
+        expect(json_response["name"]).to eq(label1.title)
+        expect(json_response["subscribed"]).to be_falsey
+      end
+    end
+
+    context "when label_id is a label ID" do
+      it "should unsubscribe from the label" do
+        delete api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
+
+        expect(response.status).to eq(200)
+        expect(json_response["name"]).to eq(label1.title)
+        expect(json_response["subscribed"]).to be_falsey
+      end
+    end
+
+    context "when user is already unsubscribed from label" do
+      before { label1.unsubscribe(user) }
+
+      it "should return 304" do
+        delete api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
+
+        expect(response.status).to eq(304)
+      end
+    end
+
+    context "when label ID is not found" do
+      it "should a return 404 error" do
+        delete api("/projects/#{project.id}/labels/1234/subscription", user)
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
 end

From e4d3e949555c51cf54ead163bf001b4ec86a2733 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 12 May 2016 16:22:21 -0500
Subject: [PATCH 0372/1431] Move broadcast msg into content-wrapper

---
 app/views/layouts/_page.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 3c3bc41bf0e..3c0660d34f4 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,5 +1,4 @@
 .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
-  = render "layouts/broadcast"
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
     .header-logo
       %a#logo
@@ -27,6 +26,7 @@
       .container-fluid
         = render "layouts/nav/#{nav}"
   .content-wrapper{ class: ('page-with-layout-nav' if defined?(nav) && nav) }
+    = render "layouts/broadcast"
     = render "layouts/flash"
     = yield :flash_message
     %div{ class: (container_class unless @no_container) }

From 05bbad5817c567b547177441769643042d699d8a Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 11 May 2016 15:17:16 -0500
Subject: [PATCH 0373/1431] Clean up EventsHelper spec

---
 spec/helpers/events_helper_spec.rb | 95 +++++++++++++++---------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index e68a5ec29ab..c0d2be98e85 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -1,64 +1,65 @@
 require 'spec_helper'
 
 describe EventsHelper do
-  include ApplicationHelper
-  include GitlabMarkdownHelper
+  describe '#event_note' do
+    before do
+      allow(helper).to receive(:current_user).and_return(double)
+    end
 
-  let(:current_user) { create(:user, email: "current@email.com") }
+    it 'should display one line of plain text without alteration' do
+      input = 'A short, plain note'
+      expect(helper.event_note(input)).to match(input)
+      expect(helper.event_note(input)).not_to match(/\.\.\.\z/)
+    end
 
-  it 'should display one line of plain text without alteration' do
-    input = 'A short, plain note'
-    expect(event_note(input)).to match(input)
-    expect(event_note(input)).not_to match(/\.\.\.\z/)
-  end
+    it 'should display inline code' do
+      input = 'A note with `inline code`'
+      expected = 'A note with <code>inline code</code>'
 
-  it 'should display inline code' do
-    input = 'A note with `inline code`'
-    expected = 'A note with <code>inline code</code>'
+      expect(helper.event_note(input)).to match(expected)
+    end
 
-    expect(event_note(input)).to match(expected)
-  end
+    it 'should truncate a note with multiple paragraphs' do
+      input = "Paragraph 1\n\nParagraph 2"
+      expected = 'Paragraph 1...'
 
-  it 'should truncate a note with multiple paragraphs' do
-    input = "Paragraph 1\n\nParagraph 2"
-    expected = 'Paragraph 1...'
+      expect(helper.event_note(input)).to match(expected)
+    end
 
-    expect(event_note(input)).to match(expected)
-  end
+    it 'should display the first line of a code block' do
+      input = "```\nCode block\nwith two lines\n```"
+      expected = %r{<pre.+><code>Code block\.\.\.</code></pre>}
 
-  it 'should display the first line of a code block' do
-    input = "```\nCode block\nwith two lines\n```"
-    expected = %r{<pre.+><code>Code block\.\.\.</code></pre>}
+      expect(helper.event_note(input)).to match(expected)
+    end
 
-    expect(event_note(input)).to match(expected)
-  end
+    it 'should truncate a single long line of text' do
+      text = 'The quick brown fox jumped over the lazy dog twice' # 50 chars
+      input = text * 4
+      expected = (text * 2).sub(/.{3}/, '...')
 
-  it 'should truncate a single long line of text' do
-    text = 'The quick brown fox jumped over the lazy dog twice' # 50 chars
-    input = "#{text}#{text}#{text}#{text}" # 200 chars
-    expected = "#{text}#{text}".sub(/.{3}/, '...')
+      expect(helper.event_note(input)).to match(expected)
+    end
 
-    expect(event_note(input)).to match(expected)
-  end
+    it 'should preserve a link href when link text is truncated' do
+      text = 'The quick brown fox jumped over the lazy dog' # 44 chars
+      input = "#{text}#{text}#{text} " # 133 chars
+      link_url = 'http://example.com/foo/bar/baz' # 30 chars
+      input << link_url
+      expected_link_text = 'http://example...</a>'
 
-  it 'should preserve a link href when link text is truncated' do
-    text = 'The quick brown fox jumped over the lazy dog' # 44 chars
-    input = "#{text}#{text}#{text} " # 133 chars
-    link_url = 'http://example.com/foo/bar/baz' # 30 chars
-    input << link_url
-    expected_link_text = 'http://example...</a>'
+      expect(helper.event_note(input)).to match(link_url)
+      expect(helper.event_note(input)).to match(expected_link_text)
+    end
 
-    expect(event_note(input)).to match(link_url)
-    expect(event_note(input)).to match(expected_link_text)
-  end
-
-  it 'should preserve code color scheme' do
-    input = "```ruby\ndef test\n  'hello world'\nend\n```"
-    expected = '<pre class="code highlight js-syntax-highlight ruby">' \
-      "<code><span class=\"k\">def</span> <span class=\"nf\">test</span>\n" \
-      "  <span class=\"s1\">\'hello world\'</span>\n" \
-      "<span class=\"k\">end</span>" \
-      '</code></pre>'
-    expect(event_note(input)).to eq(expected)
+    it 'should preserve code color scheme' do
+      input = "```ruby\ndef test\n  'hello world'\nend\n```"
+      expected = '<pre class="code highlight js-syntax-highlight ruby">' \
+        "<code><span class=\"k\">def</span> <span class=\"nf\">test</span>\n" \
+        "  <span class=\"s1\">\'hello world\'</span>\n" \
+        "<span class=\"k\">end</span>" \
+        '</code></pre>'
+      expect(helper.event_note(input)).to eq(expected)
+    end
   end
 end

From 7bc594735b7923d1e57eb504f09716bbb72c8c06 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 12 May 2016 17:06:47 -0500
Subject: [PATCH 0374/1431] Undo changes; reduce sidebar internal width

---
 app/assets/stylesheets/framework/sidebar.scss | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index c243dd8a424..f90d7a806d3 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -63,7 +63,7 @@
       float: left;
       height: $header-height;
       width: 100%;
-      padding-left: 16px;
+      padding-left: 22px;
       overflow: hidden;
       outline: none;
       transition-duration: .3s;
@@ -78,7 +78,7 @@
       }
 
       .gitlab-text-container {
-        width: 220px;
+        width: 230px;
 
         h3 {
           width: 158px;
@@ -146,12 +146,12 @@
 
     a {
       padding: 7px 15px;
-      transition-duration: .3s;
       font-size: $gl-font-size;
       line-height: 24px;
       color: $gray;
       display: block;
       text-decoration: none;
+      padding-left: 23px;
       font-weight: normal;
       outline: none;
 
@@ -253,11 +253,6 @@
         width: auto;
 
         a {
-          @media (min-width: $screen-xs-min) {
-            padding-left: 23px;
-            transition-duration: .3s;
-          }
-
           span {
             display: none;
           }
@@ -317,7 +312,7 @@
     }
 
     .nav-sidebar li a {
-      width: 220px;
+      width: $sidebar_width;
 
       &.back-link {
         i {

From 6a29117793934850986a9e423c86746b4a0763e9 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Fri, 13 May 2016 00:11:01 +0200
Subject: [PATCH 0375/1431] Removed stray strip_heredoc from migration helpers

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

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 4773a88d0c1..74c87fa2905 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -63,7 +63,7 @@ module Gitlab
             FROM #{quoted_table}
             ORDER BY id ASC
             LIMIT 1 OFFSET #{processed + batch_size}
-          }.strip_heredoc).to_hash.first
+          }).to_hash.first
 
           query = %Q{
             UPDATE #{quoted_table}

From 4fea5cda0bf7ff56dafae90306441b0d65f3ca05 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Thu, 12 May 2016 17:11:37 -0500
Subject: [PATCH 0376/1431] Fix minor typos in admin health check page

---
 app/views/admin/health_check/show.html.haml    | 2 +-
 spec/features/admin/admin_health_check_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml
index ad79fd26d0b..c2313986a7f 100644
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -13,7 +13,7 @@
     = icon('refresh')
     Reset health check access token
 %p.light
-  Health information can be reteived as plain text, json, or xml using:
+  Health information can be retrieved as plain text, JSON, or XML using:
   %ul
     %li
       %code= health_check_url(token: current_application_settings.health_check_access_token)
diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb
index 4fde04b609b..dec2dedf2b5 100644
--- a/spec/features/admin/admin_health_check_spec.rb
+++ b/spec/features/admin/admin_health_check_spec.rb
@@ -13,7 +13,7 @@ feature "Admin Health Check", feature: true do
     end
 
     it { page.has_text? 'Health Check' }
-    it { page.has_text? 'Health information can be reteived' }
+    it { page.has_text? 'Health information can be retrieved' }
 
     it 'has a health check access token' do
       token = current_application_settings.health_check_access_token

From 311fb58c44fe6dd14709c8eb8f9346ec73e03aff Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Tue, 10 May 2016 23:24:23 -0300
Subject: [PATCH 0377/1431] Require space around operators

---
 .rubocop.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 3fb2f2df592..562197300b4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -276,7 +276,7 @@ Style/IdenticalConditionalBranches:
   Enabled: false
 
 # Checks the indentation of the first line of the right-hand-side of a
-# multi-line assignment. 
+# multi-line assignment.
 Style/IndentAssignment:
   Enabled: false
 
@@ -531,7 +531,7 @@ Style/SpaceAroundKeyword:
 
 # Use a single space around operators.
 Style/SpaceAroundOperators:
-  Enabled: false
+  Enabled: true
 
 # Checks that the left block brace has or doesn't have space before it.
 Style/SpaceBeforeBlockBraces:

From f5a0ac0fc197bae2eb5fe1045ed237cdbbaf6ea4 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Tue, 10 May 2016 23:58:06 -0300
Subject: [PATCH 0378/1431] Codestyle: make sure we have space around operators

---
 app/controllers/application_controller.rb     |  2 +-
 app/controllers/concerns/creates_commit.rb    |  2 +-
 app/helpers/search_helper.rb                  |  2 +-
 app/helpers/selects_helper.rb                 |  2 +-
 .../project_services/external_wiki_service.rb |  2 +-
 app/models/project_wiki.rb                    |  2 +-
 app/models/repository.rb                      |  4 ++--
 app/services/merge_requests/build_service.rb  |  2 +-
 app/services/system_hooks_service.rb          |  2 +-
 config/environments/test.rb                   |  2 +-
 config/initializers/1_settings.rb             | 18 ++++++++---------
 config/initializers/carrierwave.rb            |  2 +-
 config/initializers/devise.rb                 |  2 +-
 config/routes.rb                              |  2 +-
 features/steps/dashboard/issues.rb            |  2 +-
 features/steps/dashboard/merge_requests.rb    |  2 +-
 features/steps/profile/profile.rb             |  2 +-
 features/steps/project/team_management.rb     |  2 +-
 lib/api/helpers.rb                            |  2 +-
 lib/gitlab/email/reply_parser.rb              |  2 +-
 lib/gitlab/redis.rb                           |  6 +++---
 spec/lib/ci/gitlab_ci_yaml_processor_spec.rb  |  4 ++--
 .../ci/build/artifacts/metadata/entry_spec.rb |  4 ++--
 spec/lib/gitlab/lfs/lfs_router_spec.rb        |  4 ++--
 spec/models/commit_spec.rb                    |  2 +-
 spec/models/hooks/service_hook_spec.rb        |  4 ++--
 spec/models/hooks/system_hook_spec.rb         | 20 +++++++++----------
 .../slack_service/note_message_spec.rb        |  4 ++--
 spec/requests/api/builds_spec.rb              |  4 ++--
 spec/requests/api/group_members_spec.rb       | 10 +++++-----
 spec/requests/ci/api/builds_spec.rb           |  4 ++--
 spec/support/jira_service_helper.rb           | 10 +++++-----
 spec/support/stub_gitlab_calls.rb             | 20 +++++++++----------
 33 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 17b3f49aed1..1429ee40bb7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -176,7 +176,7 @@ class ApplicationController < ActionController::Base
   end
 
   def check_password_expiration
-    if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now  && !current_user.ldap_user?
+    if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user?
       redirect_to new_profile_password_path and return
     end
   end
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index 787416c17ab..dacb5679dd3 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -122,7 +122,7 @@ module CreatesCommit
       # Merge request from fork to this project
       @mr_source_project = @tree_edit_project
       @mr_target_project = @project
-      @mr_target_branch  ||= @ref
+      @mr_target_branch ||= @ref
     end
   end
 end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 24c4c098c65..d2f94d4ae6f 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -59,7 +59,7 @@ module SearchHelper
   # Autocomplete results for the current project, if it's defined
   def project_autocomplete
     if @project && @project.repository.exists? && @project.repository.root_ref
-      ref    = @ref || @project.repository.root_ref
+      ref = @ref || @project.repository.root_ref
 
       [
         { category: "Current Project", label: "Files",          url: namespace_project_tree_path(@project.namespace, @project, ref) },
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb
index e951a87a212..bb395e37884 100644
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
@@ -18,7 +18,7 @@ module SelectsHelper
         first_user: first_user,
         current_user: opts[:current_user] || false,
         "push-code-to-protected-branches" => opts[:push_code_to_protected_branches],
-        author_id: opts[:author_id]       || ''
+        author_id: opts[:author_id] || ''
       }
     }
 
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index f042bfc5210..d7b6e505191 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -25,7 +25,7 @@ class ExternalWikiService < Service
 
   def execute(_data)
     @response = HTTParty.get(properties['external_wiki_url'], verify: true) rescue nil
-    if @response !=200
+    if @response != 200
       nil
     end
   end
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 7c1a61bb0bf..060ed9b44ec 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -113,7 +113,7 @@ class ProjectWiki
   end
 
   def page_title_and_dir(title)
-    title_array =  title.split("/")
+    title_array = title.split("/")
     title = title_array.pop
     [title, title_array.join("/")]
   end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index de7e163078d..0eff74320f3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -795,7 +795,7 @@ class Repository
   def check_revert_content(commit, base_branch)
     source_sha = find_branch(base_branch).target
     args       = [commit.id, source_sha]
-    args       << { mainline: 1 } if commit.merge_commit?
+    args << { mainline: 1 } if commit.merge_commit?
 
     revert_index = rugged.revert_commit(*args)
     return false if revert_index.conflicts?
@@ -809,7 +809,7 @@ class Repository
   def check_cherry_pick_content(commit, base_branch)
     source_sha = find_branch(base_branch).target
     args       = [commit.id, source_sha]
-    args       << 1 if commit.merge_commit?
+    args << 1 if commit.merge_commit?
 
     cherry_pick_index = rugged.cherrypick_commit(*args)
     return false if cherry_pick_index.conflicts?
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index cd4230aa5e4..1b48899bb0a 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -66,7 +66,7 @@ module MergeRequests
       commits = merge_request.compare_commits
       if commits && commits.count == 1
         commit = commits.first
-        merge_request.title       = commit.title
+        merge_request.title = commit.title
         merge_request.description ||= commit.description.try(:strip)
       elsif iid && (issue = merge_request.target_project.get_issue(iid)) && !issue.try(:confidential?)
         case issue
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb
index e43b5b51e5b..1fb72cf89e9 100644
--- a/app/services/system_hooks_service.rb
+++ b/app/services/system_hooks_service.rb
@@ -85,7 +85,7 @@ class SystemHooksService
       path_with_namespace: model.path_with_namespace,
       project_id: model.id,
       owner_name: owner.name,
-      owner_email: owner.respond_to?(:email) ?  owner.email : "",
+      owner_email: owner.respond_to?(:email) ? owner.email : "",
       project_visibility: Project.visibility_levels.key(model.visibility_level_field).downcase
     }
   end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a703c0934f7..fb25d3a8b14 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -20,7 +20,7 @@ Rails.application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 23c8cea038a..a69b933d811 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -126,7 +126,7 @@ end
 
 
 Settings['omniauth'] ||= Settingslogic.new({})
-Settings.omniauth['enabled']      = false if Settings.omniauth['enabled'].nil?
+Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?
 Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil?
 Settings.omniauth['allow_single_sign_on'] = false if Settings.omniauth['allow_single_sign_on'].nil?
 Settings.omniauth['external_providers'] = [] if Settings.omniauth['external_providers'].nil?
@@ -134,7 +134,7 @@ Settings.omniauth['block_auto_created_users'] = true if Settings.omniauth['block
 Settings.omniauth['auto_link_ldap_user'] = false if Settings.omniauth['auto_link_ldap_user'].nil?
 Settings.omniauth['auto_link_saml_user'] = false if Settings.omniauth['auto_link_saml_user'].nil?
 
-Settings.omniauth['providers']  ||= []
+Settings.omniauth['providers'] ||= []
 Settings.omniauth['cas3'] ||= Settingslogic.new({})
 Settings.omniauth.cas3['session_duration'] ||= 8.hours
 Settings.omniauth['session_tickets'] ||= Settingslogic.new({})
@@ -168,7 +168,7 @@ end
 Settings['shared'] ||= Settingslogic.new({})
 Settings.shared['path'] = File.expand_path(Settings.shared['path'] || "shared", Rails.root)
 
-Settings['issues_tracker']  ||= {}
+Settings['issues_tracker'] ||= {}
 
 #
 # GitLab
@@ -183,7 +183,7 @@ Settings.gitlab['ssh_host']   ||= Settings.gitlab.host
 Settings.gitlab['https']        = false if Settings.gitlab['https'].nil?
 Settings.gitlab['port']       ||= Settings.gitlab.https ? 443 : 80
 Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
-Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
+Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
 Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil?
 Settings.gitlab['email_from'] ||= ENV['GITLAB_EMAIL_FROM'] || "gitlab@#{Settings.gitlab.host}"
 Settings.gitlab['email_display_name'] ||= ENV['GITLAB_EMAIL_DISPLAY_NAME'] || 'GitLab'
@@ -196,7 +196,7 @@ Settings.gitlab['user_home']  ||= begin
 rescue ArgumentError # no user configured
   '/home/' + Settings.gitlab['user']
 end
-Settings.gitlab['time_zone']  ||= nil
+Settings.gitlab['time_zone'] ||= nil
 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
 Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
@@ -211,7 +211,7 @@ Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.g
 Settings.gitlab.default_projects_features['wiki']           = true if Settings.gitlab.default_projects_features['wiki'].nil?
 Settings.gitlab.default_projects_features['snippets']       = false if Settings.gitlab.default_projects_features['snippets'].nil?
 Settings.gitlab.default_projects_features['builds']         = true if Settings.gitlab.default_projects_features['builds'].nil?
-Settings.gitlab.default_projects_features['visibility_level']    = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
+Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
 Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') if Settings.gitlab['repository_downloads_path'].nil?
 Settings.gitlab['restricted_signup_domains'] ||= []
 Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git']
@@ -225,8 +225,8 @@ Settings['gitlab_ci'] ||= Settingslogic.new({})
 Settings.gitlab_ci['shared_runners_enabled'] = true if Settings.gitlab_ci['shared_runners_enabled'].nil?
 Settings.gitlab_ci['all_broken_builds']     = true if Settings.gitlab_ci['all_broken_builds'].nil?
 Settings.gitlab_ci['add_pusher']            = false if Settings.gitlab_ci['add_pusher'].nil?
-Settings.gitlab_ci['url']                   ||= Settings.send(:build_gitlab_ci_url)
 Settings.gitlab_ci['builds_path']           = File.expand_path(Settings.gitlab_ci['builds_path'] || "builds/", Rails.root)
+Settings.gitlab_ci['url']                 ||= Settings.send(:build_gitlab_ci_url)
 
 #
 # Reply by email
@@ -240,7 +240,7 @@ Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled']
 Settings['artifacts'] ||= Settingslogic.new({})
 Settings.artifacts['enabled']      = true if Settings.artifacts['enabled'].nil?
 Settings.artifacts['path']         = File.expand_path(Settings.artifacts['path'] || File.join(Settings.shared['path'], "artifacts"), Rails.root)
-Settings.artifacts['max_size']    ||= 100 # in megabytes
+Settings.artifacts['max_size']   ||= 100 # in megabytes
 
 #
 # Git LFS
@@ -298,7 +298,7 @@ Settings['backup'] ||= Settingslogic.new({})
 Settings.backup['keep_time']  ||= 0
 Settings.backup['pg_schema']    = nil
 Settings.backup['path']         = File.expand_path(Settings.backup['path'] || "tmp/backups/", Rails.root)
-Settings.backup['archive_permissions']          ||= 0600
+Settings.backup['archive_permissions'] ||= 0600
 Settings.backup['upload'] ||= Settingslogic.new({ 'remote_directory' => nil, 'connection' => nil })
 # Convert upload connection settings to use symbol keys, to make Fog happy
 if Settings.backup['upload']['connection']
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 0d278717d6e..1933afcbfb1 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -20,7 +20,7 @@ if File.exist?(aws_file)
     config.fog_public = false
 
     # optional, defaults to {}
-    config.fog_attributes = { 'Cache-Control'=>'max-age=315576000' }
+    config.fog_attributes = { 'Cache-Control' => 'max-age=315576000' }
 
     # optional time (in seconds) that authenticated urls will be valid.
     # when fog_public is false and provider is AWS or Google, defaults to 600
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 31dceaebcad..021bdb11251 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -243,7 +243,7 @@ Devise.setup do |config|
     when Hash
       # Add procs for handling SLO
       if provider['name'] == 'cas3'
-        provider['args'][:on_single_sign_out]  = lambda do |request|
+        provider['args'][:on_single_sign_out] = lambda do |request|
           ticket = request.params[:session_index]
           raise "Service Ticket not found." unless Gitlab::OAuth::Session.valid?(:cas3, ticket)
           Gitlab::OAuth::Session.destroy(:cas3, ticket)
diff --git a/config/routes.rb b/config/routes.rb
index ec876eba345..0c01c529210 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,7 +83,7 @@ Rails.application.routes.draw do
   get 'help'                  => 'help#index'
   get 'help/:category/:file'  => 'help#show', as: :help_page, constraints: { category: /.*/, file: /[^\/\.]+/ }
   get 'help/shortcuts'
-  get 'help/ui'               => 'help#ui'
+  get 'help/ui' => 'help#ui'
 
   #
   # Global snippets
diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb
index e21af72a777..8706f0e8e78 100644
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
@@ -74,7 +74,7 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
 
   def project
     @project ||= begin
-                   project =create :project
+                   project = create :project
                    project.team << [current_user, :master]
                    project
                  end
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index a2adc87f8ef..06db36c7014 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -100,7 +100,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   def project
     @project ||= begin
-                   project =create :project
+                   project = create :project
                    project.team << [current_user, :master]
                    project
                  end
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index 909de31a479..b1a87b96efd 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -166,7 +166,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
   end
 
   step 'I have group with projects' do
-    @group   = create(:group)
+    @group = create(:group)
     @group.add_owner(current_user)
     @project = create(:project, namespace: @group)
     @event   = create(:closed_issue_event, project: @project)
diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index 3fbcf770b62..c6ced747370 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -126,7 +126,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
 
   step 'I share project with group "OpenSource"' do
     project = Project.find_by(name: 'Shop')
-    os_group   = create(:group, name: 'OpenSource')
+    os_group = create(:group, name: 'OpenSource')
     create(:project, group: os_group)
     @os_user1 = create(:user)
     @os_user2 = create(:user)
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 5e638dbe16a..cadf9f98fe3 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -2,7 +2,7 @@ module API
   module Helpers
     PRIVATE_TOKEN_HEADER = "HTTP_PRIVATE_TOKEN"
     PRIVATE_TOKEN_PARAM = :private_token
-    SUDO_HEADER ="HTTP_SUDO"
+    SUDO_HEADER = "HTTP_SUDO"
     SUDO_PARAM = :sudo
 
     def parse_boolean(value)
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
index 6ed36b51f12..3411eb1d9ce 100644
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -65,7 +65,7 @@ module Gitlab
                    (l =~ /On \w+ \d+,? \d+,?.*wrote:/)
 
           # Headers on subsequent lines
-          break if (0..2).all? { |off| lines[idx+off] =~ REPLYING_HEADER_REGEX }
+          break if (0..2).all? { |off| lines[idx + off] =~ REPLYING_HEADER_REGEX }
           # Headers on the same line
           break if REPLYING_HEADER_LABELS.count { |label| l.include?(label) } >= 3
 
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index f7db7a6391c..40766f35f77 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -25,7 +25,7 @@ module Gitlab
       end
       @pool.with { |redis| yield redis }
     end
-    
+
     def self.redis_store_options
       url = new.url
       redis_config_hash = ::Redis::Store::Factory.extract_host_options_from_uri(url)
@@ -40,10 +40,10 @@ module Gitlab
     def initialize(rails_env=nil)
       rails_env ||= Rails.env
       config_file = File.expand_path('../../../config/resque.yml', __FILE__)
-  
+
       @url = "redis://localhost:6379"
       if File.exist?(config_file)
-        @url =YAML.load_file(config_file)[rails_env]
+        @url = YAML.load_file(config_file)[rails_env]
       end
     end
   end
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index c7ab3185378..9eef8ea0976 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -443,12 +443,12 @@ module Ci
       context 'when job variables are defined' do
         context 'when syntax is correct' do
           it 'returns job variables' do
-            variables =  {
+            variables = {
               KEY1: 'value1',
               SOME_KEY_2: 'value2'
             }
 
-            config =  YAML.dump(
+            config = YAML.dump(
               { before_script: ['pwd'],
                 rspec: {
                   variables: variables,
diff --git a/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb b/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
index acca0b08bab..46a5b7fce65 100644
--- a/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
@@ -10,8 +10,8 @@ describe Gitlab::Ci::Build::Artifacts::Metadata::Entry do
       'path/dir_1/subdir/subfile' => { size: 10 },
       'path/second_dir' => {},
       'path/second_dir/dir_3/file_2' => { size: 10 },
-      'path/second_dir/dir_3/file_3'=> { size: 10 },
-      'another_directory/'=> {},
+      'path/second_dir/dir_3/file_3' => { size: 10 },
+      'another_directory/' => {},
       'another_file' => {},
       '/file/with/absolute_path' => {} }
   end
diff --git a/spec/lib/gitlab/lfs/lfs_router_spec.rb b/spec/lib/gitlab/lfs/lfs_router_spec.rb
index 5852b31ab3a..3325190789b 100644
--- a/spec/lib/gitlab/lfs/lfs_router_spec.rb
+++ b/spec/lib/gitlab/lfs/lfs_router_spec.rb
@@ -26,8 +26,8 @@ describe Gitlab::Lfs::Router, lib: true do
 
   let(:sample_oid) { "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a17f80" }
   let(:sample_size) { 499013 }
-  let(:respond_with_deprecated) {[ 501, { "Content-Type"=>"application/json; charset=utf-8" }, ["{\"message\":\"Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.\",\"documentation_url\":\"#{Gitlab.config.gitlab.url}/help\"}"]]}
-  let(:respond_with_disabled) {[ 501, { "Content-Type"=>"application/json; charset=utf-8" }, ["{\"message\":\"Git LFS is not enabled on this GitLab server, contact your admin.\",\"documentation_url\":\"#{Gitlab.config.gitlab.url}/help\"}"]]}
+  let(:respond_with_deprecated) {[ 501, { "Content-Type" => "application/json; charset=utf-8" }, ["{\"message\":\"Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.\",\"documentation_url\":\"#{Gitlab.config.gitlab.url}/help\"}"]]}
+  let(:respond_with_disabled) {[ 501, { "Content-Type" => "application/json; charset=utf-8" }, ["{\"message\":\"Git LFS is not enabled on this GitLab server, contact your admin.\",\"documentation_url\":\"#{Gitlab.config.gitlab.url}/help\"}"]]}
 
   describe 'when lfs is disabled' do
     before do
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index ad47e338a33..ccb100cd96f 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -56,7 +56,7 @@ describe Commit, models: true do
     end
 
     it "does not truncates a message with a newline after 80 but less 100 characters" do
-      message =<<eos
+      message = <<eos
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sodales id felis id blandit.
 Vivamus egestas lacinia lacus, sed rutrum mauris.
 eos
diff --git a/spec/models/hooks/service_hook_spec.rb b/spec/models/hooks/service_hook_spec.rb
index f800f415bd2..534e1b4f128 100644
--- a/spec/models/hooks/service_hook_spec.rb
+++ b/spec/models/hooks/service_hook_spec.rb
@@ -34,14 +34,14 @@ describe ServiceHook, models: true do
     it "POSTs to the webhook URL" do
       @service_hook.execute(@data)
       expect(WebMock).to have_requested(:post, @service_hook.url).with(
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'Service Hook' }
       ).once
     end
 
     it "POSTs the data as JSON" do
       @service_hook.execute(@data)
       expect(WebMock).to have_requested(:post, @service_hook.url).with(
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'Service Hook' }
       ).once
     end
 
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb
index 56a9fbe9720..4078b9e4ff5 100644
--- a/spec/models/hooks/system_hook_spec.rb
+++ b/spec/models/hooks/system_hook_spec.rb
@@ -33,7 +33,7 @@ describe SystemHook, models: true do
       Projects::CreateService.new(user, name: 'empty').execute
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /project_create/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -42,7 +42,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /project_destroy/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -51,7 +51,7 @@ describe SystemHook, models: true do
       
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_create/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -60,7 +60,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_destroy/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -69,7 +69,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_add_to_team/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -79,7 +79,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_remove_from_team/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -88,7 +88,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /group_create/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -97,7 +97,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /group_destroy/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -106,7 +106,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_add_to_group/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
 
@@ -116,7 +116,7 @@ describe SystemHook, models: true do
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_remove_from_group/,
-        headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
+        headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
       ).once
     end
   end
diff --git a/spec/models/project_services/slack_service/note_message_spec.rb b/spec/models/project_services/slack_service/note_message_spec.rb
index d37590cab75..379c3e1219c 100644
--- a/spec/models/project_services/slack_service/note_message_spec.rb
+++ b/spec/models/project_services/slack_service/note_message_spec.rb
@@ -65,7 +65,7 @@ describe SlackService::NoteMessage, models: true do
       expect(message.pretext).to eq("Test User commented on " \
       "<url|merge request !30> in <somewhere.com|project_name>: " \
       "*merge request title*")
-      expected_attachments =  [
+      expected_attachments = [
           {
               text: "comment on a merge request",
               color: color,
@@ -117,7 +117,7 @@ describe SlackService::NoteMessage, models: true do
       expect(message.pretext).to eq("Test User commented on " \
       "<url|snippet #5> in <somewhere.com|project_name>: " \
       "*snippet title*")
-      expected_attachments =  [
+      expected_attachments = [
           {
               text: "comment on a snippet",
               color: color,
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 5ead735be48..0fbc984c061 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -106,8 +106,8 @@ describe API::API, api: true  do
 
       context 'authorized user' do
         let(:download_headers) do
-          { 'Content-Transfer-Encoding'=>'binary',
-            'Content-Disposition'=>'attachment; filename=ci_build_artifacts.zip' }
+          { 'Content-Transfer-Encoding' => 'binary',
+            'Content-Disposition' => 'attachment; filename=ci_build_artifacts.zip' }
         end
 
         it 'should return specific build artifacts' do
diff --git a/spec/requests/api/group_members_spec.rb b/spec/requests/api/group_members_spec.rb
index 96d89e69209..02553d0f8e2 100644
--- a/spec/requests/api/group_members_spec.rb
+++ b/spec/requests/api/group_members_spec.rb
@@ -34,11 +34,11 @@ describe API::API, api: true  do
           expect(response.status).to eq(200)
           expect(json_response).to be_an Array
           expect(json_response.size).to eq(5)
-          expect(json_response.find { |e| e['id']==owner.id }['access_level']).to eq(GroupMember::OWNER)
-          expect(json_response.find { |e| e['id']==reporter.id }['access_level']).to eq(GroupMember::REPORTER)
-          expect(json_response.find { |e| e['id']==developer.id }['access_level']).to eq(GroupMember::DEVELOPER)
-          expect(json_response.find { |e| e['id']==master.id }['access_level']).to eq(GroupMember::MASTER)
-          expect(json_response.find { |e| e['id']==guest.id }['access_level']).to eq(GroupMember::GUEST)
+          expect(json_response.find { |e| e['id'] == owner.id }['access_level']).to eq(GroupMember::OWNER)
+          expect(json_response.find { |e| e['id'] == reporter.id }['access_level']).to eq(GroupMember::REPORTER)
+          expect(json_response.find { |e| e['id'] == developer.id }['access_level']).to eq(GroupMember::DEVELOPER)
+          expect(json_response.find { |e| e['id'] == master.id }['access_level']).to eq(GroupMember::MASTER)
+          expect(json_response.find { |e| e['id'] == guest.id }['access_level']).to eq(GroupMember::GUEST)
         end
       end
 
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index dfd361a2cdd..cae4656010f 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -402,8 +402,8 @@ describe Ci::API::API do
         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' }
+            { 'Content-Transfer-Encoding' => 'binary',
+              'Content-Disposition' => 'attachment; filename=ci_build_artifacts.zip' }
           end
 
           it 'should download artifact' do
diff --git a/spec/support/jira_service_helper.rb b/spec/support/jira_service_helper.rb
index a3f496359b1..5ebe095743b 100644
--- a/spec/support/jira_service_helper.rb
+++ b/spec/support/jira_service_helper.rb
@@ -2,11 +2,11 @@ module JiraServiceHelper
 
   def jira_service_settings
     properties = {
-      "title"=>"JIRA tracker",
-      "project_url"=>"http://jira.example/issues/?jql=project=A",
-      "issues_url"=>"http://jira.example/browse/JIRA-1",
-      "new_issue_url"=>"http://jira.example/secure/CreateIssue.jspa",
-      "api_url"=>"http://jira.example/rest/api/2"
+      "title" => "JIRA tracker",
+      "project_url" => "http://jira.example/issues/?jql=project=A",
+      "issues_url" => "http://jira.example/browse/JIRA-1",
+      "new_issue_url" => "http://jira.example/secure/CreateIssue.jspa",
+      "api_url" => "http://jira.example/rest/api/2"
     }
 
     jira_tracker.update_attributes(properties: properties, active: true)
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index eec2e681117..b5ca34bc028 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -36,20 +36,20 @@ module StubGitlabCalls
 
     stub_request(:post, "#{gitlab_url}api/v3/session.json").
       with(body: "{\"email\":\"test@test.com\",\"password\":\"123456\"}",
-           headers: { 'Content-Type'=>'application/json' }).
-           to_return(status: 201, body: f, headers: { 'Content-Type'=>'application/json' })
+           headers: { 'Content-Type' => 'application/json' }).
+           to_return(status: 201, body: f, headers: { 'Content-Type' => 'application/json' })
   end
 
   def stub_user
     f = File.read(Rails.root.join('spec/support/gitlab_stubs/user.json'))
 
     stub_request(:get, "#{gitlab_url}api/v3/user?private_token=Wvjy2Krpb7y8xi93owUz").
-      with(headers: { 'Content-Type'=>'application/json' }).
-      to_return(status: 200, body: f, headers: { 'Content-Type'=>'application/json' })
+      with(headers: { 'Content-Type' => 'application/json' }).
+      to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
 
     stub_request(:get, "#{gitlab_url}api/v3/user?access_token=some_token").
-      with(headers: { 'Content-Type'=>'application/json' }).
-      to_return(status: 200, body: f, headers: { 'Content-Type'=>'application/json' })
+      with(headers: { 'Content-Type' => 'application/json' }).
+      to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
   end
 
   def stub_project_8
@@ -66,19 +66,19 @@ module StubGitlabCalls
     f = File.read(Rails.root.join('spec/support/gitlab_stubs/projects.json'))
 
     stub_request(:get, "#{gitlab_url}api/v3/projects.json?archived=false&ci_enabled_first=true&private_token=Wvjy2Krpb7y8xi93owUz").
-      with(headers: { 'Content-Type'=>'application/json' }).
-      to_return(status: 200, body: f, headers: { 'Content-Type'=>'application/json' })
+      with(headers: { 'Content-Type' => 'application/json' }).
+      to_return(status: 200, body: f, headers: { 'Content-Type' => 'application/json' })
   end
 
   def stub_projects_owned
     stub_request(:get, "#{gitlab_url}api/v3/projects/owned.json?archived=false&ci_enabled_first=true&private_token=Wvjy2Krpb7y8xi93owUz").
-      with(headers: { 'Content-Type'=>'application/json' }).
+      with(headers: { 'Content-Type' => 'application/json' }).
       to_return(status: 200, body: "", headers: {})
   end
 
   def stub_ci_enable
     stub_request(:put, "#{gitlab_url}api/v3/projects/2/services/gitlab-ci.json?private_token=Wvjy2Krpb7y8xi93owUz").
-      with(headers: { 'Content-Type'=>'application/json' }).
+      with(headers: { 'Content-Type' => 'application/json' }).
       to_return(status: 200, body: "", headers: {})
   end
 

From 8d58e691c69f623878522c4f0dccf9f24229e9ce Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Fri, 13 May 2016 04:51:13 -0300
Subject: [PATCH 0379/1431] remove extra space to fix codestyle

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

diff --git a/config/routes.rb b/config/routes.rb
index 0c01c529210..9e776a1f541 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,7 +74,7 @@ Rails.application.routes.draw do
   end
 
   # Health check
-  get 'health_check(/:checks)'  => 'health_check#index', as: :health_check
+  get 'health_check(/:checks)' => 'health_check#index', as: :health_check
 
   # Enable Grack support
   mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post, :put]

From 8eb67187d04f49f88afc13cdc3d0d591bb1e2a20 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 13 May 2016 13:12:21 +0200
Subject: [PATCH 0380/1431] removed transaction stuff

---
 app/controllers/projects/imports_controller.rb | 4 +---
 app/services/projects/create_service.rb        | 8 +-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index d353a390340..a1b84afcd91 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -19,9 +19,7 @@ class Projects::ImportsController < Projects::ApplicationController
       if @project.import_failed?
         @project.import_retry
       else
-        Project.transaction do
-          @project.import_start
-        end
+        @project.import_start
         @project.add_import_job
       end
     end
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 2687544ae62..6728fabea1e 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -52,7 +52,7 @@ module Projects
 
       save_project_and_import_data(import_data)
 
-      start_import if @project.import?
+      @project.import_start if @project.import?
 
       after_create_actions if @project.persisted?
 
@@ -94,12 +94,6 @@ module Projects
       end
     end
 
-    def start_import
-      Project.transaction do
-        @project.import_start
-      end
-    end
-
     def save_project_and_import_data(import_data)
       Project.transaction do
         @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data

From 886bfb0a4ddeb546b9e14f7671273466dc5708ba Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 08:36:44 -0500
Subject: [PATCH 0381/1431] Initial specs for pipelines

---
 spec/features/pipelines_spec.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 spec/features/pipelines_spec.rb

diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
new file mode 100644
index 00000000000..1e0c58be979
--- /dev/null
+++ b/spec/features/pipelines_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "Pipelines" do
+  include GitlabRoutingHelper
+
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+  before { login_as(user) }
+
+  describe "GET /:project/pipelines" do
+
+  end
+
+  describe "GET /:project/pipelines/:id" do
+    let(:pipeline) { create(:ci_commit, project: project, ref: 'master') }
+
+    before do
+      create(:ci_build, :success, commit: pipeline)
+    end
+
+    before { visit namespace_project_pipeline_path(project.namespace, project, pipeline) }
+
+    it { expect(page).to()}
+  end
+end

From 575a73c896a113e6e9b76adb582cb23025cf0032 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 08:45:57 -0500
Subject: [PATCH 0382/1431] Fix specs

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

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 62ef6de5db1..cadd4ab044e 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -153,7 +153,7 @@ class Namespace < ActiveRecord::Base
   end
 
   def any_project_has_container_registry_tags?
-    projects.any?(:has_container_registry_tags?)
+    projects.any?(&:has_container_registry_tags?)
   end
 
   def send_update_instructions

From ae89161db5d6294948990b1d87f4fa306f2a1be9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 13 May 2016 09:25:38 -0500
Subject: [PATCH 0383/1431] Remove background color differentiation from gitlab
 logo/text in sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index dc4668877f2..51a17d1469e 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -9,9 +9,6 @@
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   .page-with-sidebar {
     .header-logo {
-      background-color: $color;
-      border-color: $color;
-
       a {
         color: $color-light;
 
@@ -21,7 +18,7 @@
       }
 
       &:hover {
-        background-color: $color-darker;
+        background-color: $color-dark;
         a {
           color: #fff;
 

From 6da24056030ccf45ec39f2f3b6addc6f0ffe1d1f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 13 May 2016 10:05:52 -0500
Subject: [PATCH 0384/1431] Add UI changes in 8.8 to changelog

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 588a4b4eef6..30d4955c9f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,8 @@ v 8.8.0 (unreleased)
   - Total method execution timings are no longer tracked
   - Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034. (Andrei Gliga)
   - Add API endpoints for un/subscribing from/to a label. !4051 (Ahmad Sherif)
+  - Hide left sidebar on phone screens to give more space for content
+  - Redesign navigation for profile and group pages
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From 16b1d3a34f665776bbdfca041326b9c2d569e59b Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 13 May 2016 11:12:49 -0500
Subject: [PATCH 0385/1431] Fix mobile dropdown bug

---
 app/assets/stylesheets/framework/nav.scss     | 19 +++++++++++++++++++
 app/helpers/nav_helper.rb                     |  8 ++++++++
 app/views/layouts/_page.html.haml             |  2 +-
 .../layouts/nav/_group_settings.html.haml     |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index f2d7dc625e0..a81fcb1c6b3 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -209,6 +209,15 @@
     float: right;
     padding: 7px 0 0;
 
+    @media (max-width: $screen-xs-min) {
+      float: none;
+      padding: 0 9px;
+
+      .dropdown-new {
+        width: 100%;
+      }
+    }
+
     i {
       color: $layout-link-gray;
     }
@@ -225,6 +234,10 @@
 
     .dropdown {
       margin-left: 7px;
+
+      @media (max-width: $screen-xs-min) {
+        margin-left: 0;
+      }
     }
   }
 
@@ -260,4 +273,10 @@
 
 .page-with-layout-nav {
   margin-top: 50px;
+
+  &.controls-dropdown-visible {
+    @media (max-width: $screen-xs-min) {
+      margin-top: 96px;
+    }
+  }
 }
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 3aa41030453..fbb799eecd3 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -43,4 +43,12 @@ module NavHelper
     class_name += " with-horizontal-nav" if defined?(nav) && nav
     class_name
   end
+
+  def layout_nav_class
+    "page-with-layout-nav" if defined?(nav) && nav
+  end
+
+  def layout_dropdown_class
+    "controls-dropdown-visible" if current_user
+  end
 end
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 3c0660d34f4..5be0b546a62 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -25,7 +25,7 @@
     .layout-nav
       .container-fluid
         = render "layouts/nav/#{nav}"
-  .content-wrapper{ class: ('page-with-layout-nav' if defined?(nav) && nav) }
+  .content-wrapper{ class: "#{layout_nav_class} #{layout_dropdown_class}" }
     = render "layouts/broadcast"
     = render "layouts/flash"
     = yield :flash_message
diff --git a/app/views/layouts/nav/_group_settings.html.haml b/app/views/layouts/nav/_group_settings.html.haml
index e391ec7f2b7..0b2673f1a82 100644
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
@@ -1,7 +1,7 @@
 - if current_user
   - if access = @group.users.find_by(id: current_user.id)
     .controls
-      %span.dropdown.group-settings-dropdown
+      .dropdown.group-settings-dropdown
         %a.dropdown-new.btn.btn-default#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
           = icon('cog')
           = icon('caret-down')

From 2148566b3dce96f36bbf86555ef0d68758044429 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 13 May 2016 11:21:31 -0500
Subject: [PATCH 0386/1431] Fix issue sidebar top position after header height
 change

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/header.scss | 4 ++--
 app/assets/stylesheets/pages/issuable.scss   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 8190a97ed58..0da96c4017d 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -6,12 +6,12 @@ header {
   transition-duration: .3s;
 
   &.navbar-empty {
-    height: 58px;
+    height: $header-height;
     background: #fff;
     border-bottom: 1px solid $btn-gray-hover;
 
     .center-logo {
-      margin: 11px 0;
+      margin: 8px 0;
       text-align: center;
 
       #tanuki-logo, img {
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 1cf3023ecc9..d06086a581b 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -125,7 +125,7 @@
 
 .right-sidebar {
   position: fixed;
-  top: 58px;
+  top: $header-height;
   bottom: 0;
   right: 0;
   z-index: 10;

From 9a7a0415535da7541095de363dee37b9f09fe702 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 13 May 2016 11:24:00 -0500
Subject: [PATCH 0387/1431] Fix login btn vertical align

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/common.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 3386523dbf7..f8aecd0558d 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -289,7 +289,7 @@ table {
   text-shadow: none;
 
   @media (min-width: $screen-sm-min) {
-    margin-top: 11px;
+    margin-top: 8px;
   }
 }
 

From 935c684ad3427069431a1130d364a4481af6cb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 13 May 2016 18:39:32 +0200
Subject: [PATCH 0388/1431] Revert "Merge branch
 'doc-fix-db-gem-install-instructions' into 'master'
"

This reverts commit 66d8ef1ad9d5952b7e7f026658f71aafc861950e, reversing
changes made to 6a8359f3d3be01af6f5b124b61af7ee1c77c17d0.

The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.

See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.
---
 doc/update/patch_versions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index b4283a526f3..60729316cde 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -57,10 +57,10 @@ sudo -u git -H make
 cd /home/git/gitlab
 
 # PostgreSQL
-sudo -u git -H bundle install --without development test mysql --with postgres --deployment
+sudo -u git -H bundle install --without development test mysql --deployment
 
 # MySQL
-sudo -u git -H bundle install --without development test postgres --with mysql --deployment
+sudo -u git -H bundle install --without development test postgres --deployment
 
 # Optional: clean up old gems
 sudo -u git -H bundle clean

From 9e318bd99deb90a93130cd4ef79e54f18555d4dc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 12:20:23 -0500
Subject: [PATCH 0389/1431] Fix container registry permissions

---
 app/models/ability.rb                              |  1 +
 .../container_registry_authentication_service.rb   |  6 +++++-
 app/services/projects/destroy_service.rb           |  2 +-
 ...ntainer_registry_authentication_service_spec.rb | 14 ++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 2465c1f424c..09dea54689e 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -61,6 +61,7 @@ class Ability
           :read_merge_request,
           :read_note,
           :read_commit_status,
+          :read_container_registry,
           :download_code
         ]
 
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
index 91bad347278..b60cd3c57e5 100644
--- a/app/services/jwt/container_registry_authentication_service.rb
+++ b/app/services/jwt/container_registry_authentication_service.rb
@@ -3,6 +3,8 @@ module JWT
     AUDIENCE = 'container_registry'
 
     def execute
+      return error('not found', 404) unless registry.enabled
+
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
       end
@@ -65,9 +67,11 @@ module JWT
     end
 
     def can_access?(requested_project, requested_action)
+      return false unless requested_project.container_registry_enabled?
+
       case requested_action
       when 'pull'
-        requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
+        requested_project == project || can?(current_user, :read_container_registry, requested_project)
       when 'push'
         requested_project == project || can?(current_user, :create_container_registry, requested_project)
       else
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 0ff2bc3cb81..d3920ac8baa 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -64,7 +64,7 @@ module Projects
     end
 
     def remove_registry_tags
-      return unless Gitlab.config.registry.enabled
+      return true unless Gitlab.config.registry.enabled
 
       project.container_registry_repository.delete_tags
     end
diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/jwt/container_registry_authentication_service_spec.rb
index 1873ea2639b..672a7579dd3 100644
--- a/spec/services/jwt/container_registry_authentication_service_spec.rb
+++ b/spec/services/jwt/container_registry_authentication_service_spec.rb
@@ -7,6 +7,7 @@ describe JWT::ContainerRegistryAuthenticationService, services: true do
   let(:rsa_key) { OpenSSL::PKey::RSA.generate(512) }
   let(:registry_settings) do
     {
+      enabled: true,
       issuer: 'rspec',
       key: nil
     }
@@ -146,7 +147,20 @@ describe JWT::ContainerRegistryAuthenticationService, services: true do
           it_behaves_like 'a forbidden'
         end
       end
+    end
 
+    context 'for project without container registry' do
+      let(:project) { create(:empty_project, :public, container_registry_enabled: false) }
+
+      before { project.update(container_registry_enabled: false) }
+
+      context 'disallow when pulling' do
+        let(:current_params) do
+          { scope: "repository:#{project.path_with_namespace}:pull" }
+        end
+
+        it_behaves_like 'a forbidden'
+      end
     end
   end
 

From c1bc5c58a2861af25f4f03e0a757dceae4b67cda Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 13:17:15 -0500
Subject: [PATCH 0390/1431] Added pipelines spec

---
 .../projects/ci/commits/_commit.html.haml     |   2 +-
 spec/features/pipelines_spec.rb               | 130 +++++++++++++++++-
 2 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index c6359c7c981..90ac41666d0 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -55,7 +55,7 @@
     .controls.hidden-xs.pull-right
       - artifacts = commit.builds.latest.select { |b| b.artifacts? }
       - if artifacts.present?
-        .dropdown.inline
+        .dropdown.inline.build-artifacts
           %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
             = icon('download')
             %b.caret
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 1e0c58be979..0e654c3e40f 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -5,21 +5,139 @@ describe "Pipelines" do
 
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
-  before { login_as(user) }
-
-  describe "GET /:project/pipelines" do
 
+  before do
+    login_as(user)
+    project.team << [user, :developer]
   end
 
-  describe "GET /:project/pipelines/:id" do
+  describe 'GET /:project/pipelines' do
+    let!(:pipeline) { create(:ci_commit, project: project, ref: 'master', status: 'running') }
+
+    [:all, :running, :branches].each do |scope|
+      context "displaying #{scope}" do
+        let(:project) { create(:project) }
+
+        before { visit namespace_project_pipelines_path(project.namespace, project, scope: scope) }
+
+        it { expect(page).to have_content(pipeline.short_sha) }
+      end
+    end
+
+    context 'cancelable pipeline' do
+      let!(:running) { create(:ci_build, :running, commit: pipeline, stage: 'test', commands: 'test') }
+
+      before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+      it { expect(page).to have_link('Cancel') }
+      it { expect(page).to have_selector('.ci-running') }
+
+      context 'when canceling' do
+        before { click_link('Cancel') }
+
+        it { expect(page).to_not have_link('Cancel') }
+        it { expect(page).to have_selector('.ci-canceled') }
+      end
+    end
+
+    context 'retryable pipelines' do
+      let!(:failed) { create(:ci_build, :failed, commit: pipeline, stage: 'test', commands: 'test') }
+
+      before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+      it { expect(page).to have_link('Retry') }
+      it { expect(page).to have_selector('.ci-failed') }
+
+      context 'when retrying' do
+        before { click_link('Retry') }
+
+        it { expect(page).to_not have_link('Retry') }
+        it { expect(page).to have_selector('.ci-running') }
+      end
+    end
+
+    context 'downloadable pipelines' do
+      before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+      context 'with artifacts' do
+        let!(:with_artifacts) { create(:ci_build, :success, :artifacts, commit: pipeline, name: 'rspec tests', stage: 'test') }
+
+        it { expect(page).to have_selector('.build-artifacts') }
+        it { expect(page).to have_link(with_artifacts.name) }
+      end
+
+      context 'without artifacts' do
+        let!(:without_artifacts) { create(:ci_build, :success, commit: pipeline, name: 'rspec', stage: 'test') }
+
+        it { expect(page).to_not have_selector('.build-artifacts') }
+      end
+    end
+  end
+
+  describe 'GET /:project/pipelines/:id' do
     let(:pipeline) { create(:ci_commit, project: project, ref: 'master') }
 
     before do
-      create(:ci_build, :success, commit: pipeline)
+      @success = create(:ci_build, :success, commit: pipeline, stage: 'build')
+      @failed = create(:ci_build, :failed, commit: pipeline, stage: 'test', commands: 'test')
+      @running = create(:ci_build, :running, commit: pipeline, stage: 'deploy')
+      @external = create(:generic_commit_status, :success, commit: pipeline, stage: 'external')
     end
 
     before { visit namespace_project_pipeline_path(project.namespace, project, pipeline) }
 
-    it { expect(page).to()}
+    it 'showing a list of builds' do
+      expect(page).to have_content('Tests')
+      expect(page).to have_content(@success.id)
+      expect(page).to have_content('Deploy')
+      expect(page).to have_content(@failed.id)
+      expect(page).to have_content(@running.id)
+      expect(page).to have_content(@external.id)
+      expect(page).to have_content('Retry failed')
+      expect(page).to have_content('Cancel running')
+    end
+
+    context 'retrying builds' do
+      it { expect(page).to_not have_content('retried') }
+
+      context 'when retrying' do
+        before { click_on 'Retry failed' }
+
+        it { expect(page).to_not have_content('Retry failed') }
+        it { expect(page).to have_content('retried') }
+      end
+    end
+
+    context 'canceling builds' do
+      it { expect(page).to_not have_selector('.ci-canceled') }
+
+      context 'when canceling' do
+        before { click_on 'Cancel running' }
+
+        it { expect(page).to_not have_content('Cancel running') }
+        it { expect(page).to have_selector('.ci-canceled') }
+      end
+    end
+  end
+
+  describe 'POST /:project/pipelines' do
+    let(:project) { create(:project) }
+
+    before { visit new_namespace_project_pipeline_path(project.namespace, project) }
+
+    context 'for valid commit' do
+      before { fill_in('Create for', with: 'master') }
+
+      it { expect{ click_on 'Create pipeline' }.to change{ Ci::Commit.count }.by(1) }
+    end
+
+    context 'for invalid commit' do
+      before do
+        fill_in('Create for', with: 'invalid reference')
+        click_on 'Create pipeline'
+      end
+
+      it { expect(page).to have_content('Reference not found') }
+    end
   end
 end

From e5c97101478829fe8200557afd02bde92c3eb4e4 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem@posteo.de>
Date: Tue, 3 May 2016 17:33:43 +0200
Subject: [PATCH 0391/1431] Use the relative url prefix for links in Wiki

---
 CHANGELOG                        | 3 +++
 app/models/project_wiki.rb       | 2 +-
 lib/gitlab/url_builder.rb        | 2 +-
 spec/models/project_wiki_spec.rb | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 30d4955c9f3..5ffe91ce4e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,9 @@ v 8.8.0 (unreleased)
   - Hide left sidebar on phone screens to give more space for content
   - Redesign navigation for profile and group pages
 
+v 8.7.6
+  - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
+
 v 8.7.5
   - Fix relative links in wiki pages. !4050
   - Fix always showing build notification message when switching between merge requests !4086
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 060ed9b44ec..339fb0b9f9d 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -40,7 +40,7 @@ class ProjectWiki
   end
 
   def wiki_base_path
-    ["/", @project.path_with_namespace, "/wikis"].join('')
+    [Gitlab.config.gitlab.relative_url_root, "/", @project.path_with_namespace, "/wikis"].join('')
   end
 
   # Returns the Gollum::Wiki object.
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index 2bbbd3074e8..fe65c246101 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -62,7 +62,7 @@ module Gitlab
     end
 
     def wiki_page_url
-      "#{Gitlab.config.gitlab.url}#{object.wiki.wiki_base_path}/#{object.slug}"
+      namespace_project_wiki_url(object.wiki.project.namespace, object.wiki.project, object.slug)
     end
   end
 end
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 532e3f013fd..91ebb612baa 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -38,7 +38,8 @@ describe ProjectWiki, models: true do
 
   describe "#wiki_base_path" do
     it "returns the wiki base path" do
-      wiki_base_path = "/#{project.path_with_namespace}/wikis"
+      wiki_base_path = "#{Gitlab.config.gitlab.relative_url_root}/#{project.path_with_namespace}/wikis"
+
       expect(subject.wiki_base_path).to eq(wiki_base_path)
     end
   end

From 9ef9e008feb99aaf0c4edc85bb76039eb46f0794 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 16:22:50 -0500
Subject: [PATCH 0392/1431] Move JWT to Gitlab::JWT

---
 app/controllers/jwt_controller.rb             |   2 +-
 ...ntainer_registry_authentication_service.rb | 118 +++++++++---------
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 599f62bd121..c203c50d1fb 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -3,7 +3,7 @@ class JwtController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   SERVICES = {
-    'container_registry' => JWT::ContainerRegistryAuthenticationService,
+    'container_registry' => ::Gitlab::JWT::ContainerRegistryAuthenticationService,
   }
 
   def auth
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
index 0ab3e6d02ba..dd0f2954784 100644
--- a/app/services/jwt/container_registry_authentication_service.rb
+++ b/app/services/jwt/container_registry_authentication_service.rb
@@ -1,69 +1,71 @@
-module JWT
-  class ContainerRegistryAuthenticationService < BaseService
-    def execute
-      if params[:offline_token]
-        return error('forbidden', 403) unless current_user
+module Gitlab
+  module JWT
+    class ContainerRegistryAuthenticationService < BaseService
+      def execute
+        if params[:offline_token]
+          return error('forbidden', 403) unless current_user
+        end
+
+        return error('forbidden', 401) if scopes.blank?
+
+        { token: authorized_token(scopes).encoded }
       end
 
-      return error('forbidden', 401) if scopes.blank?
+      private
 
-      { token: authorized_token(scopes).encoded }
-    end
-
-    private
-
-    def authorized_token(access)
-      token = ::JWT::RSAToken.new(registry.key)
-      token.issuer = registry.issuer
-      token.audience = params[:service]
-      token.subject = current_user.try(:username)
-      token[:access] = access
-      token
-    end
-
-    def scopes
-      return unless params[:scope]
-
-      @scopes ||= begin
-        scope = process_scope(params[:scope])
-        [scope].compact
-      end
-    end
-
-    def process_scope(scope)
-      type, name, actions = scope.split(':', 3)
-      actions = actions.split(',')
-
-      case type
-      when 'repository'
-        process_repository_access(type, name, actions)
-      end
-    end
-
-    def process_repository_access(type, name, actions)
-      requested_project = Project.find_with_namespace(name)
-      return unless requested_project
-
-      actions = actions.select do |action|
-        can_access?(requested_project, action)
+      def authorized_token(access)
+        token = ::JWT::RSAToken.new(registry.key)
+        token.issuer = registry.issuer
+        token.audience = params[:service]
+        token.subject = current_user.try(:username)
+        token[:access] = access
+        token
       end
 
-      { type: type, name: name, actions: actions } if actions.present?
-    end
+      def scopes
+        return unless params[:scope]
 
-    def can_access?(requested_project, requested_action)
-      case requested_action
-      when 'pull'
-        requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
-      when 'push'
-        requested_project == project || can?(current_user, :create_container_registry, requested_project)
-      else
-        false
+        @scopes ||= begin
+          scope = process_scope(params[:scope])
+          [scope].compact
+        end
       end
-    end
 
-    def registry
-      Gitlab.config.registry
+      def process_scope(scope)
+        type, name, actions = scope.split(':', 3)
+        actions = actions.split(',')
+
+        case type
+        when 'repository'
+          process_repository_access(type, name, actions)
+        end
+      end
+
+      def process_repository_access(type, name, actions)
+        requested_project = Project.find_with_namespace(name)
+        return unless requested_project
+
+        actions = actions.select do |action|
+          can_access?(requested_project, action)
+        end
+
+        { type: type, name: name, actions: actions } if actions.present?
+      end
+
+      def can_access?(requested_project, requested_action)
+        case requested_action
+        when 'pull'
+          requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
+        when 'push'
+          requested_project == project || can?(current_user, :create_container_registry, requested_project)
+        else
+          false
+        end
+      end
+
+      def registry
+        Gitlab.config.registry
+      end
     end
   end
 end

From e900ff972a4a6133a499adcc1263d3634863f410 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 16:23:02 -0500
Subject: [PATCH 0393/1431] Improve JwtController code

---
 app/controllers/jwt_controller.rb | 37 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index c203c50d1fb..e067f59808a 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -1,22 +1,13 @@
 class JwtController < ApplicationController
   skip_before_action :authenticate_user!
   skip_before_action :verify_authenticity_token
+  before_action :authenticate_project_or_user
 
   SERVICES = {
     'container_registry' => ::Gitlab::JWT::ContainerRegistryAuthenticationService,
   }
 
   def auth
-    @authenticated = authenticate_with_http_basic do |login, password|
-      # if it's possible we first try to authenticate project with login and password
-      @project = authenticate_project(login, password)
-      @user = authenticate_user(login, password) unless @project
-    end
-
-    unless @authenticated
-      head :forbidden if ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
-    end
-
     service = SERVICES[params[:service]]
     head :not_found unless service
 
@@ -28,19 +19,28 @@ class JwtController < ApplicationController
 
   private
 
+  def authenticate_project_or_user
+    authenticate_with_http_basic do |login, password|
+      # if it's possible we first try to authenticate project with login and password
+      @project = authenticate_project(login, password)
+      return if @project
+
+      @user = authenticate_user(login, password)
+      return if @user
+    end
+
+    if ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
+      head :forbidden
+    end
+  end
+
   def auth_params
     params.permit(:service, :scope, :offline_token, :account, :client_id)
   end
 
   def authenticate_project(login, password)
-    matched_login = /(?<s>^[a-zA-Z]*-ci)-token$/.match(login)
-
-    if matched_login.present?
-      underscored_service = matched_login['s'].underscore
-
-      if underscored_service == 'gitlab_ci'
-        Project.find_by(builds_enabled: true, runners_token: password)
-      end
+    if login == 'gitlab_ci_token'
+      Project.find_by(builds_enabled: true, runners_token: password)
     end
   end
 
@@ -77,6 +77,7 @@ class JwtController < ApplicationController
         if banned
           Rails.logger.info "IP #{request.ip} failed to login " \
               "as #{login} but has been temporarily banned from Git auth"
+          return
         end
       end
     end

From 9eb4569ed9330d65fb24e0272402fe5ac739b8be Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 13 May 2016 16:17:01 -0500
Subject: [PATCH 0394/1431] Change all occurrences of doc.gitlab.com to
 docs.gitlab.com

[ci skip]
---
 doc/administration/environment_variables.md               | 2 +-
 doc/administration/high_availability/load_balancer.md     | 2 +-
 doc/administration/high_availability/nfs.md               | 2 +-
 doc/api/services.md                                       | 2 +-
 doc/development/doc_styleguide.md                         | 4 ++--
 doc/gitlab-basics/create-issue.md                         | 2 +-
 doc/gitlab-basics/create-project.md                       | 2 +-
 doc/hooks/custom_hooks.md                                 | 2 +-
 doc/install/installation.md                               | 2 +-
 doc/install/relative_url.md                               | 2 +-
 doc/integration/README.md                                 | 2 +-
 doc/intro/README.md                                       | 2 +-
 doc/logs/logs.md                                          | 2 +-
 doc/raketasks/README.md                                   | 2 +-
 doc/update/README.md                                      | 6 +++---
 doc/workflow/gitlab_flow.md                               | 4 ++--
 doc/workflow/groups.md                                    | 2 +-
 doc/workflow/importing/import_projects_from_github.md     | 2 +-
 doc/workflow/importing/import_projects_from_gitlab_com.md | 2 +-
 doc/workflow/lfs/manage_large_binaries_with_git_lfs.md    | 2 +-
 20 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md
index 43ab153d76d..7f53915a4d7 100644
--- a/doc/administration/environment_variables.md
+++ b/doc/administration/environment_variables.md
@@ -58,4 +58,4 @@ to the naming scheme `GITLAB_#{name in 1_settings.rb in upper case}`.
 
 It's possible to preconfigure the GitLab docker image by adding the environment
 variable `GITLAB_OMNIBUS_CONFIG` to the `docker run` command.
-For more information see the ['preconfigure-docker-container' section in the Omnibus documentation](http://doc.gitlab.com/omnibus/docker/#preconfigure-docker-container).
+For more information see the ['preconfigure-docker-container' section in the Omnibus documentation](http://docs.gitlab.com/omnibus/docker/#preconfigure-docker-container).
diff --git a/doc/administration/high_availability/load_balancer.md b/doc/administration/high_availability/load_balancer.md
index b1fe34ed9a1..136f570ac27 100644
--- a/doc/administration/high_availability/load_balancer.md
+++ b/doc/administration/high_availability/load_balancer.md
@@ -60,4 +60,4 @@ Read more on high-availability configuration:
       configure custom domains with custom SSL, which would not be possible
       if SSL was terminated at the load balancer.
 
-[gitlab-pages]: http://doc.gitlab.com/ee/pages/administration.html
+[gitlab-pages]: http://docs.gitlab.com/ee/pages/administration.html
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index e4e124e200a..49ff5d536a1 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -113,4 +113,4 @@ Read more on high-availability configuration:
 1. [Configure the GitLab application servers](gitlab.md)
 1. [Configure the load balancers](load_balancer.md)
 
-[udp-log-shipping]: http://doc.gitlab.com/omnibus/settings/logs.html#udp-log-shipping-gitlab-enterprise-edition-only "UDP log shipping"
+[udp-log-shipping]: http://docs.gitlab.com/omnibus/settings/logs.html#udp-log-shipping-gitlab-enterprise-edition-only "UDP log shipping"
diff --git a/doc/api/services.md b/doc/api/services.md
index 7d45b2cf463..83ac7845156 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -491,7 +491,7 @@ Jira issue tracker
 
 Set JIRA service for a project.
 
-> Setting `project_url`, `issues_url` and `new_issue_url` will allow a user to easily navigate to the Jira issue tracker. See the [integration doc](http://doc.gitlab.com/ce/integration/external-issue-tracker.html) for details.  Support for referencing commits and automatic closing of Jira issues directly from GitLab is [available in GitLab EE.](http://doc.gitlab.com/ee/integration/jira.html)
+> Setting `project_url`, `issues_url` and `new_issue_url` will allow a user to easily navigate to the Jira issue tracker. See the [integration doc](http://docs.gitlab.com/ce/integration/external-issue-tracker.html) for details.  Support for referencing commits and automatic closing of Jira issues directly from GitLab is [available in GitLab EE.](http://docs.gitlab.com/ee/integration/jira.html)
 
 ```
 PUT /projects/:id/services/jira
diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md
index 187ec9e7b75..8292b393757 100644
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
@@ -127,7 +127,7 @@ Inside the document:
     ```
   If the document you are editing resides in a place other than the GitLab CE/EE
   `doc/` directory, instead of the relative link, use the full path:
-  `http://doc.gitlab.com/ce/administration/restart_gitlab.html`.
+  `http://docs.gitlab.com/ce/administration/restart_gitlab.html`.
   Replace `reconfigure` with `restart` where appropriate.
 
 ## Installation guide
@@ -266,5 +266,5 @@ curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -d "restricted_signup_domai
 
 [cURL]: http://curl.haxx.se/ "cURL website"
 [single spaces]: http://www.slate.com/articles/technology/technology/2011/01/space_invaders.html
-[gfm]: http://doc.gitlab.com/ce/markdown/markdown.html#newlines "GitLab flavored markdown documentation"
+[gfm]: http://docs.gitlab.com/ce/markdown/markdown.html#newlines "GitLab flavored markdown documentation"
 [doc-restart]: ../administration/restart_gitlab.md "GitLab restart documentation"
diff --git a/doc/gitlab-basics/create-issue.md b/doc/gitlab-basics/create-issue.md
index 87f078def04..5221d85b661 100644
--- a/doc/gitlab-basics/create-issue.md
+++ b/doc/gitlab-basics/create-issue.md
@@ -24,4 +24,4 @@ You may assign the Issue to a user, add a milestone and add labels (they are all
 
 ![Submit new issue](basicsimages/submit_new_issue.png)
 
-Your Issue will now be added to the Issue Tracker and will be ready to be reviewed. You can comment on it and mention the people involved. You can also link Issues to the Merge Requests where the Issues are solved. To do this, you can use an [Issue closing pattern](http://doc.gitlab.com/ce/customization/issue_closing.html).
+Your Issue will now be added to the Issue Tracker and will be ready to be reviewed. You can comment on it and mention the people involved. You can also link Issues to the Merge Requests where the Issues are solved. To do this, you can use an [Issue closing pattern](http://docs.gitlab.com/ce/customization/issue_closing.html).
diff --git a/doc/gitlab-basics/create-project.md b/doc/gitlab-basics/create-project.md
index b545d62549d..f737dffc024 100644
--- a/doc/gitlab-basics/create-project.md
+++ b/doc/gitlab-basics/create-project.md
@@ -14,7 +14,7 @@ Fill out the required information:
 
 1. Select a [visibility level](https://gitlab.com/help/public_access/public_access)
 
-1. You can also [import your existing projects](http://doc.gitlab.com/ce/workflow/importing/README.html)
+1. You can also [import your existing projects](http://docs.gitlab.com/ce/workflow/importing/README.html)
 
 1. Click on "create project"
 
diff --git a/doc/hooks/custom_hooks.md b/doc/hooks/custom_hooks.md
index dcdf49d3379..820934f97f1 100644
--- a/doc/hooks/custom_hooks.md
+++ b/doc/hooks/custom_hooks.md
@@ -2,7 +2,7 @@
 
 **Note: Custom git hooks must be configured on the filesystem of the GitLab
 server. Only GitLab server administrators will be able to complete these tasks.
-Please explore [webhooks](../web_hooks/web_hooks.md) as an option if you do not have filesystem access. For a user configurable Git Hooks interface, please see [GitLab Enterprise Edition Git Hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html).**
+Please explore [webhooks](../web_hooks/web_hooks.md) as an option if you do not have filesystem access. For a user configurable Git Hooks interface, please see [GitLab Enterprise Edition Git Hooks](http://docs.gitlab.com/ee/git_hooks/git_hooks.html).**
 
 Git natively supports hooks that are executed on different actions.
 Examples of server-side git hooks include pre-receive, post-receive, and update.
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 44ae0be406c..fa11eb9ba6a 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -6,7 +6,7 @@ Since an installation from source is a lot of work and error prone we strongly r
 
 One reason the Omnibus package is more reliable is its use of Runit to restart any of the GitLab processes in case one crashes.
 On heavily used GitLab instances the memory usage of the Sidekiq background worker will grow over time.
-Omnibus packages solve this by [letting the Sidekiq terminate gracefully](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) if it uses too much memory.
+Omnibus packages solve this by [letting the Sidekiq terminate gracefully](http://docs.gitlab.com/ce/operations/sidekiq_memory_killer.html) if it uses too much memory.
 After this termination Runit will detect Sidekiq is not running and will start it.
 Since installations from source don't have Runit, Sidekiq can't be terminated and its memory usage will grow over time.
 
diff --git a/doc/install/relative_url.md b/doc/install/relative_url.md
index 0245febfcd8..44d2a14f366 100644
--- a/doc/install/relative_url.md
+++ b/doc/install/relative_url.md
@@ -132,5 +132,5 @@ To disable the relative URL:
 1.  Follow the same as above starting from 2. and set up the
     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"
+[omnibus-rel]: http://docs.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"
diff --git a/doc/integration/README.md b/doc/integration/README.md
index 6fe04aa2a06..fd330dd7a7d 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -19,7 +19,7 @@ See the documentation below for details on how to configure these services.
 
 GitLab Enterprise Edition contains [advanced Jenkins support][jenkins].
 
-[jenkins]: http://doc.gitlab.com/ee/integration/jenkins.html
+[jenkins]: http://docs.gitlab.com/ee/integration/jenkins.html
 
 
 ## Project services
diff --git a/doc/intro/README.md b/doc/intro/README.md
index ab298d3808e..382d10aaf40 100644
--- a/doc/intro/README.md
+++ b/doc/intro/README.md
@@ -39,4 +39,4 @@ Install and update your GitLab installation.
 
 - [Install GitLab](https://about.gitlab.com/installation/)
 - [Update GitLab](https://about.gitlab.com/update/)
-- [Explore Omnibus GitLab configuration options](http://doc.gitlab.com/omnibus/settings/configuration.html)
+- [Explore Omnibus GitLab configuration options](http://docs.gitlab.com/omnibus/settings/configuration.html)
diff --git a/doc/logs/logs.md b/doc/logs/logs.md
index 27937e51764..ef5affa2ebd 100644
--- a/doc/logs/logs.md
+++ b/doc/logs/logs.md
@@ -1,6 +1,6 @@
 ## Log system
 GitLab has advanced log system so everything is logging and you can analize your instance using various system log files.
-In addition to system log files, GitLab Enterprise Edition comes with Audit Events. Find more about them [in Audit Events documentation](http://doc.gitlab.com/ee/administration/audit_events.html)
+In addition to system log files, GitLab Enterprise Edition comes with Audit Events. Find more about them [in Audit Events documentation](http://docs.gitlab.com/ee/administration/audit_events.html)
 
 System log files are typically plain text in a standard log file format. This guide talks about how to read and use these system log files.
 
diff --git a/doc/raketasks/README.md b/doc/raketasks/README.md
index 6be954ad68b..a49c43b8ef2 100644
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
@@ -8,4 +8,4 @@
 - [User management](user_management.md)
 - [Webhooks](web_hooks.md)
 - [Import](import.md) of git repositories in bulk
-- [Rebuild authorized_keys file](http://doc.gitlab.com/ce/raketasks/maintenance.html#rebuild-authorized_keys-file) task for administrators
+- [Rebuild authorized_keys file](http://docs.gitlab.com/ce/raketasks/maintenance.html#rebuild-authorized_keys-file) task for administrators
diff --git a/doc/update/README.md b/doc/update/README.md
index a770633c9b8..975d72164b4 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -29,7 +29,7 @@ Based on your installation, choose a section below that fits your needs.
 
 ## Omnibus Packages
 
-- The [Omnibus update guide](http://doc.gitlab.com/omnibus/update/README.html)
+- The [Omnibus update guide](http://docs.gitlab.com/omnibus/update/README.html)
   contains the steps needed to update an Omnibus GitLab package.
 
 ## Installation from source
@@ -86,10 +86,10 @@ possible.
   information about configuring GitLab to work with a MySQL database.
 - [Restoring from backup after a failed upgrade](restore_after_failure.md)
 
-[omnidocker]: http://doc.gitlab.com/omnibus/docker/README.html
+[omnidocker]: http://docs.gitlab.com/omnibus/docker/README.html
 [source-ee]: https://gitlab.com/gitlab-org/gitlab-ee/tree/master/doc/update
 [source-ce]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update
 [ee-ce]: ../downgrade_ee_to_ce/README.md
 [ce]: https://about.gitlab.com/features/#community
 [ee]: https://about.gitlab.com/features/#enterprise
-[omni-ce-ee]: http://doc.gitlab.com/omnibus/update/README.html#from-community-edition-to-enterprise-edition
+[omni-ce-ee]: http://docs.gitlab.com/omnibus/update/README.html#from-community-edition-to-enterprise-edition
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md
index 1b354bcc0f1..2b2f140f8bf 100644
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
@@ -131,7 +131,7 @@ When you feel comfortable with it to be merged you assign it to the person that
 There is room for more feedback and after the assigned person feels comfortable with the result the branch is merged.
 If the assigned person does not feel comfortable they can close the merge request without merging.
 
-In GitLab it is common to protect the long-lived branches (e.g. the master branch) so that normal developers [can't modify these protected branches](http://doc.gitlab.com/ce/permissions/permissions.html).
+In GitLab it is common to protect the long-lived branches (e.g. the master branch) so that normal developers [can't modify these protected branches](http://docs.gitlab.com/ce/permissions/permissions.html).
 So if you want to merge it into a protected branch you assign it to someone with master authorizations.
 
 ## Issues with GitLab flow
@@ -187,7 +187,7 @@ 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.
+In GitLab EE and .com you can also [rebase before merge](http://docs.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.
diff --git a/doc/workflow/groups.md b/doc/workflow/groups.md
index 52bf611dc5e..34ada1774d8 100644
--- a/doc/workflow/groups.md
+++ b/doc/workflow/groups.md
@@ -54,7 +54,7 @@ If necessary, you can increase the access level of an individual user for a spec
 ## Managing group memberships via LDAP
 
 In GitLab Enterprise Edition it is possible to manage GitLab group memberships using LDAP groups.
-See [the GitLab Enterprise Edition documentation](http://doc.gitlab.com/ee/integration/ldap.html) for more information.
+See [the GitLab Enterprise Edition documentation](http://docs.gitlab.com/ee/integration/ldap.html) for more information.
 
 ## Allowing only admins to create groups
 
diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md
index e670e415c71..a7dfac2c120 100644
--- a/doc/workflow/importing/import_projects_from_github.md
+++ b/doc/workflow/importing/import_projects_from_github.md
@@ -44,5 +44,5 @@ case the namespace is taken, the project will be imported on the user's
 namespace.
 
 [gh-import]: ../../integration/github.md "GitHub integration"
-[ee-gh]: http://doc.gitlab.com/ee/integration/github.html "GitHub integration for GitLab EE"
+[ee-gh]: http://docs.gitlab.com/ee/integration/github.html "GitHub integration for GitLab EE"
 [new-project]: ../../gitlab-basics/create-project.md "How to create a new project in GitLab"
diff --git a/doc/workflow/importing/import_projects_from_gitlab_com.md b/doc/workflow/importing/import_projects_from_gitlab_com.md
index 1117db98e7e..dcc00074b75 100644
--- a/doc/workflow/importing/import_projects_from_gitlab_com.md
+++ b/doc/workflow/importing/import_projects_from_gitlab_com.md
@@ -2,7 +2,7 @@
 
 You can import your existing GitLab.com projects to your GitLab instance. But keep in mind that it is possible only if
 GitLab support is enabled on your GitLab instance. 
-You can read more about GitLab support [here](http://doc.gitlab.com/ce/integration/gitlab.html)
+You can read more about GitLab support [here](http://docs.gitlab.com/ce/integration/gitlab.html)
 To get to the importer page you need to go to "New project" page.
 
 ![New project page](gitlab_importer/new_project_page.png)
diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index 83db44c10b1..1295dfbd770 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -4,7 +4,7 @@ Managing large files such as audio, video and graphics files has always been one
 of the shortcomings of Git. The general recommendation is to not have Git repositories
 larger than 1GB to preserve performance.
 
-GitLab already supports [managing large files with git annex](http://doc.gitlab.com/ee/workflow/git_annex.html)
+GitLab already supports [managing large files with git annex](http://docs.gitlab.com/ee/workflow/git_annex.html)
 (EE only), however in certain environments it is not always convenient to use
 different commands to differentiate between the large files and regular ones.
 

From 509654b3784da2a084a0c8303e9c6cc1498b8d2b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 16:41:30 -0500
Subject: [PATCH 0395/1431] Improve JWT::RSAToken::kid

---
 lib/jwt/rsa_token.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/jwt/rsa_token.rb b/lib/jwt/rsa_token.rb
index 0438135ad54..4de89bf0d37 100644
--- a/lib/jwt/rsa_token.rb
+++ b/lib/jwt/rsa_token.rb
@@ -24,11 +24,13 @@ module JWT
       @key ||= OpenSSL::PKey::RSA.new(key_data)
     end
 
+    def public_key
+      key.public_key
+    end
+
     def kid
-      sha256 = Digest::SHA256.new
-      sha256.update(key.public_key.to_der)
-      payload = StringIO.new(sha256.digest).read(30)
-      Base32.encode(payload).split('').each_slice(4).each_with_object([]) do |slice, mem|
+      fingerprint = Digest::SHA256.digest(public_key.to_der)
+      Base32.encode(fingerprint).split('').each_slice(4).each_with_object([]) do |slice, mem|
         mem << slice.join
       end.join(':')
     end

From 8532dc0d774d43e2e23ab169d5af0c2ab12c139c Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 21 Apr 2016 17:16:22 -0300
Subject: [PATCH 0396/1431] Import pull requests from GitHub where the source
 branch was removed

---
 lib/gitlab/github_import/importer.rb          | 44 ++++++++++++-------
 .../github_import/pull_request_formatter.rb   | 26 +++++++----
 2 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 0f9e3ee14ee..a3f27891784 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -3,12 +3,15 @@ module Gitlab
     class Importer
       include Gitlab::ShellAdapter
 
-      attr_reader :project, :client
+      attr_reader :client, :project, :repo, :repo_url
 
       def initialize(project)
         @project = project
-        if import_data_credentials
-          @client = Client.new(import_data_credentials[:user])
+        @repo = project.import_source
+        @repo_url = project.import_url
+
+        if credentials
+          @client = Client.new(credentials[:user])
           @formatter = Gitlab::ImportFormatter.new
         else
           raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}"
@@ -22,8 +25,8 @@ module Gitlab
 
       private
 
-      def import_data_credentials
-        @import_data_credentials ||= project.import_data.credentials if project.import_data
+      def credentials
+        @credentials ||= project.import_data.credentials if project.import_data
       end
 
       def import_labels
@@ -68,22 +71,31 @@ module Gitlab
       end
 
       def import_pull_requests
-        client.pull_requests(project.import_source, state: :all,
-                                                    sort: :created,
-                                                    direction: :asc).each do |raw_data|
-          pull_request = PullRequestFormatter.new(project, raw_data)
+        pull_requests = client.pull_requests(repo, state: :all, sort: :created, direction: :asc)
+                              .map { |raw| PullRequestFormatter.new(project, raw) }
+                              .reject(&:cross_project?)
 
-          if pull_request.valid?
-            merge_request = MergeRequest.new(pull_request.attributes)
+        source_branches_removed = pull_requests.reject(&:source_branch_exists?)
+        source_branches_removed.each do |pull_request|
+          client.create_ref(repo, "refs/heads/#{pull_request.source_branch}", pull_request.source_sha)
+        end
 
-            if merge_request.save
-              apply_labels(pull_request.number, merge_request)
-              import_comments(pull_request.number, merge_request)
-              import_comments_on_diff(pull_request.number, merge_request)
-            end
+        project.repository.fetch_ref(repo_url, '+refs/heads/*', 'refs/heads/*')
+
+        pull_requests.each do |pull_request|
+          merge_request = MergeRequest.new(pull_request.attributes)
+
+          if merge_request.save
+            apply_labels(pull_request.number, merge_request)
+            import_comments(pull_request.number, merge_request)
+            import_comments_on_diff(pull_request.number, merge_request)
           end
         end
 
+        source_branches_removed.each do |pull_request|
+          client.delete_ref(repo, "heads/#{pull_request.source_branch}")
+        end
+
         true
       rescue ActiveRecord::RecordInvalid => e
         raise Projects::ImportService::Error, e.message
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index d21b942ad4b..be970f724c6 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -7,7 +7,7 @@ module Gitlab
           title: raw_data.title,
           description: description,
           source_project: source_project,
-          source_branch: source_branch.name,
+          source_branch: source_branch,
           target_project: target_project,
           target_branch: target_branch.name,
           state: state,
@@ -27,6 +27,22 @@ module Gitlab
         !cross_project? && source_branch.present? && target_branch.present?
       end
 
+      def cross_project?
+        source_repo.present? && target_repo.present? && source_repo.id != target_repo.id
+      end
+
+      def source_branch_exists?
+        source_project.repository.branch_names.include?(source_branch)
+      end
+
+      def source_branch
+        raw_data.head.ref
+      end
+
+      def source_sha
+        raw_data.head.sha
+      end
+
       private
 
       def assigned?
@@ -51,10 +67,6 @@ module Gitlab
         raw_data.body || ""
       end
 
-      def cross_project?
-        source_repo.present? && target_repo.present? && source_repo.id != target_repo.id
-      end
-
       def description
         formatter.author_line(author) + body
       end
@@ -73,10 +85,6 @@ module Gitlab
         raw_data.head.repo
       end
 
-      def source_branch
-        source_project.repository.find_branch(raw_data.head.ref)
-      end
-
       def target_project
         project
       end

From 9b4dc552cb51faee38baffa6f29954d795282658 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 22 Apr 2016 15:25:04 -0300
Subject: [PATCH 0397/1431] Import pull requests from GitHub where the target
 branch was removed

---
 lib/gitlab/github_import/importer.rb          | 25 +++++++++++++------
 .../github_import/pull_request_formatter.rb   | 18 +++++++++----
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index a3f27891784..bc25fc8c0b4 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -75,10 +75,11 @@ module Gitlab
                               .map { |raw| PullRequestFormatter.new(project, raw) }
                               .reject(&:cross_project?)
 
-        source_branches_removed = pull_requests.reject(&:source_branch_exists?)
-        source_branches_removed.each do |pull_request|
-          client.create_ref(repo, "refs/heads/#{pull_request.source_branch}", pull_request.source_sha)
-        end
+        source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch, pr.source_sha] }
+        target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch, pr.target_sha] }
+        branches_removed = source_branches_removed | target_branches_removed
+
+        create_refs(branches_removed)
 
         project.repository.fetch_ref(repo_url, '+refs/heads/*', 'refs/heads/*')
 
@@ -92,15 +93,25 @@ module Gitlab
           end
         end
 
-        source_branches_removed.each do |pull_request|
-          client.delete_ref(repo, "heads/#{pull_request.source_branch}")
-        end
+        delete_refs(branches_removed)
 
         true
       rescue ActiveRecord::RecordInvalid => e
         raise Projects::ImportService::Error, e.message
       end
 
+      def create_refs(branches)
+        branches.each do |branch|
+          client.create_ref(repo, "refs/heads/#{branch.first}", branch.last)
+        end
+      end
+
+      def delete_refs(branches)
+        branches.each do |branch|
+          client.delete_ref(repo, "heads/#{branch.first}")
+        end
+      end
+
       def apply_labels(number, issuable)
         issue = client.issue(project.import_source, number)
 
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index be970f724c6..ef32a23b045 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -9,7 +9,7 @@ module Gitlab
           source_project: source_project,
           source_branch: source_branch,
           target_project: target_project,
-          target_branch: target_branch.name,
+          target_branch: target_branch,
           state: state,
           milestone: milestone,
           author_id: author_id,
@@ -43,6 +43,18 @@ module Gitlab
         raw_data.head.sha
       end
 
+      def target_branch_exists?
+        target_project.repository.branch_names.include?(target_branch)
+      end
+
+      def target_branch
+        raw_data.base.ref
+      end
+
+      def target_sha
+        raw_data.base.sha
+      end
+
       private
 
       def assigned?
@@ -93,10 +105,6 @@ module Gitlab
         raw_data.base.repo
       end
 
-      def target_branch
-        target_project.repository.find_branch(raw_data.base.ref)
-      end
-
       def state
         @state ||= case true
                    when raw_data.state == 'closed' && raw_data.merged_at.present?

From 3b50867550818413eed01fcbe85e5442707150be Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 26 Apr 2016 12:03:48 -0300
Subject: [PATCH 0398/1431] Fix spec for
 Gitlab::GithubImport::PullRequestFormatter

---
 lib/gitlab/github_import/importer.rb          |   2 +-
 .../github_import/pull_request_formatter.rb   |  10 +-
 .../pull_request_formatter_spec.rb            | 104 +++++++++++++-----
 3 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index bc25fc8c0b4..9aea947a812 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -73,7 +73,7 @@ module Gitlab
       def import_pull_requests
         pull_requests = client.pull_requests(repo, state: :all, sort: :created, direction: :asc)
                               .map { |raw| PullRequestFormatter.new(project, raw) }
-                              .reject(&:cross_project?)
+                              .select(&:valid?)
 
         source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch, pr.source_sha] }
         target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch, pr.target_sha] }
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index ef32a23b045..f242596bdf5 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -24,11 +24,7 @@ module Gitlab
       end
 
       def valid?
-        !cross_project? && source_branch.present? && target_branch.present?
-      end
-
-      def cross_project?
-        source_repo.present? && target_repo.present? && source_repo.id != target_repo.id
+        !cross_project?
       end
 
       def source_branch_exists?
@@ -79,6 +75,10 @@ module Gitlab
         raw_data.body || ""
       end
 
+      def cross_project?
+        source_repo.present? && target_repo.present? && source_repo.id != target_repo.id
+      end
+
       def description
         formatter.author_line(author) + body
       end
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index e59c0ca110e..b1f3d17373b 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -4,9 +4,9 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
   let(:project) { create(:project) }
   let(:repository) { double(id: 1, fork: false) }
   let(:source_repo) { repository }
-  let(:source_branch) { double(ref: 'feature', repo: source_repo) }
+  let(:source_branch) { double(ref: 'feature', repo: source_repo, sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b') }
   let(:target_repo) { repository }
-  let(:target_branch) { double(ref: 'master', repo: target_repo) }
+  let(:target_branch) { double(ref: 'master', repo: target_repo, sha: '8ffb3c15a5475e59ae909384297fede4badcb4c7') }
   let(:octocat) { double(id: 123456, login: 'octocat') }
   let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
   let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
@@ -137,11 +137,11 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
       let(:milestone) { double(number: 45) }
       let(:raw_data) { double(base_data.merge(milestone: milestone)) }
 
-      it 'returns nil when milestone does not exists' do
+      it 'returns nil when milestone does not exist' do
         expect(pull_request.attributes.fetch(:milestone)).to be_nil
       end
 
-      it 'returns milestone when is exists' do
+      it 'returns milestone when it exists' do
         milestone = create(:milestone, project: project, iid: 45)
 
         expect(pull_request.attributes.fetch(:milestone)).to eq milestone
@@ -157,32 +157,80 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
   end
 
+  describe '#source_branch' do
+    let(:raw_data) { double(base_data) }
+
+    it 'returns head ref' do
+      expect(pull_request.source_branch).to eq 'feature'
+    end
+  end
+
+  describe '#source_sha' do
+    let(:raw_data) { double(base_data) }
+
+    it 'returns head sha' do
+      expect(pull_request.source_sha).to eq '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
+    end
+  end
+
+  describe '#source_branch_exists?' do
+    context 'when source branch exists' do
+      let(:raw_data) { double(base_data) }
+
+      it 'returns true' do
+        expect(pull_request.source_branch_exists?).to eq true
+      end
+    end
+
+    context 'when source branch does not exist' do
+      let(:raw_data) { double(base_data.merge(head: double(ref: 'removed-branch').as_null_object)) }
+
+      it 'returns false' do
+        expect(pull_request.source_branch_exists?).to eq false
+      end
+    end
+  end
+
+  describe '#target_branch' do
+    let(:raw_data) { double(base_data) }
+
+    it 'returns base ref' do
+      expect(pull_request.target_branch).to eq 'master'
+    end
+  end
+
+  describe '#target_sha' do
+    let(:raw_data) { double(base_data) }
+
+    it 'returns base sha' do
+      expect(pull_request.target_sha).to eq '8ffb3c15a5475e59ae909384297fede4badcb4c7'
+    end
+  end
+
+  describe '#target_branch_exists?' do
+    context 'when target branch exists' do
+      let(:raw_data) { double(base_data) }
+
+      it 'returns true' do
+        expect(pull_request.target_branch_exists?).to eq true
+      end
+    end
+
+    context 'when target branch does not exist' do
+      let(:raw_data) { double(base_data.merge(base: double(ref: 'removed-branch').as_null_object)) }
+
+      it 'returns false' do
+        expect(pull_request.target_branch_exists?).to eq false
+      end
+    end
+  end
+
   describe '#valid?' do
-    let(:invalid_branch) { double(ref: 'invalid-branch').as_null_object }
+    context 'when source, and target repos are not a fork' do
+      let(:raw_data) { double(base_data) }
 
-    context 'when source, and target repositories are the same' do
-      context 'and source and target branches exists' do
-        let(:raw_data) { double(base_data.merge(head: source_branch, base: target_branch)) }
-
-        it 'returns true' do
-          expect(pull_request.valid?).to eq true
-        end
-      end
-
-      context 'and source branch doesn not exists' do
-        let(:raw_data) { double(base_data.merge(head: invalid_branch, base: target_branch)) }
-
-        it 'returns false' do
-          expect(pull_request.valid?).to eq false
-        end
-      end
-
-      context 'and target branch doesn not exists' do
-        let(:raw_data) { double(base_data.merge(head: source_branch, base: invalid_branch)) }
-
-        it 'returns false' do
-          expect(pull_request.valid?).to eq false
-        end
+      it 'returns true' do
+        expect(pull_request.valid?).to eq true
       end
     end
 

From 6d19e13df62376916e024ff44939bf2a8f5b671b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 13 May 2016 17:11:57 -0500
Subject: [PATCH 0399/1431] Fix specs

---
 app/models/commit_status.rb                   | 11 +++-------
 app/models/project.rb                         |  2 +-
 .../projects/ci/commits/_commit.html.haml     |  3 +--
 spec/features/pipelines_spec.rb               | 21 +++++++++++--------
 spec/models/commit_status_spec.rb             | 12 -----------
 5 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 2d09edf3ca1..c7451ea0a86 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -92,16 +92,11 @@ class CommitStatus < ActiveRecord::Base
 
   def self.stages
     # We group by stage name, but order stages by theirs' index
-    unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').pluck('sg.stage')
+    unscoped.where(id: all).group('stage').order('max(stage_idx)', 'stage').pluck('stage')
   end
 
-  def self.stages_status
-    # We execute subquery for each stage to calculate a stage status
-    statuses = unscoped.from(all, :sg).group('stage').pluck('sg.stage', all.where('stage=sg.stage').status_sql)
-    statuses.inject({}) do |h, k|
-      h[k.first] = k.last
-      h
-    end
+  def self.status_for_stage(stage)
+    where(stage: stage).status
   end
 
   def ignored?
diff --git a/app/models/project.rb b/app/models/project.rb
index 82489235a3f..dfd1e54ecf7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -354,7 +354,7 @@ class Project < ActiveRecord::Base
       join_body = "INNER JOIN (
         SELECT project_id, COUNT(*) AS amount
         FROM notes
-        WHERE created_at >= #{sanitize(since)}project.ci_commits
+        WHERE created_at >= #{sanitize(since)}
         GROUP BY project_id
       ) join_note_counts ON projects.id = join_note_counts.project_id"
 
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 90ac41666d0..7f9a3417836 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -31,10 +31,9 @@
             Cant find HEAD commit for this branch
 
 
-    - stages_status = commit.statuses.stages_status
     - stages.each do |stage|
       %td
-        - if status = stages_status[stage]
+        - if status = commit.statuses.status_for_stage(stage)
           - tooltip = "#{stage.titleize}: #{status}"
           %span.has-tooltip(title="#{tooltip}"){class: "ci-status-icon-#{status}"}
             = ci_icon_for_status(status)
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 0e654c3e40f..1df516eafd5 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -52,15 +52,15 @@ describe "Pipelines" do
         before { click_link('Retry') }
 
         it { expect(page).to_not have_link('Retry') }
-        it { expect(page).to have_selector('.ci-running') }
+        it { expect(page).to have_selector('.ci-pending') }
       end
     end
 
     context 'downloadable pipelines' do
-      before { visit namespace_project_pipelines_path(project.namespace, project) }
-
       context 'with artifacts' do
-        let!(:with_artifacts) { create(:ci_build, :success, :artifacts, commit: pipeline, name: 'rspec tests', stage: 'test') }
+        let!(:with_artifacts) { create(:ci_build, :artifacts, :success, commit: pipeline, name: 'rspec tests', stage: 'test') }
+
+        before { visit namespace_project_pipelines_path(project.namespace, project) }
 
         it { expect(page).to have_selector('.build-artifacts') }
         it { expect(page).to have_link(with_artifacts.name) }
@@ -78,10 +78,10 @@ describe "Pipelines" do
     let(:pipeline) { create(:ci_commit, project: project, ref: 'master') }
 
     before do
-      @success = create(:ci_build, :success, commit: pipeline, stage: 'build')
-      @failed = create(:ci_build, :failed, commit: pipeline, stage: 'test', commands: 'test')
-      @running = create(:ci_build, :running, commit: pipeline, stage: 'deploy')
-      @external = create(:generic_commit_status, :success, commit: pipeline, stage: 'external')
+      @success = create(:ci_build, :success, commit: pipeline, stage: 'build', name: 'build')
+      @failed = create(:ci_build, :failed, commit: pipeline, stage: 'test', name: 'test', commands: 'test')
+      @running = create(:ci_build, :running, commit: pipeline, stage: 'deploy', name: 'deploy')
+      @external = create(:generic_commit_status, status: 'success', commit: pipeline, name: 'jenkins', stage: 'external')
     end
 
     before { visit namespace_project_pipeline_path(project.namespace, project, pipeline) }
@@ -126,7 +126,10 @@ describe "Pipelines" do
     before { visit new_namespace_project_pipeline_path(project.namespace, project) }
 
     context 'for valid commit' do
-      before { fill_in('Create for', with: 'master') }
+      before do
+        fill_in('Create for', with: 'master')
+        stub_ci_commit_to_return_yaml_file
+      end
 
       it { expect{ click_on 'Create pipeline' }.to change{ Ci::Commit.count }.by(1) }
     end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 971e6750375..eb3715f00d4 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -219,17 +219,5 @@ describe CommitStatus, models: true do
         is_expected.to eq(%w(build test deploy))
       end
     end
-
-    context 'stages with statuses' do
-      subject { CommitStatus.where(commit: commit).stages_status }
-
-      it 'return list of stages with statuses' do
-        is_expected.to eq({
-          'build' => 'failed',
-          'test' => 'success',
-          'deploy' => 'running'
-        })
-      end
-    end
   end
 end

From 99d3e21f19ffb5cccb58fdfeac4fb6174e7e65e2 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 10 May 2016 17:41:46 -0500
Subject: [PATCH 0400/1431] Extract LegacyDiffNote out of Note

---
 app/assets/javascripts/notes.js.coffee        |   2 +
 app/assets/stylesheets/pages/notes.scss       |   3 +-
 app/controllers/projects/commit_controller.rb |  11 +-
 .../projects/compare_controller.rb            |   2 +-
 .../projects/merge_requests_controller.rb     |   7 +-
 app/controllers/projects/notes_controller.rb  |   6 +-
 app/finders/notes_finder.rb                   |   2 +-
 app/helpers/diff_helper.rb                    |  22 +-
 app/helpers/notes_helper.rb                   |  29 +--
 app/models/legacy_diff_note.rb                | 182 ++++++++++++++
 app/models/note.rb                            | 222 +++---------------
 .../notify/note_merge_request_email.html.haml |   2 +-
 .../projects/diffs/_parallel_view.html.haml   |  10 +-
 app/views/projects/diffs/_text_file.html.haml |   9 +-
 .../notes/_commit_discussion.html.haml        |   0
 .../notes/_diff_notes_with_reply.html.haml    |  18 +-
 .../_diff_notes_with_reply_parallel.html.haml |  20 +-
 .../projects/notes/_discussion.html.haml      |  47 +++-
 app/views/projects/notes/_form.html.haml      |   1 +
 app/views/projects/notes/_note.html.haml      |   9 +-
 app/views/projects/notes/_notes.html.haml     |   9 +-
 .../notes/discussions/_active.html.haml       |  16 --
 .../notes/discussions/_commit.html.haml       |  25 --
 .../notes/discussions/_diff.html.haml         |  28 ---
 .../_legacy_diff_with_notes.html.haml         |  30 +++
 .../notes/discussions/_notes.html.haml        |   7 +
 .../notes/discussions/_outdated.html.haml     |  14 --
 .../20160508215820_add_type_to_notes.rb       |   5 +
 ...508221410_set_type_on_legacy_diff_notes.rb |   5 +
 db/schema.rb                                  |   5 +-
 lib/api/commits.rb                            |   2 +
 lib/api/entities.rb                           |   6 +-
 spec/models/note_spec.rb                      |   8 +-
 33 files changed, 390 insertions(+), 374 deletions(-)
 create mode 100644 app/models/legacy_diff_note.rb
 delete mode 100644 app/views/projects/notes/_commit_discussion.html.haml
 delete mode 100644 app/views/projects/notes/discussions/_active.html.haml
 delete mode 100644 app/views/projects/notes/discussions/_commit.html.haml
 delete mode 100644 app/views/projects/notes/discussions/_diff.html.haml
 create mode 100644 app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
 create mode 100644 app/views/projects/notes/discussions/_notes.html.haml
 delete mode 100644 app/views/projects/notes/discussions/_outdated.html.haml
 create mode 100644 db/migrate/20160508215820_add_type_to_notes.rb
 create mode 100644 db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index efb3e8e2198..6d9d6528f45 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -285,6 +285,7 @@ class @Notes
     form.addClass "js-main-target-form"
 
     form.find("#note_line_code").remove()
+    form.find("#note_type").remove()
 
   ###
   General note form setup.
@@ -472,6 +473,7 @@ class @Notes
   setupDiscussionNoteForm: (dataHolder, form) =>
     # setup note target
     form.attr 'id', "new-discussion-note-form-#{dataHolder.data("discussionId")}"
+    form.find("#note_type").val dataHolder.data("noteType")
     form.find("#line_type").val dataHolder.data("lineType")
     form.find("#note_commit_id").val dataHolder.data("commitId")
     form.find("#note_line_code").val dataHolder.data("lineCode")
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 624c8249f7e..a3e1ac13a43 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -226,8 +226,7 @@ ul.notes {
   }
 }
 
-.note-action-button,
-.discussion-action-button {
+.note-action-button {
   display: inline-block;
   margin-left: 10px;
   line-height: 24px;
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index a202cb38692..9bcb82ef3f9 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -17,11 +17,12 @@ class Projects::CommitController < Projects::ApplicationController
   def show
     apply_diff_view_cookie!
 
-    @line_notes = commit.notes.inline
+    @grouped_diff_notes = commit.notes.grouped_diff_notes
+
     @note = @project.build_commit_note(commit)
-    @notes = commit.notes.not_inline.fresh
+    @notes = commit.notes.non_diff_notes.fresh
     @noteable = @commit
-    @comments_allowed = @reply_allowed = true
+    @comments_allowed = true
     @comments_target  = {
       noteable_type: 'Commit',
       commit_id: @commit.id
@@ -67,10 +68,10 @@ class Projects::CommitController < Projects::ApplicationController
     create_commit(Commits::RevertService, success_notice: "The #{@commit.change_type_title} has been successfully reverted.",
                                           success_path: successful_change_path, failure_path: failed_change_path)
   end
-  
+
   def cherry_pick
     assign_change_commit_vars(@commit.cherry_pick_branch_name)
-    
+
     return render_404 if @target_branch.blank?
 
     create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title} has been successfully cherry-picked.",
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 671d5c23024..587b84fd921 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -22,7 +22,7 @@ class Projects::CompareController < Projects::ApplicationController
       @base_commit = @project.merge_base_commit(@base_ref, @head_ref)
       @diffs = compare.diffs(diff_options)
       @diff_refs = [@base_commit, @commit]
-      @line_notes = []
+      @grouped_diff_notes = {}
     end
   end
 
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 9c147b3689e..e571da64e4b 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -73,12 +73,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     # but we need it for the "View file @ ..." link by deleted files
     @base_commit ||= @merge_request.first_commit.parent || @merge_request.first_commit
 
-    @comments_allowed = @reply_allowed = true
+    @comments_allowed = true
     @comments_target = {
       noteable_type: 'MergeRequest',
       noteable_id: @merge_request.id
     }
-    @line_notes = @merge_request.notes.where("line_code is not null")
+
+    @grouped_diff_notes = @merge_request.notes.grouped_diff_notes
 
     respond_to do |format|
       format.html
@@ -300,7 +301,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
     @notes = @merge_request.mr_and_commit_notes.nonawards.inc_author.fresh
-    @discussions = Note.discussions_from_notes(@notes)
+    @discussions = @notes.discussions
     @noteable = @merge_request
 
     # Get commits from repository
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 707a0d0e5c6..4a57cd29a20 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -96,7 +96,7 @@ class Projects::NotesController < Projects::ApplicationController
   end
 
   def note_to_discussion_html(note)
-    return unless note.for_diff_line?
+    return unless note.diff_note?
 
     if params[:view] == 'parallel'
       template = "projects/notes/_diff_notes_with_reply_parallel"
@@ -120,7 +120,7 @@ class Projects::NotesController < Projects::ApplicationController
   end
 
   def note_to_discussion_with_diff_html(note)
-    return unless note.for_diff_line?
+    return unless note.diff_note?
 
     render_to_string(
       "projects/notes/_discussion",
@@ -158,7 +158,7 @@ class Projects::NotesController < Projects::ApplicationController
   def note_params
     params.require(:note).permit(
       :note, :noteable, :noteable_id, :noteable_type, :project_id,
-      :attachment, :line_code, :commit_id
+      :attachment, :line_code, :commit_id, :type
     )
   end
 
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index fa4c635f55c..c41be333537 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -10,7 +10,7 @@ class NotesFinder
     notes =
       case target_type
       when "commit"
-        project.notes.for_commit_id(target_id).not_inline
+        project.notes.for_commit_id(target_id).non_diff_notes
       when "issue"
         project.issues.find(target_id).notes.nonawards.inc_author
       when "merge_request"
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 9f73edb4553..5f311f3780a 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -55,22 +55,18 @@ module DiffHelper
     end
   end
 
-  def line_comments
-    @line_comments ||= @line_notes.select(&:active?).sort_by(&:created_at).group_by(&:line_code)
-  end
+  def organize_comments(left, right)
+    notes_left = notes_right = nil
 
-  def organize_comments(type_left, type_right, line_code_left, line_code_right)
-    comments_left = comments_right = nil
-
-    unless type_left.nil? && type_right == 'new'
-      comments_left = line_comments[line_code_left]
+    unless left[:type].nil? && right[:type] == 'new'
+      notes_left = @grouped_diff_notes[left[:line_code]]
     end
 
-    unless type_left.nil? && type_right.nil?
-      comments_right = line_comments[line_code_right]
+    unless left[:type].nil? && right[:type].nil?
+      notes_right = @grouped_diff_notes[right[:line_code]]
     end
 
-    [comments_left, comments_right]
+    [notes_left, notes_right]
   end
 
   def inline_diff_btn
@@ -96,8 +92,8 @@ module DiffHelper
     ].join(' ').html_safe
   end
 
-  def commit_for_diff(diff)
-    if diff.deleted_file
+  def commit_for_diff(diff_file)
+    if diff_file.deleted_file
       @base_commit || @commit.parent || @commit
     else
       @commit
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 95072b5373f..b401c8385be 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -1,7 +1,7 @@
 module NotesHelper
   # Helps to distinguish e.g. commit notes in mr notes list
   def note_for_main_target?(note)
-    (@noteable.class.name == note.noteable_type && !note.for_diff_line?)
+    @noteable.class.name == note.noteable_type && !note.diff_note?
   end
 
   def note_target_fields(note)
@@ -15,16 +15,6 @@ module NotesHelper
     note.editable? && can?(current_user, :admin_note, note)
   end
 
-  def link_to_commit_diff_line_note(note)
-    if note.for_commit_diff_line?
-      link_to(
-        "#{note.diff_file_name}:L#{note.diff_new_line}",
-        namespace_project_commit_path(@project.namespace, @project,
-                                      note.noteable, anchor: note.line_code)
-      )
-    end
-  end
-
   def noteable_json(noteable)
     {
       id: noteable.id,
@@ -35,7 +25,7 @@ module NotesHelper
   end
 
   def link_to_new_diff_note(line_code, line_type = nil)
-    discussion_id = Note.build_discussion_id(
+    discussion_id = LegacyDiffNote.build_discussion_id(
       @comments_target[:noteable_type],
       @comments_target[:noteable_id] || @comments_target[:commit_id],
       line_code
@@ -45,9 +35,10 @@ module NotesHelper
       noteable_type: @comments_target[:noteable_type],
       noteable_id:   @comments_target[:noteable_id],
       commit_id:     @comments_target[:commit_id],
+      line_type:     line_type,
       line_code:     line_code,
-      discussion_id: discussion_id,
-      line_type:     line_type
+      note_type:     LegacyDiffNote.name,
+      discussion_id: discussion_id
     }
 
     button_tag(class: 'btn add-diff-note js-add-diff-note-button',
@@ -57,18 +48,24 @@ module NotesHelper
     end
   end
 
-  def link_to_reply_diff(note, line_type = nil)
+  def link_to_reply_discussion(note, line_type = nil)
     return unless current_user
 
     data = {
       noteable_type: note.noteable_type,
       noteable_id:   note.noteable_id,
       commit_id:     note.commit_id,
-      line_code:     note.line_code,
       discussion_id: note.discussion_id,
       line_type:     line_type
     }
 
+    if note.diff_note?
+      data.merge!(
+        line_code: note.line_code,
+        note_type: LegacyDiffNote.name
+      )
+    end
+
     button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
                            data: data, title: 'Add a reply'
   end
diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb
new file mode 100644
index 00000000000..b5de85df99f
--- /dev/null
+++ b/app/models/legacy_diff_note.rb
@@ -0,0 +1,182 @@
+class LegacyDiffNote < Note
+  serialize :st_diff
+
+  validates :line_code, presence: true, line_code: true
+
+  before_create :set_diff
+
+  class << self
+    def build_discussion_id(noteable_type, noteable_id, line_code, active = true)
+      [super(noteable_type, noteable_id), line_code, active].join("-")
+    end
+  end
+
+  def diff_note?
+    true
+  end
+
+  def legacy_diff_note?
+    true
+  end
+
+  def discussion_id
+    @discussion_id ||= self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code, active?)
+  end
+
+  def find_diff
+    return nil unless noteable
+    return @diff if defined?(@diff)
+
+    # Don't use ||= because nil is a valid value for @diff
+    @diff = noteable.diffs(Commit.max_diff_options).find do |d|
+      Digest::SHA1.hexdigest(d.new_path) == diff_file_index if d.new_path
+    end
+  end
+
+  def set_diff
+    # First lets find notes with same diff
+    # before iterating over all mr diffs
+    diff = diff_for_line_code unless for_merge_request?
+    diff ||= find_diff
+
+    self.st_diff = diff.to_hash if diff
+  end
+
+  def diff
+    @diff ||= Gitlab::Git::Diff.new(st_diff) if st_diff.respond_to?(:map)
+  end
+
+  def diff_for_line_code
+    attributes = {
+      noteable_type: noteable_type,
+      line_code: line_code
+    }
+
+    if for_commit?
+      attributes[:commit_id] = commit_id
+    else
+      attributes[:noteable_id] = noteable_id
+    end
+
+    self.class.where(attributes).last.try(:diff)
+  end
+
+  # Check if this note is part of an "active" discussion
+  #
+  # This will always return true for anything except MergeRequest noteables,
+  # which have special logic.
+  #
+  # If the note's current diff cannot be matched in the MergeRequest's current
+  # diff, it's considered inactive.
+  def active?
+    return true if for_commit?
+    return true unless self.diff
+    return false unless noteable
+    return @active if defined?(@active)
+
+    noteable_diff = find_noteable_diff
+
+    if noteable_diff
+      parsed_lines = Gitlab::Diff::Parser.new.parse(noteable_diff.diff.each_line)
+
+      @active = parsed_lines.any? { |line_obj| line_obj.text == diff_line }
+    else
+      @active = false
+    end
+
+    @active
+  end
+
+  def diff_file_index
+    line_code.split('_')[0] if line_code
+  end
+
+  def diff_file_name
+    diff.new_path if diff
+  end
+
+  def file_path
+    if diff.new_path.present?
+      diff.new_path
+    elsif diff.old_path.present?
+      diff.old_path
+    end
+  end
+
+  def diff_old_line
+    line_code.split('_')[1].to_i if line_code
+  end
+
+  def diff_new_line
+    line_code.split('_')[2].to_i if line_code
+  end
+
+  def generate_line_code(line)
+    Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+  end
+
+  def diff_line
+    return @diff_line if @diff_line
+
+    if diff
+      diff_lines.each do |line|
+        if generate_line_code(line) == self.line_code
+          @diff_line = line.text
+        end
+      end
+    end
+
+    @diff_line
+  end
+
+  def diff_line_type
+    return @diff_line_type if @diff_line_type
+
+    if diff
+      diff_lines.each do |line|
+        if generate_line_code(line) == self.line_code
+          @diff_line_type = line.type
+        end
+      end
+    end
+
+    @diff_line_type
+  end
+
+  def truncated_diff_lines
+    max_number_of_lines = 16
+    prev_match_line = nil
+    prev_lines = []
+
+    highlighted_diff_lines.each do |line|
+      if line.type == "match"
+        prev_lines.clear
+        prev_match_line = line
+      else
+        prev_lines << line
+
+        break if generate_line_code(line) == self.line_code
+
+        prev_lines.shift if prev_lines.length >= max_number_of_lines
+      end
+    end
+
+    prev_lines
+  end
+
+  def diff_lines
+    @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
+  end
+
+  def highlighted_diff_lines
+    Gitlab::Diff::Highlight.new(diff_lines).highlight
+  end
+
+  private
+
+  # Find the diff on noteable that matches our own
+  def find_noteable_diff
+    diffs = noteable.diffs(Commit.max_diff_options)
+    diffs.find { |d| d.new_path == self.diff.new_path }
+  end
+end
diff --git a/app/models/note.rb b/app/models/note.rb
index f26aa1bf63f..3bc55870704 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,6 +1,5 @@
-require 'carrierwave/orm/activerecord'
-
 class Note < ActiveRecord::Base
+  extend ActiveModel::Naming
   include Gitlab::CurrentSettings
   include Participable
   include Mentionable
@@ -22,12 +21,10 @@ class Note < ActiveRecord::Base
   delegate :name, :email, to: :author, prefix: true
 
   before_validation :set_award!
-  before_validation :clear_blank_line_code!
 
   validates :note, :project, presence: true
   validates :note, uniqueness: { scope: [:author, :noteable_type, :noteable_id] }, if: ->(n) { n.is_award }
   validates :note, inclusion: { in: Emoji.emojis_names }, if: ->(n) { n.is_award }
-  validates :line_code, line_code: true, allow_blank: true
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
 
@@ -41,8 +38,6 @@ class Note < ActiveRecord::Base
   scope :awards, ->{ where(is_award: true) }
   scope :nonawards, ->{ where(is_award: false) }
   scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) }
-  scope :inline, ->{ where("line_code IS NOT NULL") }
-  scope :not_inline, ->{ where(line_code: nil) }
   scope :system, ->{ where(system: true) }
   scope :user, ->{ where(system: false) }
   scope :common, ->{ where(noteable_type: ["", nil]) }
@@ -50,38 +45,31 @@ class Note < ActiveRecord::Base
   scope :inc_author_project, ->{ includes(:project, :author) }
   scope :inc_author, ->{ includes(:author) }
 
+  scope :legacy_diff_notes, ->{ where(type: 'LegacyDiffNote') }
+  scope :non_diff_notes, ->{ where(type: ['Note', nil]) }
+
   scope :with_associations, -> do
     includes(:author, :noteable, :updated_by,
              project: [:project_members, { group: [:group_members] }])
   end
 
-  serialize :st_diff
-  before_create :set_diff, if: ->(n) { n.line_code.present? }
+  before_validation :clear_blank_line_code!
 
   class << self
-    def discussions_from_notes(notes)
-      discussion_ids = []
-      discussions = []
-
-      notes.each do |note|
-        next if discussion_ids.include?(note.discussion_id)
-
-        # don't group notes for the main target
-        if !note.for_diff_line? && note.for_merge_request?
-          discussions << [note]
-        else
-          discussions << notes.select do |other_note|
-            note.discussion_id == other_note.discussion_id
-          end
-          discussion_ids << note.discussion_id
-        end
-      end
-
-      discussions
+    def model_name
+      ActiveModel::Name.new(self, nil, 'note')
     end
 
-    def build_discussion_id(type, id, line_code)
-      [:discussion, type.try(:underscore), id, line_code].join("-").to_sym
+    def build_discussion_id(noteable_type, noteable_id)
+      [:discussion, noteable_type.try(:underscore), noteable_id].join("-")
+    end
+
+    def discussions
+      all.group_by(&:discussion_id).values
+    end
+
+    def grouped_diff_notes
+      legacy_diff_notes.select(&:active?).sort_by(&:created_at).group_by(&:line_code)
     end
 
     # Searches for notes matching the given query.
@@ -116,167 +104,35 @@ class Note < ActiveRecord::Base
     system && SystemNoteService.cross_reference?(note)
   end
 
-  def max_attachment_size
-    current_application_settings.max_attachment_size.megabytes.to_i
+  def diff_note?
+    false
   end
 
-  def find_diff
-    return nil unless noteable
-    return @diff if defined?(@diff)
+  def legacy_diff_note?
+    false
+  end
 
-    # Don't use ||= because nil is a valid value for @diff
-    @diff = noteable.diffs(Commit.max_diff_options).find do |d|
-      Digest::SHA1.hexdigest(d.new_path) == diff_file_index if d.new_path
-    end
+  def discussion_id
+    @discussion_id ||=
+      if for_merge_request?
+        [:discussion, :note, id].join("-")
+      else
+        self.class.build_discussion_id(noteable_type, noteable_id || commit_id)
+      end
+  end
+
+  def max_attachment_size
+    current_application_settings.max_attachment_size.megabytes.to_i
   end
 
   def hook_attrs
     attributes
   end
 
-  def set_diff
-    # First lets find notes with same diff
-    # before iterating over all mr diffs
-    diff = diff_for_line_code unless for_merge_request?
-    diff ||= find_diff
-
-    self.st_diff = diff.to_hash if diff
-  end
-
-  def diff
-    @diff ||= Gitlab::Git::Diff.new(st_diff) if st_diff.respond_to?(:map)
-  end
-
-  def diff_for_line_code
-    Note.where(noteable_id: noteable_id, noteable_type: noteable_type, line_code: line_code).last.try(:diff)
-  end
-
-  # Check if this note is part of an "active" discussion
-  #
-  # This will always return true for anything except MergeRequest noteables,
-  # which have special logic.
-  #
-  # If the note's current diff cannot be matched in the MergeRequest's current
-  # diff, it's considered inactive.
-  def active?
-    return true unless self.diff
-    return false unless noteable
-    return @active if defined?(@active)
-
-    noteable_diff = find_noteable_diff
-
-    if noteable_diff
-      parsed_lines = Gitlab::Diff::Parser.new.parse(noteable_diff.diff.each_line)
-
-      @active = parsed_lines.any? { |line_obj| line_obj.text == diff_line }
-    else
-      @active = false
-    end
-
-    @active
-  end
-
-  def diff_file_index
-    line_code.split('_')[0] if line_code
-  end
-
-  def diff_file_name
-    diff.new_path if diff
-  end
-
-  def file_path
-    if diff.new_path.present?
-      diff.new_path
-    elsif diff.old_path.present?
-      diff.old_path
-    end
-  end
-
-  def diff_old_line
-    line_code.split('_')[1].to_i if line_code
-  end
-
-  def diff_new_line
-    line_code.split('_')[2].to_i if line_code
-  end
-
-  def generate_line_code(line)
-    Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
-  end
-
-  def diff_line
-    return @diff_line if @diff_line
-
-    if diff
-      diff_lines.each do |line|
-        if generate_line_code(line) == self.line_code
-          @diff_line = line.text
-        end
-      end
-    end
-
-    @diff_line
-  end
-
-  def diff_line_type
-    return @diff_line_type if @diff_line_type
-
-    if diff
-      diff_lines.each do |line|
-        if generate_line_code(line) == self.line_code
-          @diff_line_type = line.type
-        end
-      end
-    end
-
-    @diff_line_type
-  end
-
-  def truncated_diff_lines
-    max_number_of_lines = 16
-    prev_match_line = nil
-    prev_lines = []
-
-    highlighted_diff_lines.each do |line|
-      if line.type == "match"
-        prev_lines.clear
-        prev_match_line = line
-      else
-        prev_lines << line
-
-        break if generate_line_code(line) == self.line_code
-
-        prev_lines.shift if prev_lines.length >= max_number_of_lines
-      end
-    end
-
-    prev_lines
-  end
-
-  def diff_lines
-    @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
-  end
-
-  def highlighted_diff_lines
-    Gitlab::Diff::Highlight.new(diff_lines).highlight
-  end
-
-  def discussion_id
-    @discussion_id ||= Note.build_discussion_id(noteable_type, noteable_id || commit_id, line_code)
-  end
-
   def for_commit?
     noteable_type == "Commit"
   end
 
-  def for_commit_diff_line?
-    for_commit? && for_diff_line?
-  end
-
-  def for_diff_line?
-    line_code.present?
-  end
-
   def for_issue?
     noteable_type == "Issue"
   end
@@ -285,10 +141,6 @@ class Note < ActiveRecord::Base
     noteable_type == "MergeRequest"
   end
 
-  def for_merge_request_diff_line?
-    for_merge_request? && for_diff_line?
-  end
-
   def for_snippet?
     noteable_type == "Snippet"
   end
@@ -361,14 +213,8 @@ class Note < ActiveRecord::Base
     self.line_code = nil if self.line_code.blank?
   end
 
-  # Find the diff on noteable that matches our own
-  def find_noteable_diff
-    diffs = noteable.diffs(Commit.max_diff_options)
-    diffs.find { |d| d.new_path == self.diff.new_path }
-  end
-
   def awards_supported?
-    (for_issue? || for_merge_request?) && !for_diff_line?
+    (for_issue? || for_merge_request?) && !diff_note?
   end
 
   def contains_emoji_only?
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 65f0e4c4068..27e8ea5f5a1 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,4 +1,4 @@
-- if @note.diff_file_name
+- if @note.legacy_diff_note?
   %p.details
     New comment on diff for
     = link_to @note.diff_file_name, @target_url
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml
index 81948513e43..3d91dc43129 100644
--- a/app/views/projects/diffs/_parallel_view.html.haml
+++ b/app/views/projects/diffs/_parallel_view.html.haml
@@ -30,13 +30,13 @@
           %td.new_line.diff-line-num{id: new_line_code, class: "#{new_line_class} #{'empty-cell' if !right[:number]}", data: { linenumber: right[:number] }}
             = link_to raw(right[:number]), "##{new_line_code}", id: new_line_code
             - if @comments_allowed && can?(current_user, :create_note, @project)
-              = link_to_new_diff_note(right[:line_code], 'new')
+              = link_to_new_diff_note(new_line_code, 'new')
           %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code} #{'empty-cell' if right[:text].empty?}", data: { line_code: new_line_code }}= diff_line_content(right[:text])
 
-      - if @reply_allowed
-        - comments_left, comments_right = organize_comments(left[:type], right[:type], left[:line_code], right[:line_code])
-        - if comments_left.present? || comments_right.present?
-          = render "projects/notes/diff_notes_with_reply_parallel", notes_left: comments_left, notes_right: comments_right
+      - if @comments_allowed
+        - notes_left, notes_right = organize_comments(left, right)
+        - if notes_left.present? || notes_right.present?
+          = render "projects/notes/diff_notes_with_reply_parallel", notes_left: notes_left, notes_right: notes_right
 
 - if diff_file.diff.diff.blank? && diff_file.mode_changed?
   .file-mode-changed
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml
index e7169d7b599..d58444a9d5b 100644
--- a/app/views/projects/diffs/_text_file.html.haml
+++ b/app/views/projects/diffs/_text_file.html.haml
@@ -6,16 +6,15 @@
 %table.text-file.code.js-syntax-highlight{ class: too_big ? 'hide' : '' }
 
   - last_line = 0
-  - raw_diff_lines = diff_file.diff_lines.to_a
   - diff_file.highlighted_diff_lines.each_with_index do |line, index|
     - line_code = generate_line_code(diff_file.file_path, line)
     - last_line = line.new_pos
     = render "projects/diffs/line", {line: line, diff_file: diff_file, line_code: line_code}
 
-    - if @reply_allowed
-      - comments = @line_notes.select { |n| n.line_code == line_code && n.active? }.sort_by(&:created_at)
-      - unless comments.empty?
-        = render "projects/notes/diff_notes_with_reply", notes: comments, line: raw_diff_lines[index].text
+    - if @comments_allowed
+      - diff_notes = @grouped_diff_notes[line_code]
+      - if diff_notes
+        = render "projects/notes/diff_notes_with_reply", notes: diff_notes
 
   - if last_line > 0
     = render "projects/diffs/match_line", { line: "",
diff --git a/app/views/projects/notes/_commit_discussion.html.haml b/app/views/projects/notes/_commit_discussion.html.haml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/views/projects/notes/_diff_notes_with_reply.html.haml b/app/views/projects/notes/_diff_notes_with_reply.html.haml
index 39be072855a..8144c1ba49e 100644
--- a/app/views/projects/notes/_diff_notes_with_reply.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply.html.haml
@@ -1,10 +1,8 @@
-- note = notes.first # example note
--# Check if line want not changed since comment was left
-- if !defined?(line) || line == note.diff_line
-  %tr.notes_holder
-    %td.notes_line{ colspan: 2 }
-    %td.notes_content
-      %ul.notes{ data: { discussion_id: note.discussion_id } }
-        = render notes
-      .discussion-reply-holder
-        = link_to_reply_diff(note)
+- note = notes.first
+%tr.notes_holder
+  %td.notes_line{ colspan: 2 }
+  %td.notes_content
+    %ul.notes{ data: { discussion_id: note.discussion_id } }
+      = render partial: "projects/notes/note", collection: notes, as: :note
+    .discussion-reply-holder
+      = link_to_reply_discussion(note)
diff --git a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
index f8aa5e2fa7d..45986b0d1e8 100644
--- a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
@@ -1,27 +1,27 @@
-- note1 = notes_left.present? ? notes_left.first : nil
-- note2 = notes_right.present? ? notes_right.first : nil
+- note_left = notes_left.present? ? notes_left.first : nil
+- note_right = notes_right.present? ? notes_right.first : nil
 
 %tr.notes_holder
-  - if note1
+  - if note_left
     %td.notes_line.old
     %td.notes_content.parallel.old
-      %ul.notes{ data: { discussion_id: note1.discussion_id } }
-        = render notes_left
+      %ul.notes{ data: { discussion_id: note_left.discussion_id } }
+        = render partial: "projects/notes/note", collection: notes_left, as: :note
 
       .discussion-reply-holder
-        = link_to_reply_diff(note1, 'old')
+        = link_to_reply_discussion(note_left, 'old')
   - else
     %td.notes_line.old= ""
     %td.notes_content.parallel.old= ""
 
-  - if note2
+  - if note_right
     %td.notes_line.new
     %td.notes_content.parallel.new
-      %ul.notes{ data: { discussion_id: note2.discussion_id } }
-        = render notes_right
+      %ul.notes{ data: { discussion_id: note_right.discussion_id } }
+        = render partial: "projects/notes/note", collection: notes_right, as: :note
 
       .discussion-reply-holder
-        = link_to_reply_diff(note2, 'new')
+        = link_to_reply_discussion(note_right, 'new')
   - else
     %td.notes_line.new= ""
     %td.notes_content.parallel.new= ""
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index 572b00a38c7..40e03050a7d 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -1,13 +1,46 @@
 - note = discussion_notes.first
+- expanded = !note.diff_note? || note.active?
 %li.note.note-discussion.timeline-entry
   .timeline-entry-inner
     .timeline-icon
       = link_to user_path(note.author) do
-        = image_tag avatar_icon(note.author_email), class: "avatar s40"
+        = image_tag avatar_icon(note.author), class: "avatar s40"
     .timeline-content
-      - if note.for_merge_request?
-        - (active_notes, outdated_notes) = discussion_notes.partition(&:active?)
-        = render "projects/notes/discussions/active", discussion_notes: active_notes if active_notes.length > 0
-        = render "projects/notes/discussions/outdated", discussion_notes: outdated_notes if outdated_notes.length > 0
-      - else
-        = render "projects/notes/discussions/commit", discussion_notes: discussion_notes
+      .discussion.js-toggle-container{ class: note.discussion_id }
+        .discussion-header
+          = link_to_member(@project, note.author, avatar: false)
+
+          .inline.discussion-headline-light
+            = note.author.to_reference
+            started a discussion on
+
+            - if note.for_commit?
+              - commit = note.noteable
+              - if commit
+                commit
+                = link_to commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code), class: 'monospace'
+              - else
+                a deleted commit
+            - else
+              - if note.active?
+                = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
+                  the diff
+              - else
+                the outdated diff
+
+            = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "note-created-ago")
+
+          .discussion-actions
+            = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
+              - if expanded
+                = icon("chevron-up")
+              - else
+                = icon("chevron-down")
+
+              Toggle discussion
+
+        .discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
+          - if note.diff_note?
+            = render "projects/notes/discussions/legacy_diff_with_notes", discussion_notes: discussion_notes
+          - else
+            = render "projects/notes/discussions/notes", discussion_notes: discussion_notes
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index d0ac380f216..67ed38a7b22 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -6,6 +6,7 @@
   = f.hidden_field :line_code
   = f.hidden_field :noteable_id
   = f.hidden_field :noteable_type
+  = f.hidden_field :type
 
   = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
     = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text', placeholder: "Write a comment or drag your files here..."
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index aeb7c1d5ee4..9fbc9a45549 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -1,5 +1,8 @@
+- return unless note.author
+- return if note.cross_reference_not_visible_for?(current_user)
+
 - note_editable = note_editable?(note)
-%li.timeline-entry{ id: dom_id(note), class: [dom_class(note), "note-row-#{note.id}", ('system-note' if note.system)], data: {author_id: note.author.id, editable: note_editable} }
+%li.timeline-entry{ id: dom_id(note), class: ["note", "note-row-#{note.id}", ('system-note' if note.system)], data: {author_id: note.author.id, editable: note_editable} }
   .timeline-entry-inner
     .timeline-icon
       %a{href: user_path(note.author)}
@@ -8,8 +11,8 @@
       .note-header
         = link_to_member(note.project, note.author, avatar: false)
         .inline.note-headline-light
-          = "#{note.author.to_reference}"
-          - if !note.system
+          = note.author.to_reference
+          - unless note.system
             commented
           %a{ href: "##{dom_id(note)}" }
             = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
diff --git a/app/views/projects/notes/_notes.html.haml b/app/views/projects/notes/_notes.html.haml
index 62db86fb181..ebf7e8a9cb3 100644
--- a/app/views/projects/notes/_notes.html.haml
+++ b/app/views/projects/notes/_notes.html.haml
@@ -2,14 +2,9 @@
   - @discussions.each do |discussion_notes|
     - note = discussion_notes.first
     - if note_for_main_target?(note)
-      - next if note.cross_reference_not_visible_for?(current_user)
-
-      = render discussion_notes
+      = render partial: "projects/notes/note", object: note, as: :note
     - else
       = render 'projects/notes/discussion', discussion_notes: discussion_notes
 - else
   - @notes.each do |note|
-    - next unless note.author
-    - next if note.cross_reference_not_visible_for?(current_user)
-
-    = render note
+    = render partial: "projects/notes/note", object: note, as: :note
diff --git a/app/views/projects/notes/discussions/_active.html.haml b/app/views/projects/notes/discussions/_active.html.haml
deleted file mode 100644
index 0ea8862a684..00000000000
--- a/app/views/projects/notes/discussions/_active.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-- note = discussion_notes.first
-.discussion.js-toggle-container{ class: note.discussion_id }
-  .discussion-header
-    = link_to_member(@project, note.author, avatar: false)
-    .inline.discussion-headline-light
-      = "#{note.author.to_reference} started a discussion"
-      = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
-        on the diff
-      = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "discussion_updated_ago")
-    .discussion-actions
-      = link_to "#", class: "discussion-action-button discussion-toggle-button js-toggle-button" do
-        %i.fa.fa-chevron-up
-        Show/hide discussion
-
-  .discussion-body.js-toggle-content
-    = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
diff --git a/app/views/projects/notes/discussions/_commit.html.haml b/app/views/projects/notes/discussions/_commit.html.haml
deleted file mode 100644
index 2a2ead58eeb..00000000000
--- a/app/views/projects/notes/discussions/_commit.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-- note = discussion_notes.first
-- commit = note.noteable
-- commit_description = commit ? 'commit' : 'a deleted commit'
-.discussion.js-toggle-container{ class: note.discussion_id }
-  .discussion-header
-    = link_to_member(@project, note.author, avatar: false)
-    .inline.discussion-headline-light
-      = "#{note.author.to_reference} started a discussion on #{commit_description}"
-      - if commit
-        = link_to(commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace')
-      = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "discussion_updated_ago")
-    .discussion-actions
-      = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
-        %i.fa.fa-chevron-up
-        Show/hide discussion
-  .discussion-body.js-toggle-content
-    - if note.for_diff_line?
-      = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
-    - else
-      .panel.panel-default
-        .notes{ data: { discussion_id: discussion_notes.first.discussion_id } }
-          %ul.notes.timeline
-            = render discussion_notes
-        .discussion-reply-holder
-          = link_to_reply_diff(discussion_notes.first)
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml
deleted file mode 100644
index d46aab000c3..00000000000
--- a/app/views/projects/notes/discussions/_diff.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-- diff = note.diff
-- if diff
-  .diff-file
-    .diff-header
-      %span
-        - if diff.deleted_file
-          = diff.old_path
-        - else
-          = diff.new_path
-          - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
-            %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
-    .diff-content.code.js-syntax-highlight
-      %table
-        - note.truncated_diff_lines.each do |line|
-          - type = line.type
-          - line_code = generate_line_code(note.file_path, line)
-          %tr.line_holder{ id: line_code, class: "#{type}" }
-            - if type == "match"
-              %td.old_line.diff-line-num= "..."
-              %td.new_line.diff-line-num= "..."
-              %td.line_content.match= line.text
-            - else
-              %td.old_line.diff-line-num{ data: { linenumber: type == "new" ? "&nbsp;".html_safe : line.old_pos } }
-              %td.new_line.diff-line-num{ data: { linenumber: type == "old" ? "&nbsp;".html_safe : line.new_pos } }
-              %td.line_content{ class: ['noteable_line', type, line_code], line_code: line_code }= diff_line_content(line.text, type)
-
-              - if line_code == note.line_code
-                = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
diff --git a/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml b/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
new file mode 100644
index 00000000000..3ab11f6461d
--- /dev/null
+++ b/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
@@ -0,0 +1,30 @@
+- note = discussion_notes.first
+- diff = note.diff
+- return unless diff
+
+.diff-file
+  .diff-header
+    %span
+      - if diff.deleted_file
+        = diff.old_path
+      - else
+        = diff.new_path
+        - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
+          %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
+  .diff-content.code.js-syntax-highlight
+    %table
+      - note.truncated_diff_lines.each do |line|
+        - type = line.type
+        - line_code = generate_line_code(note.file_path, line)
+        %tr.line_holder{ id: line_code, class: "#{type}" }
+          - if type == "match"
+            %td.old_line.diff-line-num= "..."
+            %td.new_line.diff-line-num= "..."
+            %td.line_content.match= line.text
+          - else
+            %td.old_line.diff-line-num{ data: { linenumber: type == "new" ? "&nbsp;".html_safe : line.old_pos } }
+            %td.new_line.diff-line-num{ data: { linenumber: type == "old" ? "&nbsp;".html_safe : line.new_pos } }
+            %td.line_content{ class: ['noteable_line', type, line_code], line_code: line_code }= diff_line_content(line.text, type)
+
+            - if line_code == note.line_code
+              = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
diff --git a/app/views/projects/notes/discussions/_notes.html.haml b/app/views/projects/notes/discussions/_notes.html.haml
new file mode 100644
index 00000000000..e598e3c7c63
--- /dev/null
+++ b/app/views/projects/notes/discussions/_notes.html.haml
@@ -0,0 +1,7 @@
+- note = discussion_notes.first
+.panel.panel-default
+  .notes{ data: { discussion_id: note.discussion_id } }
+    %ul.notes.timeline
+      = render partial: "projects/notes/note", collection: discussion_notes, as: :note
+  .discussion-reply-holder
+    = link_to_reply_discussion(note)
diff --git a/app/views/projects/notes/discussions/_outdated.html.haml b/app/views/projects/notes/discussions/_outdated.html.haml
deleted file mode 100644
index 45141bcd1df..00000000000
--- a/app/views/projects/notes/discussions/_outdated.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- note = discussion_notes.first
-.discussion.js-toggle-container{ class: note.discussion_id }
-  .discussion-header
-    = link_to_member(@project, note.author, avatar: false)
-    .inline.discussion-headline-light
-      = "#{note.author.to_reference} started a discussion"
-      on the outdated diff
-      = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "discussion_updated_ago")
-    .discussion-actions
-      = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
-        %i.fa.fa-chevron-down
-        Show/hide discussion
-  .discussion-body.js-toggle-content.hide
-    = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
diff --git a/db/migrate/20160508215820_add_type_to_notes.rb b/db/migrate/20160508215820_add_type_to_notes.rb
new file mode 100644
index 00000000000..58944d4e651
--- /dev/null
+++ b/db/migrate/20160508215820_add_type_to_notes.rb
@@ -0,0 +1,5 @@
+class AddTypeToNotes < ActiveRecord::Migration
+  def change
+    add_column :notes, :type, :string
+  end
+end
diff --git a/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb b/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb
new file mode 100644
index 00000000000..c3f23d89d5a
--- /dev/null
+++ b/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb
@@ -0,0 +1,5 @@
+class SetTypeOnLegacyDiffNotes < ActiveRecord::Migration
+  def change
+    execute "UPDATE notes SET type = 'LegacyDiffNote' WHERE line_code IS NOT NULL"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9b5aa640cb0..e1117a0d858 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -632,10 +632,11 @@ ActiveRecord::Schema.define(version: 20160509201028) do
     t.string   "line_code"
     t.string   "commit_id"
     t.integer  "noteable_id"
-    t.boolean  "system",        default: false, null: false
+    t.boolean  "system",            default: false, null: false
     t.text     "st_diff"
     t.integer  "updated_by_id"
-    t.boolean  "is_award",      default: false, null: false
+    t.boolean  "is_award",          default: false, null: false
+    t.string   "type"
   end
 
   add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 93a3a5ce089..4a11c8e3620 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -107,6 +107,8 @@ module API
 
             break if opts[:line_code]
           end
+
+          opts[:type] = LegacyDiffNote.name if opts[:line_code]
         end
 
         note = ::Notes::CreateService.new(user_project, current_user, opts).execute
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 406f5ea9139..1619199b0a7 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -227,9 +227,9 @@ module API
 
     class CommitNote < Grape::Entity
       expose :note
-      expose(:path) { |note| note.diff_file_name }
-      expose(:line) { |note| note.diff_new_line }
-      expose(:line_type) { |note| note.diff_line_type }
+      expose(:path) { |note| note.diff_file_name if note.legacy_diff_note? }
+      expose(:line) { |note| note.diff_new_line if note.legacy_diff_note? }
+      expose(:line_type) { |note| note.diff_line_type if note.legacy_diff_note? }
       expose :author, using: Entities::UserBasic
       expose :created_at
     end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 4b788b57882..264888cb376 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -43,12 +43,8 @@ describe Note, models: true do
       expect(note.noteable.id).to eq(commit.id)
     end
 
-    it "should be recognized by #for_diff_line?" do
-      expect(note).to be_for_diff_line
-    end
-
-    it "should be recognized by #for_commit_diff_line?" do
-      expect(note).to be_for_commit_diff_line
+    it "should be recognized by #legacy_diff_note?" do
+      expect(note).to be_legacy_diff_note
     end
   end
 

From 9a3ed265e9c82ee55bc6a17737ef6c5c2a1ad7e3 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 13 May 2016 14:53:04 -0500
Subject: [PATCH 0401/1431] Use `@diff_notes_disabled` instead of
 `@comments_allowed`

---
 app/controllers/projects/commit_controller.rb         | 1 -
 app/controllers/projects/compare_controller.rb        | 1 +
 app/controllers/projects/merge_requests_controller.rb | 2 +-
 app/views/projects/diffs/_line.html.haml              | 2 +-
 app/views/projects/diffs/_parallel_view.html.haml     | 6 +++---
 app/views/projects/diffs/_text_file.html.haml         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 9bcb82ef3f9..6e02f1240fe 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -22,7 +22,6 @@ class Projects::CommitController < Projects::ApplicationController
     @note = @project.build_commit_note(commit)
     @notes = commit.notes.non_diff_notes.fresh
     @noteable = @commit
-    @comments_allowed = true
     @comments_target  = {
       noteable_type: 'Commit',
       commit_id: @commit.id
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 587b84fd921..af0b69a2442 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -22,6 +22,7 @@ class Projects::CompareController < Projects::ApplicationController
       @base_commit = @project.merge_base_commit(@base_ref, @head_ref)
       @diffs = compare.diffs(diff_options)
       @diff_refs = [@base_commit, @commit]
+      @diff_notes_disabled = true
       @grouped_diff_notes = {}
     end
   end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e571da64e4b..c5757a24624 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -73,7 +73,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     # but we need it for the "View file @ ..." link by deleted files
     @base_commit ||= @merge_request.first_commit.parent || @merge_request.first_commit
 
-    @comments_allowed = true
     @comments_target = {
       noteable_type: 'MergeRequest',
       noteable_id: @merge_request.id
@@ -118,6 +117,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @commit = @merge_request.last_commit
     @base_commit = @merge_request.diff_base_commit
     @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
+    @diff_notes_disabled = true
 
     @ci_commit = @merge_request.ci_commit
     @statuses = @ci_commit.statuses if @ci_commit
diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml
index 107097ad963..f1577e8a47b 100644
--- a/app/views/projects/diffs/_line.html.haml
+++ b/app/views/projects/diffs/_line.html.haml
@@ -15,7 +15,7 @@
         = link_text
       - else
         = link_to "", "##{line_code}", id: line_code, data: { linenumber: link_text }
-      - if @comments_allowed && can?(current_user, :create_note, @project)
+      - if !@diff_notes_disabled && can?(current_user, :create_note, @project)
         = link_to_new_diff_note(line_code)
     %td.new_line.diff-line-num{ class: type, data: { linenumber: line.new_pos } }
       - link_text = type == "old" ? "&nbsp;".html_safe : line.new_pos
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml
index 3d91dc43129..4ecc9528bd2 100644
--- a/app/views/projects/diffs/_parallel_view.html.haml
+++ b/app/views/projects/diffs/_parallel_view.html.haml
@@ -16,7 +16,7 @@
         - else
           %td.old_line.diff-line-num{id: left[:line_code], class: "#{left[:type]} #{'empty-cell' if !left[:number]}"}
             = link_to raw(left[:number]), "##{left[:line_code]}", id: left[:line_code]
-            - if @comments_allowed && can?(current_user, :create_note, @project)
+            - if !@diff_notes_disabled && can?(current_user, :create_note, @project)
               = link_to_new_diff_note(left[:line_code], 'old')
           %td.line_content{class: "parallel noteable_line #{left[:type]} #{left[:line_code]} #{'empty-cell' if left[:text].empty?}", data: { line_code: left[:line_code] }}= diff_line_content(left[:text])
 
@@ -29,11 +29,11 @@
 
           %td.new_line.diff-line-num{id: new_line_code, class: "#{new_line_class} #{'empty-cell' if !right[:number]}", data: { linenumber: right[:number] }}
             = link_to raw(right[:number]), "##{new_line_code}", id: new_line_code
-            - if @comments_allowed && can?(current_user, :create_note, @project)
+            - if !@diff_notes_disabled && can?(current_user, :create_note, @project)
               = link_to_new_diff_note(new_line_code, 'new')
           %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code} #{'empty-cell' if right[:text].empty?}", data: { line_code: new_line_code }}= diff_line_content(right[:text])
 
-      - if @comments_allowed
+      - unless @diff_notes_disabled
         - notes_left, notes_right = organize_comments(left, right)
         - if notes_left.present? || notes_right.present?
           = render "projects/notes/diff_notes_with_reply_parallel", notes_left: notes_left, notes_right: notes_right
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml
index d58444a9d5b..068593a7dd1 100644
--- a/app/views/projects/diffs/_text_file.html.haml
+++ b/app/views/projects/diffs/_text_file.html.haml
@@ -11,7 +11,7 @@
     - last_line = line.new_pos
     = render "projects/diffs/line", {line: line, diff_file: diff_file, line_code: line_code}
 
-    - if @comments_allowed
+    - unless @diff_notes_disabled
       - diff_notes = @grouped_diff_notes[line_code]
       - if diff_notes
         = render "projects/notes/diff_notes_with_reply", notes: diff_notes

From 7848d54f5b0024f58d8ce2b0259347816be5bdbc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 13 May 2016 14:53:31 -0500
Subject: [PATCH 0402/1431] Clean up LegacyDiffNote somewhat

---
 app/models/legacy_diff_note.rb                | 183 ++++++++----------
 app/models/note.rb                            |   4 +
 .../notify/note_merge_request_email.html.haml |   2 +-
 .../_legacy_diff_with_notes.html.haml         |   2 +-
 lib/api/entities.rb                           |   2 +-
 spec/models/legacy_diff_note_spec.rb          |  74 +++++++
 6 files changed, 160 insertions(+), 107 deletions(-)
 create mode 100644 spec/models/legacy_diff_note_spec.rb

diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb
index b5de85df99f..bbefc911b29 100644
--- a/app/models/legacy_diff_note.rb
+++ b/app/models/legacy_diff_note.rb
@@ -23,86 +23,10 @@ class LegacyDiffNote < Note
     @discussion_id ||= self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code, active?)
   end
 
-  def find_diff
-    return nil unless noteable
-    return @diff if defined?(@diff)
-
-    # Don't use ||= because nil is a valid value for @diff
-    @diff = noteable.diffs(Commit.max_diff_options).find do |d|
-      Digest::SHA1.hexdigest(d.new_path) == diff_file_index if d.new_path
-    end
-  end
-
-  def set_diff
-    # First lets find notes with same diff
-    # before iterating over all mr diffs
-    diff = diff_for_line_code unless for_merge_request?
-    diff ||= find_diff
-
-    self.st_diff = diff.to_hash if diff
-  end
-
-  def diff
-    @diff ||= Gitlab::Git::Diff.new(st_diff) if st_diff.respond_to?(:map)
-  end
-
-  def diff_for_line_code
-    attributes = {
-      noteable_type: noteable_type,
-      line_code: line_code
-    }
-
-    if for_commit?
-      attributes[:commit_id] = commit_id
-    else
-      attributes[:noteable_id] = noteable_id
-    end
-
-    self.class.where(attributes).last.try(:diff)
-  end
-
-  # Check if this note is part of an "active" discussion
-  #
-  # This will always return true for anything except MergeRequest noteables,
-  # which have special logic.
-  #
-  # If the note's current diff cannot be matched in the MergeRequest's current
-  # diff, it's considered inactive.
-  def active?
-    return true if for_commit?
-    return true unless self.diff
-    return false unless noteable
-    return @active if defined?(@active)
-
-    noteable_diff = find_noteable_diff
-
-    if noteable_diff
-      parsed_lines = Gitlab::Diff::Parser.new.parse(noteable_diff.diff.each_line)
-
-      @active = parsed_lines.any? { |line_obj| line_obj.text == diff_line }
-    else
-      @active = false
-    end
-
-    @active
-  end
-
-  def diff_file_index
+  def diff_file_hash
     line_code.split('_')[0] if line_code
   end
 
-  def diff_file_name
-    diff.new_path if diff
-  end
-
-  def file_path
-    if diff.new_path.present?
-      diff.new_path
-    elsif diff.old_path.present?
-      diff.old_path
-    end
-  end
-
   def diff_old_line
     line_code.split('_')[1].to_i if line_code
   end
@@ -111,36 +35,32 @@ class LegacyDiffNote < Note
     line_code.split('_')[2].to_i if line_code
   end
 
-  def generate_line_code(line)
-    Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+  def diff
+    @diff ||= Gitlab::Git::Diff.new(st_diff) if st_diff.respond_to?(:map)
+  end
+
+  def diff_file_path
+    diff.new_path.presence || diff.old_path
+  end
+
+  def diff_lines
+    @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
   end
 
   def diff_line
-    return @diff_line if @diff_line
+    @diff_line ||= diff_lines.find { |line| generate_line_code(line) == self.line_code }
+  end
 
-    if diff
-      diff_lines.each do |line|
-        if generate_line_code(line) == self.line_code
-          @diff_line = line.text
-        end
-      end
-    end
-
-    @diff_line
+  def diff_line_text
+    diff_line.try(:text)
   end
 
   def diff_line_type
-    return @diff_line_type if @diff_line_type
+    diff_line.try(:type)
+  end
 
-    if diff
-      diff_lines.each do |line|
-        if generate_line_code(line) == self.line_code
-          @diff_line_type = line.type
-        end
-      end
-    end
-
-    @diff_line_type
+  def highlighted_diff_lines
+    Gitlab::Diff::Highlight.new(diff_lines).highlight
   end
 
   def truncated_diff_lines
@@ -164,16 +84,71 @@ class LegacyDiffNote < Note
     prev_lines
   end
 
-  def diff_lines
-    @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
-  end
+  # Check if this note is part of an "active" discussion
+  #
+  # This will always return true for anything except MergeRequest noteables,
+  # which have special logic.
+  #
+  # If the note's current diff cannot be matched in the MergeRequest's current
+  # diff, it's considered inactive.
+  def active?
+    return @active if defined?(@active)
+    return true if for_commit?
+    return true unless self.diff
+    return false unless noteable
 
-  def highlighted_diff_lines
-    Gitlab::Diff::Highlight.new(diff_lines).highlight
+    noteable_diff = find_noteable_diff
+
+    if noteable_diff
+      parsed_lines = Gitlab::Diff::Parser.new.parse(noteable_diff.diff.each_line)
+
+      @active = parsed_lines.any? { |line_obj| line_obj.text == diff_line_text }
+    else
+      @active = false
+    end
+
+    @active
   end
 
   private
 
+  def find_diff
+    return nil unless noteable
+    return @diff if defined?(@diff)
+
+    @diff = noteable.diffs(Commit.max_diff_options).find do |d|
+      d.new_path && Digest::SHA1.hexdigest(d.new_path) == diff_file_hash
+    end
+  end
+
+  def set_diff
+    # First lets find notes with same diff
+    # before iterating over all mr diffs
+    diff = diff_for_line_code unless for_merge_request?
+    diff ||= find_diff
+
+    self.st_diff = diff.to_hash if diff
+  end
+
+  def diff_for_line_code
+    attributes = {
+      noteable_type: noteable_type,
+      line_code: line_code
+    }
+
+    if for_commit?
+      attributes[:commit_id] = commit_id
+    else
+      attributes[:noteable_id] = noteable_id
+    end
+
+    self.class.where(attributes).last.try(:diff)
+  end
+
+  def generate_line_code(line)
+    Gitlab::Diff::LineCode.generate(diff_file_path, line.new_pos, line.old_pos)
+  end
+
   # Find the diff on noteable that matches our own
   def find_noteable_diff
     diffs = noteable.diffs(Commit.max_diff_options)
diff --git a/app/models/note.rb b/app/models/note.rb
index 3bc55870704..7e5bdc09a84 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -112,6 +112,10 @@ class Note < ActiveRecord::Base
     false
   end
 
+  def active?
+    true
+  end
+
   def discussion_id
     @discussion_id ||=
       if for_merge_request?
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 27e8ea5f5a1..a3643a00cfe 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,7 +1,7 @@
 - if @note.legacy_diff_note?
   %p.details
     New comment on diff for
-    = link_to @note.diff_file_name, @target_url
+    = link_to @note.diff_file_path, @target_url
     \:
 
 = render 'note_message'
diff --git a/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml b/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
index 3ab11f6461d..6401245bf73 100644
--- a/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
+++ b/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
@@ -15,7 +15,7 @@
     %table
       - note.truncated_diff_lines.each do |line|
         - type = line.type
-        - line_code = generate_line_code(note.file_path, line)
+        - line_code = generate_line_code(note.diff_file_path, line)
         %tr.line_holder{ id: line_code, class: "#{type}" }
           - if type == "match"
             %td.old_line.diff-line-num= "..."
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1619199b0a7..93a5798e21e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -227,7 +227,7 @@ module API
 
     class CommitNote < Grape::Entity
       expose :note
-      expose(:path) { |note| note.diff_file_name if note.legacy_diff_note? }
+      expose(:path) { |note| note.diff_file_path if note.legacy_diff_note? }
       expose(:line) { |note| note.diff_new_line if note.legacy_diff_note? }
       expose(:line_type) { |note| note.diff_line_type if note.legacy_diff_note? }
       expose :author, using: Entities::UserBasic
diff --git a/spec/models/legacy_diff_note_spec.rb b/spec/models/legacy_diff_note_spec.rb
new file mode 100644
index 00000000000..7c29bef54e4
--- /dev/null
+++ b/spec/models/legacy_diff_note_spec.rb
@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe LegacyDiffNote, models: true do
+  describe "Commit diff line notes" do
+    let!(:note) { create(:note_on_commit_diff, note: "+1 from me") }
+    let!(:commit) { note.noteable }
+
+    it "should save a valid note" do
+      expect(note.commit_id).to eq(commit.id)
+      expect(note.noteable.id).to eq(commit.id)
+    end
+
+    it "should be recognized by #legacy_diff_note?" do
+      expect(note).to be_legacy_diff_note
+    end
+  end
+
+  describe '#active?' do
+    it 'is always true when the note has no associated diff' do
+      note = build(:note_on_merge_request_diff)
+
+      expect(note).to receive(:diff).and_return(nil)
+
+      expect(note).to be_active
+    end
+
+    it 'is never true when the note has no noteable associated' do
+      note = build(:note_on_merge_request_diff)
+
+      expect(note).to receive(:diff).and_return(double)
+      expect(note).to receive(:noteable).and_return(nil)
+
+      expect(note).not_to be_active
+    end
+
+    it 'returns the memoized value if defined' do
+      note = build(:note_on_merge_request_diff)
+
+      note.instance_variable_set(:@active, 'foo')
+      expect(note).not_to receive(:find_noteable_diff)
+
+      expect(note.active?).to eq 'foo'
+    end
+
+    context 'for a merge request noteable' do
+      it 'is false when noteable has no matching diff' do
+        merge = build_stubbed(:merge_request, :simple)
+        note = build(:note_on_merge_request_diff, noteable: merge)
+
+        allow(note).to receive(:diff).and_return(double)
+        expect(note).to receive(:find_noteable_diff).and_return(nil)
+
+        expect(note).not_to be_active
+      end
+
+      it 'is true when noteable has a matching diff' do
+        merge = create(:merge_request, :simple)
+
+        # Generate a real line_code value so we know it will match. We use a
+        # random line from a random diff just for funsies.
+        diff = merge.diffs.to_a.sample
+        line = Gitlab::Diff::Parser.new.parse(diff.diff.each_line).to_a.sample
+        code = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+
+        # We're persisting in order to trigger the set_diff callback
+        note = create(:note_on_merge_request_diff, noteable: merge, line_code: code)
+
+        # Make sure we don't get a false positive from a guard clause
+        expect(note).to receive(:find_noteable_diff).and_call_original
+        expect(note).to be_active
+      end
+    end
+  end
+end

From c452fa8124ffe18e2e74e14491dcb3e419e60057 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 13 May 2016 14:53:42 -0500
Subject: [PATCH 0403/1431] Update specs

---
 features/steps/shared/diff_note.rb            | 12 +--
 spec/factories/notes.rb                       |  4 +-
 spec/features/notes_on_merge_requests_spec.rb |  2 +-
 spec/models/note_spec.rb                      | 76 +------------------
 4 files changed, 10 insertions(+), 84 deletions(-)

diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index e846c52d474..e8b1e4b4879 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -23,7 +23,7 @@ module SharedDiffNote
     page.within(diff_file_selector) do
       click_diff_line(sample_commit.line_code)
 
-      page.within("form[id$='#{sample_commit.line_code}']") do
+      page.within("form[id$='#{sample_commit.line_code}-true']") do
         fill_in "note[note]", with: "Typo, please fix"
         find(".js-comment-button").trigger("click")
         sleep 0.05
@@ -33,7 +33,7 @@ module SharedDiffNote
 
   step 'I leave a diff comment in a parallel view on the left side like "Old comment"' do
     click_parallel_diff_line(sample_commit.line_code, 'old')
-    page.within("#{diff_file_selector} form[id$='#{sample_commit.line_code}']") do
+    page.within("#{diff_file_selector} form[id$='#{sample_commit.line_code}-true']") do
       fill_in "note[note]", with: "Old comment"
       find(".js-comment-button").trigger("click")
     end
@@ -41,7 +41,7 @@ module SharedDiffNote
 
   step 'I leave a diff comment in a parallel view on the right side like "New comment"' do
     click_parallel_diff_line(sample_commit.line_code, 'new')
-    page.within("#{diff_file_selector} form[id$='#{sample_commit.line_code}']") do
+    page.within("#{diff_file_selector} form[id$='#{sample_commit.line_code}-true']") do
       fill_in "note[note]", with: "New comment"
       find(".js-comment-button").trigger("click")
     end
@@ -51,7 +51,7 @@ module SharedDiffNote
     page.within(diff_file_selector) do
       click_diff_line(sample_commit.line_code)
 
-      page.within("form[id$='#{sample_commit.line_code}']") do
+      page.within("form[id$='#{sample_commit.line_code}-true']") do
         fill_in "note[note]", with: "Should fix it :smile:"
         find('.js-md-preview-button').click
       end
@@ -62,7 +62,7 @@ module SharedDiffNote
     page.within(diff_file_selector) do
       click_diff_line(sample_commit.del_line_code)
 
-      page.within("form[id$='#{sample_commit.del_line_code}']") do
+      page.within("form[id$='#{sample_commit.del_line_code}-true']") do
         fill_in "note[note]", with: "DRY this up"
         find('.js-md-preview-button').click
       end
@@ -91,7 +91,7 @@ module SharedDiffNote
     page.within(diff_file_selector) do
       click_diff_line(sample_commit.line_code)
 
-      page.within("form[id$='#{sample_commit.line_code}']") do
+      page.within("form[id$='#{sample_commit.line_code}-true']") do
         fill_in 'note[note]', with: ':smile:'
         click_button('Comment')
       end
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 840b13196a6..26719f2652c 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -9,10 +9,10 @@ FactoryGirl.define do
     author
 
     factory :note_on_commit,             traits: [:on_commit]
-    factory :note_on_commit_diff,        traits: [:on_commit, :on_diff]
+    factory :note_on_commit_diff,        traits: [:on_commit, :on_diff], class: LegacyDiffNote
     factory :note_on_issue,              traits: [:on_issue], aliases: [:votable_note]
     factory :note_on_merge_request,      traits: [:on_merge_request]
-    factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff]
+    factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote
     factory :note_on_project_snippet,    traits: [:on_project_snippet]
     factory :system_note,                traits: [:system]
     factory :downvote_note,              traits: [:award, :downvote]
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 389812ff7e1..9e9fec01943 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -192,7 +192,7 @@ describe 'Comments', feature: true do
         end
 
         it 'should be removed when canceled' do
-          page.within(".diff-file form[id$='#{line_code}']") do
+          page.within(".diff-file form[id$='#{line_code}-true']") do
             find('.js-close-discussion-note-form').trigger('click')
           end
 
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 264888cb376..5d916f0e6a6 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -34,20 +34,6 @@ describe Note, models: true do
     end
   end
 
-  describe "Commit diff line notes" do
-    let!(:note) { create(:note_on_commit_diff, note: "+1 from me") }
-    let!(:commit) { note.noteable }
-
-    it "should save a valid note" do
-      expect(note.commit_id).to eq(commit.id)
-      expect(note.noteable.id).to eq(commit.id)
-    end
-
-    it "should be recognized by #legacy_diff_note?" do
-      expect(note).to be_legacy_diff_note
-    end
-  end
-
   describe 'authorization' do
     before do
       @p1 = create(:project)
@@ -144,66 +130,6 @@ describe Note, models: true do
     end
   end
 
-  describe '#active?' do
-    it 'is always true when the note has no associated diff' do
-      note = build(:note)
-
-      expect(note).to receive(:diff).and_return(nil)
-
-      expect(note).to be_active
-    end
-
-    it 'is never true when the note has no noteable associated' do
-      note = build(:note)
-
-      expect(note).to receive(:diff).and_return(double)
-      expect(note).to receive(:noteable).and_return(nil)
-
-      expect(note).not_to be_active
-    end
-
-    it 'returns the memoized value if defined' do
-      note = build(:note)
-
-      expect(note).to receive(:diff).and_return(double)
-      expect(note).to receive(:noteable).and_return(double)
-
-      note.instance_variable_set(:@active, 'foo')
-      expect(note).not_to receive(:find_noteable_diff)
-
-      expect(note.active?).to eq 'foo'
-    end
-
-    context 'for a merge request noteable' do
-      it 'is false when noteable has no matching diff' do
-        merge = build_stubbed(:merge_request, :simple)
-        note = build(:note, noteable: merge)
-
-        allow(note).to receive(:diff).and_return(double)
-        expect(note).to receive(:find_noteable_diff).and_return(nil)
-
-        expect(note).not_to be_active
-      end
-
-      it 'is true when noteable has a matching diff' do
-        merge = create(:merge_request, :simple)
-
-        # Generate a real line_code value so we know it will match. We use a
-        # random line from a random diff just for funsies.
-        diff = merge.diffs.to_a.sample
-        line = Gitlab::Diff::Parser.new.parse(diff.diff.each_line).to_a.sample
-        code = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
-
-        # We're persisting in order to trigger the set_diff callback
-        note = create(:note, noteable: merge, line_code: code)
-
-        # Make sure we don't get a false positive from a guard clause
-        expect(note).to receive(:find_noteable_diff).and_call_original
-        expect(note).to be_active
-      end
-    end
-  end
-
   describe "editable?" do
     it "returns true" do
       note = build(:note)
@@ -254,7 +180,7 @@ describe Note, models: true do
     end
 
     it "is not an award emoji when comment is on a diff" do
-      note = create(:note, note: ":blowfish:", noteable: merge_request, line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2")
+      note = create(:note_on_merge_request_diff, note: ":blowfish:", noteable: merge_request, line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2")
       note = note.reload
 
       expect(note.note).to eq(":blowfish:")

From e0bb169ae390a00b3993bd0551859db05ad2bde1 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 13 May 2016 14:53:55 -0500
Subject: [PATCH 0404/1431] "the outdated diff" -> "an outdated diff"

---
 app/views/projects/notes/_discussion.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index 40e03050a7d..aa26d8e87f1 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -26,7 +26,7 @@
                 = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
                   the diff
               - else
-                the outdated diff
+                an outdated diff
 
             = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "note-created-ago")
 

From e5ce1668061904a559ac6b9e5c830436fc743795 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 13 May 2016 16:02:22 -0500
Subject: [PATCH 0405/1431] Satisfy Rubocop

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

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 6e02f1240fe..10b5932affa 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -22,7 +22,7 @@ class Projects::CommitController < Projects::ApplicationController
     @note = @project.build_commit_note(commit)
     @notes = commit.notes.non_diff_notes.fresh
     @noteable = @commit
-    @comments_target  = {
+    @comments_target = {
       noteable_type: 'Commit',
       commit_id: @commit.id
     }

From 876dc7bacb5c2835537d13dfedd2f7ed55463c6b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 13 May 2016 17:25:00 -0500
Subject: [PATCH 0406/1431] Rename diff_with_notes partial.

---
 app/views/projects/notes/_discussion.html.haml                  | 2 +-
 ...acy_diff_with_notes.html.haml => _diff_with_notes.html.haml} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/views/projects/notes/discussions/{_legacy_diff_with_notes.html.haml => _diff_with_notes.html.haml} (100%)

diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index aa26d8e87f1..7869d6413d8 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -41,6 +41,6 @@
 
         .discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
           - if note.diff_note?
-            = render "projects/notes/discussions/legacy_diff_with_notes", discussion_notes: discussion_notes
+            = render "projects/notes/discussions/diff_with_notes", discussion_notes: discussion_notes
           - else
             = render "projects/notes/discussions/notes", discussion_notes: discussion_notes
diff --git a/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml b/app/views/projects/notes/discussions/_diff_with_notes.html.haml
similarity index 100%
rename from app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml
rename to app/views/projects/notes/discussions/_diff_with_notes.html.haml

From 4b4f2cf53b2ed9d5d1747469b7fb7779ea803058 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 26 Apr 2016 18:14:37 -0600
Subject: [PATCH 0407/1431] Replace animate.css with a smaller subset of
 animations.

As discussed in #15667.
---
 CHANGELOG                                     |  1 +
 app/assets/stylesheets/application.scss       |  1 -
 app/assets/stylesheets/framework.scss         |  1 +
 .../stylesheets/framework/animations.scss     | 72 +++++++++++++++++++
 vendor/assets/stylesheets/animate.css         | 11 ---
 5 files changed, 74 insertions(+), 12 deletions(-)
 create mode 100644 app/assets/stylesheets/framework/animations.scss
 delete mode 100644 vendor/assets/stylesheets/animate.css

diff --git a/CHANGELOG b/CHANGELOG
index 30d4955c9f3..b166598a117 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,6 +72,7 @@ v 8.7.3
   - Merge request widget displays TeamCity build state and code coverage correctly again.
   - Fix the line code when importing PR review comments from GitHub. !4010
   - Wikis are now initialized on legacy projects when checking repositories
+  - Remove animate.css in favor of a smaller subset of animations. !3937 (Connor Shea)
 
 v 8.7.2
   - The "New Branch" button is now loaded asynchronously
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 69b3b6586de..e2d590f4df4 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -10,7 +10,6 @@
  *= require dropzone/basic
  *= require cal-heatmap
  *= require cropper.css
- *= require animate
 */
 
 /*
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 560de9fc0bd..3cbddc59f11 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -5,6 +5,7 @@
 @import 'framework/tw_bootstrap';
 @import "framework/layout";
 
+@import "framework/animations.scss";
 @import "framework/avatar.scss";
 @import "framework/blocks.scss";
 @import "framework/buttons.scss";
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
new file mode 100644
index 00000000000..1fec61bdba1
--- /dev/null
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -0,0 +1,72 @@
+// This file is based off animate.css 3.5.1, available here:
+// https://github.com/daneden/animate.css/blob/3.5.1/animate.css
+// 
+// animate.css - http://daneden.me/animate
+// Version - 3.5.1
+// Licensed under the MIT license - http://opensource.org/licenses/MIT
+// 
+// Copyright (c) 2016 Daniel Eden
+
+.animated {
+  -webkit-animation-duration: 1s;
+  animation-duration: 1s;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+.animated.infinite {
+  -webkit-animation-iteration-count: infinite;
+  animation-iteration-count: infinite;
+}
+
+.animated.hinge {
+  -webkit-animation-duration: 2s;
+  animation-duration: 2s;
+}
+
+.animated.flipOutX,
+.animated.flipOutY,
+.animated.bounceIn,
+.animated.bounceOut {
+  -webkit-animation-duration: .75s;
+  animation-duration: .75s;
+}
+
+@-webkit-keyframes pulse {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  50% {
+    -webkit-transform: scale3d(1.05, 1.05, 1.05);
+    transform: scale3d(1.05, 1.05, 1.05);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes pulse {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  50% {
+    -webkit-transform: scale3d(1.05, 1.05, 1.05);
+    transform: scale3d(1.05, 1.05, 1.05);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+.pulse {
+  -webkit-animation-name: pulse;
+  animation-name: pulse;
+}
diff --git a/vendor/assets/stylesheets/animate.css b/vendor/assets/stylesheets/animate.css
deleted file mode 100644
index b6f61295392..00000000000
--- a/vendor/assets/stylesheets/animate.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@charset "UTF-8";
-
-/*!
- * animate.css -http://daneden.me/animate
- * Version - 3.5.1
- * Licensed under the MIT license - http://opensource.org/licenses/MIT
- *
- * Copyright (c) 2016 Daniel Eden
- */
-
-.animated{-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-fill-mode:both;animation-fill-mode:both}.animated.infinite{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.animated.hinge{-webkit-animation-duration:2s;animation-duration:2s}.animated.bounceIn,.animated.bounceOut,.animated.flipOutX,.animated.flipOutY{-webkit-animation-duration:.75s;animation-duration:.75s}@-webkit-keyframes bounce{0%,20%,53%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1);-webkit-transform:translateZ(0);transform:translateZ(0)}40%,43%{-webkit-transform:translate3d(0,-30px,0);transform:translate3d(0,-30px,0)}40%,43%,70%{-webkit-animation-timing-function:cubic-bezier(.755,.05,.855,.06);animation-timing-function:cubic-bezier(.755,.05,.855,.06)}70%{-webkit-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}90%{-webkit-transform:translate3d(0,-4px,0);transform:translate3d(0,-4px,0)}}@keyframes bounce{0%,20%,53%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1);-webkit-transform:translateZ(0);transform:translateZ(0)}40%,43%{-webkit-transform:translate3d(0,-30px,0);transform:translate3d(0,-30px,0)}40%,43%,70%{-webkit-animation-timing-function:cubic-bezier(.755,.05,.855,.06);animation-timing-function:cubic-bezier(.755,.05,.855,.06)}70%{-webkit-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}90%{-webkit-transform:translate3d(0,-4px,0);transform:translate3d(0,-4px,0)}}.bounce{-webkit-animation-name:bounce;animation-name:bounce;-webkit-transform-origin:center bottom;transform-origin:center bottom}@-webkit-keyframes flash{0%,50%,to{opacity:1}25%,75%{opacity:0}}@keyframes flash{0%,50%,to{opacity:1}25%,75%{opacity:0}}.flash{-webkit-animation-name:flash;animation-name:flash}@-webkit-keyframes pulse{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}50%{-webkit-transform:scale3d(1.05,1.05,1.05);transform:scale3d(1.05,1.05,1.05)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes pulse{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}50%{-webkit-transform:scale3d(1.05,1.05,1.05);transform:scale3d(1.05,1.05,1.05)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}.pulse{-webkit-animation-name:pulse;animation-name:pulse}@-webkit-keyframes rubberBand{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}30%{-webkit-transform:scale3d(1.25,.75,1);transform:scale3d(1.25,.75,1)}40%{-webkit-transform:scale3d(.75,1.25,1);transform:scale3d(.75,1.25,1)}50%{-webkit-transform:scale3d(1.15,.85,1);transform:scale3d(1.15,.85,1)}65%{-webkit-transform:scale3d(.95,1.05,1);transform:scale3d(.95,1.05,1)}75%{-webkit-transform:scale3d(1.05,.95,1);transform:scale3d(1.05,.95,1)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes rubberBand{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}30%{-webkit-transform:scale3d(1.25,.75,1);transform:scale3d(1.25,.75,1)}40%{-webkit-transform:scale3d(.75,1.25,1);transform:scale3d(.75,1.25,1)}50%{-webkit-transform:scale3d(1.15,.85,1);transform:scale3d(1.15,.85,1)}65%{-webkit-transform:scale3d(.95,1.05,1);transform:scale3d(.95,1.05,1)}75%{-webkit-transform:scale3d(1.05,.95,1);transform:scale3d(1.05,.95,1)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}.rubberBand{-webkit-animation-name:rubberBand;animation-name:rubberBand}@-webkit-keyframes shake{0%,to{-webkit-transform:translateZ(0);transform:translateZ(0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}@keyframes shake{0%,to{-webkit-transform:translateZ(0);transform:translateZ(0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}.shake{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes headShake{0%{-webkit-transform:translateX(0);transform:translateX(0)}6.5%{-webkit-transform:translateX(-6px) rotateY(-9deg);transform:translateX(-6px) rotateY(-9deg)}18.5%{-webkit-transform:translateX(5px) rotateY(7deg);transform:translateX(5px) rotateY(7deg)}31.5%{-webkit-transform:translateX(-3px) rotateY(-5deg);transform:translateX(-3px) rotateY(-5deg)}43.5%{-webkit-transform:translateX(2px) rotateY(3deg);transform:translateX(2px) rotateY(3deg)}50%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes headShake{0%{-webkit-transform:translateX(0);transform:translateX(0)}6.5%{-webkit-transform:translateX(-6px) rotateY(-9deg);transform:translateX(-6px) rotateY(-9deg)}18.5%{-webkit-transform:translateX(5px) rotateY(7deg);transform:translateX(5px) rotateY(7deg)}31.5%{-webkit-transform:translateX(-3px) rotateY(-5deg);transform:translateX(-3px) rotateY(-5deg)}43.5%{-webkit-transform:translateX(2px) rotateY(3deg);transform:translateX(2px) rotateY(3deg)}50%{-webkit-transform:translateX(0);transform:translateX(0)}}.headShake{-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;-webkit-animation-name:headShake;animation-name:headShake}@-webkit-keyframes swing{20%{-webkit-transform:rotate(15deg);transform:rotate(15deg)}40%{-webkit-transform:rotate(-10deg);transform:rotate(-10deg)}60%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}80%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(0deg);transform:rotate(0deg)}}@keyframes swing{20%{-webkit-transform:rotate(15deg);transform:rotate(15deg)}40%{-webkit-transform:rotate(-10deg);transform:rotate(-10deg)}60%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}80%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(0deg);transform:rotate(0deg)}}.swing{-webkit-transform-origin:top center;transform-origin:top center;-webkit-animation-name:swing;animation-name:swing}@-webkit-keyframes tada{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}10%,20%{-webkit-transform:scale3d(.9,.9,.9) rotate(-3deg);transform:scale3d(.9,.9,.9) rotate(-3deg)}30%,50%,70%,90%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(3deg);transform:scale3d(1.1,1.1,1.1) rotate(3deg)}40%,60%,80%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(-3deg);transform:scale3d(1.1,1.1,1.1) rotate(-3deg)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes tada{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}10%,20%{-webkit-transform:scale3d(.9,.9,.9) rotate(-3deg);transform:scale3d(.9,.9,.9) rotate(-3deg)}30%,50%,70%,90%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(3deg);transform:scale3d(1.1,1.1,1.1) rotate(3deg)}40%,60%,80%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(-3deg);transform:scale3d(1.1,1.1,1.1) rotate(-3deg)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}.tada{-webkit-animation-name:tada;animation-name:tada}@-webkit-keyframes wobble{0%{-webkit-transform:none;transform:none}15%{-webkit-transform:translate3d(-25%,0,0) rotate(-5deg);transform:translate3d(-25%,0,0) rotate(-5deg)}30%{-webkit-transform:translate3d(20%,0,0) rotate(3deg);transform:translate3d(20%,0,0) rotate(3deg)}45%{-webkit-transform:translate3d(-15%,0,0) rotate(-3deg);transform:translate3d(-15%,0,0) rotate(-3deg)}60%{-webkit-transform:translate3d(10%,0,0) rotate(2deg);transform:translate3d(10%,0,0) rotate(2deg)}75%{-webkit-transform:translate3d(-5%,0,0) rotate(-1deg);transform:translate3d(-5%,0,0) rotate(-1deg)}to{-webkit-transform:none;transform:none}}@keyframes wobble{0%{-webkit-transform:none;transform:none}15%{-webkit-transform:translate3d(-25%,0,0) rotate(-5deg);transform:translate3d(-25%,0,0) rotate(-5deg)}30%{-webkit-transform:translate3d(20%,0,0) rotate(3deg);transform:translate3d(20%,0,0) rotate(3deg)}45%{-webkit-transform:translate3d(-15%,0,0) rotate(-3deg);transform:translate3d(-15%,0,0) rotate(-3deg)}60%{-webkit-transform:translate3d(10%,0,0) rotate(2deg);transform:translate3d(10%,0,0) rotate(2deg)}75%{-webkit-transform:translate3d(-5%,0,0) rotate(-1deg);transform:translate3d(-5%,0,0) rotate(-1deg)}to{-webkit-transform:none;transform:none}}.wobble{-webkit-animation-name:wobble;animation-name:wobble}@-webkit-keyframes jello{0%,11.1%,to{-webkit-transform:none;transform:none}22.2%{-webkit-transform:skewX(-12.5deg) skewY(-12.5deg);transform:skewX(-12.5deg) skewY(-12.5deg)}33.3%{-webkit-transform:skewX(6.25deg) skewY(6.25deg);transform:skewX(6.25deg) skewY(6.25deg)}44.4%{-webkit-transform:skewX(-3.125deg) skewY(-3.125deg);transform:skewX(-3.125deg) skewY(-3.125deg)}55.5%{-webkit-transform:skewX(1.5625deg) skewY(1.5625deg);transform:skewX(1.5625deg) skewY(1.5625deg)}66.6%{-webkit-transform:skewX(-.78125deg) skewY(-.78125deg);transform:skewX(-.78125deg) skewY(-.78125deg)}77.7%{-webkit-transform:skewX(.390625deg) skewY(.390625deg);transform:skewX(.390625deg) skewY(.390625deg)}88.8%{-webkit-transform:skewX(-.1953125deg) skewY(-.1953125deg);transform:skewX(-.1953125deg) skewY(-.1953125deg)}}@keyframes jello{0%,11.1%,to{-webkit-transform:none;transform:none}22.2%{-webkit-transform:skewX(-12.5deg) skewY(-12.5deg);transform:skewX(-12.5deg) skewY(-12.5deg)}33.3%{-webkit-transform:skewX(6.25deg) skewY(6.25deg);transform:skewX(6.25deg) skewY(6.25deg)}44.4%{-webkit-transform:skewX(-3.125deg) skewY(-3.125deg);transform:skewX(-3.125deg) skewY(-3.125deg)}55.5%{-webkit-transform:skewX(1.5625deg) skewY(1.5625deg);transform:skewX(1.5625deg) skewY(1.5625deg)}66.6%{-webkit-transform:skewX(-.78125deg) skewY(-.78125deg);transform:skewX(-.78125deg) skewY(-.78125deg)}77.7%{-webkit-transform:skewX(.390625deg) skewY(.390625deg);transform:skewX(.390625deg) skewY(.390625deg)}88.8%{-webkit-transform:skewX(-.1953125deg) skewY(-.1953125deg);transform:skewX(-.1953125deg) skewY(-.1953125deg)}}.jello{-webkit-animation-name:jello;animation-name:jello;-webkit-transform-origin:center;transform-origin:center}@-webkit-keyframes bounceIn{0%,20%,40%,60%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}20%{-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}40%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}60%{opacity:1;-webkit-transform:scale3d(1.03,1.03,1.03);transform:scale3d(1.03,1.03,1.03)}80%{-webkit-transform:scale3d(.97,.97,.97);transform:scale3d(.97,.97,.97)}to{opacity:1;-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes bounceIn{0%,20%,40%,60%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}20%{-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}40%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}60%{opacity:1;-webkit-transform:scale3d(1.03,1.03,1.03);transform:scale3d(1.03,1.03,1.03)}80%{-webkit-transform:scale3d(.97,.97,.97);transform:scale3d(.97,.97,.97)}to{opacity:1;-webkit-transform:scaleX(1);transform:scaleX(1)}}.bounceIn{-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes bounceInDown{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,-3000px,0);transform:translate3d(0,-3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,25px,0);transform:translate3d(0,25px,0)}75%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}90%{-webkit-transform:translate3d(0,5px,0);transform:translate3d(0,5px,0)}to{-webkit-transform:none;transform:none}}@keyframes bounceInDown{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,-3000px,0);transform:translate3d(0,-3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,25px,0);transform:translate3d(0,25px,0)}75%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}90%{-webkit-transform:translate3d(0,5px,0);transform:translate3d(0,5px,0)}to{-webkit-transform:none;transform:none}}.bounceInDown{-webkit-animation-name:bounceInDown;animation-name:bounceInDown}@-webkit-keyframes bounceInLeft{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(-3000px,0,0);transform:translate3d(-3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(25px,0,0);transform:translate3d(25px,0,0)}75%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}90%{-webkit-transform:translate3d(5px,0,0);transform:translate3d(5px,0,0)}to{-webkit-transform:none;transform:none}}@keyframes bounceInLeft{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(-3000px,0,0);transform:translate3d(-3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(25px,0,0);transform:translate3d(25px,0,0)}75%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}90%{-webkit-transform:translate3d(5px,0,0);transform:translate3d(5px,0,0)}to{-webkit-transform:none;transform:none}}.bounceInLeft{-webkit-animation-name:bounceInLeft;animation-name:bounceInLeft}@-webkit-keyframes bounceInRight{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(3000px,0,0);transform:translate3d(3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(-25px,0,0);transform:translate3d(-25px,0,0)}75%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}90%{-webkit-transform:translate3d(-5px,0,0);transform:translate3d(-5px,0,0)}to{-webkit-transform:none;transform:none}}@keyframes bounceInRight{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(3000px,0,0);transform:translate3d(3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(-25px,0,0);transform:translate3d(-25px,0,0)}75%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}90%{-webkit-transform:translate3d(-5px,0,0);transform:translate3d(-5px,0,0)}to{-webkit-transform:none;transform:none}}.bounceInRight{-webkit-animation-name:bounceInRight;animation-name:bounceInRight}@-webkit-keyframes bounceInUp{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,3000px,0);transform:translate3d(0,3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}75%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}90%{-webkit-transform:translate3d(0,-5px,0);transform:translate3d(0,-5px,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes bounceInUp{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,3000px,0);transform:translate3d(0,3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}75%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}90%{-webkit-transform:translate3d(0,-5px,0);transform:translate3d(0,-5px,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.bounceInUp{-webkit-animation-name:bounceInUp;animation-name:bounceInUp}@-webkit-keyframes bounceOut{20%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}to{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}}@keyframes bounceOut{20%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}to{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}}.bounceOut{-webkit-animation-name:bounceOut;animation-name:bounceOut}@-webkit-keyframes bounceOutDown{20%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}@keyframes bounceOutDown{20%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}.bounceOutDown{-webkit-animation-name:bounceOutDown;animation-name:bounceOutDown}@-webkit-keyframes bounceOutLeft{20%{opacity:1;-webkit-transform:translate3d(20px,0,0);transform:translate3d(20px,0,0)}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}@keyframes bounceOutLeft{20%{opacity:1;-webkit-transform:translate3d(20px,0,0);transform:translate3d(20px,0,0)}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}.bounceOutLeft{-webkit-animation-name:bounceOutLeft;animation-name:bounceOutLeft}@-webkit-keyframes bounceOutRight{20%{opacity:1;-webkit-transform:translate3d(-20px,0,0);transform:translate3d(-20px,0,0)}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}@keyframes bounceOutRight{20%{opacity:1;-webkit-transform:translate3d(-20px,0,0);transform:translate3d(-20px,0,0)}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}.bounceOutRight{-webkit-animation-name:bounceOutRight;animation-name:bounceOutRight}@-webkit-keyframes bounceOutUp{20%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,20px,0);transform:translate3d(0,20px,0)}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}@keyframes bounceOutUp{20%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,20px,0);transform:translate3d(0,20px,0)}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}.bounceOutUp{-webkit-animation-name:bounceOutUp;animation-name:bounceOutUp}@-webkit-keyframes fadeIn{0%{opacity:0}to{opacity:1}}@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.fadeIn{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes fadeInDown{0%{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInDown{0%{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInDown{-webkit-animation-name:fadeInDown;animation-name:fadeInDown}@-webkit-keyframes fadeInDownBig{0%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInDownBig{0%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInDownBig{-webkit-animation-name:fadeInDownBig;animation-name:fadeInDownBig}@-webkit-keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInLeft{-webkit-animation-name:fadeInLeft;animation-name:fadeInLeft}@-webkit-keyframes fadeInLeftBig{0%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInLeftBig{0%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInLeftBig{-webkit-animation-name:fadeInLeftBig;animation-name:fadeInLeftBig}@-webkit-keyframes fadeInRight{0%{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInRight{0%{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInRight{-webkit-animation-name:fadeInRight;animation-name:fadeInRight}@-webkit-keyframes fadeInRightBig{0%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInRightBig{0%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInRightBig{-webkit-animation-name:fadeInRightBig;animation-name:fadeInRightBig}@-webkit-keyframes fadeInUp{0%{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInUp{0%{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInUp{-webkit-animation-name:fadeInUp;animation-name:fadeInUp}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}to{opacity:1;-webkit-transform:none;transform:none}}.fadeInUpBig{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes fadeOut{0%{opacity:1}to{opacity:0}}@keyframes fadeOut{0%{opacity:1}to{opacity:0}}.fadeOut{-webkit-animation-name:fadeOut;animation-name:fadeOut}@-webkit-keyframes fadeOutDown{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes fadeOutDown{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.fadeOutDown{-webkit-animation-name:fadeOutDown;animation-name:fadeOutDown}@-webkit-keyframes fadeOutDownBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}@keyframes fadeOutDownBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}.fadeOutDownBig{-webkit-animation-name:fadeOutDownBig;animation-name:fadeOutDownBig}@-webkit-keyframes fadeOutLeft{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@keyframes fadeOutLeft{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.fadeOutLeft{-webkit-animation-name:fadeOutLeft;animation-name:fadeOutLeft}@-webkit-keyframes fadeOutLeftBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}@keyframes fadeOutLeftBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}.fadeOutLeftBig{-webkit-animation-name:fadeOutLeftBig;animation-name:fadeOutLeftBig}@-webkit-keyframes fadeOutRight{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@keyframes fadeOutRight{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.fadeOutRight{-webkit-animation-name:fadeOutRight;animation-name:fadeOutRight}@-webkit-keyframes fadeOutRightBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}@keyframes fadeOutRightBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}.fadeOutRightBig{-webkit-animation-name:fadeOutRightBig;animation-name:fadeOutRightBig}@-webkit-keyframes fadeOutUp{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}@keyframes fadeOutUp{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}.fadeOutUp{-webkit-animation-name:fadeOutUp;animation-name:fadeOutUp}@-webkit-keyframes fadeOutUpBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}@keyframes fadeOutUpBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}.fadeOutUpBig{-webkit-animation-name:fadeOutUpBig;animation-name:fadeOutUpBig}@-webkit-keyframes flip{0%{-webkit-transform:perspective(400px) rotateY(-1turn);transform:perspective(400px) rotateY(-1turn)}0%,40%{-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}40%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-190deg);transform:perspective(400px) translateZ(150px) rotateY(-190deg)}50%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-170deg);transform:perspective(400px) translateZ(150px) rotateY(-170deg)}50%,80%{-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}80%{-webkit-transform:perspective(400px) scale3d(.95,.95,.95);transform:perspective(400px) scale3d(.95,.95,.95)}to{-webkit-transform:perspective(400px);transform:perspective(400px);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}}@keyframes flip{0%{-webkit-transform:perspective(400px) rotateY(-1turn);transform:perspective(400px) rotateY(-1turn)}0%,40%{-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}40%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-190deg);transform:perspective(400px) translateZ(150px) rotateY(-190deg)}50%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-170deg);transform:perspective(400px) translateZ(150px) rotateY(-170deg)}50%,80%{-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}80%{-webkit-transform:perspective(400px) scale3d(.95,.95,.95);transform:perspective(400px) scale3d(.95,.95,.95)}to{-webkit-transform:perspective(400px);transform:perspective(400px);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}}.animated.flip{-webkit-backface-visibility:visible;backface-visibility:visible;-webkit-animation-name:flip;animation-name:flip}@-webkit-keyframes flipInX{0%{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);opacity:0}0%,40%{-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}40%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg)}60%{-webkit-transform:perspective(400px) rotateX(10deg);transform:perspective(400px) rotateX(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateX(-5deg);transform:perspective(400px) rotateX(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}@keyframes flipInX{0%{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);opacity:0}0%,40%{-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}40%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg)}60%{-webkit-transform:perspective(400px) rotateX(10deg);transform:perspective(400px) rotateX(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateX(-5deg);transform:perspective(400px) rotateX(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}.flipInX{-webkit-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipInX;animation-name:flipInX}@-webkit-keyframes flipInY{0%{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);opacity:0}0%,40%{-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}40%{-webkit-transform:perspective(400px) rotateY(-20deg);transform:perspective(400px) rotateY(-20deg)}60%{-webkit-transform:perspective(400px) rotateY(10deg);transform:perspective(400px) rotateY(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateY(-5deg);transform:perspective(400px) rotateY(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}@keyframes flipInY{0%{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);opacity:0}0%,40%{-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}40%{-webkit-transform:perspective(400px) rotateY(-20deg);transform:perspective(400px) rotateY(-20deg)}60%{-webkit-transform:perspective(400px) rotateY(10deg);transform:perspective(400px) rotateY(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateY(-5deg);transform:perspective(400px) rotateY(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}.flipInY{-webkit-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipInY;animation-name:flipInY}@-webkit-keyframes flipOutX{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg);opacity:1}to{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);opacity:0}}@keyframes flipOutX{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg);opacity:1}to{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);opacity:0}}.flipOutX{-webkit-animation-name:flipOutX;animation-name:flipOutX;-webkit-backface-visibility:visible!important;backface-visibility:visible!important}@-webkit-keyframes flipOutY{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateY(-15deg);transform:perspective(400px) rotateY(-15deg);opacity:1}to{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);opacity:0}}@keyframes flipOutY{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateY(-15deg);transform:perspective(400px) rotateY(-15deg);opacity:1}to{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);opacity:0}}.flipOutY{-webkit-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipOutY;animation-name:flipOutY}@-webkit-keyframes lightSpeedIn{0%{-webkit-transform:translate3d(100%,0,0) skewX(-30deg);transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{-webkit-transform:skewX(20deg);transform:skewX(20deg)}60%,80%{opacity:1}80%{-webkit-transform:skewX(-5deg);transform:skewX(-5deg)}to{-webkit-transform:none;transform:none;opacity:1}}@keyframes lightSpeedIn{0%{-webkit-transform:translate3d(100%,0,0) skewX(-30deg);transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{-webkit-transform:skewX(20deg);transform:skewX(20deg)}60%,80%{opacity:1}80%{-webkit-transform:skewX(-5deg);transform:skewX(-5deg)}to{-webkit-transform:none;transform:none;opacity:1}}.lightSpeedIn{-webkit-animation-name:lightSpeedIn;animation-name:lightSpeedIn;-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}@-webkit-keyframes lightSpeedOut{0%{opacity:1}to{-webkit-transform:translate3d(100%,0,0) skewX(30deg);transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}@keyframes lightSpeedOut{0%{opacity:1}to{-webkit-transform:translate3d(100%,0,0) skewX(30deg);transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}.lightSpeedOut{-webkit-animation-name:lightSpeedOut;animation-name:lightSpeedOut;-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}@-webkit-keyframes rotateIn{0%{transform-origin:center;-webkit-transform:rotate(-200deg);transform:rotate(-200deg);opacity:0}0%,to{-webkit-transform-origin:center}to{transform-origin:center;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateIn{0%{transform-origin:center;-webkit-transform:rotate(-200deg);transform:rotate(-200deg);opacity:0}0%,to{-webkit-transform-origin:center}to{transform-origin:center;-webkit-transform:none;transform:none;opacity:1}}.rotateIn{-webkit-animation-name:rotateIn;animation-name:rotateIn}@-webkit-keyframes rotateInDownLeft{0%{transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInDownLeft{0%{transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:none;transform:none;opacity:1}}.rotateInDownLeft{-webkit-animation-name:rotateInDownLeft;animation-name:rotateInDownLeft}@-webkit-keyframes rotateInDownRight{0%{transform-origin:right bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInDownRight{0%{transform-origin:right bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:none;transform:none;opacity:1}}.rotateInDownRight{-webkit-animation-name:rotateInDownRight;animation-name:rotateInDownRight}@-webkit-keyframes rotateInUpLeft{0%{transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInUpLeft{0%{transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:none;transform:none;opacity:1}}.rotateInUpLeft{-webkit-animation-name:rotateInUpLeft;animation-name:rotateInUpLeft}@-webkit-keyframes rotateInUpRight{0%{transform-origin:right bottom;-webkit-transform:rotate(-90deg);transform:rotate(-90deg);opacity:0}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:none;transform:none;opacity:1}}@keyframes rotateInUpRight{0%{transform-origin:right bottom;-webkit-transform:rotate(-90deg);transform:rotate(-90deg);opacity:0}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:none;transform:none;opacity:1}}.rotateInUpRight{-webkit-animation-name:rotateInUpRight;animation-name:rotateInUpRight}@-webkit-keyframes rotateOut{0%{transform-origin:center;opacity:1}0%,to{-webkit-transform-origin:center}to{transform-origin:center;-webkit-transform:rotate(200deg);transform:rotate(200deg);opacity:0}}@keyframes rotateOut{0%{transform-origin:center;opacity:1}0%,to{-webkit-transform-origin:center}to{transform-origin:center;-webkit-transform:rotate(200deg);transform:rotate(200deg);opacity:0}}.rotateOut{-webkit-animation-name:rotateOut;animation-name:rotateOut}@-webkit-keyframes rotateOutDownLeft{0%{transform-origin:left bottom;opacity:1}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}}@keyframes rotateOutDownLeft{0%{transform-origin:left bottom;opacity:1}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}}.rotateOutDownLeft{-webkit-animation-name:rotateOutDownLeft;animation-name:rotateOutDownLeft}@-webkit-keyframes rotateOutDownRight{0%{transform-origin:right bottom;opacity:1}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}@keyframes rotateOutDownRight{0%{transform-origin:right bottom;opacity:1}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}.rotateOutDownRight{-webkit-animation-name:rotateOutDownRight;animation-name:rotateOutDownRight}@-webkit-keyframes rotateOutUpLeft{0%{transform-origin:left bottom;opacity:1}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}@keyframes rotateOutUpLeft{0%{transform-origin:left bottom;opacity:1}0%,to{-webkit-transform-origin:left bottom}to{transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}.rotateOutUpLeft{-webkit-animation-name:rotateOutUpLeft;animation-name:rotateOutUpLeft}@-webkit-keyframes rotateOutUpRight{0%{transform-origin:right bottom;opacity:1}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:0}}@keyframes rotateOutUpRight{0%{transform-origin:right bottom;opacity:1}0%,to{-webkit-transform-origin:right bottom}to{transform-origin:right bottom;-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:0}}.rotateOutUpRight{-webkit-animation-name:rotateOutUpRight;animation-name:rotateOutUpRight}@-webkit-keyframes hinge{0%{transform-origin:top left}0%,20%,60%{-webkit-transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}20%,60%{-webkit-transform:rotate(80deg);transform:rotate(80deg);transform-origin:top left}40%,80%{-webkit-transform:rotate(60deg);transform:rotate(60deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;opacity:1}to{-webkit-transform:translate3d(0,700px,0);transform:translate3d(0,700px,0);opacity:0}}@keyframes hinge{0%{transform-origin:top left}0%,20%,60%{-webkit-transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}20%,60%{-webkit-transform:rotate(80deg);transform:rotate(80deg);transform-origin:top left}40%,80%{-webkit-transform:rotate(60deg);transform:rotate(60deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;opacity:1}to{-webkit-transform:translate3d(0,700px,0);transform:translate3d(0,700px,0);opacity:0}}.hinge{-webkit-animation-name:hinge;animation-name:hinge}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0) rotate(-120deg);transform:translate3d(-100%,0,0) rotate(-120deg)}to{opacity:1;-webkit-transform:none;transform:none}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0) rotate(-120deg);transform:translate3d(-100%,0,0) rotate(-120deg)}to{opacity:1;-webkit-transform:none;transform:none}}.rollIn{-webkit-animation-name:rollIn;animation-name:rollIn}@-webkit-keyframes rollOut{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0) rotate(120deg);transform:translate3d(100%,0,0) rotate(120deg)}}@keyframes rollOut{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0) rotate(120deg);transform:translate3d(100%,0,0) rotate(120deg)}}.rollOut{-webkit-animation-name:rollOut;animation-name:rollOut}@-webkit-keyframes zoomIn{0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%{opacity:1}}@keyframes zoomIn{0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%{opacity:1}}.zoomIn{-webkit-animation-name:zoomIn;animation-name:zoomIn}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInDown{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInLeft{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes zoomInRight{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInRight{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInRight{-webkit-animation-name:zoomInRight;animation-name:zoomInRight}@-webkit-keyframes zoomInUp{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInUp{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInUp{-webkit-animation-name:zoomInUp;animation-name:zoomInUp}@-webkit-keyframes zoomOut{0%{opacity:1}50%{-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%,to{opacity:0}}@keyframes zoomOut{0%{opacity:1}50%{-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%,to{opacity:0}}.zoomOut{-webkit-animation-name:zoomOut;animation-name:zoomOut}@-webkit-keyframes zoomOutDown{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomOutDown{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomOutDown{-webkit-animation-name:zoomOutDown;animation-name:zoomOutDown}@-webkit-keyframes zoomOutLeft{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(-2000px,0,0);transform:scale(.1) translate3d(-2000px,0,0);-webkit-transform-origin:left center;transform-origin:left center}}@keyframes zoomOutLeft{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(-2000px,0,0);transform:scale(.1) translate3d(-2000px,0,0);-webkit-transform-origin:left center;transform-origin:left center}}.zoomOutLeft{-webkit-animation-name:zoomOutLeft;animation-name:zoomOutLeft}@-webkit-keyframes zoomOutRight{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(2000px,0,0);transform:scale(.1) translate3d(2000px,0,0);-webkit-transform-origin:right center;transform-origin:right center}}@keyframes zoomOutRight{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(2000px,0,0);transform:scale(.1) translate3d(2000px,0,0);-webkit-transform-origin:right center;transform-origin:right center}}.zoomOutRight{-webkit-animation-name:zoomOutRight;animation-name:zoomOutRight}@-webkit-keyframes zoomOutUp{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomOutUp{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomOutUp{-webkit-animation-name:zoomOutUp;animation-name:zoomOutUp}@-webkit-keyframes slideInDown{0%{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInDown{0%{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInDown{-webkit-animation-name:slideInDown;animation-name:slideInDown}@-webkit-keyframes slideInLeft{0%{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInLeft{0%{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInLeft{-webkit-animation-name:slideInLeft;animation-name:slideInLeft}@-webkit-keyframes slideInRight{0%{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInRight{0%{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInRight{-webkit-animation-name:slideInRight;animation-name:slideInRight}@-webkit-keyframes slideInUp{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInUp{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInUp{-webkit-animation-name:slideInUp;animation-name:slideInUp}@-webkit-keyframes slideOutDown{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes slideOutDown{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.slideOutDown{-webkit-animation-name:slideOutDown;animation-name:slideOutDown}@-webkit-keyframes slideOutLeft{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@keyframes slideOutLeft{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.slideOutLeft{-webkit-animation-name:slideOutLeft;animation-name:slideOutLeft}@-webkit-keyframes slideOutRight{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@keyframes slideOutRight{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.slideOutRight{-webkit-animation-name:slideOutRight;animation-name:slideOutRight}@-webkit-keyframes slideOutUp{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}@keyframes slideOutUp{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}.slideOutUp{-webkit-animation-name:slideOutUp;animation-name:slideOutUp}
\ No newline at end of file

From 7e1f14e21517d3907a0e096d44b30797612f69cd Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 26 Apr 2016 19:57:37 -0300
Subject: [PATCH 0408/1431] Preserve commits/diff/comments for PRs that were
 merged on GitHub

---
 app/models/merge_request.rb                   | 10 ++++++-
 app/models/merge_request_diff.rb              | 26 ++++++++++++++-----
 .../github_import/pull_request_formatter.rb   |  2 ++
 .../pull_request_formatter_spec.rb            |  6 +++++
 spec/models/merge_request_spec.rb             | 15 +++++++++--
 5 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 5c5e6007aa0..45ddcf6812a 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -26,6 +26,10 @@ class MergeRequest < ActiveRecord::Base
   # when creating new merge request
   attr_accessor :can_be_created, :compare_commits, :compare
 
+  # Temporary fields to store target_sha, and base_sha to
+  # compare when importing pull requests from GitHub
+  attr_accessor :base_target_sha, :head_source_sha
+
   state_machine :state, initial: :opened do
     event :close do
       transition [:reopened, :opened] => :closed
@@ -490,10 +494,14 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def target_sha
-    @target_sha ||= target_project.repository.commit(target_branch).try(:sha)
+    return @base_target_sha if defined?(@base_target_sha)
+
+    target_project.repository.commit(target_branch).try(:sha)
   end
 
   def source_sha
+    return @head_source_sha if defined?(@head_source_sha)
+
     last_commit.try(:sha) || source_tip.try(:sha)
   end
 
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index eb42c07b9b9..6ad8fc3f034 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -6,7 +6,7 @@ class MergeRequestDiff < ActiveRecord::Base
 
   belongs_to :merge_request
 
-  delegate :target_branch, :source_branch, to: :merge_request, prefix: nil
+  delegate :head_source_sha, :target_branch, :source_branch, to: :merge_request, prefix: nil
 
   state_machine :state, initial: :empty do
     state :collected
@@ -38,8 +38,8 @@ class MergeRequestDiff < ActiveRecord::Base
       @diffs_no_whitespace ||= begin
         compare = Gitlab::Git::Compare.new(
           self.repository.raw_repository,
-          self.target_branch,
-          self.source_sha,
+          self.base,
+          self.head,
         )
         compare.diffs(options)
       end
@@ -144,7 +144,7 @@ class MergeRequestDiff < ActiveRecord::Base
 
     self.st_diffs = new_diffs
 
-    self.base_commit_sha = self.repository.merge_base(self.source_sha, self.target_branch)
+    self.base_commit_sha = self.repository.merge_base(self.head, self.base)
 
     self.save
   end
@@ -160,10 +160,24 @@ class MergeRequestDiff < ActiveRecord::Base
   end
 
   def source_sha
+    return head_source_sha if head_source_sha.present?
+
     source_commit = merge_request.source_project.commit(source_branch)
     source_commit.try(:sha)
   end
 
+  def target_sha
+    merge_request.target_sha
+  end
+
+  def base
+    self.target_sha || self.target_branch
+  end
+
+  def head
+    self.source_sha
+  end
+
   def compare
     @compare ||=
       begin
@@ -172,8 +186,8 @@ class MergeRequestDiff < ActiveRecord::Base
 
         Gitlab::Git::Compare.new(
           self.repository.raw_repository,
-          self.target_branch,
-          self.source_sha
+          self.base,
+          self.head
         )
       end
   end
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index f242596bdf5..3b541a04d5c 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -8,8 +8,10 @@ module Gitlab
           description: description,
           source_project: source_project,
           source_branch: source_branch,
+          head_source_sha: source_sha,
           target_project: target_project,
           target_branch: target_branch,
+          base_target_sha: target_sha,
           state: state,
           milestone: milestone,
           author_id: author_id,
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index b1f3d17373b..1d15d3d937e 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -41,8 +41,10 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
           description: "*Created by: octocat*\n\nPlease pull these awesome changes",
           source_project: project,
           source_branch: 'feature',
+          head_source_sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b',
           target_project: project,
           target_branch: 'master',
+          base_target_sha: '8ffb3c15a5475e59ae909384297fede4badcb4c7',
           state: 'opened',
           milestone: nil,
           author_id: project.creator_id,
@@ -66,8 +68,10 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
           description: "*Created by: octocat*\n\nPlease pull these awesome changes",
           source_project: project,
           source_branch: 'feature',
+          head_source_sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b',
           target_project: project,
           target_branch: 'master',
+          base_target_sha: '8ffb3c15a5475e59ae909384297fede4badcb4c7',
           state: 'closed',
           milestone: nil,
           author_id: project.creator_id,
@@ -91,8 +95,10 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
           description: "*Created by: octocat*\n\nPlease pull these awesome changes",
           source_project: project,
           source_branch: 'feature',
+          head_source_sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b',
           target_project: project,
           target_branch: 'master',
+          base_target_sha: '8ffb3c15a5475e59ae909384297fede4badcb4c7',
           state: 'merged',
           milestone: nil,
           author_id: project.creator_id,
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index c8578749b21..9eef08c6d00 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -64,7 +64,13 @@ describe MergeRequest, models: true do
 
   describe '#target_sha' do
     context 'when the target branch does not exist anymore' do
-      subject { create(:merge_request).tap { |mr| mr.update_attribute(:target_branch, 'deleted') } }
+      let(:project) { create(:project) }
+
+      subject { create(:merge_request, source_project: project, target_project: project) }
+
+      before do
+        project.repository.raw_repository.delete_branch(subject.target_branch)
+      end
 
       it 'returns nil' do
         expect(subject.target_sha).to be_nil
@@ -289,7 +295,12 @@ describe MergeRequest, models: true do
     let(:fork_project) { create(:project, forked_from_project: project) }
 
     context 'when the target branch does not exist anymore' do
-      subject { create(:merge_request).tap { |mr| mr.update_attribute(:target_branch, 'deleted') } }
+      subject { create(:merge_request, source_project: project, target_project: project) }
+
+      before do
+        project.repository.raw_repository.delete_branch(subject.target_branch)
+        subject.reload
+      end
 
       it 'does not crash' do
         expect{ subject.diverged_commits_count }.not_to raise_error

From e001bd5e3d813fa72f724fc0e661b36099f678ea Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 9 May 2016 16:17:05 -0500
Subject: [PATCH 0409/1431] Import PRs where branch names were reused across
 PRs

---
 .../github_import/pull_request_formatter.rb   | 28 +++++++++++++---
 .../pull_request_formatter_spec.rb            | 32 +++++++++++++++----
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 3b541a04d5c..9f8182f643e 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -30,11 +30,19 @@ module Gitlab
       end
 
       def source_branch_exists?
-        source_project.repository.branch_names.include?(source_branch)
+        source_project.repository.branch_exists?(source_ref)
       end
 
       def source_branch
-        raw_data.head.ref
+        @source_branch ||= if source_branch_exists?
+                             source_ref
+                           else
+                             "#{source_ref}-#{short_id(source_sha)}"
+                           end
+      end
+
+      def short_id(sha, length = 7)
+        sha.to_s[0..length]
       end
 
       def source_sha
@@ -42,11 +50,15 @@ module Gitlab
       end
 
       def target_branch_exists?
-        target_project.repository.branch_names.include?(target_branch)
+        target_project.repository.branch_exists?(target_ref)
       end
 
       def target_branch
-        raw_data.base.ref
+        @target_branch ||= if target_branch_exists?
+                             target_ref
+                           else
+                             "#{target_ref}-#{short_id(target_sha)}"
+                           end
       end
 
       def target_sha
@@ -99,6 +111,10 @@ module Gitlab
         raw_data.head.repo
       end
 
+      def source_ref
+        raw_data.head.ref
+      end
+
       def target_project
         project
       end
@@ -107,6 +123,10 @@ module Gitlab
         raw_data.base.repo
       end
 
+      def target_ref
+        raw_data.base.ref
+      end
+
       def state
         @state ||= case true
                    when raw_data.state == 'closed' && raw_data.merged_at.present?
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index 1d15d3d937e..adedc57719e 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -164,10 +164,20 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
   end
 
   describe '#source_branch' do
-    let(:raw_data) { double(base_data) }
+    context 'when source branch exists' do
+      let(:raw_data) { double(base_data) }
 
-    it 'returns head ref' do
-      expect(pull_request.source_branch).to eq 'feature'
+      it 'returns head ref' do
+        expect(pull_request.source_branch).to eq 'feature'
+      end
+    end
+
+    context 'when source branch does not exist' do
+      let(:raw_data) { double(base_data.merge(head: double(ref: 'removed-branch', sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'))) }
+
+      it 'returns head ref' do
+        expect(pull_request.source_branch).to eq 'removed-branch-2e5d3239'
+      end
     end
   end
 
@@ -198,10 +208,20 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
   end
 
   describe '#target_branch' do
-    let(:raw_data) { double(base_data) }
+    context 'when target branch exists' do
+      let(:raw_data) { double(base_data) }
 
-    it 'returns base ref' do
-      expect(pull_request.target_branch).to eq 'master'
+      it 'returns base ref' do
+        expect(pull_request.target_branch).to eq 'master'
+      end
+    end
+
+    context 'when target branch does not exist' do
+      let(:raw_data) { double(base_data.merge(base: double(ref: 'removed-branch', sha: '8ffb3c15a5475e59ae909384297fede4badcb4c7'))) }
+
+      it 'returns head ref' do
+        expect(pull_request.target_branch).to eq 'removed-branch-8ffb3c15'
+      end
     end
   end
 

From 795a7ca8f171a1634134e8b8ce5cf80a65381903 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 9 May 2016 17:45:37 -0500
Subject: [PATCH 0410/1431] Extract GitHub branch formatter

---
 app/models/repository.rb                      |  4 +
 lib/gitlab/github_import/branch_formatter.rb  | 25 ++++++
 lib/gitlab/github_import/importer.rb          | 30 +++----
 .../github_import/pull_request_formatter.rb   | 74 +++-------------
 .../github_import/branch_formatter_spec.rb    | 57 ++++++++++++
 .../pull_request_formatter_spec.rb            | 88 -------------------
 6 files changed, 113 insertions(+), 165 deletions(-)
 create mode 100644 lib/gitlab/github_import/branch_formatter.rb
 create mode 100644 spec/lib/gitlab/github_import/branch_formatter_spec.rb

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 0eff74320f3..3716ea6ad6c 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -195,6 +195,10 @@ class Repository
     cache.fetch(:branch_names) { branches.map(&:name) }
   end
 
+  def branch_exists?(branch_name)
+    branch_names.include?(branch_name)
+  end
+
   def tag_names
     cache.fetch(:tag_names) { raw_repository.tag_names }
   end
diff --git a/lib/gitlab/github_import/branch_formatter.rb b/lib/gitlab/github_import/branch_formatter.rb
new file mode 100644
index 00000000000..f968ec4b102
--- /dev/null
+++ b/lib/gitlab/github_import/branch_formatter.rb
@@ -0,0 +1,25 @@
+module Gitlab
+  module GithubImport
+    class BranchFormatter < BaseFormatter
+      delegate :repo, :sha, :ref, to: :raw_data
+
+      def exists?
+        project.repository.branch_exists?(ref)
+      end
+
+      def name
+        @name ||= exists? ? ref : "#{ref}-#{short_id}"
+      end
+
+      def valid?
+        repo.present?
+      end
+
+      private
+
+      def short_id
+        sha.to_s[0..7]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 9aea947a812..1f160837c5d 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -6,8 +6,8 @@ module Gitlab
       attr_reader :client, :project, :repo, :repo_url
 
       def initialize(project)
-        @project = project
-        @repo = project.import_source
+        @project  = project
+        @repo     = project.import_source
         @repo_url = project.import_url
 
         if credentials
@@ -30,7 +30,7 @@ module Gitlab
       end
 
       def import_labels
-        client.labels(project.import_source).each do |raw_data|
+        client.labels(repo).each do |raw_data|
           Label.create!(LabelFormatter.new(project, raw_data).attributes)
         end
 
@@ -40,7 +40,7 @@ module Gitlab
       end
 
       def import_milestones
-        client.list_milestones(project.import_source, state: :all).each do |raw_data|
+        client.list_milestones(repo, state: :all).each do |raw_data|
           Milestone.create!(MilestoneFormatter.new(project, raw_data).attributes)
         end
 
@@ -50,9 +50,7 @@ module Gitlab
       end
 
       def import_issues
-        client.list_issues(project.import_source, state: :all,
-                                                  sort: :created,
-                                                  direction: :asc).each do |raw_data|
+        client.list_issues(repo, state: :all, sort: :created, direction: :asc).each do |raw_data|
           gh_issue = IssueFormatter.new(project, raw_data)
 
           if gh_issue.valid?
@@ -75,8 +73,8 @@ module Gitlab
                               .map { |raw| PullRequestFormatter.new(project, raw) }
                               .select(&:valid?)
 
-        source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch, pr.source_sha] }
-        target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch, pr.target_sha] }
+        source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch_name, pr.source_branch_sha] }
+        target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch_name, pr.target_branch_sha] }
         branches_removed = source_branches_removed | target_branches_removed
 
         create_refs(branches_removed)
@@ -101,19 +99,19 @@ module Gitlab
       end
 
       def create_refs(branches)
-        branches.each do |branch|
-          client.create_ref(repo, "refs/heads/#{branch.first}", branch.last)
+        branches.each do |name, sha|
+          client.create_ref(repo, "refs/heads/#{name}", sha)
         end
       end
 
       def delete_refs(branches)
-        branches.each do |branch|
-          client.delete_ref(repo, "heads/#{branch.first}")
+        branches.each do |name, _|
+          client.delete_ref(repo, "heads/#{name}")
         end
       end
 
       def apply_labels(number, issuable)
-        issue = client.issue(project.import_source, number)
+        issue = client.issue(repo, number)
 
         if issue.labels.count > 0
           label_ids = issue.labels.map do |raw|
@@ -125,12 +123,12 @@ module Gitlab
       end
 
       def import_comments(issue_number, noteable)
-        comments = client.issue_comments(project.import_source, issue_number)
+        comments = client.issue_comments(repo, issue_number)
         create_comments(comments, noteable)
       end
 
       def import_comments_on_diff(pull_request_number, merge_request)
-        comments = client.pull_request_comments(project.import_source, pull_request_number)
+        comments = client.pull_request_comments(repo, pull_request_number)
         create_comments(comments, merge_request)
       end
 
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 9f8182f643e..361d15d991c 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -1,17 +1,20 @@
 module Gitlab
   module GithubImport
     class PullRequestFormatter < BaseFormatter
+      delegate :exists?, :name, :project, :repo, :sha, to: :source_branch, prefix: true
+      delegate :exists?, :name, :project, :repo, :sha, to: :target_branch, prefix: true
+
       def attributes
         {
           iid: number,
           title: raw_data.title,
           description: description,
-          source_project: source_project,
-          source_branch: source_branch,
-          head_source_sha: source_sha,
-          target_project: target_project,
-          target_branch: target_branch,
-          base_target_sha: target_sha,
+          source_project: source_branch_project,
+          source_branch: source_branch_name,
+          head_source_sha: source_branch_sha,
+          target_project: target_branch_project,
+          target_branch: target_branch_name,
+          base_target_sha: target_branch_sha,
           state: state,
           milestone: milestone,
           author_id: author_id,
@@ -29,40 +32,12 @@ module Gitlab
         !cross_project?
       end
 
-      def source_branch_exists?
-        source_project.repository.branch_exists?(source_ref)
-      end
-
       def source_branch
-        @source_branch ||= if source_branch_exists?
-                             source_ref
-                           else
-                             "#{source_ref}-#{short_id(source_sha)}"
-                           end
-      end
-
-      def short_id(sha, length = 7)
-        sha.to_s[0..length]
-      end
-
-      def source_sha
-        raw_data.head.sha
-      end
-
-      def target_branch_exists?
-        target_project.repository.branch_exists?(target_ref)
+        @source_branch ||= BranchFormatter.new(project, raw_data.head)
       end
 
       def target_branch
-        @target_branch ||= if target_branch_exists?
-                             target_ref
-                           else
-                             "#{target_ref}-#{short_id(target_sha)}"
-                           end
-      end
-
-      def target_sha
-        raw_data.base.sha
+        @target_branch ||= BranchFormatter.new(project, raw_data.base)
       end
 
       private
@@ -90,7 +65,8 @@ module Gitlab
       end
 
       def cross_project?
-        source_repo.present? && target_repo.present? && source_repo.id != target_repo.id
+        source_branch_repo.present? && target_branch_repo.present? &&
+          source_branch_repo.id != target_branch_repo.id
       end
 
       def description
@@ -103,30 +79,6 @@ module Gitlab
         end
       end
 
-      def source_project
-        project
-      end
-
-      def source_repo
-        raw_data.head.repo
-      end
-
-      def source_ref
-        raw_data.head.ref
-      end
-
-      def target_project
-        project
-      end
-
-      def target_repo
-        raw_data.base.repo
-      end
-
-      def target_ref
-        raw_data.base.ref
-      end
-
       def state
         @state ||= case true
                    when raw_data.state == 'closed' && raw_data.merged_at.present?
diff --git a/spec/lib/gitlab/github_import/branch_formatter_spec.rb b/spec/lib/gitlab/github_import/branch_formatter_spec.rb
new file mode 100644
index 00000000000..58bfdd6c72b
--- /dev/null
+++ b/spec/lib/gitlab/github_import/branch_formatter_spec.rb
@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::BranchFormatter, lib: true do
+  let(:project) { create(:project) }
+  let(:repo) { double }
+  let(:raw) do
+    {
+      ref: 'feature',
+      repo: repo,
+      sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
+    }
+  end
+
+  describe '#exists?' do
+    it 'returns true when branch exists' do
+      branch = described_class.new(project, double(raw))
+
+      expect(branch.exists?).to eq true
+    end
+
+    it 'returns false when branch does not exist' do
+      branch = described_class.new(project, double(raw.merge(ref: 'removed-branch')))
+
+      expect(branch.exists?).to eq false
+    end
+  end
+
+  describe '#name' do
+    it 'returns raw ref when branch exists' do
+      branch = described_class.new(project, double(raw))
+
+      expect(branch.name).to eq 'feature'
+    end
+
+    it 'returns formatted ref when branch does not exist' do
+      branch = described_class.new(project, double(raw.merge(ref: 'removed-branch')))
+
+      expect(branch.name).to eq 'removed-branch-2e5d3239'
+    end
+  end
+
+  describe '#repo' do
+    it 'returns raw repo' do
+      branch = described_class.new(project, double(raw))
+
+      expect(branch.repo).to eq repo
+    end
+  end
+
+  describe '#sha' do
+    it 'returns raw sha' do
+      branch = described_class.new(project, double(raw))
+
+      expect(branch.sha).to eq '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index adedc57719e..5fed98e3926 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -163,94 +163,6 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
   end
 
-  describe '#source_branch' do
-    context 'when source branch exists' do
-      let(:raw_data) { double(base_data) }
-
-      it 'returns head ref' do
-        expect(pull_request.source_branch).to eq 'feature'
-      end
-    end
-
-    context 'when source branch does not exist' do
-      let(:raw_data) { double(base_data.merge(head: double(ref: 'removed-branch', sha: '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'))) }
-
-      it 'returns head ref' do
-        expect(pull_request.source_branch).to eq 'removed-branch-2e5d3239'
-      end
-    end
-  end
-
-  describe '#source_sha' do
-    let(:raw_data) { double(base_data) }
-
-    it 'returns head sha' do
-      expect(pull_request.source_sha).to eq '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
-    end
-  end
-
-  describe '#source_branch_exists?' do
-    context 'when source branch exists' do
-      let(:raw_data) { double(base_data) }
-
-      it 'returns true' do
-        expect(pull_request.source_branch_exists?).to eq true
-      end
-    end
-
-    context 'when source branch does not exist' do
-      let(:raw_data) { double(base_data.merge(head: double(ref: 'removed-branch').as_null_object)) }
-
-      it 'returns false' do
-        expect(pull_request.source_branch_exists?).to eq false
-      end
-    end
-  end
-
-  describe '#target_branch' do
-    context 'when target branch exists' do
-      let(:raw_data) { double(base_data) }
-
-      it 'returns base ref' do
-        expect(pull_request.target_branch).to eq 'master'
-      end
-    end
-
-    context 'when target branch does not exist' do
-      let(:raw_data) { double(base_data.merge(base: double(ref: 'removed-branch', sha: '8ffb3c15a5475e59ae909384297fede4badcb4c7'))) }
-
-      it 'returns head ref' do
-        expect(pull_request.target_branch).to eq 'removed-branch-8ffb3c15'
-      end
-    end
-  end
-
-  describe '#target_sha' do
-    let(:raw_data) { double(base_data) }
-
-    it 'returns base sha' do
-      expect(pull_request.target_sha).to eq '8ffb3c15a5475e59ae909384297fede4badcb4c7'
-    end
-  end
-
-  describe '#target_branch_exists?' do
-    context 'when target branch exists' do
-      let(:raw_data) { double(base_data) }
-
-      it 'returns true' do
-        expect(pull_request.target_branch_exists?).to eq true
-      end
-    end
-
-    context 'when target branch does not exist' do
-      let(:raw_data) { double(base_data.merge(base: double(ref: 'removed-branch').as_null_object)) }
-
-      it 'returns false' do
-        expect(pull_request.target_branch_exists?).to eq false
-      end
-    end
-  end
-
   describe '#valid?' do
     context 'when source, and target repos are not a fork' do
       let(:raw_data) { double(base_data) }

From ebaa19c162bec7dce64db25124e448d832c17384 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 10 May 2016 16:23:59 -0500
Subject: [PATCH 0411/1431] Fix validation method for
 Gitlab::GithubImport::PullRequestFormatter

---
 lib/gitlab/github_import/branch_formatter.rb       |  4 ++++
 lib/gitlab/github_import/pull_request_formatter.rb |  5 ++---
 .../gitlab/github_import/branch_formatter_spec.rb  | 14 ++++++++++++++
 .../github_import/pull_request_formatter_spec.rb   |  4 ++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/gitlab/github_import/branch_formatter.rb b/lib/gitlab/github_import/branch_formatter.rb
index f968ec4b102..a15fc84b418 100644
--- a/lib/gitlab/github_import/branch_formatter.rb
+++ b/lib/gitlab/github_import/branch_formatter.rb
@@ -15,6 +15,10 @@ module Gitlab
         repo.present?
       end
 
+      def valid?
+        repo.present?
+      end
+
       private
 
       def short_id
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 361d15d991c..574737b31c1 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -29,7 +29,7 @@ module Gitlab
       end
 
       def valid?
-        !cross_project?
+        source_branch.valid? && target_branch.valid? && !cross_project?
       end
 
       def source_branch
@@ -65,8 +65,7 @@ module Gitlab
       end
 
       def cross_project?
-        source_branch_repo.present? && target_branch_repo.present? &&
-          source_branch_repo.id != target_branch_repo.id
+        source_branch_repo.id != target_branch_repo.id
       end
 
       def description
diff --git a/spec/lib/gitlab/github_import/branch_formatter_spec.rb b/spec/lib/gitlab/github_import/branch_formatter_spec.rb
index 58bfdd6c72b..3cb634ba010 100644
--- a/spec/lib/gitlab/github_import/branch_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/branch_formatter_spec.rb
@@ -54,4 +54,18 @@ describe Gitlab::GithubImport::BranchFormatter, lib: true do
       expect(branch.sha).to eq '2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
     end
   end
+
+  describe '#valid?' do
+    it 'returns true when repository exists' do
+      branch = described_class.new(project, double(raw))
+
+      expect(branch.valid?).to eq true
+    end
+
+    it 'returns false when repository does not exist' do
+      branch = described_class.new(project, double(raw.merge(repo: nil)))
+
+      expect(branch.valid?).to eq false
+    end
+  end
 end
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index 5fed98e3926..120f59e6e71 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -173,7 +173,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
 
     context 'when source repo is a fork' do
-      let(:source_repo) { double(id: 2, fork: true) }
+      let(:source_repo) { double(id: 2) }
       let(:raw_data) { double(base_data) }
 
       it 'returns false' do
@@ -182,7 +182,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
 
     context 'when target repo is a fork' do
-      let(:target_repo) { double(id: 2, fork: true) }
+      let(:target_repo) { double(id: 2) }
       let(:raw_data) { double(base_data) }
 
       it 'returns false' do

From 290aa75e6f8dfbd92ed11f6c271fb4ad83831e86 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 10 May 2016 17:23:03 -0500
Subject: [PATCH 0412/1431] Remove branches that does exist on GitHub after PRs
 were imported

---
 lib/gitlab/github_import/importer.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 1f160837c5d..408d9b79632 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -79,8 +79,6 @@ module Gitlab
 
         create_refs(branches_removed)
 
-        project.repository.fetch_ref(repo_url, '+refs/heads/*', 'refs/heads/*')
-
         pull_requests.each do |pull_request|
           merge_request = MergeRequest.new(pull_request.attributes)
 
@@ -102,11 +100,14 @@ module Gitlab
         branches.each do |name, sha|
           client.create_ref(repo, "refs/heads/#{name}", sha)
         end
+
+        project.repository.fetch_ref(repo_url, '+refs/heads/*', 'refs/heads/*')
       end
 
       def delete_refs(branches)
         branches.each do |name, _|
           client.delete_ref(repo, "heads/#{name}")
+          project.repository.rm_branch(project.creator, name)
         end
       end
 

From bd1a6208d9b76922ae07bbe59f9f03a3573fe59d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 10 May 2016 17:34:57 -0500
Subject: [PATCH 0413/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 30d4955c9f3..accaaaba4e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 8.8.0 (unreleased)
   - Add API endpoints for un/subscribing from/to a label. !4051 (Ahmad Sherif)
   - Hide left sidebar on phone screens to give more space for content
   - Redesign navigation for profile and group pages
+  - Import pull requests from GitHub where the source or target branches were removed
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From cf6d4e9db507d31feede527cb2dcc196d763c359 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 14 May 2016 00:48:49 -0500
Subject: [PATCH 0414/1431] Change colors for charcoal and graphite sidebar
 themes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 51a17d1469e..f47eb1f233e 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -88,8 +88,8 @@
 }
 
 $theme-blue: #2980b9;
-$theme-charcoal: #333c47;
-$theme-graphite: #888;
+$theme-charcoal: #3d454d;
+$theme-graphite: #666;
 $theme-gray: #373737;
 $theme-green: #019875;
 $theme-violet: #548;
@@ -100,11 +100,11 @@ body {
   }
 
   &.ui_charcoal {
-    @include gitlab-theme(#c5d0de, $theme-charcoal, #2b333d, #24272d);
+    @include gitlab-theme(#d6d7d9, #485157, $theme-charcoal, #353b41);
   }
 
   &.ui_graphite {
-    @include gitlab-theme(#ccc, $theme-graphite, #777, #666);
+    @include gitlab-theme(#ccc, #777, $theme-graphite, #555);
   }
 
   &.ui_gray {

From 7b7e0032ed94f6671389d899e5175d6ec9128df8 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sat, 14 May 2016 15:40:32 +0700
Subject: [PATCH 0415/1431] Only show todos of projects that user is a member
 of

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 489bff3fa4a..0b1f5f99ccb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,7 +77,7 @@ class User < ActiveRecord::Base
   has_one  :abuse_report,             dependent: :destroy
   has_many :spam_logs,                dependent: :destroy
   has_many :builds,                   dependent: :nullify, class_name: 'Ci::Build'
-  has_many :todos,                    dependent: :destroy
+  has_many :todos, -> { joins("join members on members.source_id = todos.project_id and members.user_id = todos.user_id") }, dependent: :destroy
   has_many :notification_settings,    dependent: :destroy
 
   #

From 774a5107822d3d451b88ed3a7257aeac8d91c35a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 09:39:33 -0500
Subject: [PATCH 0416/1431] Fix specs

---
 .../jwt/container_registry_authentication_service_spec.rb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/jwt/container_registry_authentication_service_spec.rb
index 1873ea2639b..7c879852520 100644
--- a/spec/services/jwt/container_registry_authentication_service_spec.rb
+++ b/spec/services/jwt/container_registry_authentication_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe JWT::ContainerRegistryAuthenticationService, services: true do
+describe Gitlab::JWT::ContainerRegistryAuthenticationService, services: true do
   let(:current_project) { nil }
   let(:current_user) { nil }
   let(:current_params) { {} }

From a6b8d36ae933c3f21e7ba2c17864c6d8bf626d25 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 09:46:38 -0500
Subject: [PATCH 0417/1431] Fix specs

---
 app/controllers/projects/pipelines_controller.rb | 3 ---
 app/models/commit_status.rb                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index bdb5722c55f..f3f5338003a 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -31,9 +31,6 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def show
-    respond_to do |format|
-      format.html
-    end
   end
 
   def retry
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 521456bedee..213cd20e8d8 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -55,7 +55,7 @@ class CommitStatus < ActiveRecord::Base
 
   def self.stages
     # We group by stage name, but order stages by theirs' index
-    unscoped.where(id: all).group('stage').order('max(stage_idx)', 'stage').pluck('stage')
+    unscoped.where(id: all.ids).group('stage').order('max(stage_idx)', 'stage').pluck('stage')
   end
 
   def self.status_for_stage(stage)

From 63cdf1aeb04b9694c0b6d44b1141868fcc5a0904 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 11:11:48 -0500
Subject: [PATCH 0418/1431] Use Auth::ContainerRegistryAuthenticationService

---
 app/controllers/jwt_controller.rb             |  2 +-
 ...ntainer_registry_authentication_service.rb | 69 ++++++++++++++++++
 ...ntainer_registry_authentication_service.rb | 71 -------------------
 ...er_registry_authentication_service_spec.rb |  2 +-
 4 files changed, 71 insertions(+), 73 deletions(-)
 create mode 100644 app/services/auth/container_registry_authentication_service.rb
 delete mode 100644 app/services/jwt/container_registry_authentication_service.rb

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index e067f59808a..e5affb1adc9 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -4,7 +4,7 @@ class JwtController < ApplicationController
   before_action :authenticate_project_or_user
 
   SERVICES = {
-    'container_registry' => ::Gitlab::JWT::ContainerRegistryAuthenticationService,
+    'container_registry' => Auth::ContainerRegistryAuthenticationService,
   }
 
   def auth
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
new file mode 100644
index 00000000000..0323a42b697
--- /dev/null
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -0,0 +1,69 @@
+module Auth
+  class ContainerRegistryAuthenticationService < BaseService
+    def execute
+      if params[:offline_token]
+        return error('forbidden', 403) unless current_user
+      end
+
+      return error('forbidden', 401) if scopes.blank?
+
+      { token: authorized_token(scopes).encoded }
+    end
+
+    private
+
+    def authorized_token(access)
+      token = ::JWT::RSAToken.new(registry.key)
+      token.issuer = registry.issuer
+      token.audience = params[:service]
+      token.subject = current_user.try(:username)
+      token[:access] = access
+      token
+    end
+
+    def scopes
+      return unless params[:scope]
+
+      @scopes ||= begin
+        scope = process_scope(params[:scope])
+        [scope].compact
+      end
+    end
+
+    def process_scope(scope)
+      type, name, actions = scope.split(':', 3)
+      actions = actions.split(',')
+
+      case type
+      when 'repository'
+        process_repository_access(type, name, actions)
+      end
+    end
+
+    def process_repository_access(type, name, actions)
+      requested_project = Project.find_with_namespace(name)
+      return unless requested_project
+
+      actions = actions.select do |action|
+        can_access?(requested_project, action)
+      end
+
+      { type: type, name: name, actions: actions } if actions.present?
+    end
+
+    def can_access?(requested_project, requested_action)
+      case requested_action
+      when 'pull'
+        requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
+      when 'push'
+        requested_project == project || can?(current_user, :create_container_registry, requested_project)
+      else
+        false
+      end
+    end
+
+    def registry
+      Gitlab.config.registry
+    end
+  end
+end
diff --git a/app/services/jwt/container_registry_authentication_service.rb b/app/services/jwt/container_registry_authentication_service.rb
deleted file mode 100644
index dd0f2954784..00000000000
--- a/app/services/jwt/container_registry_authentication_service.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-module Gitlab
-  module JWT
-    class ContainerRegistryAuthenticationService < BaseService
-      def execute
-        if params[:offline_token]
-          return error('forbidden', 403) unless current_user
-        end
-
-        return error('forbidden', 401) if scopes.blank?
-
-        { token: authorized_token(scopes).encoded }
-      end
-
-      private
-
-      def authorized_token(access)
-        token = ::JWT::RSAToken.new(registry.key)
-        token.issuer = registry.issuer
-        token.audience = params[:service]
-        token.subject = current_user.try(:username)
-        token[:access] = access
-        token
-      end
-
-      def scopes
-        return unless params[:scope]
-
-        @scopes ||= begin
-          scope = process_scope(params[:scope])
-          [scope].compact
-        end
-      end
-
-      def process_scope(scope)
-        type, name, actions = scope.split(':', 3)
-        actions = actions.split(',')
-
-        case type
-        when 'repository'
-          process_repository_access(type, name, actions)
-        end
-      end
-
-      def process_repository_access(type, name, actions)
-        requested_project = Project.find_with_namespace(name)
-        return unless requested_project
-
-        actions = actions.select do |action|
-          can_access?(requested_project, action)
-        end
-
-        { type: type, name: name, actions: actions } if actions.present?
-      end
-
-      def can_access?(requested_project, requested_action)
-        case requested_action
-        when 'pull'
-          requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
-        when 'push'
-          requested_project == project || can?(current_user, :create_container_registry, requested_project)
-        else
-          false
-        end
-      end
-
-      def registry
-        Gitlab.config.registry
-      end
-    end
-  end
-end
diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/jwt/container_registry_authentication_service_spec.rb
index 7c879852520..1873ea2639b 100644
--- a/spec/services/jwt/container_registry_authentication_service_spec.rb
+++ b/spec/services/jwt/container_registry_authentication_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::JWT::ContainerRegistryAuthenticationService, services: true do
+describe JWT::ContainerRegistryAuthenticationService, services: true do
   let(:current_project) { nil }
   let(:current_user) { nil }
   let(:current_params) { {} }

From 0a9979d9ef3b5205e36ecfb66ff6322fa824492f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 11:16:11 -0500
Subject: [PATCH 0419/1431] Rename specs

---
 .../container_registry_authentication_service_spec.rb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename spec/services/{jwt => auth}/container_registry_authentication_service_spec.rb (98%)

diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
similarity index 98%
rename from spec/services/jwt/container_registry_authentication_service_spec.rb
rename to spec/services/auth/container_registry_authentication_service_spec.rb
index 1873ea2639b..8dc47a24ee2 100644
--- a/spec/services/jwt/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe JWT::ContainerRegistryAuthenticationService, services: true do
+describe Auth::ContainerRegistryAuthenticationService, services: true do
   let(:current_project) { nil }
   let(:current_user) { nil }
   let(:current_params) { {} }

From 4f1e0014a73e1e310a82a3d8ce52367a1f9d6a9e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:03:41 -0500
Subject: [PATCH 0420/1431] Simplify registry configuration

---
 config/gitlab.yml.example         |  4 +---
 config/initializers/1_settings.rb | 38 ++++---------------------------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 37639e52e66..2e383bc90fa 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -179,9 +179,7 @@ production: &base
   registry:
     # enabled: true
     # host: localhost
-    # port: 5000
-    # https: false
-    # internal_host: localhost
+    # api_url: http://localhost:5000/
     # key: config/registry.key
     # issuer: omnibus-certificate
 
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index e46be3f420a..d1fcb053bee 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -27,30 +27,6 @@ class Settings < Settingslogic
       ].join('')
     end
 
-    def build_registry_api_url
-      if registry.port.to_i == (registry.https ? 443 : 80)
-        custom_port = nil
-      else
-        custom_port = ":#{registry.port}"
-      end
-      [ registry.protocol,
-        "://",
-        registry.internal_host,
-        custom_port
-      ].join('')
-    end
-
-    def build_registry_host_with_port
-      if registry.port.to_i == (registry.https ? 443 : 80)
-        custom_port = nil
-      else
-        custom_port = ":#{registry.port}"
-      end
-      [ registry.host,
-        custom_port
-      ].join('')
-    end
-
     def build_gitlab_shell_ssh_path_prefix
       user_host = "#{gitlab_shell.ssh_user}@#{gitlab_shell.ssh_host}"
 
@@ -271,15 +247,11 @@ Settings.artifacts['max_size']   ||= 100 # in megabytes
 # Registry
 #
 Settings['registry'] ||= Settingslogic.new({})
-Settings.registry['enabled']     = false if Settings.registry['enabled'].nil?
-Settings.registry['host']         ||= "example.com"
-Settings.registry['internal_host']||= "localhost"
-Settings.registry['key']          ||= nil
-Settings.registry['https']        = false if Settings.registry['https'].nil?
-Settings.registry['port']         ||= Settings.registry.https ? 443 : 80
-Settings.registry['protocol']     ||= Settings.registry.https ? "https" : "http"
-Settings.registry['api_url']      ||= Settings.send(:build_registry_api_url)
-Settings.registry['host_port']    ||= Settings.send(:build_registry_host_with_port)
+Settings.registry['enabled']       ||= false
+Settings.registry['host']          ||= "example.com"
+Settings.registry['api_url']       ||= "http://localhost:5000/"
+Settings.registry['key']           ||= nil
+Settings.registry['issuer']        ||= nil
 
 #
 # Git LFS

From 393459b2b24fe788764ee787552da055846b9a63 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:04:04 -0500
Subject: [PATCH 0421/1431] Improve code design after review

---
 app/controllers/jwt_controller.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index e5affb1adc9..0a993bf280e 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -12,9 +12,8 @@ class JwtController < ApplicationController
     head :not_found unless service
 
     result = service.new(@project, @user, auth_params).execute
-    return head result[:http_status] if result[:http_status]
 
-    render json: result
+    render json: result, status: result[:http_status]
   end
 
   private
@@ -27,10 +26,8 @@ class JwtController < ApplicationController
 
       @user = authenticate_user(login, password)
       return if @user
-    end
 
-    if ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
-      head :forbidden
+      render_403
     end
   end
 

From ee725db8e0f5d95c14031bd939a414e068497bb4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:16:44 -0500
Subject: [PATCH 0422/1431] Add TODO

---
 app/controllers/jwt_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index e0e0a98a6c1..0edf084e9e4 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -42,6 +42,9 @@ class JwtController < ApplicationController
   end
 
   def authenticate_user(login, password)
+    # TODO: this is a copy and paste from grack_auth,
+    # it should be refactored in the future
+
     user = Gitlab::Auth.new.find(login, password)
 
     # If the user authenticated successfully, we reset the auth failure count

From 46cc04ce7a374127dd617c8fd2671efed2819cda Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:16:44 -0500
Subject: [PATCH 0423/1431] Add TODO

---
 app/controllers/jwt_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 0a993bf280e..bd9d7e4425d 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -42,6 +42,9 @@ class JwtController < ApplicationController
   end
 
   def authenticate_user(login, password)
+    # TODO: this is a copy and paste from grack_auth,
+    # it should be refactored in the future
+
     user = Gitlab::Auth.new.find(login, password)
 
     # If the user authenticated successfully, we reset the auth failure count

From 284dc3285a4ec2a626e90b16ca3d372eed82d349 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:22:10 -0500
Subject: [PATCH 0424/1431] Fix abilities

---
 app/models/ability.rb                                 |  2 +-
 app/models/project.rb                                 | 10 +++++-----
 app/views/projects/container_registry/index.html.haml |  2 +-
 spec/requests/ci/api/runners_spec.rb                  |  1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 09dea54689e..74321240468 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -292,7 +292,7 @@ class Ability
         rules += named_abilities('build')
       end
 
-      unless project.container_registry_enabled && Gitlab.config.registry.enabled
+      unless project.container_registry_enabled
         rules += named_abilities('container_registry')
       end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 0206ccc8d37..ed7719ed31c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -332,20 +332,20 @@ class Project < ActiveRecord::Base
     @container_registry_repository ||= begin
       token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
       url = Gitlab.config.registry.api_url
-      host_port = Gitlab.config.registry.host_port
-      registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
+      host = Gitlab.config.registry.host
+      registry = ContainerRegistry::Registry.new(url, token: token, path: host)
       registry[path_with_namespace]
     end
   end
 
   def container_registry_repository_url
-    if container_registry_enabled? && Gitlab.config.registry.enabled
-      "#{Gitlab.config.registry.host_port}/#{path_with_namespace}"
+    if Gitlab.config.registry.enabled
+      "#{Gitlab.config.registry.host}/#{path_with_namespace}"
     end
   end
 
   def has_container_registry_tags?
-    if container_registry_enabled? && Gitlab.config.registry.enabled
+    if Gitlab.config.registry.enabled
       container_registry_repository.tags.any?
     end
   end
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index ea7c4faaaec..990253719bf 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -16,7 +16,7 @@
         To start using container images hosted on GitLab you first need to login:
         %pre
           %code
-            docker login #{Gitlab.config.registry.host_port}
+            docker login #{Gitlab.config.registry.host}
         %br
         Then you are free to create and upload a container image with build and push commands:
         %pre
diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index db8189ffb79..43f9fe89c8e 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -7,7 +7,6 @@ describe Ci::API::API do
   let(:registration_token) { 'abcdefg123456' }
 
   before do
-    stub_gitlab_calls
     stub_application_setting(runners_registration_token: registration_token)
   end
 

From d40bd7419f9ca0f7caedef05209b86e7431dd882 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:22:45 -0500
Subject: [PATCH 0425/1431] Fix authentication service

---
 app/services/auth/container_registry_authentication_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 0323a42b697..100f7cbae28 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -54,7 +54,7 @@ module Auth
     def can_access?(requested_project, requested_action)
       case requested_action
       when 'pull'
-        requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
+        requested_project == project || can?(current_user, :read_container_registry, requested_project)
       when 'push'
         requested_project == project || can?(current_user, :create_container_registry, requested_project)
       else

From 715a8cfa2f4639bf36b604f6e3eb2814187367c0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:22:45 -0500
Subject: [PATCH 0426/1431] Fix authentication service

---
 app/models/ability.rb                                     | 1 +
 .../auth/container_registry_authentication_service.rb     | 8 +++++++-
 .../container_registry_authentication_service_spec.rb     | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 59d5195f5b9..74321240468 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -61,6 +61,7 @@ class Ability
           :read_merge_request,
           :read_note,
           :read_commit_status,
+          :read_container_registry,
           :download_code
         ]
 
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 0323a42b697..a63e7046fcc 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -1,6 +1,10 @@
 module Auth
   class ContainerRegistryAuthenticationService < BaseService
+    AUDIENCE = 'container_registry'
+
     def execute
+      return error('not found', 404) unless registry.enabled
+
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
       end
@@ -52,9 +56,11 @@ module Auth
     end
 
     def can_access?(requested_project, requested_action)
+      return false unless requested_project.container_registry_enabled?
+
       case requested_action
       when 'pull'
-        requested_project.public? || requested_project == project || can?(current_user, :read_container_registry, requested_project)
+        requested_project == project || can?(current_user, :read_container_registry, requested_project)
       when 'push'
         requested_project == project || can?(current_user, :create_container_registry, requested_project)
       else
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 8dc47a24ee2..6e86a3dcf56 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -7,6 +7,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
   let(:rsa_key) { OpenSSL::PKey::RSA.generate(512) }
   let(:registry_settings) do
     {
+      enabled: true,
       issuer: 'rspec',
       key: nil
     }

From 8c93b6051fdc7bb59af2e6bf2f5b3a1817a73ceb Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:44:35 -0500
Subject: [PATCH 0427/1431] Revert `stages` change

---
 app/models/commit_status.rb                     | 11 ++++++++---
 app/views/projects/ci/commits/_commit.html.haml |  3 ++-
 spec/models/commit_status_spec.rb               | 12 ++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 213cd20e8d8..6fef1c038e9 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -55,11 +55,16 @@ class CommitStatus < ActiveRecord::Base
 
   def self.stages
     # We group by stage name, but order stages by theirs' index
-    unscoped.where(id: all.ids).group('stage').order('max(stage_idx)', 'stage').pluck('stage')
+    unscoped.from(all, :sg).group('stage').order('max(stage_idx)', 'stage').pluck('sg.stage')
   end
 
-  def self.status_for_stage(stage)
-    where(stage: stage).status
+  def self.stages_status
+    # We execute subquery for each stage to calculate a stage status
+    statuses = unscoped.from(all, :sg).group('stage').pluck('sg.stage', all.where('stage=sg.stage').status_sql)
+    statuses.inject({}) do |h, k|
+      h[k.first] = k.last
+      h
+    end
   end
 
   def ignored?
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 7f9a3417836..90ac41666d0 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -31,9 +31,10 @@
             Cant find HEAD commit for this branch
 
 
+    - stages_status = commit.statuses.stages_status
     - stages.each do |stage|
       %td
-        - if status = commit.statuses.status_for_stage(stage)
+        - if status = stages_status[stage]
           - tooltip = "#{stage.titleize}: #{status}"
           %span.has-tooltip(title="#{tooltip}"){class: "ci-status-icon-#{status}"}
             = ci_icon_for_status(status)
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index ea60894c419..434e58cfd06 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -185,5 +185,17 @@ describe CommitStatus, models: true do
         is_expected.to eq(%w(build test deploy))
       end
     end
+
+    context 'stages with statuses' do
+      subject { CommitStatus.where(commit: commit).stages_status }
+
+      it 'return list of stages with statuses' do
+        is_expected.to eq({
+          'build' => 'failed',
+          'test' => 'success',
+          'deploy' => 'running'
+        })
+      end
+    end
   end
 end

From 865e8853369b542569693ec23a9b533481228829 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:47:47 -0500
Subject: [PATCH 0428/1431] Fix specs for MySQL

---
 app/models/ci/commit.rb                      | 5 ++---
 app/views/projects/pipelines/index.html.haml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 91c5b4c1cae..6675a3f5d53 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -8,8 +8,6 @@ module Ci
     has_many :builds, class_name: 'Ci::Build'
     has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest'
 
-    delegate :stages, to: :statuses
-
     validates_presence_of :sha
     validates_presence_of :status
     validate :valid_commit_sha
@@ -22,7 +20,8 @@ module Ci
     end
 
     def self.stages
-      CommitStatus.where(commit: all).stages
+      # We use pluck here due to problems with MySQL which doesn't allow LIMIT/OFFSET in queries
+      CommitStatus.where(commit: pluck(:id)).stages
     end
 
     def project_id
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 574941ed5f2..af55ef42a6e 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -55,7 +55,7 @@
         %tbody
           %th ID
           %th Commit
-          - @pipelines.stages.each do |stage|
+          - stages.each do |stage|
             %th
               %span.has-tooltip(title="#{stage.titleize}")
                 = truncate(stage.titleize.pluralize, length: 8)

From 7d907acc3805a692fd9f6f29e529c5b5fe15ec11 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 14:51:57 -0500
Subject: [PATCH 0429/1431] Fix spinach tests

---
 features/steps/dashboard/dashboard.rb    | 2 +-
 features/steps/project/merge_requests.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index b5980b35102..80ed4c6d64c 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -13,7 +13,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
   end
 
   step 'I should see "Shop" project CI status' do
-    expect(page).to have_link "Build skipped"
+    expect(page).to have_link "Commit: skipped"
   end
 
   step 'I should see last push widget' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 3b1a00f628a..b79d19f1c58 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -525,7 +525,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I should see merge request "Bug NS-05" with CI status' do
     page.within ".mr-list" do
-      expect(page).to have_link "Build pending"
+      expect(page).to have_link "Pipeline: pending"
     end
   end
 

From 2566c89a3232d6d4d5aa5d77821819e86424548d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 15:55:00 -0500
Subject: [PATCH 0430/1431] Remove testing delegate

---
 app/controllers/projects/pipelines_controller.rb | 4 ++--
 spec/models/ci/commit_spec.rb                    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index f3f5338003a..78b85ea9a71 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -22,10 +22,10 @@ class Projects::PipelinesController < Projects::ApplicationController
       pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute
       redirect_to namespace_project_pipeline_path(project.namespace, project, pipeline)
     rescue ArgumentError => e
-      @error = e.message
+      flash[:alert] = e.message
       render 'new'
     rescue
-      @error = 'Undefined error'
+      flash[:alert] = 'Undefined error'
       render 'new'
     end
   end
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index dc071ad1c90..1b5940ad5a8 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -10,7 +10,6 @@ describe Ci::Commit, models: true do
   it { is_expected.to have_many(:builds) }
   it { is_expected.to validate_presence_of :sha }
   it { is_expected.to validate_presence_of :status }
-  it { is_expected.to delegate_method(:stages).to(:statuses) }
 
   it { is_expected.to respond_to :git_author_name }
   it { is_expected.to respond_to :git_author_email }

From df973df8c536fb9ffe0a9ed4e92f7d9144eb687a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 16:04:26 -0500
Subject: [PATCH 0431/1431] Simplify JWT::RSAToken::kid

---
 lib/jwt/rsa_token.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/jwt/rsa_token.rb b/lib/jwt/rsa_token.rb
index 4de89bf0d37..d7df9269e1e 100644
--- a/lib/jwt/rsa_token.rb
+++ b/lib/jwt/rsa_token.rb
@@ -29,10 +29,14 @@ module JWT
     end
 
     def kid
-      fingerprint = Digest::SHA256.digest(public_key.to_der)
-      Base32.encode(fingerprint).split('').each_slice(4).each_with_object([]) do |slice, mem|
-        mem << slice.join
-      end.join(':')
+      # calculate sha256 from DER encoded ASN1
+      kid = Digest::SHA256.digest(public_key.to_der)
+
+      # we encode only 30 bytes with base32
+      kid = Base32.encode(kid[0..29])
+
+      # insert colon every 4 characters
+      kid.scan(/.{4}/).join(':')
     end
   end
 end

From f4f9184a01bc7442411bbcffd9b6a86784fa5f53 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 18:23:31 -0500
Subject: [PATCH 0432/1431] Rename JWT to JSONWebToken

---
 app/controllers/jwt_controller.rb             |  2 +-
 app/models/ability.rb                         | 12 ++++-----
 ...ntainer_registry_authentication_service.rb | 27 ++++++++-----------
 lib/{jwt => json_web_token}/rsa_token.rb      |  2 +-
 lib/{jwt => json_web_token}/token.rb          |  2 +-
 .../{jwt => json_web_token}/rsa_token_spec.rb |  2 +-
 .../lib/{jwt => json_web_token}/token_spec.rb |  2 +-
 ...er_registry_authentication_service_spec.rb |  2 +-
 8 files changed, 23 insertions(+), 28 deletions(-)
 rename lib/{jwt => json_web_token}/rsa_token.rb (97%)
 rename lib/{jwt => json_web_token}/token.rb (97%)
 rename spec/lib/{jwt => json_web_token}/rsa_token_spec.rb (95%)
 rename spec/lib/{jwt => json_web_token}/token_spec.rb (92%)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index bd9d7e4425d..0edf084e9e4 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -4,7 +4,7 @@ class JwtController < ApplicationController
   before_action :authenticate_project_or_user
 
   SERVICES = {
-    'container_registry' => Auth::ContainerRegistryAuthenticationService,
+    Auth::ContainerRegistryAuthenticationService::AUDIENCE => Auth::ContainerRegistryAuthenticationService,
   }
 
   def auth
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 74321240468..f70268d3138 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -61,7 +61,7 @@ class Ability
           :read_merge_request,
           :read_note,
           :read_commit_status,
-          :read_container_registry,
+          :read_container_image,
           :download_code
         ]
 
@@ -204,7 +204,7 @@ class Ability
         :admin_label,
         :read_commit_status,
         :read_build,
-        :read_container_registry,
+        :read_container_image,
       ]
     end
 
@@ -219,8 +219,8 @@ class Ability
         :create_merge_request,
         :create_wiki,
         :push_code,
-        :create_container_registry,
-        :update_container_registry,
+        :create_container_image,
+        :update_container_image,
       ]
     end
 
@@ -247,7 +247,7 @@ class Ability
         :admin_project,
         :admin_commit_status,
         :admin_build,
-        :admin_container_registry,
+        :admin_container_image,
       ]
     end
 
@@ -293,7 +293,7 @@ class Ability
       end
 
       unless project.container_registry_enabled
-        rules += named_abilities('container_registry')
+        rules += named_abilities('container_image')
       end
 
       rules
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index a63e7046fcc..bbbc84475c8 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -9,39 +9,34 @@ module Auth
         return error('forbidden', 403) unless current_user
       end
 
-      return error('forbidden', 401) if scopes.blank?
+      return error('forbidden', 401) unless scope
 
-      { token: authorized_token(scopes).encoded }
+      { token: authorized_token(scope).encoded }
     end
 
     private
 
-    def authorized_token(access)
-      token = ::JWT::RSAToken.new(registry.key)
+    def authorized_token(*accesses)
+      token = JSONWebToken::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = params[:service]
       token.subject = current_user.try(:username)
-      token[:access] = access
+      token[:access] = accesses
       token
     end
 
-    def scopes
+    def scope
       return unless params[:scope]
 
-      @scopes ||= begin
-        scope = process_scope(params[:scope])
-        [scope].compact
-      end
+      @scope ||= process_scope(params[:scope])
     end
 
     def process_scope(scope)
       type, name, actions = scope.split(':', 3)
       actions = actions.split(',')
+      return unless type == 'repository'
 
-      case type
-      when 'repository'
-        process_repository_access(type, name, actions)
-      end
+      process_repository_access(type, name, actions)
     end
 
     def process_repository_access(type, name, actions)
@@ -60,9 +55,9 @@ module Auth
 
       case requested_action
       when 'pull'
-        requested_project == project || can?(current_user, :read_container_registry, requested_project)
+        requested_project == project || can?(current_user, :read_container_image, requested_project)
       when 'push'
-        requested_project == project || can?(current_user, :create_container_registry, requested_project)
+        requested_project == project || can?(current_user, :create_container_image, requested_project)
       else
         false
       end
diff --git a/lib/jwt/rsa_token.rb b/lib/json_web_token/rsa_token.rb
similarity index 97%
rename from lib/jwt/rsa_token.rb
rename to lib/json_web_token/rsa_token.rb
index d7df9269e1e..d6d6af7089c 100644
--- a/lib/jwt/rsa_token.rb
+++ b/lib/json_web_token/rsa_token.rb
@@ -1,4 +1,4 @@
-module JWT
+module JSONWebToken
   class RSAToken < Token
     attr_reader :key_file
 
diff --git a/lib/jwt/token.rb b/lib/json_web_token/token.rb
similarity index 97%
rename from lib/jwt/token.rb
rename to lib/json_web_token/token.rb
index f13abf2b71f..5b67715b0b2 100644
--- a/lib/jwt/token.rb
+++ b/lib/json_web_token/token.rb
@@ -1,4 +1,4 @@
-module JWT
+module JSONWebToken
   class Token
     attr_accessor :issuer, :subject, :audience, :id
     attr_accessor :issued_at, :not_before, :expire_time
diff --git a/spec/lib/jwt/rsa_token_spec.rb b/spec/lib/json_web_token/rsa_token_spec.rb
similarity index 95%
rename from spec/lib/jwt/rsa_token_spec.rb
rename to spec/lib/json_web_token/rsa_token_spec.rb
index a5b1d3a67dc..4462cdde9a3 100644
--- a/spec/lib/jwt/rsa_token_spec.rb
+++ b/spec/lib/json_web_token/rsa_token_spec.rb
@@ -1,4 +1,4 @@
-describe JWT::RSAToken do
+describe JSONWebToken::RSAToken do
   let(:rsa_key) { generate_key }
   let(:rsa_token) { described_class.new(nil) }
   let(:rsa_encoded) { rsa_token.encoded }
diff --git a/spec/lib/jwt/token_spec.rb b/spec/lib/json_web_token/token_spec.rb
similarity index 92%
rename from spec/lib/jwt/token_spec.rb
rename to spec/lib/json_web_token/token_spec.rb
index 92fdc3f1b7c..3d955e4d774 100644
--- a/spec/lib/jwt/token_spec.rb
+++ b/spec/lib/json_web_token/token_spec.rb
@@ -1,4 +1,4 @@
-describe JWT::Token do
+describe JSONWebToken::Token do
   let(:token) { described_class.new }
 
   context 'custom parameters' do
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 6e86a3dcf56..a2937368136 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -18,7 +18,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
   before do
     allow(Gitlab.config.registry).to receive_messages(registry_settings)
-    allow_any_instance_of(JWT::RSAToken).to receive(:key).and_return(rsa_key)
+    allow_any_instance_of(JSONWebToken::RSAToken).to receive(:key).and_return(rsa_key)
   end
 
   shared_examples 'an authenticated' do

From c275c91373103c10dfe5e21afd6fc54a7a4dfdbe Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 18:26:26 -0500
Subject: [PATCH 0433/1431] Change abilities from container_registry to
 container_image

---
 app/controllers/projects/container_registry_controller.rb | 4 ++--
 app/helpers/projects_helper.rb                            | 2 +-
 app/views/projects/container_registry/_tag.html.haml      | 2 +-
 app/views/projects/container_registry/index.html.haml     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index c470789a5bb..e48f205d216 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -1,6 +1,6 @@
 class Projects::ContainerRegistryController < Projects::ApplicationController
-  before_action :authorize_read_container_registry!
-  before_action :authorize_update_container_registry!, only: [:destroy]
+  before_action :authorize_read_container_image!
+  before_action :authorize_update_container_image!, only: [:destroy]
   layout 'project'
 
   def index
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 7113e28924b..466929443d6 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,7 +152,7 @@ module ProjectsHelper
       nav_tabs << :builds
     end
 
-    if can?(current_user, :read_container_registry, project)
+    if can?(current_user, :read_container_image, project)
       nav_tabs << :container_registry
     end
 
diff --git a/app/views/projects/container_registry/_tag.html.haml b/app/views/projects/container_registry/_tag.html.haml
index bf816d109b6..10eabc6cd6f 100644
--- a/app/views/projects/container_registry/_tag.html.haml
+++ b/app/views/projects/container_registry/_tag.html.haml
@@ -14,7 +14,7 @@
     = pluralize(tag.layers.size, "layer")
   %td
     = time_ago_in_words(tag.created_at)
-  - if can?(current_user, :update_container_registry, @project)
+  - if can?(current_user, :update_container_image, @project)
     %td.content
       .controls.hidden-xs.pull-right
         = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 990253719bf..f3b2881ce09 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -33,7 +33,7 @@
             %th Image ID
             %th Size
             %th Created
-            - if can?(current_user, :update_container_registry, @project)
+            - if can?(current_user, :update_container_image, @project)
               %th
 
         - @tags.each do |tag|

From 0d93e93e794d179a4cbc5302aece27296e4abfe4 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sat, 14 May 2016 23:14:25 +0900
Subject: [PATCH 0434/1431] Add tests for unintentional filtering bug in MR
 (cf. !3872)

---
 CHANGELOG                                         |  2 +-
 .../user_lists_merge_requests_spec.rb             | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 30d4955c9f3..b5ee7681df6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,7 +43,7 @@ v 8.8.0 (unreleased)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
   - Expire repository exists? and has_visible_content? caches after a push if necessary
-  - Fix unintentional filtering bug in issues sorted by milestone due (Takuya Noguchi)
+  - Fix unintentional filtering bug in Issue/MR sorted by milestone due (Takuya Noguchi)
   - Fix adding a todo for private group members (Ahmad Sherif)
   - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
   - Total method execution timings are no longer tracked
diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
index cc7f78e7325..2c7e1c748ad 100644
--- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -38,6 +38,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
     expect(page).to have_content 'lfs'
     expect(page).not_to have_content 'fix'
     expect(page).not_to have_content 'markdown'
+    expect(count_merge_requests).to eq(1)
   end
 
   it 'filters on a specific assignee' do
@@ -46,6 +47,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
     expect(page).not_to have_content 'lfs'
     expect(page).to have_content 'fix'
     expect(page).to have_content 'markdown'
+    expect(count_merge_requests).to eq(2)
   end
 
   it 'sorts by newest' do
@@ -53,6 +55,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
 
     expect(first_merge_request).to include('lfs')
     expect(last_merge_request).to include('fix')
+    expect(count_merge_requests).to eq(3)
   end
 
   it 'sorts by oldest' do
@@ -60,30 +63,35 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
 
     expect(first_merge_request).to include('fix')
     expect(last_merge_request).to include('lfs')
+    expect(count_merge_requests).to eq(3)
   end
 
   it 'sorts by last updated' do
     visit_merge_requests(project, sort: sort_value_recently_updated)
 
     expect(first_merge_request).to include('lfs')
+    expect(count_merge_requests).to eq(3)
   end
 
   it 'sorts by oldest updated' do
     visit_merge_requests(project, sort: sort_value_oldest_updated)
 
     expect(first_merge_request).to include('markdown')
+    expect(count_merge_requests).to eq(3)
   end
 
   it 'sorts by milestone due soon' do
     visit_merge_requests(project, sort: sort_value_milestone_soon)
 
     expect(first_merge_request).to include('fix')
+    expect(count_merge_requests).to eq(3)
   end
 
   it 'sorts by milestone due later' do
     visit_merge_requests(project, sort: sort_value_milestone_later)
 
     expect(first_merge_request).to include('markdown')
+    expect(count_merge_requests).to eq(3)
   end
 
   it 'filters on one label and sorts by due soon' do
@@ -94,6 +102,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
                                   sort: sort_value_due_date_soon)
 
     expect(first_merge_request).to include('fix')
+    expect(count_merge_requests).to eq(1)
   end
 
   context 'while filtering on two labels' do
@@ -110,6 +119,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
                                     sort: sort_value_due_date_soon)
 
       expect(first_merge_request).to include('fix')
+      expect(count_merge_requests).to eq(1)
     end
 
     context 'filter on assignee and' do
@@ -119,6 +129,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
                                       sort: sort_value_due_date_soon)
 
         expect(first_merge_request).to include('fix')
+        expect(count_merge_requests).to eq(1)
       end
     end
   end
@@ -134,4 +145,8 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
   def last_merge_request
     page.all('ul.mr-list > li').last.text
   end
+
+  def count_merge_requests
+    page.all('ul.mr-list > li').count
+  end
 end

From 8d445fe665df313c16a88c319fde9bdfb97339df Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 19:45:33 -0500
Subject: [PATCH 0435/1431] Improve JwtController

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

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 0edf084e9e4..f5aa5397ff1 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -9,7 +9,7 @@ class JwtController < ApplicationController
 
   def auth
     service = SERVICES[params[:service]]
-    head :not_found unless service
+    return head :not_found unless service
 
     result = service.new(@project, @user, auth_params).execute
 

From e8f7e5516bf0449f0d7f435ae720aa35f40e1dd0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 19:45:48 -0500
Subject: [PATCH 0436/1431] Added specs for JwtController

---
 spec/requests/jwt_controller_spec.rb | 87 ++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 spec/requests/jwt_controller_spec.rb

diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
new file mode 100644
index 00000000000..782d710e1b4
--- /dev/null
+++ b/spec/requests/jwt_controller_spec.rb
@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe JwtController do
+  let(:services) { { 'test' => TestService } }
+  let(:parameters) { { service: 'test' } }
+  let(:ok_status) { { status: 'OK' } }
+
+  before { allow_any_instance_of(JwtController).to receive(:SERVICES).and_return services }
+
+  context 'existing service' do
+    before { expect_any_instance_of(TestService).to receive(:execute).and_return(ok_status) }
+
+    subject! { get '/jwt/auth', parameters }
+
+    it { expect(response.status).to eq(200) }
+  end
+
+  context 'when using authorized request' do
+    context 'using CI token' do
+      let(:project) { create(:empty_project, runners_token: 'token', builds_enabled: builds_enabled) }
+      let(:headers) { { HTTP_AUTHENTICATION: authorize('gitlab-ci-token', project.runners_token) } }
+
+      context 'project with enabled CI' do
+        let(:builds_enabled) { true }
+
+        it do
+          expect(TestService).to receive(:new).with(project, nil, parameters).and_call_original
+
+          get '/jwt/auth', parameters, headers
+        end
+      end
+
+      context 'project with disabled CI' do
+        let(:builds_enabled) { false }
+
+        it do
+          expect(TestService).to receive(:new).with(project, nil, parameters).and_call_original
+
+          get '/jwt/auth', parameters, headers
+        end
+      end
+    end
+
+    context 'using User login' do
+      let(:user) { create(:user) }
+      let(:headers) { { HTTP_AUTHENTICATION: authorize('user', 'password') } }
+
+      before { expect_any_instance_of(Gitlab::Auth).to receive(:find).with('user', 'password').and_return(user) }
+
+      it do
+        expect(TestService).to receive(:new).with(nil, user, parameters).and_call_original
+
+        get '/jwt/auth', parameters, headers
+      end
+    end
+
+    context 'using invalid login' do
+      let(:headers) { { HTTP_AUTHENTICATION: authorize('invalid', 'password') } }
+
+      subject! { get '/jwt/auth', parameters, headers }
+
+      it { expect(response.status).to eq(403) }
+    end
+  end
+
+  context 'unknown service' do
+    subject! { get '/jwt/auth', service: 'unknown' }
+
+    it { expect(response.status).to eq(404) }
+  end
+
+  def authorize(login, password)
+    ActionController::HttpAuthentication::Basic.encode_credentials(login, password)
+  end
+
+  class TestService
+    attr_accessor :project, :current_user, :params
+
+    def initialize(project, user, params = {})
+      @project, @current_user, @params = project, user, params.dup
+    end
+
+    def execute
+      { status: 'OK' }
+    end
+  end
+end

From 003526e2ee408bc6be3596436288213cc57d1bcd Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 14 May 2016 19:47:16 -0500
Subject: [PATCH 0437/1431] Add method new_pipeline

---
 app/services/ci/create_pipeline_service.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 223514968fc..e13f4fce13d 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -13,6 +13,8 @@ module Ci
         raise RuntimeError, 'Insufficient permissions to create a new pipeline'
       end
 
+      pipeline = new_pipeline
+
       Ci::Commit.transaction do
         unless pipeline.config_processor
           raise ArgumentError, pipeline.yaml_errors || 'Missing .gitlab-ci.yml file'
@@ -27,6 +29,10 @@ module Ci
 
     private
 
+    def new_pipeline
+      project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
+    end
+
     def ref_names
       @ref_names ||= project.repository.ref_names
     end
@@ -34,9 +40,5 @@ module Ci
     def commit
       @commit ||= project.commit(params[:ref])
     end
-
-    def pipeline
-      @pipeline ||= project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
-    end
   end
 end

From dec6b31c2772f7af792f7739b8b3b86a4dbd75db Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 14 May 2016 10:47:56 -0500
Subject: [PATCH 0438/1431] Fix Error 500 when attempting to retrieve project
 license when HEAD points to non-existent ref

Closes #17537
---
 CHANGELOG                      |  1 +
 app/models/repository.rb       | 12 ++++++++----
 spec/models/repository_spec.rb | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 30d4955c9f3..81dfd1a1eb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - Snippets tab under user profile. !4001 (Long Nguyen)
   - Fix error when using link to uploads in global snippets
+  - Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Use a case-insensitive comparison in sanitizing URI schemes
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 0eff74320f3..f89a1063099 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -475,7 +475,7 @@ class Repository
   end
 
   def license_blob
-    return nil if !exists? || empty?
+    return nil unless head_exists?
 
     cache.fetch(:license_blob) do
       tree(:head).blobs.find do |file|
@@ -485,7 +485,7 @@ class Repository
   end
 
   def license_key
-    return nil if !exists? || empty?
+    return nil unless head_exists?
 
     cache.fetch(:license_key) do
       Licensee.license(path).try(:key)
@@ -493,7 +493,7 @@ class Repository
   end
 
   def gitlab_ci_yml
-    return nil if !exists? || empty?
+    return nil unless head_exists?
 
     @gitlab_ci_yml ||= tree(:head).blobs.find do |file|
       file.name == '.gitlab-ci.yml'
@@ -961,7 +961,7 @@ class Repository
   end
 
   def main_language
-    return if empty? || rugged.head_unborn?
+    return unless head_exists?
 
     Linguist::Repository.new(rugged, rugged.head.target_id).language
   end
@@ -981,4 +981,8 @@ class Repository
   def cache
     @cache ||= RepositoryCache.new(path_with_namespace)
   end
+
+  def head_exists?
+    exists? && !empty? && !rugged.head_unborn?
+  end
 end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 34a13f9b5c9..2d5238b77fe 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -176,6 +176,15 @@ describe Repository, models: true do
       repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
     end
 
+    it 'handles when HEAD points to non-existent ref' do
+      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
+      rugged = double('rugged')
+      expect(rugged).to receive(:head_unborn?).and_return(true)
+      expect(repository).to receive(:rugged).and_return(rugged)
+
+      expect(repository.license_blob).to be_nil
+    end
+
     it 'looks in the root_ref only' do
       repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'markdown')
       repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'markdown', false)
@@ -204,6 +213,15 @@ describe Repository, models: true do
       repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
     end
 
+    it 'handles when HEAD points to non-existent ref' do
+      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
+      rugged = double('rugged')
+      expect(rugged).to receive(:head_unborn?).and_return(true)
+      expect(repository).to receive(:rugged).and_return(rugged)
+
+      expect(repository.license_key).to be_nil
+    end
+
     it 'returns nil when no license is detected' do
       expect(repository.license_key).to be_nil
     end

From 7b88dca77eeb2a93b5a343d27af513ea28222379 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 15 May 2016 00:33:06 -0500
Subject: [PATCH 0439/1431] Update JwtController specs

---
 spec/requests/jwt_controller_spec.rb | 57 ++++++++++------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 782d710e1b4..7bb71365a48 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -1,61 +1,58 @@
 require 'spec_helper'
 
 describe JwtController do
-  let(:services) { { 'test' => TestService } }
-  let(:parameters) { { service: 'test' } }
-  let(:ok_status) { { status: 'OK' } }
+  let(:service) { double(execute: {}) }
+  let(:service_class) { double(new: service) }
+  let(:service_name) { 'test' }
+  let(:parameters) { { service: service_name } }
 
-  before { allow_any_instance_of(JwtController).to receive(:SERVICES).and_return services }
+  before { stub_const('JwtController::SERVICES', service_name => service_class) }
 
   context 'existing service' do
-    before { expect_any_instance_of(TestService).to receive(:execute).and_return(ok_status) }
-
     subject! { get '/jwt/auth', parameters }
 
     it { expect(response.status).to eq(200) }
+
+    context 'returning custom http code' do
+      let(:service) { double(execute: { http_status: 505 }) }
+
+      it { expect(response.status).to eq(505) }
+    end
   end
 
   context 'when using authorized request' do
     context 'using CI token' do
       let(:project) { create(:empty_project, runners_token: 'token', builds_enabled: builds_enabled) }
-      let(:headers) { { HTTP_AUTHENTICATION: authorize('gitlab-ci-token', project.runners_token) } }
+      let(:headers) { { authorization: credentials('gitlab_ci_token', project.runners_token) } }
+
+      subject! { get '/jwt/auth', parameters, headers }
 
       context 'project with enabled CI' do
         let(:builds_enabled) { true }
 
-        it do
-          expect(TestService).to receive(:new).with(project, nil, parameters).and_call_original
-
-          get '/jwt/auth', parameters, headers
-        end
+        it { expect(service_class).to have_received(:new).with(project, nil, parameters) }
       end
 
       context 'project with disabled CI' do
         let(:builds_enabled) { false }
 
-        it do
-          expect(TestService).to receive(:new).with(project, nil, parameters).and_call_original
-
-          get '/jwt/auth', parameters, headers
-        end
+        it { expect(response.status).to eq(403) }
       end
     end
 
     context 'using User login' do
       let(:user) { create(:user) }
-      let(:headers) { { HTTP_AUTHENTICATION: authorize('user', 'password') } }
+      let(:headers) { { authorization: credentials('user', 'password') } }
 
       before { expect_any_instance_of(Gitlab::Auth).to receive(:find).with('user', 'password').and_return(user) }
 
-      it do
-        expect(TestService).to receive(:new).with(nil, user, parameters).and_call_original
+      subject! { get '/jwt/auth', parameters, headers }
 
-        get '/jwt/auth', parameters, headers
-      end
+      it { expect(service_class).to have_received(:new).with(nil, user, parameters) }
     end
 
     context 'using invalid login' do
-      let(:headers) { { HTTP_AUTHENTICATION: authorize('invalid', 'password') } }
+      let(:headers) { { authorization: credentials('invalid', 'password') } }
 
       subject! { get '/jwt/auth', parameters, headers }
 
@@ -69,19 +66,7 @@ describe JwtController do
     it { expect(response.status).to eq(404) }
   end
 
-  def authorize(login, password)
+  def credentials(login, password)
     ActionController::HttpAuthentication::Basic.encode_credentials(login, password)
   end
-
-  class TestService
-    attr_accessor :project, :current_user, :params
-
-    def initialize(project, user, params = {})
-      @project, @current_user, @params = project, user, params.dup
-    end
-
-    def execute
-      { status: 'OK' }
-    end
-  end
 end

From b575b2f1ef10c44a59151567aa1aa390f4a94ab1 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 15 May 2016 08:47:48 -0500
Subject: [PATCH 0440/1431] Fix Container Service full access token

---
 app/services/auth/container_registry_authentication_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 69ad634c368..9bfc1085fb9 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -16,7 +16,7 @@ module Auth
 
     def self.full_access_token(*names)
       registry = Gitlab.config.registry
-      token = ::JWT::RSAToken.new(registry.key)
+      token = JSONWebToken::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = AUDIENCE
       token[:access] = names.map do |name|

From dfd0e2450aabc3b5c322c4a4382edb84caa7101b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 15 May 2016 08:52:26 -0500
Subject: [PATCH 0441/1431] Improve authentication service specs

---
 ...ntainer_registry_authentication_service.rb |  6 +--
 spec/lib/json_web_token/rsa_token_spec.rb     | 28 ++++++++----
 ...er_registry_authentication_service_spec.rb | 44 +++++++++++++++----
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index bbbc84475c8..c61d339ffdd 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -7,10 +7,10 @@ module Auth
 
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
+      else
+        return error('forbidden', 401) unless scope
       end
 
-      return error('forbidden', 401) unless scope
-
       { token: authorized_token(scope).encoded }
     end
 
@@ -21,7 +21,7 @@ module Auth
       token.issuer = registry.issuer
       token.audience = params[:service]
       token.subject = current_user.try(:username)
-      token[:access] = accesses
+      token[:access] = accesses.compact
       token
     end
 
diff --git a/spec/lib/json_web_token/rsa_token_spec.rb b/spec/lib/json_web_token/rsa_token_spec.rb
index 4462cdde9a3..0c3d3ea7019 100644
--- a/spec/lib/json_web_token/rsa_token_spec.rb
+++ b/spec/lib/json_web_token/rsa_token_spec.rb
@@ -1,5 +1,17 @@
 describe JSONWebToken::RSAToken do
-  let(:rsa_key) { generate_key }
+  let(:rsa_key) do
+    OpenSSL::PKey::RSA.new <<-eos.strip_heredoc
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIBOgIBAAJBAMA5sXIBE0HwgIB40iNidN4PGWzOyLQK0bsdOBNgpEXkDlZBvnak
+      OUgAPF+rME4PB0Yl415DabUI40T5UNmlwxcCAwEAAQJAZtY2pSwIFm3JAXIh0cZZ
+      iXcAfiJ+YzuqinUOS+eW2sBCAEzjcARlU/o6sFQgtsOi4FOMczAd1Yx8UDMXMmrw
+      2QIhAPBgVhJiTF09pdmeFWutCvTJDlFFAQNbrbo2X2x/9WF9AiEAzLgqMKeStSRu
+      H9N16TuDrUoO8R+DPqriCwkKrSHaWyMCIFzMhE4inuKcSywBaLmiG4m3GQzs++Al
+      A6PRG/PSTpQtAiBxtBg6zdf+JC3GH3zt/dA0/10tL4OF2wORfYQghRzyYQIhAL2l
+      0ZQW+yLIZAGrdBFWYEAa52GZosncmzBNlsoTgwE4
+      -----END RSA PRIVATE KEY-----
+    eos
+  end
   let(:rsa_token) { described_class.new(nil) }
   let(:rsa_encoded) { rsa_token.encoded }
 
@@ -13,19 +25,19 @@ describe JSONWebToken::RSAToken do
 
       it { expect{subject}.to_not raise_error }
       it { expect(subject.first).to include('key' => 'value') }
+      it do
+        expect(subject.second).to eq(
+          "typ" => "JWT",
+          "alg" => "RS256",
+          "kid" => "OGXY:4TR7:FAVO:WEM2:XXEW:E4FP:TKL7:7ACK:TZAF:D54P:SUIA:P3B2")
+      end
     end
 
     context 'for invalid key to raise an exception' do
-      let(:new_key) { generate_key }
+      let(:new_key) { OpenSSL::PKey::RSA.generate(512) }
       subject { JWT.decode(rsa_encoded, new_key) }
 
       it { expect{subject}.to raise_error(JWT::DecodeError) }
     end
   end
-
-  private
-
-  def generate_key
-    OpenSSL::PKey::RSA.generate(512)
-  end
 end
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index a2937368136..4a6cd132e8d 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -57,15 +57,28 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     end
   end
 
-  shared_examples 'a forbidden' do
+  shared_examples 'a unauthorized' do
     it { is_expected.to include(http_status: 401) }
     it { is_expected.to_not include(:token) }
   end
 
+  shared_examples 'a forbidden' do
+    it { is_expected.to include(http_status: 403) }
+    it { is_expected.to_not include(:token) }
+  end
+
   context 'user authorization' do
     let(:project) { create(:project) }
     let(:current_user) { create(:user) }
 
+    context 'allow to use offline_token' do
+      let(:current_params) do
+        { offline_token: true }
+      end
+
+      it_behaves_like 'an authenticated'
+    end
+
     context 'allow developer to push images' do
       before { project.team << [current_user, :developer] }
 
@@ -103,13 +116,21 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull,push" }
       end
 
-      it_behaves_like 'a forbidden'
+      it_behaves_like 'a unauthorized'
     end
   end
 
   context 'project authorization' do
     let(:current_project) { create(:empty_project) }
 
+    context 'disallow to use offline_token' do
+      let(:current_params) do
+        { offline_token: true }
+      end
+
+      it_behaves_like 'a forbidden'
+    end
+
     context 'allow to pull and push images' do
       let(:current_params) do
         { scope: "repository:#{current_project.path_with_namespace}:pull,push" }
@@ -133,7 +154,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for private' do
           let(:project) { create(:empty_project, :private) }
-          it_behaves_like 'a forbidden'
+          it_behaves_like 'a unauthorized'
         end
       end
 
@@ -144,20 +165,27 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for all' do
           let(:project) { create(:empty_project, :public) }
-          it_behaves_like 'a forbidden'
+          it_behaves_like 'a unauthorized'
         end
       end
-
     end
   end
 
   context 'unauthorized' do
+    context 'disallow to use offline_token' do
+      let(:current_params) do
+        { offline_token: true }
+      end
+
+      it_behaves_like 'a forbidden'
+    end
+
     context 'for invalid scope' do
       let(:current_params) do
         { scope: 'invalid:aa:bb' }
       end
 
-      it_behaves_like 'a forbidden'
+      it_behaves_like 'a unauthorized'
     end
 
     context 'for private project' do
@@ -167,7 +195,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull" }
       end
 
-      it_behaves_like 'a forbidden'
+      it_behaves_like 'a unauthorized'
     end
 
     context 'for public project' do
@@ -186,7 +214,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
           { scope: "repository:#{project.path_with_namespace}:push" }
         end
 
-        it_behaves_like 'a forbidden'
+        it_behaves_like 'a unauthorized'
       end
     end
   end

From 938d5b6fe4bb3d7d6d85188fc5fd1aac77803577 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 15 May 2016 10:46:54 -0500
Subject: [PATCH 0442/1431] Fix http status codes for container registry
 authentication service

---
 ...container_registry_authentication_service.rb |  4 ++--
 ...iner_registry_authentication_service_spec.rb | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index a0cda4adc56..169e0387e85 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -6,9 +6,9 @@ module Auth
       return error('not found', 404) unless registry.enabled
 
       if params[:offline_token]
-        return error('forbidden', 403) unless current_user
+        return error('forbidden', 401) unless current_user
       else
-        return error('forbidden', 401) unless scope
+        return error('forbidden', 403) unless scope
       end
 
       { token: authorized_token(scope).encoded }
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 409d08e49f1..143d992b6e4 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -57,11 +57,6 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     end
   end
 
-  shared_examples 'a unauthorized' do
-    it { is_expected.to include(http_status: 401) }
-    it { is_expected.to_not include(:token) }
-  end
-
   shared_examples 'a forbidden' do
     it { is_expected.to include(http_status: 403) }
     it { is_expected.to_not include(:token) }
@@ -116,7 +111,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull,push" }
       end
 
-      it_behaves_like 'a unauthorized'
+      it_behaves_like 'a forbidden'
     end
   end
 
@@ -154,7 +149,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for private' do
           let(:project) { create(:empty_project, :private) }
-          it_behaves_like 'a unauthorized'
+          it_behaves_like 'a forbidden'
         end
       end
 
@@ -165,7 +160,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for all' do
           let(:project) { create(:empty_project, :public) }
-          it_behaves_like 'a unauthorized'
+          it_behaves_like 'a forbidden'
         end
       end
     end
@@ -199,7 +194,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: 'invalid:aa:bb' }
       end
 
-      it_behaves_like 'a unauthorized'
+      it_behaves_like 'a forbidden'
     end
 
     context 'for private project' do
@@ -209,7 +204,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull" }
       end
 
-      it_behaves_like 'a unauthorized'
+      it_behaves_like 'a forbidden'
     end
 
     context 'for public project' do
@@ -228,7 +223,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
           { scope: "repository:#{project.path_with_namespace}:push" }
         end
 
-        it_behaves_like 'a unauthorized'
+        it_behaves_like 'a forbidden'
       end
     end
   end

From 28ed9907047dd07089833d5b7bb8cd800e0ddff6 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 15 May 2016 10:46:54 -0500
Subject: [PATCH 0443/1431] Fix http status codes for container registry
 authentication service

---
 ...container_registry_authentication_service.rb |  4 ++--
 ...iner_registry_authentication_service_spec.rb | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index c61d339ffdd..72d28af7f7d 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -6,9 +6,9 @@ module Auth
       return error('not found', 404) unless registry.enabled
 
       if params[:offline_token]
-        return error('forbidden', 403) unless current_user
+        return error('forbidden', 401) unless current_user
       else
-        return error('forbidden', 401) unless scope
+        return error('forbidden', 403) unless scope
       end
 
       { token: authorized_token(scope).encoded }
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 4a6cd132e8d..3ea252ed44f 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -57,11 +57,6 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     end
   end
 
-  shared_examples 'a unauthorized' do
-    it { is_expected.to include(http_status: 401) }
-    it { is_expected.to_not include(:token) }
-  end
-
   shared_examples 'a forbidden' do
     it { is_expected.to include(http_status: 403) }
     it { is_expected.to_not include(:token) }
@@ -116,7 +111,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull,push" }
       end
 
-      it_behaves_like 'a unauthorized'
+      it_behaves_like 'a forbidden'
     end
   end
 
@@ -154,7 +149,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for private' do
           let(:project) { create(:empty_project, :private) }
-          it_behaves_like 'a unauthorized'
+          it_behaves_like 'a forbidden'
         end
       end
 
@@ -165,7 +160,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for all' do
           let(:project) { create(:empty_project, :public) }
-          it_behaves_like 'a unauthorized'
+          it_behaves_like 'a forbidden'
         end
       end
     end
@@ -185,7 +180,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: 'invalid:aa:bb' }
       end
 
-      it_behaves_like 'a unauthorized'
+      it_behaves_like 'a forbidden'
     end
 
     context 'for private project' do
@@ -195,7 +190,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull" }
       end
 
-      it_behaves_like 'a unauthorized'
+      it_behaves_like 'a forbidden'
     end
 
     context 'for public project' do
@@ -214,7 +209,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
           { scope: "repository:#{project.path_with_namespace}:push" }
         end
 
-        it_behaves_like 'a unauthorized'
+        it_behaves_like 'a forbidden'
       end
     end
   end

From bc32a3ecc7ec2e5ebf6e8c9d9fc1b218a3620f36 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 15 May 2016 10:47:38 -0500
Subject: [PATCH 0444/1431] Fix offline_token http_status code

---
 app/services/auth/container_registry_authentication_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 72d28af7f7d..b636f55d031 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -6,7 +6,7 @@ module Auth
       return error('not found', 404) unless registry.enabled
 
       if params[:offline_token]
-        return error('forbidden', 401) unless current_user
+        return error('forbidden', 403) unless current_user
       else
         return error('forbidden', 403) unless scope
       end

From b9306c2e82fec5b74416ccdd5481dfed3f8fbf51 Mon Sep 17 00:00:00 2001
From: Pablo Carranza <pcarranza@gmail.com>
Date: Sun, 15 May 2016 19:47:41 +0100
Subject: [PATCH 0445/1431] Add cache count metrics to rails cache

---
 CHANGELOG                                        |  1 +
 lib/gitlab/metrics/subscribers/rails_cache.rb    | 12 +++++++-----
 .../metrics/subscribers/rails_cache_spec.rb      | 16 +++++++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 30d4955c9f3..ca59f488e0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 8.8.0 (unreleased)
   - Add API endpoints for un/subscribing from/to a label. !4051 (Ahmad Sherif)
   - Hide left sidebar on phone screens to give more space for content
   - Redesign navigation for profile and group pages
+  - Add counter metrics for rails cache
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/lib/gitlab/metrics/subscribers/rails_cache.rb b/lib/gitlab/metrics/subscribers/rails_cache.rb
index 49e5f86e6e6..8e345e8ae4a 100644
--- a/lib/gitlab/metrics/subscribers/rails_cache.rb
+++ b/lib/gitlab/metrics/subscribers/rails_cache.rb
@@ -6,26 +6,28 @@ module Gitlab
         attach_to :active_support
 
         def cache_read(event)
-          increment(:cache_read_duration, event.duration)
+          increment(:cache_read, event.duration)
         end
 
         def cache_write(event)
-          increment(:cache_write_duration, event.duration)
+          increment(:cache_write, event.duration)
         end
 
         def cache_delete(event)
-          increment(:cache_delete_duration, event.duration)
+          increment(:cache_delete, event.duration)
         end
 
         def cache_exist?(event)
-          increment(:cache_exists_duration, event.duration)
+          increment(:cache_exists, event.duration)
         end
 
         def increment(key, duration)
           return unless current_transaction
 
           current_transaction.increment(:cache_duration, duration)
-          current_transaction.increment(key, duration)
+          current_transaction.increment(:cache_count, 1)
+          current_transaction.increment("#{key}_duration".to_sym, duration)
+          current_transaction.increment("#{key}_count".to_sym, 1)
         end
 
         private
diff --git a/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb b/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
index e01b0b4bd21..d824dc54438 100644
--- a/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
@@ -9,7 +9,7 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
   describe '#cache_read' do
     it 'increments the cache_read duration' do
       expect(subscriber).to receive(:increment).
-        with(:cache_read_duration, event.duration)
+        with(:cache_read, event.duration)
 
       subscriber.cache_read(event)
     end
@@ -18,7 +18,7 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
   describe '#cache_write' do
     it 'increments the cache_write duration' do
       expect(subscriber).to receive(:increment).
-        with(:cache_write_duration, event.duration)
+        with(:cache_write, event.duration)
 
       subscriber.cache_write(event)
     end
@@ -27,7 +27,7 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
   describe '#cache_delete' do
     it 'increments the cache_delete duration' do
       expect(subscriber).to receive(:increment).
-        with(:cache_delete_duration, event.duration)
+        with(:cache_delete, event.duration)
 
       subscriber.cache_delete(event)
     end
@@ -36,7 +36,7 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
   describe '#cache_exist?' do
     it 'increments the cache_exists duration' do
       expect(subscriber).to receive(:increment).
-        with(:cache_exists_duration, event.duration)
+        with(:cache_exists, event.duration)
 
       subscriber.cache_exist?(event)
     end
@@ -61,10 +61,16 @@ describe Gitlab::Metrics::Subscribers::RailsCache do
         expect(transaction).to receive(:increment).
           with(:cache_duration, event.duration)
 
+        expect(transaction).to receive(:increment).
+          with(:cache_count, 1)
+
         expect(transaction).to receive(:increment).
           with(:cache_delete_duration, event.duration)
 
-        subscriber.increment(:cache_delete_duration, event.duration)
+        expect(transaction).to receive(:increment).
+          with(:cache_delete_count, 1)
+
+        subscriber.increment(:cache_delete, event.duration)
       end
     end
   end

From bec350528cdc81e26476780f1ca3db8171b3ece8 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 3 May 2016 12:42:55 +0100
Subject: [PATCH 0446/1431] Force password change after admin reset

When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
---
 CHANGELOG                                     |  1 +
 app/controllers/admin/users_controller.rb     |  1 +
 .../admin/users_controller_spec.rb            | 76 +++++++++++++++++++
 spec/features/admin/admin_users_spec.rb       |  3 +
 4 files changed, 81 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ca59f488e0f..02b94e5a0b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.8.0 (unreleased)
   - Display informative message when new milestone is created
   - Sanitize milestones and labels titles
   - Support multi-line tag messages. !3833 (Calin Seciu)
+  - Force users to reset their password after an admin changes it
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index f2f654c7bcd..6908a3bf946 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -119,6 +119,7 @@ class Admin::UsersController < Admin::ApplicationController
       user_params_with_pass.merge!(
         password: params[:user][:password],
         password_confirmation: params[:user][:password_confirmation],
+        password_expires_at: Time.now
       )
     end
 
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index ce2a62ae1fd..6caf37ddc2c 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -114,6 +114,82 @@ describe Admin::UsersController do
     end
   end
 
+  describe 'POST update' do
+    context 'when the password has changed' do
+      def update_password(user, password, password_confirmation = nil)
+        params = {
+          id: user.to_param,
+          user: {
+            password: password,
+            password_confirmation: password_confirmation || password
+          }
+        }
+
+        post :update, params
+      end
+
+      context 'when the new password is valid' do
+        it 'redirects to the user' do
+          update_password(user, 'AValidPassword1')
+
+          expect(response).to redirect_to(admin_user_path(user))
+        end
+
+        it 'updates the password' do
+          update_password(user, 'AValidPassword1')
+
+          expect { user.reload }.to change { user.encrypted_password }
+        end
+
+        it 'sets the new password to expire immediately' do
+          update_password(user, 'AValidPassword1')
+
+          expect { user.reload }.to change { user.password_expires_at }.to(a_value <= Time.now)
+        end
+      end
+
+      context 'when the new password is invalid' do
+        it 'shows the edit page again' do
+          update_password(user, 'invalid')
+
+          expect(response).to render_template(:edit)
+        end
+
+        it 'returns the error message' do
+          update_password(user, 'invalid')
+
+          expect(assigns[:user].errors).to contain_exactly(a_string_matching(/too short/))
+        end
+
+        it 'does not update the password' do
+          update_password(user, 'invalid')
+
+          expect { user.reload }.not_to change { user.encrypted_password }
+        end
+      end
+
+      context 'when the new password does not match the password confirmation' do
+        it 'shows the edit page again' do
+          update_password(user, 'AValidPassword1', 'AValidPassword2')
+
+          expect(response).to render_template(:edit)
+        end
+
+        it 'returns the error message' do
+          update_password(user, 'AValidPassword1', 'AValidPassword2')
+
+          expect(assigns[:user].errors).to contain_exactly(a_string_matching(/doesn't match/))
+        end
+
+        it 'does not update the password' do
+          update_password(user, 'AValidPassword1', 'AValidPassword2')
+
+          expect { user.reload }.not_to change { user.encrypted_password }
+        end
+      end
+    end
+  end
+
   describe "POST impersonate" do
     context "when the user is blocked" do
       before do
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 4570e409128..6dee0cd8d47 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -210,6 +210,8 @@ describe "Admin::Users", feature: true  do
       before do
         fill_in "user_name", with: "Big Bang"
         fill_in "user_email", with: "bigbang@mail.com"
+        fill_in "user_password", with: "AValidPassword1"
+        fill_in "user_password_confirmation", with: "AValidPassword1"
         check "user_admin"
         click_button "Save changes"
       end
@@ -223,6 +225,7 @@ describe "Admin::Users", feature: true  do
         @simple_user.reload
         expect(@simple_user.name).to eq('Big Bang')
         expect(@simple_user.is_admin?).to be_truthy
+        expect(@simple_user.password_expires_at).to be <= Time.now
       end
     end
   end

From e037faa3f8b9f6238a574e52f85b10dd0464a496 Mon Sep 17 00:00:00 2001
From: donhui <977675308@qq.com>
Date: Mon, 16 May 2016 16:22:22 +0800
Subject: [PATCH 0447/1431] typo fix: # Disable all components except Redis

typo fix: # Disable all components except Redis
---
 doc/administration/high_availability/redis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index d89a1e582ca..f6153216f33 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -26,7 +26,7 @@ that runs Redis.
     ```ruby
       external_url 'https://gitlab.example.com'
 
-      # Disable all components except PostgreSQL
+      # Disable all components except Redis
       redis['enable'] = true
       bootstrap['enable'] = false
       nginx['enable'] = false

From bda2c44a0b2f032d8c3eb9b9b8d79933fb40e651 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 27 Apr 2016 09:01:43 +0100
Subject: [PATCH 0448/1431] Project variables UI

Closes #14091
---
 .../projects/variables_controller.rb          | 30 ++++++++++++--
 .../projects/variables/_content.html.haml     |  8 ++++
 app/views/projects/variables/_form.html.haml  | 10 +++++
 app/views/projects/variables/_table.html.haml | 24 +++++++++++
 app/views/projects/variables/index.html.haml  | 17 ++++++++
 app/views/projects/variables/show.html.haml   | 41 ++++---------------
 config/routes.rb                              |  2 +-
 7 files changed, 94 insertions(+), 38 deletions(-)
 create mode 100644 app/views/projects/variables/_content.html.haml
 create mode 100644 app/views/projects/variables/_form.html.haml
 create mode 100644 app/views/projects/variables/_table.html.haml
 create mode 100644 app/views/projects/variables/index.html.haml

diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index 00234654578..6f068729390 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -3,20 +3,44 @@ class Projects::VariablesController < Projects::ApplicationController
 
   layout 'project_settings'
 
+  def index
+    @variable = Ci::Variable.new
+  end
+
   def show
+    @variable = @project.variables.find(params[:id])
   end
 
   def update
-    if project.update_attributes(project_params)
+    @variable = @project.variables.find(params[:id])
+
+    if @variable.update_attributes(project_params)
+      redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variable was successfully updated.'
+    else
+      render action: "show"
+    end
+  end
+
+  def create
+    @variable = Ci::Variable.new(project_params)
+
+    if @variable.valid? && @project.variables << @variable
       redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variables were successfully updated.'
     else
-      render action: 'show'
+      render action: "index"
     end
   end
 
+  def destroy
+    @key = @project.variables.find(params[:id])
+    @key.destroy
+
+    redirect_to namespace_project_variables_path(project.namespace, project), notice: 'Variable was successfully removed.'
+  end
+
   private
 
   def project_params
-    params.require(:project).permit({ variables_attributes: [:id, :key, :value, :_destroy] })
+    params.require(:variable).permit([:id, :key, :value, :_destroy])
   end
 end
diff --git a/app/views/projects/variables/_content.html.haml b/app/views/projects/variables/_content.html.haml
new file mode 100644
index 00000000000..0249e0c1bf1
--- /dev/null
+++ b/app/views/projects/variables/_content.html.haml
@@ -0,0 +1,8 @@
+%h4.prepend-top-0
+  Secret Variables
+%p
+  These variables will be set to environment by the runner.
+%p
+  So you can use them for passwords, secret keys or whatever you want.
+%p
+  The value of the variable can be visible in build log if explicitly asked to do so.
diff --git a/app/views/projects/variables/_form.html.haml b/app/views/projects/variables/_form.html.haml
new file mode 100644
index 00000000000..a5bae83e0ce
--- /dev/null
+++ b/app/views/projects/variables/_form.html.haml
@@ -0,0 +1,10 @@
+= form_for [@project.namespace.becomes(Namespace), @project, @variable] do |f|
+  = form_errors(@variable)
+
+  .form-group
+    = f.label :key, "Key", class: "label-light"
+    = f.text_field :key, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true
+  .form-group
+    = f.label :value, "Value", class: "label-light"
+    = f.text_area :value, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true
+  = f.submit btn_text, class: "btn btn-save"
diff --git a/app/views/projects/variables/_table.html.haml b/app/views/projects/variables/_table.html.haml
new file mode 100644
index 00000000000..1a733200098
--- /dev/null
+++ b/app/views/projects/variables/_table.html.haml
@@ -0,0 +1,24 @@
+.table-responsive
+  %table.table
+    %colgroup
+      %col
+      %col
+      %col{ width: 100 }
+    %thead
+      %th Key
+      %th Value
+      %th
+    %tbody
+      - @project.variables.each do |variable|
+        %tr
+          %td= variable.key
+          %td= variable.value
+          %td
+            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent" do
+              %span.sr-only
+                Update
+              = icon("pencil")
+            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent", method: :delete, data: { confirm: "Are you sure?" } do
+              %span.sr-only
+                Remove
+              = icon("trash")
diff --git a/app/views/projects/variables/index.html.haml b/app/views/projects/variables/index.html.haml
new file mode 100644
index 00000000000..89ef79fb2e9
--- /dev/null
+++ b/app/views/projects/variables/index.html.haml
@@ -0,0 +1,17 @@
+- page_title "Variables"
+
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    = render "content"
+  .col-lg-9
+    %h5.prepend-top-0
+      Add a variable
+    = render "form", btn_text: "Add new variable"
+    %hr
+    %h5.prepend-top-0
+      Your variables (#{@project.variables.size})
+    - if @project.variables.empty?
+      %p.profile-settings-message.text-center.append-bottom-0
+        No variables found, add one with the form above.
+    - else
+      = render "table"
diff --git a/app/views/projects/variables/show.html.haml b/app/views/projects/variables/show.html.haml
index ca284b84d39..297a53ca98c 100644
--- a/app/views/projects/variables/show.html.haml
+++ b/app/views/projects/variables/show.html.haml
@@ -1,36 +1,9 @@
 - page_title "Variables"
-%h3.page-title
-  Secret Variables
 
-%p.light
-  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
-
-
-= nested_form_for @project, url: url_for(controller: 'projects/variables', action: 'update'), html: { class: 'form-horizontal' }  do |f|
-  = form_errors(@project)
-
-  = f.fields_for :variables do |variable_form|
-    .form-group
-      = variable_form.label :key, 'Key', class: 'control-label'
-      .col-sm-10
-        = variable_form.text_field :key, class: 'form-control', placeholder: "PROJECT_VARIABLE"
-
-    .form-group
-      = variable_form.label :value, 'Value', class: 'control-label'
-      .col-sm-10
-        = variable_form.text_area :value, class: 'form-control', rows: 2, placeholder: ""
-
-        = variable_form.link_to_remove "Remove this variable", class: 'btn btn-danger pull-right prepend-top-10'
-    %hr
-  %p
-    .clearfix
-      = f.link_to_add "Add a variable", :variables, class: 'btn btn-success pull-right'
-
-  .form-actions
-    = f.submit 'Save changes', class: 'btn btn-save', return_to: request.original_url
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    = render "content"
+  .col-lg-9
+    %h5.prepend-top-0
+      Update variable
+    = render "form", btn_text: "Save variable"
diff --git a/config/routes.rb b/config/routes.rb
index 9e776a1f541..511ab5cfcd7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -660,7 +660,7 @@ Rails.application.routes.draw do
         end
 
         resources :protected_branches, only: [:index, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-        resource :variables, only: [:show, :update]
+        resources :variables, only: [:index, :show, :update, :create, :destroy]
         resources :triggers, only: [:index, :create, :destroy]
 
         resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do

From 99428f193b2fe51b16e43f7cd98029326b5c30f9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 27 Apr 2016 12:17:17 +0100
Subject: [PATCH 0449/1431] Updated project variable tests

---
 app/views/projects/variables/_table.html.haml |  6 +-
 spec/features/variables_spec.rb               | 59 ++++++++++++++-----
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/app/views/projects/variables/_table.html.haml b/app/views/projects/variables/_table.html.haml
index 1a733200098..f51a52d7cb3 100644
--- a/app/views/projects/variables/_table.html.haml
+++ b/app/views/projects/variables/_table.html.haml
@@ -1,4 +1,4 @@
-.table-responsive
+.table-responsive.variables-table
   %table.table
     %colgroup
       %col
@@ -14,11 +14,11 @@
           %td= variable.key
           %td= variable.value
           %td
-            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent" do
+            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do
               %span.sr-only
                 Update
               = icon("pencil")
-            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent", method: :delete, data: { confirm: "Are you sure?" } do
+            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-delete", method: :delete, data: { confirm: "Are you sure?" } do
               %span.sr-only
                 Remove
               = icon("trash")
diff --git a/spec/features/variables_spec.rb b/spec/features/variables_spec.rb
index afea1840cd7..48e2dae4884 100644
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
@@ -1,24 +1,53 @@
 require 'spec_helper'
 
-describe "Variables" do
-  let(:user) { create(:user) }
-  before { login_as(user) }
+describe 'Project variables', js: true do
+  let(:user)     { create(:user) }
+  let(:project)  { create(:project) }
+  let(:variable) { create(:ci_variable, key: 'test') }
 
-  describe "specific runners" do
-    before do
-      @project = FactoryGirl.create :empty_project
-      @project.team << [user, :master]
+  before do
+    login_as(user)
+    project.team << [user, :master]
+    project.variables << variable
+
+    visit namespace_project_variables_path(project.namespace, project)
+  end
+
+  it 'should show list of variables' do
+    page.within('.variables-table') do
+      expect(page).to have_content(variable.key)
+    end
+  end
+
+  it 'should add new variable' do
+    fill_in('variable_key', with: 'key')
+    fill_in('variable_value', with: 'key value')
+    click_button('Add new variable')
+
+    page.within('.variables-table') do
+      expect(page).to have_content('key')
+    end
+  end
+
+  it 'should delete variable' do
+    page.within('.variables-table') do
+      find('.btn-variable-delete').click
     end
 
-    it "creates variable", js: true do
-      visit namespace_project_variables_path(@project.namespace, @project)
-      click_on "Add a variable"
-      fill_in "Key", with: "SECRET_KEY"
-      fill_in "Value", with: "SECRET_VALUE"
-      click_on "Save changes"
+    expect(page).to_not have_selector('variables-table')
+  end
 
-      expect(page).to have_content("Variables were successfully updated.")
-      expect(@project.variables.count).to eq(1)
+  it 'should edit variable' do
+    page.within('.variables-table') do
+      find('.btn-variable-edit').click
+    end
+
+    fill_in('variable_key', with: 'key')
+    fill_in('variable_value', with: 'key value')
+    click_button('Save variable')
+
+    page.within('.variables-table') do
+      expect(page).to have_content('key')
     end
   end
 end

From 91480e5e7f2fb5e732839958b53c521bf7206939 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 12 May 2016 12:20:09 +0100
Subject: [PATCH 0450/1431] Tidy up IssuesFinder specs

- Don't do setup in spec bodies.
- Don't `describe` a symbol.
- Don't use 'should'.
---
 spec/finders/issues_finder_spec.rb | 150 ++++++++++++++++-------------
 1 file changed, 81 insertions(+), 69 deletions(-)

diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index bc607a29751..f905703dd6b 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe IssuesFinder do
-  let(:user) { create :user }
-  let(:user2) { create :user }
-  let(:project1) { create(:project) }
-  let(:project2) { create(:project) }
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:project1) { create(:empty_project) }
+  let(:project2) { create(:empty_project) }
   let(:milestone) { create(:milestone, project: project1) }
   let(:label) { create(:label, project: project2) }
   let(:issue1) { create(:issue, author: user, assignee: user, project: project1, milestone: milestone) }
@@ -16,101 +16,113 @@ describe IssuesFinder do
     project1.team << [user, :master]
     project2.team << [user, :developer]
     project2.team << [user2, :developer]
+
+    issue1
+    issue2
+    issue3
   end
 
-  describe :execute do
-    before :each do
-      issue1
-      issue2
-      issue3
-    end
+  describe '#execute' do
+    let(:search_user) { user }
+    let(:params) { {} }
+    let(:issues) { IssuesFinder.new(search_user, params.merge(scope: scope, state: 'opened')).execute }
 
     context 'scope: all' do
-      it 'should filter by all' do
-        params = { scope: "all", state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues.size).to eq(3)
+      let(:scope) { 'all' }
+
+      it 'returns all issues' do
+        expect(issues).to contain_exactly(issue1, issue2, issue3)
       end
 
-      it 'should filter by assignee id' do
-        params = { scope: "all", assignee_id: user.id, state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues.size).to eq(2)
+      context 'filtering by assignee ID' do
+        let(:params) { { assignee_id: user.id } }
+
+        it 'returns issues assigned to that user' do
+          expect(issues).to contain_exactly(issue1, issue2)
+        end
       end
 
-      it 'should filter by author id' do
-        params = { scope: "all", author_id: user2.id, state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues).to eq([issue3])
+      context 'filtering by author ID' do
+        let(:params) { { author_id: user2.id } }
+
+        it 'returns issues created by that user' do
+          expect(issues).to contain_exactly(issue3)
+        end
       end
 
-      it 'should filter by milestone id' do
-        params = { scope: "all", milestone_title: milestone.title, state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues).to eq([issue1])
+      context 'filtering by milestone' do
+        let(:params) { { milestone_title: milestone.title } }
+
+        it 'returns issues assigned to that milestone' do
+          expect(issues).to contain_exactly(issue1)
+        end
       end
 
-      it 'should filter by no milestone id' do
-        params = { scope: "all", milestone_title: Milestone::None.title, state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues).to match_array([issue2, issue3])
+      context 'filtering by no milestone' do
+        let(:params) { { milestone_title: Milestone::None.title } }
+
+        it 'returns issues with no milestone' do
+          expect(issues).to contain_exactly(issue2, issue3)
+        end
       end
 
-      it 'should filter by label name' do
-        params = { scope: "all", label_name: label.title, state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues).to eq([issue2])
+      context 'filtering by label' do
+        let(:params) { { label_name: label.title } }
+
+        it 'returns issues with that label' do
+          expect(issues).to contain_exactly(issue2)
+        end
       end
 
-      it 'returns unique issues when filtering by multiple labels' do
-        label2 = create(:label, project: project2)
+      context 'filtering by multiple labels' do
+        let(:params) { { label_name: [label.title, label2.title].join(',') } }
+        let(:label2) { create(:label, project: project2) }
 
-        create(:label_link, label: label2, target: issue2)
+        before { create(:label_link, label: label2, target: issue2) }
 
-        params = {
-          scope:      'all',
-          label_name: [label.title, label2.title].join(','),
-          state:      'opened'
-        }
-
-        issues = IssuesFinder.new(user, params).execute
-
-        expect(issues).to eq([issue2])
+        it 'returns the unique issues with any of those labels' do
+          expect(issues).to contain_exactly(issue2)
+        end
       end
 
-      it 'should filter by no label name' do
-        params = { scope: "all", label_name: Label::None.title, state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues).to match_array([issue1, issue3])
+      context 'filtering by no label' do
+        let(:params) { { label_name: Label::None.title } }
+
+        it 'returns issues with no labels' do
+          expect(issues).to contain_exactly(issue1, issue3)
+        end
       end
 
-      it 'should be empty for unauthorized user' do
-        params = { scope: "all", state: 'opened' }
-        issues = IssuesFinder.new(nil, params).execute
-        expect(issues.size).to be_zero
+      context 'when the user is unauthorized' do
+        let(:search_user) { nil }
+
+        it 'returns no results' do
+          expect(issues).to be_empty
+        end
       end
 
-      it 'should not include unauthorized issues' do
-        params = { scope: "all", state: 'opened' }
-        issues = IssuesFinder.new(user2, params).execute
-        expect(issues.size).to eq(2)
-        expect(issues).not_to include(issue1)
-        expect(issues).to include(issue2)
-        expect(issues).to include(issue3)
+      context 'when the user can see some, but not all, issues' do
+        let(:search_user) { user2 }
+
+        it 'returns only issues they can see' do
+          expect(issues).to contain_exactly(issue2, issue3)
+        end
       end
     end
 
     context 'personal scope' do
-      it 'should filter by assignee' do
-        params = { scope: "assigned-to-me", state: 'opened' }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues.size).to eq(2)
+      let(:scope) { 'assigned-to-me' }
+
+      it 'returns issue assigned to the user' do
+        expect(issues).to contain_exactly(issue1, issue2)
       end
 
-      it 'should filter by project' do
-        params = { scope: "assigned-to-me", state: 'opened', project_id: project1.id }
-        issues = IssuesFinder.new(user, params).execute
-        expect(issues.size).to eq(1)
+      context 'filtering by project' do
+        let(:params) { { project_id: project1.id } }
+
+        it 'returns issues assigned to the user in that project' do
+          expect(issues).to contain_exactly(issue1)
+        end
       end
     end
   end

From 750b2ff0eec67926e737a40c7975cce2b58e27f7 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 11 May 2016 17:38:34 +0100
Subject: [PATCH 0451/1431] Make upcoming milestone work across projects

Before: we took the next milestone due across all projects in the
search and found issues whose milestone title matched that
one. Problems:

1. The milestone could be closed.
2. Different projects have milestones with different schedules.
3. Different projects have milestones with different titles.
4. Different projects can have milestones with different schedules, but
   the _same_ title. That means we could show issues from a past
   milestone, or one that's far in the future.

After: gather the ID of the next milestone on each project we're looking
at, and find issues with those milestone IDs. Problems:

1. For a lot of projects, this can return a lot of IDs.
2. The SQL query has to be different between Postgres and MySQL, because
   MySQL is much more lenient with HAVING: as well as the columns
   appearing in GROUP BY or in aggregate clauses, MySQL allows them to
   appear in the SELECT list (un-aggregated).
---
 CHANGELOG                          |  1 +
 app/finders/issuable_finder.rb     |  4 ++--
 app/models/milestone.rb            | 14 ++++++++++--
 spec/finders/issues_finder_spec.rb | 34 ++++++++++++++++++++++++++++++
 spec/models/milestone_spec.rb      | 31 +++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ca59f488e0f..50937f5f835 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.8.0 (unreleased)
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
   - Added /health_check endpoint for checking service status
+  - Make 'upcoming' filter for milestones work better across projects
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index f00f3f709e9..5849e00662b 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -252,8 +252,8 @@ class IssuableFinder
       if filter_by_no_milestone?
         items = items.where(milestone_id: [-1, nil])
       elsif filter_by_upcoming_milestone?
-        upcoming = Milestone.where(project_id: projects).upcoming
-        items = items.joins(:milestone).where(milestones: { title: upcoming.try(:title) })
+        upcoming_ids = Milestone.upcoming_ids_by_projects(projects)
+        items = items.joins(:milestone).where(milestone_id: upcoming_ids)
       else
         items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] })
 
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index e4fdd23badb..6b01e48d7fc 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -67,8 +67,18 @@ class Milestone < ActiveRecord::Base
     @link_reference_pattern ||= super("milestones", /(?<milestone>\d+)/)
   end
 
-  def self.upcoming
-    self.where('due_date > ?', Time.now).reorder(due_date: :asc).first
+  def self.upcoming_ids_by_projects(projects)
+    rel = unscoped.of_projects(projects).active.where('due_date > ?', Time.now)
+
+    if Gitlab::Database.postgresql?
+      rel.order(:project_id, :due_date).pluck('DISTINCT ON (project_id) id')
+    else
+      rel.
+        group(:project_id).
+        having('due_date = MIN(due_date)').
+        pluck(:id, :project_id, :due_date).
+        map(&:first)
+    end
   end
 
   def to_reference(from_project = nil)
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index f905703dd6b..ec8809e6926 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -66,6 +66,40 @@ describe IssuesFinder do
         end
       end
 
+      context 'filtering by upcoming milestone' do
+        let(:params) { { milestone_title: Milestone::Upcoming.name } }
+
+        let(:project_no_upcoming_milestones) { create(:empty_project, :public) }
+        let(:project_next_1_1) { create(:empty_project, :public) }
+        let(:project_next_8_8) { create(:empty_project, :public) }
+
+        let(:yesterday) { Date.today - 1.day }
+        let(:tomorrow) { Date.today + 1.day }
+        let(:two_days_from_now) { Date.today + 2.days }
+        let(:ten_days_from_now) { Date.today + 10.days }
+
+        let(:milestones) do
+          [
+            create(:milestone, :closed, project: project_no_upcoming_milestones),
+            create(:milestone, project: project_next_1_1, title: '1.1', due_date: two_days_from_now),
+            create(:milestone, project: project_next_1_1, title: '8.8', due_date: ten_days_from_now),
+            create(:milestone, project: project_next_8_8, title: '1.1', due_date: yesterday),
+            create(:milestone, project: project_next_8_8, title: '8.8', due_date: tomorrow)
+          ]
+        end
+
+        before do
+          milestones.each do |milestone|
+            create(:issue, project: milestone.project, milestone: milestone, author: user, assignee: user)
+          end
+        end
+
+        it 'returns issues in the upcoming milestone for each project' do
+          expect(issues.map { |issue| issue.milestone.title }).to contain_exactly('1.1', '8.8')
+          expect(issues.map { |issue| issue.milestone.due_date }).to contain_exactly(tomorrow, two_days_from_now)
+        end
+      end
+
       context 'filtering by label' do
         let(:params) { { label_name: label.title } }
 
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 247a9fa9910..210c5f7eb4f 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -204,4 +204,35 @@ describe Milestone, models: true do
         to eq([milestone])
     end
   end
+
+  describe '.upcoming_ids_by_projects' do
+    let(:project_1) { create(:empty_project) }
+    let(:project_2) { create(:empty_project) }
+    let(:project_3) { create(:empty_project) }
+    let(:projects) { [project_1, project_2, project_3] }
+
+    let!(:past_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.now - 1.day) }
+    let!(:current_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.now + 1.day) }
+    let!(:future_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.now + 2.days) }
+
+    let!(:past_milestone_project_2) { create(:milestone, project: project_2, due_date: Time.now - 1.day) }
+    let!(:closed_milestone_project_2) { create(:milestone, :closed, project: project_2, due_date: Time.now + 1.day) }
+    let!(:current_milestone_project_2) { create(:milestone, project: project_2, due_date: Time.now + 2.days) }
+
+    let!(:past_milestone_project_3) { create(:milestone, project: project_3, due_date: Time.now - 1.day) }
+
+    let(:milestone_ids) { Milestone.upcoming_ids_by_projects(projects) }
+
+    it 'returns the next upcoming open milestone ID for each project' do
+      expect(milestone_ids).to contain_exactly(current_milestone_project_1.id, current_milestone_project_2.id)
+    end
+
+    context 'when the projects have no open upcoming milestones' do
+      let(:projects) { [project_3] }
+
+      it 'returns no results' do
+        expect(milestone_ids).to be_empty
+      end
+    end
+  end
 end

From e8058bd23100949607ac8c353f482067c0ecd25a Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 16 May 2016 10:23:21 +0100
Subject: [PATCH 0452/1431] Return a relation with Postgres

Postgres only needs to select a single column, so that can used as a
sub-query where `Milestone.upcoming_ids_by_projects` is actually used in
`IssuableFinder`.

MySQL needs to select the `due_date` column because it's used in the
`HAVING` clause, so it has to return an array of IDs.
---
 app/models/milestone.rb       | 2 +-
 spec/models/milestone_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 6b01e48d7fc..fe9a281f366 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -71,7 +71,7 @@ class Milestone < ActiveRecord::Base
     rel = unscoped.of_projects(projects).active.where('due_date > ?', Time.now)
 
     if Gitlab::Database.postgresql?
-      rel.order(:project_id, :due_date).pluck('DISTINCT ON (project_id) id')
+      rel.order(:project_id, :due_date).select('DISTINCT ON (project_id) id')
     else
       rel.
         group(:project_id).
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 210c5f7eb4f..1e18c788b50 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -221,7 +221,9 @@ describe Milestone, models: true do
 
     let!(:past_milestone_project_3) { create(:milestone, project: project_3, due_date: Time.now - 1.day) }
 
-    let(:milestone_ids) { Milestone.upcoming_ids_by_projects(projects) }
+    # The call to `#try` is because this returns a relation with a Postgres DB,
+    # and an array of IDs with a MySQL DB.
+    let(:milestone_ids) { Milestone.upcoming_ids_by_projects(projects).map { |id| id.try(:id) || id } }
 
     it 'returns the next upcoming open milestone ID for each project' do
       expect(milestone_ids).to contain_exactly(current_milestone_project_1.id, current_milestone_project_2.id)

From c9b3c08c21daf421ec36828c990ccceb21e1577f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 10:26:11 +0100
Subject: [PATCH 0453/1431] Changed table border color Fixed issue with form
 errors not displaying

---
 .../stylesheets/framework/variables.scss      |  2 +-
 app/views/projects/variables/_table.html.haml | 25 ++++++++++---------
 app/views/projects/variables/index.html.haml  |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 5fa4c266607..7360bdbcc82 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -12,7 +12,7 @@ $gutter_inner_width: 258px;
  */
 $border-color:       #e5e5e5;
 $focus-border-color: #3aabf0;
-$table-border-color: #ececec;
+$table-border-color: #f0f0f0;
 $background-color:   #fafafa;
 
 /*
diff --git a/app/views/projects/variables/_table.html.haml b/app/views/projects/variables/_table.html.haml
index f51a52d7cb3..6c43f822db4 100644
--- a/app/views/projects/variables/_table.html.haml
+++ b/app/views/projects/variables/_table.html.haml
@@ -10,15 +10,16 @@
       %th
     %tbody
       - @project.variables.each do |variable|
-        %tr
-          %td= variable.key
-          %td= variable.value
-          %td
-            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do
-              %span.sr-only
-                Update
-              = icon("pencil")
-            = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-delete", method: :delete, data: { confirm: "Are you sure?" } do
-              %span.sr-only
-                Remove
-              = icon("trash")
+        - if variable.id?
+          %tr
+            %td= variable.key
+            %td= variable.value
+            %td
+              = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do
+                %span.sr-only
+                  Update
+                = icon("pencil")
+              = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-delete", method: :delete, data: { confirm: "Are you sure?" } do
+                %span.sr-only
+                  Remove
+                = icon("trash")
diff --git a/app/views/projects/variables/index.html.haml b/app/views/projects/variables/index.html.haml
index 89ef79fb2e9..09bb54600af 100644
--- a/app/views/projects/variables/index.html.haml
+++ b/app/views/projects/variables/index.html.haml
@@ -11,7 +11,7 @@
     %h5.prepend-top-0
       Your variables (#{@project.variables.size})
     - if @project.variables.empty?
-      %p.profile-settings-message.text-center.append-bottom-0
+      %p.settings-message.text-center.append-bottom-0
         No variables found, add one with the form above.
     - else
       = render "table"

From 832d7fa3ce3e97113dd783600de57b8d2276d8a1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 13:11:44 +0100
Subject: [PATCH 0454/1431] Issuable filtering improvements This improves the
 filtering of issues and merge requests by creating a single file that
 encapsulates all the filtering. Previously this was done with a file for
 issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both.
---
 app/assets/javascripts/dispatcher.js.coffee   |  1 -
 app/assets/javascripts/issuable.js.coffee     | 23 +++++++++++++++++--
 .../javascripts/lib/url_utility.js.coffee     | 11 ++++++++-
 app/assets/stylesheets/framework/nav.scss     |  2 +-
 app/assets/stylesheets/pages/issues.scss      |  5 ----
 app/helpers/application_helper.rb             | 17 ++++++++++----
 app/views/shared/issuable/_filter.html.haml   |  6 +++--
 .../shared/issuable/_search_form.html.haml    |  6 -----
 8 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index f91aa3c5ad7..5dc1f2cbd69 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -16,7 +16,6 @@ class Dispatcher
     shortcut_handler = null
     switch page
       when 'projects:issues:index'
-        Issues.init()
         Issuable.init()
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:issues:show'
diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index afffed63ac5..b999500d0e5 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -1,7 +1,10 @@
+issuable_created = false
 @Issuable =
   init: ->
-    Issuable.initTemplates()
-    Issuable.initSearch()
+    if not issuable_created
+      issuable_created = true
+      Issuable.initTemplates()
+      Issuable.initSearch()
 
   initTemplates: ->
     Issuable.labelRow = _.template(
@@ -64,6 +67,7 @@
 
     $('#filter_issue_search').val($('#issue_search').val())
 
+
   updateStateFilters: ->
     stateFilters =  $('.issues-state-filters')
     newParams = {}
@@ -82,3 +86,18 @@
         else
           newUrl = gl.utils.mergeUrlParams(newParams, initialUrl)
         $(this).attr 'href', newUrl
+
+  checkChanged: ->
+    checked_issues = $('.selected_issue:checked')
+    if checked_issues.length > 0
+      ids = []
+      $.each checked_issues, (index, value) ->
+        ids.push $(value).data('id')
+
+      $('#update_issues_ids').val ids
+      $('.issues-other-filters').hide()
+      $('.issues_bulk_update').show()
+    else
+      $('#update_issues_ids').val []
+      $('.issues_bulk_update').hide()
+      $('.issues-other-filters').show()
diff --git a/app/assets/javascripts/lib/url_utility.js.coffee b/app/assets/javascripts/lib/url_utility.js.coffee
index 6a00932c028..3d51744614f 100644
--- a/app/assets/javascripts/lib/url_utility.js.coffee
+++ b/app/assets/javascripts/lib/url_utility.js.coffee
@@ -26,10 +26,19 @@
     newUrl = decodeURIComponent(url)
     for paramName, paramValue of params
       pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
-      if url.search(pattern) >= 0
+      if !paramValue?
+        newUrl = newUrl.replace pattern, ''
+      else if url.search(pattern) >= 0
         newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
       else
         newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
+
+    # Remove a trailing ampersand
+    lastChar = newUrl[newUrl.length - 1]
+
+    if lastChar is '&'
+        newUrl = newUrl.slice 0, -1
+
     newUrl
 
   # removes parameter query string from url. returns the modified url
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a81fcb1c6b3..89bff150c5e 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -119,7 +119,7 @@
     }
 
     input {
-      height: 34px;
+      height: 35px;
       display: inline-block;
       position: relative;
       top: 2px;
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index fc9db97132d..59f72cd8b69 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -40,11 +40,6 @@
   }
 }
 
-.issue-search-form {
-  margin: 0;
-  height: 24px;
-}
-
 form.edit-issue {
   margin: 0;
 }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3e0074da394..da4dee443a0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -263,6 +263,7 @@ module ApplicationHelper
       assignee_id: params[:assignee_id],
       author_id: params[:author_id],
       sort: params[:sort],
+      issue_search: params[:issue_search]
     }
 
     options = exist_opts.merge(options)
@@ -273,15 +274,21 @@ module ApplicationHelper
       end
     end
 
+    params = options.compact.to_param
+
     path = request.path
-    path << "?#{options.to_param}"
-    if add_label
-      if params[:label_name].present? and params[:label_name].respond_to?('any?')
-        params[:label_name].each do |label|
-          path << "&label_name[]=#{label}"
+
+    if params != nil
+      path << "?#{options.to_param}"
+      if add_label
+        if params[:label_name].present? and params[:label_name].respond_to?('any?')
+          params[:label_name].each do |label|
+            path << "&label_name[]=#{label}"
+          end
         end
       end
     end
+    
     path
   end
 
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 9474462cbd1..c4aa57e0acf 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -1,6 +1,8 @@
 .issues-filters
-  .issues-details-filters.row-content-block.second-block
-    = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
+  .issues-details-filters.gray-content-block.second-block
+    = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :issue_search]), method: :get, class: 'filter-form js-filter-form' do
+      - if params[:issue_search].present?
+        = hidden_field_tag :issue_search, params[:issue_search]
       - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
         .check-all-holder
           = check_box_tag "check_all_issues", nil, false,
diff --git a/app/views/shared/issuable/_search_form.html.haml b/app/views/shared/issuable/_search_form.html.haml
index afad48499b7..186963b32b8 100644
--- a/app/views/shared/issuable/_search_form.html.haml
+++ b/app/views/shared/issuable/_search_form.html.haml
@@ -1,8 +1,2 @@
 = form_tag(path, method: :get, id: "issue_search_form", class: 'issue-search-form') do
   = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by name ...', class: 'form-control issue_search search-text-input input-short', spellcheck: false }
-  = hidden_field_tag :state, params['state']
-  = hidden_field_tag :scope, params['scope']
-  = hidden_field_tag :assignee_id, params['assignee_id']
-  = hidden_field_tag :author_id, params['author_id']
-  = hidden_field_tag :milestone_id, params['milestone_id']
-  = hidden_field_tag :label_id, params['label_id']

From 3a76cc5c411433d39b8ac5e9af037a839767152c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 16:41:52 +0100
Subject: [PATCH 0455/1431] Fixed Ruby issues

---
 app/helpers/application_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index da4dee443a0..e6f11f95ec8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -279,7 +279,7 @@ module ApplicationHelper
     path = request.path
 
     if params != nil
-      path << "?#{options.to_param}"
+      path << "?#{params}"
       if add_label
         if params[:label_name].present? and params[:label_name].respond_to?('any?')
           params[:label_name].each do |label|
@@ -288,7 +288,6 @@ module ApplicationHelper
         end
       end
     end
-    
     path
   end
 

From 471d7a5b32c9be9d925ae262165c0917605a846b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 15 Apr 2016 08:54:28 +0100
Subject: [PATCH 0456/1431] Added tests

---
 spec/features/issues/filter_issues_spec.rb | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 192e3619375..9f4e6e56651 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -154,4 +154,110 @@ describe 'Filter issues', feature: true do
       end
     end
   end
+
+  describe 'filter issues by text' do
+    before do
+      create(:issue, title: "Bug", project: project)
+
+      create(:label, project: project, title: 'bug')
+      milestone = create(:milestone, title: "8", project: project)
+
+      issue = create(:issue,
+        title: "Bug 2",
+        project: project,
+        milestone: milestone,
+        author: user,
+        assignee: user
+      )
+      issue.labels << project.labels.find_by(title: 'bug')
+
+      visit namespace_project_issues_path(project.namespace, project)
+    end
+
+    context 'only text', js: true do
+      it 'should filter issues by searched text' do
+        fill_in 'issue_search', with: 'Bug'
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 2)
+        end
+      end
+
+      it 'should not show any issues' do
+        fill_in 'issue_search', with: 'testing'
+
+        page.within '.issues-list' do
+          expect(page).to_not have_selector('.issue')
+        end
+      end
+
+      it 'should filter by text and label' do
+        fill_in 'issue_search', with: 'Bug'
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 2)
+        end
+
+        click_button 'Label'
+        page.within '.labels-filter' do
+          click_link 'bug'
+        end
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 1)
+        end
+      end
+
+      it 'should filter by text and milestone' do
+        fill_in 'issue_search', with: 'Bug'
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 2)
+        end
+
+        click_button 'Milestone'
+        page.within '.milestone-filter' do
+          click_link '8'
+        end
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 1)
+        end
+      end
+
+      it 'should filter by text and assignee' do
+        fill_in 'issue_search', with: 'Bug'
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 2)
+        end
+
+        click_button 'Assignee'
+        page.within '.dropdown-menu-assignee' do
+          click_link user.name
+        end
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 1)
+        end
+      end
+
+      it 'should filter by text and author' do
+        fill_in 'issue_search', with: 'Bug'
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 2)
+        end
+
+        click_button 'Author'
+        page.within '.dropdown-menu-author' do
+          click_link user.name
+        end
+
+        page.within '.issues-list' do
+          expect(page).to have_selector('.issue', count: 1)
+        end
+      end
+    end
+  end
 end

From fdc949073ceabac7f573c1c1e0fcf06e4603ce11 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 15 Apr 2016 09:24:19 +0100
Subject: [PATCH 0457/1431] Fixed issue with not being able to sort and filter

---
 app/assets/javascripts/issuable.js.coffee  |  2 +-
 app/views/shared/_sort_dropdown.html.haml  | 13 ++++++--
 spec/features/issues/filter_issues_spec.rb | 35 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index b999500d0e5..b40fa322940 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -69,7 +69,7 @@ issuable_created = false
 
 
   updateStateFilters: ->
-    stateFilters =  $('.issues-state-filters')
+    stateFilters =  $('.issues-state-filters, .dropdown-menu-sort')
     newParams = {}
     paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search']
 
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index d327bd0a96f..154d9e30851 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -6,26 +6,35 @@
     - else
       = sort_title_recently_created
     %b.caret
-  %ul.dropdown-menu.dropdown-menu-align-right
+  %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-sort
     %li
       = link_to page_filter_path(sort: sort_value_recently_created) do
         = sort_title_recently_created
+    %li
       = link_to page_filter_path(sort: sort_value_oldest_created) do
         = sort_title_oldest_created
+    %li
       = link_to page_filter_path(sort: sort_value_recently_updated) do
         = sort_title_recently_updated
+    %li
       = link_to page_filter_path(sort: sort_value_oldest_updated) do
         = sort_title_oldest_updated
+    %li
       = link_to page_filter_path(sort: sort_value_milestone_soon) do
         = sort_title_milestone_soon
+    %li
       = link_to page_filter_path(sort: sort_value_milestone_later) do
         = sort_title_milestone_later
-      - if controller.controller_name == 'issues' || controller.action_name == 'issues'
+    - if controller.controller_name == 'issues' || controller.action_name == 'issues'
+      %li
         = link_to page_filter_path(sort: sort_value_due_date_soon) do
           = sort_title_due_date_soon
+      %li
         = link_to page_filter_path(sort: sort_value_due_date_later) do
           = sort_title_due_date_later
+    %li
       = link_to page_filter_path(sort: sort_value_upvotes) do
         = sort_title_upvotes
+    %li
       = link_to page_filter_path(sort: sort_value_downvotes) do
         = sort_title_downvotes
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 9f4e6e56651..c479e43b016 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -190,7 +190,9 @@ describe 'Filter issues', feature: true do
           expect(page).to_not have_selector('.issue')
         end
       end
+    end
 
+    context 'text and dropdown options', js: true do
       it 'should filter by text and label' do
         fill_in 'issue_search', with: 'Bug'
 
@@ -260,4 +262,37 @@ describe 'Filter issues', feature: true do
       end
     end
   end
+
+  describe 'filter issues and sort', js: true do
+    before do
+      label = create(:label, project: project, title: 'bug')
+      bug_one = create(:issue, title: "Frontend", project: project)
+      bug_two = create(:issue, title: "Bug 2", project: project)
+
+      bug_one.labels << project.labels.find_by(title: 'bug')
+      bug_two.labels << project.labels.find_by(title: 'bug')
+
+      visit namespace_project_issues_path(project.namespace, project)
+    end
+
+    it 'should be able to filter and sort issues' do
+      click_button 'Label'
+      page.within '.labels-filter' do
+        click_link 'bug'
+      end
+
+      page.within '.issues-list' do
+        expect(page).to have_selector('.issue', count: 2)
+      end
+
+      click_button 'Last created'
+      page.within '.dropdown-menu-sort' do
+        click_link 'Oldest created'
+      end
+
+      page.within '.issues-list' do
+        expect(first('.issue')).to have_content('Frontend')
+      end
+    end
+  end
 end

From 1a086745fc9a3e1ad74a7156f7f8bbf826a46b83 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 15 Apr 2016 15:18:55 +0100
Subject: [PATCH 0458/1431] Fixed tests

---
 app/helpers/application_helper.rb          |  4 ++--
 app/views/shared/_sort_dropdown.html.haml  | 11 +----------
 spec/features/issues/filter_issues_spec.rb |  5 ++---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e6f11f95ec8..27fae716216 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -274,12 +274,12 @@ module ApplicationHelper
       end
     end
 
-    params = options.compact.to_param
+    params = options.compact
 
     path = request.path
 
     if params != nil
-      path << "?#{params}"
+      path << "?#{params.to_param}"
       if add_label
         if params[:label_name].present? and params[:label_name].respond_to?('any?')
           params[:label_name].each do |label|
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index 154d9e30851..1e0f075b303 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -10,31 +10,22 @@
     %li
       = link_to page_filter_path(sort: sort_value_recently_created) do
         = sort_title_recently_created
-    %li
       = link_to page_filter_path(sort: sort_value_oldest_created) do
         = sort_title_oldest_created
-    %li
       = link_to page_filter_path(sort: sort_value_recently_updated) do
         = sort_title_recently_updated
-    %li
       = link_to page_filter_path(sort: sort_value_oldest_updated) do
         = sort_title_oldest_updated
-    %li
       = link_to page_filter_path(sort: sort_value_milestone_soon) do
         = sort_title_milestone_soon
-    %li
       = link_to page_filter_path(sort: sort_value_milestone_later) do
         = sort_title_milestone_later
-    - if controller.controller_name == 'issues' || controller.action_name == 'issues'
-      %li
+      - if controller.controller_name == 'issues' || controller.action_name == 'issues'
         = link_to page_filter_path(sort: sort_value_due_date_soon) do
           = sort_title_due_date_soon
-      %li
         = link_to page_filter_path(sort: sort_value_due_date_later) do
           = sort_title_due_date_later
-    %li
       = link_to page_filter_path(sort: sort_value_upvotes) do
         = sort_title_upvotes
-    %li
       = link_to page_filter_path(sort: sort_value_downvotes) do
         = sort_title_downvotes
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index c479e43b016..c7ffee7d09c 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -167,8 +167,7 @@ describe 'Filter issues', feature: true do
         project: project,
         milestone: milestone,
         author: user,
-        assignee: user
-      )
+        assignee: user)
       issue.labels << project.labels.find_by(title: 'bug')
 
       visit namespace_project_issues_path(project.namespace, project)
@@ -265,7 +264,7 @@ describe 'Filter issues', feature: true do
 
   describe 'filter issues and sort', js: true do
     before do
-      label = create(:label, project: project, title: 'bug')
+      create(:label, project: project, title: 'bug')
       bug_one = create(:issue, title: "Frontend", project: project)
       bug_two = create(:issue, title: "Bug 2", project: project)
 

From 7eb97ef4025f831fa5c922fb69661caf50aa990e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 25 Apr 2016 13:52:14 +0100
Subject: [PATCH 0459/1431] Added issue_search parameter

---
 app/assets/javascripts/issuable.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index b40fa322940..eb785bf96eb 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -71,7 +71,7 @@ issuable_created = false
   updateStateFilters: ->
     stateFilters =  $('.issues-state-filters, .dropdown-menu-sort')
     newParams = {}
-    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search']
+    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search', 'issue_search']
 
     for paramKey in paramKeys
       newParams[paramKey] = gl.utils.getParameterValues(paramKey)[0] or ''

From 31b1dc3c31a4da59acd2deff2ded0d6d2aed8557 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 26 Apr 2016 11:10:39 +0100
Subject: [PATCH 0460/1431] Fixed failing rubocop tests

Fixed issue with issuable checkboxs not being init'd
---
 app/assets/javascripts/issuable.js.coffee | 11 +++++--
 app/assets/javascripts/issues.js.coffee   | 38 -----------------------
 app/helpers/application_helper.rb         |  2 +-
 3 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 app/assets/javascripts/issues.js.coffee

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index eb785bf96eb..012c3e48014 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -5,6 +5,7 @@ issuable_created = false
       issuable_created = true
       Issuable.initTemplates()
       Issuable.initSearch()
+      Issuable.initChecks()
 
   initTemplates: ->
     Issuable.labelRow = _.template(
@@ -62,11 +63,17 @@ issuable_created = false
       dataType: "json"
 
   reload: ->
-    if Issues.created
-      Issues.initChecks()
+    if Issuable.created
+      Issuable.initChecks()
 
     $('#filter_issue_search').val($('#issue_search').val())
 
+  initChecks: ->
+    $('.check_all_issues').on 'click', ->
+      $('.selected_issue').prop('checked', @checked)
+      Issuable.checkChanged()
+
+    $('.selected_issue').on 'change', Issuable.checkChanged
 
   updateStateFilters: ->
     stateFilters =  $('.issues-state-filters, .dropdown-menu-sort')
diff --git a/app/assets/javascripts/issues.js.coffee b/app/assets/javascripts/issues.js.coffee
deleted file mode 100644
index 3330e6c68ad..00000000000
--- a/app/assets/javascripts/issues.js.coffee
+++ /dev/null
@@ -1,38 +0,0 @@
-@Issues =
-  init: ->
-    Issues.created = true
-    Issues.initChecks()
-
-    $("body").on "ajax:success", ".close_issue, .reopen_issue", ->
-      t = $(this)
-      totalIssues = undefined
-      reopen = t.hasClass("reopen_issue")
-      $(".issue_counter").each ->
-        issue = $(this)
-        totalIssues = parseInt($(this).html(), 10)
-        if reopen and issue.closest(".main_menu").length
-          $(this).html totalIssues + 1
-        else
-          $(this).html totalIssues - 1
-
-  initChecks: ->
-    $(".check_all_issues").click ->
-      $(".selected_issue").prop("checked", @checked)
-      Issues.checkChanged()
-
-    $(".selected_issue").bind "change", Issues.checkChanged
-
-  checkChanged: ->
-    checked_issues = $(".selected_issue:checked")
-    if checked_issues.length > 0
-      ids = []
-      $.each checked_issues, (index, value) ->
-        ids.push $(value).attr("data-id")
-
-      $("#update_issues_ids").val ids
-      $(".issues-other-filters").hide()
-      $(".issues_bulk_update").show()
-    else
-      $("#update_issues_ids").val []
-      $(".issues_bulk_update").hide()
-      $(".issues-other-filters").show()
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 27fae716216..59a04578c58 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -278,7 +278,7 @@ module ApplicationHelper
 
     path = request.path
 
-    if params != nil
+    if !params.nil?
       path << "?#{params.to_param}"
       if add_label
         if params[:label_name].present? and params[:label_name].respond_to?('any?')

From 7df4b16b56f52eafccd080253b60a4cc15c66149 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 26 Apr 2016 13:41:17 +0100
Subject: [PATCH 0461/1431] Fixed issue with not being able to search text &
 filter

---
 app/assets/javascripts/issuable.js.coffee   | 11 ++++++++++-
 app/views/shared/issuable/_filter.html.haml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 012c3e48014..4c4f67f5104 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -23,7 +23,16 @@ issuable_created = false
       .on 'keyup', ->
         clearTimeout(@timer)
         @timer = setTimeout( ->
-          Issuable.filterResults $('#issue_search_form')
+          $search = $('#issue_search')
+          $form = $('.js-filter-form')
+          $input = $("input[name='#{$search.attr('name')}']", $form)
+
+          if $input.length is 0
+            $form.append "<input type='hidden' name='#{$search.attr('name')}' value='#{$search.val()}'/>"
+          else
+            $input.val $search.val()
+
+          Issuable.filterResults $form
         , 500)
 
   toggleLabelFilters: ->
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index c4aa57e0acf..323d563cd4a 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -1,5 +1,5 @@
 .issues-filters
-  .issues-details-filters.gray-content-block.second-block
+  .issues-details-filters.row-content-block.second-block
     = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :issue_search]), method: :get, class: 'filter-form js-filter-form' do
       - if params[:issue_search].present?
         = hidden_field_tag :issue_search, params[:issue_search]

From 5f66bfe7edbdae24008a9ebeaadca9441b011184 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 22 Apr 2016 21:23:55 +0100
Subject: [PATCH 0462/1431] Added due date calendar to new issue form

Closes #15516
---
 .../javascripts/issuable_form.js.coffee       |  9 ++
 app/assets/stylesheets/framework/forms.scss   |  8 +-
 app/views/shared/issuable/_form.html.haml     | 82 ++++++++++---------
 3 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/issuable_form.js.coffee b/app/assets/javascripts/issuable_form.js.coffee
index 7a788f761b7..72ae3bde81e 100644
--- a/app/assets/javascripts/issuable_form.js.coffee
+++ b/app/assets/javascripts/issuable_form.js.coffee
@@ -20,6 +20,15 @@ class @IssuableForm
 
     @initWip()
 
+    $issuableDueDate = $('#issuable-due-date')
+
+    if $issuableDueDate.length
+      $('.datepicker').datepicker(
+        dateFormat: 'yy-mm-dd',
+        onSelect: (dateText, inst) ->
+          $issuableDueDate.val dateText
+      ).datepicker 'setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())
+
   initAutosave: ->
     new Autosave @titleField, [
       document.location.pathname,
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 558b133f593..46acc3b772f 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -28,10 +28,6 @@ input[type='text'].danger {
 }
 
 label {
-  &.control-label {
-    @extend .col-sm-2;
-  }
-
   &.inline-label {
     margin: 0;
   }
@@ -41,6 +37,10 @@ label {
   }
 }
 
+.control-label {
+  @extend .col-sm-2;
+}
+
 .inline-input-group {
   width: 250px;
 }
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 5c52cc6d1da..9ac5c0d9e4d 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -44,45 +44,53 @@
           This issue is confidential and should only be visible to team members
 
 - if can?(current_user, :"admin_#{issuable.to_ability_name}", issuable.project)
+  - has_due_date = issuable.has_attribute?(:due_date)
   %hr
-  .form-group
-    .issue-assignee
-      = f.label :assignee_id, "Assignee", class: 'control-label'
-      .col-sm-10
-        .issuable-form-select-holder
-          = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
-              placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
-              selected: issuable.assignee_id, project: @target_project || @project,
-              first_user: true, current_user: true, include_blank: true)
-        &nbsp;
-        = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
-  .form-group
-    .issue-milestone
-      = f.label :milestone_id, "Milestone", class: 'control-label'
-      .col-sm-10
-        - if milestone_options(issuable).present?
+  .row
+    %div{ class: (has_due_date ? "col-lg-6" : "col-sm-12") }
+      .form-group.issue-assignee
+        = f.label :assignee_id, "Assignee", class: "control-label #{"col-lg-4" if has_due_date}"
+        .col-sm-10{ class: ("col-lg-8" if has_due_date) }
           .issuable-form-select-holder
-            = f.select(:milestone_id, milestone_options(issuable),
-              { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
-        - else
-          .prepend-top-10
-          %span.light No open milestones available.
-        &nbsp;
-        - if can? current_user, :admin_milestone, issuable.project
-          = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank
-  .form-group
-    - has_labels = issuable.project.labels.any?
-    = f.label :label_ids, "Labels", class: 'control-label'
-    .col-sm-10{ class: ('issuable-form-padding-top' if !has_labels) }
-      - if has_labels
-        .issuable-form-select-holder
-          = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
-            { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
-      - else
-        %span.light No labels yet.
-      &nbsp;
-      - if can? current_user, :admin_label, issuable.project
-        = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank
+            = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
+                placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
+                selected: issuable.assignee_id, project: @target_project || @project,
+                first_user: true, current_user: true, include_blank: true)
+          %br
+          = link_to 'Assign to me', '#', class: 'assign-to-me-link prepend-top-5 inline'
+      .form-group.issue-milestone
+        = f.label :milestone_id, "Milestone", class: "control-label #{"col-lg-4" if has_due_date}"
+        .col-sm-10{ class: ("col-lg-8" if has_due_date) }
+          - if milestone_options(issuable).present?
+            .issuable-form-select-holder
+              = f.select(:milestone_id, milestone_options(issuable),
+                { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
+          - else
+            .prepend-top-10
+            %span.light No open milestones available.
+          - if can? current_user, :admin_milestone, issuable.project
+            %br
+            = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+      .form-group
+        - has_labels = issuable.project.labels.any?
+        = f.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}"
+        .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
+          - if has_labels
+            .issuable-form-select-holder
+              = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
+                { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
+          - else
+            %span.light No labels yet.
+          - if can? current_user, :admin_label, issuable.project
+            %br
+            = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+    - if issuable.has_attribute?(:due_date)
+      .col-lg-6
+        .form-group
+          = f.label :due_date, "Due date", class: "control-label"
+          = f.hidden_field :due_date, id: "issuable-due-date"
+          .col-sm-10
+            .datepicker
 
 - if issuable.can_move?(current_user)
   %hr

From 82ea43555773f9acb5c02dd659ab47cec3d2ebb0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 22 Apr 2016 21:48:45 +0100
Subject: [PATCH 0463/1431] Added tests

---
 spec/features/issues_spec.rb | 60 +++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index d5755c293c5..93c1fc0d03c 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -64,6 +64,64 @@ describe 'Issues', feature: true do
     end
   end
 
+  describe 'due date', js: true do
+    context 'on new form' do
+      before do
+        visit new_namespace_project_issue_path(project.namespace, project)
+      end
+
+      it 'should save with due date' do
+        date = Date.today.at_beginning_of_month
+
+        fill_in 'issue_title', with: 'bug 345'
+        fill_in 'issue_description', with: 'bug description'
+
+        page.within '.datepicker' do
+          click_link date.day
+        end
+
+        expect(find('#issuable-due-date', :visible => false).value).to eq date.to_s
+
+        click_button 'Submit issue'
+
+        page.within '.issuable-sidebar' do
+          expect(page).to have_content date.to_s(:medium)
+        end
+      end
+    end
+
+    context 'on edit form' do
+      let(:issue) { create(:issue, author: @user,project: project, due_date: Date.today.at_beginning_of_month.to_s) }
+
+      before do
+        visit edit_namespace_project_issue_path(project.namespace, project, issue)
+      end
+
+      it 'should save with due date' do
+        date = Date.today.at_beginning_of_month
+
+        expect(find('#issuable-due-date', :visible => false).value).to eq date.to_s
+
+        date = date.tomorrow
+
+        fill_in 'issue_title', with: 'bug 345'
+        fill_in 'issue_description', with: 'bug description'
+
+        page.within '.datepicker' do
+          click_link date.day
+        end
+
+        expect(find('#issuable-due-date', :visible => false).value).to eq date.to_s
+
+        click_button 'Save changes'
+
+        page.within '.issuable-sidebar' do
+          expect(page).to have_content date.to_s(:medium)
+        end
+      end
+    end
+  end
+
   describe 'Issue info' do
     it 'excludes award_emoji from comment count' do
       issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
@@ -331,7 +389,7 @@ describe 'Issues', feature: true do
         page.within '.assignee' do
           click_link 'Edit'
         end
-        
+
         page.within '.dropdown-menu-user' do
           click_link @user.name
         end

From f6d321ae9cd9f751952e0ff2eda9718eecdc4bf1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 22 Apr 2016 22:42:22 +0100
Subject: [PATCH 0464/1431] Fixed rubocop issues

---
 spec/features/issues_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 93c1fc0d03c..dd114db7e88 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -80,7 +80,7 @@ describe 'Issues', feature: true do
           click_link date.day
         end
 
-        expect(find('#issuable-due-date', :visible => false).value).to eq date.to_s
+        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
 
         click_button 'Submit issue'
 
@@ -100,7 +100,7 @@ describe 'Issues', feature: true do
       it 'should save with due date' do
         date = Date.today.at_beginning_of_month
 
-        expect(find('#issuable-due-date', :visible => false).value).to eq date.to_s
+        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
 
         date = date.tomorrow
 
@@ -111,7 +111,7 @@ describe 'Issues', feature: true do
           click_link date.day
         end
 
-        expect(find('#issuable-due-date', :visible => false).value).to eq date.to_s
+        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
 
         click_button 'Save changes'
 

From d4777cd86b79e5db7b1e351444c26b72cdaad3db Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 25 Apr 2016 08:04:37 +0100
Subject: [PATCH 0465/1431] Updated if statement

---
 app/views/shared/issuable/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 9ac5c0d9e4d..d06a287281a 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -84,7 +84,7 @@
           - if can? current_user, :admin_label, issuable.project
             %br
             = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
-    - if issuable.has_attribute?(:due_date)
+    - if has_due_date
       .col-lg-6
         .form-group
           = f.label :due_date, "Due date", class: "control-label"

From 36fdbc6edb1c0884f68c1267902b33a78d7be6ae Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 26 Apr 2016 13:21:48 +0100
Subject: [PATCH 0466/1431] Updated contrib map away from cal heat map

---
 app/assets/javascripts/calendar.js.coffee     | 106 ++++++++++++++----
 .../stylesheets/framework/calendar.scss       |  30 +++++
 app/views/users/calendar.html.haml            |   2 -
 3 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index d80e0e716ce..ec153f61c2a 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -1,27 +1,75 @@
 class @Calendar
   constructor: (timestamps, starting_year, starting_month, calendar_activities_path) ->
-    cal = new CalHeatMap()
-    cal.init
-      itemName: ["contribution"]
-      data: timestamps
-      start: new Date(starting_year, starting_month)
-      domainLabelFormat: "%b"
-      id: "cal-heatmap"
-      domain: "month"
-      subDomain: "day"
-      range: 12
-      tooltip: true
-      label:
-        position: "top"
-      legend: [
-        0
-        10
-        20
-        30
-      ]
-      legendCellPadding: 3
-      cellSize: $('.user-calendar').width() / 73
-      onClick: (date, count) ->
+    # Get the highest value from the timestampes
+    highestValue = 0
+    _.each timestamps, (count) ->
+      if count > highestValue
+        highestValue = count
+
+    timestamps = _.chain(timestamps)
+      .map (stamp, key) ->
+        {
+          count: stamp
+          date: key
+        }
+      .groupBy (stamp, i) ->
+        Math.floor i / 7
+      .toArray()
+      .value()
+
+    monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+    months = []
+    svg = d3.select '#cal-heatmap'
+      .append 'svg'
+      .attr 'width', 53 * 17
+      .attr 'height', 140
+
+    # Setup each day box
+    svg.selectAll 'g'
+      .data timestamps
+      .enter()
+      .append 'g'
+      .attr 'transform', (group, i) ->
+        _.each group, (stamp) ->
+          month = new Date(parseInt(stamp.date) * 1000).getMonth()
+          x = 17 * i + 1
+          lastMonth = _.last(months)
+
+          # If undefined, push
+          if !lastMonth?
+            months.push
+              month: month
+              x: x
+          else if lastMonth.x is x
+            lastMonth.month = month
+          else if lastMonth.month isnt month
+              months.push
+                month: month
+                x: x
+        "translate(#{17 * i + 1}, 18)"
+      .selectAll 'rect'
+      .data (stamp) ->
+        stamp
+      .enter()
+      .append 'rect'
+      .attr 'x', '0'
+      .attr 'y', (stamp, i) ->
+        17 * i
+      .attr 'width', 15
+      .attr 'height', 15
+      .attr 'title', (stamp) ->
+        "#{stamp.count} contributions<br />#{gl.utils.formatDate parseInt(stamp.date) * 1000}"
+      .attr 'class', (stamp) ->
+        extraClass = ''
+        if stamp.count isnt 0
+          diff = stamp.count / highestValue
+          classNumber = Math.floor (diff / 0.25) + 1
+          extraClass += "user-contrib-cell-#{classNumber}"
+
+        "user-contrib-cell #{extraClass} js-tooltip"
+      .attr 'data-container', 'body'
+      .on 'click', (stamp) ->
+        date = new Date(parseInt(stamp.date) * 1000)
         formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
         $.ajax
           url: calendar_activities_path
@@ -32,3 +80,17 @@ class @Calendar
           success: (data) ->
             $(".user-calendar-activities").html data
 
+    svg.append 'g'
+      .selectAll 'text'
+      .data months
+      .enter()
+      .append 'text'
+      .attr 'x', (date) ->
+        date.x
+      .attr 'y', 10
+      .attr 'class', 'user-contrib-text'
+      .text (date) ->
+        monthNames[date.month]
+
+    $('#cal-heatmap .js-tooltip').tooltip
+      html: true
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index 11f39d583bd..da03454d807 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -68,3 +68,33 @@
     font-weight: 550;
   }
 }
+
+.user-contrib-cell {
+  fill: #ededed;
+  cursor: pointer;
+
+  &:hover {
+    stroke: #000;
+  }
+}
+
+.user-contrib-cell-1 {
+  fill: #acd5f2;
+}
+
+.user-contrib-cell-3 {
+  fill: #7fa8d1;
+}
+
+.user-contrib-cell-4 {
+  fill: #49729b;
+}
+
+.user-contrib-cell-5 {
+  fill: #254e77;
+}
+
+.user-contrib-text {
+  font-size: 12px;
+  fill: #959494;
+}
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 1de71f37d1a..2abee8be2a6 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -6,5 +6,3 @@
       #{@starting_month},
       '#{user_calendar_activities_path}'
     );
-
-.calendar-hint Summary of issues, merge requests, and push events

From 18b361cf809251dd633e31d3dd6d877b31d8db7f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 27 Apr 2016 11:07:46 +0100
Subject: [PATCH 0467/1431] Group the contributing calendar by day This aligns
 the boxes correctly with the day on the left side of the calendar

---
 app/assets/javascripts/application.js.coffee  |   1 -
 app/assets/javascripts/calendar.js.coffee     | 147 +++++++++++++-----
 app/assets/stylesheets/application.scss       |   1 -
 .../stylesheets/framework/calendar.scss       |  69 ++------
 app/assets/stylesheets/pages/profile.scss     |   6 -
 app/controllers/users_controller.rb           |   2 -
 app/views/users/calendar.html.haml            |  17 +-
 app/views/users/show.html.haml                |   7 +-
 lib/gitlab/contributions_calendar.rb          |   2 +-
 9 files changed, 132 insertions(+), 120 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index bffce5a0c0f..ff69e27bbcf 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -19,7 +19,6 @@
 #= require jquery.scrollTo
 #= require jquery.turbolinks
 #= require d3
-#= require cal-heatmap
 #= require turbolinks
 #= require autosave
 #= require bootstrap/affix
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index ec153f61c2a..9c4d529f7e9 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -1,52 +1,83 @@
 class @Calendar
-  constructor: (timestamps, starting_year, starting_month, calendar_activities_path) ->
+  constructor: (timestamps, calendar_activities_path) ->
     # Get the highest value from the timestampes
     highestValue = 0
     _.each timestamps, (count) ->
       if count > highestValue
         highestValue = count
 
-    timestamps = _.chain(timestamps)
-      .map (stamp, key) ->
-        {
-          count: stamp
-          date: key
-        }
-      .groupBy (stamp, i) ->
-        Math.floor i / 7
-      .toArray()
-      .value()
+    # Loop through the timestamps to create a group of objects
+    # The group of objects will be grouped based on the day of the week they are
+    timestampsTmp = []
+    i = 0
+    group = 0
+    _.each timestamps, (count, date) ->
+      newDate = new Date parseInt(date) * 1000
+      day = newDate.getDay()
+
+      # Create a new group array if this is the first day of the week
+      # or if is first object
+      if (day is 0 and i isnt 0) or i is 0
+        timestampsTmp.push []
+        group++
+
+      innerArray = timestampsTmp[group-1]
+
+      # Push to the inner array the values that will be used to render map
+      innerArray.push
+        count: count
+        date: newDate
+        day: day
+
+      i++
+
+    # Color function for chart
+    color = d3
+      .scale
+      .linear()
+      .range(['#acd5f2', '#254e77'])
+      .domain([0, highestValue])
+
+    # Color function for key
+    colorKey = d3
+      .scale
+      .linear()
+      .range(['#acd5f2', '#254e77'])
+      .domain([0, 3])
+    keyColors = ['#ededed', colorKey(0), colorKey(1), colorKey(2), colorKey(3)]
 
     monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
     months = []
-    svg = d3.select '#cal-heatmap'
+    svg = d3.select '.js-contrib-calendar'
       .append 'svg'
-      .attr 'width', 53 * 17
-      .attr 'height', 140
+      .attr 'width', 54 * 17
+      .attr 'height', 167
+      .attr 'class', 'contrib-calendar'
 
     # Setup each day box
     svg.selectAll 'g'
-      .data timestamps
+      .data timestampsTmp
       .enter()
       .append 'g'
       .attr 'transform', (group, i) ->
-        _.each group, (stamp) ->
-          month = new Date(parseInt(stamp.date) * 1000).getMonth()
-          x = 17 * i + 1
-          lastMonth = _.last(months)
+        _.each group, (stamp, a) ->
+          if a is 0 and stamp.day is 0
+            month = stamp.date.getMonth()
+            x = (17 * i + 1) + 17
+            lastMonth = _.last(months)
+            if lastMonth?
+              lastMonthX = lastMonth.x
 
-          # If undefined, push
-          if !lastMonth?
-            months.push
-              month: month
-              x: x
-          else if lastMonth.x is x
-            lastMonth.month = month
-          else if lastMonth.month isnt month
+            if !lastMonth?
               months.push
                 month: month
                 x: x
-        "translate(#{17 * i + 1}, 18)"
+            else if month isnt lastMonth.month and x - 17 isnt lastMonthX
+              months.push
+                month: month
+                x: x
+
+        "translate(#{(17 * i + 1) + 17}, 18)"
       .selectAll 'rect'
       .data (stamp) ->
         stamp
@@ -54,22 +85,20 @@ class @Calendar
       .append 'rect'
       .attr 'x', '0'
       .attr 'y', (stamp, i) ->
-        17 * i
+        (17 * stamp.day)
       .attr 'width', 15
       .attr 'height', 15
       .attr 'title', (stamp) ->
-        "#{stamp.count} contributions<br />#{gl.utils.formatDate parseInt(stamp.date) * 1000}"
-      .attr 'class', (stamp) ->
-        extraClass = ''
+        "#{stamp.count} contributions<br />#{gl.utils.formatDate stamp.date}"
+      .attr 'class', 'user-contrib-cell js-tooltip'
+      .attr 'fill', (stamp) ->
         if stamp.count isnt 0
-          diff = stamp.count / highestValue
-          classNumber = Math.floor (diff / 0.25) + 1
-          extraClass += "user-contrib-cell-#{classNumber}"
-
-        "user-contrib-cell #{extraClass} js-tooltip"
+          color(stamp.count)
+        else
+          '#ededed'
       .attr 'data-container', 'body'
       .on 'click', (stamp) ->
-        date = new Date(parseInt(stamp.date) * 1000)
+        date = stamp.date
         formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
         $.ajax
           url: calendar_activities_path
@@ -80,6 +109,7 @@ class @Calendar
           success: (data) ->
             $(".user-calendar-activities").html data
 
+    # Month titles
     svg.append 'g'
       .selectAll 'text'
       .data months
@@ -92,5 +122,44 @@ class @Calendar
       .text (date) ->
         monthNames[date.month]
 
-    $('#cal-heatmap .js-tooltip').tooltip
+    # Day titles
+    days = [{
+      text: 'M'
+      y: 29 + (17 * 1)
+    }, {
+      text: 'W'
+      y: 29 + (17 * 3)
+    }, {
+      text: 'F'
+      y: 29 + (17 * 5)
+    }]
+    svg.append 'g'
+      .selectAll 'text'
+      .data days
+      .enter()
+      .append 'text'
+      .attr 'text-anchor', 'middle'
+      .attr 'x', 8
+      .attr 'y', (day) ->
+        day.y
+      .text (day) ->
+        day.text
+      .attr 'class', 'user-contrib-text'
+
+    # Key with color boxes
+    svg.append 'g'
+      .attr 'transform', "translate(18, #{17 * 8 + 16})"
+      .selectAll 'rect'
+      .data keyColors
+      .enter()
+      .append 'rect'
+      .attr 'width', 15
+      .attr 'height', 15
+      .attr 'x', (color, i) ->
+        17 * i
+      .attr 'y', 0
+      .attr 'fill', (color) ->
+        color
+
+    $('.js-contrib-calendar .js-tooltip').tooltip
       html: true
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 69b3b6586de..efdb2b06a8c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -8,7 +8,6 @@
  *= require select2
  *= require_self
  *= require dropzone/basic
- *= require cal-heatmap
  *= require cropper.css
  *= require animate
 */
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index da03454d807..5b48801485b 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -26,75 +26,28 @@
   }
 }
 
-/**
-* This overwrites the default values of the cal-heatmap gem
-*/
-.calendar {
-  .qi {
-    fill: #fff;
-  }
+.user-calendar {
+  text-align: center;
 
-  .q1 {
-    fill: #ededed !important;
-  }
-
-  .q2 {
-    fill: #acd5f2 !important;
-  }
-
-  .q3 {
-    fill: #7fa8d1 !important;
-  }
-
-  .q4 {
-    fill: #49729b !important;
-  }
-
-  .q5 {
-    fill: #254e77 !important;
-  }
-
-  .future {
-    visibility: hidden;
-  }
-
-  .domain-background {
-    fill: none;
-    shape-rendering: crispedges;
-  }
-
-  .ch-tooltip {
-    padding: 3px;
-    font-weight: 550;
+  .calendar {
+    display: inline-block;
   }
 }
 
 .user-contrib-cell {
-  fill: #ededed;
-  cursor: pointer;
-
   &:hover {
+    cursor: pointer;
     stroke: #000;
   }
 }
 
-.user-contrib-cell-1 {
-  fill: #acd5f2;
-}
-
-.user-contrib-cell-3 {
-  fill: #7fa8d1;
-}
-
-.user-contrib-cell-4 {
-  fill: #49729b;
-}
-
-.user-contrib-cell-5 {
-  fill: #254e77;
-}
-
 .user-contrib-text {
   font-size: 12px;
   fill: #959494;
 }
+
+.calendar-hint {
+  margin-top: -23px;
+  float: right;
+  font-size: 12px;
+}
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 843379a3f54..ef375e1386c 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -66,12 +66,6 @@
   }
 }
 
-.calendar-hint {
-  margin-top: -12px;
-  float: right;
-  font-size: 12px;
-}
-
 .profile-link-holder {
   display: inline;
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 799421c185b..a99632454d9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -74,8 +74,6 @@ class UsersController < ApplicationController
   def calendar
     calendar = contributions_calendar
     @timestamps = calendar.timestamps
-    @starting_year = calendar.starting_year
-    @starting_month = calendar.starting_month
 
     render 'calendar', layout: false
   end
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 2abee8be2a6..77f2ddefb1e 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -1,8 +1,9 @@
-#cal-heatmap.calendar
-  :javascript
-    new Calendar(
-      #{@timestamps.to_json},
-      #{@starting_year},
-      #{@starting_month},
-      '#{user_calendar_activities_path}'
-    );
+.clearfix.calendar
+  .js-contrib-calendar
+  .calendar-hint
+    Summary of issues, merge requests, and push events
+:javascript
+  new Calendar(
+    #{@timestamps.to_json},
+    '#{user_calendar_activities_path}'
+  );
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 9017fd54fcc..0c513308308 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -89,10 +89,9 @@
     .tab-content
       #activity.tab-pane
         .row-content-block.calender-block.white.second-block.hidden-xs
-          %div{ class: container_class }
-            .user-calendar{data: {href: user_calendar_path}}
-              %h4.center.light
-                %i.fa.fa-spinner.fa-spin
+          .user-calendar{data: {href: user_calendar_path}}
+            %h4.center.light
+              %i.fa.fa-spinner.fa-spin
           .user-calendar-activities
 
         .content_list{ data: {href: user_path} }
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb
index 85583dce9ee..9dc2602867e 100644
--- a/lib/gitlab/contributions_calendar.rb
+++ b/lib/gitlab/contributions_calendar.rb
@@ -19,7 +19,7 @@ module Gitlab
         select('date(created_at) as date, count(id) as total_amount').
         map(&:attributes)
 
-      dates = (1.year.ago.to_date..(Date.today + 1.day)).to_a
+      dates = (1.year.ago.to_date..Date.today).to_a
 
       dates.each do |date|
         date_id = date.to_time.to_i.to_s

From c3de94404099193c0ca6551ef149da1522adacd1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 27 Apr 2016 11:09:40 +0100
Subject: [PATCH 0468/1431] Removed cal heatmap from gemfile

---
 Gemfile      | 3 ---
 Gemfile.lock | 2 --
 2 files changed, 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6949c16e966..ba1ae9cf900 100644
--- a/Gemfile
+++ b/Gemfile
@@ -177,9 +177,6 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 # d3
 gem 'd3_rails', '~> 3.5.0'
 
-#cal-heatmap
-gem 'cal-heatmap-rails', '~> 3.6.0'
-
 # underscore-rails
 gem "underscore-rails", "~> 1.8.0"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b51bf58bba..b1cd5ab4b17 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,6 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (8.2.1)
-    cal-heatmap-rails (3.6.0)
     capybara (2.6.2)
       addressable
       mime-types (>= 1.16)
@@ -902,7 +901,6 @@ DEPENDENCIES
   bullet
   bundler-audit
   byebug
-  cal-heatmap-rails (~> 3.6.0)
   capybara (~> 2.6.2)
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 0.10.0)

From 1c9440c2cf171e919f3e7317e9a9827576f9aafd Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 27 Apr 2016 12:45:14 +0100
Subject: [PATCH 0469/1431] tests update

---
 features/steps/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/user.rb b/features/steps/user.rb
index b1d088f07f9..59385a6ab59 100644
--- a/features/steps/user.rb
+++ b/features/steps/user.rb
@@ -34,7 +34,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
   end
 
   step 'I should see contributions calendar' do
-    expect(page).to have_css('.cal-heatmap-container')
+    expect(page).to have_css('.js-contrib-calendar')
   end
 
   def contributed_project

From bef5695a81af7a0afbb7ebe30d8ce344afe824f5 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 27 Apr 2016 17:38:22 +0100
Subject: [PATCH 0470/1431] Formats tooltip title & date correctly

Correctly changes the activity when clicking a date - will also revert back to old data when clicking date again
---
 app/assets/javascripts/calendar.js.coffee | 36 ++++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index 9c4d529f7e9..dd6adfe978f 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -1,5 +1,6 @@
 class @Calendar
   constructor: (timestamps, calendar_activities_path) ->
+    currentSelectedDate = ''
     # Get the highest value from the timestampes
     highestValue = 0
     _.each timestamps, (count) ->
@@ -89,7 +90,14 @@ class @Calendar
       .attr 'width', 15
       .attr 'height', 15
       .attr 'title', (stamp) ->
-        "#{stamp.count} contributions<br />#{gl.utils.formatDate stamp.date}"
+        contribText = 'No contributions'
+
+        if stamp.count > 0
+          contribText = "#{stamp.count} contribution#{if stamp.count > 1 then 's' else ''}"
+
+        date = dateFormat(stamp.date, 'mmm d, yyyy')
+
+        "#{contribText}<br />#{date}"
       .attr 'class', 'user-contrib-cell js-tooltip'
       .attr 'fill', (stamp) ->
         if stamp.count isnt 0
@@ -98,16 +106,22 @@ class @Calendar
           '#ededed'
       .attr 'data-container', 'body'
       .on 'click', (stamp) ->
-        date = stamp.date
-        formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
-        $.ajax
-          url: calendar_activities_path
-          data:
-            date: formated_date
-          cache: false
-          dataType: "html"
-          success: (data) ->
-            $(".user-calendar-activities").html data
+        if currentSelectedDate is ''
+          currentSelectedDate = stamp.date
+          formated_date = currentSelectedDate.getFullYear() + "-" + (currentSelectedDate.getMonth()+1) + "-" + currentSelectedDate.getDate()
+
+          $.ajax
+            url: calendar_activities_path
+            data:
+              date: formated_date
+            cache: false
+            dataType: 'html'
+            success: (data) ->
+              $('.user-calendar-activities').html data
+        else
+          currentSelectedDate = ''
+          $('.user-calendar-activities, .content_list').html ''
+          Pager.getOld()
 
     # Month titles
     svg.append 'g'

From 93c0bb8041963d6677cc9c169a0e1e22221dd0cb Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 28 Apr 2016 11:03:14 +0100
Subject: [PATCH 0471/1431] Fixed issue with selected date not loading
 correctly Added loading icon to selected date box

---
 app/assets/javascripts/calendar.js.coffee     | 44 ++++++++++---------
 .../stylesheets/framework/calendar.scss       | 16 +------
 app/views/users/calendar_activities.html.haml | 42 ++++++++++--------
 3 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index dd6adfe978f..701117747d5 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -1,6 +1,10 @@
 class @Calendar
   constructor: (timestamps, calendar_activities_path) ->
     currentSelectedDate = ''
+    daySpace = 1
+    daySize = 15
+    daySizeWithSpace = daySize + (daySpace * 2)
+
     # Get the highest value from the timestampes
     highestValue = 0
     _.each timestamps, (count) ->
@@ -51,7 +55,7 @@ class @Calendar
     months = []
     svg = d3.select '.js-contrib-calendar'
       .append 'svg'
-      .attr 'width', 54 * 17
+      .attr 'width', 54 * daySizeWithSpace
       .attr 'height', 167
       .attr 'class', 'contrib-calendar'
 
@@ -64,7 +68,7 @@ class @Calendar
         _.each group, (stamp, a) ->
           if a is 0 and stamp.day is 0
             month = stamp.date.getMonth()
-            x = (17 * i + 1) + 17
+            x = (daySizeWithSpace * i + 1) + daySizeWithSpace
             lastMonth = _.last(months)
             if lastMonth?
               lastMonthX = lastMonth.x
@@ -73,12 +77,12 @@ class @Calendar
               months.push
                 month: month
                 x: x
-            else if month isnt lastMonth.month and x - 17 isnt lastMonthX
+            else if month isnt lastMonth.month and x - daySizeWithSpace isnt lastMonthX
               months.push
                 month: month
                 x: x
 
-        "translate(#{(17 * i + 1) + 17}, 18)"
+        "translate(#{(daySizeWithSpace * i + 1) + daySizeWithSpace}, 18)"
       .selectAll 'rect'
       .data (stamp) ->
         stamp
@@ -86,9 +90,9 @@ class @Calendar
       .append 'rect'
       .attr 'x', '0'
       .attr 'y', (stamp, i) ->
-        (17 * stamp.day)
-      .attr 'width', 15
-      .attr 'height', 15
+        (daySizeWithSpace * stamp.day)
+      .attr 'width', daySize
+      .attr 'height', daySize
       .attr 'title', (stamp) ->
         contribText = 'No contributions'
 
@@ -106,22 +110,22 @@ class @Calendar
           '#ededed'
       .attr 'data-container', 'body'
       .on 'click', (stamp) ->
-        if currentSelectedDate is ''
+        if currentSelectedDate isnt stamp.date
           currentSelectedDate = stamp.date
-          formated_date = currentSelectedDate.getFullYear() + "-" + (currentSelectedDate.getMonth()+1) + "-" + currentSelectedDate.getDate()
+          formatted_date = currentSelectedDate.getFullYear() + "-" + (currentSelectedDate.getMonth()+1) + "-" + currentSelectedDate.getDate()
 
           $.ajax
             url: calendar_activities_path
             data:
-              date: formated_date
+              date: formatted_date
             cache: false
             dataType: 'html'
+            beforeSend: ->
+              $('.user-calendar-activities').html '<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>'
             success: (data) ->
               $('.user-calendar-activities').html data
         else
-          currentSelectedDate = ''
-          $('.user-calendar-activities, .content_list').html ''
-          Pager.getOld()
+          $('.user-calendar-activities').html ''
 
     # Month titles
     svg.append 'g'
@@ -139,13 +143,13 @@ class @Calendar
     # Day titles
     days = [{
       text: 'M'
-      y: 29 + (17 * 1)
+      y: 29 + (daySizeWithSpace * 1)
     }, {
       text: 'W'
-      y: 29 + (17 * 3)
+      y: 29 + (daySizeWithSpace * 3)
     }, {
       text: 'F'
-      y: 29 + (17 * 5)
+      y: 29 + (daySizeWithSpace * 5)
     }]
     svg.append 'g'
       .selectAll 'text'
@@ -162,15 +166,15 @@ class @Calendar
 
     # Key with color boxes
     svg.append 'g'
-      .attr 'transform', "translate(18, #{17 * 8 + 16})"
+      .attr 'transform', "translate(18, #{daySizeWithSpace * 8 + 16})"
       .selectAll 'rect'
       .data keyColors
       .enter()
       .append 'rect'
-      .attr 'width', 15
-      .attr 'height', 15
+      .attr 'width', daySize
+      .attr 'height', daySize
       .attr 'x', (color, i) ->
-        17 * i
+        daySizeWithSpace * i
       .attr 'y', 0
       .attr 'fill', (color) ->
         color
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index 5b48801485b..81118b13bef 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -5,24 +5,12 @@
 }
 
 .user-calendar-activities {
-  .calendar_onclick_hr {
-    padding: 0;
-    margin: 10px 0;
-  }
-
   .str-truncated {
     max-width: 70%;
   }
 
-  .text-expander {
-    background: #eee;
-    color: #555;
-    padding: 0 5px;
-    cursor: pointer;
-    margin-left: 4px;
-    &:hover {
-      background-color: #ddd;
-    }
+  .user-calendar-activities-loading {
+    font-size: 24px;
   }
 }
 
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml
index 027a93a75fc..630d97e339d 100644
--- a/app/views/users/calendar_activities.html.haml
+++ b/app/views/users/calendar_activities.html.haml
@@ -1,23 +1,27 @@
 %h4.prepend-top-20
-  %span.light Contributions for
+  Contributions for
   %strong #{@calendar_date.to_s(:short)}
 
-%ul.bordered-list
-  - @events.sort_by(&:created_at).each do |event|
-    %li
-      %span.light
-        %i.fa.fa-clock-o
-        = event.created_at.to_s(:time)
-      - if event.push?
-        #{event.action_name} #{event.ref_type} #{event.ref_name}
-      - else
-        = event_action_name(event)
-        - if event.target
-          %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
-
-      at
-      %strong
-        - if event.project
-          = link_to_project event.project
+- if @events.any?
+  %ul.bordered-list
+    - @events.sort_by(&:created_at).each do |event|
+      %li
+        %span.light
+          %i.fa.fa-clock-o
+          = event.created_at.to_s(:time)
+        - if event.push?
+          #{event.action_name} #{event.ref_type} #{event.ref_name}
         - else
-          = event.project_name
+          = event_action_name(event)
+          - if event.target
+            %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
+
+        at
+        %strong
+          - if event.project
+            = link_to_project event.project
+          - else
+            = event.project_name
+- else
+  %p
+    No contributions found for #{@calendar_date.to_s(:short)}

From b54ea9de7c99df737d8f6fc358f8eb0ef8b20c76 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 28 Apr 2016 11:07:17 +0100
Subject: [PATCH 0472/1431] Updated spacing of the calendar

---
 app/assets/stylesheets/framework/calendar.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index 81118b13bef..8642b7530e2 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -1,4 +1,7 @@
 .calender-block {
+  padding-left: 0;
+  padding-right: 0;
+
   @media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
     overflow-x: scroll;
   }

From 527d64463530df5a2f5f800885f5f84920b1058b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 12:51:49 +0100
Subject: [PATCH 0473/1431] Moved into class methods

---
 app/assets/javascripts/calendar.js.coffee | 195 ++++++++++++----------
 1 file changed, 105 insertions(+), 90 deletions(-)

diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index 701117747d5..f9c7bffdadb 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -1,32 +1,34 @@
 class @Calendar
-  constructor: (timestamps, calendar_activities_path) ->
-    currentSelectedDate = ''
-    daySpace = 1
-    daySize = 15
-    daySizeWithSpace = daySize + (daySpace * 2)
+  constructor: (timestamps, @calendar_activities_path) ->
+    @currentSelectedDate = ''
+    @daySpace = 1
+    @daySize = 15
+    @daySizeWithSpace = @daySize + (@daySpace * 2)
+    @monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+    @months = []
+    @highestValue = 0
 
     # Get the highest value from the timestampes
-    highestValue = 0
-    _.each timestamps, (count) ->
-      if count > highestValue
-        highestValue = count
+    _.each timestamps, (count) =>
+      if count > @highestValue
+        @highestValue = count
 
     # Loop through the timestamps to create a group of objects
     # The group of objects will be grouped based on the day of the week they are
-    timestampsTmp = []
+    @timestampsTmp = []
     i = 0
     group = 0
-    _.each timestamps, (count, date) ->
+    _.each timestamps, (count, date) =>
       newDate = new Date parseInt(date) * 1000
       day = newDate.getDay()
 
       # Create a new group array if this is the first day of the week
       # or if is first object
       if (day is 0 and i isnt 0) or i is 0
-        timestampsTmp.push []
+        @timestampsTmp.push []
         group++
 
-      innerArray = timestampsTmp[group-1]
+      innerArray = @timestampsTmp[group-1]
 
       # Push to the inner array the values that will be used to render map
       innerArray.push
@@ -36,64 +38,61 @@ class @Calendar
 
       i++
 
-    # Color function for chart
-    color = d3
-      .scale
-      .linear()
-      .range(['#acd5f2', '#254e77'])
-      .domain([0, highestValue])
+    # Init color functions
+    @color = @initColor()
+    @colorKey = @initColorKey()
 
-    # Color function for key
-    colorKey = d3
-      .scale
-      .linear()
-      .range(['#acd5f2', '#254e77'])
-      .domain([0, 3])
-    keyColors = ['#ededed', colorKey(0), colorKey(1), colorKey(2), colorKey(3)]
+    # Init the svg element
+    @renderSvg(group)
+    @renderDays()
+    @renderMonths()
+    @renderDayTitles()
+    @renderKey()
 
-    monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-    months = []
-    svg = d3.select '.js-contrib-calendar'
+    @initTooltips()
+
+  renderSvg: (group) ->
+    @svg = d3.select '.js-contrib-calendar'
       .append 'svg'
-      .attr 'width', 54 * daySizeWithSpace
+      .attr 'width', (group + 1) * @daySizeWithSpace
       .attr 'height', 167
       .attr 'class', 'contrib-calendar'
 
-    # Setup each day box
-    svg.selectAll 'g'
-      .data timestampsTmp
+  renderDays: ->
+    @svg.selectAll 'g'
+      .data @timestampsTmp
       .enter()
       .append 'g'
-      .attr 'transform', (group, i) ->
-        _.each group, (stamp, a) ->
+      .attr 'transform', (group, i) =>
+        _.each group, (stamp, a) =>
           if a is 0 and stamp.day is 0
             month = stamp.date.getMonth()
-            x = (daySizeWithSpace * i + 1) + daySizeWithSpace
-            lastMonth = _.last(months)
+            x = (@daySizeWithSpace * i + 1) + @daySizeWithSpace
+            lastMonth = _.last(@months)
             if lastMonth?
               lastMonthX = lastMonth.x
 
             if !lastMonth?
-              months.push
+              @months.push
                 month: month
                 x: x
-            else if month isnt lastMonth.month and x - daySizeWithSpace isnt lastMonthX
-              months.push
+            else if month isnt lastMonth.month and x - @daySizeWithSpace isnt lastMonthX
+              @months.push
                 month: month
                 x: x
 
-        "translate(#{(daySizeWithSpace * i + 1) + daySizeWithSpace}, 18)"
+        "translate(#{(@daySizeWithSpace * i + 1) + @daySizeWithSpace}, 18)"
       .selectAll 'rect'
       .data (stamp) ->
         stamp
       .enter()
       .append 'rect'
       .attr 'x', '0'
-      .attr 'y', (stamp, i) ->
-        (daySizeWithSpace * stamp.day)
-      .attr 'width', daySize
-      .attr 'height', daySize
-      .attr 'title', (stamp) ->
+      .attr 'y', (stamp, i) =>
+        (@daySizeWithSpace * stamp.day)
+      .attr 'width', @daySize
+      .attr 'height', @daySize
+      .attr 'title', (stamp) =>
         contribText = 'No contributions'
 
         if stamp.count > 0
@@ -103,55 +102,26 @@ class @Calendar
 
         "#{contribText}<br />#{date}"
       .attr 'class', 'user-contrib-cell js-tooltip'
-      .attr 'fill', (stamp) ->
+      .attr 'fill', (stamp) =>
         if stamp.count isnt 0
-          color(stamp.count)
+          @color(stamp.count)
         else
           '#ededed'
       .attr 'data-container', 'body'
-      .on 'click', (stamp) ->
-        if currentSelectedDate isnt stamp.date
-          currentSelectedDate = stamp.date
-          formatted_date = currentSelectedDate.getFullYear() + "-" + (currentSelectedDate.getMonth()+1) + "-" + currentSelectedDate.getDate()
+      .on 'click', @clickDay
 
-          $.ajax
-            url: calendar_activities_path
-            data:
-              date: formatted_date
-            cache: false
-            dataType: 'html'
-            beforeSend: ->
-              $('.user-calendar-activities').html '<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>'
-            success: (data) ->
-              $('.user-calendar-activities').html data
-        else
-          $('.user-calendar-activities').html ''
-
-    # Month titles
-    svg.append 'g'
-      .selectAll 'text'
-      .data months
-      .enter()
-      .append 'text'
-      .attr 'x', (date) ->
-        date.x
-      .attr 'y', 10
-      .attr 'class', 'user-contrib-text'
-      .text (date) ->
-        monthNames[date.month]
-
-    # Day titles
+  renderDayTitles: ->
     days = [{
       text: 'M'
-      y: 29 + (daySizeWithSpace * 1)
+      y: 29 + (@daySizeWithSpace * 1)
     }, {
       text: 'W'
-      y: 29 + (daySizeWithSpace * 3)
+      y: 29 + (@daySizeWithSpace * 3)
     }, {
       text: 'F'
-      y: 29 + (daySizeWithSpace * 5)
+      y: 29 + (@daySizeWithSpace * 5)
     }]
-    svg.append 'g'
+    @svg.append 'g'
       .selectAll 'text'
       .data days
       .enter()
@@ -164,20 +134,65 @@ class @Calendar
         day.text
       .attr 'class', 'user-contrib-text'
 
-    # Key with color boxes
-    svg.append 'g'
-      .attr 'transform', "translate(18, #{daySizeWithSpace * 8 + 16})"
+  renderMonths: ->
+    @svg.append 'g'
+      .selectAll 'text'
+      .data @months
+      .enter()
+      .append 'text'
+      .attr 'x', (date) ->
+        date.x
+      .attr 'y', 10
+      .attr 'class', 'user-contrib-text'
+      .text (date) =>
+        @monthNames[date.month]
+
+  renderKey: ->
+    keyColors = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)]
+    @svg.append 'g'
+      .attr 'transform', "translate(18, #{@daySizeWithSpace * 8 + 16})"
       .selectAll 'rect'
       .data keyColors
       .enter()
       .append 'rect'
-      .attr 'width', daySize
-      .attr 'height', daySize
-      .attr 'x', (color, i) ->
-        daySizeWithSpace * i
+      .attr 'width', @daySize
+      .attr 'height', @daySize
+      .attr 'x', (color, i) =>
+        @daySizeWithSpace * i
       .attr 'y', 0
       .attr 'fill', (color) ->
         color
 
+  initColor: ->
+    d3.scale
+      .linear()
+      .range(['#acd5f2', '#254e77'])
+      .domain([0, @highestValue])
+
+  initColorKey: ->
+    d3.scale
+      .linear()
+      .range(['#acd5f2', '#254e77'])
+      .domain([0, 3])
+
+  clickDay: (stamp) ->
+    if @currentSelectedDate isnt stamp.date
+      @currentSelectedDate = stamp.date
+      formatted_date = @currentSelectedDate.getFullYear() + "-" + (@currentSelectedDate.getMonth()+1) + "-" + @currentSelectedDate.getDate()
+
+      $.ajax
+        url: @calendar_activities_path
+        data:
+          date: formatted_date
+        cache: false
+        dataType: 'html'
+        beforeSend: ->
+          $('.user-calendar-activities').html '<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>'
+        success: (data) ->
+          $('.user-calendar-activities').html data
+    else
+      $('.user-calendar-activities').html ''
+
+  initTooltips: ->
     $('.js-contrib-calendar .js-tooltip').tooltip
       html: true

From 5c4416bb45c2c61e99517c594cdd3b8dea1dc829 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 15:24:51 +0100
Subject: [PATCH 0474/1431] Loads move issue dropdown async

Closes #16563
---
 app/assets/javascripts/issuable_form.js.coffee | 17 +++++++++++++++++
 app/controllers/autocomplete_controller.rb     | 15 +++++++++++++++
 app/views/shared/issuable/_form.html.haml      |  4 +---
 config/routes.rb                               |  1 +
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/issuable_form.js.coffee b/app/assets/javascripts/issuable_form.js.coffee
index 7a788f761b7..9787a64a4a7 100644
--- a/app/assets/javascripts/issuable_form.js.coffee
+++ b/app/assets/javascripts/issuable_form.js.coffee
@@ -19,6 +19,7 @@ class @IssuableForm
     @form.on "click", ".btn-cancel", @resetAutosave
 
     @initWip()
+    @initMoveDropdown()
 
   initAutosave: ->
     new Autosave @titleField, [
@@ -80,3 +81,19 @@ class @IssuableForm
 
   addWip: ->
     @titleField.val "WIP: #{@titleField.val()}"
+
+  initMoveDropdown: ->
+    $moveDropdown = $('.js-move-dropdown')
+
+    if $moveDropdown.length
+      $('.js-move-dropdown').select2
+        ajax:
+          url: $moveDropdown.data('projects-url')
+          results: (data) ->
+            return {
+              results: data
+            }
+        formatResult: (project) ->
+          project.name_with_namespace
+        formatSelection: (project) ->
+          project.name_with_namespace
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index eb0abc80ab4..155c78bcd8a 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -31,6 +31,21 @@ class AutocompleteController < ApplicationController
     render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
   end
 
+  def projects
+    project = Project.find_by_id(params[:project_id])
+
+    projects = current_user.authorized_projects
+    projects = projects.select do |project|
+      current_user.can?(:admin_issue, project)
+    end
+
+    no_project = OpenStruct.new(id: 0, name_with_namespace: 'No project')
+    projects.unshift(no_project.marshal_dump)
+    projects.delete(project)
+
+    render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
+  end
+
   private
 
   def find_users
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 5c52cc6d1da..c014332d7f3 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -90,9 +90,7 @@
     = label_tag :move_to_project_id, 'Move', class: 'control-label'
     .col-sm-10
       .issuable-form-select-holder
-        - projects = project_options(issuable, current_user, ability: :admin_issue)
-        = select_tag(:move_to_project_id, projects, include_blank: true,
-                     class: 'select2', data: { placeholder: 'Select project' })
+        = hidden_field_tag :move_to_project_id, nil, class: 'js-move-dropdown', data: { placeholder: 'Select project', projects_url: autocomplete_projects_path(project_id: '1') }
       &nbsp;
       %span{ data: { toggle: 'tooltip', placement: 'auto top' }, style: 'cursor: default',
       title: 'Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location.' }
diff --git a/config/routes.rb b/config/routes.rb
index 9e776a1f541..5d1284919ef 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -56,6 +56,7 @@ Rails.application.routes.draw do
   # Autocomplete
   get '/autocomplete/users' => 'autocomplete#users'
   get '/autocomplete/users/:id' => 'autocomplete#user'
+  get '/autocomplete/projects' => 'autocomplete#projects'
 
   # Emojis
   resources :emojis, only: :index

From caca3bb7b8e0d39947607d2704bed8ae4f04965c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 15:40:44 +0100
Subject: [PATCH 0475/1431] Fixed project settings alert colors

In another MR, the class name was changed making all the alert messages have no background color
---
 app/views/projects/deploy_keys/index.html.haml                | 4 ++--
 app/views/projects/hooks/index.html.haml                      | 2 +-
 .../projects/protected_branches/_branches_list.html.haml      | 2 +-
 app/views/projects/triggers/index.html.haml                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index e230834e8ba..04fbb37d93f 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -19,7 +19,7 @@
       %ul.well-list
         = render @enabled_keys
     - else
-      .profile-settings-message.text-center
+      .settings-message.text-center
         No deploy keys found. Create one with the form above or add existing one below.
     %h5.prepend-top-default
       Deploy keys from projects you have access to (#{@available_project_keys.size})
@@ -27,7 +27,7 @@
       %ul.well-list
         = render @available_project_keys
     - else
-      .profile-settings-message.text-center
+      .settings-message.text-center
         No deploy keys from your projects could be found. Create one with the form above or add existing one below.
     - if @available_public_keys.any?
       %h5.prepend-top-default
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 36c1d69f060..cffe9a01a96 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -80,5 +80,5 @@
         - @hooks.each do |hook|
           = render "project_hook", hook: hook
     - else
-      %p.profile-settings-message.text-center.append-bottom-0
+      %p.settings-message.text-center.append-bottom-0
         No webhooks found, add one in the form above.
diff --git a/app/views/projects/protected_branches/_branches_list.html.haml b/app/views/projects/protected_branches/_branches_list.html.haml
index b9e9dd8aaea..565905cbe7b 100644
--- a/app/views/projects/protected_branches/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/_branches_list.html.haml
@@ -1,7 +1,7 @@
 %h5.prepend-top-0
   Already Protected (#{@branches.size})
 - if @branches.empty?
-  %p.profile-settings-message.text-center
+  %p.settings-message.text-center
     No branches are protected, protect a branch with the form above.
 - else
   - can_admin_project = can?(current_user, :admin_project, @project)
diff --git a/app/views/projects/triggers/index.html.haml b/app/views/projects/triggers/index.html.haml
index f91885b216d..d73ac987161 100644
--- a/app/views/projects/triggers/index.html.haml
+++ b/app/views/projects/triggers/index.html.haml
@@ -18,7 +18,7 @@
             %th
           = render partial: 'trigger', collection: @triggers, as: :trigger
     - else
-      %p.profile-settings-message.text-center.append-bottom-default
+      %p.settings-message.text-center.append-bottom-default
         There are no triggers to use, add one by the button below.
 
     = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f|

From 72577033888a77eeb2f4d362c2ae2331c1cbf6d7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 09:45:18 -0500
Subject: [PATCH 0476/1431] Bring back port to registry configuration

---
 config/gitlab.yml.example | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 2e383bc90fa..d935121d88b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -178,7 +178,8 @@ production: &base
 
   registry:
     # enabled: true
-    # host: localhost
+    # host: registry.example.com
+    # port: 5000
     # api_url: http://localhost:5000/
     # key: config/registry.key
     # issuer: omnibus-certificate

From 623102d4556c42fd386e37724e638156dabca277 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 09:48:39 -0500
Subject: [PATCH 0477/1431] Use registry.port to construct the registry host

---
 app/models/project.rb                                 | 6 +++---
 app/views/projects/container_registry/index.html.haml | 2 +-
 config/initializers/1_settings.rb                     | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index ed7719ed31c..a3eb7d83e49 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -332,15 +332,15 @@ class Project < ActiveRecord::Base
     @container_registry_repository ||= begin
       token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
       url = Gitlab.config.registry.api_url
-      host = Gitlab.config.registry.host
-      registry = ContainerRegistry::Registry.new(url, token: token, path: host)
+      host_port = Gitlab.config.registry.host_port
+      registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
       registry[path_with_namespace]
     end
   end
 
   def container_registry_repository_url
     if Gitlab.config.registry.enabled
-      "#{Gitlab.config.registry.host}/#{path_with_namespace}"
+      "#{Gitlab.config.registry.host_port}/#{path_with_namespace}"
     end
   end
 
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index f3b2881ce09..6a1e46b14b9 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -16,7 +16,7 @@
         To start using container images hosted on GitLab you first need to login:
         %pre
           %code
-            docker login #{Gitlab.config.registry.host}
+            docker login #{Gitlab.config.registry.host_port}
         %br
         Then you are free to create and upload a container image with build and push commands:
         %pre
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index d1fcb053bee..20f920ea854 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -249,9 +249,11 @@ Settings.artifacts['max_size']   ||= 100 # in megabytes
 Settings['registry'] ||= Settingslogic.new({})
 Settings.registry['enabled']       ||= false
 Settings.registry['host']          ||= "example.com"
+Settings.registry['port']          ||= nil
 Settings.registry['api_url']       ||= "http://localhost:5000/"
 Settings.registry['key']           ||= nil
 Settings.registry['issuer']        ||= nil
+Settings.registry['host_port']     ||= [Settings.registry['host'], Settings.registry['port']].join(':')
 
 #
 # Git LFS

From 5b3ac8c83f19bfa8b897f307c056c521fd1d052a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 09:45:18 -0500
Subject: [PATCH 0478/1431] Bring back port to registry configuration

---
 config/gitlab.yml.example | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 2e383bc90fa..d935121d88b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -178,7 +178,8 @@ production: &base
 
   registry:
     # enabled: true
-    # host: localhost
+    # host: registry.example.com
+    # port: 5000
     # api_url: http://localhost:5000/
     # key: config/registry.key
     # issuer: omnibus-certificate

From e60bbdf9d9609fd0624be61dcf8a3a0432040ad1 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 09:49:55 -0500
Subject: [PATCH 0479/1431] Fix path to tag

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

diff --git a/lib/container_registry/registry.rb b/lib/container_registry/registry.rb
index a86ddb9326a..d3b117eeaca 100644
--- a/lib/container_registry/registry.rb
+++ b/lib/container_registry/registry.rb
@@ -3,7 +3,7 @@ module ContainerRegistry
     attr_reader :uri, :client, :path
 
     def initialize(uri, options = {})
-      @path = uri || options[:path]
+      @path = options[:path] || uri
       @uri = URI.parse(uri)
       @client = ContainerRegistry::Client.new(uri, options)
     end

From a26ec8a10660ca6ffcf49abac6ddad57fd99f80d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 09:51:15 -0500
Subject: [PATCH 0480/1431] Compact host and port

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

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 20f920ea854..129fd9b79f2 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -253,7 +253,7 @@ Settings.registry['port']          ||= nil
 Settings.registry['api_url']       ||= "http://localhost:5000/"
 Settings.registry['key']           ||= nil
 Settings.registry['issuer']        ||= nil
-Settings.registry['host_port']     ||= [Settings.registry['host'], Settings.registry['port']].join(':')
+Settings.registry['host_port']     ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':')
 
 #
 # Git LFS

From 80bda87424c149a3ab301cdca4500c0f236c38bd Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 17:17:40 +0100
Subject: [PATCH 0481/1431] Updated tests

---
 spec/features/issues/move_spec.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 84c8e20ebaa..ebf039817dd 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -19,7 +19,7 @@ feature 'issue move to another project' do
     end
 
     scenario 'moving issue to another project not allowed' do
-      expect(page).to have_no_select('move_to_project_id')
+      expect(page).to have_no_selector('#move_to_project_id')
     end
   end
 
@@ -37,7 +37,7 @@ feature 'issue move to another project' do
     end
 
     scenario 'moving issue to another project' do
-      select(new_project.name_with_namespace, from: 'move_to_project_id')
+      first('#move_to_project_id', visible: false).set(new_project.id)
       click_button('Save changes')
 
       expect(current_url).to include project_path(new_project)
@@ -47,14 +47,19 @@ feature 'issue move to another project' do
       expect(page).to have_content(issue.title)
     end
 
-    context 'projects user does not have permission to move issue to exist' do
+    context 'projects user does not have permission to move issue to exist', js: true do
       let!(:private_project) { create(:project, :private) }
       let(:another_project) { create(:project) }
       background { another_project.team << [user, :guest] }
 
       scenario 'browsing projects in projects select' do
         options = [ '', 'No project', new_project.name_with_namespace ]
-        expect(page).to have_select('move_to_project_id', options: options)
+        click_link 'Select project'
+
+        page.within '.select2-results' do
+          expect(page).to have_content 'No project'
+          expect(page).to have_content new_project.name_with_namespace
+        end
       end
     end
 
@@ -65,7 +70,7 @@ feature 'issue move to another project' do
       end
 
       scenario 'user wants to move issue that has already been moved' do
-        expect(page).to have_no_select('move_to_project_id')
+        expect(page).to have_no_selector('#move_to_project_id')
       end
     end
   end

From 114d023b1b6f0e14adefb72980ec1658946bd897 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Tue, 17 May 2016 01:41:26 +0900
Subject: [PATCH 0482/1431] Clean up the images from GitLab CI

---
 app/assets/images/ci/arch.jpg           | Bin 25222 -> 0 bytes
 app/assets/images/ci/favicon.ico        | Bin 5430 -> 0 bytes
 app/assets/images/ci/loader.gif         | Bin 4405 -> 0 bytes
 app/assets/images/ci/no_avatar.png      | Bin 1337 -> 0 bytes
 app/assets/images/ci/rails.png          | Bin 6646 -> 0 bytes
 app/assets/images/ci/service_sample.png | Bin 76024 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/assets/images/ci/arch.jpg
 delete mode 100644 app/assets/images/ci/favicon.ico
 delete mode 100644 app/assets/images/ci/loader.gif
 delete mode 100644 app/assets/images/ci/no_avatar.png
 delete mode 100644 app/assets/images/ci/rails.png
 delete mode 100644 app/assets/images/ci/service_sample.png

diff --git a/app/assets/images/ci/arch.jpg b/app/assets/images/ci/arch.jpg
deleted file mode 100644
index 0e05674e840c6946d5a40f340790289af2dc25f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25222
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

diff --git a/app/assets/images/ci/favicon.ico b/app/assets/images/ci/favicon.ico
deleted file mode 100644
index 9663d4d00b9ceee236ba324738d5d4a253a81ed8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5430
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

diff --git a/app/assets/images/ci/loader.gif b/app/assets/images/ci/loader.gif
deleted file mode 100644
index 2fcb8f2da0d283628878cbc74b9dd848109a4535..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4405
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

diff --git a/app/assets/images/ci/no_avatar.png b/app/assets/images/ci/no_avatar.png
deleted file mode 100644
index 752d26adba7aa91b8e32685cd5ded666da5c9a69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1337
zcmV-91;+Y`P)<h;3K|Lk000e1NJLTq002t>002t}0ssI2w=C_w00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyi4
z5-JP+*H#e#00g;7L_t(|+TB~rZt5@)C5}TvLWo<0D4=#j|NnQoVON1lQ4vY=bnN&p
zA|Z4Gf#5L>%&v$UAJ5~=jK|tyvFJRspw6Sq<0Hhk`5Df6Q52kWA;kVeP1AH;M+oV<
zey<3H5R}q9&kuneN}lH>RMRvK!?-hqS(Z^si=w#X%W)j*x^5VTX_|L{PzVvnF=MQ$
zC3DUhW43K;n%3S(BZP>es42X?Fvg-NI<#uedAks%X)3uV&UqZi`#&Y)5C&1&-l!<0
zS(eGKndf<yWgtEYpu<C-Ns<K67EVRro9d8rzPF+zNiK|>7n(+zroCS8k9BzHB$DoT
zH0rd7Ef`}U9(X8}QpOm@_>cW??=~u^Reo78gy1F$wJZV*42sgDw)o+Hb;G0SPza$;
zhmtG9=&&dXMF`8qWfC_S9U_D%r7GYt#t=e(Z>43mu1JTHl@wT{!5FI`3`x3&WDCo(
zRJfviUWx&?;`=_Vt#Z!)KJ$jEQ`IetTIDk;P7QKTmSr7wALOOm?Y5%E-;3iofZ?<#
z3deEUg%Fl77-N=YwF@DXUBP-aaBKi{MX199)}iA#<yC}yNg>aKt+rCe7!*SIdke!b
z<kL66R309oX`1qVVZew5e{TW8iXc3pN{78(k8>_l)Io8*DjkB@7$mQ%K!`Dx>3_p!
z@Je*p@At2EMInT3+igeay6)ANDruS$LLd#QqeeW>3&XG}r*X~)g8^(Yt!iRuG#XvO
zib;~Zyu85fL={3^*WcdWeBZzD&a@~B-}hf%U%|T}3a7q2&zsF=zVDX<Q8mIC^L>9d
zo56Y@ydS1%`d=<G8jZT$?qadfb=`5CYWKP*iYSUW=kM?Dp68ui@R}4CWco5mlI?bz
zB*}O@c3rnxC~P*H)oPXJImWoOL&g|m%rwpEbUGT1s>b>I`@3GRd%YeZL?*?NMHq(R
zZnxXt)M}bGolZ{`K53ffc^*Yk$(c1XUP+RyR;zuDVp$d;q~Gt~4q-X?^z-vmt#@@@
zpUq}6X&0q*xm;Fr28{7=IPCZPjgsER2!#+q5Nx;G8csJ1V>+E)2a-}++H*}#_w@AS
zy6%Nhw*f-Vc@PA<-R_cn1tByZkDJ<67>4Wh`VxXc2oXXEA!l)3iZBer&1TcI2QwH9
zo}ZsDQ6{ByyWIvs(2VO48V-kqkQ%!^k1)^k@9*z2JY3h0ux)!V7}&O5J@0ZzF9?D-
zj<4>0bi3WjWO6EKok5tU>2kRQnN2FUQjP<6I-M-b$_Zka#08<rWOCFg>JVmG_WAj#
zXix@RN}{TQL^W|`wOZW^yfVmteSK9ojA~M0MT1=GB+v6|9L6=Arfy0`of@kH|8=#6
zqUQnX<miTReMbl?irz+!wy^4S2-udrjU3(Z<0HiN|G+ty9J;!h6h(234(}+I3LzTn
zu)N{|9KTl`W{&3H=xio=*Hm#HA^1x&b#iK}`0T;liz{BKLqdq6(O6ial%DFfqO%O+
zx^BxsQc7LdJ;mPVJHqq%{Nv+ex7%5krRzH2+edkN;GCCtRrC2=wol{x{(8NZc{-_r
v9vsIRkH^(!c{3fB;(1>ELamj@e~<qU)-k2c06h(200000NkvXXu0mjf=No#&

diff --git a/app/assets/images/ci/rails.png b/app/assets/images/ci/rails.png
deleted file mode 100644
index d5edc04e65f555e3ba4dcdaad39dc352e75b575e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6646
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
AQ~&?~

diff --git a/app/assets/images/ci/service_sample.png b/app/assets/images/ci/service_sample.png
deleted file mode 100644
index 65d29e3fd891b7b8deba8670cb7d74b03056e3d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76024
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
Vw<T+EEg$}A?9%xuafg-Pe*y4G<RAb5


From 29211b48d785d18c3af59a11e07abaf820086701 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 16 May 2016 12:21:12 -0500
Subject: [PATCH 0483/1431] Implement new horizontal navigation to project
 pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/nav.scss     |   6 +-
 app/helpers/tab_helper.rb                     |   4 +-
 app/views/layouts/nav/_dashboard.html.haml    |   2 +-
 app/views/layouts/nav/_project.html.haml      |  63 +++++------
 .../layouts/nav/_project_settings.html.haml   | 102 ++++++++----------
 app/views/layouts/project.html.haml           |   2 +-
 app/views/layouts/project_settings.html.haml  |   3 +-
 app/views/projects/_home_panel.html.haml      |  22 ----
 8 files changed, 77 insertions(+), 127 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a81fcb1c6b3..2e1aa884d9c 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -196,7 +196,7 @@
   position: fixed;
   top: $header-height;
   width: 100%;
-  z-index: 1;
+  z-index: 3;
   background: $background-color;
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;
@@ -238,6 +238,10 @@
       @media (max-width: $screen-xs-min) {
         margin-left: 0;
       }
+
+      li.active {
+        font-weight: bold;
+      }
     }
   }
 
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 96a83671009..9f639d3461d 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -95,7 +95,9 @@ module TabHelper
   end
 
   def project_tab_class
-    return "active" if current_page?(controller: "/projects", action: :edit, id: @project)
+    if controller.controller_path =~ /\Aprojects/
+      return 'active'
+    end
 
     if ['services', 'hooks', 'deploy_keys', 'protected_branches'].include? controller.controller_name
       "active"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index fad4224e945..c82c2f1bfaf 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,5 +1,5 @@
 %ul.nav.nav-sidebar
-  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: 'home'}) do
+  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
     = link_to dashboard_projects_path, title: 'Projects' do
       = icon('bookmark fw')
       %span
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 479bde33719..b60c419fb3a 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,19 +1,25 @@
-%ul.nav.nav-sidebar
-  - if @project.group
-    = nav_link do
-      = link_to group_path(@project.group), title: 'Go to group', class: 'back-link' do
-        = icon('caret-square-o-left fw')
-        %span
-          Go to group
-  - else
-    = nav_link do
-      = link_to root_path, title: 'Go to dashboard', class: 'back-link' do
-        = icon('caret-square-o-left fw')
-        %span
-          Go to dashboard
-
-  %li.separate-item
+- if current_user
+  .controls
+    - access = user_max_access_in_project(current_user.id, @project)
+    - can_edit = can?(current_user, :admin_project, @project)
+    %span.dropdown.project-settings-dropdown
+      %a.dropdown-new.btn.btn-default#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+        = icon('cog')
+        = icon('caret-down')
+      %ul.dropdown-menu.dropdown-menu-align-right
+        = render 'layouts/nav/project_settings'
+        %li.divider
+        - if can_edit
+          %li
+            = link_to edit_project_path(@project) do
+              Edit Project
+        - if access
+          %li
+            = link_to leave_namespace_project_project_members_path(@project.namespace, @project),
+              data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
+              Leave Project
 
+%ul.nav-links
   = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
     = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
       = icon('bookmark fw')
@@ -44,7 +50,7 @@
         = icon('cubes fw')
         %span
           Builds
-          %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
+          %span.badge.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
@@ -67,7 +73,7 @@
         %span
           Issues
           - if @project.default_issues_tracker?
-            %span.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
+            %span.badge.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
 
   - if project_nav_tab? :merge_requests
     = nav_link(controller: :merge_requests) do
@@ -75,14 +81,7 @@
         = icon('tasks fw')
         %span
           Merge Requests
-          %span.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
-
-  - if project_nav_tab? :team
-    = nav_link(controller: [:project_members, :teams]) do
-      = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
-        = icon('users fw')
-        %span
-          Members
+          %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
 
   - if project_nav_tab? :labels
     = nav_link(controller: :labels) do
@@ -98,13 +97,6 @@
         %span
           Wiki
 
-  - if project_nav_tab? :forks
-    = nav_link(controller: :forks, action: :index) do
-      = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do
-        = icon('code-fork fw')
-        %span
-          Forks
-
   - if project_nav_tab? :snippets
     = nav_link(controller: :snippets) do
       = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
@@ -112,13 +104,6 @@
         %span
           Snippets
 
-  - if project_nav_tab? :settings
-    = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
-      = link_to edit_project_path(@project), title: 'Settings' do
-        = icon('cogs fw')
-        %span
-          Settings
-
   -# Global shortcut to network page for compatibility
   - if project_nav_tab? :network
     %li.hidden
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index d429a928464..885e78d38c6 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -1,63 +1,45 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to project_path(@project), title: 'Go to project', class: 'back-link' do
-      = icon('caret-square-o-left fw')
+- if project_nav_tab? :team
+  = nav_link(controller: [:project_members, :teams]) do
+    = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
       %span
-        Go to project
+        Members
 
-  %li.separate-item
+- if @project.allowed_to_share_with_group?
+  = nav_link(controller: :group_links) do
+    = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
+      %span
+        Groups
+= nav_link(controller: :deploy_keys) do
+  = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
+    %span
+      Deploy Keys
+= nav_link(controller: :hooks) do
+  = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
+    %span
+      Webhooks
+= nav_link(controller: :services) do
+  = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
+    %span
+      Services
+= nav_link(controller: :protected_branches) do
+  = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
+    %span
+      Protected Branches
 
-  %ul.sidebar-subnav
-    = nav_link(path: 'projects#edit') do
-      = link_to edit_project_path(@project), title: 'Project Settings' do
-        = icon('pencil-square-o fw')
-        %span
-          Project Settings
-    - if @project.allowed_to_share_with_group?
-      = nav_link(controller: :group_links) do
-        = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
-          = icon('share-square-o fw')
-          %span
-            Groups
-    = nav_link(controller: :deploy_keys) do
-      = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
-        = icon('key fw')
-        %span
-          Deploy Keys
-    = nav_link(controller: :hooks) do
-      = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
-        = icon('link fw')
-        %span
-          Webhooks
-    = nav_link(controller: :services) do
-      = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
-        = icon('cogs fw')
-        %span
-          Services
-    = nav_link(controller: :protected_branches) do
-      = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
-        = icon('lock fw')
-        %span
-          Protected Branches
-
-    - if @project.builds_enabled?
-      = nav_link(controller: :runners) do
-        = link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
-          = icon('cog fw')
-          %span
-            Runners
-      = nav_link(controller: :variables) do
-        = link_to namespace_project_variables_path(@project.namespace, @project), title: 'Variables' do
-          = icon('code fw')
-          %span
-            Variables
-      = nav_link(controller: :triggers) do
-        = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
-          = icon('retweet fw')
-          %span
-            Triggers
-      = nav_link(controller: :badges) do
-        = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
-          = icon('star-half-empty fw')
-          %span
-            Badges
+- if @project.builds_enabled?
+  = nav_link(controller: :runners) do
+    = link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
+      %span
+        Runners
+  = nav_link(controller: :variables) do
+    = link_to namespace_project_variables_path(@project.namespace, @project), title: 'Variables' do
+      %span
+        Variables
+  = nav_link(controller: :triggers) do
+    = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
+      %span
+        Triggers
+  = nav_link(controller: :badges) do
+    = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
+      %span
+        Badges
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 6dfe7fbdae8..20d6cdf7246 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -1,7 +1,7 @@
 - page_title       @project.name_with_namespace
 - page_description @project.description    unless page_description
 - header_title     project_title(@project) unless header_title
-- sidebar          "project"               unless sidebar
+- nav              "project"
 
 - content_for :scripts_body_top do
   - project = @target_project || @project
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 59ce38f67bb..4bc94bd132d 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -1,5 +1,4 @@
 - page_title  "Settings"
-- header_title project_title(@project, "Settings", edit_project_path(@project))
-- sidebar     "project_settings"
+- nav         "project"
 
 = render template: "layouts/project"
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 9b5de17dd3b..cdb8d2b5e36 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -18,28 +18,6 @@
       = link_to project_path(forked_from_project) do
         = forked_from_project.namespace.try(:name)
 
-  .cover-controls
-    - if current_user
-      = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), class: 'btn btn-gray' do
-        = icon('rss')
-      - access = user_max_access_in_project(current_user.id, @project)
-      - can_edit = can?(current_user, :admin_project, @project)
-      - if access || can_edit
-        %span.dropdown.project-settings-dropdown
-          %a.dropdown-new.btn.btn-gray#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
-            = icon('cog')
-            = icon('angle-down')
-          %ul.dropdown-menu.dropdown-menu-right
-            - if can_edit
-              %li
-                = link_to edit_project_path(@project) do
-                  Edit Project
-            - if access
-              %li
-                = link_to leave_namespace_project_project_members_path(@project.namespace, @project),
-                  data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
-                  Leave Project
-
   .project-repo-buttons
     .split-one.count-buttons
       = render 'projects/buttons/star'

From 7365ac60f116d0e0a89a3bd8ebcf558b477c4bc3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 16 May 2016 12:25:37 -0500
Subject: [PATCH 0484/1431] Fix spec for new project navigation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 spec/features/projects/badges/list_spec.rb    | 5 +----
 spec/features/tags/master_updates_tag_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index 13c9b95b316..51be81d634c 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -8,12 +8,10 @@ feature 'list of badges' do
     project = create(:project)
     project.team << [user, :master]
     login_as(user)
-    visit edit_namespace_project_path(project.namespace, project)
+    visit namespace_project_badges_path(project.namespace, project)
   end
 
   scenario 'user displays list of badges' do
-    click_link 'Badges'
-
     expect(page).to have_content 'build status'
     expect(page).to have_content 'Markdown'
     expect(page).to have_content 'HTML'
@@ -26,7 +24,6 @@ feature 'list of badges' do
   end
 
   scenario 'user changes current ref on badges list page', js: true do
-    click_link 'Badges'
     select2('improve/awesome', from: '#ref')
 
     expect(page).to have_content 'badges/improve/awesome/build.svg'
diff --git a/spec/features/tags/master_updates_tag_spec.rb b/spec/features/tags/master_updates_tag_spec.rb
index c926e9841f3..6b5b3122f72 100644
--- a/spec/features/tags/master_updates_tag_spec.rb
+++ b/spec/features/tags/master_updates_tag_spec.rb
@@ -12,7 +12,7 @@ feature 'Master updates tag', feature: true do
 
   context 'from the tags list page' do
     scenario 'updates the release notes' do
-      page.within(first('.controls')) do
+      page.within(first('.content-list .controls')) do
         click_link 'Edit release notes'
       end
 

From 79b9ff60768644287daace5a8f640d1790816353 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 16 May 2016 12:36:27 -0500
Subject: [PATCH 0485/1431] Modify tests to match new navigation behaviour for
 project pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/project/active_tab.feature         | 18 ++++-------
 features/project/project.feature            |  9 ------
 features/steps/admin/active_tab.rb          | 10 +++++-
 features/steps/dashboard/active_tab.rb      |  6 +---
 features/steps/dashboard/shortcuts.rb       |  2 +-
 features/steps/profile/active_tab.rb        |  4 ---
 features/steps/project/active_tab.rb        | 28 ++++++++++-------
 features/steps/project/fork.rb              |  2 +-
 features/steps/project/project.rb           | 12 ++-----
 features/steps/project/project_milestone.rb |  2 +-
 features/steps/shared/active_tab.rb         | 28 +++--------------
 features/steps/shared/issuable.rb           |  8 ++---
 features/steps/shared/project_tab.rb        |  4 +--
 features/steps/shared/sidebar_active_tab.rb | 35 +++++++++++++++++++++
 14 files changed, 82 insertions(+), 86 deletions(-)
 create mode 100644 features/steps/shared/sidebar_active_tab.rb

diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 2fd097d100b..5125a3e5773 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -30,11 +30,6 @@ Feature: Project Active Tab
     Then the active main tab should be Merge Requests
     And no other main tabs should be active
 
-  Scenario: On Project Members
-    Given I visit my project's members page
-    Then the active main tab should be Members
-    And no other main tabs should be active
-
   Scenario: On Project Wiki
     Given I visit my project's wiki page
     Then the active main tab should be Wiki
@@ -49,13 +44,6 @@ Feature: Project Active Tab
 
   # Sub Tabs: Settings
 
-  Scenario: On Project Settings/Edit
-    Given I visit my project's settings page
-    And I click the "Edit" tab
-    Then the active sub nav should be Edit
-    And no other sub navs should be active
-    And the active main tab should be Settings
-
   Scenario: On Project Settings/Hooks
     Given I visit my project's settings page
     And I click the "Hooks" tab
@@ -70,6 +58,12 @@ Feature: Project Active Tab
     And no other sub navs should be active
     And the active main tab should be Settings
 
+  Scenario: On Project Members
+    Given I visit my project's members page
+    Then the active sub nav should be Members
+    And no other sub navs should be active
+    And the active main tab should be Settings
+
   # Sub Tabs: Commits
 
   Scenario: On Project Commits/Commits
diff --git a/features/project/project.feature b/features/project/project.feature
index f1f3ed26065..aa22401c88e 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -18,15 +18,6 @@ Feature: Project
     Then I should see the default project avatar
     And I should not see the "Remove avatar" button
 
-  Scenario: I should have back to group button
-    And project "Shop" belongs to group
-    And I visit project "Shop" page
-    Then I should see back to group button
-
-  Scenario: I should have back to group button
-    And I visit project "Shop" page
-    Then I should see back to dashboard button
-
   Scenario: I should have readme on page
     And I visit project "Shop" page
     Then I should see project "Shop" README
diff --git a/features/steps/admin/active_tab.rb b/features/steps/admin/active_tab.rb
index 90d13abdb13..f2db1801389 100644
--- a/features/steps/admin/active_tab.rb
+++ b/features/steps/admin/active_tab.rb
@@ -1,7 +1,7 @@
 class Spinach::Features::AdminActiveTab < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
-  include SharedActiveTab
+  include SharedSidebarActiveTab
 
   step 'the active main tab should be Home' do
     ensure_active_main_tab('Overview')
@@ -34,4 +34,12 @@ class Spinach::Features::AdminActiveTab < Spinach::FeatureSteps
   step 'the active main tab should be Messages' do
     ensure_active_main_tab('Messages')
   end
+
+  step 'no other main tabs should be active' do
+    expect(page).to have_selector('.nav-sidebar > li.active', count: 1)
+  end
+
+  def ensure_active_main_tab(content)
+    expect(find('.nav-sidebar > li.active')).to have_content(content)
+  end
 end
diff --git a/features/steps/dashboard/active_tab.rb b/features/steps/dashboard/active_tab.rb
index 0e2c04fb299..04fe96cef22 100644
--- a/features/steps/dashboard/active_tab.rb
+++ b/features/steps/dashboard/active_tab.rb
@@ -1,9 +1,5 @@
 class Spinach::Features::DashboardActiveTab < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
-  include SharedActiveTab
-
-  step 'the active main tab should be Help' do
-    ensure_active_main_tab('Help')
-  end
+  include SharedSidebarActiveTab
 end
diff --git a/features/steps/dashboard/shortcuts.rb b/features/steps/dashboard/shortcuts.rb
index a9083850b52..512dc5f18d9 100644
--- a/features/steps/dashboard/shortcuts.rb
+++ b/features/steps/dashboard/shortcuts.rb
@@ -2,5 +2,5 @@ class Spinach::Features::DashboardShortcuts < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedProject
-  include SharedActiveTab
+  include SharedSidebarActiveTab
 end
diff --git a/features/steps/profile/active_tab.rb b/features/steps/profile/active_tab.rb
index 3b59089a093..4724a326277 100644
--- a/features/steps/profile/active_tab.rb
+++ b/features/steps/profile/active_tab.rb
@@ -22,8 +22,4 @@ class Spinach::Features::ProfileActiveTab < Spinach::FeatureSteps
   step 'the active main tab should be Audit Log' do
     ensure_active_main_tab('Audit Log')
   end
-
-  def ensure_active_main_tab(content)
-    expect(find('.layout-nav li.active')).to have_content(content)
-  end
 end
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 19d81453d8c..4a5a71e7e61 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -16,12 +16,14 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'I click the "Snippets" tab' do
-    click_link('Snippets')
+    page.within('.layout-nav') do
+      click_link('Snippets')
+    end
   end
 
-  step 'I click the "Edit" tab' do
-    page.within '.sidebar-subnav' do
-      click_link('Project Settings')
+  step 'I click the "Edit Project"' do
+    page.within '.layout-nav .controls' do
+      click_link('Edit Project')
     end
   end
 
@@ -33,14 +35,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     click_link('Deploy Keys')
   end
 
-  step 'the active sub nav should be Team' do
+  step 'the active sub nav should be Members' do
     ensure_active_sub_nav('Members')
   end
 
-  step 'the active sub nav should be Edit' do
-    ensure_active_sub_nav('Project')
-  end
-
   step 'the active sub nav should be Hooks' do
     ensure_active_sub_nav('Webhooks')
   end
@@ -56,7 +54,9 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'I click the "Branches" tab' do
-    click_link('Branches')
+    page.within '.content' do
+      click_link('Branches')
+    end
   end
 
   step 'I click the "Tags" tab' do
@@ -82,11 +82,15 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   # Sub Tabs: Issues
 
   step 'I click the "Milestones" tab' do
-    click_link('Milestones')
+    page.within('.layout-nav') do
+      click_link('Milestones')
+    end
   end
 
   step 'I click the "Labels" tab' do
-    click_link('Labels')
+    page.within('.layout-nav') do
+      click_link('Labels')
+    end
   end
 
   step 'the active sub tab should be Issues' do
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 527f7853da9..8abeb5ee242 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
   end
 
   step 'I goto the Merge Requests page' do
-    page.within '.page-sidebar-expanded' do
+    page.within '.layout-nav' do
       click_link "Merge Requests"
     end
   end
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index ef185861e00..a1785311c2b 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -114,7 +114,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   end
 
   step 'I should not see "Snippets" button' do
-    expect(page).not_to have_link 'Snippets'
+    page.within '.content' do
+      expect(page).not_to have_link 'Snippets'
+    end
   end
 
   step 'project "Shop" belongs to group' do
@@ -123,14 +125,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps
     @project.save!
   end
 
-  step 'I should see back to dashboard button' do
-    expect(page).to have_content 'Go to dashboard'
-  end
-
-  step 'I should see back to group button' do
-    expect(page).to have_content 'Go to group'
-  end
-
   step 'I click notifications drop down button' do
     click_link 'notifications-button'
   end
diff --git a/features/steps/project/project_milestone.rb b/features/steps/project/project_milestone.rb
index 2508c09e36d..1864b3a2b52 100644
--- a/features/steps/project/project_milestone.rb
+++ b/features/steps/project/project_milestone.rb
@@ -52,7 +52,7 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps
   end
 
   step 'I click link "Labels"' do
-    page.within('.nav-links') do
+    page.within('.layout-nav .nav-links') do
       page.find(:xpath, "//a[@href='#tab-labels']").click
     end
   end
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index 0bee91d758d..ace717b9909 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -2,7 +2,7 @@ module SharedActiveTab
   include Spinach::DSL
 
   def ensure_active_main_tab(content)
-    expect(find('.nav-sidebar > li.active')).to have_content(content)
+    expect(find('.layout-nav li.active')).to have_content(content)
   end
 
   def ensure_active_sub_tab(content)
@@ -10,11 +10,11 @@ module SharedActiveTab
   end
 
   def ensure_active_sub_nav(content)
-    expect(find('.sidebar-subnav > li.active')).to have_content(content)
+    expect(find('.layout-nav .controls li.active')).to have_content(content)
   end
 
   step 'no other main tabs should be active' do
-    expect(page).to have_selector('.nav-sidebar > li.active', count: 1)
+    expect(page).to have_selector('.layout-nav .nav-links > li.active', count: 1)
   end
 
   step 'no other sub tabs should be active' do
@@ -22,26 +22,6 @@ module SharedActiveTab
   end
 
   step 'no other sub navs should be active' do
-    expect(page).to have_selector('.sidebar-subnav > li.active', count: 1)
-  end
-
-  step 'the active main tab should be Home' do
-    ensure_active_main_tab('Projects')
-  end
-
-  step 'the active main tab should be Projects' do
-    ensure_active_main_tab('Projects')
-  end
-
-  step 'the active main tab should be Issues' do
-    ensure_active_main_tab('Issues')
-  end
-
-  step 'the active main tab should be Merge Requests' do
-    ensure_active_main_tab('Merge Requests')
-  end
-
-  step 'the active main tab should be Help' do
-    ensure_active_main_tab('Help')
+    expect(page).to have_selector('.layout-nav .controls li.active', count: 1)
   end
 end
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index a58b3cb7e16..733e80b7279 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -111,7 +111,7 @@ module SharedIssuable
 
   step 'I sort the list by "Oldest updated"' do
     find('button.dropdown-toggle.btn').click
-    page.within('ul.dropdown-menu.dropdown-menu-align-right li') do
+    page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
       click_link "Oldest updated"
     end
   end
@@ -119,7 +119,7 @@ module SharedIssuable
   step 'I sort the list by "Least popular"' do
     find('button.dropdown-toggle.btn').click
 
-    page.within('ul.dropdown-menu.dropdown-menu-align-right li') do
+    page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
       click_link 'Least popular'
     end
   end
@@ -127,13 +127,13 @@ module SharedIssuable
   step 'I sort the list by "Most popular"' do
     find('button.dropdown-toggle.btn').click
 
-    page.within('ul.dropdown-menu.dropdown-menu-align-right li') do
+    page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
       click_link 'Most popular'
     end
   end
 
   step 'The list should be sorted by "Oldest updated"' do
-    page.within('div.dropdown.inline.prepend-left-10') do
+    page.within('.content div.dropdown.inline.prepend-left-10') do
       expect(page.find('button.dropdown-toggle.btn')).to have_content('Oldest updated')
     end
   end
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 4fc2ece79ff..b209020c5a9 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -41,9 +41,7 @@ module SharedProjectTab
   end
 
   step 'the active main tab should be Settings' do
-    page.within '.nav-sidebar' do
-      expect(page).to have_content('Go to project')
-    end
+    expect(page).to have_selector('.layout-nav .nav-links > li.active', count: 0)
   end
 
   step 'the active main tab should be Activity' do
diff --git a/features/steps/shared/sidebar_active_tab.rb b/features/steps/shared/sidebar_active_tab.rb
new file mode 100644
index 00000000000..5c47238777f
--- /dev/null
+++ b/features/steps/shared/sidebar_active_tab.rb
@@ -0,0 +1,35 @@
+module SharedSidebarActiveTab
+  include Spinach::DSL
+
+  step 'the active main tab should be Help' do
+    ensure_active_main_tab('Help')
+  end
+
+  step 'no other main tabs should be active' do
+    expect(page).to have_selector('.nav-sidebar > li.active', count: 1)
+  end
+
+  def ensure_active_main_tab(content)
+    expect(find('.nav-sidebar li.active')).to have_content(content)
+  end
+
+  step 'the active main tab should be Home' do
+    ensure_active_main_tab('Projects')
+  end
+
+  step 'the active main tab should be Projects' do
+    ensure_active_main_tab('Projects')
+  end
+
+  step 'the active main tab should be Issues' do
+    ensure_active_main_tab('Issues')
+  end
+
+  step 'the active main tab should be Merge Requests' do
+    ensure_active_main_tab('Merge Requests')
+  end
+
+  step 'the active main tab should be Help' do
+    ensure_active_main_tab('Help')
+  end
+end

From e9fdfb9a71d26f501c988033e9b4de8d607f1d61 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 16 May 2016 12:44:07 -0500
Subject: [PATCH 0486/1431] Fix left sidebar overlap when scroll on long menu

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index f47eb1f233e..16cf394c426 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -9,6 +9,8 @@
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   .page-with-sidebar {
     .header-logo {
+      background: $color-darker;
+
       a {
         color: $color-light;
 

From 71ca2de7aabf3191c4f486ca15a78a5b7f6abd94 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 21 Apr 2016 15:55:54 -0300
Subject: [PATCH 0487/1431] Toggle email signup confirmation in admin settings

---
 CHANGELOG                                     |  1 +
 .../admin/application_settings_controller.rb  |  1 +
 app/models/user.rb                            |  5 +++
 .../application_settings/_form.html.haml      |  6 ++++
 ...firmation_email_to_application_settings.rb |  8 +++++
 .../registrations_controller_spec.rb          | 33 +++++++++++++++++++
 6 files changed, 54 insertions(+)
 create mode 100644 db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb
 create mode 100644 spec/controllers/registrations_controller_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index ca59f488e0f..7a86263c0a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -189,6 +189,7 @@ v 8.7.0
   - Add Slack notifications when Wiki is edited (Sebastian Klier)
   - Diffs load at the correct point when linking from from number
   - Selected diff rows highlight
+  - Toggle sign-up confirmation emails in application settings
   - Fix emoji categories in the emoji picker
   - API: Properly display annotated tags for GET /projects/:id/repository/tags (Robert Schilling)
   - Add encrypted credentials for imported projects and migrate old ones
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 8c973f0e4a8..956d145f029 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -106,6 +106,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :email_author_in_body,
       :repository_checks_enabled,
       :metrics_packet_size,
+      :skip_user_confirmation_email,
       restricted_visibility_levels: [],
       import_sources: [],
       disabled_oauth_sign_in_sources: []
diff --git a/app/models/user.rb b/app/models/user.rb
index 489bff3fa4a..470734f5c2f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -112,6 +112,7 @@ class User < ActiveRecord::Base
   before_save :ensure_external_user_rights
   after_save :ensure_namespace_correct
   after_initialize :set_projects_limit
+  before_create :check_confirmation_email
   after_create :post_create_hook
   after_destroy :post_destroy_hook
 
@@ -307,6 +308,10 @@ class User < ActiveRecord::Base
     @reset_token
   end
 
+  def check_confirmation_email
+    skip_confirmation! if current_application_settings.skip_user_confirmation_email
+  end
+
   def recently_sent_password_reset?
     reset_password_sent_at.present? && reset_password_sent_at >= 1.minute.ago
   end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index f7c799c968f..6d6d87cdd5a 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -103,6 +103,12 @@
           = f.label :signup_enabled do
             = f.check_box :signup_enabled
             Sign-up enabled
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :skip_confirmation_email do
+            = f.check_box :skip_user_confirmation_email
+            Skip sign-up email confirmation
     .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
diff --git a/db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb b/db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb
new file mode 100644
index 00000000000..953f1cea896
--- /dev/null
+++ b/db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb
@@ -0,0 +1,8 @@
+class AddSkipConfirmationEmailToApplicationSettings < ActiveRecord::Migration
+  def change
+    #Skip confirmation emails just for new installations
+    default_value = User.count > 0 ? false : true
+
+    add_column :application_settings, :skip_user_confirmation_email, :boolean, default: default_value
+  end
+end
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
new file mode 100644
index 00000000000..b4ab767f73e
--- /dev/null
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe RegistrationsController do
+  describe '#create' do
+    around(:each) do |example|
+      perform_enqueued_jobs do
+        example.run
+      end
+    end
+
+    let(:user_params) { { "user"=> {"name"=>"new_user", "username"=>"new_username", "email"=>"new@user.com", "password"=>"Any_password"} } }
+
+    context 'when skipping email confirmation' do
+      before { allow(current_application_settings).to receive(:skip_user_confirmation_email).and_return(true) }
+
+      it 'logs user in directly' do
+        post(:create, user_params)
+        expect(ActionMailer::Base.deliveries.last).to be_nil
+        expect(subject.current_user).to be
+      end
+    end
+
+    context 'when not skipping email confirmation' do
+      before { allow(current_application_settings).to receive(:skip_user_confirmation_email).and_return(false) }
+
+      it 'does not authenticate user and sends confirmation email' do
+        post(:create, user_params)
+        expect(ActionMailer::Base.deliveries.last.to.first).to eq(user_params["user"]["email"])
+        expect(subject.current_user).to be_nil
+      end
+    end
+  end
+end

From c5526a2d9a946d99d7b4a72fc488fe6e0a9ad60b Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 28 Apr 2016 17:09:15 -0300
Subject: [PATCH 0488/1431] Change skip_user_confirmation_email to
 send_user_confirmation_email

---
 CHANGELOG                                            |  5 ++++-
 .../admin/application_settings_controller.rb         |  2 +-
 app/models/user.rb                                   |  3 ++-
 app/views/admin/application_settings/_form.html.haml |  4 ++--
 ...end_confirmation_email_to_application_settings.rb | 12 ++++++++++++
 ...kip_confirmation_email_to_application_settings.rb |  8 --------
 spec/controllers/registrations_controller_spec.rb    | 12 ++++++------
 spec/features/signup_spec.rb                         |  2 ++
 spec/models/user_spec.rb                             |  1 +
 9 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
 delete mode 100644 db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb

diff --git a/CHANGELOG b/CHANGELOG
index 7a86263c0a9..5841da3ac99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,8 @@ v 8.8.0 (unreleased)
   - Display informative message when new milestone is created
   - Sanitize milestones and labels titles
   - Support multi-line tag messages. !3833 (Calin Seciu)
+  - Toggle sign-up confirmation emails in application settings
+  - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
@@ -93,6 +95,8 @@ v 8.7.1
 v 8.7.0
   - Gitlab::GitAccess and Gitlab::GitAccessWiki are now instrumented
   - Fix vulnerability that made it possible to gain access to private labels and milestones
+
+v 8.7.0 (unreleased)
   - The number of InfluxDB points stored per UDP packet can now be configured
   - Fix error when cross-project label reference used with non-existent project
   - Transactions for /internal/allowed now have an "action" tag set
@@ -189,7 +193,6 @@ v 8.7.0
   - Add Slack notifications when Wiki is edited (Sebastian Klier)
   - Diffs load at the correct point when linking from from number
   - Selected diff rows highlight
-  - Toggle sign-up confirmation emails in application settings
   - Fix emoji categories in the emoji picker
   - API: Properly display annotated tags for GET /projects/:id/repository/tags (Robert Schilling)
   - Add encrypted credentials for imported projects and migrate old ones
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 956d145f029..ff7a5cad2fb 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -106,7 +106,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :email_author_in_body,
       :repository_checks_enabled,
       :metrics_packet_size,
-      :skip_user_confirmation_email,
+      :send_user_confirmation_email,
       restricted_visibility_levels: [],
       import_sources: [],
       disabled_oauth_sign_in_sources: []
diff --git a/app/models/user.rb b/app/models/user.rb
index 470734f5c2f..bcadbd3e2fb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -309,7 +309,8 @@ class User < ActiveRecord::Base
   end
 
   def check_confirmation_email
-    skip_confirmation! if current_application_settings.skip_user_confirmation_email
+    byebug
+    skip_confirmation! unless current_application_settings.send_user_confirmation_email
   end
 
   def recently_sent_password_reset?
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 6d6d87cdd5a..289dda9a436 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -107,8 +107,8 @@
       .col-sm-offset-2.col-sm-10
         .checkbox
           = f.label :skip_confirmation_email do
-            = f.check_box :skip_user_confirmation_email
-            Skip sign-up email confirmation
+            = f.check_box :send_user_confirmation_email
+            Send sign-up email confirmation
     .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
diff --git a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb b/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
new file mode 100644
index 00000000000..0fef2a831e7
--- /dev/null
+++ b/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
@@ -0,0 +1,12 @@
+class AddSendConfirmationEmailToApplicationSettings < ActiveRecord::Migration
+  def up
+    add_column :application_settings, :send_user_confirmation_email, :boolean, default: false
+
+    #Sets confirmation email to true by default on existing installations.
+    ApplicationSetting.update_all(send_user_confirmation_email: true)
+  end
+
+  def down
+    remove_column :application_settings, :send_user_confirmation_email
+  end
+end
diff --git a/db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb b/db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb
deleted file mode 100644
index 953f1cea896..00000000000
--- a/db/migrate/20160421141709_add_skip_confirmation_email_to_application_settings.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddSkipConfirmationEmailToApplicationSettings < ActiveRecord::Migration
-  def change
-    #Skip confirmation emails just for new installations
-    default_value = User.count > 0 ? false : true
-
-    add_column :application_settings, :skip_user_confirmation_email, :boolean, default: default_value
-  end
-end
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index b4ab767f73e..29f1847d9a1 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -8,10 +8,10 @@ describe RegistrationsController do
       end
     end
 
-    let(:user_params) { { "user"=> {"name"=>"new_user", "username"=>"new_username", "email"=>"new@user.com", "password"=>"Any_password"} } }
+    let(:user_params) { { user: { name: "new_user", username: "new_username", email: "new@user.com", password: "Any_password" } } }
 
-    context 'when skipping email confirmation' do
-      before { allow(current_application_settings).to receive(:skip_user_confirmation_email).and_return(true) }
+    context 'when sending email confirmation' do
+      before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(false) }
 
       it 'logs user in directly' do
         post(:create, user_params)
@@ -20,12 +20,12 @@ describe RegistrationsController do
       end
     end
 
-    context 'when not skipping email confirmation' do
-      before { allow(current_application_settings).to receive(:skip_user_confirmation_email).and_return(false) }
+    context 'when not sending email confirmation' do
+      before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) }
 
       it 'does not authenticate user and sends confirmation email' do
         post(:create, user_params)
-        expect(ActionMailer::Base.deliveries.last.to.first).to eq(user_params["user"]["email"])
+        expect(ActionMailer::Base.deliveries.last.to.first).to eq(user_params[:user][:email])
         expect(subject.current_user).to be_nil
       end
     end
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index 58aabd913eb..c7840f26d8f 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 
 feature 'Signup', feature: true do
   describe 'signup with no errors' do
+    before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
+
     it 'creates the user account and sends a confirmation email' do
       user = build(:user)
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 10e7e693571..9581990666b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -141,6 +141,7 @@ describe User, models: true do
   end
 
   describe '#confirm' do
+    before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) }
     let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') }
 
     it 'returns unconfirmed' do

From 0baadd6cff63d5ac0048043381a0b7daff6e01c3 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 28 Apr 2016 17:22:35 -0300
Subject: [PATCH 0489/1431] Fix changelog file

---
 CHANGELOG          | 2 --
 app/models/user.rb | 1 -
 2 files changed, 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5841da3ac99..7ebe10c0f7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -95,8 +95,6 @@ v 8.7.1
 v 8.7.0
   - Gitlab::GitAccess and Gitlab::GitAccessWiki are now instrumented
   - Fix vulnerability that made it possible to gain access to private labels and milestones
-
-v 8.7.0 (unreleased)
   - The number of InfluxDB points stored per UDP packet can now be configured
   - Fix error when cross-project label reference used with non-existent project
   - Transactions for /internal/allowed now have an "action" tag set
diff --git a/app/models/user.rb b/app/models/user.rb
index bcadbd3e2fb..368a3f3cfba 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -309,7 +309,6 @@ class User < ActiveRecord::Base
   end
 
   def check_confirmation_email
-    byebug
     skip_confirmation! unless current_application_settings.send_user_confirmation_email
   end
 

From 7bb84e64979edda8e76f077bd58aeb35857aec23 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 6 May 2016 17:59:45 -0300
Subject: [PATCH 0490/1431] Change landing page when skipping confirmation
 email and add documentation

---
 app/controllers/registrations_controller.rb   |  4 +-
 .../application_settings/_form.html.haml      |  4 +-
 ...firmation_email_to_application_settings.rb |  2 +-
 doc/security/README.md                        |  1 +
 doc/security/user_email_confirmation.md       |  7 +++
 .../registrations_controller_spec.rb          |  2 +-
 spec/features/signup_spec.rb                  | 45 ++++++++++++++-----
 7 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 doc/security/user_email_confirmation.md

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 352bff19383..26eb15f49e4 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -37,8 +37,8 @@ class RegistrationsController < Devise::RegistrationsController
     super
   end
 
-  def after_sign_up_path_for(_resource)
-    users_almost_there_path
+  def after_sign_up_path_for(user)
+    user.confirmed_at.present? ? dashboard_projects_path : users_almost_there_path
   end
 
   def after_inactive_sign_up_path_for(_resource)
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 289dda9a436..df286852b97 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -106,9 +106,9 @@
     .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
-          = f.label :skip_confirmation_email do
+          = f.label :send_user_confirmation_email do
             = f.check_box :send_user_confirmation_email
-            Send sign-up email confirmation
+            Send confirmation email on sign-up
     .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
diff --git a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb b/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
index 0fef2a831e7..f92ef960509 100644
--- a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
+++ b/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
@@ -3,7 +3,7 @@ class AddSendConfirmationEmailToApplicationSettings < ActiveRecord::Migration
     add_column :application_settings, :send_user_confirmation_email, :boolean, default: false
 
     #Sets confirmation email to true by default on existing installations.
-    ApplicationSetting.update_all(send_user_confirmation_email: true)
+    execute "UPDATE application_settings SET send_user_confirmation_email=true"
   end
 
   def down
diff --git a/doc/security/README.md b/doc/security/README.md
index 4cd0fdd4094..38706e48ec5 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -8,3 +8,4 @@
 - [User File Uploads](user_file_uploads.md)
 - [How we manage the CRIME vulnerability](crime_vulnerability.md)
 - [Enforce Two-factor authentication](two_factor_authentication.md)
+- [Send email confirmation on sign-up](user_email_confirmation.md)
diff --git a/doc/security/user_email_confirmation.md b/doc/security/user_email_confirmation.md
new file mode 100644
index 00000000000..4293944ae8b
--- /dev/null
+++ b/doc/security/user_email_confirmation.md
@@ -0,0 +1,7 @@
+# User email confirmation at sign-up
+
+Gitlab admin can enable email confirmation on sign-up, if you want to confirm all
+user emails before they are able to sign-in.
+
+In the Admin area under **Settings** (`/admin/application_settings`), go to section
+**Sign-in Restrictions** and look for **Send confirmation email on sign-up** option.
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 29f1847d9a1..df70a589a89 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -16,7 +16,7 @@ describe RegistrationsController do
       it 'logs user in directly' do
         post(:create, user_params)
         expect(ActionMailer::Base.deliveries.last).to be_nil
-        expect(subject.current_user).to be
+        expect(subject.current_user).to_not be_nil
       end
     end
 
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index c7840f26d8f..4229e82b443 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -2,22 +2,45 @@ require 'spec_helper'
 
 feature 'Signup', feature: true do
   describe 'signup with no errors' do
-    before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
 
-    it 'creates the user account and sends a confirmation email' do
-      user = build(:user)
+    context "when sending confirmation email" do
+      before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
 
-      visit root_path
+      it 'creates the user account and sends a confirmation email' do
+        user = build(:user)
 
-      fill_in 'new_user_name',     with: user.name
-      fill_in 'new_user_username', with: user.username
-      fill_in 'new_user_email',    with: user.email
-      fill_in 'new_user_password', with: user.password
-      click_button "Sign up"
+        visit root_path
 
-      expect(current_path).to eq users_almost_there_path
-      expect(page).to have_content("Please check your email to confirm your account")
+        fill_in 'new_user_name',     with: user.name
+        fill_in 'new_user_username', with: user.username
+        fill_in 'new_user_email',    with: user.email
+        fill_in 'new_user_password', with: user.password
+        click_button "Sign up"
+
+        expect(current_path).to eq users_almost_there_path
+        expect(page).to have_content("Please check your email to confirm your account")
+      end
     end
+
+    context "when not sending confirmation email" do
+      before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(false) }
+
+      it 'creates the user account and goes to dashboard' do
+        user = build(:user)
+
+        visit root_path
+
+        fill_in 'new_user_name',     with: user.name
+        fill_in 'new_user_username', with: user.username
+        fill_in 'new_user_email',    with: user.email
+        fill_in 'new_user_password', with: user.password
+        click_button "Sign up"
+
+        expect(current_path).to eq dashboard_projects_path
+        expect(page).to have_content("Welcome! You have signed up successfully.")
+      end
+    end
+
   end
 
   describe 'signup with errors' do

From 8536c49f1958b08a6dc556f0cf9abd166f821669 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 18:38:25 +0000
Subject: [PATCH 0491/1431] Fixed rubocop error

---
 spec/features/issues/move_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index ebf039817dd..307ecc6fcaf 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -53,7 +53,6 @@ feature 'issue move to another project' do
       background { another_project.team << [user, :guest] }
 
       scenario 'browsing projects in projects select' do
-        options = [ '', 'No project', new_project.name_with_namespace ]
         click_link 'Select project'
 
         page.within '.select2-results' do

From c9be74e24797c1dab5b443728349bb0c5ce969c3 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 16 May 2016 16:43:19 -0300
Subject: [PATCH 0492/1431] Fix single note api request

---
 lib/api/helpers.rb              |  4 ++++
 lib/api/notes.rb                | 10 +++++-----
 spec/requests/api/notes_spec.rb | 17 ++++++++++++++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 40c967453fb..1003b596aec 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -397,5 +397,9 @@ module API
       error!(errors[:access_level], 422) if errors[:access_level].any?
       not_found!(errors)
     end
+
+    def noteable_ability_name(noteable)
+      "read_#{noteable.class.to_s.underscore.downcase}".to_sym
+    end
   end
 end
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index f0116acd90f..c49b107d1d9 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -20,9 +20,8 @@ module API
         #   GET /projects/:id/snippets/:noteable_id/notes
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes" do
           @noteable = user_project.send(noteables_str.to_sym).find(params[noteable_id_str.to_sym])
-          read_ability_name = "read_#{@noteable.class.to_s.underscore.downcase}".to_sym
 
-          if can?(current_user, read_ability_name, @noteable)
+          if can?(current_user, noteable_ability_name(@noteable), @noteable)
             # We exclude notes that are cross-references and that cannot be viewed
             # by the current user. By doing this exclusion at this level and not
             # at the DB query level (which we cannot in that case), the current
@@ -52,11 +51,12 @@ module API
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id" do
           @noteable = user_project.send(noteables_str.to_sym).find(params[noteable_id_str.to_sym])
           @note = @noteable.notes.find(params[:note_id])
+          can_read_note = can?(current_user, noteable_ability_name(@noteable), @noteable) && !@note.cross_reference_not_visible_for?(current_user)
 
-          if @note.cross_reference_not_visible_for?(current_user)
-            not_found!("Note")
-          else
+          if can_read_note
             present @note, with: Entities::Note
+          else
+            not_found!("Note")
           end
         end
 
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index f9bfee94424..ed1ed5aeb95 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe API::API, api: true  do
   include ApiHelpers
   let(:user) { create(:user) }
-  let!(:project) { create(:project, namespace: user.namespace) }
+  let!(:project) { create(:project, :public, namespace: user.namespace) }
   let!(:issue) { create(:issue, project: project, author: user) }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project, author: user) }
   let!(:snippet) { create(:project_snippet, project: project, author: user) }
@@ -51,7 +51,7 @@ describe API::API, api: true  do
         expect(response.status).to eq(404)
       end
 
-      context "that references a private issue" do
+      context "and current user cannot view the notes" do
         it "should return an empty array" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes", user)
 
@@ -142,13 +142,24 @@ describe API::API, api: true  do
         expect(response.status).to eq(404)
       end
 
-      context "that references a private issue" do
+      context "and current user cannot view the note" do
         it "should return a 404 error" do
           get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", user)
 
           expect(response.status).to eq(404)
         end
 
+        context "when issue is confidential" do
+          before { issue.update_attributes(confidential: true) }
+
+          it "returns 404" do
+            get api("/projects/#{project.id}/issues/#{issue.id}/notes/#{issue_note.id}", private_user)
+
+            expect(response.status).to eq(404)
+          end
+        end
+
+
         context "and current user can view the note" do
           it "should return an issue note by id" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.id}/notes/#{cross_reference_note.id}", private_user)

From 6286b28bbc9b62af729c45c45f953f5426f5bf52 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 8 May 2016 14:05:45 -0400
Subject: [PATCH 0493/1431] Add an Event's target's title to its reference link

Given an activity feed entry like:

> Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]

...the `issue #123` link will now have a `title` attribute.
---
 app/helpers/events_helper.rb             | 2 +-
 app/models/event.rb                      | 2 +-
 app/models/note.rb                       | 1 +
 app/views/events/event/_common.html.haml | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 0bf328e7d19..2b33889b46a 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -162,7 +162,7 @@ module EventsHelper
           "#{event.note_target_type} #{truncate event.note_target.to_reference}"
         end
       else
-        link_to event_note_target_path(event) do
+        link_to event_note_target_path(event), title: event.target_title do
           "#{event.note_target_type} #{truncate event.note_target.to_reference}"
         end
       end
diff --git a/app/models/event.rb b/app/models/event.rb
index 17ee48b91a8..b54fbe6f7e8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -80,7 +80,7 @@ class Event < ActiveRecord::Base
   end
 
   def target_title
-    target.title if target && target.respond_to?(:title)
+    target.try(:title)
   end
 
   def created?
diff --git a/app/models/note.rb b/app/models/note.rb
index 7e5bdc09a84..55b98557244 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -19,6 +19,7 @@ class Note < ActiveRecord::Base
   delegate :gfm_reference, :local_reference, to: :noteable
   delegate :name, to: :project, prefix: true
   delegate :name, :email, to: :author, prefix: true
+  delegate :title, to: :noteable, allow_nil: true
 
   before_validation :set_award!
 
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index c994e3b997d..f9f623cc031 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -4,7 +4,7 @@
     = event_action_name(event)
 
   - if event.target
-    %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target]
+    %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target], title: event.target_title
 
   = event_preposition(event)
 

From c05ed99bff637f51d16cc34663b911e46295a473 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 8 May 2016 14:46:43 -0400
Subject: [PATCH 0494/1431] Simplify Event's target type-checking

---
 app/models/event.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index b54fbe6f7e8..a617694b7dd 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -279,15 +279,15 @@ class Event < ActiveRecord::Base
   end
 
   def note_commit?
-    target.noteable_type == "Commit"
+    target.for_commit?
   end
 
   def issue_note?
-    note? && target && target.noteable_type == "Issue"
+    note? && target && target.for_issue?
   end
 
   def note_project_snippet?
-    target.noteable_type == "Snippet"
+    target.for_snippet?
   end
 
   def note_target

From 3950f8074c078fb9320c3e9a468da15feb2d103e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 8 May 2016 15:28:21 -0400
Subject: [PATCH 0495/1431] Fix titles for commit references in Event feed

Prior, the `title` attribute was being included as an argument to the
route helper rather than as an argument to `link_to`.
---
 app/helpers/events_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 2b33889b46a..73320d8841d 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -150,7 +150,8 @@ module EventsHelper
         link_to(
           namespace_project_commit_path(event.project.namespace, event.project,
                                         event.note_commit_id,
-                                        anchor: dom_id(event.target), title: h(event.target_title)),
+                                        anchor: dom_id(event.target)),
+          title: h(event.target_title),
           class: "commit_short_id"
         ) do
           "#{event.note_target_type} #{event.note_short_commit_id}"

From 8a7b5b17d325e13c989098c7e763de1f43505780 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 8 May 2016 15:37:43 -0400
Subject: [PATCH 0496/1431] Remove redundant `html_escape` calls from `title`
 attributes

These get escaped automatically.
---
 app/helpers/events_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 73320d8841d..d0a63d58803 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -3,7 +3,7 @@ module EventsHelper
     author = event.author
 
     if author
-      link_to author.name, user_path(author.username), title: h(author.name)
+      link_to author.name, user_path(author.username), title: author.name
     else
       event.author_name
     end
@@ -151,7 +151,7 @@ module EventsHelper
           namespace_project_commit_path(event.project.namespace, event.project,
                                         event.note_commit_id,
                                         anchor: dom_id(event.target)),
-          title: h(event.target_title),
+          title: event.target_title,
           class: "commit_short_id"
         ) do
           "#{event.note_target_type} #{event.note_short_commit_id}"
@@ -159,7 +159,7 @@ module EventsHelper
       elsif event.note_project_snippet?
         link_to(namespace_project_snippet_path(event.project.namespace,
                                                event.project,
-                                               event.note_target), title: h(event.project.name)) do
+                                               event.note_target), title: event.project.name) do
           "#{event.note_target_type} #{truncate event.note_target.to_reference}"
         end
       else

From b2fc0a51a61669b46516c2a21cbd0abd893ff124 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 12 May 2016 15:31:53 -0500
Subject: [PATCH 0497/1431] Rename `Event#note_commit?` to `commit_note?`

---
 app/helpers/events_helper.rb | 10 +++++-----
 app/models/event.rb          |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d0a63d58803..d7ddb31dbb7 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -57,7 +57,7 @@ module EventsHelper
       words << event.ref_name
       words << "at"
     elsif event.commented?
-      if event.note_commit?
+      if event.commit_note?
         words << event.note_short_commit_id
       else
         words << "##{truncate event.note_target_iid}"
@@ -84,12 +84,12 @@ module EventsHelper
     elsif event.merge_request?
       namespace_project_merge_request_url(event.project.namespace,
                                           event.project, event.merge_request)
-    elsif event.note? && event.note_commit?
+    elsif event.note? && event.commit_note?
       namespace_project_commit_url(event.project.namespace, event.project,
                                    event.note_target)
     elsif event.note?
       if event.note_target
-        if event.note_commit?
+        if event.commit_note?
           namespace_project_commit_path(event.project.namespace, event.project,
                                         event.note_commit_id,
                                         anchor: dom_id(event.target))
@@ -134,7 +134,7 @@ module EventsHelper
   end
 
   def event_note_target_path(event)
-    if event.note? && event.note_commit?
+    if event.note? && event.commit_note?
       namespace_project_commit_path(event.project.namespace, event.project,
                                     event.note_target)
     else
@@ -146,7 +146,7 @@ module EventsHelper
 
   def event_note_title_html(event)
     if event.note_target
-      if event.note_commit?
+      if event.commit_note?
         link_to(
           namespace_project_commit_path(event.project.namespace, event.project,
                                         event.note_commit_id,
diff --git a/app/models/event.rb b/app/models/event.rb
index a617694b7dd..5629f1ee445 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -278,7 +278,7 @@ class Event < ActiveRecord::Base
     Commit.truncate_sha(note_commit_id)
   end
 
-  def note_commit?
+  def commit_note?
     target.for_commit?
   end
 
@@ -295,7 +295,7 @@ class Event < ActiveRecord::Base
   end
 
   def note_target_id
-    if note_commit?
+    if commit_note?
       target.commit_id
     else
       target.noteable_id.to_s

From 0ec2ee71b31ea604a677e28ffb84f3ded1701395 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 12 May 2016 15:37:00 -0500
Subject: [PATCH 0498/1431] Rename `Event#note_project_snippet?` to
 `project_snippet_note?`

---
 app/helpers/events_helper.rb | 4 ++--
 app/models/event.rb          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index d7ddb31dbb7..19281e3f3aa 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -93,7 +93,7 @@ module EventsHelper
           namespace_project_commit_path(event.project.namespace, event.project,
                                         event.note_commit_id,
                                         anchor: dom_id(event.target))
-        elsif event.note_project_snippet?
+        elsif event.project_snippet_note?
           namespace_project_snippet_path(event.project.namespace,
                                          event.project, event.note_target)
         else
@@ -156,7 +156,7 @@ module EventsHelper
         ) do
           "#{event.note_target_type} #{event.note_short_commit_id}"
         end
-      elsif event.note_project_snippet?
+      elsif event.project_snippet_note?
         link_to(namespace_project_snippet_path(event.project.namespace,
                                                event.project,
                                                event.note_target), title: event.project.name) do
diff --git a/app/models/event.rb b/app/models/event.rb
index 5629f1ee445..2e9da42deaa 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -286,7 +286,7 @@ class Event < ActiveRecord::Base
     note? && target && target.for_issue?
   end
 
-  def note_project_snippet?
+  def project_snippet_note?
     target.for_snippet?
   end
 

From 020e616822f0e634932bf948013f94eb7ef413bb Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 12 May 2016 16:47:45 -0500
Subject: [PATCH 0499/1431] Reduce duplication and branching logic in
 EventsHelper

Remove unused methods from Event model
---
 app/helpers/events_helper.rb | 56 ++++++++++--------------------------
 app/models/event.rb          | 21 ++++++--------
 app/models/project.rb        |  2 ++
 3 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 19281e3f3aa..e1489381706 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -57,11 +57,7 @@ module EventsHelper
       words << event.ref_name
       words << "at"
     elsif event.commented?
-      if event.commit_note?
-        words << event.note_short_commit_id
-      else
-        words << "##{truncate event.note_target_iid}"
-      end
+      words << event.note_target_reference
       words << "at"
     elsif event.milestone?
       words << "##{event.target_iid}" if event.target_iid
@@ -89,16 +85,7 @@ module EventsHelper
                                    event.note_target)
     elsif event.note?
       if event.note_target
-        if event.commit_note?
-          namespace_project_commit_path(event.project.namespace, event.project,
-                                        event.note_commit_id,
-                                        anchor: dom_id(event.target))
-        elsif event.project_snippet_note?
-          namespace_project_snippet_path(event.project.namespace,
-                                         event.project, event.note_target)
-        else
-          event_note_target_path(event)
-        end
+        event_note_target_path(event)
       end
     elsif event.push?
       push_event_feed_url(event)
@@ -135,42 +122,29 @@ module EventsHelper
 
   def event_note_target_path(event)
     if event.note? && event.commit_note?
-      namespace_project_commit_path(event.project.namespace, event.project,
-                                    event.note_target)
+      namespace_project_commit_path(event.project.namespace,
+                                    event.project,
+                                    event.note_target,
+                                    anchor: dom_id(event.target))
+    elsif event.project_snippet_note?
+      namespace_project_snippet_path(event.project.namespace,
+                                     event.project,
+                                     event.note_target,
+                                     anchor: dom_id(event.target))
     else
       polymorphic_path([event.project.namespace.becomes(Namespace),
                         event.project, event.note_target],
-                       anchor: dom_id(event.target))
+                        anchor: dom_id(event.target))
     end
   end
 
   def event_note_title_html(event)
     if event.note_target
-      if event.commit_note?
-        link_to(
-          namespace_project_commit_path(event.project.namespace, event.project,
-                                        event.note_commit_id,
-                                        anchor: dom_id(event.target)),
-          title: event.target_title,
-          class: "commit_short_id"
-        ) do
-          "#{event.note_target_type} #{event.note_short_commit_id}"
-        end
-      elsif event.project_snippet_note?
-        link_to(namespace_project_snippet_path(event.project.namespace,
-                                               event.project,
-                                               event.note_target), title: event.project.name) do
-          "#{event.note_target_type} #{truncate event.note_target.to_reference}"
-        end
-      else
-        link_to event_note_target_path(event), title: event.target_title do
-          "#{event.note_target_type} #{truncate event.note_target.to_reference}"
-        end
+      link_to(event_note_target_path(event), title: event.target_title, class: 'has-tooltip') do
+        "#{event.note_target_type} #{event.note_target_reference}"
       end
     else
-      content_tag :strong do
-        "(deleted)"
-      end
+      content_tag(:strong, '(deleted)')
     end
   end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 2e9da42deaa..716039fb54b 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -266,18 +266,10 @@ class Event < ActiveRecord::Base
     branch? && project.default_branch != branch_name
   end
 
-  def note_commit_id
-    target.commit_id
-  end
-
   def target_iid
     target.respond_to?(:iid) ? target.iid : target_id
   end
 
-  def note_short_commit_id
-    Commit.truncate_sha(note_commit_id)
-  end
-
   def commit_note?
     target.for_commit?
   end
@@ -302,12 +294,15 @@ class Event < ActiveRecord::Base
     end
   end
 
-  def note_target_iid
-    if note_target.respond_to?(:iid)
-      note_target.iid
+  def note_target_reference
+    return unless note_target
+
+    # Commit#to_reference returns the full SHA, but we want the short one here
+    if commit_note?
+      note_target.short_id
     else
-      note_target_id
-    end.to_s
+      note_target.to_reference
+    end
   end
 
   def note_target_type
diff --git a/app/models/project.rb b/app/models/project.rb
index 6e85841db44..a3c4f1d8e9b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -50,6 +50,8 @@ class Project < ActiveRecord::Base
   attr_accessor :new_default_branch
   attr_accessor :old_path_with_namespace
 
+  alias_attribute :title, :name
+
   # Relations
   belongs_to :creator, foreign_key: 'creator_id', class_name: 'User'
   belongs_to :group, -> { where(type: Group) }, foreign_key: 'namespace_id'

From ecce94d3aab57e099a8897a860023b8ec7acac05 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 16 May 2016 12:42:34 -0300
Subject: [PATCH 0500/1431] fix default send confirmation value

---
 CHANGELOG                                                      | 3 +--
 app/models/application_setting.rb                              | 3 ++-
 ...dd_send_user_confirmation_email_to_application_settings.rb} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename db/migrate/{20160421141709_add_send_confirmation_email_to_application_settings.rb => 20160516174813_add_send_user_confirmation_email_to_application_settings.rb} (81%)

diff --git a/CHANGELOG b/CHANGELOG
index 7ebe10c0f7b..eb5fee8b075 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.8.0 (unreleased)
   - Fix error when using link to uploads in global snippets
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Use a case-insensitive comparison in sanitizing URI schemes
+  - Toggle sign-up confirmation emails in application settings
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
   - Improve multiple branch push performance by memoizing permission checking
@@ -28,8 +29,6 @@ v 8.8.0 (unreleased)
   - Display informative message when new milestone is created
   - Sanitize milestones and labels titles
   - Support multi-line tag messages. !3833 (Calin Seciu)
-  - Toggle sign-up confirmation emails in application settings
-  - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
   - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 1a10768655f..f5079f92444 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -120,7 +120,8 @@ class ApplicationSetting < ActiveRecord::Base
       recaptcha_enabled: false,
       akismet_enabled: false,
       repository_checks_enabled: true,
-      disabled_oauth_sign_in_sources: []
+      disabled_oauth_sign_in_sources: [],
+      send_user_confirmation_email: false
     )
   end
 
diff --git a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb b/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
similarity index 81%
rename from db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
rename to db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
index f92ef960509..c34e7ba5409 100644
--- a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb
+++ b/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
@@ -1,4 +1,4 @@
-class AddSendConfirmationEmailToApplicationSettings < ActiveRecord::Migration
+class AddSendUserConfirmationEmailToApplicationSettings < ActiveRecord::Migration
   def up
     add_column :application_settings, :send_user_confirmation_email, :boolean, default: false
 

From d71edf0dedb944be62390c0e6eea5f6e6da7a328 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 12 May 2016 17:32:09 -0600
Subject: [PATCH 0501/1431] Disallow search engines from indexing uploads from
 a GitLab project.

This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.
---
 public/robots.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/robots.txt b/public/robots.txt
index 4f616c7f4c1..334f4c03533 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -65,3 +65,4 @@ Disallow: /*/*/deploy_keys
 Disallow: /*/*/hooks
 Disallow: /*/*/services
 Disallow: /*/*/protected_branches
+Disallow: /*/*/uploads/

From e3e392965ee16f79a80b0f8517ff8c9e445bb907 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 16:39:23 -0500
Subject: [PATCH 0502/1431] Update permission doc

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

diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index 30f6c75e1cf..b76ce31cbad 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -39,7 +39,7 @@ documentation](../workflow/add-user/add-user.md).
 | Cancel and retry builds               |         |            | ✓           | ✓        | ✓      |
 | Create or update commit status        |         |            | ✓           | ✓        | ✓      |
 | Update a container registry           |         |            | ✓           | ✓        | ✓      |
-| Remove a container registry images    |         |            | ✓           | ✓        | ✓      |
+| Remove a container registry image     |         |            | ✓           | ✓        | ✓      |
 | Create new milestones                 |         |            |             | ✓        | ✓      |
 | Add new team members                  |         |            |             | ✓        | ✓      |
 | Push to protected branches            |         |            |             | ✓        | ✓      |

From bf4dc75801176c95b49763ff6ab5e03305c91f73 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 16:34:42 -0500
Subject: [PATCH 0503/1431] Improve the pipelines design

---
 app/assets/stylesheets/pages/pipelines.scss      | 5 +++++
 app/controllers/projects/pipelines_controller.rb | 2 +-
 app/models/commit_status.rb                      | 1 +
 app/views/projects/ci/commits/_commit.html.haml  | 6 +++---
 app/views/projects/commit/_ci_stage.html.haml    | 8 +++-----
 app/views/projects/commit/_commit_box.html.haml  | 4 ++--
 app/views/projects/pipelines/index.html.haml     | 8 ++++----
 app/views/projects/pipelines/new.html.haml       | 4 ++--
 8 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 app/assets/stylesheets/pages/pipelines.scss

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
new file mode 100644
index 00000000000..7d90a4bebc5
--- /dev/null
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -0,0 +1,5 @@
+.pipeline-stage {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 78b85ea9a71..19071cc9e43 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -25,7 +25,7 @@ class Projects::PipelinesController < Projects::ApplicationController
       flash[:alert] = e.message
       render 'new'
     rescue
-      flash[:alert] = 'Undefined error'
+      flash[:alert] = 'The pipeline could not be created. Please try again.'
       render 'new'
     end
   end
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 6fef1c038e9..1548a51e942 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -14,6 +14,7 @@ class CommitStatus < ActiveRecord::Base
   alias_attribute :author, :user
 
   scope :latest, -> { where(id: unscope(:select).select('max(id)').group(:name, :commit_id)) }
+  scope :retried, -> { where.not(id: latest) }
   scope :ordered, -> { order(:name) }
   scope :ignored, -> { where(allow_failure: true, status: [:failed, :canceled]) }
 
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 90ac41666d0..13162b41f9b 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -19,7 +19,7 @@
       - if commit.triggered?
         %span.label.label-primary triggered
       - if commit.yaml_errors.present?
-        %span.label.label-danger.has-tooltip(title="#{commit.yaml_errors}") yaml invalid
+        %span.label.label-danger.has-tooltip{ title: "#{commit.yaml_errors}" } yaml invalid
       - if commit.builds.any?(&:stuck?)
         %span.label.label-warning stuck
 
@@ -36,7 +36,7 @@
       %td
         - if status = stages_status[stage]
           - tooltip = "#{stage.titleize}: #{status}"
-          %span.has-tooltip(title="#{tooltip}"){class: "ci-status-icon-#{status}"}
+          %span.has-tooltip{ title: "#{tooltip}", class: "ci-status-icon-#{status}" }
             = ci_icon_for_status(status)
 
   %td
@@ -74,4 +74,4 @@
         &nbsp;
         - if commit.active?
           = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
-            = icon("remove", class: "cred")
+            = icon("remove")
diff --git a/app/views/projects/commit/_ci_stage.html.haml b/app/views/projects/commit/_ci_stage.html.haml
index bdadf2944c4..aaa318e1eb3 100644
--- a/app/views/projects/commit/_ci_stage.html.haml
+++ b/app/views/projects/commit/_ci_stage.html.haml
@@ -1,16 +1,14 @@
-- latest = statuses.latest
-- retried = statuses.where.not(id: latest)
 %tr
   %th{colspan: 10}
     %strong
-      - status = latest.status
+      - status = statuses.latest.status
       %span{class: "ci-status-link ci-status-icon-#{status}"}
         = ci_icon_for_status(status)
       - if stage
         &nbsp;
         = stage.titleize.pluralize
-  = render latest.ordered, coverage: @project.build_coverage_enabled?, tage: false, ref: false, allow_retry: true
-  = render retried.ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
+  = render statuses.latest.ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, allow_retry: true
+  = render statuses.retried.ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true
   %tr
     %td{colspan: 10}
       &nbsp;
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 77fb0bc7357..30ec47cc8e3 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -27,14 +27,14 @@
     .pull-right
       = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline), class: "ci-status ci-#{pipeline.status}" do
         = ci_icon_for_status(pipeline.status)
-        pipeline:
+        Pipeline:
         = ci_label_for_status(pipeline.status)
 
   - elsif @commit.status
     .pull-right
       = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
         = ci_icon_for_status(@commit.status)
-        build:
+        Build:
         = ci_label_for_status(@commit.status)
 
   %span.light Authored by
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index af55ef42a6e..9d5b6d367c9 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -27,7 +27,7 @@
     - if can? current_user, :create_pipeline, @project
       = link_to new_namespace_project_pipeline_path(@project.namespace, @project), class: 'btn btn-create' do
         = icon('plus')
-        New
+        New pipeline
 
       - unless @repository.gitlab_ci_yml
         = link_to 'Get started with Pipelines', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
@@ -36,7 +36,7 @@
         = icon('wrench')
         %span CI Lint
 
-.gray-content-block
+.row-content-block
   - if @scope == 'running'
     Running pipelines for this project
   - elsif @scope.nil?
@@ -57,8 +57,8 @@
           %th Commit
           - stages.each do |stage|
             %th
-              %span.has-tooltip(title="#{stage.titleize}")
-                = truncate(stage.titleize.pluralize, length: 8)
+              %span.pipeline-stage.has-tooltip{ title: "#{stage.titleize}" }
+                = stage.titleize.pluralize
           %th
           %th
         = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index 39b1571b9cf..534a495dd85 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -9,7 +9,7 @@
   New Pipeline
 %hr
 
-= form_tag namespace_project_pipelines_path, method: :post, id: "new-pipeline-form", class: "form-horizontal js-create-branch-form js-requires-input" do
+= form_tag namespace_project_pipelines_path, method: :post, id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" do
   .form-group
     = label_tag :ref, 'Create for', class: 'control-label'
     .col-sm-10
@@ -22,4 +22,4 @@
 :javascript
   var availableRefs = #{@project.repository.ref_names.to_json};
 
-  new NewBranchForm($('.js-create-branch-form'), availableRefs)
+  new NewBranchForm($('.js-new-pipeline-form'), availableRefs)

From 7657d202160e04e6b5e5412d949977bc48cdacea Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:09:04 -0500
Subject: [PATCH 0504/1431] Improve design of commit_box with status of builds
 and pipelines

---
 app/views/projects/commit/_builds.html.haml   |  2 +-
 .../projects/commit/_ci_commit.html.haml      | 29 +++++++--------
 .../projects/commit/_commit_box.html.haml     | 35 +++++++++++--------
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/app/views/projects/commit/_builds.html.haml b/app/views/projects/commit/_builds.html.haml
index 5c9a319edeb..7f7a15aa214 100644
--- a/app/views/projects/commit/_builds.html.haml
+++ b/app/views/projects/commit/_builds.html.haml
@@ -1,2 +1,2 @@
 - @ci_commits.each do |ci_commit|
-  = render "ci_commit", ci_commit: ci_commit
+  = render "ci_commit", ci_commit: ci_commit, pipeline_details: true
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 0ff679d0e3d..df92a38db31 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -7,20 +7,21 @@
       - if ci_commit.builds.running_or_pending.any?
         = link_to "Cancel running", cancel_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
 
-  .oneline
-    Pipeline
-    = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
-    with
-    = pluralize ci_commit.statuses.count(:id), "build"
-    - if ci_commit.ref
-      for
-      = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace"
-    - if defined?(link_to_commit) && link_to_commit
-      for commit
-      = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
-    - if ci_commit.duration
-      in
-      = time_interval_in_words ci_commit.duration
+  - if defined?(pipeline_details) && pipeline_details
+    .oneline
+      Pipeline
+      = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
+      with
+      = pluralize ci_commit.statuses.count(:id), "build"
+      - if ci_commit.ref
+        for
+        = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace"
+      - if defined?(link_to_commit) && link_to_commit
+        for commit
+        = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
+      - if ci_commit.duration
+        in
+        = time_interval_in_words ci_commit.duration
 
 - if ci_commit.yaml_errors.present?
   .bs-callout.bs-callout-danger
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 30ec47cc8e3..611272b8a74 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -23,20 +23,6 @@
 
 %p
 .commit-info-row
-  - if defined?(pipeline) && pipeline
-    .pull-right
-      = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline), class: "ci-status ci-#{pipeline.status}" do
-        = ci_icon_for_status(pipeline.status)
-        Pipeline:
-        = ci_label_for_status(pipeline.status)
-
-  - elsif @commit.status
-    .pull-right
-      = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
-        = ci_icon_for_status(@commit.status)
-        Build:
-        = ci_label_for_status(@commit.status)
-
   %span.light Authored by
   %strong
     = commit_author_link(@commit, avatar: true, size: 24)
@@ -60,6 +46,27 @@
   %span.commit-info.branches
     %i.fa.fa-spinner.fa-spin
 
+- if defined?(pipeline) && pipeline
+  .commit-info-row
+    Pipeline
+    = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline), class: "ci-status-link ci-status-icon-#{pipeline.status}" do
+      = ci_icon_for_status(pipeline.status)
+      = ci_label_for_status(pipeline.status)
+    - if pipeline.duration
+      in
+      = time_interval_in_words 3600
+
+- elsif @commit.status
+  .commit-info-row
+    Builds for
+    = pluralize(@commit.ci_commits.count, 'pipeline')
+    = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status-link ci-status-icon-#{@commit.status}" do
+      = ci_icon_for_status(@commit.status)
+      = ci_label_for_status(@commit.status)
+    - if @commit.ci_commits.duration
+      in
+      = time_interval_in_words @commit.ci_commits.duration
+
 .commit-box.content-block
   %h3.commit-title
     = markdown escape_once(@commit.title), pipeline: :single_line

From 23d1c454108d50bbb1795b0a5855ee7ae9024e3c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:12:45 -0500
Subject: [PATCH 0505/1431] Fix 401 message

---
 app/services/auth/container_registry_authentication_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 169e0387e85..3144e96ba31 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -6,7 +6,7 @@ module Auth
       return error('not found', 404) unless registry.enabled
 
       if params[:offline_token]
-        return error('forbidden', 401) unless current_user
+        return error('unauthorized', 401) unless current_user
       else
         return error('forbidden', 403) unless scope
       end

From 89644edc4e2a9447cc31d4f966c163316dff95fa Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:15:38 -0500
Subject: [PATCH 0506/1431] Bring back path to registry settings

---
 config/gitlab.yml.example         | 1 +
 config/initializers/1_settings.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index d935121d88b..0cef2794f4e 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -183,6 +183,7 @@ production: &base
     # api_url: http://localhost:5000/
     # key: config/registry.key
     # issuer: omnibus-certificate
+    # path: shared/registry
 
   #
   # 2. GitLab CI settings
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 129fd9b79f2..796b8178c5e 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -254,6 +254,7 @@ Settings.registry['api_url']       ||= "http://localhost:5000/"
 Settings.registry['key']           ||= nil
 Settings.registry['issuer']        ||= nil
 Settings.registry['host_port']     ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':')
+Settings.registry['path']          = File.expand_path(Settings.artifacts['path'] || File.join(Settings.shared['path'], "registry"), Rails.root)
 
 #
 # Git LFS

From b933367ab3d8df50f0ebd0690d306536f7a654db Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 17 May 2016 00:10:32 +0200
Subject: [PATCH 0507/1431] Instrument all Grape API helpers

---
 CHANGELOG                      | 1 +
 config/initializers/metrics.rb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e1252d4b947..20e2fcb806c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,7 @@ v 8.8.0 (unreleased)
   - Redesign navigation for profile and group pages
   - Add counter metrics for rails cache
   - Import pull requests from GitHub where the source or target branches were removed
+  - All Grape API helpers are now instrumented
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index b2d08d87bac..2338916e9da 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -118,6 +118,8 @@ if Gitlab::Metrics.enabled?
     # Instrument the classes used for checking if somebody has push access.
     config.instrument_instance_methods(Gitlab::GitAccess)
     config.instrument_instance_methods(Gitlab::GitAccessWiki)
+
+    config.instrument_instance_methods(API::Helpers)
   end
 
   GC::Profiler.enable

From 143cd58c398b693db1b9d02f7267db39a8acb87c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:17:57 -0500
Subject: [PATCH 0508/1431] Added backup of container registry

---
 lib/backup/manager.rb                 |  2 +-
 lib/backup/registry.rb                | 13 +++++++++++++
 lib/tasks/gitlab/backup.rake          | 21 +++++++++++++++++++++
 spec/tasks/gitlab/backup_rake_spec.rb | 14 +++++++++-----
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 lib/backup/registry.rb

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 4962f5e53ce..7d0608f09da 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -157,7 +157,7 @@ module Backup
     end
 
     def archives_to_backup
-      %w{uploads builds artifacts lfs}.map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
+      %w{uploads builds artifacts lfs registry}.map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
     end
 
     def folders_to_backup
diff --git a/lib/backup/registry.rb b/lib/backup/registry.rb
new file mode 100644
index 00000000000..67fe0231087
--- /dev/null
+++ b/lib/backup/registry.rb
@@ -0,0 +1,13 @@
+require 'backup/files'
+
+module Backup
+  class Registry < Files
+    def initialize
+      super('registry', Settings.registry.path)
+    end
+
+    def create_files_dir
+      Dir.mkdir(app_files_dir, 0700)
+    end
+  end
+end
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 402bb338f27..d97d974ec20 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -14,6 +14,7 @@ namespace :gitlab do
       Rake::Task["gitlab:backup:builds:create"].invoke
       Rake::Task["gitlab:backup:artifacts:create"].invoke
       Rake::Task["gitlab:backup:lfs:create"].invoke
+      Rake::Task["gitlab:backup:registry:create"].invoke
 
       backup = Backup::Manager.new
       backup.pack
@@ -54,6 +55,7 @@ namespace :gitlab do
       Rake::Task['gitlab:backup:builds:restore'].invoke unless backup.skipped?('builds')
       Rake::Task['gitlab:backup:artifacts:restore'].invoke unless backup.skipped?('artifacts')
       Rake::Task['gitlab:backup:lfs:restore'].invoke unless backup.skipped?('lfs')
+      Rake::Task['gitlab:backup:registry:restore'].invoke unless backup.skipped?('registry')
       Rake::Task['gitlab:shell:setup'].invoke
 
       backup.cleanup
@@ -173,6 +175,25 @@ namespace :gitlab do
       end
     end
 
+    namespace :registry do
+      task create: :environment do
+        $progress.puts "Dumping container registry images ... ".blue
+
+        if ENV["SKIP"] && ENV["SKIP"].include?("registry")
+          $progress.puts "[SKIPPED]".cyan
+        else
+          Backup::Registry.new.dump
+          $progress.puts "done".green
+        end
+      end
+
+      task restore: :environment do
+        $progress.puts "Restoring container registry images ... ".blue
+        Backup::Registry.new.restore
+        $progress.puts "done".green
+      end
+    end
+
     def configure_cron_mode
       if ENV['CRON']
         # We need an object we can say 'puts' and 'print' to; let's use a
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 05fc4c4554f..8aeb013eec6 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -21,7 +21,7 @@ describe 'gitlab:app namespace rake task' do
   end
 
   def reenable_backup_sub_tasks
-    %w{db repo uploads builds artifacts lfs}.each do |subtask|
+    %w{db repo uploads builds artifacts lfs registry}.each do |subtask|
       Rake::Task["gitlab:backup:#{subtask}:create"].reenable
     end
   end
@@ -65,6 +65,7 @@ describe 'gitlab:app namespace rake task' do
         expect(Rake::Task['gitlab:backup:uploads:restore']).to receive(:invoke)
         expect(Rake::Task['gitlab:backup:artifacts:restore']).to receive(:invoke)
         expect(Rake::Task['gitlab:backup:lfs:restore']).to receive(:invoke)
+        expect(Rake::Task['gitlab:backup:registry:restore']).to receive(:invoke)
         expect(Rake::Task['gitlab:shell:setup']).to receive(:invoke)
         expect { run_rake_task('gitlab:backup:restore') }.not_to raise_error
       end
@@ -122,7 +123,7 @@ describe 'gitlab:app namespace rake task' do
 
     it 'should set correct permissions on the tar contents' do
       tar_contents, exit_status = Gitlab::Popen.popen(
-        %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz lfs.tar.gz}
+        %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz lfs.tar.gz registry.tar.gz}
       )
       expect(exit_status).to eq(0)
       expect(tar_contents).to match('db/')
@@ -131,12 +132,13 @@ describe 'gitlab:app namespace rake task' do
       expect(tar_contents).to match('builds.tar.gz')
       expect(tar_contents).to match('artifacts.tar.gz')
       expect(tar_contents).to match('lfs.tar.gz')
-      expect(tar_contents).not_to match(/^.{4,9}[rwx].* (database.sql.gz|uploads.tar.gz|repositories|builds.tar.gz|artifacts.tar.gz)\/$/)
+      expect(tar_contents).to match('registry.tar.gz')
+      expect(tar_contents).not_to match(/^.{4,9}[rwx].* (database.sql.gz|uploads.tar.gz|repositories|builds.tar.gz|artifacts.tar.gz|registry.tar.gz)\/$/)
     end
 
     it 'should delete temp directories' do
       temp_dirs = Dir.glob(
-        File.join(Gitlab.config.backup.path, '{db,repositories,uploads,builds,artifacts,lfs}')
+        File.join(Gitlab.config.backup.path, '{db,repositories,uploads,builds,artifacts,lfs,registry}')
       )
 
       expect(temp_dirs).to be_empty
@@ -172,7 +174,7 @@ describe 'gitlab:app namespace rake task' do
 
     it "does not contain skipped item" do
       tar_contents, _exit_status = Gitlab::Popen.popen(
-        %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz lfs.tar.gz}
+        %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz lfs.tar.gz registry.tar.gz}
       )
 
       expect(tar_contents).to match('db/')
@@ -180,6 +182,7 @@ describe 'gitlab:app namespace rake task' do
       expect(tar_contents).to match('builds.tar.gz')
       expect(tar_contents).to match('artifacts.tar.gz')
       expect(tar_contents).to match('lfs.tar.gz')
+      expect(tar_contents).to match('registry.tar.gz')
       expect(tar_contents).not_to match('repositories/')
     end
 
@@ -195,6 +198,7 @@ describe 'gitlab:app namespace rake task' do
       expect(Rake::Task['gitlab:backup:builds:restore']).to receive :invoke
       expect(Rake::Task['gitlab:backup:artifacts:restore']).to receive :invoke
       expect(Rake::Task['gitlab:backup:lfs:restore']).to receive :invoke
+      expect(Rake::Task['gitlab:backup:registry:restore']).to receive :invoke
       expect(Rake::Task['gitlab:shell:setup']).to receive :invoke
       expect { run_rake_task('gitlab:backup:restore') }.not_to raise_error
     end

From 7aee713420d5533452613480082660f0647f5598 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:29:14 -0500
Subject: [PATCH 0509/1431] Improve design of the feature

---
 app/views/projects/container_registry/_tag.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/container_registry/_tag.html.haml b/app/views/projects/container_registry/_tag.html.haml
index 10eabc6cd6f..4e9f936539b 100644
--- a/app/views/projects/container_registry/_tag.html.haml
+++ b/app/views/projects/container_registry/_tag.html.haml
@@ -4,7 +4,7 @@
     = clipboard_button(clipboard_text: "docker pull #{tag.path}")
   %td
     - if layer = tag.layers.first
-      %span.has-tooltip(title="#{layer.revision}")
+      %span.has-tooltip{ title: "#{layer.revision}" }
         = layer.short_revision
     - else
       \-

From ff5109e19cc6a34c8919da1be4aa6f7b53afdef9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 16 May 2016 17:36:06 -0500
Subject: [PATCH 0510/1431] Fix shortcuts tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/steps/dashboard/shortcuts.rb       | 1 +
 features/steps/project/project_shortcuts.rb | 1 +
 features/steps/shared/shortcuts.rb          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/steps/dashboard/shortcuts.rb b/features/steps/dashboard/shortcuts.rb
index 512dc5f18d9..118d27888df 100644
--- a/features/steps/dashboard/shortcuts.rb
+++ b/features/steps/dashboard/shortcuts.rb
@@ -3,4 +3,5 @@ class Spinach::Features::DashboardShortcuts < Spinach::FeatureSteps
   include SharedPaths
   include SharedProject
   include SharedSidebarActiveTab
+  include SharedShortcuts
 end
diff --git a/features/steps/project/project_shortcuts.rb b/features/steps/project/project_shortcuts.rb
index 49e9c5520bb..8143b01ca40 100644
--- a/features/steps/project/project_shortcuts.rb
+++ b/features/steps/project/project_shortcuts.rb
@@ -3,6 +3,7 @@ class Spinach::Features::ProjectShortcuts < Spinach::FeatureSteps
   include SharedPaths
   include SharedProject
   include SharedProjectTab
+  include SharedShortcuts
 
   step 'I press "g" and "f"' do
     find('body').native.send_key('g')
diff --git a/features/steps/shared/shortcuts.rb b/features/steps/shared/shortcuts.rb
index bbb7afec0ad..a75a8474d26 100644
--- a/features/steps/shared/shortcuts.rb
+++ b/features/steps/shared/shortcuts.rb
@@ -1,4 +1,4 @@
-module SharedActiveTab
+module SharedShortcuts
   include Spinach::DSL
 
   step 'I press "g" and "p"' do

From 154270a3d4f42f1751502112d0e9cd6b5983032b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:37:28 -0500
Subject: [PATCH 0511/1431] Test container related specs

---
 spec/models/project_spec.rb          | 75 ++++++++++++++++++++++++++++
 spec/requests/ci/api/runners_spec.rb |  1 +
 2 files changed, 76 insertions(+)

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index f6e5b132643..6de75af08e4 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -772,4 +772,79 @@ describe Project, models: true do
       expect(project.protected_branch?('foo')).to eq(false)
     end
   end
+
+  describe '#container_registry_repository' do
+    let(:project) { create(:empty_project) }
+
+    subject { project.container_registry_repository }
+
+    it { is_expected.to_not be_nil }
+  end
+
+  describe '#container_registry_repository_url' do
+    let(:project) { create(:empty_project) }
+
+    subject { project.container_registry_repository_url }
+
+    before { allow(Gitlab.config.registry).to receive_messages(registry_settings) }
+
+    context 'for enabled registry' do
+      let(:registry_settings) do
+        {
+          enabled: true,
+          host_port: 'example.com',
+        }
+      end
+
+      it { is_expected.to_not be_nil }
+    end
+
+    context 'for disabled registry' do
+      let(:registry_settings) do
+        {
+          enabled: false
+        }
+      end
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '#has_container_registry_tags?' do
+    let(:project) { create(:empty_project) }
+
+    subject { project.has_container_registry_tags? }
+
+    before { allow(Gitlab.config.registry).to receive_messages(registry_settings) }
+
+    context 'for enabled registry' do
+      let(:registry_settings) do
+        {
+          enabled: true
+        }
+      end
+
+      context 'with tags' do
+        before { stub_container_registry('test', 'test2') }
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when no tags' do
+        before { stub_container_registry }
+
+        it { is_expected.to be_falsey }
+      end
+    end
+
+    context 'for disabled registry' do
+      let(:registry_settings) do
+        {
+          enabled: false
+        }
+      end
+
+      it { is_expected.to be_falsey }
+    end
+  end
 end
diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index 43f9fe89c8e..db8189ffb79 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -7,6 +7,7 @@ describe Ci::API::API do
   let(:registration_token) { 'abcdefg123456' }
 
   before do
+    stub_gitlab_calls
     stub_application_setting(runners_registration_token: registration_token)
   end
 

From 72a71e9d17c75b11e82623cd9edd22ba70c9ba4f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 17:38:58 -0500
Subject: [PATCH 0512/1431] Show container registry item only when container
 registry is enabled

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

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 466929443d6..b6ba66bf3e5 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,7 +152,7 @@ module ProjectsHelper
       nav_tabs << :builds
     end
 
-    if can?(current_user, :read_container_image, project)
+    if project.container_registry_repository_url.present? && can?(current_user, :read_container_image, project)
       nav_tabs << :container_registry
     end
 

From 442083e0fcc2d7ee9a3b202a1ebfdeaa659bb6ad Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 16 May 2016 17:56:39 -0500
Subject: [PATCH 0513/1431] Fix file browsing test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/steps/project/source/browse_files.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index c26d7a15212..2c0498de3b9 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -337,13 +337,15 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I should see buttons for allowed commands' do
-    expect(page).to have_content 'Raw'
-    expect(page).to have_content 'History'
-    expect(page).to have_content 'Permalink'
-    expect(page).not_to have_content 'Edit'
-    expect(page).not_to have_content 'Blame'
-    expect(page).to have_content 'Delete'
-    expect(page).to have_content 'Replace'
+    page.within '.content' do
+      expect(page).to have_content 'Raw'
+      expect(page).to have_content 'History'
+      expect(page).to have_content 'Permalink'
+      expect(page).not_to have_content 'Edit'
+      expect(page).not_to have_content 'Blame'
+      expect(page).to have_content 'Delete'
+      expect(page).to have_content 'Replace'
+    end
   end
 
   step 'I should see a notice about a new fork having been created' do

From 91c4002a0c2f32944ec669cc159c4b1c9176866f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 18:03:55 -0500
Subject: [PATCH 0514/1431] Improve test coverage

---
 lib/container_registry/repository.rb          |  2 +-
 spec/features/container_registry_spec.rb      |  2 +-
 spec/models/namespace_spec.rb                 | 14 +++++++++
 spec/models/project_spec.rb                   | 19 +++++++++---
 .../services/projects/destroy_service_spec.rb | 29 +++++++++++++++++++
 .../projects/transfer_service_spec.rb         | 11 +++++++
 spec/support/stub_gitlab_calls.rb             |  6 +++-
 7 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/lib/container_registry/repository.rb b/lib/container_registry/repository.rb
index b30cb527b60..07cdb78264e 100644
--- a/lib/container_registry/repository.rb
+++ b/lib/container_registry/repository.rb
@@ -39,7 +39,7 @@ module ContainerRegistry
     def delete_tags
       return unless tags
 
-      tags.each(:delete)
+      tags.all?(&:delete)
     end
 
     def mount_blob(blob)
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index be5910e4abb..271ef883d13 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -14,7 +14,7 @@ describe "Container Registry" do
   before do
     login_as(:user)
     project.team << [@user, :developer]
-    stub_container_registry(*tags)
+    stub_container_registry_tags(*tags)
     allow(Gitlab.config.registry).to receive_messages(registry_settings)
     allow(Auth::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token')
   end
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 4074f966299..4e68ac5e63a 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -70,6 +70,20 @@ describe Namespace, models: true do
       allow(@namespace).to receive(:path).and_return(new_path)
       expect(@namespace.move_dir).to be_truthy
     end
+
+    context "when any project has container tags" do
+      before do
+        stub_container_registry_config(enabled: true)
+        stub_container_registry_tags('tag')
+
+        create(:empty_project, namespace: @namespace)
+
+        allow(@namespace).to receive(:path_was).and_return(@namespace.path)
+        allow(@namespace).to receive(:path).and_return('new_path')
+      end
+
+      it { expect { @namespace.move_dir }.to raise_error('Namespace cannot be moved, because at least one project has tags in container registry') }
+    end
   end
 
   describe :rm_dir do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6de75af08e4..262f4122220 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -634,11 +634,11 @@ describe Project, models: true do
       # Project#gitlab_shell returns a new instance of Gitlab::Shell on every
       # call. This makes testing a bit easier.
       allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
+
+      allow(project).to receive(:previous_changes).and_return('path' => ['foo'])
     end
 
     it 'renames a repository' do
-      allow(project).to receive(:previous_changes).and_return('path' => ['foo'])
-
       ns = project.namespace_dir
 
       expect(gitlab_shell).to receive(:mv_repository).
@@ -663,6 +663,17 @@ describe Project, models: true do
 
       project.rename_repo
     end
+
+    context 'container registry with tags' do
+      before do
+        stub_container_registry_config(enabled: true)
+        stub_container_registry_tags('tag')
+      end
+
+      subject { project.rename_repo }
+
+      it { expect{subject}.to raise_error(Exception) }
+    end
   end
 
   describe '#expire_caches_before_rename' do
@@ -825,13 +836,13 @@ describe Project, models: true do
       end
 
       context 'with tags' do
-        before { stub_container_registry('test', 'test2') }
+        before { stub_container_registry_tags('test', 'test2') }
 
         it { is_expected.to be_truthy }
       end
 
       context 'when no tags' do
-        before { stub_container_registry }
+        before { stub_container_registry_tags }
 
         it { is_expected.to be_falsey }
       end
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index a5cb6f382e4..45b78ccf136 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -28,6 +28,35 @@ describe Projects::DestroyService, services: true do
     it { expect(Dir.exist?(remove_path)).to be_truthy }
   end
 
+  context 'container registry' do
+    let(:registry_settings) do
+      {
+        enabled: true
+      }
+    end
+
+    before do
+      allow(Gitlab.config.registry).to receive_messages(registry_settings)
+      stub_container_registry_tags('tag')
+    end
+
+    context 'tags deletion succeeds' do
+      it do
+        expect_any_instance_of(ContainerRegistry::Tag).to receive(:delete).and_return(true)
+
+        destroy_project(project, user, {})
+      end
+    end
+
+    context 'tags deletion fails' do
+      before { expect_any_instance_of(ContainerRegistry::Tag).to receive(:delete).and_return(false) }
+
+      subject { destroy_project(project, user, {}) }
+
+      it { expect{subject}.to raise_error(Projects::DestroyService::DestroyError) }
+    end
+  end
+
   def destroy_project(project, user, params)
     Projects::DestroyService.new(project, user, params).execute
   end
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 06017317339..d5aa115a074 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -26,6 +26,17 @@ describe Projects::TransferService, services: true do
     it { expect(project.namespace).to eq(user.namespace) }
   end
 
+  context 'disallow transfering of project with tags' do
+    before do
+      stub_container_registry_config(enabled: true)
+      stub_container_registry_tags('tag')
+    end
+
+    subject { transfer_project(project, user, group) }
+
+    it { is_expected.to be_falsey }
+  end
+
   context 'namespace -> not allowed namespace' do
     before do
       @result = transfer_project(project, user, group)
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index 2c31cbe3faf..36e234c2e9c 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -25,7 +25,11 @@ module StubGitlabCalls
     allow_any_instance_of(Project).to receive(:builds_enabled?).and_return(false)
   end
 
-  def stub_container_registry(*tags)
+  def stub_container_registry_config(registry_settings)
+    allow(Gitlab.config.registry).to receive_messages(registry_settings)
+  end
+
+  def stub_container_registry_tags(*tags)
     allow_any_instance_of(ContainerRegistry::Client).to receive(:repository_tags).and_return(
       { "tags" => tags }
     )

From 8572a6b2d469009f01533b1003e73952bd2b6850 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 18:07:37 -0500
Subject: [PATCH 0515/1431] Always show documentation how to access images

---
 .../container_registry/index.html.haml        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 6a1e46b14b9..40957993b22 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -4,26 +4,26 @@
 %hr
 
 %ul.content-list
+  .light.prepend-top-default
+    %p
+      A 'container image' is a snapshot of a container.
+      You can host your container images with GitLab.
+      %br
+      To start using container images hosted on GitLab you first need to login:
+      %pre
+        %code
+          docker login #{Gitlab.config.registry.host_port}
+      %br
+      Then you are free to create and upload a container image with build and push commands:
+      %pre
+        docker build -t #{escape_once(@project.container_registry_repository_url)} .
+        %br
+        docker push #{escape_once(@project.container_registry_repository_url)}
+
   - if @tags.blank?
     %li
       .nothing-here-block No images in Container Registry for this project.
 
-    .light.prepend-top-default
-      %p
-        A 'container image' is a snapshot of a container.
-        You can host your container images with GitLab.
-        %br
-        To start using container images hosted on GitLab you first need to login:
-        %pre
-          %code
-            docker login #{Gitlab.config.registry.host_port}
-        %br
-        Then you are free to create and upload a container image with build and push commands:
-        %pre
-          docker build -t #{escape_once(@project.container_registry_repository_url)} .
-          %br
-          docker push #{escape_once(@project.container_registry_repository_url)}
-
   - else
     .table-holder
       %table.table.tags

From 04933fd572f60909e8dbd14bd9366e96dc40806e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 18:07:49 -0500
Subject: [PATCH 0516/1431] Use container registry config stub

---
 spec/features/container_registry_spec.rb         |  7 +------
 spec/models/project_spec.rb                      | 16 +++-------------
 ...ainer_registry_authentication_service_spec.rb |  9 +--------
 spec/services/projects/destroy_service_spec.rb   |  8 +-------
 4 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index 271ef883d13..53b4f027117 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -5,17 +5,12 @@ describe "Container Registry" do
   let(:repository) { project.container_registry_repository }
   let(:tag_name) { 'latest' }
   let(:tags) { [tag_name] }
-  let(:registry_settings) do
-    {
-      enabled: true
-    }
-  end
 
   before do
     login_as(:user)
     project.team << [@user, :developer]
     stub_container_registry_tags(*tags)
-    allow(Gitlab.config.registry).to receive_messages(registry_settings)
+    stub_container_registry_config(enabled: true)
     allow(Auth::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token')
   end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 262f4122220..e434d267896 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -797,7 +797,7 @@ describe Project, models: true do
 
     subject { project.container_registry_repository_url }
 
-    before { allow(Gitlab.config.registry).to receive_messages(registry_settings) }
+    before { stub_container_registry_config(**registry_settings) }
 
     context 'for enabled registry' do
       let(:registry_settings) do
@@ -826,14 +826,8 @@ describe Project, models: true do
 
     subject { project.has_container_registry_tags? }
 
-    before { allow(Gitlab.config.registry).to receive_messages(registry_settings) }
-
     context 'for enabled registry' do
-      let(:registry_settings) do
-        {
-          enabled: true
-        }
-      end
+      before { stub_container_registry_config(enabled: true) }
 
       context 'with tags' do
         before { stub_container_registry_tags('test', 'test2') }
@@ -849,11 +843,7 @@ describe Project, models: true do
     end
 
     context 'for disabled registry' do
-      let(:registry_settings) do
-        {
-          enabled: false
-        }
-      end
+      before { stub_container_registry_config(enabled: false) }
 
       it { is_expected.to be_falsey }
     end
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 143d992b6e4..d90e2982c4f 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -5,19 +5,12 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
   let(:current_user) { nil }
   let(:current_params) { {} }
   let(:rsa_key) { OpenSSL::PKey::RSA.generate(512) }
-  let(:registry_settings) do
-    {
-      enabled: true,
-      issuer: 'rspec',
-      key: nil
-    }
-  end
   let(:payload) { JWT.decode(subject[:token], rsa_key).first }
 
   subject { described_class.new(current_project, current_user, current_params).execute }
 
   before do
-    allow(Gitlab.config.registry).to receive_messages(registry_settings)
+    stub_container_registry_config(enabled: true, issuer: 'rspec', key: nil)
     allow_any_instance_of(JSONWebToken::RSAToken).to receive(:key).and_return(rsa_key)
   end
 
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index 45b78ccf136..29341c5e57e 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -29,14 +29,8 @@ describe Projects::DestroyService, services: true do
   end
 
   context 'container registry' do
-    let(:registry_settings) do
-      {
-        enabled: true
-      }
-    end
-
     before do
-      allow(Gitlab.config.registry).to receive_messages(registry_settings)
+      stub_container_registry_config(enabled: true)
       stub_container_registry_tags('tag')
     end
 

From bfc6799c9367a0bb249e1d4eeece5485e16ec6a5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 18:13:44 -0500
Subject: [PATCH 0517/1431] Fix spinach tests

---
 features/steps/project/commits/commits.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 93c37bf507f..f33f37be951 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -173,7 +173,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I see commit ci info' do
-    expect(page).to have_content "build: pending"
+    expect(page).to have_content "Builds for 1 pipeline pending"
   end
 
   step 'I click status link' do
@@ -181,7 +181,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I see builds list' do
-    expect(page).to have_content "build: pending"
+    expect(page).to have_content "Builds for 1 pipeline pending"
     expect(page).to have_content "1 build"
   end
 

From 256e0e8898d0b4a25e7674d2aaa6df06a1a5fe1f Mon Sep 17 00:00:00 2001
From: Carlos Feliciano <c.feliciano2009@gmail.com>
Date: Mon, 16 May 2016 23:36:42 -0400
Subject: [PATCH 0518/1431] Remove bottom margin for flash message on home page

---
 app/assets/stylesheets/pages/projects.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index c20f04653fc..a3690e40e28 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -7,7 +7,7 @@
 }
 .no-ssh-key-message, .project-limit-message {
   background-color: #f28d35;
-  margin-bottom: 16px;
+  margin-bottom: 0;
 }
 .new_project,
 .edit_project {

From 5194a9d9f62d5e9702f3a60e42079ce7bf81ddd4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 23:29:11 -0500
Subject: [PATCH 0519/1431] Improve the pipeline box

---
 .../projects/commit/_commit_box.html.haml     | 12 +-----
 app/views/projects/pipelines/_info.html.haml  | 37 +++++++++++++++++++
 app/views/projects/pipelines/show.html.haml   |  2 +-
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 app/views/projects/pipelines/_info.html.haml

diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 611272b8a74..028564c9305 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -46,17 +46,7 @@
   %span.commit-info.branches
     %i.fa.fa-spinner.fa-spin
 
-- if defined?(pipeline) && pipeline
-  .commit-info-row
-    Pipeline
-    = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline), class: "ci-status-link ci-status-icon-#{pipeline.status}" do
-      = ci_icon_for_status(pipeline.status)
-      = ci_label_for_status(pipeline.status)
-    - if pipeline.duration
-      in
-      = time_interval_in_words 3600
-
-- elsif @commit.status
+- if @commit.status
   .commit-info-row
     Builds for
     = pluralize(@commit.ci_commits.count, 'pipeline')
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
new file mode 100644
index 00000000000..8289aefcde7
--- /dev/null
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -0,0 +1,37 @@
+%p
+.commit-info-row
+  Pipeline
+  = link_to "##{@pipeline.id}", namespace_project_pipeline_path(@project.namespace, @project, @pipeline.id), class: "monospace"
+  with
+  = pluralize @pipeline.statuses.count(:id), "build"
+  - if @pipeline.ref
+    for
+    = link_to @pipeline.ref, namespace_project_commits_path(@project.namespace, @project, @pipeline.ref), class: "monospace"
+  - if @pipeline.duration
+    in
+    = time_interval_in_words @pipeline.duration
+
+  .pull-right
+    = link_to namespace_project_pipeline_path(@project.namespace, @project, @pipeline), class: "ci-status ci-#{@pipeline.status}" do
+      = ci_icon_for_status(@pipeline.status)
+      = ci_label_for_status(@pipeline.status)
+
+- if @commit
+  .commit-info-row
+    %span.light Authored by
+    %strong
+      = commit_author_link(@commit, avatar: true, size: 24)
+    #{time_ago_with_tooltip(@commit.authored_date)}
+
+.commit-info-row
+  %span.light Commit
+  = link_to @pipeline.sha, namespace_project_commit_path(@project.namespace, @project, @pipeline.sha), class: "monospace"
+  = clipboard_button(clipboard_text: @pipeline.sha)
+
+- if @commit
+  .commit-box.content-block
+    %h3.commit-title
+      = markdown escape_once(@commit.title), pipeline: :single_line
+    - if @commit.description.present?
+      %pre.commit-description
+        = preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
index 8a2e14d8d87..b082d4d5da8 100644
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@@ -3,7 +3,7 @@
 = render "header_title"
 .prepend-top-default
   - if @commit
-    = render "projects/commit/commit_box", pipeline: @pipeline
+    = render "projects/pipelines/info"
   %div.block-connector
 
 = render "projects/commit/ci_commit", ci_commit: @pipeline

From 0a6c3494b0326de4cdc35d6369f48810d8403f5a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 23:32:48 -0500
Subject: [PATCH 0520/1431] Fix rubocop offenses

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

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 796b8178c5e..124d63ce3ac 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -254,7 +254,7 @@ Settings.registry['api_url']       ||= "http://localhost:5000/"
 Settings.registry['key']           ||= nil
 Settings.registry['issuer']        ||= nil
 Settings.registry['host_port']     ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':')
-Settings.registry['path']          = File.expand_path(Settings.artifacts['path'] || File.join(Settings.shared['path'], "registry"), Rails.root)
+Settings.registry['path']            = File.expand_path(Settings.registry['path'] || File.join(Settings.shared['path'], 'registry'), Rails.root)
 
 #
 # Git LFS

From 379dc6fbccc84858a392226111a0abadb54f0c04 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 23:34:42 -0500
Subject: [PATCH 0521/1431] Wrap text

---
 app/assets/stylesheets/pages/pipelines.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 7d90a4bebc5..546176b65e4 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,5 +1,4 @@
 .pipeline-stage {
-  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }

From ac6992ba682de08b79e5ddde08dbf566827e2f07 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 16 May 2016 23:40:40 -0500
Subject: [PATCH 0522/1431] Fix specs

---
 spec/models/project_spec.rb                              | 2 ++
 .../container_registry_authentication_service_spec.rb    | 9 +++++++--
 spec/support/stub_gitlab_calls.rb                        | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index e434d267896..60e1ec43f2b 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -787,6 +787,8 @@ describe Project, models: true do
   describe '#container_registry_repository' do
     let(:project) { create(:empty_project) }
 
+    before { stub_container_registry_config(enabled: true) }
+
     subject { project.container_registry_repository }
 
     it { is_expected.to_not be_nil }
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index d90e2982c4f..6c9f56a4fba 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -50,6 +50,11 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     end
   end
 
+  shared_examples 'an unauthorized' do
+    it { is_expected.to include(http_status: 401) }
+    it { is_expected.to_not include(:token) }
+  end
+
   shared_examples 'a forbidden' do
     it { is_expected.to include(http_status: 403) }
     it { is_expected.to_not include(:token) }
@@ -116,7 +121,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { offline_token: true }
       end
 
-      it_behaves_like 'a forbidden'
+      it_behaves_like 'an unauthorized'
     end
 
     context 'allow to pull and push images' do
@@ -179,7 +184,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { offline_token: true }
       end
 
-      it_behaves_like 'a forbidden'
+      it_behaves_like 'an unauthorized'
     end
 
     context 'for invalid scope' do
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index 36e234c2e9c..f73416a3d0f 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -27,6 +27,7 @@ module StubGitlabCalls
 
   def stub_container_registry_config(registry_settings)
     allow(Gitlab.config.registry).to receive_messages(registry_settings)
+    allow(Auth::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token')
   end
 
   def stub_container_registry_tags(*tags)

From 5ba52693830bfa2d5c70a343b8c2ceace0f20ccd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 17 May 2016 00:35:16 -0500
Subject: [PATCH 0523/1431] Fix dashboard shortcuts

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/dispatcher.js.coffee               | 2 +-
 .../javascripts/shortcuts_dashboard_navigation.js.coffee  | 8 ++++----
 app/views/layouts/nav/_dashboard.html.haml                | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index f91aa3c5ad7..12c143fdf76 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -119,7 +119,7 @@ class Dispatcher
             new UsersSelect()
           when 'projects'
             new NamespaceSelect()
-      when 'dashboard'
+      when 'dashboard', 'root'
         shortcut_handler = new ShortcutsDashboardNavigation()
       when 'profiles'
         new Profile()
diff --git a/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee b/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
index 4a05bdccdb3..cca2b8a1fcc 100644
--- a/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
+++ b/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
@@ -3,10 +3,10 @@
 class @ShortcutsDashboardNavigation extends Shortcuts
  constructor: ->
    super()
-   Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-activity'))
-   Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-issues'))
-   Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-merge_requests'))
-   Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-projects'))
+   Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-activity'))
+   Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-issues'))
+   Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-merge_requests'))
+   Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-projects'))
 
  @findAndFollowLink: (selector) ->
    link = $(selector).attr('href')
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index c82c2f1bfaf..43532b0c155 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,6 +1,6 @@
 %ul.nav.nav-sidebar
   = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
-    = link_to dashboard_projects_path, title: 'Projects' do
+    = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
       = icon('bookmark fw')
       %span
         Projects
@@ -11,7 +11,7 @@
         Todos
         %span.count.todos-pending-count= number_with_delimiter(todos_pending_count)
   = nav_link(path: 'dashboard#activity') do
-    = link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity' do
+    = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
       = icon('dashboard fw')
       %span
         Activity
@@ -26,13 +26,13 @@
       %span
         Milestones
   = nav_link(path: 'dashboard#issues') do
-    = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues' do
+    = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = icon('exclamation-circle fw')
       %span
         Issues
         %span.count= number_with_delimiter(current_user.assigned_issues.opened.count)
   = nav_link(path: 'dashboard#merge_requests') do
-    = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+    = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = icon('tasks fw')
       %span
         Merge Requests

From 6b834f2cbcfc26fe3123b6682ed7e20618e31d1b Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@mcgivern.me.uk>
Date: Tue, 8 Mar 2016 18:22:50 +0000
Subject: [PATCH 0524/1431] Create a todo on failing MR build

When a build fails for a commit, create a todo for the author of the
merge request that commit is the HEAD of. If the commit isn't the HEAD
commit of any MR, don't do anything. If there already is a todo for that
user and MR, don't do anything.

Current limitations:
- This isn't configurable by project.
- The author of a merge request might not be the person who pushed the
  breaking commit.
---
 app/finders/todos_finder.rb                   |  2 +-
 app/helpers/todos_helper.rb                   |  8 +-
 app/models/ci/build.rb                        |  1 +
 app/models/commit_status.rb                   |  4 +
 app/models/todo.rb                            |  9 ++-
 .../add_todo_when_build_fails_service.rb      | 17 ++++
 app/services/merge_requests/base_service.rb   | 25 ++++++
 .../merge_when_build_succeeds_service.rb      | 23 +-----
 .../merge_requests/refresh_service.rb         |  7 ++
 app/services/todo_service.rb                  | 30 +++++++
 app/views/dashboard/todos/_todo.html.haml     | 12 +--
 spec/factories/todos.rb                       |  4 +
 .../add_todo_when_build_fails_service_spec.rb | 81 +++++++++++++++++++
 .../merge_requests/refresh_service_spec.rb    | 28 +++++++
 spec/services/todo_service_spec.rb            | 19 +++++
 15 files changed, 237 insertions(+), 33 deletions(-)
 create mode 100644 app/services/merge_requests/add_todo_when_build_fails_service.rb
 create mode 100644 spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 3ba27c40504..4bd46a76087 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -36,7 +36,7 @@ class TodosFinder
   private
 
   def action_id?
-    action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED].include?(action_id.to_i)
+    action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED].include?(action_id.to_i)
   end
 
   def action_id
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 2f066682180..81b9b5d7052 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -11,6 +11,7 @@ module TodosHelper
     case todo.action
     when Todo::ASSIGNED then 'assigned you'
     when Todo::MENTIONED then 'mentioned you on'
+    when Todo::BUILD_FAILED then 'The build failed for your'
     end
   end
 
@@ -28,8 +29,11 @@ module TodosHelper
       namespace_project_commit_path(todo.project.namespace.becomes(Namespace), todo.project,
                                     todo.target, anchor: anchor)
     else
-      polymorphic_path([todo.project.namespace.becomes(Namespace),
-                        todo.project, todo.target], anchor: anchor)
+      path = [todo.project.namespace.becomes(Namespace), todo.project, todo.target]
+
+      path.unshift(:builds) if todo.build_failed?
+
+      polymorphic_path(path, anchor: anchor)
     end
   end
 
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 92327bdb08d..50190101f2b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -53,6 +53,7 @@ module Ci
         new_build.stage_idx = build.stage_idx
         new_build.trigger_request = build.trigger_request
         new_build.save
+        MergeRequests::AddTodoWhenBuildFailsService.new(build.project, nil).close(new_build)
         new_build
       end
     end
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index cacbc13b391..8181416f7d5 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -45,6 +45,10 @@ class CommitStatus < ActiveRecord::Base
     after_transition [:pending, :running] => :success do |commit_status|
       MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.commit.project, nil).trigger(commit_status)
     end
+
+    after_transition any => :failed do |commit_status|
+      MergeRequests::AddTodoWhenBuildFailsService.new(commit_status.commit.project, nil).execute(commit_status)
+    end
   end
 
   delegate :sha, :short_sha, to: :commit
diff --git a/app/models/todo.rb b/app/models/todo.rb
index f8b59fe4126..3a091373329 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -1,6 +1,7 @@
 class Todo < ActiveRecord::Base
-  ASSIGNED  = 1
-  MENTIONED = 2
+  ASSIGNED     = 1
+  MENTIONED    = 2
+  BUILD_FAILED = 3
 
   belongs_to :author, class_name: "User"
   belongs_to :note
@@ -28,6 +29,10 @@ class Todo < ActiveRecord::Base
     state :done
   end
 
+  def build_failed?
+    action == BUILD_FAILED
+  end
+
   def body
     if note.present?
       note.note
diff --git a/app/services/merge_requests/add_todo_when_build_fails_service.rb b/app/services/merge_requests/add_todo_when_build_fails_service.rb
new file mode 100644
index 00000000000..566049525cb
--- /dev/null
+++ b/app/services/merge_requests/add_todo_when_build_fails_service.rb
@@ -0,0 +1,17 @@
+module MergeRequests
+  class AddTodoWhenBuildFailsService < MergeRequests::BaseService
+    # Adds a todo to the parent merge_request when a CI build fails
+    def execute(commit_status)
+      each_merge_request(commit_status) do |merge_request|
+        todo_service.merge_request_build_failed(merge_request)
+      end
+    end
+
+    # Closes any pending build failed todos for the parent MRs when a build is retried
+    def close(commit_status)
+      each_merge_request(commit_status) do |merge_request|
+        todo_service.merge_request_build_retried(merge_request)
+      end
+    end
+  end
+end
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index e6837a18696..9d7fca6882d 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -38,5 +38,30 @@ module MergeRequests
     def filter_params
       super(:merge_request)
     end
+
+    def merge_request_from(commit_status)
+      branches = commit_status.ref
+
+      # This is for ref-less builds
+      branches ||= @project.repository.branch_names_contains(commit_status.sha)
+
+      return [] if branches.blank?
+
+      merge_requests = @project.origin_merge_requests.opened.where(source_branch: branches).to_a
+      merge_requests += @project.fork_merge_requests.opened.where(source_branch: branches).to_a
+
+      merge_requests.uniq.select(&:source_project)
+    end
+
+    def each_merge_request(commit_status)
+      merge_request_from(commit_status).each do |merge_request|
+        ci_commit = merge_request.ci_commit
+
+        next unless ci_commit
+        next unless ci_commit.sha == commit_status.sha
+
+        yield merge_request, ci_commit
+      end
+    end
   end
 end
diff --git a/app/services/merge_requests/merge_when_build_succeeds_service.rb b/app/services/merge_requests/merge_when_build_succeeds_service.rb
index d6af12f9739..8fd6a4ea1f6 100644
--- a/app/services/merge_requests/merge_when_build_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb
@@ -20,15 +20,9 @@ module MergeRequests
 
     # Triggers the automatic merge of merge_request once the build succeeds
     def trigger(commit_status)
-      merge_requests = merge_request_from(commit_status)
-
-      merge_requests.each do |merge_request|
+      each_merge_request(commit_status) do |merge_request, ci_commit|
         next unless merge_request.merge_when_build_succeeds?
         next unless merge_request.mergeable?
-
-        ci_commit = merge_request.ci_commit
-        next unless ci_commit
-        next unless ci_commit.sha == commit_status.sha
         next unless ci_commit.success?
 
         MergeWorker.perform_async(merge_request.id, merge_request.merge_user_id, merge_request.merge_params)
@@ -47,20 +41,5 @@ module MergeRequests
       end
     end
 
-    private
-
-    def merge_request_from(commit_status)
-      branches = commit_status.ref
-
-      # This is for ref-less builds
-      branches ||= @project.repository.branch_names_contains(commit_status.sha)
-
-      return [] if branches.blank?
-
-      merge_requests = @project.origin_merge_requests.opened.where(source_branch: branches).to_a
-      merge_requests += @project.fork_merge_requests.opened.where(source_branch: branches).to_a
-
-      merge_requests.uniq.select(&:source_project)
-    end
   end
 end
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index 8b3d56c2b4c..fe0579744b4 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -12,6 +12,7 @@ module MergeRequests
       close_merge_requests
       reload_merge_requests
       reset_merge_when_build_succeeds
+      mark_pending_todos_done
 
       # Leave a system note if a branch was deleted/added
       if branch_added? || branch_removed?
@@ -80,6 +81,12 @@ module MergeRequests
       merge_requests_for_source_branch.each(&:reset_merge_when_build_succeeds)
     end
 
+    def mark_pending_todos_done
+      merge_requests_for_source_branch.each do |merge_request|
+        todo_service.merge_request_push(merge_request, @current_user)
+      end
+    end
+
     def find_new_commits
       if branch_added?
         @commits = []
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 42c5bca90fd..4bf4e144727 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -80,6 +80,30 @@ class TodoService
     mark_pending_todos_as_done(merge_request, current_user)
   end
 
+  # When a build fails on the HEAD of a merge request we should:
+  #
+  #  * create a todo for that user to fix it
+  #
+  def merge_request_build_failed(merge_request)
+    create_build_failed_todo(merge_request)
+  end
+
+  # When a new commit is pushed to a merge request we should:
+  #
+  #  * mark all pending todos related to the merge request for that user as done
+  #
+  def merge_request_push(merge_request, current_user)
+    mark_pending_todos_as_done(merge_request, current_user)
+  end
+
+  # When a build is retried to a merge request we should:
+  #
+  #  * mark all pending todos related to the merge request for the author as done
+  #
+  def merge_request_build_retried(merge_request)
+    mark_pending_todos_as_done(merge_request, merge_request.author)
+  end
+
   # When create a note we should:
   #
   #  * mark all pending todos related to the noteable for the note author as done
@@ -145,6 +169,12 @@ class TodoService
     create_todos(mentioned_users, attributes)
   end
 
+  def create_build_failed_todo(merge_request)
+    author = merge_request.author
+    attributes = attributes_for_todo(merge_request.project, merge_request, author, Todo::BUILD_FAILED)
+    create_todos(author, attributes)
+  end
+
   def attributes_for_target(target)
     attributes = {
       project_id: target.project.id,
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index aa0aff86d4d..539f1dc6036 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -1,13 +1,13 @@
 %li{class: "todo todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo), data:{url: todo_target_path(todo)} }
   .todo-item.todo-block
     = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
-
     .todo-title.title
-      %span.author-name
-        - if todo.author
-          = link_to_author(todo)
-        - else
-          (removed)
+      - unless todo.build_failed?
+        %span.author-name
+          - if todo.author
+            = link_to_author(todo)
+          - else
+            (removed)
       %span.todo-label
         = todo_action_name(todo)
         - if todo.target
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb
index e3681ae93a5..f426e27afed 100644
--- a/spec/factories/todos.rb
+++ b/spec/factories/todos.rb
@@ -18,5 +18,9 @@ FactoryGirl.define do
       commit_id RepoHelpers.sample_commit.id
       target_type "Commit"
     end
+
+    trait :build_failed do
+      action { Todo::BUILD_FAILED }
+    end
   end
 end
diff --git a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
new file mode 100644
index 00000000000..f70716c9d19
--- /dev/null
+++ b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+# Write specs in this file.
+describe MergeRequests::AddTodoWhenBuildFailsService do
+  let(:user) { create(:user) }
+  let(:merge_request) { create(:merge_request) }
+  let(:project) { create(:project) }
+  let(:sha) { '1234567890abcdef1234567890abcdef12345678' }
+  let(:ci_commit) { create(:ci_commit_with_one_job, ref: merge_request.source_branch, project: project, sha: sha) }
+  let(:service) { MergeRequests::AddTodoWhenBuildFailsService.new(project, user, commit_message: 'Awesome message') }
+  let(:todo_service) { TodoService.new }
+
+  let(:merge_request) do
+    create(:merge_request, merge_user: user, source_branch: 'master',
+                           target_branch: 'feature', source_project: project, target_project: project,
+                           state: 'opened')
+  end
+
+  before do
+    allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
+    allow(service).to receive(:todo_service).and_return(todo_service)
+  end
+
+  describe '#execute' do
+    context 'commit status with ref' do
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, commit: ci_commit) }
+
+      it 'notifies the todo service' do
+        expect(todo_service).to receive(:merge_request_build_failed).with(merge_request)
+        service.execute(commit_status)
+      end
+    end
+
+    context 'commit status with non-HEAD ref' do
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch) }
+
+      it 'does not notify the todo service' do
+        expect(todo_service).not_to receive(:merge_request_build_failed)
+        service.execute(commit_status)
+      end
+    end
+
+    context 'commit status without ref' do
+      let(:commit_status) { create(:generic_commit_status) }
+
+      it 'does not notify the todo service' do
+        expect(todo_service).not_to receive(:merge_request_build_failed)
+        service.execute(commit_status)
+      end
+    end
+  end
+
+  describe '#close' do
+    context 'commit status with ref' do
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, commit: ci_commit) }
+
+      it 'notifies the todo service' do
+        expect(todo_service).to receive(:merge_request_build_retried).with(merge_request)
+        service.close(commit_status)
+      end
+    end
+
+    context 'commit status with non-HEAD ref' do
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch) }
+
+      it 'does not notify the todo service' do
+        expect(todo_service).not_to receive(:merge_request_build_retried)
+        service.close(commit_status)
+      end
+    end
+
+    context 'commit status without ref' do
+      let(:commit_status) { create(:generic_commit_status) }
+
+      it 'does not notify the todo service' do
+        expect(todo_service).not_to receive(:merge_request_build_retried)
+        service.close(commit_status)
+      end
+    end
+  end
+end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index fea8182bd30..31b93850c7c 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -27,6 +27,20 @@ describe MergeRequests::RefreshService, services: true do
                                    target_branch: 'feature',
                                    target_project: @project)
 
+      @build_failed_todo = create(:todo,
+                                  :build_failed,
+                                  user: @user,
+                                  project: @project,
+                                  target: @merge_request,
+                                  author: @user)
+
+      @fork_build_failed_todo = create(:todo,
+                                       :build_failed,
+                                       user: @user,
+                                       project: @project,
+                                       target: @merge_request,
+                                       author: @user)
+
       @commits = @merge_request.commits
 
       @oldrev = @commits.last.id
@@ -51,6 +65,8 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request.merge_when_build_succeeds).to be_falsey}
       it { expect(@fork_merge_request).to be_open }
       it { expect(@fork_merge_request.notes).to be_empty }
+      it { expect(@build_failed_todo).to be_done }
+      it { expect(@fork_build_failed_todo).to be_done }
     end
 
     context 'push to origin repo target branch' do
@@ -63,6 +79,8 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request).to be_merged }
       it { expect(@fork_merge_request).to be_merged }
       it { expect(@fork_merge_request.notes.last.note).to include('changed to merged') }
+      it { expect(@build_failed_todo).to be_pending }
+      it { expect(@fork_build_failed_todo).to be_pending }
     end
 
     context 'manual merge of source branch' do
@@ -82,6 +100,8 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request.diffs.size).to be > 0 }
       it { expect(@fork_merge_request).to be_merged }
       it { expect(@fork_merge_request.notes.last.note).to include('changed to merged') }
+      it { expect(@build_failed_todo).to be_pending }
+      it { expect(@fork_build_failed_todo).to be_pending }
     end
 
     context 'push to fork repo source branch' do
@@ -101,6 +121,8 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request).to be_open }
       it { expect(@fork_merge_request.notes.last.note).to include('Added 4 commits') }
       it { expect(@fork_merge_request).to be_open }
+      it { expect(@build_failed_todo).to be_pending }
+      it { expect(@fork_build_failed_todo).to be_pending }
     end
 
     context 'push to fork repo target branch' do
@@ -113,6 +135,8 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request).to be_open }
       it { expect(@fork_merge_request.notes).to be_empty }
       it { expect(@fork_merge_request).to be_open }
+      it { expect(@build_failed_todo).to be_pending }
+      it { expect(@fork_build_failed_todo).to be_pending }
     end
 
     context 'push to origin repo target branch after fork project was removed' do
@@ -126,6 +150,8 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request).to be_merged }
       it { expect(@fork_merge_request).to be_open }
       it { expect(@fork_merge_request.notes).to be_empty }
+      it { expect(@build_failed_todo).to be_pending }
+      it { expect(@fork_build_failed_todo).to be_pending }
     end
 
     context 'push new branch that exists in a merge request' do
@@ -153,6 +179,8 @@ describe MergeRequests::RefreshService, services: true do
     def reload_mrs
       @merge_request.reload
       @fork_merge_request.reload
+      @build_failed_todo.reload
+      @fork_build_failed_todo.reload
     end
   end
 end
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index a075496ee63..42147736532 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -305,6 +305,25 @@ describe TodoService, services: true do
         expect(second_todo.reload).to be_done
       end
     end
+
+    describe '#merge_request_build_failed' do
+      it 'creates a pending todo for the merge request author' do
+        service.merge_request_build_failed(mr_unassigned)
+
+        should_create_todo(user: author, target: mr_unassigned, action: Todo::BUILD_FAILED)
+      end
+    end
+
+    describe '#merge_request_push' do
+      it 'marks related pending todos to the target for the user as done' do
+        first_todo = create(:todo, :build_failed, user: author, project: project, target: mr_assigned, author: john_doe)
+        second_todo = create(:todo, :build_failed, user: john_doe, project: project, target: mr_assigned, author: john_doe)
+        service.merge_request_push(mr_assigned, author)
+
+        expect(first_todo.reload).to be_done
+        expect(second_todo.reload).not_to be_done
+      end
+    end
   end
 
   def should_create_todo(attributes = {})

From 97a7bdd251701494fad4629bebe5a0393aef8df9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 17 May 2016 10:38:01 +0100
Subject: [PATCH 0525/1431] Updated services UI

---
 app/views/projects/services/_form.html.haml | 32 ++++++-------
 app/views/projects/services/index.html.haml | 53 ++++++++++++---------
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 1b70880043a..1f13ea28b4e 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -1,18 +1,16 @@
-%h3.page-title
-  = @service.title
-  = boolean_to_icon @service.activated?
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
+      = @service.title
+      = boolean_to_icon @service.activated?
 
-%p= @service.description
-
-%hr
-
-= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
-  = render 'shared/service_settings', form: form
-
-  .form-actions
-    = form.submit 'Save changes', class: 'btn btn-save'
-    &nbsp;
-    - if @service.valid? && @service.activated?
-      - disabled = @service.can_test? ? '':'disabled'
-      = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: "btn #{disabled}"
-    = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
+    %p= @service.description
+  .col-lg-9
+    = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
+      = render 'shared/service_settings', form: form
+      = form.submit 'Save changes', class: 'btn btn-save'
+      &nbsp;
+      - if @service.valid? && @service.activated?
+        - disabled = @service.can_test? ? '':'disabled'
+        = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: "btn #{disabled}"
+      = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index c1356f6db02..7b241136f69 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -1,24 +1,33 @@
 - page_title "Services"
-%h3.page-title Project services
-%p.light Project services allow you to integrate GitLab with other applications
 
-.table-holder
-  %table.table
-    %thead
-      %tr
-        %th
-        %th Service
-        %th Description
-        %th Last edit
-    - @services.sort_by(&:title).each do |service|
-      %tr
-        %td
-          = boolean_to_icon service.activated?
-        %td
-          = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
-            %strong= service.title
-        %td
-          = service.description
-        %td.light
-          = time_ago_in_words service.updated_at
-          ago
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
+      Project services
+    %p Project services allow you to integrate GitLab with other applications
+  .col-lg-9
+    .table-responsive
+      %table.table
+        %colgroup
+          %col
+          %col
+          %col
+          %col{ width: "120" }
+        %thead
+          %tr
+            %th
+            %th Service
+            %th Description
+            %th Last edit
+        - @services.sort_by(&:title).each do |service|
+          %tr
+            %td
+              = boolean_to_icon service.activated?
+            %td
+              = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
+                %strong= service.title
+            %td
+              = service.description
+            %td.light
+              = time_ago_in_words service.updated_at
+              ago

From a9977f2b7a39d57d0633714616b4653aca103993 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 12 May 2016 16:06:14 +0100
Subject: [PATCH 0526/1431] Syntax-highlight diffs in push emails

Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
---
 .../mailers/repository_push_email.scss        | 43 ++++++++++++++
 app/helpers/emails_helper.rb                  |  6 --
 app/mailers/emails/projects.rb                |  3 +-
 app/mailers/notify.rb                         |  2 +
 app/views/layouts/notify.html.haml            |  1 +
 .../notify/repository_push_email.html.haml    | 59 ++++++++++++-------
 .../notify/repository_push_email.text.haml    | 38 ++++++------
 app/views/projects/diffs/_file.html.haml      |  2 +-
 app/workers/emails_on_push_worker.rb          | 18 +++---
 config/application.rb                         |  1 +
 lib/gitlab/email/message/repository_push.rb   |  7 ++-
 .../email/message/repository_push_spec.rb     |  2 +-
 spec/mailers/notify_spec.rb                   | 16 ++---
 13 files changed, 135 insertions(+), 63 deletions(-)
 create mode 100644 app/assets/stylesheets/mailers/repository_push_email.scss

diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss
new file mode 100644
index 00000000000..001994db97b
--- /dev/null
+++ b/app/assets/stylesheets/mailers/repository_push_email.scss
@@ -0,0 +1,43 @@
+@import "framework/variables";
+
+table.code {
+  width: 100%;
+  font-family: monospace;
+  border: none;
+  border-collapse: separate;
+  margin: 0;
+  padding: 0;
+  -premailer-cellpadding: 0;
+  -premailer-cellspacing: 0;
+  -premailer-width: 100%;
+
+  td {
+    line-height: $code_line_height;
+    font-family: monospace;
+    font-size: $code_font_size;
+  }
+
+  td.diff-line-num {
+    margin: 0;
+    padding: 0;
+    border: none;
+    background: $background-color;
+    color: rgba(0, 0, 0, 0.3);
+    padding: 0 5px;
+    border-right: 1px solid $border-color;
+    text-align: right;
+    min-width: 35px;
+    max-width: 50px;
+    width: 35px;
+  }
+
+  td.line_content {
+    display: block;
+    margin: 0;
+    padding: 0 0.5em;
+    border: none;
+    white-space: pre;
+  }
+}
+
+@import "highlight/white";
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index 41b5bd7be90..8466d0aa0ba 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -32,12 +32,6 @@ module EmailsHelper
     nil
   end
 
-  def color_email_diff(diffcontent)
-    formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', inline_theme: 'github')
-    lexer = Rouge::Lexers::Diff
-    raw formatter.format(lexer.lex(diffcontent))
-  end
-
   def password_reset_token_valid_time
     valid_hours = Devise.reset_password_within / 60 / 60
     if valid_hours >= 24
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 5489283432b..fdf1e9f5afc 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -65,7 +65,8 @@ module Emails
 
       # used in notify layout
       @target_url = @message.target_url
-      @project = Project.find project_id
+      @project = Project.find(project_id)
+      @diff_notes_disabled = true
 
       add_project_headers
       headers['X-GitLab-Author'] = @message.author_username
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 826e5f96fa1..1c663bdd521 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -10,6 +10,8 @@ class Notify < BaseMailer
   include Emails::Builds
 
   add_template_helper MergeRequestsHelper
+  add_template_helper DiffHelper
+  add_template_helper BlobHelper
   add_template_helper EmailsHelper
 
   def test_email(recipient_email, subject, body)
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 2997f59d946..dde2e2889dc 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -4,6 +4,7 @@
     %title
       GitLab
     = stylesheet_link_tag 'notify'
+    = yield :head
   %body
     %div.content
       = yield
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index f2e405b14fd..f1532371b2e 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -1,3 +1,6 @@
+= content_for :head do
+  = stylesheet_link_tag 'mailers/repository_push_email'
+
 %h3
   #{@message.author_name} #{@message.action_name} #{@message.ref_type} #{@message.ref_name}
   at #{link_to(@message.project_name_with_namespace, namespace_project_url(@message.project_namespace, @message.project))}
@@ -43,26 +46,38 @@
             = diff.new_path
 
   - unless @message.disable_diffs?
-    %h4 Changes:
-    - @message.diffs.each_with_index do |diff, i|
-      %li{id: "diff-#{i}"}
-        %a{href: @message.target_url + "#diff-#{i}"}
-          - if diff.deleted_file
-            %strong
-              = diff.old_path
-            deleted
-          - elsif diff.renamed_file
-            %strong
-              = diff.old_path
-            &rarr;
-            %strong
-              = diff.new_path
-          - else
-            %strong
-              = diff.new_path
-        %hr
-        = color_email_diff(diff.diff)
-        %br
+    - diff_files = @message.diffs
 
-  - if @message.compare_timeout
-    %h5 Huge diff. To prevent performance issues changes are hidden
+    - if @message.compare_timeout
+      %h5 The diff was not included because it is too large.
+    - else
+      %h4 Changes:
+      - diff_files.each_with_index do |diff_file, i|
+        %li{id: "diff-#{i}"}
+          %a{href: @message.target_url + "#diff-#{i}"}<
+            - if diff_file.deleted_file
+              %strong<
+                = diff_file.old_path
+              deleted
+            - elsif diff_file.renamed_file
+              %strong<
+                = diff_file.old_path
+              &rarr;
+              %strong<
+                = diff_file.new_path
+            - else
+              %strong<
+                = diff_file.new_path
+          - if diff_file.too_large?
+            The diff for this file was not included because it is too large.
+          - else
+            %hr
+            - diff_commit = diff_file.deleted_file ? @message.diff_refs.first : @message.diff_refs.last
+            - blob = @message.project.repository.blob_for_diff(diff_commit, diff_file)
+            - if blob && blob.respond_to?(:text?) && blob_text_viewable?(blob)
+              %table.code.white
+                - diff_file.highlighted_diff_lines.each do |line|
+                  = render "projects/diffs/line", {line: line, diff_file: diff_file, line_code: nil, plain: true}
+            - else
+              No preview for this file type
+          %br
diff --git a/app/views/notify/repository_push_email.text.haml b/app/views/notify/repository_push_email.text.haml
index 53869e36b28..5ac23aa3997 100644
--- a/app/views/notify/repository_push_email.text.haml
+++ b/app/views/notify/repository_push_email.text.haml
@@ -25,24 +25,28 @@
     - else
       \- #{diff.new_path}
   - unless @message.disable_diffs?
-    \
-    \
-    Changes:
-    - @message.diffs.each do |diff|
+    - if @message.compare_timeout
       \
-      \=====================================
-      - if diff.deleted_file
-        #{diff.old_path} deleted
-      - elsif diff.renamed_file
-        #{diff.old_path} → #{diff.new_path}
-      - else
-        = diff.new_path
-      \=====================================
-      != diff.diff
-  - if @message.compare_timeout
-    \
-    \
-    Huge diff. To prevent performance issues it was hidden
+      \
+      The diff was not included because it is too large.
+    - else
+      \
+      \
+      Changes:
+      - @message.diffs.each do |diff_file|
+        \
+        \=====================================
+        - if diff_file.deleted_file
+          #{diff_file.old_path} deleted
+        - elsif diff_file.renamed_file
+          #{diff_file.old_path} → #{diff_file.new_path}
+        - else
+          = diff_file.new_path
+        \=====================================
+        - if diff_file.too_large?
+          The diff for this file was not included because it is too large.
+        - else
+          != diff_file.diff.diff
   - if @message.target_url
     \
     \
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 0f04fc5d33c..f10b5094eaf 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -41,7 +41,7 @@
 
   .diff-content.diff-wrap-lines
     - # Skip all non non-supported blobs
-    - return unless blob.respond_to?('text?')
+    - return unless blob.respond_to?(:text?)
     - if diff_file.too_large?
       .nothing-here-block This diff could not be displayed because it is too large.
     - elsif blob_text_viewable?(blob) && !project.repository.diffable?(blob)
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index 6ebcba5f39b..fa959fc56e3 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -27,15 +27,18 @@ class EmailsOnPushWorker
         :push
       end
 
+    diff_refs = nil
     compare = nil
     reverse_compare = false
     if action == :push
       compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha)
+      diff_refs = [project.merge_base_commit(before_sha, after_sha), project.commit(after_sha)]
 
       return false if compare.same
 
       if compare.commits.empty?
         compare = Gitlab::Git::Compare.new(project.repository.raw_repository, after_sha, before_sha)
+        diff_refs = [project.merge_base_commit(after_sha, before_sha), project.commit(before_sha)]
 
         reverse_compare = true
 
@@ -48,13 +51,14 @@ class EmailsOnPushWorker
         send_email(
           recipient,
           project_id,
-          author_id:                  author_id,
-          ref:                        ref,
-          action:                     action,
-          compare:                    compare,
-          reverse_compare:            reverse_compare,
-          send_from_committer_email:  send_from_committer_email,
-          disable_diffs:              disable_diffs
+          author_id:                 author_id,
+          ref:                       ref,
+          action:                    action,
+          compare:                   compare,
+          reverse_compare:           reverse_compare,
+          diff_refs:                 diff_refs,
+          send_from_committer_email: send_from_committer_email,
+          disable_diffs:             disable_diffs
         )
 
       # These are input errors and won't be corrected even if Sidekiq retries
diff --git a/config/application.rb b/config/application.rb
index cba80f38f1f..a96765a3c9b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -78,6 +78,7 @@ module Gitlab
     config.assets.precompile << "*.png"
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
+    config.assets.precompile << "mailers/repository_push_email.css"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
diff --git a/lib/gitlab/email/message/repository_push.rb b/lib/gitlab/email/message/repository_push.rb
index 2c91a0487c3..e2fee6b9f3e 100644
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
@@ -5,6 +5,7 @@ module Gitlab
         attr_reader :author_id, :ref, :action
 
         include Gitlab::Routing.url_helpers
+        include DiffHelper
 
         delegate :namespace, :name_with_namespace, to: :project, prefix: :project
         delegate :name, to: :author, prefix: :author
@@ -36,7 +37,7 @@ module Gitlab
         end
 
         def diffs
-          @diffs ||= (compare.diffs if compare)
+          @diffs ||= (safe_diff_files(compare.diffs, diff_refs) if compare)
         end
 
         def diffs_count
@@ -47,6 +48,10 @@ module Gitlab
           @opts[:compare]
         end
 
+        def diff_refs
+          @opts[:diff_refs]
+        end
+
         def compare_timeout
           diffs.overflow? if diffs
         end
diff --git a/spec/lib/gitlab/email/message/repository_push_spec.rb b/spec/lib/gitlab/email/message/repository_push_spec.rb
index 7d6cce6daec..c19f33e2224 100644
--- a/spec/lib/gitlab/email/message/repository_push_spec.rb
+++ b/spec/lib/gitlab/email/message/repository_push_spec.rb
@@ -57,7 +57,7 @@ describe Gitlab::Email::Message::RepositoryPush do
 
     describe '#diffs' do
       subject { message.diffs }
-      it { is_expected.to all(be_an_instance_of Gitlab::Git::Diff) }
+      it { is_expected.to all(be_an_instance_of Gitlab::Diff::File) }
     end
 
     describe '#diffs_count' do
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 5f7e4a526e6..b963a3e0324 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -693,8 +693,9 @@ describe Notify do
     let(:commits) { Commit.decorate(compare.commits, nil) }
     let(:diff_path) { namespace_project_compare_path(project.namespace, project, from: Commit.new(compare.base, project), to: Commit.new(compare.head, project)) }
     let(:send_from_committer_email) { false }
+    let(:diff_refs) { [project.merge_base_commit(sample_image_commit.id, sample_commit.id), project.commit(sample_commit.id)] }
 
-    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, reverse_compare: false, send_from_committer_email: send_from_committer_email) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, reverse_compare: false, diff_refs: diff_refs, send_from_committer_email: send_from_committer_email) }
 
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -715,15 +716,15 @@ describe Notify do
       is_expected.to have_body_text /Change some files/
     end
 
-    it 'includes diffs' do
-      is_expected.to have_body_text /def archive_formats_regex/
+    it 'includes diffs with character-level highlighting' do
+      is_expected.to have_body_text /def<\/span> <span class=\"nf\">archive_formats_regex/
     end
 
     it 'contains a link to the diff' do
       is_expected.to have_body_text /#{diff_path}/
     end
 
-    it 'doesn not contain the misleading footer' do
+    it 'does not contain the misleading footer' do
       is_expected.not_to have_body_text /you are a member of/
     end
 
@@ -797,8 +798,9 @@ describe Notify do
     let(:compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, sample_commit.parent_id, sample_commit.id) }
     let(:commits) { Commit.decorate(compare.commits, nil) }
     let(:diff_path) { namespace_project_commit_path(project.namespace, project, commits.first) }
+    let(:diff_refs) { [project.merge_base_commit(sample_commit.parent_id, sample_commit.id), project.commit(sample_commit.id)] }
 
-    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare) }
+    subject { Notify.repository_push_email(project.id, author_id: user.id, ref: 'refs/heads/master', action: :push, compare: compare, diff_refs: diff_refs) }
 
     it_behaves_like 'it should show Gmail Actions View Commit link'
     it_behaves_like "a user cannot unsubscribe through footer link"
@@ -819,8 +821,8 @@ describe Notify do
       is_expected.to have_body_text /Change some files/
     end
 
-    it 'includes diffs' do
-      is_expected.to have_body_text /def archive_formats_regex/
+    it 'includes diffs with character-level highlighting' do
+      is_expected.to have_body_text /def<\/span> <span class=\"nf\">archive_formats_regex/
     end
 
     it 'contains a link to the diff' do

From 74b74e59327ef4e393b937d33ba10c43c1e1087b Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 17 May 2016 15:01:03 +0200
Subject: [PATCH 0527/1431] fix for import URL URI problem when URL contains a
 space

---
 lib/gitlab/import_url.rb           |  6 +++++-
 spec/lib/gitlab/import_url_spec.rb | 21 +++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/gitlab/import_url.rb b/lib/gitlab/import_url.rb
index d23b013c1f5..f1191cc3a50 100644
--- a/lib/gitlab/import_url.rb
+++ b/lib/gitlab/import_url.rb
@@ -1,7 +1,7 @@
 module Gitlab
   class ImportUrl
     def initialize(url, credentials: nil)
-      @url = URI.parse(URI.encode(url))
+      @url = URI.parse(encode(url))
       @credentials = credentials
     end
 
@@ -37,5 +37,9 @@ module Gitlab
     def valid_credentials?
       credentials && credentials.is_a?(Hash) && credentials.any?
     end
+
+    def encode(url)
+      URI.decode(url).size < url.size ? url : URI.encode(url)
+    end
   end
 end
diff --git a/spec/lib/gitlab/import_url_spec.rb b/spec/lib/gitlab/import_url_spec.rb
index f758cb8693c..46029b121dc 100644
--- a/spec/lib/gitlab/import_url_spec.rb
+++ b/spec/lib/gitlab/import_url_spec.rb
@@ -3,19 +3,32 @@ require 'spec_helper'
 describe Gitlab::ImportUrl do
 
   let(:credentials) { { user: 'blah', password: 'password' } }
+  let(:url) { "https://github.com/me/project.git" }
   let(:import_url) do
-    Gitlab::ImportUrl.new("https://github.com/me/project.git", credentials: credentials)
+    described_class.new(url, credentials: credentials)
   end
 
-  describe :full_url do
+  describe 'full_url' do
     it { expect(import_url.full_url).to eq("https://blah:password@github.com/me/project.git") }
   end
 
-  describe :sanitized_url do
+  describe 'sanitized_url' do
     it { expect(import_url.sanitized_url).to eq("https://github.com/me/project.git") }
   end
 
-  describe :credentials do
+  describe 'credentials' do
     it { expect(import_url.credentials).to eq(credentials) }
   end
+
+  context 'URL encoding' do
+    describe 'not encoded URL' do
+      let(:url) { "https://github.com/me/my project.git" }
+      it { expect(import_url.sanitized_url).to eq("https://github.com/me/my%20project.git") }
+    end
+
+    describe 'already encoded URL' do
+      let(:url) { "https://github.com/me/my%20project.git" }
+      it { expect(import_url.sanitized_url).to eq("https://github.com/me/my%20project.git") }
+    end
+  end
 end

From 8a91f3f27399745722fe527ee76ab18bc5b26245 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 17 May 2016 15:04:33 +0200
Subject: [PATCH 0528/1431] added CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 20e2fcb806c..bcf44b9a8d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ v 8.8.0 (unreleased)
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
+  - Fix import by `Any Git URL` broken if the URL contains a space
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From 4e9ce5abe2c18089f02ab9f3a3e12c4ccae16af6 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 17 May 2016 15:19:59 +0200
Subject: [PATCH 0529/1431] fix typo from bad refactoring

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

diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index 96717b42bae..3e51c06877e 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,7 +5,7 @@ module Gitlab
 
       def initialize(project)
         @project = project
-        credentials = import_data
+        credentials = project.import_data
         if credentials && credentials[:password]
           @client = Client.new(credentials[:password])
           @formatter = Gitlab::ImportFormatter.new

From ab2a1d23459294d3ce61e8558538f38cb5f29bb9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 17 May 2016 15:29:53 +0200
Subject: [PATCH 0530/1431] added CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 20e2fcb806c..bafdc8dbc8e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ v 8.8.0 (unreleased)
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
+  - Fix import from gitlab.com to a private instance failure
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From a82109eee80bf703ad8e82de2410f490e5fc6d54 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 17 May 2016 09:41:47 -0500
Subject: [PATCH 0531/1431] Add .gitkeep

---
 lib/container_registry/config.rb             |  1 +
 lib/container_registry/registry.rb           | 10 +++++--
 lib/container_registry/repository.rb         |  1 +
 lib/container_registry/tag.rb                | 10 +++++++
 shared/registry/.gitkeep                     |  0
 spec/lib/container_registry/registry_spec.rb | 28 ++++++++++++++++++++
 6 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 shared/registry/.gitkeep
 create mode 100644 spec/lib/container_registry/registry_spec.rb

diff --git a/lib/container_registry/config.rb b/lib/container_registry/config.rb
index 626b36cbaa9..589f9f4380a 100644
--- a/lib/container_registry/config.rb
+++ b/lib/container_registry/config.rb
@@ -9,6 +9,7 @@ module ContainerRegistry
 
     def [](key)
       return unless data
+
       data[key]
     end
   end
diff --git a/lib/container_registry/registry.rb b/lib/container_registry/registry.rb
index d3b117eeaca..07490de94ba 100644
--- a/lib/container_registry/registry.rb
+++ b/lib/container_registry/registry.rb
@@ -3,13 +3,19 @@ module ContainerRegistry
     attr_reader :uri, :client, :path
 
     def initialize(uri, options = {})
-      @path = options[:path] || uri
-      @uri = URI.parse(uri)
+      @uri = uri
+      @path = options[:path] || default_path
       @client = ContainerRegistry::Client.new(uri, options)
     end
 
     def [](name)
       ContainerRegistry::Repository.new(self, name)
     end
+
+    private
+
+    def default_path
+      @uri.sub(/^https?:\/\//, '')
+    end
   end
 end
diff --git a/lib/container_registry/repository.rb b/lib/container_registry/repository.rb
index 07cdb78264e..77825056138 100644
--- a/lib/container_registry/repository.rb
+++ b/lib/container_registry/repository.rb
@@ -20,6 +20,7 @@ module ContainerRegistry
 
     def manifest
       return @manifest if defined?(@manifest)
+
       @manifest = client.repository_tags(name)
     end
 
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index 14cee8be889..f06806db6a8 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -12,6 +12,7 @@ module ContainerRegistry
 
     def manifest
       return @manifest if defined?(@manifest)
+
       @manifest = client.repository_manifest(repository.name, name)
     end
 
@@ -21,33 +22,39 @@ module ContainerRegistry
 
     def [](key)
       return unless manifest
+
       manifest[key]
     end
 
     def digest
       return @digest if defined?(@digest)
+
       @digest = client.repository_tag_digest(repository.name, name)
     end
 
     def config_blob
       return @config_blob if defined?(@config_blob)
       return unless manifest && manifest['config']
+
       @config_blob = ContainerRegistry::Blob.new(repository, manifest['config'])
     end
 
     def config
       return unless config_blob
+
       @config ||= ContainerRegistry::Config.new(self, config_blob)
     end
 
     def created_at
       return unless config
+
       @created_at ||= DateTime.rfc3339(config['created'])
     end
 
     def layers
       return @layers if defined?(@layers)
       return unless manifest
+
       @layers = manifest['layers'].map do |layer|
         ContainerRegistry::Blob.new(repository, layer)
       end
@@ -55,16 +62,19 @@ module ContainerRegistry
 
     def total_size
       return unless layers
+
       layers.map(&:size).sum
     end
 
     def delete
       return unless digest
+
       client.delete_repository_tag(repository.name, digest)
     end
 
     def copy_to(repository)
       return unless manifest
+
       layers.each do |blob|
         repository.mount_blob(blob)
       end
diff --git a/shared/registry/.gitkeep b/shared/registry/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/spec/lib/container_registry/registry_spec.rb b/spec/lib/container_registry/registry_spec.rb
new file mode 100644
index 00000000000..f5f7c3c8bf2
--- /dev/null
+++ b/spec/lib/container_registry/registry_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe ContainerRegistry::Registry do
+  let(:path) { nil }
+  let(:registry) { described_class.new('http://example.com', path: path) }
+
+  subject { registry }
+
+  it { is_expected.to respond_to(:client) }
+  it { is_expected.to respond_to(:uri) }
+  it { is_expected.to respond_to(:path) }
+
+  it { expect(subject['test']).to_not be_nil }
+
+  context '#path' do
+    subject { registry.path }
+
+    context 'path from URL' do
+      it { is_expected.to eq('example.com') }
+    end
+
+    context 'custom path' do
+      let(:path) { 'registry.example.com' }
+
+      it { is_expected.to eq(path) }
+    end
+  end
+end

From 24145592e804ffbe58a38b15095808919337d545 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 17 May 2016 13:20:11 -0500
Subject: [PATCH 0532/1431] Provide full test coverage to
 lib/container_registry API implementation

---
 .../projects/container_registry_controller.rb |  2 +-
 app/models/project.rb                         |  2 +-
 lib/container_registry/blob.rb                | 10 +--
 lib/container_registry/client.rb              |  8 --
 lib/container_registry/registry.rb            |  2 +-
 lib/container_registry/repository.rb          | 28 ++----
 lib/container_registry/tag.rb                 | 20 +----
 spec/lib/container_registry/blob_spec.rb      | 61 +++++++++++++
 spec/lib/container_registry/registry_spec.rb  |  2 +-
 .../lib/container_registry/repository_spec.rb | 65 ++++++++++++++
 spec/lib/container_registry/tag_spec.rb       | 89 +++++++++++++++++++
 11 files changed, 232 insertions(+), 57 deletions(-)
 create mode 100644 spec/lib/container_registry/blob_spec.rb
 create mode 100644 spec/lib/container_registry/repository_spec.rb
 create mode 100644 spec/lib/container_registry/tag_spec.rb

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index e48f205d216..8ed5a8ff6fd 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -22,6 +22,6 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
   end
 
   def tag
-    @tag ||= container_registry_repository[params[:id]]
+    @tag ||= container_registry_repository.tag(params[:id])
   end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 8e80a6b5c01..09a214da043 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -336,7 +336,7 @@ class Project < ActiveRecord::Base
       url = Gitlab.config.registry.api_url
       host_port = Gitlab.config.registry.host_port
       registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
-      registry[path_with_namespace]
+      registry.repository(path_with_namespace)
     end
   end
 
diff --git a/lib/container_registry/blob.rb b/lib/container_registry/blob.rb
index d59792a383e..4e20dc4f875 100644
--- a/lib/container_registry/blob.rb
+++ b/lib/container_registry/blob.rb
@@ -2,6 +2,8 @@ module ContainerRegistry
   class Blob
     attr_reader :repository, :config
 
+    delegate :registry, :client, to: :repository
+
     def initialize(repository, config)
       @repository = repository
       @config = config || {}
@@ -35,10 +37,6 @@ module ContainerRegistry
       revision[0..8]
     end
 
-    def client
-      @client ||= repository.client
-    end
-
     def delete
       client.delete_blob(repository.name, digest)
     end
@@ -46,9 +44,5 @@ module ContainerRegistry
     def data
       @data ||= client.blob(repository.name, digest, type)
     end
-
-    def mount_to(to_repository)
-      client.repository_mount_blob(to_repository.name, digest, repository.name)
-    end
   end
 end
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index c250a4b6946..4d726692f45 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -22,14 +22,6 @@ module ContainerRegistry
       @faraday.get("/v2/#{name}/manifests/#{reference}").body
     end
 
-    def put_repository_manifest(name, reference, manifest)
-      @faraday.put("/v2/#{name}/manifests/#{reference}", manifest, { "Content-Type" => MANIFEST_VERSION }).success?
-    end
-
-    def repository_mount_blob(name, digest, from)
-      @faraday.post("/v2/#{name}/blobs/uploads/?mount=#{digest}&from=#{from}").status == 201
-    end
-
     def repository_tag_digest(name, reference)
       response = @faraday.head("/v2/#{name}/manifests/#{reference}")
       response.headers['docker-content-digest'] if response.success?
diff --git a/lib/container_registry/registry.rb b/lib/container_registry/registry.rb
index 07490de94ba..0e634f6b6ef 100644
--- a/lib/container_registry/registry.rb
+++ b/lib/container_registry/registry.rb
@@ -8,7 +8,7 @@ module ContainerRegistry
       @client = ContainerRegistry::Client.new(uri, options)
     end
 
-    def [](name)
+    def repository(name)
       ContainerRegistry::Repository.new(self, name)
     end
 
diff --git a/lib/container_registry/repository.rb b/lib/container_registry/repository.rb
index 77825056138..0e4a7cb3cc9 100644
--- a/lib/container_registry/repository.rb
+++ b/lib/container_registry/repository.rb
@@ -2,19 +2,17 @@ module ContainerRegistry
   class Repository
     attr_reader :registry, :name
 
+    delegate :client, to: :registry
+
     def initialize(registry, name)
       @registry, @name = registry, name
     end
 
-    def client
-      @client ||= registry.client
-    end
-
     def path
       [registry.path, name].compact.join('/')
     end
 
-    def [](tag)
+    def tag(tag)
       ContainerRegistry::Tag.new(self, tag)
     end
 
@@ -37,26 +35,14 @@ module ContainerRegistry
       end
     end
 
+    def blob(config)
+      ContainerRegistry::Blob.new(self, config)
+    end
+
     def delete_tags
       return unless tags
 
       tags.all?(&:delete)
     end
-
-    def mount_blob(blob)
-      return unless blob
-
-      client.repository_mount_blob(name, blob.digest, blob.repository.name)
-    end
-
-    def mount_manifest(tag, manifest)
-      client.put_repository_manifest(name, tag, manifest)
-    end
-
-    def copy_to(other_repository)
-      tags.all? do |tag|
-        tag.copy_to(other_repository)
-      end
-    end
   end
 end
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index f06806db6a8..43f8d6dc8c2 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -2,6 +2,8 @@ module ContainerRegistry
   class Tag
     attr_reader :repository, :name
 
+    delegate :registry, :client, to: :repository
+
     def initialize(repository, name)
       @repository, @name = repository, name
     end
@@ -36,7 +38,7 @@ module ContainerRegistry
       return @config_blob if defined?(@config_blob)
       return unless manifest && manifest['config']
 
-      @config_blob = ContainerRegistry::Blob.new(repository, manifest['config'])
+      @config_blob = repository.blob(manifest['config'])
     end
 
     def config
@@ -56,7 +58,7 @@ module ContainerRegistry
       return unless manifest
 
       @layers = manifest['layers'].map do |layer|
-        ContainerRegistry::Blob.new(repository, layer)
+        repository.blob(layer)
       end
     end
 
@@ -71,19 +73,5 @@ module ContainerRegistry
 
       client.delete_repository_tag(repository.name, digest)
     end
-
-    def copy_to(repository)
-      return unless manifest
-
-      layers.each do |blob|
-        repository.mount_blob(blob)
-      end
-      repository.mount_blob(config_blob)
-      repository.mount_manifest(name, manifest.to_json)
-    end
-
-    def client
-      @client ||= repository.client
-    end
   end
 end
diff --git a/spec/lib/container_registry/blob_spec.rb b/spec/lib/container_registry/blob_spec.rb
new file mode 100644
index 00000000000..4d8cb787dde
--- /dev/null
+++ b/spec/lib/container_registry/blob_spec.rb
@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe ContainerRegistry::Blob do
+  let(:digest) { 'sha256:0123456789012345' }
+  let(:config) do
+    {
+      'digest' => digest,
+      'mediaType' => 'binary',
+      'size' => 1000
+    }
+  end
+  
+  let(:registry) { ContainerRegistry::Registry.new('http://example.com') }
+  let(:repository) { registry.repository('group/test') }
+  let(:blob) { repository.blob(config) }
+
+  it { expect(blob).to respond_to(:repository) }
+  it { expect(blob).to delegate_method(:registry).to(:repository) }
+  it { expect(blob).to delegate_method(:client).to(:repository) }
+
+  context '#path' do
+    subject { blob.path }
+
+    it { is_expected.to eq('example.com/group/test@sha256:0123456789012345') }
+  end
+
+  context '#digest' do
+    subject { blob.digest }
+
+    it { is_expected.to eq(digest) }
+  end
+
+  context '#type' do
+    subject { blob.type }
+
+    it { is_expected.to eq('binary') }
+  end
+
+  context '#revision' do
+    subject { blob.revision }
+
+    it { is_expected.to eq('0123456789012345') }
+  end
+
+  context '#short_revision' do
+    subject { blob.short_revision }
+
+    it { is_expected.to eq('012345678') }
+  end
+
+  context '#delete' do
+    before do
+      stub_request(:delete, 'http://example.com/v2/group/test/blobs/sha256:0123456789012345').
+        to_return(status: 200)
+    end
+
+    subject { blob.delete }
+
+    it { is_expected.to be_truthy }
+  end
+end
diff --git a/spec/lib/container_registry/registry_spec.rb b/spec/lib/container_registry/registry_spec.rb
index f5f7c3c8bf2..2638401ae6e 100644
--- a/spec/lib/container_registry/registry_spec.rb
+++ b/spec/lib/container_registry/registry_spec.rb
@@ -10,7 +10,7 @@ describe ContainerRegistry::Registry do
   it { is_expected.to respond_to(:uri) }
   it { is_expected.to respond_to(:path) }
 
-  it { expect(subject['test']).to_not be_nil }
+  it { expect(subject.repository('test')).to_not be_nil }
 
   context '#path' do
     subject { registry.path }
diff --git a/spec/lib/container_registry/repository_spec.rb b/spec/lib/container_registry/repository_spec.rb
new file mode 100644
index 00000000000..e6d66b11e4e
--- /dev/null
+++ b/spec/lib/container_registry/repository_spec.rb
@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe ContainerRegistry::Repository do
+  let(:registry) { ContainerRegistry::Registry.new('http://example.com') }
+  let(:repository) { registry.repository('group/test') }
+
+  it { expect(repository).to respond_to(:registry) }
+  it { expect(repository).to delegate_method(:client).to(:registry) }
+  it { expect(repository.tag('test')).to_not be_nil }
+
+  context '#path' do
+    subject { repository.path }
+
+    it { is_expected.to eq('example.com/group/test') }
+  end
+
+  context 'manifest processing' do
+    before do
+      stub_request(:get, 'http://example.com/v2/group/test/tags/list').
+        with(headers: { 'Accept' => 'application/vnd.docker.distribution.manifest.v2+json' }).
+        to_return(
+          status: 200,
+          body: JSON.dump(tags: ['test']),
+          headers: { 'Content-Type' => 'application/vnd.docker.distribution.manifest.v2+json' })
+    end
+
+    context '#manifest' do
+      subject { repository.manifest }
+
+      it { is_expected.to_not be_nil }
+    end
+
+    context '#valid?' do
+      subject { repository.valid? }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context '#tags' do
+      subject { repository.tags }
+
+      it { is_expected.to_not be_empty }
+    end
+  end
+
+  context '#delete_tags' do
+    let(:tag) { ContainerRegistry::Tag.new(repository, 'tag') }
+
+    before { expect(repository).to receive(:tags).twice.and_return([tag]) }
+
+    subject { repository.delete_tags }
+
+    context 'succeeds' do
+      before { expect(tag).to receive(:delete).and_return(true) }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'any fails' do
+      before { expect(tag).to receive(:delete).and_return(false) }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+end
diff --git a/spec/lib/container_registry/tag_spec.rb b/spec/lib/container_registry/tag_spec.rb
new file mode 100644
index 00000000000..12cf91127ed
--- /dev/null
+++ b/spec/lib/container_registry/tag_spec.rb
@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+describe ContainerRegistry::Tag do
+  let(:registry) { ContainerRegistry::Registry.new('http://example.com') }
+  let(:repository) { registry.repository('group/test') }
+  let(:tag) { repository.tag('tag') }
+  let(:headers) { { 'Accept' => 'application/vnd.docker.distribution.manifest.v2+json' } }
+
+  it { expect(tag).to respond_to(:repository) }
+  it { expect(tag).to delegate_method(:registry).to(:repository) }
+  it { expect(tag).to delegate_method(:client).to(:repository) }
+
+  context '#path' do
+    subject { tag.path }
+
+    it { is_expected.to eq('example.com/group/test:tag') }
+  end
+
+  context 'manifest processing' do
+    before do
+      stub_request(:get, 'http://example.com/v2/group/test/manifests/tag').
+        with(headers: headers).
+        to_return(
+          status: 200,
+          body: File.read(Rails.root + 'spec/fixtures/container_registry/tag_manifest.json'),
+          headers: { 'Content-Type' => 'application/vnd.docker.distribution.manifest.v2+json' })
+    end
+
+    context '#layers' do
+      subject { tag.layers }
+
+      it { expect(subject.length).to eq(1) }
+    end
+
+    context '#total_size' do
+      subject { tag.total_size }
+
+      it { is_expected.to eq(2319870) }
+    end
+
+    context 'config processing' do
+      before do
+        stub_request(:get, 'http://example.com/v2/group/test/blobs/sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac').
+          with(headers: { 'Accept' => 'application/octet-stream' }).
+          to_return(
+            status: 200,
+            body: File.read(Rails.root + 'spec/fixtures/container_registry/config_blob.json'))
+      end
+
+      context '#config' do
+        subject { tag.config }
+
+        it { is_expected.to_not be_nil }
+      end
+
+      context '#created_at' do
+        subject { tag.created_at }
+
+        it { is_expected.to_not be_nil }
+      end
+    end
+  end
+
+  context 'manifest digest' do
+    before do
+      stub_request(:head, 'http://example.com/v2/group/test/manifests/tag').
+        with(headers: headers).
+        to_return(status: 200, headers: { 'Docker-Content-Digest' => 'sha256:digest' })
+    end
+
+    context '#digest' do
+      subject { tag.digest }
+
+      it { is_expected.to eq('sha256:digest') }
+    end
+
+    context '#delete' do
+      before do
+        stub_request(:delete, 'http://example.com/v2/group/test/manifests/sha256:digest').
+          with(headers: headers).
+          to_return(status: 200)
+      end
+
+      subject { tag.delete }
+
+      it { is_expected.to be_truthy }
+    end
+  end
+end

From 5bf49bb63d88b1cce2d9a44716b54acfa63ea657 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 17 May 2016 21:41:53 -0500
Subject: [PATCH 0533/1431] Move note helper method to notes entity file

---
 lib/api/helpers.rb |  4 ----
 lib/api/notes.rb   | 10 ++++++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 1003b596aec..40c967453fb 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -397,9 +397,5 @@ module API
       error!(errors[:access_level], 422) if errors[:access_level].any?
       not_found!(errors)
     end
-
-    def noteable_ability_name(noteable)
-      "read_#{noteable.class.to_s.underscore.downcase}".to_sym
-    end
   end
 end
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index c49b107d1d9..d4fcfd3d4d3 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -21,7 +21,7 @@ module API
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes" do
           @noteable = user_project.send(noteables_str.to_sym).find(params[noteable_id_str.to_sym])
 
-          if can?(current_user, noteable_ability_name(@noteable), @noteable)
+          if can?(current_user, noteable_read_ability_name(@noteable), @noteable)
             # We exclude notes that are cross-references and that cannot be viewed
             # by the current user. By doing this exclusion at this level and not
             # at the DB query level (which we cannot in that case), the current
@@ -51,7 +51,7 @@ module API
         get ":id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id" do
           @noteable = user_project.send(noteables_str.to_sym).find(params[noteable_id_str.to_sym])
           @note = @noteable.notes.find(params[:note_id])
-          can_read_note = can?(current_user, noteable_ability_name(@noteable), @noteable) && !@note.cross_reference_not_visible_for?(current_user)
+          can_read_note = can?(current_user, noteable_read_ability_name(@noteable), @noteable) && !@note.cross_reference_not_visible_for?(current_user)
 
           if can_read_note
             present @note, with: Entities::Note
@@ -141,5 +141,11 @@ module API
         end
       end
     end
+
+    helpers do
+      def noteable_read_ability_name(noteable)
+        "read_#{noteable.class.to_s.underscore.downcase}".to_sym
+      end
+    end
   end
 end

From 07ff874f572a947d7730787492a604dd3f44d496 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 29 Apr 2016 18:06:22 -0300
Subject: [PATCH 0534/1431] Let users set notification levels in projects which
 they are not members

---
 app/controllers/projects_controller.rb        |  4 +--
 app/models/user.rb                            |  9 ++++-
 .../notification_settings_controller_spec.rb  | 14 ++++++++
 spec/controllers/projects_controller_spec.rb  | 35 ++++++++++++++++++-
 .../merge_requests/update_service_spec.rb     |  1 +
 spec/services/notification_service_spec.rb    |  8 ++++-
 6 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f4ec60ad2c7..55632308b4f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,9 +102,7 @@ class ProjectsController < Projects::ApplicationController
     respond_to do |format|
       format.html do
         if current_user
-          @membership = @project.team.find_member(current_user.id)
-
-          if @membership
+          if can?(current_user, :read_project, @project)
             @notification_setting = current_user.notification_settings_for(@project)
           end
         end
diff --git a/app/models/user.rb b/app/models/user.rb
index 368a3f3cfba..cc312a291c6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -777,7 +777,14 @@ class User < ActiveRecord::Base
   end
 
   def notification_settings_for(source)
-    notification_settings.find_or_initialize_by(source: source)
+    notification_setting  = notification_settings.find_or_initialize_by({ source: source })
+
+    if source.is_a?(Project)
+      membership = source.team.find_member(self.id)
+      notification_setting.level = :disabled unless membership.present? || notification_setting.persisted?
+    end
+
+    notification_setting
   end
 
   private
diff --git a/spec/controllers/projects/notification_settings_controller_spec.rb b/spec/controllers/projects/notification_settings_controller_spec.rb
index 4908b545648..c5d17d97ec9 100644
--- a/spec/controllers/projects/notification_settings_controller_spec.rb
+++ b/spec/controllers/projects/notification_settings_controller_spec.rb
@@ -34,5 +34,19 @@ describe Projects::NotificationSettingsController do
         expect(response.status).to eq 200
       end
     end
+
+    context 'not authorized' do
+      let(:private_project) { create(:project, :private) }
+      before { sign_in(user) }
+
+      it 'returns 404' do
+        put :update,
+            namespace_id: private_project.namespace.to_param,
+            project_id: private_project.to_param,
+            notification_setting: { level: :participating }
+
+        expect(response.status).to eq(404)
+      end
+    end
   end
 end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 069cd917e5a..685fe9ffe0b 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -8,10 +8,43 @@ describe ProjectsController do
   let(:txt)     { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
 
   describe "GET show" do
+    context "user not project member" do
+      before { sign_in(user) }
+
+      context "user does not have access to project" do
+        let(:private_project) { create(:project, :private) }
+
+        it "does not initialize notification setting" do
+          get :show, namespace_id: private_project.namespace.path, id: private_project.path
+          expect(assigns(:notification_setting)).to be_nil
+        end
+      end
+
+      context "user has access to project" do
+        context "and does not have notification setting" do
+          it "initializes notification as disabled" do
+            get :show, namespace_id: public_project.namespace.path, id: public_project.path
+            expect(assigns(:notification_setting).level).to eq("disabled")
+          end
+        end
+
+        context "and has notification setting" do
+          before do
+            setting = user.notification_settings_for(public_project)
+            setting.level = :global
+            setting.save
+          end
+
+          it "shows current notification setting" do
+            get :show, namespace_id: public_project.namespace.path, id: public_project.path
+            expect(assigns(:notification_setting).level).to eq("global")
+          end
+        end
+      end
+    end
 
     context "rendering default project view" do
       render_views
-
       it "renders the activity view" do
         allow(controller).to receive(:current_user).and_return(user)
         allow(user).to receive(:project_view).and_return('activity')
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 213e8c2eb3a..e872fc0eed2 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -17,6 +17,7 @@ describe MergeRequests::UpdateService, services: true do
   before do
     project.team << [user, :master]
     project.team << [user2, :developer]
+    project.team << [user3, :developer]
   end
 
   describe 'execute' do
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 4bbc4ddc3ab..d557b2e65b8 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -119,7 +119,10 @@ describe NotificationService, services: true do
       let(:note) { create(:note_on_issue, noteable: confidential_issue, project: project, note: "#{author.to_reference} #{assignee.to_reference} #{non_member.to_reference} #{member.to_reference} #{admin.to_reference}") }
 
       it 'filters out users that can not read the issue' do
+        project.team << [admin, :master]
+        project.team << [author, :developer]
         project.team << [member, :developer]
+        project.team << [assignee, :developer]
 
         expect(SentNotification).to receive(:record).with(confidential_issue, any_args).exactly(4).times
 
@@ -143,7 +146,8 @@ describe NotificationService, services: true do
 
       before do
         build_team(note.project)
-        note.project.team << [note.author, :master]
+        note.project.team << [[note.author, note.noteable.author, note.noteable.assignee], :master]
+
         ActionMailer::Base.deliveries.clear
       end
 
@@ -260,6 +264,7 @@ describe NotificationService, services: true do
     before do
       build_team(issue.project)
       add_users_with_subscription(issue.project, issue)
+      project.team << [[issue.assignee, issue.author], :developer]
       ActionMailer::Base.deliveries.clear
     end
 
@@ -491,6 +496,7 @@ describe NotificationService, services: true do
     before do
       build_team(merge_request.target_project)
       add_users_with_subscription(merge_request.target_project, merge_request)
+      project.team << [merge_request.assignee, :developer]
       ActionMailer::Base.deliveries.clear
     end
 

From c2c7014e017a36e2819335653f5d3fc04cc2c054 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 6 May 2016 16:40:27 -0300
Subject: [PATCH 0535/1431] Improve documentation and add changelog

---
 app/controllers/projects_controller.rb     |  6 +----
 app/models/user.rb                         |  7 +++--
 spec/services/notification_service_spec.rb | 30 +++++++++++++++++++++-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 55632308b4f..6d2b6b60f13 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -101,11 +101,7 @@ class ProjectsController < Projects::ApplicationController
 
     respond_to do |format|
       format.html do
-        if current_user
-          if can?(current_user, :read_project, @project)
-            @notification_setting = current_user.notification_settings_for(@project)
-          end
-        end
+        @notification_setting = current_user.notification_settings_for(@project) if current_user
 
         if @project.repository_exists?
           if @project.empty_repo?
diff --git a/app/models/user.rb b/app/models/user.rb
index cc312a291c6..09fb6c978f3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -777,11 +777,10 @@ class User < ActiveRecord::Base
   end
 
   def notification_settings_for(source)
-    notification_setting  = notification_settings.find_or_initialize_by({ source: source })
+    notification_setting  = notification_settings.find_or_initialize_by(source: source)
 
-    if source.is_a?(Project)
-      membership = source.team.find_member(self.id)
-      notification_setting.level = :disabled unless membership.present? || notification_setting.persisted?
+    if source.is_a?(Project) && !source.team.member?(id) && !notification_setting.persisted?
+      notification_setting.level = :disabled
     end
 
     notification_setting
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index d557b2e65b8..6a84dcfa014 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -106,6 +106,35 @@ describe NotificationService, services: true do
           should_not_email(@u_disabled)
         end
       end
+
+      context 'when user is not project member' do
+        let(:user) { create(:user) }
+        let(:project) { create(:empty_project, :public) }
+        let(:issue) { create(:issue, project: project, assignee: create(:user)) }
+        let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: 'anything') }
+
+        before { ActionMailer::Base.deliveries.clear }
+
+        context "and has notification setting" do
+          before do
+            setting = user.notification_settings_for(project)
+            setting.level = :watch
+            setting.save
+          end
+
+          it "sends user email" do
+            notification.new_note(note)
+            should_email(user)
+          end
+        end
+
+        context "and does note have notification setting" do
+          it "does not send email" do
+            notification.new_note(note)
+            should_not_email(user)
+          end
+        end
+      end
     end
 
     context 'confidential issue note' do
@@ -147,7 +176,6 @@ describe NotificationService, services: true do
       before do
         build_team(note.project)
         note.project.team << [[note.author, note.noteable.author, note.noteable.assignee], :master]
-
         ActionMailer::Base.deliveries.clear
       end
 

From fc9844e8e1955359eae5b159069a90a993c667d1 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 16 May 2016 13:34:10 -0300
Subject: [PATCH 0536/1431] Update documentation

---
 CHANGELOG                                  |  1 +
 app/models/user.rb                         |  2 +-
 doc/workflow/notifications.md              |  2 +-
 spec/services/notification_service_spec.rb | 67 +++++++++++-----------
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bafdc8dbc8e..fc7d1a710a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.8.0 (unreleased)
   - Added button to toggle whitespaces changes on diff view
   - Backport GitHub Enterprise import support from EE
   - Create tags using Rugged for performance reasons. !3745
+  - Allow guests to set notification level in projects
   - API: Expose Issue#user_notes_count. !3126 (Anton Popov)
   - Don't show forks button when user can't view forks
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
diff --git a/app/models/user.rb b/app/models/user.rb
index 09fb6c978f3..831fbcbb3f5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -777,7 +777,7 @@ class User < ActiveRecord::Base
   end
 
   def notification_settings_for(source)
-    notification_setting  = notification_settings.find_or_initialize_by(source: source)
+    notification_setting = notification_settings.find_or_initialize_by(source: source)
 
     if source.is_a?(Project) && !source.team.member?(id) && !notification_setting.persisted?
       notification_setting.level = :disabled
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index 80817c98d22..cbca94c0b5e 100644
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -69,7 +69,7 @@ In all of the below cases, the notification will be sent to:
 
     ...with notification level "Participating" or higher
 
-- Watchers: project members with notification level "Watch"
+- Watchers: users with notification level "Watch"
 - Subscribers: anyone who manually subscribed to the issue/merge request
 
 | Event                  | Sent to |
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 6a84dcfa014..4bf8fcde4dd 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -35,7 +35,7 @@ describe NotificationService, services: true do
 
   describe 'Notes' do
     context 'issue note' do
-      let(:project) { create(:empty_project, :private) }
+      let(:project) { create(:empty_project, :internal) }
       let(:issue) { create(:issue, project: project, assignee: create(:user)) }
       let(:mentioned_issue) { create(:issue, assignee: issue.assignee) }
       let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@mention referenced, @outsider also') }
@@ -52,8 +52,8 @@ describe NotificationService, services: true do
         it do
           add_users_with_subscription(note.project, issue)
 
-          # Ensure create SentNotification by noteable = issue 6 times, not noteable = note
-          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(7).times
+          # Ensure create SentNotification by noteable = issue 7 times, not noteable = note
+          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(8).times
 
           ActionMailer::Base.deliveries.clear
 
@@ -66,6 +66,7 @@ describe NotificationService, services: true do
           should_email(@subscriber)
           should_email(@watcher_and_subscriber)
           should_email(@subscribed_participant)
+          should_email(@u_guest_watcher)
           should_not_email(note.author)
           should_not_email(@u_participating)
           should_not_email(@u_disabled)
@@ -100,41 +101,13 @@ describe NotificationService, services: true do
           should_email(note.noteable.author)
           should_email(note.noteable.assignee)
           should_email(@u_mentioned)
+          should_email(@u_guest_watcher)
           should_not_email(@u_watcher)
           should_not_email(note.author)
           should_not_email(@u_participating)
           should_not_email(@u_disabled)
         end
       end
-
-      context 'when user is not project member' do
-        let(:user) { create(:user) }
-        let(:project) { create(:empty_project, :public) }
-        let(:issue) { create(:issue, project: project, assignee: create(:user)) }
-        let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: 'anything') }
-
-        before { ActionMailer::Base.deliveries.clear }
-
-        context "and has notification setting" do
-          before do
-            setting = user.notification_settings_for(project)
-            setting.level = :watch
-            setting.save
-          end
-
-          it "sends user email" do
-            notification.new_note(note)
-            should_email(user)
-          end
-        end
-
-        context "and does note have notification setting" do
-          it "does not send email" do
-            notification.new_note(note)
-            should_not_email(user)
-          end
-        end
-      end
     end
 
     context 'confidential issue note' do
@@ -192,6 +165,7 @@ describe NotificationService, services: true do
             should_email(member)
           end
 
+          should_email(@u_guest_watcher)
           should_email(note.noteable.author)
           should_email(note.noteable.assignee)
           should_not_email(note.author)
@@ -216,7 +190,7 @@ describe NotificationService, services: true do
 
       before do
         build_team(note.project)
-        note.project.team << [note.author, :master]
+        note.project.team << [[note.author, note.noteable.author], :master]
         ActionMailer::Base.deliveries.clear
       end
 
@@ -233,6 +207,7 @@ describe NotificationService, services: true do
             should_email(member)
           end
 
+          should_email(@u_guest_watcher)
           should_email(note.noteable.author)
           should_not_email(note.author)
           should_email(@u_mentioned)
@@ -256,6 +231,7 @@ describe NotificationService, services: true do
         it do
           notification.new_note(note)
 
+          should_email(@u_guest_watcher)
           should_email(@u_committer)
           should_email(@u_watcher)
           should_not_email(@u_mentioned)
@@ -268,6 +244,7 @@ describe NotificationService, services: true do
           note.update_attribute(:note, '@mention referenced')
           notification.new_note(note)
 
+          should_email(@u_guest_watcher)
           should_email(@u_committer)
           should_email(@u_watcher)
           should_email(@u_mentioned)
@@ -302,6 +279,7 @@ describe NotificationService, services: true do
 
         should_email(issue.assignee)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_not_email(@u_mentioned)
         should_not_email(@u_participating)
@@ -361,6 +339,7 @@ describe NotificationService, services: true do
 
         should_email(issue.assignee)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_not_email(@unsubscriber)
@@ -375,6 +354,7 @@ describe NotificationService, services: true do
 
         should_email(@u_mentioned)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_not_email(@unsubscriber)
@@ -389,6 +369,7 @@ describe NotificationService, services: true do
         expect(issue.assignee).to be @u_mentioned
         should_email(issue.assignee)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_not_email(@unsubscriber)
@@ -403,6 +384,7 @@ describe NotificationService, services: true do
         expect(issue.assignee).to be @u_mentioned
         should_email(issue.assignee)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_not_email(@unsubscriber)
@@ -416,6 +398,7 @@ describe NotificationService, services: true do
 
         expect(issue.assignee).to be @u_mentioned
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_not_email(issue.assignee)
@@ -444,6 +427,7 @@ describe NotificationService, services: true do
         should_not_email(issue.assignee)
         should_not_email(issue.author)
         should_not_email(@u_watcher)
+        should_not_email(@u_guest_watcher)
         should_not_email(@u_participant_mentioned)
         should_not_email(@subscriber)
         should_not_email(@watcher_and_subscriber)
@@ -492,6 +476,7 @@ describe NotificationService, services: true do
         should_email(issue.assignee)
         should_email(issue.author)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_email(@watcher_and_subscriber)
@@ -508,6 +493,7 @@ describe NotificationService, services: true do
         should_email(issue.assignee)
         should_email(issue.author)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_email(@watcher_and_subscriber)
@@ -536,6 +522,7 @@ describe NotificationService, services: true do
         should_email(@u_watcher)
         should_email(@watcher_and_subscriber)
         should_email(@u_participant_mentioned)
+        should_email(@u_guest_watcher)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
       end
@@ -559,6 +546,7 @@ describe NotificationService, services: true do
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_email(@watcher_and_subscriber)
+        should_email(@u_guest_watcher)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -600,6 +588,7 @@ describe NotificationService, services: true do
 
         should_email(merge_request.assignee)
         should_email(@u_watcher)
+        should_email(@u_guest_watcher)
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_email(@watcher_and_subscriber)
@@ -618,6 +607,7 @@ describe NotificationService, services: true do
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_email(@watcher_and_subscriber)
+        should_email(@u_guest_watcher)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -633,6 +623,7 @@ describe NotificationService, services: true do
         should_email(@u_participant_mentioned)
         should_email(@subscriber)
         should_email(@watcher_and_subscriber)
+        should_email(@u_guest_watcher)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
@@ -654,6 +645,7 @@ describe NotificationService, services: true do
 
         should_email(@u_watcher)
         should_email(@u_participating)
+        should_not_email(@u_guest_watcher)
         should_not_email(@u_disabled)
       end
     end
@@ -669,6 +661,8 @@ describe NotificationService, services: true do
     @u_not_mentioned = create(:user, username: 'regular', notification_level: :participating)
     @u_outsider_mentioned = create(:user, username: 'outsider')
 
+    create_guest_watcher
+
     project.team << [@u_watcher, :master]
     project.team << [@u_participating, :master]
     project.team << [@u_participant_mentioned, :master]
@@ -678,6 +672,13 @@ describe NotificationService, services: true do
     project.team << [@u_not_mentioned, :master]
   end
 
+  def create_guest_watcher
+    @u_guest_watcher = create(:user, username: 'guest_watching')
+    setting = @u_guest_watcher.notification_settings_for(project)
+    setting.level = :watch
+    setting.save
+  end
+
   def add_users_with_subscription(project, issuable)
     @subscriber = create :user
     @unsubscriber = create :user

From 4e58aa40b98aa1cb758b1386b961f3bf15671bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 17 May 2016 23:44:54 -0500
Subject: [PATCH 0537/1431] Remove back-compat code that's not needed anymore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/helpers/projects_helper.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index e1ab78df69e..5f18ac7ea04 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -124,11 +124,7 @@ module ProjectsHelper
   end
 
   def license_short_name(project)
-    no_license_key = project.repository.license_key.nil? ||
-      # Back-compat if cache contains 'no-license', can be removed in a few weeks
-      project.repository.license_key == 'no-license'
-
-    return 'LICENSE' if no_license_key
+    return 'LICENSE' if project.repository.license_key.nil?
 
     license = Licensee::License.new(project.repository.license_key)
 

From f7bdbc0b55dfed9f1bfabf052436bac2997e78f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 00:07:51 -0500
Subject: [PATCH 0538/1431] Make it clearer that /licenses is the OS license
 templates endpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 doc/api/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/README.md b/doc/api/README.md
index ff039f1886f..27c5962decf 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -33,7 +33,7 @@ following locations:
 - [Build triggers](build_triggers.md)
 - [Build Variables](build_variables.md)
 - [Runners](runners.md)
-- [Licenses](licenses.md)
+- [Open source license templates](licenses.md)
 
 ## Authentication
 

From 483c034b86262fb9b2c47df999d995f500b38eb4 Mon Sep 17 00:00:00 2001
From: Alex Moore-Niemi <moore.niemi@gmail.com>
Date: Wed, 20 Apr 2016 18:41:11 -0400
Subject: [PATCH 0539/1431] Changing the confidentiality of an issue now
 creates a new system note
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                   |  1 +
 app/services/issuable_base_service.rb       |  6 ++++++
 app/services/issues/update_service.rb       |  6 +++++-
 app/services/system_note_service.rb         | 19 +++++++++++++++++++
 spec/services/issues/update_service_spec.rb | 20 ++++++++++++++------
 spec/services/system_note_service_spec.rb   | 12 ++++++++++++
 6 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 48e38899607..8b1752c30fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.8.0 (unreleased)
   - Escape HTML in commit titles in system note messages
   - Improve multiple branch push performance by memoizing permission checking
   - Log to application.log when an admin starts and stops impersonating a user
+  - Changing the confidentiality of an issue now creates a new system note (Alex Moore-Niemi)
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
   - Reduce delay in destroying a project from 1-minute to immediately
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 2b16089df1b..1f59281e271 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -36,6 +36,12 @@ class IssuableBaseService < BaseService
     end
   end
 
+  def create_confidentiality_note(issuable)
+    SystemNoteService.change_confidentiality(
+      issuable, issuable.project, current_user
+    )
+  end
+
   def filter_params(issuable_ability_name = :issue)
     filter_assignee
     filter_milestone
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 3563cbaa997..3a9bbf8a78c 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -10,7 +10,7 @@ module Issues
       end
 
       if issue.previous_changes.include?('title') ||
-         issue.previous_changes.include?('description')
+          issue.previous_changes.include?('description')
         todo_service.update_issue(issue, current_user)
       end
 
@@ -24,6 +24,10 @@ module Issues
         todo_service.reassigned_issue(issue, current_user)
       end
 
+      if issue.previous_changes.include?('confidential')
+        create_confidentiality_note(issue)
+      end
+
       added_labels = issue.labels - old_labels
       if added_labels.present?
         notification_service.relabeled_issue(issue, added_labels, current_user)
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 4bdb1b0c074..e9e3c472e6d 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -175,6 +175,25 @@ class SystemNoteService
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
 
+  # Called when the confidentiality changes
+  #
+  # noteable    - Noteable object that responds to 'confidential'
+  # project     - Project owning noteable
+  # author      - User performing the change
+  #
+  # Example Note text:
+  #
+  # "Marked as confidential"
+  #
+  # Returns the created Note object
+  def self.change_confidentiality(noteable, project, author)
+    return unless noteable.respond_to?(:confidential)
+
+    confidentiality_status = noteable.confidential ? "confidential" : "not confidential"
+    body = "Marked as #{confidentiality_status}"
+    create_note(noteable: noteable, project: project, author: author, note: body)
+  end
+
   # Called when a branch in Noteable is changed
   #
   # noteable    - Noteable object
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 52f69306994..c9d8f1b382c 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -27,11 +27,6 @@ describe Issues::UpdateService, services: true do
       end
     end
 
-    def update_issue(opts)
-      @issue = Issues::UpdateService.new(project, user, opts).execute(issue)
-      @issue.reload
-    end
-
     context "valid params" do
       before do
         opts = {
@@ -39,7 +34,8 @@ describe Issues::UpdateService, services: true do
           description: 'Also please fix',
           assignee_id: user2.id,
           state_event: 'close',
-          label_ids: [label.id]
+          label_ids: [label.id],
+          confidential: true
         }
 
         perform_enqueued_jobs do
@@ -84,6 +80,18 @@ describe Issues::UpdateService, services: true do
         expect(note).not_to be_nil
         expect(note.note).to eq 'Title changed from **Old title** to **New title**'
       end
+
+      it 'creates system note about confidentiality change' do
+        note = find_note('Marked as confidential')
+
+        expect(note).not_to be_nil
+        expect(note.note).to eq 'Marked as confidential'
+      end
+    end
+
+    def update_issue(opts)
+      @issue = Issues::UpdateService.new(project, user, opts).execute(issue)
+      @issue.reload
     end
 
     context 'todos' do
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 5fbf2ae5247..4fa60436155 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -254,6 +254,18 @@ describe SystemNoteService, services: true do
     end
   end
 
+  describe '.change_confidentiality' do
+    subject { described_class.change_confidentiality(noteable, project, author) }
+
+    context 'when noteable responds to `confidential`' do
+      it_behaves_like 'a system note'
+
+      it 'sets the note text' do
+        expect(subject.note).to eq "Marked as not confidential"
+      end
+    end
+  end
+
   describe '.change_branch' do
     subject { described_class.change_branch(noteable, project, author, 'target', old_branch, new_branch) }
     let(:old_branch) { 'old_branch'}

From cf3b149e6506c516d6f691f6e36c599f0beb0590 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 18 May 2016 10:14:53 +0100
Subject: [PATCH 0540/1431] Point group's issues atom feed to group

This was using the user dashboard atom builder template, not one for the
group's issues.
---
 app/views/groups/issues.atom.builder | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/groups/issues.atom.builder b/app/views/groups/issues.atom.builder
index 486d1d8587a..a6eb9abada6 100644
--- a/app/views/groups/issues.atom.builder
+++ b/app/views/groups/issues.atom.builder
@@ -1,9 +1,9 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@user.name} issues"
-  xml.link    href: issues_dashboard_url(format: :atom, private_token: @user.private_token), rel: "self", type: "application/atom+xml"
-  xml.link    href: issues_dashboard_url, rel: "alternate", type: "text/html"
-  xml.id      issues_dashboard_url
+  xml.title   "#{@group.name} issues"
+  xml.link    href: issues_group_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
+  xml.link    href: issues_group_url, rel: "alternate", type: "text/html"
+  xml.id      issues_group_url
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
   @issues.each do |issue|

From 72df2da7c2cd004f3c2659249324a4f07f0c71e0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 18 May 2016 11:13:57 +0100
Subject: [PATCH 0541/1431] Clicking changes tab scrolls the window to show the
 content

Closes #15133
---
 app/assets/javascripts/merge_request_tabs.js.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index 372732d0aac..49a4727205a 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -75,6 +75,9 @@ class @MergeRequestTabs
       @loadDiff($target.attr('href'))
       if bp? and bp.getBreakpointSize() isnt 'lg'
         @shrinkView()
+
+      navBarHeight = $('.navbar-gitlab').outerHeight()
+      $.scrollTo(".merge-request-details .merge-request-tabs", offset: -navBarHeight)
     else if action == 'builds'
       @loadBuilds($target.attr('href'))
       @expandView()

From da5f0b9119d4f8c911db30557a04d14ff7406e5f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 18 May 2016 14:11:06 +0100
Subject: [PATCH 0542/1431] Updated snippets UI

Closes #14328
---
 .../stylesheets/framework/dropdowns.scss      |  4 ++
 app/assets/stylesheets/framework/files.scss   | 15 ++++++-
 app/assets/stylesheets/pages/snippets.scss    | 44 +++++++++++++------
 .../projects/snippets/_actions.html.haml      | 38 +++++++++++-----
 app/views/projects/snippets/show.html.haml    |  8 ++--
 app/views/shared/snippets/_header.html.haml   | 19 ++++----
 app/views/snippets/_actions.html.haml         | 38 +++++++++++-----
 app/views/snippets/show.html.haml             |  7 ++-
 8 files changed, 118 insertions(+), 55 deletions(-)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 4bf3a050403..79a37d87e82 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -162,6 +162,10 @@
   }
 }
 
+.dropdown-menu-full-width {
+  width: 100%;
+}
+
 .dropdown-menu-paging {
   .dropdown-page-two,
   .dropdown-menu-back {
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 61d9954c6c8..780b9b185f7 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -5,6 +5,10 @@
 .file-holder {
   border: 1px solid $border-color;
 
+  &.file-holder-no-border {
+    border: 0;
+  }
+
   &.readme-holder {
     margin: $gl-padding-top 0;
   }
@@ -23,8 +27,17 @@
     word-wrap: break-word;
     border-radius: 3px 3px 0 0;
 
+    &.file-title-clear {
+      padding-left: 0;
+      padding-right: 0;
+      background-color: transparent;
+
+      .file-actions {
+        right: 0;
+      }
+    }
+
     .file-actions {
-      float: right;
       position: absolute;
       top: 5px;
       right: 15px;
diff --git a/app/assets/stylesheets/pages/snippets.scss b/app/assets/stylesheets/pages/snippets.scss
index 639d639d5b0..2aa939b7dc3 100644
--- a/app/assets/stylesheets/pages/snippets.scss
+++ b/app/assets/stylesheets/pages/snippets.scss
@@ -16,19 +16,6 @@
   }
 }
 
-.snippet-box {
-  @include border-radius(2px);
-
-  display: block;
-  float: left;
-  padding: 0 $gl-padding;
-  font-weight: normal;
-  margin-right: 10px;
-  font-size: $gl-font-size;
-  border: 1px solid;
-  line-height: 32px;
-}
-
 .markdown-snippet-copy {
   position: fixed;
   top: -10px;
@@ -36,3 +23,34 @@
   max-height: 0;
   max-width: 0;
 }
+
+.file-holder.snippet-file-content {
+  padding-bottom: $gl-padding;
+  border-bottom: 1px solid $border-color;
+
+  .file-title {
+    padding-top: $gl-padding;
+    padding-bottom: $gl-padding;
+  }
+
+  .file-actions {
+    top: 12px;
+  }
+
+  .file-content {
+    border-left: 1px solid $border-color;
+    border-right: 1px solid $border-color;
+    border-bottom: 1px solid $border-color;
+  }
+}
+
+.snippet-title {
+  font-size: 24px;
+  font-weight: normal;
+}
+
+.snippet-actions {
+  @media (min-width: $screen-sm-min) {
+    float: right;
+  }
+}
diff --git a/app/views/projects/snippets/_actions.html.haml b/app/views/projects/snippets/_actions.html.haml
index 4a515469422..bf57beb9d07 100644
--- a/app/views/projects/snippets/_actions.html.haml
+++ b/app/views/projects/snippets/_actions.html.haml
@@ -1,11 +1,27 @@
-= link_to new_namespace_project_snippet_path(@project.namespace, @project), class: 'btn btn-grouped new-snippet-link', title: "New Snippet" do
-  = icon('plus')
-  New Snippet
-- if can?(current_user, :admin_project_snippet, @snippet)
-  = link_to namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-remove", title: 'Delete Snippet' do
-    = icon('trash-o')
-    Delete
-- if can?(current_user, :update_project_snippet, @snippet)
-  = link_to edit_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-grouped snippable-edit" do
-    = icon('pencil-square-o')
-    Edit
+.hidden-xs
+  = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: 'btn btn-grouped btn-create new-snippet-link', title: "New Snippet" do
+    = icon('plus')
+    New Snippet
+  - if can?(current_user, :update_project_snippet, @snippet)
+    = link_to edit_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-grouped snippable-edit" do
+      Edit
+  - if can?(current_user, :update_project_snippet, @snippet)
+    = link_to namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-warning", title: 'Delete Snippet' do
+      Delete
+.visible-xs-block.dropdown
+  %button.btn.btn-default.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } }
+    Options
+    %span.caret
+  .dropdown-menu.dropdown-menu-full-width
+    %ul
+      %li
+        = link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "New Snippet" do
+          New Snippet
+      - if can?(current_user, :update_project_snippet, @snippet)
+        %li
+          = link_to edit_namespace_project_snippet_path(@project.namespace, @project, @snippet) do
+            Edit
+      - if can?(current_user, :update_project_snippet, @snippet)
+        %li
+          = link_to namespace_project_snippet_path(@project.namespace, @project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, title: 'Delete Snippet' do
+            Delete
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 7c599563ce4..6f7bdcb29e8 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -4,15 +4,13 @@
 .snippet-holder
   = render 'shared/snippets/header'
 
-  %article.file-holder
-    .file-title
+  %article.file-holder.file-holder-no-border.snippet-file-content
+    .file-title.file-title-clear
       = blob_icon 0, @snippet.file_name
-      %strong
-        = @snippet.file_name
+      = @snippet.file_name
       .file-actions.hidden-xs
         = clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']")
         = link_to 'Raw', raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank"
-
     = render 'shared/snippets/blob'
 
   %div#notes= render "projects/notes/notes_with_form"
diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index e65b1814872..897aa5b4462 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -1,25 +1,24 @@
-.detail-page-header
-  .snippet-box.has-tooltip{class: visibility_level_color(@snippet.visibility_level), title: snippet_visibility_level_description(@snippet.visibility_level, @snippet), data: { container: 'body' }}
+.detail-page-header.clearfix
+  .snippet-box.has-tooltip.inline.append-right-5{ title: snippet_visibility_level_description(@snippet.visibility_level, @snippet), data: { container: "body" } }
+    %span.sr-only
+      = visibility_level_label(@snippet.visibility_level)
     = visibility_level_icon(@snippet.visibility_level, fw: false)
-    = visibility_level_label(@snippet.visibility_level)
-  %span.identifier
+  %strong.item-title
     Snippet ##{@snippet.id}
   %span.creator
-    &middot; created by #{link_to_member(@project, @snippet.author, size: 24)}
-    &middot;
+    created by #{link_to_member(@project, @snippet.author, size: 24, author_class: "author item-title")}
     = time_ago_with_tooltip(@snippet.created_at, placement: 'bottom', html_class: 'snippet_updated_ago')
     - if @snippet.updated_at != @snippet.created_at
       %span
-        &middot;
         = icon('edit', title: 'edited')
         = time_ago_with_tooltip(@snippet.updated_at, placement: 'bottom', html_class: 'snippet_edited_ago')
 
-  .pull-right
+  .snippet-actions
     - if @snippet.project_id?
       = render "projects/snippets/actions"
     - else
       = render "snippets/actions"
 
-.detail-page-description.row-content-block.second-block
-  %h2.title
+.content-block.second-block
+  %h2.snippet-title.prepend-top-0.append-bottom-0
     = markdown escape_once(@snippet.title), pipeline: :single_line
diff --git a/app/views/snippets/_actions.html.haml b/app/views/snippets/_actions.html.haml
index 1979ae6d5bc..a7769654b61 100644
--- a/app/views/snippets/_actions.html.haml
+++ b/app/views/snippets/_actions.html.haml
@@ -1,11 +1,27 @@
-= link_to new_snippet_path, class: 'btn btn-grouped new-snippet-link', title: "New Snippet" do
-  = icon('plus')
-  New Snippet
-- if can?(current_user, :update_personal_snippet, @snippet)
-  = link_to edit_snippet_path(@snippet), class: "btn btn-grouped snippable-edit" do
-    = icon('pencil-square-o')
-    Edit
-- if can?(current_user, :admin_personal_snippet, @snippet)
-  = link_to snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-remove", title: 'Delete Snippet' do
-    = icon('trash-o')
-    Delete
+.hidden-xs
+  = link_to new_snippet_path, class: "btn btn-grouped btn-create new-snippet-link", title: "New Snippet" do
+    = icon('plus')
+    New Snippet
+  - if can?(current_user, :update_personal_snippet, @snippet)
+    = link_to edit_snippet_path(@snippet), class: "btn btn-grouped snippable-edit" do
+      Edit
+  - if can?(current_user, :admin_personal_snippet, @snippet)
+    = link_to snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-grouped btn-warning", title: 'Delete Snippet' do
+      Delete
+.visible-xs-block.dropdown
+  %button.btn.btn-default.btn-block.append-bottom-0.prepend-top-5{ data: { toggle: "dropdown" } }
+    Options
+    %span.caret
+  .dropdown-menu.dropdown-menu-full-width
+    %ul
+      %li
+        = link_to new_snippet_path, title: "New Snippet" do
+          New Snippet
+      - if can?(current_user, :update_personal_snippet, @snippet)
+        %li
+          = link_to edit_snippet_path(@snippet) do
+            Edit
+      - if can?(current_user, :admin_personal_snippet, @snippet)
+        %li
+          = link_to snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, title: 'Delete Snippet' do
+            Delete
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index a2b36568770..ed3992650d4 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -3,11 +3,10 @@
 .snippet-holder
   = render 'shared/snippets/header'
 
-  %article.file-holder
-    .file-title
+  %article.file-holder.file-holder-no-border.snippet-file-content
+    .file-title.file-title-clear
       = blob_icon 0, @snippet.file_name
-      %strong
-        = @snippet.file_name
+      = @snippet.file_name
       .file-actions.hidden-xs
         = clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']")
         = link_to 'Raw', raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank"

From e0cabb67d0492907e6cef21bb0ef21a6e953b70b Mon Sep 17 00:00:00 2001
From: ZJ van de Weg <zegerjan@gitlab.com>
Date: Tue, 17 May 2016 12:28:17 -0500
Subject: [PATCH 0543/1431] Fix latests concerns

---
 .../concerns/toggle_award_emoji.rb            |  2 ++
 app/controllers/projects/notes_controller.rb  | 13 +++++---
 app/models/award_emoji.rb                     |  9 -----
 app/services/notes/create_service.rb          |  6 ++--
 app/services/toggle_award_emoji_service.rb    |  9 -----
 .../merge_requests/_merge_request.html.haml   |  6 ++--
 .../merge_requests/_merge_requests.html.haml  |  1 -
 spec/features/notes_on_merge_requests_spec.rb |  8 ++---
 spec/services/notes/create_service_spec.rb    |  2 +-
 .../toggle_award_emoji_service_spec.rb        | 33 -------------------
 10 files changed, 23 insertions(+), 66 deletions(-)
 delete mode 100644 app/services/toggle_award_emoji_service.rb
 delete mode 100644 spec/services/toggle_award_emoji_service_spec.rb

diff --git a/app/controllers/concerns/toggle_award_emoji.rb b/app/controllers/concerns/toggle_award_emoji.rb
index 9cd522d1c30..09ff44f291b 100644
--- a/app/controllers/concerns/toggle_award_emoji.rb
+++ b/app/controllers/concerns/toggle_award_emoji.rb
@@ -7,7 +7,9 @@ module ToggleAwardEmoji
 
   def toggle_award_emoji
     name = params.require(:name)
+
     awardable.toggle_award_emoji(name, current_user)
+    TodoService.new.new_award_emoji(awardable, current_user)
 
     render json: { ok: true }
   end
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index eb5137fe999..b097f609c63 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -22,10 +22,8 @@ class Projects::NotesController < Projects::ApplicationController
   def create
     @note = Notes::CreateService.new(project, current_user, note_params).execute
 
-    @note = @note.is_a?(AwardEmoji) ? @note.to_note_json : note_json(@note)
-
     respond_to do |format|
-      format.json { render json: @note }
+      format.json { render json: note_json(@note) }
       format.html { redirect_back_or_default }
     end
   end
@@ -109,7 +107,14 @@ class Projects::NotesController < Projects::ApplicationController
   end
 
   def note_json(note)
-    if note.valid?
+    if note.is_a?(AwardEmoji)
+      {
+        valid:  note.valid?,
+        award:  true,
+        id:     note.id,
+        name:   note.name
+      }
+    elsif note.valid?
       {
         valid: true,
         id: note.id,
diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb
index 44a9b55a8a6..59c7d87f5df 100644
--- a/app/models/award_emoji.rb
+++ b/app/models/award_emoji.rb
@@ -23,13 +23,4 @@ class AwardEmoji < ActiveRecord::Base
   def upvote?
     self.name == UPVOTE_NAME
   end
-
-  def to_note_json
-    {
-      valid:  valid?,
-      award:  true,
-      id:     id,
-      name:   name
-    }
-  end
 end
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 509deb898b1..44ff96f9bd8 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -6,8 +6,10 @@ module Notes
       note.system = false
 
       if note.award_emoji?
-        return ToggleAwardEmojiService.new(project, current_user, params).
-                                        execute(note.noteable, note.award_emoji_name)
+        noteable = note.noteable
+        todo_service.new_award_emoji(noteable, current_user)
+
+        return noteable.create_award_emoji(note.award_emoji_name, current_user)
       end
 
       return unless valid_project?(note)
diff --git a/app/services/toggle_award_emoji_service.rb b/app/services/toggle_award_emoji_service.rb
deleted file mode 100644
index 1820f57f564..00000000000
--- a/app/services/toggle_award_emoji_service.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_relative 'base_service'
-
-class ToggleAwardEmojiService < BaseService
-  def execute(awardable, emoji)
-    todo_service.new_award_emoji(awardable, current_user)
-
-    awardable.toggle_award_emoji(emoji, current_user)
-  end
-end
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index eaee5180176..bcc6c4f2d5f 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -37,9 +37,9 @@
 
       - note_count = merge_request.mr_and_commit_notes.user.count
       %li
-         = link_to merge_request_path(merge_request, anchor: 'notes'), class: ('merge-request-no-comments' if note_count.zero?) do
-           = icon('comments')
-           = note_count
+        = link_to merge_request_path(merge_request, anchor: 'notes'), class: ('merge-request-no-comments' if note_count.zero?) do
+          = icon('comments')
+          = note_count
 
   .merge-request-info
     #{merge_request.to_reference} &middot;
diff --git a/app/views/projects/merge_requests/_merge_requests.html.haml b/app/views/projects/merge_requests/_merge_requests.html.haml
index 5473fa19166..446887774a4 100644
--- a/app/views/projects/merge_requests/_merge_requests.html.haml
+++ b/app/views/projects/merge_requests/_merge_requests.html.haml
@@ -6,4 +6,3 @@
 
 - if @merge_requests.present?
   = paginate @merge_requests, theme: "gitlab"
-
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 9e2bdd7f5bb..c93497970d7 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -8,12 +8,12 @@ describe 'Comments', feature: true do
     it 'excludes award_emoji from comment count' do
       merge_request = create(:merge_request)
       project = merge_request.source_project
-      create(:award_emoji, awardable: merge_request, project: project)
+      create(:award_emoji, awardable: merge_request)
 
       login_as :admin
       visit namespace_project_merge_requests_path(project.namespace, project)
 
-      expect(merge_request.mr_and_commit_notes.count).to eq 1
+      expect(merge_request.mr_and_commit_notes.count).to eq 0
       expect(page.all('.merge-request-no-comments').first.text).to eq "0"
     end
   end
@@ -146,11 +146,11 @@ describe 'Comments', feature: true do
 
     describe 'comment info' do
       it 'excludes award_emoji from comment count' do
-        create(:award_emoji, awardable: merge_request, project: project)
+        create(:award_emoji, awardable: merge_request)
 
         visit namespace_project_merge_request_path(project.namespace, project, merge_request)
 
-        expect(merge_request.mr_and_commit_notes.count).to eq 2
+        expect(merge_request.mr_and_commit_notes.count).to eq 1
         expect(find('.notes-tab span.badge').text).to eq "1"
       end
     end
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 4e62e3975ea..35f576874b8 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -59,7 +59,7 @@ describe Notes::CreateService, services: true do
         noteable_id: issue.id
       }
 
-      expect_any_instance_of(ToggleAwardEmojiService).to receive(:execute).with(issue, "thumbsup")
+      expect_any_instance_of(TodoService).to receive(:new_award_emoji).with(issue, user)
 
       Notes::CreateService.new(project, user, opts).execute
     end
diff --git a/spec/services/toggle_award_emoji_service_spec.rb b/spec/services/toggle_award_emoji_service_spec.rb
deleted file mode 100644
index b9d63bd70a7..00000000000
--- a/spec/services/toggle_award_emoji_service_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe ToggleAwardEmoji, services: true do
-  let(:project) { create(:project) }
-  let(:user)    { create(:user) }
-  let(:issue)   { create(:issue, project: project) }
-
-  before do
-    project.team << [user, :master]
-  end
-
-  describe '#execute' do
-    it 'removes related todos' do
-      expect_any_instance_of(TodoService).to receive(:new_award_emoji).with(issue, user)
-
-      ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsdown")
-    end
-
-    context 'when the emoji is set' do
-      it 'removes the emoji' do
-        create(:award_emoji, awardable: issue, user: user)
-
-        expect { ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsup") }.to change { AwardEmoji.count }.by(-1)
-      end
-    end
-
-    context 'when the award is not set yet' do
-      it 'awards the emoji' do
-        expect { ToggleAwardEmojiService.new(project, user).execute(issue, "thumbsup") }.to change { AwardEmoji.count }.by(1)
-      end
-    end
-  end
-end

From 3eacb19781d7812b8164b8ef65d290b09682ba57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 10:38:01 -0500
Subject: [PATCH 0544/1431] Fix 8.7.6 CHANGELOG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b4d960c5844..2dd80779541 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -62,10 +62,8 @@ v 8.8.0 (unreleased)
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
-  - Fix import from gitlab.com to a private instance failure
-
-v 8.7.6
-  - Fix external imports not finding the import data
+  - Fix import from GitLab.com to a private instance failure. !4181
+  - Fix external imports not finding the import data. !4106
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From 80817644a74e6ead62c2c66d4bd2826ecf634393 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Wed, 16 Sep 2015 13:19:46 +0200
Subject: [PATCH 0545/1431] Improve issue formatting in Slack service

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
---
 CHANGELOG                                     |  3 +++
 .../slack_service/issue_message.rb            | 19 ++++++++++++++++---
 .../slack_service/issue_message_spec.rb       | 11 ++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2dd80779541..d30c0e2a3f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -894,6 +894,9 @@ v 8.1.3
   - Add Facebook authentication
 
 v 8.1.2
+  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
+
+v 8.1.1
   - Fix cloning Wiki repositories via HTTP (Stan Hu)
   - Add migration to remove satellites directory
   - Fix specific runners visibility
diff --git a/app/models/project_services/slack_service/issue_message.rb b/app/models/project_services/slack_service/issue_message.rb
index 438ff33fdff..88e053ec192 100644
--- a/app/models/project_services/slack_service/issue_message.rb
+++ b/app/models/project_services/slack_service/issue_message.rb
@@ -34,7 +34,12 @@ class SlackService
     private
 
     def message
-      "#{user_name} #{state} #{issue_link} in #{project_link}: *#{title}*"
+      case state
+      when "opened"
+        "[#{project_link}] Issue #{state} by #{user_name}"
+      else
+        "[#{project_link}] Issue #{issue_link} #{state} by #{user_name}"
+      end
     end
 
     def opened_issue?
@@ -42,7 +47,11 @@ class SlackService
     end
 
     def description_message
-      [{ text: format(description), color: attachment_color }]
+      [{
+        title: issue_title,
+        title_link: issue_url,
+        text: format(description),
+        color: "#C95823" }]
     end
 
     def project_link
@@ -50,7 +59,11 @@ class SlackService
     end
 
     def issue_link
-      "[issue ##{issue_iid}](#{issue_url})"
+      "[#{issue_title}](#{issue_url})"
+    end
+
+    def issue_title
+      "##{issue_iid} #{title}"
     end
   end
 end
diff --git a/spec/models/project_services/slack_service/issue_message_spec.rb b/spec/models/project_services/slack_service/issue_message_spec.rb
index f648cbe2dee..0f8889bdf3c 100644
--- a/spec/models/project_services/slack_service/issue_message_spec.rb
+++ b/spec/models/project_services/slack_service/issue_message_spec.rb
@@ -25,7 +25,7 @@ describe SlackService::IssueMessage, models: true do
     }
   end
 
-  let(:color) { '#345' }
+  let(:color) { '#C95823' }
 
   context '#initialize' do
     before do
@@ -40,10 +40,11 @@ describe SlackService::IssueMessage, models: true do
   context 'open' do
     it 'returns a message regarding opening of issues' do
       expect(subject.pretext).to eq(
-        'Test User opened <url|issue #100> in <somewhere.com|project_name>: '\
-        '*Issue title*')
+        '<somewhere.com|[project_name>] Issue opened by Test User')
       expect(subject.attachments).to eq([
         {
+          title: "#100 Issue title",
+          title_link: "url",
           text: "issue description",
           color: color,
         }
@@ -56,10 +57,10 @@ describe SlackService::IssueMessage, models: true do
       args[:object_attributes][:action] = 'close'
       args[:object_attributes][:state] = 'closed'
     end
+
     it 'returns a message regarding closing of issues' do
       expect(subject.pretext). to eq(
-        'Test User closed <url|issue #100> in <somewhere.com|project_name>: '\
-        '*Issue title*')
+        '<somewhere.com|[project_name>] Issue <url|#100 Issue title> closed by Test User')
       expect(subject.attachments).to be_empty
     end
   end

From afa3e1ded1ba6b2cb3837cf3da29ff191a18e2bd Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Tue, 10 May 2016 22:08:06 +0200
Subject: [PATCH 0546/1431] Add changelog entry

---
 CHANGELOG | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d30c0e2a3f9..f060643c066 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -70,6 +70,7 @@ v 8.7.5
   - Fix always showing build notification message when switching between merge requests !4086
   - Fix an issue when filtering merge requests with more than one label. !3886
   - Fix short note for the default scope on build page (Takuya Noguchi)
+  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
@@ -893,9 +894,6 @@ v 8.1.3
   - Use issue editor as cross reference comment author when issue is edited with a new mention
   - Add Facebook authentication
 
-v 8.1.2
-  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
-
 v 8.1.1
   - Fix cloning Wiki repositories via HTTP (Stan Hu)
   - Add migration to remove satellites directory

From 78e2d0ac3c6d4e4477625840063e0d4a54f36594 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Wed, 18 May 2016 11:12:21 -0500
Subject: [PATCH 0547/1431] Move to the latest version in the CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index f060643c066..9baab4734c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -59,6 +59,7 @@ v 8.8.0 (unreleased)
   - Add counter metrics for rails cache
   - Import pull requests from GitHub where the source or target branches were removed
   - All Grape API helpers are now instrumented
+  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
@@ -70,7 +71,6 @@ v 8.7.5
   - Fix always showing build notification message when switching between merge requests !4086
   - Fix an issue when filtering merge requests with more than one label. !3886
   - Fix short note for the default scope on build page (Takuya Noguchi)
-  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)

From 27fdd3fe50bd576dc5372c9877eee0216d71c2f1 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 18 May 2016 17:14:55 +0100
Subject: [PATCH 0548/1431] Maintain commit order in MRs

`Gitlab::Git::Compare` will already have the correct order; sorting in
Ruby can only ruin that. (The correct order being the same as `git log`
- reverse chronological while maintaining the commit graph.)

As an example, imagine a branch where someone has their system clock set
wrong for some of the commits. Not only will those commits be in the
wrong order - which is maybe reasonable - but sorting in Ruby can also
put commits with the same timestamp out of order, as Ruby's sorting
isn't stable.
---
 app/models/merge_request_diff.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 6ad8fc3f034..7d5103748f5 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -98,9 +98,7 @@ class MergeRequestDiff < ActiveRecord::Base
     commits = compare.commits
 
     if commits.present?
-      commits = Commit.decorate(commits, merge_request.source_project).
-        sort_by(&:created_at).
-        reverse
+      commits = Commit.decorate(commits, merge_request.source_project).reverse
     end
 
     commits

From 8a8b5497c5142f225fb4fa3f5441526a0652869a Mon Sep 17 00:00:00 2001
From: Adam Butler <adam@littlebigmedia.co.uk>
Date: Wed, 6 Apr 2016 20:37:09 +0100
Subject: [PATCH 0549/1431] Create DiffFilter and change
 SystemNoteService#change_title to use Gitlab::Diff::InlineDiff

---
 CHANGELOG                                     |  4 ++
 app/assets/stylesheets/framework/files.scss   | 16 -----
 .../stylesheets/framework/typography.scss     |  8 +++
 .../stylesheets/framework/variables.scss      |  3 +
 app/helpers/diff_helper.rb                    |  4 +-
 app/services/system_note_service.rb           |  9 ++-
 app/views/projects/diffs/_file.html.haml      |  6 +-
 lib/banzai/filter/inline_diff_filter.rb       | 22 ++++++
 lib/banzai/pipeline/gfm_pipeline.rb           |  3 +-
 lib/gitlab/diff/inline_diff_marker.rb         | 26 +++++--
 spec/features/markdown_spec.rb                |  4 ++
 spec/fixtures/markdown.md.erb                 | 13 ++++
 spec/helpers/diff_helper_spec.rb              |  4 +-
 .../banzai/filter/inline_diff_filter_spec.rb  | 68 +++++++++++++++++++
 spec/services/issues/update_service_spec.rb   |  4 +-
 .../merge_requests/update_service_spec.rb     |  4 +-
 spec/services/system_note_service_spec.rb     |  2 +-
 spec/support/matchers/markdown_matchers.rb    | 10 +++
 18 files changed, 172 insertions(+), 38 deletions(-)
 create mode 100644 lib/banzai/filter/inline_diff_filter.rb
 create mode 100644 spec/lib/banzai/filter/inline_diff_filter_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 2dd80779541..71964051bb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -100,6 +100,10 @@ v 8.7.1
   - Prevent users from deleting Webhooks via API they do not own
   - Fix Error 500 due to stale cache when projects are renamed or transferred
   - Update width of search box to fix Safari bug. !3900 (Jedidiah)
+  - Added inline diff styling for `change_title` system notes. !3576 (Adam Butler)
+  - Added `InlineDiffFilter` to the markdown parser. !3576 (Adam Butler)
+
+v 8.7.1 (unreleased)
   - Use the `can?` helper instead of `current_user.can?`
 
 v 8.7.0
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 61d9954c6c8..8c96c7a9c31 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -36,22 +36,6 @@
       }
     }
 
-    .filename {
-      &.old {
-        display: inline-block;
-        span.idiff {
-          background-color: #f8cbcb;
-        }
-      }
-
-      &.new {
-        display: inline-block;
-        span.idiff {
-          background-color: #a6f3a6;
-        }
-      }
-    }
-
     a:not(.btn) {
       color: $gl-dark-link-color;
     }
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 2779cd56788..487081c3c7c 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -269,3 +269,11 @@ h1, h2, h3, h4 {
     text-align: right;
   }
 }
+
+.idiff.deletion {
+  background: $gl-idiff-deletion;
+}
+
+.idiff.addition {
+  background: $gl-idiff-addition;
+}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 5fa4c266607..b7d8f611621 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -178,6 +178,9 @@ $table-border-gray: #f0f0f0;
 $line-target-blue: #eaf3fc;
 $line-select-yellow: #fcf8e7;
 $line-select-yellow-dark: #f0e2bd;
+$gl-idiff-deletion: #f8cbcb;
+$gl-idiff-addition: #a6f3a6;
+
 /*
  * Fonts
  */
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 5f311f3780a..ea383f9b0f6 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -2,8 +2,8 @@ module DiffHelper
   def mark_inline_diffs(old_line, new_line)
     old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs
 
-    marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs)
-    marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs)
+    marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs, mode: :deletion)
+    marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs, mode: :addition)
 
     [marked_old_line, marked_new_line]
   end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 4bdb1b0c074..758abd7f547 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -171,7 +171,14 @@ class SystemNoteService
   def self.change_title(noteable, project, author, old_title)
     return unless noteable.respond_to?(:title)
 
-    body = "Title changed from **#{old_title}** to **#{noteable.title}**"
+    new_title = noteable.title.dup
+
+    old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_title, new_title).inline_diffs
+
+    marked_old_title = Gitlab::Diff::InlineDiffMarker.new(old_title).mark(old_diffs, mode: :deletion, markdown: true)
+    marked_new_title = Gitlab::Diff::InlineDiffMarker.new(new_title).mark(new_diffs, mode: :addition, markdown: true)
+
+    body = "Changed title: **#{marked_old_title}** → **#{marked_new_title}**"
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
 
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 0f04fc5d33c..7194d9c3ebb 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -11,11 +11,9 @@
       = link_to "#diff-#{i}" do
         - if diff_file.renamed_file
           - old_path, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path)
-          .filename.old
-            = old_path
+          = old_path
           &rarr;
-          .filename.new
-            = new_path
+          = new_path
         - else
           %span
             = diff_file.new_path
diff --git a/lib/banzai/filter/inline_diff_filter.rb b/lib/banzai/filter/inline_diff_filter.rb
new file mode 100644
index 00000000000..9e75edd4d4c
--- /dev/null
+++ b/lib/banzai/filter/inline_diff_filter.rb
@@ -0,0 +1,22 @@
+module Banzai
+  module Filter
+    class InlineDiffFilter < HTML::Pipeline::Filter
+      IGNORED_ANCESTOR_TAGS = %w(pre code tt).to_set
+
+      def call
+        search_text_nodes(doc).each do |node|
+          next if has_ancestor?(node, IGNORED_ANCESTOR_TAGS)
+
+          content = node.to_html
+          content = content.gsub(/(?:\[\-(.*?)\-\]|\{\-(.*?)\-\})/, '<span class="idiff left right deletion">\1\2</span>')
+          content = content.gsub(/(?:\[\+(.*?)\+\]|\{\+(.*?)\+\})/, '<span class="idiff left right addition">\1\2</span>')
+
+          next if html == content
+
+          node.replace(content)
+        end
+        doc
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index ed3cfd6b023..b27ecf3c923 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -23,7 +23,8 @@ module Banzai
           Filter::LabelReferenceFilter,
           Filter::MilestoneReferenceFilter,
 
-          Filter::TaskListFilter
+          Filter::TaskListFilter,
+          Filter::InlineDiffFilter
         ]
       end
 
diff --git a/lib/gitlab/diff/inline_diff_marker.rb b/lib/gitlab/diff/inline_diff_marker.rb
index dccb717e95d..c9601d42d50 100644
--- a/lib/gitlab/diff/inline_diff_marker.rb
+++ b/lib/gitlab/diff/inline_diff_marker.rb
@@ -1,6 +1,11 @@
 module Gitlab
   module Diff
     class InlineDiffMarker
+      MARKDOWN_SYMBOLS = {
+        addition: "+",
+        deletion: "-"
+      }
+
       attr_accessor :raw_line, :rich_line
 
       def initialize(raw_line, rich_line = raw_line)
@@ -8,7 +13,7 @@ module Gitlab
         @rich_line = ERB::Util.html_escape(rich_line)
       end
 
-      def mark(line_inline_diffs)
+      def mark(line_inline_diffs, mode: nil, markdown: false)
         return rich_line unless line_inline_diffs
 
         marker_ranges = []
@@ -20,13 +25,12 @@ module Gitlab
         end
 
         offset = 0
-        # Mark each range
-        marker_ranges.each_with_index do |range, i|
-          class_names = ["idiff"]
-          class_names << "left"   if i == 0
-          class_names << "right"  if i == marker_ranges.length - 1
 
-          offset = insert_around_range(rich_line, range, "<span class='#{class_names.join(" ")}'>", "</span>", offset)
+        # Mark each range
+        marker_ranges.each_with_index do |range, index|
+          before_content = markdown ? "{#{MARKDOWN_SYMBOLS[mode]}" : "<span class='#{html_class_names(marker_ranges, mode, index)}'>"
+          after_content = markdown ? "#{MARKDOWN_SYMBOLS[mode]}}" : "</span>"
+          offset = insert_around_range(rich_line, range, before_content, after_content, offset)
         end
 
         rich_line.html_safe
@@ -34,6 +38,14 @@ module Gitlab
 
       private
 
+      def html_class_names(marker_ranges, mode, index)
+        class_names = ["idiff"]
+        class_names << "left"  if index == 0
+        class_names << "right" if index == marker_ranges.length - 1
+        class_names << mode if mode
+        class_names.join(" ")
+      end
+
       # Mapping of character positions in the raw line, to the rich (highlighted) line
       def position_mapping
         @position_mapping ||= begin
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 0148c87084a..1d892fe1a55 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -278,6 +278,10 @@ describe 'GitLab Markdown', feature: true do
     it 'includes GollumTagsFilter' do
       expect(doc).to parse_gollum_tags
     end
+
+    it 'includes InlineDiffFilter' do
+      expect(doc).to parse_inline_diffs
+    end
   end
 
   # Fake a `current_user` helper
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 1772cc3f6a4..92c7fdf27bd 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -239,3 +239,16 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e
 - [[link-text|http://example.com/pdfs/gollum.pdf]]
 - [[images/example.jpg]]
 - [[http://example.com/images/example.jpg]]
+
+### Inline Diffs
+
+With inline diffs tags you can display {+ additions +} or [- deletions -].
+
+The wrapping tags can be either curly braces or square brackets [+ additions +] or {- deletions -}.
+
+However the wrapping tags can not be mixed as such -
+
+- {+ additions +]
+- [+ additions +}
+- {- delletions -]
+- [- delletions -}
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb
index b7810185d16..52764f41e0d 100644
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
@@ -93,9 +93,9 @@ describe DiffHelper do
     it "returns strings with marked inline diffs" do
       marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line)
 
-      expect(marked_old_line).to eq("abc <span class='idiff left right'>&#39;def&#39;</span>")
+      expect(marked_old_line).to eq("abc <span class='idiff left right deletion'>&#39;def&#39;</span>")
       expect(marked_old_line).to be_html_safe
-      expect(marked_new_line).to eq("abc <span class='idiff left right'>&quot;def&quot;</span>")
+      expect(marked_new_line).to eq("abc <span class='idiff left right addition'>&quot;def&quot;</span>")
       expect(marked_new_line).to be_html_safe
     end
   end
diff --git a/spec/lib/banzai/filter/inline_diff_filter_spec.rb b/spec/lib/banzai/filter/inline_diff_filter_spec.rb
new file mode 100644
index 00000000000..9e526371294
--- /dev/null
+++ b/spec/lib/banzai/filter/inline_diff_filter_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Banzai::Filter::InlineDiffFilter, lib: true do
+  include FilterSpecHelper
+
+  it 'adds inline diff span tags for deletions when using square brackets' do
+    doc = "START [-something deleted-] END"
+    expect(filter(doc).to_html).to eq('START <span class="idiff left right deletion">something deleted</span> END')
+  end
+
+  it 'adds inline diff span tags for deletions when using curley braces' do
+    doc = "START {-something deleted-} END"
+    expect(filter(doc).to_html).to eq('START <span class="idiff left right deletion">something deleted</span> END')
+  end
+
+  it 'does not add inline diff span tags when a closing tag is not provided' do
+    doc = "START [- END"
+    expect(filter(doc).to_html).to eq(doc)
+  end
+
+  it 'adds inline span tags for additions when using square brackets' do
+    doc = "START [+something added+] END"
+    expect(filter(doc).to_html).to eq('START <span class="idiff left right addition">something added</span> END')
+  end
+
+  it 'adds inline span tags for additions  when using curley braces' do
+    doc = "START {+something added+} END"
+    expect(filter(doc).to_html).to eq('START <span class="idiff left right addition">something added</span> END')
+  end
+
+  it 'does not add inline diff span tags when a closing addition tag is not provided' do
+    doc = "START {+ END"
+    expect(filter(doc).to_html).to eq(doc)
+  end
+
+  it 'does not add inline diff span tags when the tags do not match' do
+    examples = [
+      "{+ additions +]",
+      "[+ additions +}",
+      "{- delletions -]",
+      "[- delletions -}"
+    ]
+
+    examples.each do |doc|
+      expect(filter(doc).to_html).to eq(doc)
+    end
+  end
+
+  it 'prevents user-land html being injected' do
+    doc = "START {+&lt;script&gt;alert('I steal cookies')&lt;/script&gt;+} END"
+    expect(filter(doc).to_html).to eq("START <span class=\"idiff left right addition\">&lt;script&gt;alert('I steal cookies')&lt;/script&gt;</span> END")
+  end
+
+  it 'preserves content inside pre tags' do
+    doc = "<pre>START {+something added+} END</pre>"
+    expect(filter(doc).to_html).to eq(doc)
+  end
+
+  it 'preserves content inside code tags' do
+    doc = "<code>START {+something added+} END</code>"
+    expect(filter(doc).to_html).to eq(doc)
+  end
+
+  it 'preserves content inside tt tags' do
+    doc = "<tt>START {+something added+} END</tt>"
+    expect(filter(doc).to_html).to eq(doc)
+  end
+end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 52f69306994..ff63f2ce8de 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -79,10 +79,10 @@ describe Issues::UpdateService, services: true do
       end
 
       it 'creates system note about title change' do
-        note = find_note('Title changed')
+        note = find_note('Changed title:')
 
         expect(note).not_to be_nil
-        expect(note.note).to eq 'Title changed from **Old title** to **New title**'
+        expect(note.note).to eq 'Changed title: **{-Old-} title** → **{+New+} title**'
       end
     end
 
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 213e8c2eb3a..56ee3e43056 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -90,10 +90,10 @@ describe MergeRequests::UpdateService, services: true do
       end
 
       it 'creates system note about title change' do
-        note = find_note('Title changed')
+        note = find_note('Changed title:')
 
         expect(note).not_to be_nil
-        expect(note.note).to eq 'Title changed from **Old title** to **New title**'
+        expect(note.note).to eq 'Changed title: **{-Old-} title** → **{+New+} title**'
       end
 
       it 'creates system note about branch change' do
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 5fbf2ae5247..3957546b18d 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -241,7 +241,7 @@ describe SystemNoteService, services: true do
 
       it 'sets the note text' do
         expect(subject.note).
-          to eq "Title changed from **Old title** to **#{noteable.title}**"
+          to eq "Changed title: **{-Old title-}** → **{+#{noteable.title}+}**"
       end
     end
 
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb
index 43cb6ef43f2..259aa469a18 100644
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -168,6 +168,16 @@ module MarkdownMatchers
       expect(actual).to have_selector('input[checked]', count: 3)
     end
   end
+
+  # InlineDiffFilter
+  matcher :parse_inline_diffs do
+    set_default_markdown_messages
+
+    match do |actual|
+      expect(actual).to have_selector('span.idiff.addition', count: 2)
+      expect(actual).to have_selector('span.idiff.deletion', count: 2)
+    end
+  end
 end
 
 # Monkeypatch the matcher DSL so that we can reduce some noisy duplication for

From 6daec9e6f1a83a2a38b791a24f39e8e4b539c873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 11:05:51 -0500
Subject: [PATCH 0550/1431] Add documentation for Inline Diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                |  6 ++----
 doc/markdown/markdown.md | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 71964051bb1..3e1f8efa890 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,8 @@ v 8.8.0 (unreleased)
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Use a case-insensitive comparison in sanitizing URI schemes
   - Toggle sign-up confirmation emails in application settings
+  - Added `InlineDiffFilter` to the markdown parser. (Adam Butler)
+  - Added inline diff styling for `change_title` system notes. (Adam Butler)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
   - Improve multiple branch push performance by memoizing permission checking
@@ -100,10 +102,6 @@ v 8.7.1
   - Prevent users from deleting Webhooks via API they do not own
   - Fix Error 500 due to stale cache when projects are renamed or transferred
   - Update width of search box to fix Safari bug. !3900 (Jedidiah)
-  - Added inline diff styling for `change_title` system notes. !3576 (Adam Butler)
-  - Added `InlineDiffFilter` to the markdown parser. !3576 (Adam Butler)
-
-v 8.7.1 (unreleased)
   - Use the `can?` helper instead of `current_user.can?`
 
 v 8.7.0
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 4f199b6af6f..b0c6d6a4bbf 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -8,6 +8,7 @@
 * [Multiple underscores in words](#multiple-underscores-in-words)
 * [URL auto-linking](#url-auto-linking)
 * [Code and Syntax Highlighting](#code-and-syntax-highlighting)
+* [Inline Diff](#inline-diff)
 * [Emoji](#emoji)
 * [Special GitLab references](#special-gitlab-references)
 * [Task lists](#task-lists)
@@ -153,6 +154,19 @@ s = "There is no highlighting for this."
 But let's throw in a <b>tag</b>.
 ```
 
+## Inline Diff
+
+With inline diffs tags you can display {+ additions +} or [- deletions -].
+
+The wrapping tags can be either curly braces or square brackets [+ additions +] or {- deletions -}.
+
+However the wrapping tags cannot be mixed as such:
+
+- {+ additions +]
+- [+ additions +}
+- {- deletions -]
+- [- deletions -}
+
 ## Emoji
 
 	Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:

From 2f1cb7ce0439de003e92c55a27c6a8db7f0f1803 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 18 May 2016 11:22:28 -0500
Subject: [PATCH 0551/1431] Improve code design

---
 app/controllers/projects/container_registry_controller.rb | 6 ++++--
 app/models/project.rb                                     | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index 8ed5a8ff6fd..3648f8894a6 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -8,10 +8,12 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
   end
 
   def destroy
+    url = namespace_project_container_registry_index_path(project.namespace, project)
+
     if tag.delete
-      redirect_to namespace_project_container_registry_index_path(project.namespace, project)
+      redirect_to url
     else
-      redirect_to namespace_project_container_registry_index_path(project.namespace, project), alert: 'Failed to remove tag'
+      redirect_to url, alert: 'Failed to remove tag'
     end
   end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 09a214da043..321a1932a20 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -331,6 +331,8 @@ class Project < ActiveRecord::Base
   end
 
   def container_registry_repository
+    return unless Gitlab.config.registry.enabled
+
     @container_registry_repository ||= begin
       token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
       url = Gitlab.config.registry.api_url
@@ -347,9 +349,9 @@ class Project < ActiveRecord::Base
   end
 
   def has_container_registry_tags?
-    if Gitlab.config.registry.enabled
-      container_registry_repository.tags.any?
-    end
+    return unless container_registry_repository
+
+    container_registry_repository.tags.any?
   end
 
   def commit(id = 'HEAD')

From 66c421c0a788ab88f871103a26dceefc67585eec Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 18 May 2016 10:51:11 +0100
Subject: [PATCH 0552/1431] Link to group feed from group activity page

---
 CHANGELOG                              | 1 +
 app/views/groups/_activities.html.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 48e38899607..61c6f80af21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@ v 8.8.0 (unreleased)
   - Create tags using Rugged for performance reasons. !3745
   - API: Expose Issue#user_notes_count. !3126 (Anton Popov)
   - Don't show forks button when user can't view forks
+  - Fix atom feed links and rendering
   - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml
index dc76599b776..71cc4d87b1f 100644
--- a/app/views/groups/_activities.html.haml
+++ b/app/views/groups/_activities.html.haml
@@ -4,7 +4,7 @@
 .nav-block
   - if current_user
     .controls
-      = link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn' do
+      = link_to group_path(@group, format: :atom, private_token: current_user.private_token), class: 'btn rss-btn' do
         %i.fa.fa-rss
   = render 'shared/event_filter'
 

From 98a7486ba76eb7235174b4b6f74794c664df29da Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 18 May 2016 12:28:48 -0500
Subject: [PATCH 0553/1431] Verify if registry is enabled in registry

---
 app/controllers/projects/container_registry_controller.rb | 5 +++++
 app/helpers/projects_helper.rb                            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects/container_registry_controller.rb b/app/controllers/projects/container_registry_controller.rb
index 3648f8894a6..d1f46497207 100644
--- a/app/controllers/projects/container_registry_controller.rb
+++ b/app/controllers/projects/container_registry_controller.rb
@@ -1,4 +1,5 @@
 class Projects::ContainerRegistryController < Projects::ApplicationController
+  before_action :verify_registry_enabled
   before_action :authorize_read_container_image!
   before_action :authorize_update_container_image!, only: [:destroy]
   layout 'project'
@@ -19,6 +20,10 @@ class Projects::ContainerRegistryController < Projects::ApplicationController
 
   private
 
+  def verify_registry_enabled
+    render_404 unless Gitlab.config.registry.enabled
+  end
+
   def container_registry_repository
     @container_registry_repository ||= project.container_registry_repository
   end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index b6ba66bf3e5..a140bbc3c67 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,7 +152,7 @@ module ProjectsHelper
       nav_tabs << :builds
     end
 
-    if project.container_registry_repository_url.present? && can?(current_user, :read_container_image, project)
+    if Gitlab.config.registry.enabled && can?(current_user, :read_container_image, project)
       nav_tabs << :container_registry
     end
 

From ef60b8e1685a8761477e822b3190a3a0cf4b0cfa Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 18 May 2016 13:02:10 -0500
Subject: [PATCH 0554/1431] Use pipelines.errors when communicating the error

---
 .../projects/pipelines_controller.rb          | 14 ++++----
 app/services/ci/create_pipeline_service.rb    | 36 +++++++++++--------
 app/views/projects/pipelines/new.html.haml    |  7 ++--
 spec/features/pipelines_spec.rb               | 15 +++++---
 4 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 19071cc9e43..1282913d981 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -15,19 +15,17 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def new
+    @pipeline = project.ci_commits.new
   end
 
   def create
-    begin
-      pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute
-      redirect_to namespace_project_pipeline_path(project.namespace, project, pipeline)
-    rescue ArgumentError => e
-      flash[:alert] = e.message
-      render 'new'
-    rescue
-      flash[:alert] = 'The pipeline could not be created. Please try again.'
+    @pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute
+    unless @pipeline.persisted?
       render 'new'
+      return
     end
+
+    redirect_to namespace_project_pipeline_path(project.namespace, project, @pipeline)
   end
 
   def show
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index e13f4fce13d..b864807ec35 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -1,27 +1,39 @@
 module Ci
   class CreatePipelineService < BaseService
     def execute
+      pipeline = project.ci_commits.new
+
       unless ref_names.include?(params[:ref])
-        raise ArgumentError, 'Reference not found'
+        pipeline.errors.add(:base, 'Reference not found')
+        return pipeline
       end
 
       unless commit
-        raise ArgumentError, 'Commit not found'
+        pipeline.errors.add(:base, 'Commit not found')
+        return pipeline
       end
 
       unless can?(current_user, :create_pipeline, project)
-        raise RuntimeError, 'Insufficient permissions to create a new pipeline'
+        pipeline.errors.add(:base, 'Insufficient permissions to create a new pipeline')
+        return pipeline
       end
 
-      pipeline = new_pipeline
+      begin
+        Ci::Commit.transaction do
+          pipeline.sha = commit.id
+          pipeline.ref = params[:ref]
+          pipeline.before_sha = Gitlab::Git::BLANK_SHA
 
-      Ci::Commit.transaction do
-        unless pipeline.config_processor
-          raise ArgumentError, pipeline.yaml_errors || 'Missing .gitlab-ci.yml file'
+          unless pipeline.config_processor
+            pipeline.errors.add(:base, pipeline.yaml_errors || 'Missing .gitlab-ci.yml file')
+            raise ActiveRecord::Rollback
+          end
+
+          pipeline.save!
+          pipeline.create_builds(current_user)
         end
-
-        pipeline.save!
-        pipeline.create_builds(current_user)
+      rescue
+        pipeline.errors.add(:base, 'The pipeline could not be created. Please try again.')
       end
 
       pipeline
@@ -29,10 +41,6 @@ module Ci
 
     private
 
-    def new_pipeline
-      project.ci_commits.new(sha: commit.id, ref: params[:ref], before_sha: Gitlab::Git::BLANK_SHA)
-    end
-
     def ref_names
       @ref_names ||= project.repository.ref_names
     end
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index 534a495dd85..1050b28b381 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -1,15 +1,12 @@
 - page_title "New Pipeline"
 = render "header_title"
 
-- if @error
-  .alert.alert-danger
-    %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
-    = @error
 %h3.page-title
   New Pipeline
 %hr
 
-= form_tag namespace_project_pipelines_path, method: :post, id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" do
+= form_for @pipeline, url: namespace_project_pipelines_path(@project.namespace, @project), html: { id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" } do
+  = form_errors(@pipeline)
   .form-group
     = label_tag :ref, 'Create for', class: 'control-label'
     .col-sm-10
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 1df516eafd5..32665aadd22 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -126,12 +126,19 @@ describe "Pipelines" do
     before { visit new_namespace_project_pipeline_path(project.namespace, project) }
 
     context 'for valid commit' do
-      before do
-        fill_in('Create for', with: 'master')
-        stub_ci_commit_to_return_yaml_file
+      before { fill_in('Create for', with: 'master') }
+
+      context 'with gitlab-ci.yml' do
+        before { stub_ci_commit_to_return_yaml_file }
+
+        it { expect{ click_on 'Create pipeline' }.to change{ Ci::Commit.count }.by(1) }
       end
 
-      it { expect{ click_on 'Create pipeline' }.to change{ Ci::Commit.count }.by(1) }
+      context 'without gitlab-ci.yml' do
+        before { click_on 'Create pipeline' }
+
+        it { expect(page).to have_content('Missing .gitlab-ci.yml file') }
+      end
     end
 
     context 'for invalid commit' do

From 5341b16fc92425d557a1c62d0329b276170eba73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 13:20:46 -0500
Subject: [PATCH 0555/1431] Reuse existing SCSS variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/assets/stylesheets/framework/typography.scss |  4 ++--
 app/assets/stylesheets/framework/variables.scss  |  2 --
 lib/gitlab/diff/inline_diff_marker.rb            | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 487081c3c7c..3575984b229 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -271,9 +271,9 @@ h1, h2, h3, h4 {
 }
 
 .idiff.deletion {
-  background: $gl-idiff-deletion;
+  background: $line-removed-dark;
 }
 
 .idiff.addition {
-  background: $gl-idiff-addition;
+  background: $line-added-dark;
 }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index b7d8f611621..542c0c53f6f 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -178,8 +178,6 @@ $table-border-gray: #f0f0f0;
 $line-target-blue: #eaf3fc;
 $line-select-yellow: #fcf8e7;
 $line-select-yellow-dark: #f0e2bd;
-$gl-idiff-deletion: #f8cbcb;
-$gl-idiff-addition: #a6f3a6;
 
 /*
  * Fonts
diff --git a/lib/gitlab/diff/inline_diff_marker.rb b/lib/gitlab/diff/inline_diff_marker.rb
index c9601d42d50..87a9b1e23ac 100644
--- a/lib/gitlab/diff/inline_diff_marker.rb
+++ b/lib/gitlab/diff/inline_diff_marker.rb
@@ -28,8 +28,18 @@ module Gitlab
 
         # Mark each range
         marker_ranges.each_with_index do |range, index|
-          before_content = markdown ? "{#{MARKDOWN_SYMBOLS[mode]}" : "<span class='#{html_class_names(marker_ranges, mode, index)}'>"
-          after_content = markdown ? "#{MARKDOWN_SYMBOLS[mode]}}" : "</span>"
+          before_content =
+            if markdown
+              "{#{MARKDOWN_SYMBOLS[mode]}"
+            else
+              "<span class='#{html_class_names(marker_ranges, mode, index)}'>"
+            end
+          after_content =
+            if markdown
+              "#{MARKDOWN_SYMBOLS[mode]}}"
+            else
+              "</span>"
+            end
           offset = insert_around_range(rich_line, range, before_content, after_content, offset)
         end
 

From b5552bc4e57f73a80e990ee4182fb48fa4851ad3 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 18 May 2016 08:48:48 -0700
Subject: [PATCH 0556/1431] Add health check feature documentation

---
 doc/README.md                             |   1 +
 doc/monitoring/health_check.md            |  57 ++++++++++++++++++++++
 doc/monitoring/img/health_check_token.png | Bin 0 -> 10884 bytes
 3 files changed, 58 insertions(+)
 create mode 100644 doc/monitoring/health_check.md
 create mode 100644 doc/monitoring/img/health_check_token.png

diff --git a/doc/README.md b/doc/README.md
index e358da1c424..8aed060d247 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -41,6 +41,7 @@
 - [Git LFS configuration](workflow/lfs/lfs_administration.md)
 - [Housekeeping](administration/housekeeping.md) Keep your Git repository tidy and fast.
 - [GitLab Performance Monitoring](monitoring/performance/introduction.md) Configure GitLab and InfluxDB for measuring performance metrics
+- [Monitoring uptime](monitoring/health_check.md) Check the server status using the health check endpoint
 - [Sidekiq Troubleshooting](administration/troubleshooting/sidekiq.md) Debug when Sidekiq appears hung and is not processing jobs
 - [High Availability](administration/high_availability/README.md) Configure multiple servers for scaling or high availability
 
diff --git a/doc/monitoring/health_check.md b/doc/monitoring/health_check.md
new file mode 100644
index 00000000000..bbfb63dd844
--- /dev/null
+++ b/doc/monitoring/health_check.md
@@ -0,0 +1,57 @@
+# Health Check
+_**Note:** This feature was [introduced][ce-3888] in GitLab 8.8_
+
+GitLab provides a health check endpoint for uptime monitoring on the `health_check` web
+endpoint. The health check reports on the overall system status based on the status of
+the database connection, the state of the database migrations, and the ability to write
+and access the cache. This endpoint can be provided to uptime monitoring services like
+[Pingdom][pindom], [Nagios][nagios-health], and [NewRelic][newrelic-health].
+
+## Access Token
+
+A access token needs to be provided while accessing the health check endpoint. The current
+accepted token can be found on the `admin/heath_check` page of your GitLab instance.
+
+![access token](img/health_check_token.png)
+
+The access token can be passed as a url parameter:
+
+`https://gitlab.example.com/health_check.json?token=ACCESS_TOKEN`
+
+or as a http header:
+
+```bash
+curl -H "TOKEN: ACCESS_TOKEN" https://gitlab.example.com/health_check.json
+```
+
+## Using the Endpoint
+
+Once you have the access token, health information can be retrieved as plain text, JSON,
+or XML using the `health_check` endpoint:
+
+- `https://gitlab.example.com/health_check?token=ACCESS_TOKEN`
+- `https://gitlab.example.com/health_check.json?token=ACCESS_TOKEN`
+- `https://gitlab.example.com/health_check.xml?token=ACCESS_TOKEN`
+
+You can also ask for the status of specific services:
+
+- `https://gitlab.example.com/health_check/cache.json?token=ACCESS_TOKEN`
+- `https://gitlab.example.com/health_check/database.json?token=ACCESS_TOKEN`
+- `https://gitlab.example.com/health_check/migrations.json?token=ACCESS_TOKEN`
+
+Example output:
+```bash
+curl -H "TOKEN: ACCESS_TOKEN" https://gitlab.example.com/health_check.json
+{"healthy":true,"message":"success"}
+```
+
+## Status
+
+On failure the endpoint will return a `500` http status code. On success the endpoint
+will return a valid successful http status code, and a `success` message. Ideally your
+uptime monitoring should look for the success message.
+
+[ce-3888]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3888
+[pingdom]: https://www.pingdom.com
+[nagios-health]: https://nagios-plugins.org/doc/man/check_http.html
+[newrelic-health]: https://docs.newrelic.com/docs/alerts/alert-policies/downtime-alerts/availability-monitoring
diff --git a/doc/monitoring/img/health_check_token.png b/doc/monitoring/img/health_check_token.png
new file mode 100644
index 0000000000000000000000000000000000000000..2daf8606b009aedda120af03baa13c36a195f07d
GIT binary patch
literal 10884
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

literal 0
HcmV?d00001


From b340ca356a652a53c30103e41a5c854a9ba1650f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 13:43:33 -0500
Subject: [PATCH 0557/1431] Remove User#tm_in_authorized_projects and
 User#tm_of
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These methods seems to be unused.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/user.rb | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 368a3f3cfba..6a09b78455b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -397,11 +397,6 @@ class User < ActiveRecord::Base
                     owned_groups.select(:id), namespace.id).joins(:namespace)
   end
 
-  # Team membership in authorized projects
-  def tm_in_authorized_projects
-    ProjectMember.where(source_id: authorized_projects.map(&:id), user_id: self.id)
-  end
-
   def is_admin?
     admin
   end
@@ -491,10 +486,6 @@ class User < ActiveRecord::Base
     "#{name} (#{username})"
   end
 
-  def tm_of(project)
-    project.project_member_by_id(self.id)
-  end
-
   def already_forked?(project)
     !!fork_of(project)
   end

From 35430f9ef72664218a3cdc0f7c06852a5d6e90ab Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 18 May 2016 12:00:26 -0700
Subject: [PATCH 0558/1431] Fix broken pingdom link in the health_check docs

---
 doc/monitoring/health_check.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/monitoring/health_check.md b/doc/monitoring/health_check.md
index bbfb63dd844..22c53a9aecd 100644
--- a/doc/monitoring/health_check.md
+++ b/doc/monitoring/health_check.md
@@ -5,7 +5,7 @@ GitLab provides a health check endpoint for uptime monitoring on the `health_che
 endpoint. The health check reports on the overall system status based on the status of
 the database connection, the state of the database migrations, and the ability to write
 and access the cache. This endpoint can be provided to uptime monitoring services like
-[Pingdom][pindom], [Nagios][nagios-health], and [NewRelic][newrelic-health].
+[Pingdom][pingdom], [Nagios][nagios-health], and [NewRelic][newrelic-health].
 
 ## Access Token
 

From b330d5d0164d86ab06679e4304a7b57449af58ee Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 18 May 2016 23:35:31 +0200
Subject: [PATCH 0559/1431] Fix changelog for 7.9.3 [ci-skip]

---
 CHANGELOG | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 70846be1c18..cdb88cafe13 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1520,20 +1520,17 @@ v 7.10.0
   - Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
   - Fix merge request comments on files with multiple commits
   - Fix Resource Owner Password Authentication Flow
-
-v 7.9.4
-  - Security: Fix project import URL regex to prevent arbitary local repos from being imported
-  - Fixed issue where only 25 commits would load in file listings
-  - Fix LDAP identities  after config update
-
-v 7.9.3
-  - Contains no changes
   - Add icons to Add dropdown items.
   - Allow admin to create public deploy keys that are accessible to any project.
   - Warn when gitlab-shell version doesn't match requirement.
   - Skip email confirmation when set by admin or via LDAP.
   - Only allow users to reference groups, projects, issues, MRs, commits they have access to.
 
+v 7.9.4
+  - Security: Fix project import URL regex to prevent arbitary local repos from being imported
+  - Fixed issue where only 25 commits would load in file listings
+  - Fix LDAP identities  after config update
+
 v 7.9.3
   - Contains no changes
 

From 4f1c63683175fa88ca41ba2180b68e266d7118e4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 18 May 2016 17:01:42 -0500
Subject: [PATCH 0560/1431] Create pipeline objects with parameters

---
 app/controllers/projects/pipelines_controller.rb | 4 ++--
 app/services/ci/create_pipeline_service.rb       | 4 +---
 app/views/projects/commit/_ci_commit.html.haml   | 4 ++--
 app/views/projects/pipelines/new.html.haml       | 8 ++++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 1282913d981..b36081205d8 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -15,7 +15,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def new
-    @pipeline = project.ci_commits.new
+    @pipeline = project.ci_commits.new(ref: @project.default_branch)
   end
 
   def create
@@ -46,7 +46,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   private
 
   def create_params
-    params.permit(:ref)
+    params.require(:pipeline).permit(:ref)
   end
 
   def pipeline
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index b864807ec35..5bc0c31cb42 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -1,7 +1,7 @@
 module Ci
   class CreatePipelineService < BaseService
     def execute
-      pipeline = project.ci_commits.new
+      pipeline = project.ci_commits.new(params)
 
       unless ref_names.include?(params[:ref])
         pipeline.errors.add(:base, 'Reference not found')
@@ -21,8 +21,6 @@ module Ci
       begin
         Ci::Commit.transaction do
           pipeline.sha = commit.id
-          pipeline.ref = params[:ref]
-          pipeline.before_sha = Gitlab::Git::BLANK_SHA
 
           unless pipeline.config_processor
             pipeline.errors.add(:base, pipeline.yaml_errors || 'Missing .gitlab-ci.yml file')
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index df92a38db31..8228c067be0 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -7,8 +7,8 @@
       - if ci_commit.builds.running_or_pending.any?
         = link_to "Cancel running", cancel_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
 
-  - if defined?(pipeline_details) && pipeline_details
-    .oneline
+  .oneline.clearfix
+    - if defined?(pipeline_details) && pipeline_details
       Pipeline
       = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
       with
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index 1050b28b381..b97c9f5f3b6 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -5,15 +5,15 @@
   New Pipeline
 %hr
 
-= form_for @pipeline, url: namespace_project_pipelines_path(@project.namespace, @project), html: { id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" } do
+= form_for @pipeline, as: :pipeline, url: namespace_project_pipelines_path(@project.namespace, @project), html: { id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" } do |f|
   = form_errors(@pipeline)
   .form-group
-    = label_tag :ref, 'Create for', class: 'control-label'
+    = f.label :ref, 'Create for', class: 'control-label'
     .col-sm-10
-      = text_field_tag :ref, params[:ref] || @project.default_branch, required: true, tabindex: 2, class: 'form-control'
+      = f.text_field :ref, required: true, tabindex: 2, class: 'form-control'
       .help-block Existing branch name, tag
   .form-actions
-    = button_tag 'Create pipeline', class: 'btn btn-create', tabindex: 3
+    = f.submit 'Create pipeline', class: 'btn btn-create', tabindex: 3
     = link_to 'Cancel', namespace_project_pipelines_path(@project.namespace, @project), class: 'btn btn-cancel'
 
 :javascript

From ce3958ebae0332ddc295c7fe234b6a8af6f25da8 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 18 May 2016 17:03:12 -0500
Subject: [PATCH 0561/1431] Use extended regexp flag for `git grep`-ing files

Closes #3055
---
 app/models/repository.rb       | 2 +-
 spec/models/repository_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3716ea6ad6c..ca62fbbdf04 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -854,7 +854,7 @@ class Repository
 
   def search_files(query, ref)
     offset = 2
-    args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -e #{Regexp.escape(query)} #{ref || root_ref})
+    args = %W(#{Gitlab.config.git.bin_path} grep -i -I -n --before-context #{offset} --after-context #{offset} -E -e #{Regexp.escape(query)} #{ref || root_ref})
     Gitlab::Popen.popen(args, path_to_repo).first.scrub.split(/^--$/)
   end
 
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 34a13f9b5c9..7c94f3639d4 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -100,6 +100,12 @@ describe Repository, models: true do
       expect(results.first).not_to start_with('fatal:')
     end
 
+    it 'properly handles an unmatched parenthesis' do
+      results = repository.search_files("test(", 'master')
+
+      expect(results.first).not_to start_with('fatal:')
+    end
+
     describe 'result' do
       subject { results.first }
 

From 958ff11f971823aa11ac547d7e83ccf9603566d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 17:13:54 -0500
Subject: [PATCH 0562/1431] Remove unused Project scopes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/project.rb | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 2a6b0839b64..907d80c0681 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -171,17 +171,17 @@ class Project < ActiveRecord::Base
 
   scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) }
   scope :sorted_by_stars, -> { reorder('projects.star_count DESC') }
-  scope :sorted_by_names, -> { joins(:namespace).reorder('namespaces.name ASC, projects.name ASC') }
 
-  scope :without_user, ->(user)  { where('projects.id NOT IN (:ids)', ids: user.authorized_projects.map(&:id) ) }
-  scope :without_team, ->(team) { team.projects.present? ? where('projects.id NOT IN (:ids)', ids: team.projects.map(&:id)) : scoped  }
-  scope :not_in_group, ->(group) { where('projects.id NOT IN (:ids)', ids: group.project_ids ) }
   scope :in_namespace, ->(namespace_ids) { where(namespace_id: namespace_ids) }
-  scope :in_group_namespace, -> { joins(:group) }
   scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
   scope :joined, ->(user) { where('namespace_id != ?', user.namespace_id) }
+  scope :visible_to_user, ->(user) { where(id: user.authorized_projects.select(:id).reorder(nil)) }
   scope :non_archived, -> { where(archived: false) }
   scope :for_milestones, ->(ids) { joins(:milestones).where('milestones.id' => ids).distinct }
+  scope :with_push, -> { joins(:events).where('events.action = ?', Event::PUSHED) }
+
+  scope :active, -> { joins(:issues, :notes, :merge_requests).order('issues.created_at, notes.created_at, merge_requests.created_at DESC') }
+  scope :abandoned, -> { where('projects.last_activity_at < ?', 6.months.ago) }
 
   state_machine :import_status, initial: :none do
     event :import_start do
@@ -208,18 +208,6 @@ class Project < ActiveRecord::Base
   end
 
   class << self
-    def abandoned
-      where('projects.last_activity_at < ?', 6.months.ago)
-    end
-
-    def with_push
-      joins(:events).where('events.action = ?', Event::PUSHED)
-    end
-
-    def active
-      joins(:issues, :notes, :merge_requests).order('issues.created_at, notes.created_at, merge_requests.created_at DESC')
-    end
-
     # Searches for a list of projects based on the query given in `query`.
     #
     # On PostgreSQL this method uses "ILIKE" to perform a case-insensitive
@@ -281,10 +269,6 @@ class Project < ActiveRecord::Base
         projects.iwhere('projects.path' => project_path).take
     end
 
-    def find_by_ci_id(id)
-      find_by(ci_id: id.to_i)
-    end
-
     def visibility_levels
       Gitlab::VisibilityLevel.options
     end
@@ -315,10 +299,6 @@ class Project < ActiveRecord::Base
 
       joins(join_body).reorder('join_note_counts.amount DESC')
     end
-
-    def visible_to_user(user)
-      where(id: user.authorized_projects.select(:id).reorder(nil))
-    end
   end
 
   def team

From 0698113cabe68f23ac38d7b2fde6c5cb7e5bec4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 12:56:13 -0500
Subject: [PATCH 0563/1431] Move #create_confidentiality_note to
 Issues::UpdateService
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/services/issuable_base_service.rb       |  6 ------
 app/services/issues/update_service.rb       |  8 +++++++-
 app/services/system_note_service.rb         | 19 +++++++------------
 spec/services/issues/update_service_spec.rb |  4 ++--
 spec/services/system_note_service_spec.rb   | 14 +++-----------
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 1f59281e271..2b16089df1b 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -36,12 +36,6 @@ class IssuableBaseService < BaseService
     end
   end
 
-  def create_confidentiality_note(issuable)
-    SystemNoteService.change_confidentiality(
-      issuable, issuable.project, current_user
-    )
-  end
-
   def filter_params(issuable_ability_name = :issue)
     filter_assignee
     filter_milestone
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 3a9bbf8a78c..c7d406cc331 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -10,7 +10,7 @@ module Issues
       end
 
       if issue.previous_changes.include?('title') ||
-          issue.previous_changes.include?('description')
+         issue.previous_changes.include?('description')
         todo_service.update_issue(issue, current_user)
       end
 
@@ -41,5 +41,11 @@ module Issues
     def close_service
       Issues::CloseService
     end
+
+    private
+
+    def create_confidentiality_note(issue)
+      SystemNoteService.change_issue_confidentiality(issue, issue.project, current_user)
+    end
   end
 end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index e9e3c472e6d..972f8b2012d 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -169,29 +169,24 @@ class SystemNoteService
   #
   # Returns the created Note object
   def self.change_title(noteable, project, author, old_title)
-    return unless noteable.respond_to?(:title)
-
     body = "Title changed from **#{old_title}** to **#{noteable.title}**"
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
 
   # Called when the confidentiality changes
   #
-  # noteable    - Noteable object that responds to 'confidential'
-  # project     - Project owning noteable
-  # author      - User performing the change
+  # issue   - Issue object
+  # project - Project owning the issue
+  # author  - User performing the change
   #
   # Example Note text:
   #
-  # "Marked as confidential"
+  # "Made the issue confidential"
   #
   # Returns the created Note object
-  def self.change_confidentiality(noteable, project, author)
-    return unless noteable.respond_to?(:confidential)
-
-    confidentiality_status = noteable.confidential ? "confidential" : "not confidential"
-    body = "Marked as #{confidentiality_status}"
-    create_note(noteable: noteable, project: project, author: author, note: body)
+  def self.change_issue_confidentiality(issue, project, author)
+    body = issue.confidential ? 'Made the issue confidential' : 'Made the issue visible'
+    create_note(noteable: issue, project: project, author: author, note: body)
   end
 
   # Called when a branch in Noteable is changed
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index c9d8f1b382c..810a1f2d666 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -82,10 +82,10 @@ describe Issues::UpdateService, services: true do
       end
 
       it 'creates system note about confidentiality change' do
-        note = find_note('Marked as confidential')
+        note = find_note('Made the issue confidential')
 
         expect(note).not_to be_nil
-        expect(note.note).to eq 'Marked as confidential'
+        expect(note.note).to eq 'Made the issue confidential'
       end
     end
 
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 4fa60436155..bffad59b8b6 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -244,24 +244,16 @@ describe SystemNoteService, services: true do
           to eq "Title changed from **Old title** to **#{noteable.title}**"
       end
     end
-
-    context 'when noteable does not respond to `title' do
-      let(:noteable) { double('noteable') }
-
-      it 'returns nil' do
-        expect(subject).to be_nil
-      end
-    end
   end
 
-  describe '.change_confidentiality' do
-    subject { described_class.change_confidentiality(noteable, project, author) }
+  describe '.change_issue_confidentiality' do
+    subject { described_class.change_issue_confidentiality(noteable, project, author) }
 
     context 'when noteable responds to `confidential`' do
       it_behaves_like 'a system note'
 
       it 'sets the note text' do
-        expect(subject.note).to eq "Marked as not confidential"
+        expect(subject.note).to eq 'Made the issue visible'
       end
     end
   end

From 0d9c351b47dedd973620531ff3412d6da6190b2f Mon Sep 17 00:00:00 2001
From: Karlo Soriano <karlo@aelogica.com>
Date: Fri, 13 May 2016 13:42:07 +0800
Subject: [PATCH 0564/1431] Wrap "No groups found" message with a
 .nothing-here-block

---
 app/views/shared/groups/_list.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/groups/_list.html.haml b/app/views/shared/groups/_list.html.haml
index 1aa7ed1f2eb..427595c47a5 100644
--- a/app/views/shared/groups/_list.html.haml
+++ b/app/views/shared/groups/_list.html.haml
@@ -3,4 +3,4 @@
     - groups.each_with_index do |group, i|
       = render "shared/groups/group", group: group
 - else
-  %h3 No groups found
+  .nothing-here-block No groups found

From 0c47b68d0474b595bb03a49ce755c96f5d00fbf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Wed, 18 May 2016 21:16:36 -0500
Subject: [PATCH 0565/1431] Mask credentials from URL when import of project
 has failed.

---
 app/models/project.rb                         |  4 +-
 app/workers/repository_import_worker.rb       |  2 +-
 ...8_remove_wrong_import_url_from_projects.rb |  2 +-
 .../{import_url.rb => url_sanitizer.rb}       | 17 ++++-
 spec/lib/gitlab/import_url_spec.rb            | 21 ------
 spec/lib/gitlab/url_sanitizer_spec.rb         | 68 +++++++++++++++++++
 spec/workers/repository_import_worker_spec.rb | 26 +++++--
 7 files changed, 107 insertions(+), 33 deletions(-)
 rename lib/gitlab/{import_url.rb => url_sanitizer.rb} (65%)
 delete mode 100644 spec/lib/gitlab/import_url_spec.rb
 create mode 100644 spec/lib/gitlab/url_sanitizer_spec.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index a3c4f1d8e9b..b464335597d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -376,14 +376,14 @@ class Project < ActiveRecord::Base
   end
 
   def import_url=(value)
-    import_url = Gitlab::ImportUrl.new(value)
+    import_url = Gitlab::UrlSanitizer.new(value)
     create_or_update_import_data(credentials: import_url.credentials)
     super(import_url.sanitized_url)
   end
 
   def import_url
     if import_data && super
-      import_url = Gitlab::ImportUrl.new(super, credentials: import_data.credentials)
+      import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials)
       import_url.full_url
     else
       super
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 2937493c614..fbc7ed63c6a 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -13,7 +13,7 @@ class RepositoryImportWorker
     result = Projects::ImportService.new(project, current_user).execute
 
     if result[:status] == :error
-      project.update(import_error: result[:message])
+      project.update(import_error: Gitlab::UrlSanitizer.sanitize(result[:message]))
       project.import_fail
       return
     end
diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
index 8a351cf27a3..561c18a5776 100644
--- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
+++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
@@ -24,7 +24,7 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
   def process_projects_with_wrong_url
     projects_with_wrong_import_url.each do |project|
       begin
-        import_url = Gitlab::ImportUrl.new(project["import_url"])
+        import_url = Gitlab::UrlSanitizer.new(project["import_url"])
 
         update_import_url(import_url, project)
         update_import_data(import_url, project)
diff --git a/lib/gitlab/import_url.rb b/lib/gitlab/url_sanitizer.rb
similarity index 65%
rename from lib/gitlab/import_url.rb
rename to lib/gitlab/url_sanitizer.rb
index d23b013c1f5..c59d53b941a 100644
--- a/lib/gitlab/import_url.rb
+++ b/lib/gitlab/url_sanitizer.rb
@@ -1,7 +1,13 @@
 module Gitlab
-  class ImportUrl
+  class UrlSanitizer
+    def self.sanitize(content)
+      regexp = URI::Parser.new.make_regexp(['http', 'https', 'ssh', 'git'])
+
+      content.gsub(regexp) { |url| new(url).masked_url }
+    end
+
     def initialize(url, credentials: nil)
-      @url = URI.parse(URI.encode(url))
+      @url = Addressable::URI.parse(URI.encode(url))
       @credentials = credentials
     end
 
@@ -9,6 +15,13 @@ module Gitlab
       @sanitized_url ||= safe_url.to_s
     end
 
+    def masked_url
+      url = @url.dup
+      url.password = "*****" unless url.password.nil?
+      url.user = "*****" unless url.user.nil?
+      url.to_s
+    end
+
     def credentials
       @credentials ||= { user: @url.user, password: @url.password }
     end
diff --git a/spec/lib/gitlab/import_url_spec.rb b/spec/lib/gitlab/import_url_spec.rb
deleted file mode 100644
index f758cb8693c..00000000000
--- a/spec/lib/gitlab/import_url_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::ImportUrl do
-
-  let(:credentials) { { user: 'blah', password: 'password' } }
-  let(:import_url) do
-    Gitlab::ImportUrl.new("https://github.com/me/project.git", credentials: credentials)
-  end
-
-  describe :full_url do
-    it { expect(import_url.full_url).to eq("https://blah:password@github.com/me/project.git") }
-  end
-
-  describe :sanitized_url do
-    it { expect(import_url.sanitized_url).to eq("https://github.com/me/project.git") }
-  end
-
-  describe :credentials do
-    it { expect(import_url.credentials).to eq(credentials) }
-  end
-end
diff --git a/spec/lib/gitlab/url_sanitizer_spec.rb b/spec/lib/gitlab/url_sanitizer_spec.rb
new file mode 100644
index 00000000000..de55334118f
--- /dev/null
+++ b/spec/lib/gitlab/url_sanitizer_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Gitlab::UrlSanitizer, lib: true do
+  let(:credentials) { { user: 'blah', password: 'password' } }
+  let(:url_sanitizer) do
+    described_class.new("https://github.com/me/project.git", credentials: credentials)
+  end
+
+  describe '.sanitize' do
+    def sanitize_url(url)
+      # We want to try with multi-line content because is how error messages are formatted
+      described_class.sanitize(%Q{
+         remote: Not Found
+         fatal: repository '#{url}' not found
+      })
+    end
+
+    it 'mask the credentials from HTTP URLs' do
+      filtered_content = sanitize_url('http://user:pass@test.com/root/repoC.git/')
+
+      expect(filtered_content).to include("http://*****:*****@test.com/root/repoC.git/")
+    end
+
+    it 'mask the credentials from HTTPS URLs' do
+      filtered_content = sanitize_url('https://user:pass@test.com/root/repoA.git/')
+
+      expect(filtered_content).to include("https://*****:*****@test.com/root/repoA.git/")
+    end
+
+    it 'mask credentials from SSH URLs' do
+      filtered_content = sanitize_url('ssh://user@host.test/path/to/repo.git')
+
+      expect(filtered_content).to include("ssh://*****@host.test/path/to/repo.git")
+    end
+
+    it 'does not modify Git URLs' do
+      # git protocol does not support authentication
+      filtered_content = sanitize_url('git://host.test/path/to/repo.git')
+
+      expect(filtered_content).to include("git://host.test/path/to/repo.git")
+    end
+
+    it 'does not modify scp-like URLs' do
+      filtered_content = sanitize_url('user@server:project.git')
+
+      expect(filtered_content).to include("user@server:project.git")
+    end
+  end
+
+  describe '#sanitized_url' do
+    it { expect(url_sanitizer.sanitized_url).to eq("https://github.com/me/project.git") }
+  end
+
+  describe '#credentials' do
+    it { expect(url_sanitizer.credentials).to eq(credentials) }
+  end
+
+  describe '#full_url' do
+    it { expect(url_sanitizer.full_url).to eq("https://blah:password@github.com/me/project.git") }
+
+    it 'supports scp-like URLs' do
+      sanitizer = described_class.new('user@server:project.git')
+
+      expect(sanitizer.full_url).to eq('user@server:project.git')
+    end
+  end
+
+end
diff --git a/spec/workers/repository_import_worker_spec.rb b/spec/workers/repository_import_worker_spec.rb
index 6739063543b..f1b1574abf4 100644
--- a/spec/workers/repository_import_worker_spec.rb
+++ b/spec/workers/repository_import_worker_spec.rb
@@ -6,14 +6,28 @@ describe RepositoryImportWorker do
   subject { described_class.new }
 
   describe '#perform' do
-    it 'imports a project' do
-      expect_any_instance_of(Projects::ImportService).to receive(:execute).
-        and_return({ status: :ok })
+    context 'when the import was successful' do
+      it 'imports a project' do
+        expect_any_instance_of(Projects::ImportService).to receive(:execute).
+          and_return({ status: :ok })
 
-      expect_any_instance_of(Repository).to receive(:expire_emptiness_caches)
-      expect_any_instance_of(Project).to receive(:import_finish)
+        expect_any_instance_of(Repository).to receive(:expire_emptiness_caches)
+        expect_any_instance_of(Project).to receive(:import_finish)
 
-      subject.perform(project.id)
+        subject.perform(project.id)
+      end
+    end
+
+    context 'when the import has failed' do
+      it 'hide the credentials that were used in the import URL' do
+        error = %Q{remote: Not Found fatal: repository 'https://user:pass@test.com/root/repoC.git/' not found }
+        expect_any_instance_of(Projects::ImportService).to receive(:execute).
+          and_return({ status: :error, message: error })
+
+        subject.perform(project.id)
+
+        expect(project.reload.import_error).to include("https://*****:*****@test.com/root/repoC.git/")
+      end
     end
   end
 end

From 01256eecfa39cf3edc3d0eb43e624f62e45df552 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 18 May 2016 21:34:58 -0500
Subject: [PATCH 0566/1431] Update 'after_script' introduction note

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

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 7e9bced7616..63866d8c71c 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -128,7 +128,7 @@ builds, including deploy builds. This can be an array or a multi-line string.
 ### after_script
 
 >**Note:**
-Introduced in GitLab 8.7 and GitLab Runner v1.2.
+Introduced in GitLab 8.7 and requires Gitlab Runner v1.2 (not yet released)
 
 `after_script` is used to define the command that will be run after for all
 builds. This has to be an array or a multi-line string.

From 129bb6c2a71c8499daeb5d55f657b0eda8366bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 18 May 2016 23:45:25 -0500
Subject: [PATCH 0567/1431] Address Yorick's feedback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG               | 2 --
 app/models/milestone.rb | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b00cb9064a7..3466b98c4c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,6 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.8.0 (unreleased)
   - Implement GFM references for milestones (Alejandro Rodríguez)
-
-v 8.7.1 (unreleased)
   - Snippets tab under user profile. !4001 (Long Nguyen)
   - Fix error when using link to uploads in global snippets
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 31a54f44453..e0c8454a998 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -67,7 +67,7 @@ class Milestone < ActiveRecord::Base
     # NOTE: The iid pattern only matches when all characters on the expression
     # are digits, so it will match %2 but not %2.1 because that's probably a
     # milestone name and we want it to be matched as such.
-    %r{
+    @reference_pattern ||= %r{
       (#{Project.reference_pattern})?
       #{Regexp.escape(reference_prefix)}
       (?:
@@ -195,7 +195,7 @@ class Milestone < ActiveRecord::Base
   private
 
   def milestone_format_reference(format = :iid)
-    raise StandardError, 'Unknown format' unless [:iid, :name].include?(format)
+    raise ArgumentError, 'Unknown format' unless [:iid, :name].include?(format)
 
     if format == :name && !name.include?('"')
       %("#{name}")

From e9ecbd3d4e5c1a566c99b6508657ec4be9dcc704 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 19 May 2016 01:35:04 -0500
Subject: [PATCH 0568/1431] Fix warning messages with SVG ALLOWED_ELEMENTS

Eliminates "warning: already initialized constant Gitlab::Sanitizers::SVG::ALLOWED_ELEMENTS"
---
 lib/gitlab/sanitizers/svg.rb           |   8 +-
 lib/gitlab/sanitizers/svg/whitelist.rb | 170 +++++++++++++------------
 2 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/lib/gitlab/sanitizers/svg.rb b/lib/gitlab/sanitizers/svg.rb
index b98589dff89..5e95f6c0529 100644
--- a/lib/gitlab/sanitizers/svg.rb
+++ b/lib/gitlab/sanitizers/svg.rb
@@ -1,5 +1,3 @@
-require_relative "svg/whitelist"
-
 module Gitlab
   module Sanitizers
     module SVG
@@ -12,14 +10,14 @@ module Gitlab
         DATA_ATTR_PATTERN = /\Adata-(?!xml)[a-z_][\w.\u00E0-\u00F6\u00F8-\u017F\u01DD-\u02AF-]*\z/u
 
         def scrub(node)
-          unless ALLOWED_ELEMENTS.include?(node.name)
+          unless Whitelist::ALLOWED_ELEMENTS.include?(node.name)
             node.unlink
           else
             node.attributes.each do |attr_name, attr|
-              valid_attributes = ALLOWED_ATTRIBUTES[node.name]
+              valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name]
 
               unless valid_attributes && valid_attributes.include?(attr_name)
-                if ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) &&
+                if Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) &&
                     attr_name.start_with?('data-')
                   # Arbitrary data attributes are allowed. Verify that the attribute
                   # is a valid data attribute.
diff --git a/lib/gitlab/sanitizers/svg/whitelist.rb b/lib/gitlab/sanitizers/svg/whitelist.rb
index 917e795b29e..7b6b70d8dbc 100644
--- a/lib/gitlab/sanitizers/svg/whitelist.rb
+++ b/lib/gitlab/sanitizers/svg/whitelist.rb
@@ -4,7 +4,8 @@
 module Gitlab
   module Sanitizers
     module SVG
-      ALLOWED_ELEMENTS = %w[
+      class Whitelist
+        ALLOWED_ELEMENTS = %w[
         a altGlyph altGlyphDef altGlyphItem animate
         animateColor animateMotion animateTransform circle clipPath color-profile
         cursor defs desc ellipse feBlend feColorMatrix feComponentTransfer
@@ -18,90 +19,91 @@ module Gitlab
         script set stop style svg switch symbol text textPath title tref tspan use
         view vkern].freeze
 
-      ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS = %w[svg].freeze
+        ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS = %w[svg].freeze
 
-      ALLOWED_ATTRIBUTES = {
-        'a' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage target text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'altGlyph' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight format glyph-orientation-horizontal glyph-orientation-vertical glyphRef id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'altGlyphDef' => %w[id xml:base xml:lang xml:space],
-        'altGlyphItem' => %w[id xml:base xml:lang xml:space],
-        'animate' => %w[accumulate additive alignment-baseline attributeName attributeType baseline-shift begin by calcMode clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dur enable-background end externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight from glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning keySplines keyTimes letter-spacing lighting-color marker-end marker-mid marker-start mask max min onbegin onend onload onrepeat opacity overflow pointer-events repeatCount repeatDur requiredExtensions requiredFeatures restart shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width systemLanguage text-anchor text-decoration text-rendering to unicode-bidi values visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'animateColor' => %w[accumulate additive alignment-baseline attributeName attributeType baseline-shift begin by calcMode clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dur enable-background end externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight from glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning keySplines keyTimes letter-spacing lighting-color marker-end marker-mid marker-start mask max min onbegin onend onload onrepeat opacity overflow pointer-events repeatCount repeatDur requiredExtensions requiredFeatures restart shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width systemLanguage text-anchor text-decoration text-rendering to unicode-bidi values visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'animateMotion' => %w[accumulate additive begin by calcMode dur end externalResourcesRequired fill from id keyPoints keySplines keyTimes max min onbegin onend onload onrepeat origin path repeatCount repeatDur requiredExtensions requiredFeatures restart rotate systemLanguage to values xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'animateTransform' => %w[accumulate additive attributeName attributeType begin by calcMode dur end externalResourcesRequired fill from id keySplines keyTimes max min onbegin onend onload onrepeat repeatCount repeatDur requiredExtensions requiredFeatures restart systemLanguage to type values xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'circle' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events r requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'clipPath' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule clipPathUnits color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'color-profile' => %w[id local name rendering-intent xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'cursor' => %w[externalResourcesRequired id requiredExtensions requiredFeatures systemLanguage x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'defs' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'desc' => %w[class id style xml:base xml:lang xml:space],
-        'ellipse' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rx ry shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'feBlend' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask mode opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feColorMatrix' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering type unicode-bidi values visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feComponentTransfer' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feComposite' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 k1 k2 k3 k4 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity operator overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feConvolveMatrix' => %w[alignment-baseline baseline-shift bias class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display divisor dominant-baseline edgeMode enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelMatrix kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity order overflow pointer-events preserveAlpha result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style targetX targetY text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feDiffuseLighting' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor diffuseConstant direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style surfaceScale text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feDisplacementMap' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result scale shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xChannelSelector xml:base xml:lang xml:space y yChannelSelector],
-        'feDistantLight' => %w[azimuth elevation id xml:base xml:lang xml:space],
-        'feFlood' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feFuncA' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
-        'feFuncB' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
-        'feFuncG' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
-        'feFuncR' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
-        'feGaussianBlur' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stdDeviation stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feImage' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events preserveAspectRatio result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'feMerge' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feMergeNode' => %w[id xml:base xml:lang xml:space],
-        'feMorphology' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity operator overflow pointer-events radius result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feOffset' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'fePointLight' => %w[id x xml:base xml:lang xml:space y z],
-        'feSpecularLighting' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering specularConstant specularExponent stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style surfaceScale text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feSpotLight' => %w[id limitingConeAngle pointsAtX pointsAtY pointsAtZ specularExponent x xml:base xml:lang xml:space y z],
-        'feTile' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'feTurbulence' => %w[alignment-baseline baseFrequency baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask numOctaves opacity overflow pointer-events result seed shape-rendering stitchTiles stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering type unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'filter' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter filterRes filterUnits flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events primitiveUnits shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'font' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x horiz-origin-y id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'font-face' => %w[accent-height alphabetic ascent bbox cap-height descent font-family font-size font-stretch font-style font-variant font-weight hanging id ideographic mathematical overline-position overline-thickness panose-1 slope stemh stemv strikethrough-position strikethrough-thickness underline-position underline-thickness unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical widths x-height xml:base xml:lang xml:space],
-        'font-face-format' => %w[id string xml:base xml:lang xml:space],
-        'font-face-name' => %w[id name xml:base xml:lang xml:space],
-        'font-face-src' => %w[id xml:base xml:lang xml:space],
-        'font-face-uri' => %w[id xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'foreignObject' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'g' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'glyph' => %w[alignment-baseline arabic-form baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x id image-rendering kerning lang letter-spacing lighting-color marker-end marker-mid marker-start mask opacity orientation overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'glyphRef' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight format glyph-orientation-horizontal glyph-orientation-vertical glyphRef id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'hkern' => %w[g1 g2 id k u1 u2 xml:base xml:lang xml:space],
-        'image' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'line' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode x1 x2 xml:base xml:lang xml:space y1 y2],
-        'linearGradient' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical gradientTransform gradientUnits id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering spreadMethod stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x1 x2 xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space y1 y2],
-        'marker' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start markerHeight markerUnits markerWidth mask opacity orient overflow pointer-events preserveAspectRatio refX refY shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi viewBox visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'mask' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask maskContentUnits maskUnits opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'metadata' => %w[id xml:base xml:lang xml:space],
-        'missing-glyph' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'mpath' => %w[externalResourcesRequired id xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'path' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pathLength pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'pattern' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow patternContentUnits patternTransform patternUnits pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi viewBox visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'polygon' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events points requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'polyline' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events points requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'radialGradient' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight fx fy glyph-orientation-horizontal glyph-orientation-vertical gradientTransform gradientUnits id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events r shape-rendering spreadMethod stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space],
-        'rect' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rx ry shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'script' => %w[externalResourcesRequired id type xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'set' => %w[attributeName attributeType begin dur end externalResourcesRequired fill id max min onbegin onend onload onrepeat repeatCount repeatDur requiredExtensions requiredFeatures restart systemLanguage to xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
-        'stop' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask offset opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'style' => %w[id media title type xml:base xml:lang xml:space],
-        'svg' => %w[alignment-baseline baseProfile baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering contentScriptType contentStyleType cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onabort onactivate onclick onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onresize onscroll onunload onzoom opacity overflow pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi version viewBox visibility width word-spacing writing-mode x xml:base xml:lang xml:space xmlns y zoomAndPan],
-        'switch' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'symbol' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events preserveAspectRatio shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi viewBox visibility word-spacing writing-mode xml:base xml:lang xml:space],
-        'text' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength transform unicode-bidi visibility word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'textPath' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask method onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering spacing startOffset stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space],
-        'title' => %w[class id style xml:base xml:lang xml:space],
-        'tref' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode x xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space y],
-        'tspan' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode x xml:base xml:lang xml:space y],
-        'use' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
-        'view' => %w[externalResourcesRequired id preserveAspectRatio viewBox viewTarget xml:base xml:lang xml:space zoomAndPan],
-        'vkern' => %w[g1 g2 id k u1 u2 xml:base xml:lang xml:space]
-      }.freeze
+        ALLOWED_ATTRIBUTES = {
+          'a' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage target text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'altGlyph' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight format glyph-orientation-horizontal glyph-orientation-vertical glyphRef id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'altGlyphDef' => %w[id xml:base xml:lang xml:space],
+          'altGlyphItem' => %w[id xml:base xml:lang xml:space],
+          'animate' => %w[accumulate additive alignment-baseline attributeName attributeType baseline-shift begin by calcMode clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dur enable-background end externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight from glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning keySplines keyTimes letter-spacing lighting-color marker-end marker-mid marker-start mask max min onbegin onend onload onrepeat opacity overflow pointer-events repeatCount repeatDur requiredExtensions requiredFeatures restart shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width systemLanguage text-anchor text-decoration text-rendering to unicode-bidi values visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'animateColor' => %w[accumulate additive alignment-baseline attributeName attributeType baseline-shift begin by calcMode clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dur enable-background end externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight from glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning keySplines keyTimes letter-spacing lighting-color marker-end marker-mid marker-start mask max min onbegin onend onload onrepeat opacity overflow pointer-events repeatCount repeatDur requiredExtensions requiredFeatures restart shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width systemLanguage text-anchor text-decoration text-rendering to unicode-bidi values visibility word-spacing writing-mode xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'animateMotion' => %w[accumulate additive begin by calcMode dur end externalResourcesRequired fill from id keyPoints keySplines keyTimes max min onbegin onend onload onrepeat origin path repeatCount repeatDur requiredExtensions requiredFeatures restart rotate systemLanguage to values xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'animateTransform' => %w[accumulate additive attributeName attributeType begin by calcMode dur end externalResourcesRequired fill from id keySplines keyTimes max min onbegin onend onload onrepeat repeatCount repeatDur requiredExtensions requiredFeatures restart systemLanguage to type values xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'circle' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events r requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'clipPath' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule clipPathUnits color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'color-profile' => %w[id local name rendering-intent xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'cursor' => %w[externalResourcesRequired id requiredExtensions requiredFeatures systemLanguage x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'defs' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'desc' => %w[class id style xml:base xml:lang xml:space],
+          'ellipse' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rx ry shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'feBlend' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask mode opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feColorMatrix' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering type unicode-bidi values visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feComponentTransfer' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feComposite' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 k1 k2 k3 k4 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity operator overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feConvolveMatrix' => %w[alignment-baseline baseline-shift bias class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display divisor dominant-baseline edgeMode enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelMatrix kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity order overflow pointer-events preserveAlpha result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style targetX targetY text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feDiffuseLighting' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor diffuseConstant direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style surfaceScale text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feDisplacementMap' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in in2 kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result scale shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xChannelSelector xml:base xml:lang xml:space y yChannelSelector],
+          'feDistantLight' => %w[azimuth elevation id xml:base xml:lang xml:space],
+          'feFlood' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feFuncA' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+          'feFuncB' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+          'feFuncG' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+          'feFuncR' => %w[amplitude exponent id intercept offset slope tableValues type xml:base xml:lang xml:space],
+          'feGaussianBlur' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stdDeviation stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feImage' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events preserveAspectRatio result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'feMerge' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feMergeNode' => %w[id xml:base xml:lang xml:space],
+          'feMorphology' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity operator overflow pointer-events radius result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feOffset' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'fePointLight' => %w[id x xml:base xml:lang xml:space y z],
+          'feSpecularLighting' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kernelUnitLength kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering specularConstant specularExponent stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style surfaceScale text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feSpotLight' => %w[id limitingConeAngle pointsAtX pointsAtY pointsAtZ specularExponent x xml:base xml:lang xml:space y z],
+          'feTile' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering in kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events result shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'feTurbulence' => %w[alignment-baseline baseFrequency baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask numOctaves opacity overflow pointer-events result seed shape-rendering stitchTiles stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering type unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'filter' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter filterRes filterUnits flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events primitiveUnits shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'font' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x horiz-origin-y id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'font-face' => %w[accent-height alphabetic ascent bbox cap-height descent font-family font-size font-stretch font-style font-variant font-weight hanging id ideographic mathematical overline-position overline-thickness panose-1 slope stemh stemv strikethrough-position strikethrough-thickness underline-position underline-thickness unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical widths x-height xml:base xml:lang xml:space],
+          'font-face-format' => %w[id string xml:base xml:lang xml:space],
+          'font-face-name' => %w[id name xml:base xml:lang xml:space],
+          'font-face-src' => %w[id xml:base xml:lang xml:space],
+          'font-face-uri' => %w[id xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'foreignObject' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'g' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'glyph' => %w[alignment-baseline arabic-form baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x id image-rendering kerning lang letter-spacing lighting-color marker-end marker-mid marker-start mask opacity orientation overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'glyphRef' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight format glyph-orientation-horizontal glyph-orientation-vertical glyphRef id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'hkern' => %w[g1 g2 id k u1 u2 xml:base xml:lang xml:space],
+          'image' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'line' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode x1 x2 xml:base xml:lang xml:space y1 y2],
+          'linearGradient' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical gradientTransform gradientUnits id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering spreadMethod stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode x1 x2 xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space y1 y2],
+          'marker' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start markerHeight markerUnits markerWidth mask opacity orient overflow pointer-events preserveAspectRatio refX refY shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi viewBox visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'mask' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask maskContentUnits maskUnits opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'metadata' => %w[id xml:base xml:lang xml:space],
+          'missing-glyph' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi vert-adv-y vert-origin-x vert-origin-y visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'mpath' => %w[externalResourcesRequired id xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'path' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor d direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pathLength pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'pattern' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow patternContentUnits patternTransform patternUnits pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi viewBox visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'polygon' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events points requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'polyline' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events points requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'radialGradient' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor cx cy direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight fx fy glyph-orientation-horizontal glyph-orientation-vertical gradientTransform gradientUnits id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events r shape-rendering spreadMethod stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space],
+          'rect' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rx ry shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'script' => %w[externalResourcesRequired id type xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'set' => %w[attributeName attributeType begin dur end externalResourcesRequired fill id max min onbegin onend onload onrepeat repeatCount repeatDur requiredExtensions requiredFeatures restart systemLanguage to xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space],
+          'stop' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask offset opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'style' => %w[id media title type xml:base xml:lang xml:space],
+          'svg' => %w[alignment-baseline baseProfile baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering contentScriptType contentStyleType cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onabort onactivate onclick onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onresize onscroll onunload onzoom opacity overflow pointer-events preserveAspectRatio requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering unicode-bidi version viewBox visibility width word-spacing writing-mode x xml:base xml:lang xml:space xmlns y zoomAndPan],
+          'switch' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'symbol' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events preserveAspectRatio shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style text-anchor text-decoration text-rendering unicode-bidi viewBox visibility word-spacing writing-mode xml:base xml:lang xml:space],
+          'text' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength transform unicode-bidi visibility word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'textPath' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask method onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering spacing startOffset stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space],
+          'title' => %w[class id style xml:base xml:lang xml:space],
+          'tref' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode x xlink:arcrole xlink:href xlink:role xlink:title xlink:type xml:base xml:lang xml:space y],
+          'tspan' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline dx dy enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical id image-rendering kerning lengthAdjust letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures rotate shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering textLength unicode-bidi visibility word-spacing writing-mode x xml:base xml:lang xml:space y],
+          'use' => %w[alignment-baseline baseline-shift class clip clip-path clip-rule color color-interpolation color-interpolation-filters color-profile color-rendering cursor direction display dominant-baseline enable-background externalResourcesRequired fill fill-opacity fill-rule filter flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical height id image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask onactivate onclick onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup opacity overflow pointer-events requiredExtensions requiredFeatures shape-rendering stop-color stop-opacity stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width style systemLanguage text-anchor text-decoration text-rendering transform unicode-bidi visibility width word-spacing writing-mode x xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space y],
+          'view' => %w[externalResourcesRequired id preserveAspectRatio viewBox viewTarget xml:base xml:lang xml:space zoomAndPan],
+          'vkern' => %w[g1 g2 id k u1 u2 xml:base xml:lang xml:space]
+        }.freeze
+      end
     end
   end
 end

From 37415e58f84fb3419eb26673e3eba909e1cb63c1 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 18 May 2016 17:38:00 +0100
Subject: [PATCH 0569/1431] Chunk commits by date in lists

It's possible to construct a commit graph where the output of `git log`
isn't in timestamp order. Grouping the commits in the list by date then
gives dramatically wrong results. Instead, go for the more pragmatic
approach: use the commits in the order they're given, and just show the
date line each time the date changes. This means that the same date
header can show up multiple times, but at least the ordering is
preserved.
---
 CHANGELOG                                     | 2 +-
 app/views/projects/commits/_commits.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2dd80779541..49c9bbd51fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,7 +43,7 @@ v 8.8.0 (unreleased)
   - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
   - Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724
   - Added multiple colors for labels in dropdowns when dups happen.
-  - Always group commits by server timezone, not commit timestamp
+  - Show commits in the same order as `git log`
   - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
   - API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
   - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 82f39e59284..7283a78a64e 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -3,7 +3,7 @@
 
 - commits, hidden = limited_commits(@commits)
 
-- commits.group_by { |c| c.committed_date.in_time_zone.to_date }.sort.reverse.each do |day, commits|
+- commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, commits|
   .row.commits-row
     .col-md-2.hidden-xs.hidden-sm
       %h5.commits-row-date

From d53bfcb0bb320d0f182ba7967dba7be3be4e3280 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 May 2016 10:01:27 +0100
Subject: [PATCH 0570/1431] Updated snippets tests

---
 features/steps/project/snippets.rb  | 4 ++--
 features/steps/snippets/snippets.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb
index 786a0cad975..beb8ecfc799 100644
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
@@ -43,12 +43,12 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
 
   step 'I click link "Edit"' do
     page.within ".detail-page-header" do
-      click_link "Edit"
+      first(:link, "Edit").click
     end
   end
 
   step 'I click link "Delete"' do
-    click_link "Delete"
+    first(:link, "Delete").click
   end
 
   step 'I submit new snippet "Snippet three"' do
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index 023032e679f..19366b11071 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -14,12 +14,12 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
 
   step 'I click link "Edit"' do
     page.within ".detail-page-header" do
-      click_link "Edit"
+      first(:link, "Edit").click
     end
   end
 
   step 'I click link "Delete"' do
-    click_link "Delete"
+    first(:link, "Delete").click
   end
 
   step 'I submit new snippet "Personal snippet three"' do

From d46e47a5b637c02136489dd89f7277454a5f8c28 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 19 May 2016 14:09:24 +0000
Subject: [PATCH 0571/1431] Revert "Merge branch 'issues/15127' into 'master'"

This reverts merge request !3647
---
 app/models/user.rb                  | 5 +++++
 config/initializers/devise_async.rb | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 02e1f461fa6..6a09b78455b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -789,6 +789,11 @@ class User < ActiveRecord::Base
                             other.select(:id)])
   end
 
+  # Added according to https://github.com/plataformatec/devise/blob/7df57d5081f9884849ca15e4fde179ef164a575f/README.md#activejob-integration
+  def send_devise_notification(notification, *args)
+    devise_mailer.send(notification, self, *args).deliver_later
+  end
+
   def ensure_external_user_rights
     return unless self.external?
 
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index fa602cbe554..05a1852cdbd 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1,2 +1 @@
 Devise::Async.backend = :sidekiq
-Devise::Async.queue = :mailers

From 8eb1748ab20efba43f28428799f98dc6807705a3 Mon Sep 17 00:00:00 2001
From: Jazz <jazzzz@gmail.com>
Date: Tue, 23 Feb 2016 21:30:45 +0000
Subject: [PATCH 0572/1431] Fixed advice on invalid permissions on upload path

---
 lib/tasks/gitlab/check.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index effb8eb6001..fad89c73762 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -303,7 +303,7 @@ namespace :gitlab do
       else
         puts "no".red
         try_fixing_it(
-          "sudo find #{upload_path} -type d -not -path #{upload_path} -exec chmod 0700 {} \\;"
+          "sudo chmod 700 #{upload_path}"
         )
         for_more_information(
           see_installation_guide_section "GitLab"

From 59640866cee3d80a2144cb1992de36ba6678d4f7 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 19 May 2016 10:04:46 -0500
Subject: [PATCH 0573/1431] Remove left-over use of strip_heredoc

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

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 74c87fa2905..31a87b73fbe 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -75,7 +75,7 @@ module Gitlab
             query += " AND id < #{stop_row['id']}"
           end
 
-          execute(query.strip_heredoc)
+          execute(query)
 
           processed += batch_size
         end

From 7e7764139d171ceeee5200b2677bdab0f8ab7c2d Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 19 May 2016 10:05:39 -0500
Subject: [PATCH 0574/1431] Fixed typos in migration templates

---
 lib/templates/active_record/migration/create_table_migration.rb | 2 +-
 lib/templates/active_record/migration/migration.rb              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/templates/active_record/migration/create_table_migration.rb b/lib/templates/active_record/migration/create_table_migration.rb
index 4b7e39e057f..27acc75dcc4 100644
--- a/lib/templates/active_record/migration/create_table_migration.rb
+++ b/lib/templates/active_record/migration/create_table_migration.rb
@@ -9,7 +9,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   # existing transaction. When using "add_concurrent_index" make sure that this
   # method is the _only_ method called in the migration, any other changes
   # should go in a separate migration. This ensures that upon failure _only_ the
-  # index creation failes and can be re-tried or reverted easily.
+  # index creation fails and can be retried or reverted easily.
   #
   # To disable transactions uncomment the following line and remove these
   # comments:
diff --git a/lib/templates/active_record/migration/migration.rb b/lib/templates/active_record/migration/migration.rb
index ae88593cd12..06bdea11367 100644
--- a/lib/templates/active_record/migration/migration.rb
+++ b/lib/templates/active_record/migration/migration.rb
@@ -9,7 +9,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   # existing transaction. When using "add_concurrent_index" make sure that this
   # method is the _only_ method called in the migration, any other changes
   # should go in a separate migration. This ensures that upon failure _only_ the
-  # index creation failes and can be re-tried or reverted easily.
+  # index creation fails and can be retried or reverted easily.
   #
   # To disable transactions uncomment the following line and remove these
   # comments:

From 92df8f5787de2a6ee63eb6ae47eb7155081eaa54 Mon Sep 17 00:00:00 2001
From: Ludovic Perrine <lpe@f4-group.com>
Date: Thu, 19 May 2016 17:24:55 +0200
Subject: [PATCH 0575/1431] Added CHANGELOG entry

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

diff --git a/CHANGELOG b/CHANGELOG
index cdb88cafe13..31121645896 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ v 8.8.0 (unreleased)
   - Import pull requests from GitHub where the source or target branches were removed
   - All Grape API helpers are now instrumented
   - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
+  - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)

From c22be75794e0843d1c5de9a15593ccefcc1c09dc Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 19 May 2016 12:36:02 -0500
Subject: [PATCH 0576/1431] Removed outdated comment from migration helpers

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

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 31a87b73fbe..9b662d163f0 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -47,7 +47,7 @@ module Gitlab
           first['count'].
           to_i
 
-        # Update in batches of 5% with an upper limit of 5000 rows.
+        # Update in batches of 5%
         batch_size = ((total / 100.0) * 5.0).ceil
 
         while processed < total

From 5bb7fa1bd93f697a6023c738b7a1f9411fbecac9 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 19 May 2016 10:11:54 -0500
Subject: [PATCH 0577/1431] Redesign project page header

---
 app/assets/stylesheets/framework/avatar.scss  |   1 +
 app/assets/stylesheets/framework/blocks.scss  |  11 +-
 app/assets/stylesheets/framework/mobile.scss  |   4 -
 app/assets/stylesheets/framework/nav.scss     |   9 +
 .../stylesheets/framework/variables.scss      |   4 +-
 app/assets/stylesheets/pages/projects.scss    | 163 +++++++++++++-----
 app/views/layouts/nav/_project.html.haml      |   2 +-
 app/views/projects/_home_panel.html.haml      |  54 +++---
 .../projects/buttons/_dropdown.html.haml      |   2 +-
 .../projects/buttons/_notifications.html.haml |   6 +-
 app/views/projects/show.html.haml             |  77 +++++----
 app/views/shared/_clone_panel.html.haml       |   2 +-
 12 files changed, 212 insertions(+), 123 deletions(-)

diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index f5ce70b606b..bb8d71fbae8 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -45,6 +45,7 @@
   &.s32 { font-size: 20px; line-height: 32px; }
   &.s40 { font-size: 16px; line-height: 40px; }
   &.s60 { font-size: 32px; line-height: 60px; }
+  &.s70 { font-size: 34px; line-height: 70px; }
   &.s90 { font-size: 36px; line-height: 90px; }
   &.s110 { font-size: 40px; line-height: 112px; font-weight: 300; }
   &.s140 { font-size: 72px; line-height: 140px; }
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 434a26d57c6..6981f834d30 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -24,8 +24,8 @@
   background-color: $background-color;
   padding: $gl-padding;
   margin-bottom: 0;
-  border-top: 1px solid $border-color;
-  border-bottom: 1px solid $border-color;
+  border-top: 1px solid $white-dark;
+  border-bottom: 1px solid $white-dark;
   color: $gl-gray;
 
   &.oneline-block {
@@ -110,9 +110,9 @@
   .cover-title {
     color: $gl-header-color;
     margin: 0;
-    font-size: 23px;
+    font-size: 24px;
     font-weight: normal;
-    margin: 16px 0 5px;
+    margin-bottom: 5px;
     color: #4c4e54;
     font-size: 23px;
     line-height: 1.1;
@@ -137,7 +137,6 @@
   }
 
   .cover-desc {
-    padding: 0 $gl-padding 3px;
     color: $gl-text-color;
 
     &.username:last-child {
@@ -205,7 +204,7 @@
 
 .content-block {
   padding: $gl-padding 0;
-  border-bottom: 1px solid $border-color;
+  border-bottom: 1px solid $white-dark;
 
   &.oneline-block {
     line-height: 36px;
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index 33cbee85987..bd531f8376b 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -48,10 +48,6 @@
       display: block;
     }
 
-    .project-home-desc {
-      font-size: 21px;
-    }
-
     .project-repo-buttons,
     .git-clone-holder {
       display: none;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 2e1aa884d9c..4e4a1d71a47 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -250,6 +250,11 @@
     height: 51px;
     white-space: nowrap;
     overflow-x: auto;
+    overflow-y: hidden;
+    -webkit-overflow-scrolling: touch;
+    &::-webkit-scrollbar {
+      display: none;
+    }
 
     li {
 
@@ -283,4 +288,8 @@
       margin-top: 96px;
     }
   }
+
+  .right-sidebar {
+    top: 102px;
+  }
 }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 5fa4c266607..a769077bc83 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -119,8 +119,8 @@ $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
 $border-white-dark: #c6cacf;
 
-$border-gray-light: rgba(0, 0, 0, 0.06);
-$border-gray-normal: rgba(0, 0, 0, 0.10);;
+$border-gray-light: rgba(209, 209, 209, 0.70);
+$border-gray-normal: rgba(0, 0, 0, 0.10);
 $border-gray-dark: #c6cacf;
 
 $border-green-light: #2faa60;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index c20f04653fc..faf3c84ba2c 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -26,8 +26,13 @@
 }
 
 .project-home-panel {
-  padding-bottom: 40px;
-  border-bottom: 1px solid $border-color;
+  background: $white-light;
+  text-align: left;
+  padding: 24px 0;
+
+  .container-fluid {
+    position: relative;
+  }
 
   .cover-controls {
     .project-settings-dropdown {
@@ -43,21 +48,50 @@
     }
   }
 
-  .project-identicon-holder {
-    margin-bottom: 16px;
+  .project-image-container {
+    @include make-sm-column(1);
+    max-width: 86px;
+    min-width: 86px;
+    padding-right: 0;
 
-    .avatar, .identicon {
-      margin: 0 auto;
-      float: none;
-    }
+    @media (max-width: $screen-md-max) {
+      padding-left: 0;
+      margin-bottom: 10px;
+      max-width: none;
+      min-width: none;
 
-    .identicon {
-      @include border-radius(50%);
+      .avatar.s70 {
+        margin: auto;
+      }
     }
   }
 
+  .project-info {
+    @include make-sm-column(10);
+
+    h1 {
+      font-size: 24px;
+      font-weight: normal;
+      margin: 0;
+    }
+
+    .project-home-desc {
+      p {
+        margin: 0;
+      }
+    }
+  }
+
+  .identicon {
+    float: left;
+    @include border-radius(50%);
+  }
+
+  .avatar {
+    float: none;
+  }
+
   .notifications-btn {
-    margin-top: -28px;
 
     .fa-bell {
       margin-right: 6px;
@@ -69,28 +103,45 @@
   }
 
   .project-repo-buttons {
-    margin-top: 20px;
-    margin-bottom: 0;
-
-    .count-buttons {
-      display: block;
-      margin-bottom: 20px;
-    }
-
-    .clone-row {
-      .split-repo-buttons,
-      .project-clone-holder {
-        display: inline-block;
-      }
-
-      .split-repo-buttons {
-        margin: 0 12px;
-      }
-    }
+    font-size: 0;
 
     .btn {
       @include btn-gray;
+      padding: 3px 10px;
       text-transform: none;
+      background-color: $background-color;
+
+      .fa {
+        color: $layout-link-gray;
+      }
+
+      .fa-caret-down {
+        margin-left: 3px;
+      }
+    }
+
+    .btn-group:not(:first-child):not(:last-child) > .btn {
+      border-top-right-radius: 3px;
+      border-bottom-right-radius: 3px;
+    }
+
+    form {
+      margin-left: 10px;
+    }
+
+    .count-buttons {
+      display: inline-block;
+      vertical-align: top;
+      margin-top: 16px;
+    }
+
+    .project-clone-holder {
+      display: inline-block;
+      margin-top: 16px;
+
+      input {
+        height: 29px;
+      }
     }
 
     .count-with-arrow {
@@ -140,14 +191,14 @@
         line-height: 13px;
         padding: $gl-vert-padding $gl-padding;
         letter-spacing: .4px;
-        padding: 10px 14px;
+        padding: 7px 14px;
         text-align: center;
         vertical-align: middle;
         touch-action: manipulation;
         cursor: pointer;
         background-image: none;
         white-space: nowrap;
-        margin: 0 11px 0 4px;
+        margin: 0 10px 0 4px;
 
         &:hover {
           background: #fff;
@@ -155,6 +206,30 @@
       }
     }
   }
+
+  .project-right-buttons {
+    position: absolute;
+    right: 16px;
+    bottom: 0;
+
+    .btn {
+      padding: 3px 10px;
+      background-color: $background-color;
+    }
+
+    @media (max-width: 1304px) {
+      top: -6px;
+    }
+  }
+
+  @media (max-width: $screen-md-max) {
+    text-align: center;
+
+    .project-info,
+    .project-image-container {
+      width: 100%;
+    }
+  }
 }
 
 .split-one {
@@ -285,11 +360,11 @@ a.deploy-project-label {
 }
 
 .project-stats {
-  text-align: center;
   margin-top: $gl-padding;
   margin-bottom: 0;
-  padding-top: 10px;
-  padding-bottom: 4px;
+  padding: 16px 0;
+  background-color: $white-light;
+  font-size: 0;
 
   ul.nav {
     display: inline-block;
@@ -300,12 +375,11 @@ a.deploy-project-label {
   }
 
   .nav > li > a {
-    @include btn-default;
-    @include btn-gray;
-
     background-color: transparent;
-    border: 1px solid #f7f8fa;
-    margin-left: 12px;
+    margin-right: 12px;
+    padding: 0 10px;
+    font-size: 15px;
+    color: $notes-light-color;
   }
 
   li {
@@ -325,6 +399,10 @@ a.deploy-project-label {
       background-color: #f0f2f5;
     }
   }
+
+  &.row-content-block.second-block {
+    margin-top: 0;
+  }
 }
 
 pre.light-well {
@@ -442,9 +520,14 @@ pre.light-well {
   border-top: 0;
 
   .edit-project-readme {
-    z-index: 100;
+    z-index: 2;
     position: relative;
   }
+
+  .wiki h1 {
+    border-bottom: none;
+    padding: 0;
+  }
 }
 
 .git-clone-holder {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index b60c419fb3a..ac692686bb2 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -2,7 +2,7 @@
   .controls
     - access = user_max_access_in_project(current_user.id, @project)
     - can_edit = can?(current_user, :admin_project, @project)
-    %span.dropdown.project-settings-dropdown
+    .dropdown.project-settings-dropdown
       %a.dropdown-new.btn.btn-default#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
         = icon('cog')
         = icon('caret-down')
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index cdb8d2b5e36..57c3d1b0a65 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,37 +1,37 @@
 - empty_repo = @project.empty_repo?
 .project-home-panel.cover-block.clearfix{:class => ("empty-project" if empty_repo)}
-  .project-identicon-holder
-    = project_icon(@project, alt: '', class: 'project-avatar avatar s90')
-  .cover-title.project-home-desc
-    %h1
-      = @project.name
-      %span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}
-        = visibility_level_icon(@project.visibility_level, fw: false)
+  .container-fluid.container-limited
+    .row
+      .project-image-container
+        = project_icon(@project, alt: '', class: 'project-avatar avatar s70')
+      .project-info
+        .cover-title.project-home-desc
+          %h1
+            = @project.name
+            %span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}
+              = visibility_level_icon(@project.visibility_level, fw: false)
 
-  - if @project.description.present?
-    .cover-desc.project-home-desc
-      = markdown(@project.description, pipeline: :description)
+        - if @project.description.present?
+          .cover-desc.project-home-desc
+            = markdown(@project.description, pipeline: :description)
 
-  - if forked_from_project = @project.forked_from_project
-    .cover-desc
-      Forked from
-      = link_to project_path(forked_from_project) do
-        = forked_from_project.namespace.try(:name)
+        - if forked_from_project = @project.forked_from_project
+          .cover-desc
+            Forked from
+            = link_to project_path(forked_from_project) do
+              = forked_from_project.namespace.try(:name)
 
-  .project-repo-buttons
-    .split-one.count-buttons
-      = render 'projects/buttons/star'
-      = render 'projects/buttons/fork'
+        .project-repo-buttons
+          .count-buttons
+            = render 'projects/buttons/star'
+            = render 'projects/buttons/fork'
 
-    .clone-row
-      .project-clone-holder
-        = render "shared/clone_panel"
-
-      .split-repo-buttons
-        .btn-group.pull-left
-          = render "projects/buttons/download"
-          = render 'projects/buttons/dropdown'
+          .project-clone-holder
+            = render "shared/clone_panel"
 
+    .project-repo-buttons.btn-group.project-right-buttons
+      = render "projects/buttons/download"
+      = render 'projects/buttons/dropdown'
       = render 'projects/buttons/notifications'
 
 :javascript
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index 1e4c46fca2f..16b8e1cca91 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -2,7 +2,7 @@
   .btn-group
     %a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"}
       = icon('plus')
-    %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
+    %ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
       - can_create_issue = can?(current_user, :create_issue, @project)
       - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
       - can_create_snippet = can?(current_user, :create_snippet, @project)
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index c1e3e5b73a2..1d05da50581 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -1,11 +1,11 @@
 - if @notification_setting
   = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), method: :patch, remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
     = f.hidden_field :level
-    %span.dropdown
+    .dropdown
       %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
         = icon('bell')
         = notification_title(@notification_setting.level)
-        = icon('angle-down')
-      %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
+        = icon('caret-down')
+      %ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
         - NotificationSetting.levels.each do |level|
           = notification_list_item(level.first, @notification_setting)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 74feb9e3282..61f739ad1d4 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -13,50 +13,51 @@
 = render "home_panel"
 
 .project-stats.row-content-block.second-block
-  %ul.nav
-    %li
-      = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-        = pluralize(number_with_delimiter(@project.commit_count), 'commit')
-    %li
-      = link_to namespace_project_branches_path(@project.namespace, @project) do
-        = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
-    %li
-      = link_to namespace_project_tags_path(@project.namespace, @project) do
-        = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
-
-    %li
-      = link_to project_files_path(@project) do
-        = repository_size
-
-    - if default_project_view != 'readme' && @repository.readme
+  .container-fluid.container-limited
+    %ul.nav
       %li
-        = link_to 'Readme', readme_path(@project)
-
-    - if @repository.changelog
+        = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
+          = pluralize(number_with_delimiter(@project.commit_count), 'commit')
       %li
-        = link_to 'Changelog', changelog_path(@project)
-
-    - if @repository.license_blob
+        = link_to namespace_project_branches_path(@project.namespace, @project) do
+          = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
       %li
-        = link_to license_short_name(@project), license_path(@project)
+        = link_to namespace_project_tags_path(@project.namespace, @project) do
+          = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
 
-    - if @repository.contribution_guide
       %li
-        = link_to 'Contribution guide', contribution_guide_path(@project)
+        = link_to project_files_path(@project) do
+          = repository_size
 
-    - if current_user && can_push_branch?(@project, @project.default_branch)
-      - unless @repository.changelog
-        %li.missing
-          = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
-            Add Changelog
-      - unless @repository.license_blob
-        %li.missing
-          = link_to add_special_file_path(@project, file_name: 'LICENSE') do
-            Add License
-      - unless @repository.contribution_guide
-        %li.missing
-          = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
-            Add Contribution guide
+      - if default_project_view != 'readme' && @repository.readme
+        %li
+          = link_to 'Readme', readme_path(@project)
+
+      - if @repository.changelog
+        %li
+          = link_to 'Changelog', changelog_path(@project)
+
+      - if @repository.license_blob
+        %li
+          = link_to license_short_name(@project), license_path(@project)
+
+      - if @repository.contribution_guide
+        %li
+          = link_to 'Contribution guide', contribution_guide_path(@project)
+
+      - if current_user && can_push_branch?(@project, @project.default_branch)
+        - unless @repository.changelog
+          %li.missing
+            = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
+              Add Changelog
+        - unless @repository.license_blob
+          %li.missing
+            = link_to add_special_file_path(@project, file_name: 'LICENSE') do
+              Add License
+        - unless @repository.contribution_guide
+          %li.missing
+            = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
+              Add Contribution guide
 
 - if @repository.commit
   .content-block.second-block.white
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 974751d9970..84b3f44c0ad 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -5,7 +5,7 @@
     %a#clone-dropdown.clone-dropdown-btn.btn{href: '#', 'data-toggle' => 'dropdown'}
       %span
         = default_clone_protocol.upcase
-      = icon('angle-down')
+      = icon('caret-down')
     %ul.dropdown-menu.dropdown-menu-right.clone-options-dropdown
       %li
         = ssh_clone_button(project)

From 5436bfa82230f7ba4532a2b09d035cfc733e8657 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 19 May 2016 13:31:19 -0500
Subject: [PATCH 0578/1431] Fix alignment of repo buttons

---
 app/assets/stylesheets/pages/projects.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index faf3c84ba2c..46981fd0d2c 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -218,7 +218,7 @@
     }
 
     @media (max-width: 1304px) {
-      top: -6px;
+      top: 0;
     }
   }
 

From 4caf38a1d583f1561affc278ff0ddc0174e47b72 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 09:21:33 +0100
Subject: [PATCH 0579/1431] Refactored JS slightly to make things easier

# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/views/emoji_awards/_awards_block.html.haml
---
 app/assets/javascripts/awards_handler.coffee  | 209 ++++++++----------
 .../emoji_awards/_awards_block.html.haml      |  22 ++
 2 files changed, 120 insertions(+), 111 deletions(-)
 create mode 100644 app/views/emoji_awards/_awards_block.html.haml

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index bf95e06b4e5..105b0c34e95 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,78 +1,69 @@
 class @AwardsHandler
-  constructor: (@getEmojisUrl, @postEmojiUrl, @noteableType, @noteableId, @unicodes) ->
-    $('.js-add-award').on 'click', (event) =>
+  constructor: (@aliases) ->
+    $(".js-add-award").on "click", (event) =>
       event.stopPropagation()
       event.preventDefault()
 
       @showEmojiMenu()
 
-    $('html').on 'click', (event) ->
-      if !$(event.target).closest('.emoji-menu').length
-        if $('.emoji-menu').is(':visible')
-          $('.emoji-menu').removeClass 'is-visible'
+    $("html").on 'click', (event) ->
+      if !$(event.target).closest(".emoji-menu").length
+        if $(".emoji-menu").is(":visible")
+          $(".emoji-menu").removeClass "is-visible"
 
-    $('.awards')
-      .off 'click'
-      .on 'click', '.js-emoji-btn', @handleClick
+    $(".awards")
+      .off "click"
+      .on "click", ".js-emoji-btn", @handleClick
 
     @renderFrequentlyUsedBlock()
 
   handleClick: (e) ->
     e.preventDefault()
-    emoji = $(this)
-      .find('.icon')
-      .data 'emoji'
-
-    if emoji is 'thumbsup' and awardsHandler.didUserClickEmoji $(this), 'thumbsdown'
-      awardsHandler.addAward 'thumbsdown'
-
-    else if emoji is 'thumbsdown' and awardsHandler.didUserClickEmoji $(this), 'thumbsup'
-      awardsHandler.addAward 'thumbsup'
-
-    awardsHandler.addAward emoji
-
-    $(this).trigger 'blur'
-
-  didUserClickEmoji: (that, emoji) ->
-    if $(that).siblings("button:has([data-emoji=#{emoji}])").attr('data-original-title')
-      $(that).siblings("button:has([data-emoji=#{emoji}])").attr('data-original-title').indexOf('me') > -1
+    $emojiBtn = $(e.currentTarget)
+    awardUrl = $emojiBtn.closest('.js-votes-block').data 'award-url'
+    emoji = $emojiBtn
+      .find(".icon")
+      .data "emoji"
+    @addAward awardUrl, emoji
 
   showEmojiMenu: ->
-    if $('.emoji-menu').length
-      if $('.emoji-menu').is '.is-visible'
-        $('.emoji-menu').removeClass 'is-visible'
-        $('#emoji_search').blur()
+    if $(".emoji-menu").length
+      if $(".emoji-menu").is ".is-visible"
+        $(".emoji-menu").removeClass "is-visible"
+        $("#emoji_search").blur()
       else
-        $('.emoji-menu').addClass 'is-visible'
-        $('#emoji_search').focus()
+        $(".emoji-menu").addClass "is-visible"
+        $("#emoji_search").focus()
     else
-      $('.js-add-award').addClass 'is-loading'
-      $.get @getEmojisUrl, (response) =>
-        $('.js-add-award').removeClass 'is-loading'
-        $('.js-award-holder').append response
+      $('.js-add-award').addClass "is-loading"
+      $.get "/emojis", (response) =>
+        $('.js-add-award').removeClass "is-loading"
+        $(".js-award-holder").append response
         setTimeout =>
-          $('.emoji-menu').addClass 'is-visible'
-          $('#emoji_search').focus()
+          $(".emoji-menu").addClass "is-visible"
+          $("#emoji_search").focus()
           @setupSearch()
         , 200
 
-  addAward: (emoji) ->
-    @postEmoji emoji, =>
+  addAward: (awardUrl, emoji) ->
+    emoji = @normilizeEmojiName(emoji)
+    @postEmoji awardUrl, emoji, =>
       @addAwardToEmojiBar(emoji)
 
-    $('.emoji-menu').removeClass 'is-visible'
+    $(".emoji-menu").removeClass "is-visible"
 
   addAwardToEmojiBar: (emoji) ->
     @addEmojiToFrequentlyUsedList(emoji)
 
+    emoji = @normilizeEmojiName(emoji)
     if @exist(emoji)
       if @isActive(emoji)
         @decrementCounter(emoji)
       else
-        counter = @findEmojiIcon(emoji).siblings('.js-counter')
+        counter = @findEmojiIcon(emoji).siblings(".js-counter")
         counter.text(parseInt(counter.text()) + 1)
-        counter.parent().addClass('active')
-        @addMeToAuthorList(emoji)
+        counter.parent().addClass("active")
+        @addMeToUserList(emoji)
     else
       @createEmoji(emoji)
 
@@ -80,47 +71,47 @@ class @AwardsHandler
     @findEmojiIcon(emoji).length > 0
 
   isActive: (emoji) ->
-    @findEmojiIcon(emoji).parent().hasClass('active')
+    @findEmojiIcon(emoji).parent().hasClass("active")
 
   decrementCounter: (emoji) ->
-    counter = @findEmojiIcon(emoji).siblings('.js-counter')
+    counter = @findEmojiIcon(emoji).siblings(".js-counter")
     emojiIcon = counter.parent()
     if parseInt(counter.text()) > 1
       counter.text(parseInt(counter.text()) - 1)
-      emojiIcon.removeClass('active')
-      @removeMeFromAuthorList(emoji)
-    else if emoji == 'thumbsup' || emoji == 'thumbsdown'
-      emojiIcon.tooltip('destroy')
+      emojiIcon.removeClass("active")
+      @removeMeFromUserList(emoji)
+    else if emoji == "thumbsup" || emoji == "thumbsdown"
+      emojiIcon.tooltip("destroy")
       counter.text(0)
-      emojiIcon.removeClass('active')
-      @removeMeFromAuthorList(emoji)
+      emojiIcon.removeClass("active")
+      @removeMeFromUserList(emoji)
     else
-      emojiIcon.tooltip('destroy')
+      emojiIcon.tooltip("destroy")
       emojiIcon.remove()
 
-  removeMeFromAuthorList: (emoji) ->
-    awardBlock = @findEmojiIcon(emoji).parent()
-    authors = awardBlock
-      .attr('data-original-title')
-      .split(', ')
-    authors.splice(authors.indexOf('me'),1)
-    awardBlock
-      .closest('.js-emoji-btn')
-      .attr('data-original-title', authors.join(', '))
-    @resetTooltip(awardBlock)
+  removeMeFromUserList: (emoji) ->
+    award_block = @findEmojiIcon(emoji).parent()
+    authors = award_block
+      .attr("data-original-title")
+      .split(", ")
+    authors.splice(authors.indexOf("me"),1)
+    award_block
+      .closest(".js-emoji-btn")
+      .attr("data-original-title", authors.join(", "))
+    @resetTooltip(award_block)
 
-  addMeToAuthorList: (emoji) ->
-    awardBlock = @findEmojiIcon(emoji).parent()
-    origTitle = awardBlock.attr('data-original-title').trim()
-    authors = []
+  addMeToUserList: (emoji) ->
+    award_block = @findEmojiIcon(emoji).parent()
+    origTitle = award_block.attr("data-original-title").trim()
+    users = []
     if origTitle
-      authors = origTitle.split(', ')
-    authors.push('me')
-    awardBlock.attr('data-original-title', authors.join(', '))
-    @resetTooltip(awardBlock)
+      users = origTitle.split(', ')
+    users.push("me")
+    award_block.attr("title", users.join(", "))
+    @resetTooltip(award_block)
 
   resetTooltip: (award) ->
-    award.tooltip('destroy')
+    award.tooltip("destroy")
 
     # "destroy" call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
     setTimeout (->
@@ -131,37 +122,30 @@ class @AwardsHandler
   createEmoji: (emoji) ->
     emojiCssClass = @resolveNameToCssClass(emoji)
 
-    nodes = []
-    nodes.push(
-      "<button class='btn award-control js-emoji-btn has-tooltip active' data-original-title='me'>",
-      "<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>",
-      "<span class='award-control-text js-counter'>1</span>",
-      "</button>"
-    )
+    buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me'>
+      <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
+      <span class='award-control-text js-counter'>1</span>
+    </button>"
 
-    $(nodes.join("\n"))
-      .insertBefore('.js-award-holder')
-      .find('.emoji-icon')
-      .data('emoji', emoji)
+    emoji_node = $(buttonHtml)
+      .insertBefore(".js-award-holder")
+      .find(".emoji-icon")
+      .data("emoji", emoji)
     $('.award-control').tooltip()
 
   resolveNameToCssClass: (emoji) ->
-    emojiIcon = $(".emoji-menu-content [data-emoji='#{emoji}']")
+    emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
-    if emojiIcon.length > 0
-      unicodeName = emojiIcon.data('unicode-name')
+    if emoji_icon.length > 0
+      unicodeName = emoji_icon.data("unicode-name")
     else
       # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name')
+      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
 
     "emoji-#{unicodeName}"
 
-  postEmoji: (emoji, callback) ->
-    $.post @postEmojiUrl, { note: {
-      note: ":#{emoji}:"
-      noteable_type: @noteableType
-      noteable_id: @noteableId
-    }},(data) ->
+  postEmoji: (awardUrl, emoji, callback) ->
+    $.post awardUrl, { name: emoji }, (data) ->
       if data.ok
         callback.call()
 
@@ -173,43 +157,46 @@ class @AwardsHandler
       scrollTop: $('.awards').offset().top - 80
     }, 200)
 
+  normilizeEmojiName: (emoji) ->
+    @aliases[emoji] || emoji
+
   addEmojiToFrequentlyUsedList: (emoji) ->
-    frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
-    frequentlyUsedEmojis.push(emoji)
-    $.cookie('frequently_used_emojis', frequentlyUsedEmojis.join(','), { expires: 365 })
+    frequently_used_emojis = @getFrequentlyUsedEmojis()
+    frequently_used_emojis.push(emoji)
+    $.cookie('frequently_used_emojis', frequently_used_emojis.join(","), { expires: 365 })
 
   getFrequentlyUsedEmojis: ->
-    frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') || '').split(',')
-    _.compact(_.uniq(frequentlyUsedEmojis))
+    frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
+    _.compact(_.uniq(frequently_used_emojis))
 
   renderFrequentlyUsedBlock: ->
     if $.cookie('frequently_used_emojis')
-      frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
+      frequently_used_emojis = @getFrequentlyUsedEmojis()
 
-      ul = $('<ul>')
+      ul = $("<ul>")
 
-      for emoji in frequentlyUsedEmojis
+      for emoji in frequently_used_emojis
         do (emoji) ->
-          $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
+          $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
 
-      $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
+      $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
 
   setupSearch: ->
-    $('input.emoji-search').keyup (ev) =>
+    $("input.emoji-search").keyup (ev) =>
       term = $(ev.target).val()
 
       # Clean previous search results
-      $('ul.emoji-menu-search, h5.emoji-search').remove()
+      $("ul.emoji-menu-search, h5.emoji-search").remove()
 
       if term
         # Generate a search result block
-        h5 = $('<h5>').text('Search results').addClass('emoji-search')
-        foundEmojis = @searchEmojis(term).show()
-        ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis)
-        $('.emoji-menu-content ul, .emoji-menu-content h5').hide()
-        $('.emoji-menu-content').append(h5).append(ul)
+        h5 = $("<h5>").text("Search results").addClass("emoji-search")
+        found_emojis = @searchEmojis(term).show()
+        ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
+        $(".emoji-menu-content ul, .emoji-menu-content h5").hide()
+        $(".emoji-menu-content").append(h5).append(ul)
       else
-        $('.emoji-menu-content').children().show()
+        $(".emoji-menu-content").children().show()
 
   searchEmojis: (term)->
     $(".emoji-menu-content [data-emoji*='#{term}']").closest("li").clone()
diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml
new file mode 100644
index 00000000000..da1de1c1deb
--- /dev/null
+++ b/app/views/emoji_awards/_awards_block.html.haml
@@ -0,0 +1,22 @@
+.awards.votes-block.js-votes-block{ data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
+  - awards_sort(awardable.grouped_awards).each do |emoji, awards|
+    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user) }
+      = emoji_icon(emoji)
+      %span.award-control-text.js-counter
+        = awards.count
+
+  - if current_user
+    %div.award-menu-holder.js-award-holder
+      %button.btn.award-control.js-add-award{ type: "button" }
+        = icon('smile-o', {class: "award-control-icon"})
+        = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
+        %span.award-control-text
+          Add
+
+- if current_user
+  :javascript
+    var aliases = #{AwardEmoji.aliases.to_json};
+
+    window.awards_handler = new AwardsHandler(
+      aliases
+    );

From 0b45cf55dddb66b7c6328bc6d5233d023c031e5c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 10:55:37 +0100
Subject: [PATCH 0580/1431] Uses the same emoji-menu and just moves it around
 depending where it should be viewed

# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/assets/stylesheets/pages/notes.scss
#	app/helpers/issues_helper.rb
#	app/views/projects/notes/_note.html.haml
---
 app/assets/javascripts/awards_handler.coffee  |  41 +--
 app/assets/javascripts/dispatcher.js.coffee   |   2 +
 .../lib/emoji_aliases.js.coffee.erb           |   2 +
 app/assets/stylesheets/pages/awards.scss      |   2 +-
 app/assets/stylesheets/pages/notes.scss       | 253 ++++++++----------
 .../emoji_awards/_awards_block.html.haml      |  14 +-
 app/views/projects/notes/_note.html.haml      |  23 +-
 7 files changed, 157 insertions(+), 180 deletions(-)
 create mode 100644 app/assets/javascripts/lib/emoji_aliases.js.coffee.erb

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 105b0c34e95..9e3d9f09126 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,23 +1,23 @@
 class @AwardsHandler
-  constructor: (@aliases) ->
-    $(".js-add-award").on "click", (event) =>
+  constructor: ->
+    @aliases = emojiAliases()
+
+    $(document).on "click", ".js-add-award", (event) =>
       event.stopPropagation()
       event.preventDefault()
 
-      @showEmojiMenu()
+      @showEmojiMenu $(event.currentTarget)
 
     $("html").on 'click', (event) ->
       if !$(event.target).closest(".emoji-menu").length
         if $(".emoji-menu").is(":visible")
           $(".emoji-menu").removeClass "is-visible"
 
-    $(".awards")
-      .off "click"
+    $(document)
+      .off "click", ".js-emoji-btn"
       .on "click", ".js-emoji-btn", @handleClick
 
-    @renderFrequentlyUsedBlock()
-
-  handleClick: (e) ->
+  handleClick: (e) =>
     e.preventDefault()
     $emojiBtn = $(e.currentTarget)
     awardUrl = $emojiBtn.closest('.js-votes-block').data 'award-url'
@@ -26,8 +26,13 @@ class @AwardsHandler
       .data "emoji"
     @addAward awardUrl, emoji
 
-  showEmojiMenu: ->
+  showEmojiMenu: ($addBtn) ->
     if $(".emoji-menu").length
+      $holder = $addBtn.closest('.js-award-holder')
+
+      if $holder.find('.emoji-menu').length is 0
+        $(".emoji-menu").detach().appendTo $holder
+
       if $(".emoji-menu").is ".is-visible"
         $(".emoji-menu").removeClass "is-visible"
         $("#emoji_search").blur()
@@ -35,10 +40,11 @@ class @AwardsHandler
         $(".emoji-menu").addClass "is-visible"
         $("#emoji_search").focus()
     else
-      $('.js-add-award').addClass "is-loading"
-      $.get "/emojis", (response) =>
-        $('.js-add-award').removeClass "is-loading"
-        $(".js-award-holder").append response
+      $addBtn.addClass "is-loading"
+      $.get $addBtn.data('award-menu-url'), (response) =>
+        $addBtn.removeClass "is-loading"
+        $addBtn.closest('.js-award-holder').append response
+        @renderFrequentlyUsedBlock()
         setTimeout =>
           $(".emoji-menu").addClass "is-visible"
           $("#emoji_search").focus()
@@ -128,7 +134,7 @@ class @AwardsHandler
     </button>"
 
     emoji_node = $(buttonHtml)
-      .insertBefore(".js-award-holder")
+      .insertBefore(".js-award-holder:not(.js-award-action-btn)")
       .find(".emoji-icon")
       .data("emoji", emoji)
     $('.award-control').tooltip()
@@ -173,16 +179,15 @@ class @AwardsHandler
     if $.cookie('frequently_used_emojis')
       frequently_used_emojis = @getFrequentlyUsedEmojis()
 
-      ul = $("<ul>")
+      ul = $("<ul class='clearfix emoji-menu-list'>")
 
       for emoji in frequently_used_emojis
-        do (emoji) ->
-          $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
+        $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
 
       $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
 
   setupSearch: ->
-    $("input.emoji-search").keyup (ev) =>
+    $("input.emoji-search").on 'keyup', (ev) =>
       term = $(ev.target).val()
 
       # Clean previous search results
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index f91aa3c5ad7..ff8bcf89918 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -23,6 +23,7 @@ class Dispatcher
         new Issue()
         shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
+        window.awards_handler = new AwardsHandler()
       when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
         new Milestone()
       when 'dashboard:todos:index'
@@ -53,6 +54,7 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
+        window.awards_handler = new AwardsHandler()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
new file mode 100644
index 00000000000..66f640a3cb7
--- /dev/null
+++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
@@ -0,0 +1,2 @@
+window.emojiAliases = ->
+  JSON.parse('<%= AwardEmoji.aliases.to_json %>')
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 37bf38fa65d..c7c8d2dda45 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -107,7 +107,7 @@
   }
 
   &.is-loading {
-    .award-control-icon {
+    .award-control-icon-normal {
       display: none;
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index a3e1ac13a43..411cd3cd230 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -20,15 +20,9 @@ ul.notes {
 
   .timeline-content {
     margin-left: 55px;
-
-    &.timeline-content-form {
-      @media (max-width: $screen-sm-max) {
-        margin-left: 0;
-      }
-    }
   }
 
-  .note-created-ago, .note-updated-at {
+  .note_created_ago, .note-updated-at {
     white-space: nowrap;
   }
 
@@ -45,6 +39,53 @@ ul.notes {
     }
   }
 
+  .discussion-header,
+  .note-header {
+    @extend .cgray;
+
+    a:hover {
+      text-decoration: none;
+    }
+
+    .avatar {
+      float: left;
+      margin-right: 10px;
+    }
+
+    .discussion-last-update,
+    .note-last-update {
+      &:before {
+        content: "\00b7";
+      }
+
+      a {
+        color: $gl-gray;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+    .author {
+      color: #4c4e54;
+      margin-right: 3px;
+
+      &:hover {
+        color: $gl-link-color;
+      }
+    }
+    .author-username {
+    }
+
+    .note-role {
+      float: right;
+      margin-top: 1px;
+      border: 1px solid #bbb;
+      background-color: transparent;
+      color: $gl-gray;
+    }
+  }
+
   .discussion-body {
     padding-top: 15px;
   }
@@ -58,7 +99,6 @@ ul.notes {
   .note {
     display: block;
     position: relative;
-    border-bottom: 1px solid $table-border-gray;
 
     &.is-editting {
       .note-header,
@@ -73,16 +113,16 @@ ul.notes {
     }
 
     .note-body {
-      overflow: auto;
-
       .note-text {
         overflow: auto;
         word-wrap: break-word;
         @include md-typography;
 
         // On diffs code should wrap nicely and not overflow
-        code {
-          white-space: pre-wrap;
+        pre {
+          code {
+            white-space: pre-wrap;
+          }
         }
 
         // Reset ul style types since we're nested inside a ul already
@@ -109,10 +149,6 @@ ul.notes {
           border-color: darken(#f5f5f5, 8%);
           margin: 10px 0;
         }
-
-        code {
-          word-break: keep-all;
-        }
       }
     }
 
@@ -120,6 +156,9 @@ ul.notes {
       padding-bottom: 3px;
     }
 
+    &:last-child {
+      border-bottom: 1px solid $border-color;
+    }
   }
 }
 
@@ -137,149 +176,60 @@ ul.notes {
   font-family: $regular_font;
 
   td {
-    border: 1px solid $table-border-gray;
+    border: 1px solid #ddd;
     border-left: none;
 
     &.notes_line {
       vertical-align: middle;
       text-align: center;
       padding: 10px 0;
-      background: $background-color;
+      background: #fff;
       color: $text-color;
     }
-
     &.notes_line2 {
       text-align: center;
       padding: 10px 0;
       border-left: 1px solid #ddd !important;
     }
-
     &.notes_content {
-      background-color: $background-color;
+      background-color: #fff;
       border-width: 1px 0;
-      padding: 0;
+      padding-top: 0;
       vertical-align: top;
-      white-space: normal;
-
-      &.parallel {
+      &.parallel{
         border-width: 1px;
       }
-
-      .notes {
-        background-color: $white-light;
-      }
-
-      a code {
-        top: 0;
-        margin-right: 0;
-      }
     }
   }
 }
 
-.discussion-header,
-.note-header {
-  a {
-    color: inherit;
-
-    &:hover {
-      color: $gl-link-color;
-      text-decoration: none;
-    }
-  }
-
-  .author_link {
-    color: $gl-gray;
-  }
-}
-
-.note-headline-light,
-.discussion-headline-light {
-  color: $notes-light-color;
-}
-
-.discussion-headline-light {
-  a {
-    color: $gl-link-color;
-  }
-}
-
 /**
  * Actions for Discussions/Notes
  */
 
-.discussion-actions,
-.note-actions {
-  float: right;
-  margin-left: 10px;
-  color: $notes-action-color;
-}
+.discussion,
+.note {
+  .discussion-actions,
+  .note-actions {
+    float: right;
+    margin-left: 10px;
 
-.discussion-actions {
-  @media (max-width: $screen-md-max) {
-    float: none;
-    margin-left: 0;
+    a {
+      margin-left: 5px;
+      color: $gl-gray;
 
-    .note-action-button {
-      margin-left: 0;
-    }
-  }
-}
-
-.note-action-button {
-  display: inline-block;
-  margin-left: 10px;
-  line-height: 24px;
-
-  .fa {
-    color: $notes-action-color;
-    position: relative;
-    top: 1px;
-    font-size: 17px;
-  }
-
-  &.js-note-delete {
-    i {
-      &:hover {
-        color: $gl-text-red;
+      i.fa {
+        font-size: 16px;
+        line-height: 16px;
       }
-    }
-  }
 
-  &.js-note-edit {
-    i {
       &:hover {
-        color: $gl-link-color;
+        @extend .cgray;
+        &.danger { @extend .cred; }
       }
     }
   }
 }
-
-.discussion-toggle-button {
-  line-height: 20px;
-  font-size: 13px;
-
-  .fa {
-    margin-right: 3px;
-    font-size: 10px;
-    line-height: 18px;
-    vertical-align: top;
-  }
-}
-
-.note-role {
-  position: relative;
-  top: -2px;
-  display: inline-block;
-  padding-left: 4px;
-  padding-right: 4px;
-  color: $notes-role-color;
-  font-size: 12px;
-  line-height: 20px;
-  border: 1px solid $notes-role-border-color;
-  border-radius: $border-radius-base;
-}
-
 .diff-file .note .note-actions {
   right: 0;
   top: 0;
@@ -292,7 +242,8 @@ ul.notes {
 
 .diff-file tr.line_holder {
   @mixin show-add-diff-note {
-    display: inline-block;
+    filter: alpha(opacity=100);
+    opacity: 1.0;
   }
 
   .add-diff-note {
@@ -302,12 +253,17 @@ ul.notes {
     padding: 4px;
     font-size: 16px;
     color: $gl-link-color;
-    margin-left: -56px;
+    margin-left: -60px;
     position: absolute;
     z-index: 10;
     width: 32px;
+
+    transition: all 0.2s ease;
+
     // "hide" it by default
-    display: none;
+    opacity: 0.0;
+    filter: alpha(opacity=0);
+
     &:hover {
       background: $gl-info;
       color: #fff;
@@ -323,20 +279,33 @@ ul.notes {
   }
 }
 
-.disabled-comment {
-  margin-left: -$gl-padding-top;
-  margin-right: -$gl-padding-top;
-  background-color: $gray-light;
-  border-radius: $border-radius-base;
-  border: 1px solid $border-gray-normal;
-  color: $note-disabled-comment-color;
-  line-height: 200px;
-
-  .disabled-comment-text {
-    line-height: normal;
-  }
-
-  a {
-    color: $gl-link-color;
+.note-action-award-holder {
+  .emoji-menu {
+    left: auto;
+    right: -15px;
+    transform-origin: 100% -45px;
+  }
+}
+
+.note-award-control {
+  display: block;
+
+  &:hover,
+  &:focus {
+    text-decoration: none;
+  }
+
+  .award-control-icon-loading {
+    display: none;
+  }
+
+  &.is-loading {
+    .award-control-icon-normal {
+      display: none;
+    }
+
+    .award-control-icon-loading {
+      display: block;
+    }
   }
 }
diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml
index da1de1c1deb..79ebaa6777e 100644
--- a/app/views/emoji_awards/_awards_block.html.haml
+++ b/app/views/emoji_awards/_awards_block.html.haml
@@ -6,17 +6,9 @@
         = awards.count
 
   - if current_user
-    %div.award-menu-holder.js-award-holder
-      %button.btn.award-control.js-add-award{ type: "button" }
-        = icon('smile-o', {class: "award-control-icon"})
+    .award-menu-holder.js-award-holder
+      %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
+        = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
         = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
         %span.award-control-text
           Add
-
-- if current_user
-  :javascript
-    var aliases = #{AwardEmoji.aliases.to_json};
-
-    window.awards_handler = new AwardsHandler(
-      aliases
-    );
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 9fbc9a45549..b7fbd89da9c 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -9,14 +9,20 @@
         = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
     .timeline-content
       .note-header
-        = link_to_member(note.project, note.author, avatar: false)
-        .inline.note-headline-light
-          = note.author.to_reference
-          - unless note.system
-            commented
-          %a{ href: "##{dom_id(note)}" }
-            = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
-        .note-actions
+        - if note_editable?(note)
+          .note-actions
+            = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
+              = icon('pencil-square-o')
+
+            .award-menu-holder.note-action-award-holder.js-award-holder.js-award-action-btn
+              = link_to '#', title: 'Award emoji', class: 'note-award-control js-add-award', data: { award_menu_url: emojis_path } do
+                = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
+                = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
+
+            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'js-note-delete danger' do
+              = icon('trash-o')
+
+        - unless note.system
           - access = note.project.team.human_max_access(note.author.id)
           - if access
             %span.note-role
@@ -32,6 +38,7 @@
             = markdown(note.note, pipeline: :note, cache_key: [note, "note"])
         - if note_editable
           = render 'projects/notes/edit_form', note: note
+        = render 'emoji_awards/awards_block', awardable: note
       = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
 
       - if note.attachment.url

From f2f2e072940fb24f77401f8b73e417a610aa9f36 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 12:08:31 +0100
Subject: [PATCH 0581/1431] Shows the bar on notes if a new award is added
 Correctly adds/removes awards in notes

# Conflicts:
#	app/models/concerns/awardable.rb
#	app/views/projects/issues/show.html.haml
#	app/views/projects/merge_requests/_show.html.haml
---
 app/assets/javascripts/awards_handler.coffee  | 33 +++++++++++++------
 .../emoji_awards/_awards_block.html.haml      |  5 +--
 app/views/projects/notes/_note.html.haml      | 10 +++---
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 9e3d9f09126..4ee0c6e215d 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -20,7 +20,13 @@ class @AwardsHandler
   handleClick: (e) =>
     e.preventDefault()
     $emojiBtn = $(e.currentTarget)
-    awardUrl = $emojiBtn.closest('.js-votes-block').data 'award-url'
+    $votesBlock = $($emojiBtn.closest('.js-award-holder').data('target'))
+
+    if $votesBlock.length is 0
+      $votesBlock = $emojiBtn.closest('.js-awards-block')
+
+    $votesBlock.addClass 'js-awards-block-current'
+    awardUrl = $votesBlock.data 'award-url'
     emoji = $emojiBtn
       .find(".icon")
       .data "emoji"
@@ -44,7 +50,9 @@ class @AwardsHandler
       $.get $addBtn.data('award-menu-url'), (response) =>
         $addBtn.removeClass "is-loading"
         $addBtn.closest('.js-award-holder').append response
+
         @renderFrequentlyUsedBlock()
+
         setTimeout =>
           $(".emoji-menu").addClass "is-visible"
           $("#emoji_search").focus()
@@ -56,14 +64,18 @@ class @AwardsHandler
     @postEmoji awardUrl, emoji, =>
       @addAwardToEmojiBar(emoji)
 
+      $('.js-awards-block-current').removeClass 'js-awards-block-current'
+
     $(".emoji-menu").removeClass "is-visible"
 
   addAwardToEmojiBar: (emoji) ->
     @addEmojiToFrequentlyUsedList(emoji)
 
     emoji = @normilizeEmojiName(emoji)
-    if @exist(emoji)
-      if @isActive(emoji)
+    $emojiBtn = @findEmojiIcon(emoji)
+
+    if $emojiBtn.length > 0
+      if @isActive($emojiBtn)
         @decrementCounter(emoji)
       else
         counter = @findEmojiIcon(emoji).siblings(".js-counter")
@@ -73,11 +85,8 @@ class @AwardsHandler
     else
       @createEmoji(emoji)
 
-  exist: (emoji) ->
-    @findEmojiIcon(emoji).length > 0
-
-  isActive: (emoji) ->
-    @findEmojiIcon(emoji).parent().hasClass("active")
+  isActive: ($emojiBtn) ->
+    $emojiBtn.parent().hasClass("active")
 
   decrementCounter: (emoji) ->
     counter = @findEmojiIcon(emoji).siblings(".js-counter")
@@ -134,11 +143,15 @@ class @AwardsHandler
     </button>"
 
     emoji_node = $(buttonHtml)
-      .insertBefore(".js-award-holder:not(.js-award-action-btn)")
+      .insertBefore(".js-awards-block-current .js-award-holder:not(.js-award-action-btn)")
       .find(".emoji-icon")
       .data("emoji", emoji)
     $('.award-control').tooltip()
 
+    $currentBlock = $('.js-awards-block-current')
+    if $currentBlock.is('.hidden')
+      $currentBlock.removeClass 'hidden'
+
   resolveNameToCssClass: (emoji) ->
     emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
@@ -156,7 +169,7 @@ class @AwardsHandler
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    $(".awards > .js-emoji-btn [data-emoji='#{emoji}']")
+    $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']")
 
   scrollToAwards: ->
     $('body, html').animate({
diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml
index 79ebaa6777e..7df64253f25 100644
--- a/app/views/emoji_awards/_awards_block.html.haml
+++ b/app/views/emoji_awards/_awards_block.html.haml
@@ -1,5 +1,6 @@
-.awards.votes-block.js-votes-block{ data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
-  - awards_sort(awardable.grouped_awards).each do |emoji, awards|
+- grouped_emojis = awardable.grouped_awards(inline)
+.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
+  - awards_sort(grouped_emojis).each do |emoji, awards|
     %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user) }
       = emoji_icon(emoji)
       %span.award-control-text.js-counter
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index b7fbd89da9c..e11a7c52a9b 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -11,14 +11,14 @@
       .note-header
         - if note_editable?(note)
           .note-actions
-            = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
-              = icon('pencil-square-o')
-
-            .award-menu-holder.note-action-award-holder.js-award-holder.js-award-action-btn
+            .award-menu-holder.note-action-award-holder.js-award-holder.js-award-action-btn{ data: { target: "##{dom_id(note)} .js-awards-block" } }
               = link_to '#', title: 'Award emoji', class: 'note-award-control js-add-award', data: { award_menu_url: emojis_path } do
                 = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
                 = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
 
+            = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
+              = icon('pencil-square-o')
+
             = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'js-note-delete danger' do
               = icon('trash-o')
 
@@ -38,7 +38,7 @@
             = markdown(note.note, pipeline: :note, cache_key: [note, "note"])
         - if note_editable
           = render 'projects/notes/edit_form', note: note
-        = render 'emoji_awards/awards_block', awardable: note
+        = render 'emoji_awards/awards_block', awardable: note, inline: false
       = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
 
       - if note.attachment.url

From 25a4893215143a5481282013781bc30667bfd75f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 12:56:48 +0100
Subject: [PATCH 0582/1431] Removes buttons in notes body

---
 app/assets/javascripts/awards_handler.coffee | 54 +++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 4ee0c6e215d..d4ce01354b4 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -2,11 +2,13 @@ class @AwardsHandler
   constructor: ->
     @aliases = emojiAliases()
 
-    $(document).on "click", ".js-add-award", (event) =>
-      event.stopPropagation()
-      event.preventDefault()
+    $(document)
+      .off "click", ".js-add-award"
+      .on "click", ".js-add-award", (event) =>
+        event.stopPropagation()
+        event.preventDefault()
 
-      @showEmojiMenu $(event.currentTarget)
+        @showEmojiMenu $(event.currentTarget)
 
     $("html").on 'click', (event) ->
       if !$(event.target).closest(".emoji-menu").length
@@ -72,40 +74,42 @@ class @AwardsHandler
     @addEmojiToFrequentlyUsedList(emoji)
 
     emoji = @normilizeEmojiName(emoji)
-    $emojiBtn = @findEmojiIcon(emoji)
+    $emojiBtn = @findEmojiIcon(emoji).parent()
 
     if $emojiBtn.length > 0
       if @isActive($emojiBtn)
-        @decrementCounter(emoji)
+        @decrementCounter($emojiBtn, emoji)
       else
-        counter = @findEmojiIcon(emoji).siblings(".js-counter")
+        counter = $emojiBtn.siblings(".js-counter")
         counter.text(parseInt(counter.text()) + 1)
-        counter.parent().addClass("active")
+        $emojiBtn.addClass("active")
         @addMeToUserList(emoji)
     else
       @createEmoji(emoji)
 
   isActive: ($emojiBtn) ->
-    $emojiBtn.parent().hasClass("active")
+    $emojiBtn.hasClass("active")
 
-  decrementCounter: (emoji) ->
-    counter = @findEmojiIcon(emoji).siblings(".js-counter")
-    emojiIcon = counter.parent()
-    if parseInt(counter.text()) > 1
-      counter.text(parseInt(counter.text()) - 1)
-      emojiIcon.removeClass("active")
-      @removeMeFromUserList(emoji)
-    else if emoji == "thumbsup" || emoji == "thumbsdown"
-      emojiIcon.tooltip("destroy")
-      counter.text(0)
-      emojiIcon.removeClass("active")
-      @removeMeFromUserList(emoji)
+  decrementCounter: ($emojiBtn, emoji) ->
+    isntNoteBody = $emojiBtn.closest('.note-body').length is 0
+    counter = $('.js-counter', $emojiBtn)
+    counterNumber = parseInt(counter.text())
+
+    if counterNumber > 1
+      counter.text(counterNumber - 1)
+      @removeMeFromUserList($emojiBtn, emoji)
+    else if (emoji == "thumbsup" || emoji == "thumbsdown") && isntNoteBody
+      $emojiBtn.tooltip("destroy")
+      counter.text('0')
+      @removeMeFromUserList($emojiBtn, emoji)
     else
-      emojiIcon.tooltip("destroy")
-      emojiIcon.remove()
+      $emojiBtn.tooltip("destroy")
+      $emojiBtn.remove()
 
-  removeMeFromUserList: (emoji) ->
-    award_block = @findEmojiIcon(emoji).parent()
+    $emojiBtn.removeClass("active")
+
+  removeMeFromUserList: ($emojiBtn, emoji) ->
+    award_block = $emojiBtn
     authors = award_block
       .attr("data-original-title")
       .split(", ")

From 9e8449b1afee35a6497db43ae6c040fae5f26186 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 13:17:57 +0100
Subject: [PATCH 0583/1431] Hides the row in notes body when empty of emojis

---
 app/assets/javascripts/awards_handler.coffee | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index d4ce01354b4..fb880d28f2c 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -95,6 +95,11 @@ class @AwardsHandler
     counter = $('.js-counter', $emojiBtn)
     counterNumber = parseInt(counter.text())
 
+    if !isntNoteBody
+      console.log $emojiBtn.get(0)
+      # If this is a note body, we just hide the award emoji row like the initial state
+      $emojiBtn.closest('.js-awards-block').addClass 'hidden'
+
     if counterNumber > 1
       counter.text(counterNumber - 1)
       @removeMeFromUserList($emojiBtn, emoji)

From 7d4f41efdee8aae424ed624a8702c9eb863ac43f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 13:20:53 +0100
Subject: [PATCH 0584/1431] Removed console log

---
 app/assets/javascripts/awards_handler.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index fb880d28f2c..9d7ed87e598 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -96,7 +96,6 @@ class @AwardsHandler
     counterNumber = parseInt(counter.text())
 
     if !isntNoteBody
-      console.log $emojiBtn.get(0)
       # If this is a note body, we just hide the award emoji row like the initial state
       $emojiBtn.closest('.js-awards-block').addClass 'hidden'
 

From 3d4d8e59077ebd491741bb737b1e2af8f8335e4a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 15:19:38 +0100
Subject: [PATCH 0585/1431] Changed design of inline award picker to be similar
 to designs

# Conflicts:
#	app/views/votes/_votes_block.html.haml
---
 app/assets/stylesheets/pages/awards.scss |  2 --
 app/assets/stylesheets/pages/notes.scss  | 12 ++++++++++
 app/views/projects/notes/_note.html.haml |  3 ++-
 app/views/votes/_votes_block.html.haml   | 30 ------------------------
 4 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 app/views/votes/_votes_block.html.haml

diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index c7c8d2dda45..ef73e2f0a53 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -1,6 +1,4 @@
 .awards {
-  line-height: 34px;
-
   .emoji-icon {
     width: 20px;
     height: 20px;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 411cd3cd230..012799b2265 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -309,3 +309,15 @@ ul.notes {
     }
   }
 }
+
+.note-awards {
+  .awards {
+    padding-top: 10px;
+  }
+
+  .award-control {
+    padding-top: 2px;
+    padding-bottom: 2px;
+    font-size: 13px;
+  }
+}
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index e11a7c52a9b..ae5aae34326 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -38,7 +38,8 @@
             = markdown(note.note, pipeline: :note, cache_key: [note, "note"])
         - if note_editable
           = render 'projects/notes/edit_form', note: note
-        = render 'emoji_awards/awards_block', awardable: note, inline: false
+        .note-awards
+          = render 'emoji_awards/awards_block', awardable: note, inline: false
       = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
 
       - if note.attachment.url
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
deleted file mode 100644
index ab8bb949862..00000000000
--- a/app/views/votes/_votes_block.html.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-.awards.votes-block{data: { toggle_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) }}
-  - awards_sort(awardable.grouped_awards).each do |emoji, awards|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{class: (note_active_class(awards, current_user)), data: {placement: "top", original_title: emoji_author_list(awards, current_user)}}
-      = emoji_icon(emoji, sprite: false)
-      %span.award-control-text.js-counter
-        = awards.count
-
-  - if current_user
-    %div.award-menu-holder.js-award-holder
-      %a.btn.award-control.js-add-award{"href" => "#"}
-        = icon('smile-o', {class: "award-control-icon"})
-        = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
-        %span.award-control-text
-          Add
-
-- if current_user
-  :javascript
-    var getEmojisUrl = "#{emojis_path}";
-    var postEmojiUrl = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}";
-    var noteableType = "#{votable.class.name.underscore}";
-    var noteableId = "#{votable.id}";
-    var unicodes = #{AwardEmoji.unicode.to_json};
-
-    window.awardsHandler = new AwardsHandler(
-      getEmojisUrl,
-      postEmojiUrl,
-      noteableType,
-      noteableId,
-      unicodes
-    );

From f6a7b3c37a431c5a44dec3aafe212557cb27f45e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 17:34:42 +0100
Subject: [PATCH 0586/1431] Hides award bar when editing a note

---
 app/assets/stylesheets/pages/notes.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 012799b2265..e240847388e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -103,7 +103,8 @@ ul.notes {
     &.is-editting {
       .note-header,
       .note-text,
-      .edited-text {
+      .edited-text,
+      .note-awards {
         display: none;
       }
 

From 797acde04674ad58a599beea217de814d7dfe31d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 31 Mar 2016 18:19:38 +0100
Subject: [PATCH 0587/1431] Tooltip placement on award buttons

---
 app/assets/javascripts/awards_handler.coffee   | 2 +-
 app/assets/stylesheets/pages/notes.scss        | 1 +
 app/views/emoji_awards/_awards_block.html.haml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 9d7ed87e598..96f271be4db 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -145,7 +145,7 @@ class @AwardsHandler
   createEmoji: (emoji) ->
     emojiCssClass = @resolveNameToCssClass(emoji)
 
-    buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me'>
+    buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
       <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
       <span class='award-control-text js-counter'>1</span>
     </button>"
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index e240847388e..025897ca1ff 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -319,6 +319,7 @@ ul.notes {
   .award-control {
     padding-top: 2px;
     padding-bottom: 2px;
+    color: #8f8f8f;
     font-size: 13px;
   }
 }
diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml
index 7df64253f25..1b840d88752 100644
--- a/app/views/emoji_awards/_awards_block.html.haml
+++ b/app/views/emoji_awards/_awards_block.html.haml
@@ -1,7 +1,7 @@
 - grouped_emojis = awardable.grouped_awards(inline)
 .awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
   - awards_sort(grouped_emojis).each do |emoji, awards|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user) }
+    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user), data: { placement: "bottom" } }
       = emoji_icon(emoji)
       %span.award-control-text.js-counter
         = awards.count

From 44876032a2d6511060ac484259355b328b89ac0a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 1 Apr 2016 17:25:28 +0100
Subject: [PATCH 0588/1431] Added tests for issues

---
 app/views/projects/notes/_note.html.haml |   6 +-
 spec/features/issues/award_spec.rb       | 140 +++++++++++++++++++++++
 2 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100644 spec/features/issues/award_spec.rb

diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index ae5aae34326..bd478e315d1 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -9,13 +9,13 @@
         = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
     .timeline-content
       .note-header
-        - if note_editable?(note)
-          .note-actions
+        .note-actions
+          - if current_user
             .award-menu-holder.note-action-award-holder.js-award-holder.js-award-action-btn{ data: { target: "##{dom_id(note)} .js-awards-block" } }
               = link_to '#', title: 'Award emoji', class: 'note-award-control js-add-award', data: { award_menu_url: emojis_path } do
                 = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
                 = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
-
+          - if note_editable?(note)
             = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
               = icon('pencil-square-o')
 
diff --git a/spec/features/issues/award_spec.rb b/spec/features/issues/award_spec.rb
new file mode 100644
index 00000000000..46e1ed5d8cd
--- /dev/null
+++ b/spec/features/issues/award_spec.rb
@@ -0,0 +1,140 @@
+require 'rails_helper'
+
+feature 'Issue awards', js: true, feature: true do
+  let(:user)      { create(:user) }
+  let(:project)   { create(:project, :public) }
+  let(:issue)     { create(:issue, project: project) }
+  let!(:note)     { create(:note_on_issue, project: project, noteable: issue, note: 'Looks good!') }
+
+  describe 'logged in' do
+    before do
+      login_as(user)
+      visit namespace_project_issue_path(project.namespace, project, issue)
+    end
+
+    it 'should add award to issue' do
+      first('.js-emoji-btn').click
+      expect(page).to have_selector('.js-emoji-btn.active')
+      expect(first('.js-emoji-btn')).to have_content '1'
+    end
+
+    it 'should remove award from issue' do
+      first('.js-emoji-btn').click
+      find('.js-emoji-btn.active').click
+      expect(first('.js-emoji-btn')).to have_content '0'
+    end
+
+    it 'should show award menu button in notes' do
+      page.within('.note') do
+        expect(page).to have_selector('.js-award-action-btn')
+      end
+    end
+
+    it 'should not show award bar on note if no awards given' do
+      page.within('.note') do
+        expect(find('.js-awards-block', visible: false)).not_to be_visible
+      end
+    end
+
+    it 'should be able to show award menu when clicking add award button in note' do
+      show_note_award_menu
+    end
+
+    it 'should only have one menu on the page' do
+      first('.js-add-award').click
+      expect(page).to have_selector('.emoji-menu')
+
+      page.within('.note') do
+        find('.js-add-award').click
+        expect(page).to have_selector('.emoji-menu', count: 1)
+      end
+    end
+
+    it 'should add award to note' do
+      show_note_award_menu
+      award_on_note
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+        expect(find('.js-awards-block')).to have_selector('.active')
+      end
+    end
+
+    it 'should remove award from note' do
+      show_note_award_menu
+      award_on_note
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+        expect(find('.js-awards-block')).to have_selector('.active')
+      end
+
+      remove_award_on_note
+      sleep 0.5
+
+      page.within('.note') do
+        expect(find('.js-awards-block', visible: false)).not_to be_visible
+        expect(find('.js-awards-block', visible: false)).not_to have_selector('.active')
+      end
+    end
+
+    it 'should not hide award bar on notes with more than 1 award' do
+      show_note_award_menu
+      award_on_note
+
+      show_note_award_menu
+      award_on_note(2)
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+        expect(find('.js-awards-block')).to have_selector('.active')
+      end
+
+      remove_award_on_note
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+      end
+    end
+  end
+
+  describe 'logged out' do
+    before do
+      visit namespace_project_issue_path(project.namespace, project, issue)
+    end
+
+    it 'should not see award menu button' do
+      expect(page).not_to have_selector('.js-award-holder')
+    end
+
+    it 'should not see award menu button in note' do
+      page.within('.note') do
+        expect(page).not_to have_selector('.js-award-action-btn')
+      end
+    end
+  end
+
+  def show_note_award_menu
+    page.within('.note') do
+      find('.js-add-award').click
+      expect(page).to have_selector('.emoji-menu')
+    end
+  end
+
+  def award_on_note(index = 1)
+    page.within('.note') do
+      page.within('.emoji-menu') do
+        buttons = all('.js-emoji-btn')
+        buttons[index].click
+      end
+    end
+  end
+
+  def remove_award_on_note
+    page.within('.note') do
+      page.within('.js-awards-block') do
+        first('.js-emoji-btn').click
+      end
+    end
+  end
+end

From bf96c30510c0efcd56338f60c902b5b64cf98bad Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 1 Apr 2016 17:35:10 +0100
Subject: [PATCH 0589/1431] Award spec for merge requests

---
 spec/features/merge_requests/award_spec.rb | 140 +++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 spec/features/merge_requests/award_spec.rb

diff --git a/spec/features/merge_requests/award_spec.rb b/spec/features/merge_requests/award_spec.rb
new file mode 100644
index 00000000000..91e76e83c6f
--- /dev/null
+++ b/spec/features/merge_requests/award_spec.rb
@@ -0,0 +1,140 @@
+require 'rails_helper'
+
+feature 'Merge request awards', js: true, feature: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :public) }
+  let(:merge_request) { create(:merge_request_with_diffs, source_project: project) }
+  let!(:note) { create(:note_on_merge_request, project: project, noteable: merge_request, note: 'Looks good!') }
+
+  describe 'logged in' do
+    before do
+      login_as(user)
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+    end
+
+    it 'should add award to merge request' do
+      first('.js-emoji-btn').click
+      expect(page).to have_selector('.js-emoji-btn.active')
+      expect(first('.js-emoji-btn')).to have_content '1'
+    end
+
+    it 'should remove award from merge request' do
+      first('.js-emoji-btn').click
+      find('.js-emoji-btn.active').click
+      expect(first('.js-emoji-btn')).to have_content '0'
+    end
+
+    it 'should show award menu button in notes' do
+      page.within('.note') do
+        expect(page).to have_selector('.js-award-action-btn')
+      end
+    end
+
+    it 'should not show award bar on note if no awards given' do
+      page.within('.note') do
+        expect(find('.js-awards-block', visible: false)).not_to be_visible
+      end
+    end
+
+    it 'should be able to show award menu when clicking add award button in note' do
+      show_note_award_menu
+    end
+
+    it 'should only have one menu on the page' do
+      first('.js-add-award').click
+      expect(page).to have_selector('.emoji-menu')
+
+      page.within('.note') do
+        find('.js-add-award').click
+        expect(page).to have_selector('.emoji-menu', count: 1)
+      end
+    end
+
+    it 'should add award to note' do
+      show_note_award_menu
+      award_on_note
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+        expect(find('.js-awards-block')).to have_selector('.active')
+      end
+    end
+
+    it 'should remove award from note' do
+      show_note_award_menu
+      award_on_note
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+        expect(find('.js-awards-block')).to have_selector('.active')
+      end
+
+      remove_award_on_note
+      sleep 0.5
+
+      page.within('.note') do
+        expect(find('.js-awards-block', visible: false)).not_to be_visible
+        expect(find('.js-awards-block', visible: false)).not_to have_selector('.active')
+      end
+    end
+
+    it 'should not hide award bar on notes with more than 1 award' do
+      show_note_award_menu
+      award_on_note
+
+      show_note_award_menu
+      award_on_note(2)
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+        expect(find('.js-awards-block')).to have_selector('.active')
+      end
+
+      remove_award_on_note
+
+      page.within('.note') do
+        expect(find('.js-awards-block')).to be_visible
+      end
+    end
+  end
+
+  describe 'logged out' do
+    before do
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+    end
+
+    it 'should not see award menu button' do
+      expect(page).not_to have_selector('.js-award-holder')
+    end
+
+    it 'should not see award menu button in note' do
+      page.within('.note') do
+        expect(page).not_to have_selector('.js-award-action-btn')
+      end
+    end
+  end
+
+  def show_note_award_menu
+    page.within('.note') do
+      find('.js-add-award').click
+      expect(page).to have_selector('.emoji-menu')
+    end
+  end
+
+  def award_on_note(index = 1)
+    page.within('.note') do
+      page.within('.emoji-menu') do
+        buttons = all('.js-emoji-btn')
+        buttons[index].click
+      end
+    end
+  end
+
+  def remove_award_on_note
+    page.within('.note') do
+      page.within('.js-awards-block') do
+        first('.js-emoji-btn').click
+      end
+    end
+  end
+end

From 783a5ae98c17ffd1d93e2e5390e543e5f2f92bcc Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 1 Apr 2016 18:18:45 +0100
Subject: [PATCH 0590/1431] Adds the emoji menu to the body and then
 re-positions it depending on which button clicked This spots bugs where the
 menu could be in a div that has overflow hidden on ie. diff comments

---
 app/assets/javascripts/awards_handler.coffee | 52 +++++++++++++++-----
 app/assets/stylesheets/pages/awards.scss     |  9 ++--
 app/assets/stylesheets/pages/notes.scss      |  8 ---
 app/views/projects/notes/_note.html.haml     |  2 +-
 spec/features/issues/award_spec.rb           | 13 +++--
 spec/features/merge_requests/award_spec.rb   | 13 +++--
 6 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 96f271be4db..ff12cce4859 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -13,6 +13,7 @@ class @AwardsHandler
     $("html").on 'click', (event) ->
       if !$(event.target).closest(".emoji-menu").length
         if $(".emoji-menu").is(":visible")
+          $('.js-add-award.is-active').removeClass 'is-active'
           $(".emoji-menu").removeClass "is-visible"
 
     $(document)
@@ -22,10 +23,13 @@ class @AwardsHandler
   handleClick: (e) =>
     e.preventDefault()
     $emojiBtn = $(e.currentTarget)
-    $votesBlock = $($emojiBtn.closest('.js-award-holder').data('target'))
+    $addAwardBtn = $('.js-add-award.is-active')
+    $votesBlock = $($addAwardBtn.closest('.js-award-holder').data('target'))
 
-    if $votesBlock.length is 0
+    if $addAwardBtn.length is 0
       $votesBlock = $emojiBtn.closest('.js-awards-block')
+    else if $votesBlock.length is 0
+      $votesBlock = $addAwardBtn.closest('.js-awards-block')
 
     $votesBlock.addClass 'js-awards-block-current'
     awardUrl = $votesBlock.data 'award-url'
@@ -35,32 +39,56 @@ class @AwardsHandler
     @addAward awardUrl, emoji
 
   showEmojiMenu: ($addBtn) ->
-    if $(".emoji-menu").length
+    $menu = $('.emoji-menu')
+
+    if $menu.length
       $holder = $addBtn.closest('.js-award-holder')
 
-      if $holder.find('.emoji-menu').length is 0
-        $(".emoji-menu").detach().appendTo $holder
-
-      if $(".emoji-menu").is ".is-visible"
-        $(".emoji-menu").removeClass "is-visible"
+      if $menu.is ".is-visible"
+        $addBtn.removeClass "is-active"
+        $menu.removeClass "is-visible"
         $("#emoji_search").blur()
       else
-        $(".emoji-menu").addClass "is-visible"
+        $addBtn.addClass "is-active"
+        @positionMenu($menu, $addBtn)
+
+        $menu.addClass "is-visible"
         $("#emoji_search").focus()
     else
-      $addBtn.addClass "is-loading"
+      $addBtn.addClass "is-loading is-active"
       $.get $addBtn.data('award-menu-url'), (response) =>
         $addBtn.removeClass "is-loading"
-        $addBtn.closest('.js-award-holder').append response
+        $('body').append response
+
+        $menu = $(".emoji-menu")
+
+        @positionMenu($menu, $addBtn)
 
         @renderFrequentlyUsedBlock()
 
         setTimeout =>
-          $(".emoji-menu").addClass "is-visible"
+          $menu.addClass "is-visible"
           $("#emoji_search").focus()
           @setupSearch()
         , 200
 
+  positionMenu: ($menu, $addBtn) ->
+    position = $addBtn.data('position')
+
+    # The menu could potentially be off-screen or in a hidden overflow element
+    # So we position the element absolute in the body
+    css =
+      top: "#{$addBtn.offset().top + $addBtn.outerHeight()}px"
+
+    if position? and position is 'right'
+      css.left = "#{($addBtn.offset().left - $menu.outerWidth()) + 20}px"
+      $menu.addClass "is-aligned-right"
+    else
+      css.left = "#{$addBtn.offset().left}px"
+      $menu.removeClass "is-aligned-right"
+
+    $menu.css(css)
+
   addAward: (awardUrl, emoji) ->
     emoji = @normilizeEmojiName(emoji)
     @postEmoji awardUrl, emoji, =>
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index ef73e2f0a53..07d40f40556 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -7,8 +7,6 @@
 
 .emoji-menu {
   position: absolute;
-  top: 100%;
-  left: 0;
   margin-top: 3px;
   z-index: 1000;
   min-width: 160px;
@@ -21,7 +19,12 @@
   opacity: 0;
   transform: scale(.2);
   transform-origin: 0 -45px;
-  transition: all .3s cubic-bezier(.87,-.41,.19,1.44);
+  transition: .3s cubic-bezier(.87,-.41,.19,1.44);
+  transition-property: transform, opacity;
+
+  &.is-aligned-right {
+    transform-origin: 100% -45px;
+  }
 
   &.is-visible {
     pointer-events: all;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 025897ca1ff..feb42c36d31 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -280,14 +280,6 @@ ul.notes {
   }
 }
 
-.note-action-award-holder {
-  .emoji-menu {
-    left: auto;
-    right: -15px;
-    transform-origin: 100% -45px;
-  }
-}
-
 .note-award-control {
   display: block;
 
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index bd478e315d1..0b4a084b9ae 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -12,7 +12,7 @@
         .note-actions
           - if current_user
             .award-menu-holder.note-action-award-holder.js-award-holder.js-award-action-btn{ data: { target: "##{dom_id(note)} .js-awards-block" } }
-              = link_to '#', title: 'Award emoji', class: 'note-award-control js-add-award', data: { award_menu_url: emojis_path } do
+              = link_to '#', title: 'Award emoji', class: 'note-award-control js-add-award', data: { award_menu_url: emojis_path, position: "right" } do
                 = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
                 = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
           - if note_editable?(note)
diff --git a/spec/features/issues/award_spec.rb b/spec/features/issues/award_spec.rb
index 46e1ed5d8cd..209d1cca176 100644
--- a/spec/features/issues/award_spec.rb
+++ b/spec/features/issues/award_spec.rb
@@ -46,8 +46,9 @@ feature 'Issue awards', js: true, feature: true do
 
       page.within('.note') do
         find('.js-add-award').click
-        expect(page).to have_selector('.emoji-menu', count: 1)
       end
+
+      expect(page).to have_selector('.emoji-menu', count: 1)
     end
 
     it 'should add award to note' do
@@ -117,16 +118,14 @@ feature 'Issue awards', js: true, feature: true do
   def show_note_award_menu
     page.within('.note') do
       find('.js-add-award').click
-      expect(page).to have_selector('.emoji-menu')
     end
+    expect(page).to have_selector('.emoji-menu')
   end
 
   def award_on_note(index = 1)
-    page.within('.note') do
-      page.within('.emoji-menu') do
-        buttons = all('.js-emoji-btn')
-        buttons[index].click
-      end
+    page.within('.emoji-menu') do
+      buttons = all('.js-emoji-btn')
+      buttons[index].click
     end
   end
 
diff --git a/spec/features/merge_requests/award_spec.rb b/spec/features/merge_requests/award_spec.rb
index 91e76e83c6f..0f268bab5da 100644
--- a/spec/features/merge_requests/award_spec.rb
+++ b/spec/features/merge_requests/award_spec.rb
@@ -46,8 +46,9 @@ feature 'Merge request awards', js: true, feature: true do
 
       page.within('.note') do
         find('.js-add-award').click
-        expect(page).to have_selector('.emoji-menu', count: 1)
       end
+
+      expect(page).to have_selector('.emoji-menu', count: 1)
     end
 
     it 'should add award to note' do
@@ -117,16 +118,14 @@ feature 'Merge request awards', js: true, feature: true do
   def show_note_award_menu
     page.within('.note') do
       find('.js-add-award').click
-      expect(page).to have_selector('.emoji-menu')
     end
+    expect(page).to have_selector('.emoji-menu')
   end
 
   def award_on_note(index = 1)
-    page.within('.note') do
-      page.within('.emoji-menu') do
-        buttons = all('.js-emoji-btn')
-        buttons[index].click
-      end
+    page.within('.emoji-menu') do
+      buttons = all('.js-emoji-btn')
+      buttons[index].click
     end
   end
 

From b40afae62c6df741d4b458289c3d44af5a43ca4e Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 19 May 2016 14:18:33 -0500
Subject: [PATCH 0591/1431] Add Gitlab namespace AwardEmoji.

---
 app/assets/javascripts/lib/emoji_aliases.js.coffee.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
index 66f640a3cb7..97be65116e2 100644
--- a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
+++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
@@ -1,2 +1,2 @@
 window.emojiAliases = ->
-  JSON.parse('<%= AwardEmoji.aliases.to_json %>')
+  JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>')

From 9429da3ae2d118ca1edcc20e992d0b2863cadeed Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 19 May 2016 14:58:35 -0500
Subject: [PATCH 0592/1431] Move generator templates to generator_templates/

Since we eager load everything in lib/ putting ERB code in .rb files
will result in syntax errors. By moving the templates to
./generator_templates we can work around this.
---
 config/application.rb                                         | 4 +++-
 .../active_record/migration/create_table_migration.rb         | 0
 .../active_record/migration/migration.rb                      | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename {lib/templates => generator_templates}/active_record/migration/create_table_migration.rb (100%)
 rename {lib/templates => generator_templates}/active_record/migration/migration.rb (100%)

diff --git a/config/application.rb b/config/application.rb
index cba80f38f1f..06114bf34ee 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,6 +26,8 @@ module Gitlab
                                      #{config.root}/app/models/members
                                      #{config.root}/app/models/project_services))
 
+    config.generators.templates.push("#{config.root}/generator_templates")
+
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -39,7 +41,7 @@ module Gitlab
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
-    # 
+    #
     # Parameters filtered:
     # - Password (:password, :password_confirmation)
     # - Private tokens (:private_token)
diff --git a/lib/templates/active_record/migration/create_table_migration.rb b/generator_templates/active_record/migration/create_table_migration.rb
similarity index 100%
rename from lib/templates/active_record/migration/create_table_migration.rb
rename to generator_templates/active_record/migration/create_table_migration.rb
diff --git a/lib/templates/active_record/migration/migration.rb b/generator_templates/active_record/migration/migration.rb
similarity index 100%
rename from lib/templates/active_record/migration/migration.rb
rename to generator_templates/active_record/migration/migration.rb

From 4d6c51e2282c6416a8766fdf580a19fd08670609 Mon Sep 17 00:00:00 2001
From: ZJ van de Weg <zegerjan@gitlab.com>
Date: Thu, 19 May 2016 15:00:50 -0500
Subject: [PATCH 0593/1431] Fix backend merge mistakes

[ci skip]
---
 app/controllers/projects/merge_requests_controller.rb | 2 +-
 app/models/note.rb                                    | 2 +-
 app/views/projects/notes/_note.html.haml              | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 94eab37cb83..4a9ea4cbaad 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -303,7 +303,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
     @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
-    @discussions = Note.discussions_from_notes(@notes)
+    @discussions = @notes.discussions
     @noteable = @merge_request
 
     # Get commits from repository
diff --git a/app/models/note.rb b/app/models/note.rb
index e9bef4fb9fe..2b1a3f90697 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -193,7 +193,7 @@ class Note < ActiveRecord::Base
   end
 
   def award_emoji_supported?
-    noteable.is_a?(Awardable) && !for_diff_line?
+    noteable.is_a?(Awardable) && !line_code.present?
   end
 
   def contains_emoji_only?
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 0b4a084b9ae..13d3f1eceab 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -38,8 +38,6 @@
             = markdown(note.note, pipeline: :note, cache_key: [note, "note"])
         - if note_editable
           = render 'projects/notes/edit_form', note: note
-        .note-awards
-          = render 'emoji_awards/awards_block', awardable: note, inline: false
       = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
 
       - if note.attachment.url

From d0032935a1d720c8e3cfd2597667c62a0c4015a1 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 4 May 2016 14:34:11 +0200
Subject: [PATCH 0594/1431] Add runner db field for ability to run untagged
 jobs

---
 .../20160504112519_add_run_untagged_to_ci_runner.rb   | 11 +++++++++++
 db/schema.rb                                          |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb

diff --git a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
new file mode 100644
index 00000000000..38fee17f904
--- /dev/null
+++ b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
@@ -0,0 +1,11 @@
+class AddRunUntaggedToCiRunner < ActiveRecord::Migration
+  ##
+  # Downtime expected!
+  #
+  # This migration will cause downtime due to exclusive lock
+  # caused by the default value.
+  #
+  def change
+    add_column :ci_runners, :run_untagged, :boolean, default: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index af4f4c609e7..5b9fbe79fa2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -269,6 +269,7 @@ ActiveRecord::Schema.define(version: 20160509201028) do
     t.string   "revision"
     t.string   "platform"
     t.string   "architecture"
+    t.boolean  "run_untagged", default: true
   end
 
   add_index "ci_runners", ["description"], name: "index_ci_runners_on_description_trigram", using: :gin, opclasses: {"description"=>"gin_trgm_ops"}

From a8a205cd5c3f2840e7e8eab16bceff608c288f33 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 4 May 2016 14:40:03 +0200
Subject: [PATCH 0595/1431] Add form for runner config to run untagged jobs

---
 app/views/projects/runners/_form.html.haml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index 2d6c964ae94..147f1a2ebc8 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -5,6 +5,12 @@
       .checkbox
         = f.check_box :active
         %span.light Paused runners don't accept new builds
+  .form-group
+    = label :run_untagged, 'Run untagged jobs', class: 'control-label'
+    .col-sm-10
+      .checkbox
+        = f.check_box :run_untagged
+        %span.light This runner can pick jobs without tags
   .form-group
     = label_tag :token, class: 'control-label' do
       Token

From 2aa57071947e562f302b3858a249339024ef7119 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 5 May 2016 12:20:33 +0200
Subject: [PATCH 0596/1431] Extend runner config options for untagged jobs

---
 app/models/ci/runner.rb                      |  2 +-
 app/views/admin/runners/show.html.haml       |  2 -
 app/views/projects/runners/_runner.html.haml |  2 +-
 app/views/projects/runners/show.html.haml    | 51 ++++++++------------
 spec/features/runners_spec.rb                | 29 +++++++++++
 5 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 819064f99bb..23b1556712c 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -4,7 +4,7 @@ module Ci
 
     LAST_CONTACT_TIME = 5.minutes.ago
     AVAILABLE_SCOPES = %w[specific shared active paused online]
-    FORM_EDITABLE = %i[description tag_list active]
+    FORM_EDITABLE = %i[description tag_list active run_untagged]
 
     has_many :builds, class_name: 'Ci::Build'
     has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject'
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index 4dfb3ed05bb..c3784bf7192 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -9,8 +9,6 @@
         %span.runner-state.runner-state-specific
           Specific
 
-
-
 - if @runner.shared?
   .bs-callout.bs-callout-success
     %h4 This runner will process builds from ALL UNASSIGNED projects
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml
index 47ec420189d..96e2aac451f 100644
--- a/app/views/projects/runners/_runner.html.haml
+++ b/app/views/projects/runners/_runner.html.haml
@@ -5,7 +5,7 @@
       - if @runners.include?(runner)
         = link_to runner.short_sha, runner_path(runner)
         %small
-          =link_to edit_namespace_project_runner_path(@project.namespace, @project, runner) do
+          = link_to edit_namespace_project_runner_path(@project.namespace, @project, runner) do
             %i.fa.fa-edit.btn
       - else
         = runner.short_sha
diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml
index 5bf4c09ca25..f24e1b9144e 100644
--- a/app/views/projects/runners/show.html.haml
+++ b/app/views/projects/runners/show.html.haml
@@ -17,50 +17,39 @@
         %th Property Name
         %th Value
     %tr
-      %td
-        Tags
+      %td Active
+      %td= @runner.active? ? 'Yes' : 'No'
+    %tr
+      %td Can run untagged jobs
+      %td= @runner.run_untagged? ? 'Yes' : 'No'
+    %tr
+      %td Tags
       %td
         - @runner.tag_list.each do |tag|
           %span.label.label-primary
             = tag
     %tr
-      %td
-        Name
-      %td
-        = @runner.name
+      %td Name
+      %td= @runner.name
     %tr
-      %td
-        Version
-      %td
-        = @runner.version
+      %td Version
+      %td= @runner.version
     %tr
-      %td
-        Revision
-      %td
-        = @runner.revision
+      %td Revision
+      %td= @runner.revision
     %tr
-      %td
-        Platform
-      %td
-        = @runner.platform
+      %td Platform
+      %td= @runner.platform
     %tr
-      %td
-        Architecture
-      %td
-        = @runner.architecture
+      %td Architecture
+      %td= @runner.architecture
     %tr
-      %td
-        Description
-      %td
-        = @runner.description
+      %td Description
+      %td= @runner.description
     %tr
-      %td
-        Last contact
+      %td Last contact
       %td
         - if @runner.contacted_at
           #{time_ago_in_words(@runner.contacted_at)} ago
         - else
           Never
-
-
-        
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 8edeb8d18af..4f942c3ab1c 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -110,4 +110,33 @@ describe "Runners" do
       expect(page).to have_content(@specific_runner.platform)
     end
   end
+
+  feature 'configuring runners ability to picking untagged jobs' do
+    given(:project) { create(:empty_project) }
+    given(:runner) { create(:ci_runner) }
+
+    background do
+      project.team << [user, :master]
+      project.runners << runner
+    end
+
+    scenario 'user checks default configuration' do
+      visit namespace_project_runner_path(project.namespace, project, runner)
+
+      expect(page).to have_content 'Can run untagged jobs Yes'
+    end
+
+    scenario 'user want to prevent runner from running untagged job' do
+      visit runners_path(project)
+      page.within('.activated-specific-runners') do
+        first('small > a').click
+      end
+
+      uncheck 'runner_run_untagged'
+      click_button 'Save changes'
+
+      expect(page).to have_content 'Can run untagged jobs No'
+      expect(runner.reload.run_untagged?).to eq false
+    end
+  end
 end

From 83df6384558c27d3ff7282e6d66b06fa7e9c0c60 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 5 May 2016 13:08:17 +0200
Subject: [PATCH 0597/1431] Disallow runner to pick untagged build if
 configured

---
 app/models/ci/build.rb    |  4 ++++
 spec/models/build_spec.rb | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 92327bdb08d..77a2dec4f72 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -290,6 +290,10 @@ module Ci
     end
 
     def can_be_served?(runner)
+      if tag_list.empty? && !runner.run_untagged?
+        return false
+      end
+
       (tag_list - runner.tag_list).empty?
     end
 
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index b5d356aa066..5da54e07de8 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -259,11 +259,11 @@ describe Ci::Build, models: true do
   end
 
   describe '#can_be_served?' do
-    let(:runner) { FactoryGirl.create :ci_runner }
+    let(:runner) { create(:ci_runner) }
 
     before { build.project.runners << runner }
 
-    context 'runner without tags' do
+    context 'when runner does not have tags' do
       it 'can handle builds without tags' do
         expect(build.can_be_served?(runner)).to be_truthy
       end
@@ -274,21 +274,37 @@ describe Ci::Build, models: true do
       end
     end
 
-    context 'runner with tags' do
+    context 'when runner has tags' do
       before { runner.tag_list = ['bb', 'cc'] }
 
-      it 'can handle builds without tags' do
-        expect(build.can_be_served?(runner)).to be_truthy
+      shared_examples 'tagged build picker' do
+        it 'can handle build with matching tags' do
+          build.tag_list = ['bb']
+          expect(build.can_be_served?(runner)).to be_truthy
+        end
+
+        it 'cannot handle build without matching tags' do
+          build.tag_list = ['aa']
+          expect(build.can_be_served?(runner)).to be_falsey
+        end
       end
 
-      it 'can handle build with matching tags' do
-        build.tag_list = ['bb']
-        expect(build.can_be_served?(runner)).to be_truthy
+      context 'when runner can pick untagged jobs' do
+        it 'can handle builds without tags' do
+          expect(build.can_be_served?(runner)).to be_truthy
+        end
+
+        it_behaves_like 'tagged build picker'
       end
 
-      it 'cannot handle build with not matching tags' do
-        build.tag_list = ['aa']
-        expect(build.can_be_served?(runner)).to be_falsey
+      context 'when runner can not pick untagged jobs' do
+        before { runner.run_untagged = false }
+
+        it 'can not handle builds without tags' do
+          expect(build.can_be_served?(runner)).to be_falsey
+        end
+
+        it_behaves_like 'tagged build picker'
       end
     end
   end

From 9129c37c5bd6e648e23ebe6847b909dd151c7e8a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 5 May 2016 13:28:44 +0200
Subject: [PATCH 0598/1431] Add CI API tests for runner config and untagged
 jobs

---
 spec/requests/ci/api/builds_spec.rb | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index cae4656010f..7ebf8e41f3b 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -128,6 +128,38 @@ describe Ci::API::API do
           end
         end
       end
+
+      context 'when build has no tags' do
+        before do
+          commit = create(:ci_commit, project: project)
+          create(:ci_build, commit: commit, tags: [])
+        end
+
+        context 'when runner is allowed to pick untagged builds' do
+          before { runner.update_column(:run_untagged, true) }
+
+          it 'picks build' do
+            register_builds
+
+            expect(response).to have_http_status 201
+          end
+        end
+
+        context 'when runner is not allowed to pick untagged builds' do
+          before { runner.update_column(:run_untagged, false) }
+
+          it 'does not pick build' do
+            register_builds
+
+            expect(response).to have_http_status 404
+          end
+        end
+
+        def register_builds
+          post ci_api("/builds/register"), token: runner.token,
+                                           info: { platform: :darwin }
+        end
+      end
     end
 
     describe "PUT /builds/:id" do

From dd8e9e2d7acf05b837a3bacd1258e9f3df4254a6 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 5 May 2016 14:27:06 +0200
Subject: [PATCH 0599/1431] Add custom validator to runner model

---
 app/controllers/projects/runners_controller.rb | 3 ++-
 app/models/ci/runner.rb                        | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index 3a9d67aff64..12172b47520 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -20,7 +20,8 @@ class Projects::RunnersController < Projects::ApplicationController
     if @runner.update_attributes(runner_params)
       redirect_to runner_path(@runner), notice: 'Runner was successfully updated.'
     else
-      redirect_to runner_path(@runner), alert: 'Runner was not updated.'
+      flash[:alert] = @runner.errors.full_messages.to_sentence
+      render 'edit'
     end
   end
 
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 23b1556712c..b1227d72405 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -26,6 +26,13 @@ module Ci
         .where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
     end
 
+    validate do |runner|
+      if runner.tag_list.empty? && !runner.run_untagged?
+        errors.add(:tags_errors,
+          'Runner without tags must be able to pick untagged jobs!')
+      end
+    end
+
     acts_as_taggable
 
     # Searches for runners matching the given query.

From 2ee24bd9ece394269c006f9762d3fa5e16876949 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 08:41:51 +0200
Subject: [PATCH 0600/1431] Update specs to be valid only for tagged runner

---
 spec/features/runners_spec.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 4f942c3ab1c..2c9c12b4dfa 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -126,17 +126,21 @@ describe "Runners" do
       expect(page).to have_content 'Can run untagged jobs Yes'
     end
 
-    scenario 'user want to prevent runner from running untagged job' do
-      visit runners_path(project)
-      page.within('.activated-specific-runners') do
-        first('small > a').click
+    context 'when runner has tags' do
+      before { runner.update_attribute(:tag_list, ['tag']) }
+
+      scenario 'user want to prevent runner from running untagged job' do
+        visit runners_path(project)
+        page.within('.activated-specific-runners') do
+          first('small > a').click
+        end
+
+        uncheck 'runner_run_untagged'
+        click_button 'Save changes'
+
+        expect(page).to have_content 'Can run untagged jobs No'
+        expect(runner.reload.run_untagged?).to eq false
       end
-
-      uncheck 'runner_run_untagged'
-      click_button 'Save changes'
-
-      expect(page).to have_content 'Can run untagged jobs No'
-      expect(runner.reload.run_untagged?).to eq false
     end
   end
 end

From 9fd6f1b6009410cee0d0d7db8703ad64701db62b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 08:47:19 +0200
Subject: [PATCH 0601/1431] Improve displaying validation messages for runner

---
 app/controllers/projects/runners_controller.rb |  1 -
 app/models/ci/runner.rb                        | 10 +++++++---
 app/views/projects/runners/edit.html.haml      |  6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index 12172b47520..0b4fa572501 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -20,7 +20,6 @@ class Projects::RunnersController < Projects::ApplicationController
     if @runner.update_attributes(runner_params)
       redirect_to runner_path(@runner), notice: 'Runner was successfully updated.'
     else
-      flash[:alert] = @runner.errors.full_messages.to_sentence
       render 'edit'
     end
   end
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index b1227d72405..f5813589492 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -27,9 +27,9 @@ module Ci
     end
 
     validate do |runner|
-      if runner.tag_list.empty? && !runner.run_untagged?
-        errors.add(:tags_errors,
-          'Runner without tags must be able to pick untagged jobs!')
+      unless runner.has_tags? || runner.run_untagged?
+        errors.add(:tags_list,
+          'can not be empty when runner is not allowed to pick untagged jobs')
       end
     end
 
@@ -103,5 +103,9 @@ module Ci
     def short_sha
       token[0...8] if token
     end
+
+    def has_tags?
+      tag_list.any?
+    end
   end
 end
diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml
index 771947d7908..a5cfa9a8da9 100644
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
@@ -1,5 +1,11 @@
 - page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
 
 %h4 Runner ##{@runner.id}
+
+- if @runner.errors.any?
+  .error-message.js-errors
+    - @runner.errors.full_messages.each do |error|
+      %div= error
+
 %hr
  = render 'form', runner: @runner, runner_form_url: runner_path(@runner)

From 8252333183dcff74fd229ca81e7317641ad30791 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 09:04:09 +0200
Subject: [PATCH 0602/1431] Extend CI runners specs

---
 spec/models/ci/runner_spec.rb | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index eaa94228922..7c6e39419ed 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -1,6 +1,24 @@
 require 'spec_helper'
 
 describe Ci::Runner, models: true do
+  describe 'validation' do
+    context 'when runner is not allowed to pick untagged jobs' do
+      context 'when runner does not have tags' do
+        it 'is not valid' do
+          runner = build(:ci_runner, tag_list: [], run_untagged: false)
+          expect(runner).to be_invalid
+        end
+      end
+
+      context 'when runner has tags' do
+        it 'is valid' do
+          runner = build(:ci_runner, tag_list: ['tag'], run_untagged: false)
+          expect(runner).to be_valid
+        end
+      end
+    end
+  end
+
   describe '#display_name' do
     it 'should return the description if it has a value' do
       runner = FactoryGirl.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')
@@ -114,7 +132,19 @@ describe Ci::Runner, models: true do
     end
   end
 
-  describe '#search' do
+  describe '#has_tags?' do
+    context 'when runner has tags' do
+      subject { create(:ci_runner, tag_list: ['tag']) }
+      it { is_expected.to have_tags }
+    end
+
+    context 'when runner does not have tags' do
+      subject { create(:ci_runner, tag_list: []) }
+      it { is_expected.to_not have_tags }
+    end
+  end
+
+  describe '.search' do
     let(:runner) { create(:ci_runner, token: '123abc') }
 
     it 'returns runners with a matching token' do

From 8001eed06e5871f1cb108ceb70213c8b3f9192d2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 09:17:27 +0200
Subject: [PATCH 0603/1431] Add method that check if build has tags

---
 app/models/ci/build.rb    |  8 +++++---
 spec/models/build_spec.rb | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 77a2dec4f72..6c9ce0dc481 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -290,13 +290,15 @@ module Ci
     end
 
     def can_be_served?(runner)
-      if tag_list.empty? && !runner.run_untagged?
-        return false
-      end
+      return false unless has_tags? || runner.run_untagged?
 
       (tag_list - runner.tag_list).empty?
     end
 
+    def has_tags?
+      tag_list.any?
+    end
+
     def any_runners_online?
       project.any_runners? { |runner| runner.active? && runner.online? && can_be_served?(runner) }
     end
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 5da54e07de8..abae3271a5c 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -309,6 +309,18 @@ describe Ci::Build, models: true do
     end
   end
 
+  describe '#has_tags?' do
+    context 'when build has tags' do
+      subject { create(:ci_build, tag_list: ['tag']) }
+      it { is_expected.to have_tags }
+    end
+
+    context 'when build does not have tags' do
+      subject { create(:ci_build, tag_list: []) }
+      it { is_expected.to_not have_tags }
+    end
+  end
+
   describe '#any_runners_online?' do
     subject { build.any_runners_online? }
 

From 7b607cf4f0edda45e864c07b468b0b0819f974df Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 09:58:17 +0200
Subject: [PATCH 0604/1431] Add Changelog entry for new runner configuration

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

diff --git a/CHANGELOG b/CHANGELOG
index 422718dec9a..e8987000f6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.8.0 (unreleased)
   - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
   - Use a case-insensitive comparison in sanitizing URI schemes
   - Toggle sign-up confirmation emails in application settings
+  - Make it possible to prevent tagged runner from picking untagged jobs
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
   - Improve multiple branch push performance by memoizing permission checking

From da8b72d45300db3339925cf34800b6d17828582f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 12:32:17 +0200
Subject: [PATCH 0605/1431] Extend runner options that are configurable via API

---
 lib/api/entities.rb               |  1 +
 lib/api/runners.rb                |  2 +-
 spec/requests/api/runners_spec.rb | 15 +++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index dbd03ea74fa..8298e3ad34c 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -408,6 +408,7 @@ module API
 
     class RunnerDetails < Runner
       expose :tag_list
+      expose :run_untagged
       expose :version, :revision, :platform, :architecture
       expose :contacted_at
       expose :token, if: lambda { |runner, options| options[:current_user].is_admin? || !runner.is_shared? }
diff --git a/lib/api/runners.rb b/lib/api/runners.rb
index 8ec91485b26..4faba9dc87b 100644
--- a/lib/api/runners.rb
+++ b/lib/api/runners.rb
@@ -49,7 +49,7 @@ module API
         runner = get_runner(params[:id])
         authenticate_update_runner!(runner)
 
-        attrs = attributes_for_keys [:description, :active, :tag_list]
+        attrs = attributes_for_keys [:description, :active, :tag_list, :run_untagged]
         if runner.update(attrs)
           present runner, with: Entities::RunnerDetails, current_user: current_user
         else
diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb
index 3af61d4b335..73ae8ef631c 100644
--- a/spec/requests/api/runners_spec.rb
+++ b/spec/requests/api/runners_spec.rb
@@ -184,21 +184,24 @@ describe API::Runners, api: true  do
           description = shared_runner.description
           active = shared_runner.active
 
-          put api("/runners/#{shared_runner.id}", admin), description: "#{description}_updated", active: !active,
-                                                          tag_list: ['ruby2.1', 'pgsql', 'mysql']
+          update_runner(shared_runner.id, admin, description: "#{description}_updated",
+                                                 active: !active,
+                                                 tag_list: ['ruby2.1', 'pgsql', 'mysql'],
+                                                 run_untagged: 'false')
           shared_runner.reload
 
           expect(response.status).to eq(200)
           expect(shared_runner.description).to eq("#{description}_updated")
           expect(shared_runner.active).to eq(!active)
           expect(shared_runner.tag_list).to include('ruby2.1', 'pgsql', 'mysql')
+          expect(shared_runner.run_untagged?).to be false
         end
       end
 
       context 'when runner is not shared' do
         it 'should update runner' do
           description = specific_runner.description
-          put api("/runners/#{specific_runner.id}", admin), description: 'test'
+          update_runner(specific_runner.id, admin, description: 'test')
           specific_runner.reload
 
           expect(response.status).to eq(200)
@@ -208,10 +211,14 @@ describe API::Runners, api: true  do
       end
 
       it 'should return 404 if runner does not exists' do
-        put api('/runners/9999', admin), description: 'test'
+        update_runner(9999, admin, description: 'test')
 
         expect(response.status).to eq(404)
       end
+
+      def update_runner(id, user, args)
+        put api("/runners/#{id}", user), args
+      end
     end
 
     context 'authorized user' do

From b253aa32c75cb5b0796ad6a7cd85cba78516ba26 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 12:44:20 +0200
Subject: [PATCH 0606/1431] Add docs for a new configuration setting for runner

---
 doc/ci/runners/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index a06650b3387..e449d3dc61e 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -125,7 +125,13 @@ shared runners will only run the jobs they are equipped to run.
 For instance, at GitLab we have runners tagged with "rails" if they contain
 the appropriate dependencies to run Rails test suites.
 
-### Be Careful with Sensitive Information
+### Prevent runner with tags from picking jobs without tags
+
+You can configure runner to prevent it from picking jobs with tags when
+runnner does not have tags assigned. This configuration setting is available
+in GitLab interface when editting runner details.
+
+### Be careful with sensitive information
 
 If you can run a build on a runner, you can get access to any code it runs
 and get the token of the runner. With shared runners, this means that anyone

From 9ba72378fc006ecd353e1447a50d2231df09c851 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 13:56:22 +0200
Subject: [PATCH 0607/1431] Refactor CI API specs for creating runner

---
 spec/requests/ci/api/runners_spec.rb | 46 ++++++++++++++++++----------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index db8189ffb79..5d6f5f774ea 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -12,44 +12,56 @@ describe Ci::API::API do
   end
 
   describe "POST /runners/register" do
-    describe "should create a runner if token provided" do
+    context 'when runner token is provided' do
       before { post ci_api("/runners/register"), token: registration_token }
 
-      it { expect(response.status).to eq(201) }
+      it 'creates runner' do
+        expect(response.status).to eq(201)
+      end
     end
 
-    describe "should create a runner with description" do
+    context 'when runner description is provided' do
       before { post ci_api("/runners/register"), token: registration_token, description: "server.hostname" }
 
-      it { expect(response.status).to eq(201) }
-      it { expect(Ci::Runner.first.description).to eq("server.hostname") }
+      it 'creates runner' do
+        expect(response.status).to eq(201)
+        expect(Ci::Runner.first.description).to eq("server.hostname")
+      end
     end
 
-    describe "should create a runner with tags" do
+    context 'when runner tags are provided' do
       before { post ci_api("/runners/register"), token: registration_token, tag_list: "tag1, tag2" }
 
-      it { expect(response.status).to eq(201) }
-      it { expect(Ci::Runner.first.tag_list.sort).to eq(["tag1", "tag2"]) }
+      it 'creates runner' do
+        expect(response.status).to eq(201)
+        expect(Ci::Runner.first.tag_list.sort).to eq(["tag1", "tag2"])
+      end
     end
 
-    describe "should create a runner if project token provided" do
+    context 'when project token is provided' do
       let(:project) { FactoryGirl.create(:empty_project) }
       before { post ci_api("/runners/register"), token: project.runners_token }
 
-      it { expect(response.status).to eq(201) }
-      it { expect(project.runners.size).to eq(1) }
+      it 'creates runner' do
+        expect(response.status).to eq(201)
+        expect(project.runners.size).to eq(1)
+      end
     end
 
-    it "should return 403 error if token is invalid" do
-      post ci_api("/runners/register"), token: 'invalid'
+    context 'when token is invalid' do
+      it 'returns 403 error' do
+        post ci_api("/runners/register"), token: 'invalid'
 
-      expect(response.status).to eq(403)
+        expect(response.status).to eq(403)
+      end
     end
 
-    it "should return 400 error if no token" do
-      post ci_api("/runners/register")
+    context 'when no token provided' do
+      it 'returns 400 error' do
+        post ci_api("/runners/register")
 
-      expect(response.status).to eq(400)
+        expect(response.status).to eq(400)
+      end
     end
 
     %w(name version revision platform architecture).each do |param|

From b8cf2a340b3c56eb7e226473034ead2c4e5d609a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 14:06:57 +0200
Subject: [PATCH 0608/1431] Set run untagged option when registering a runner

---
 lib/ci/api/runners.rb                | 15 +++++-------
 spec/requests/ci/api/runners_spec.rb | 35 +++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/lib/ci/api/runners.rb b/lib/ci/api/runners.rb
index 192b1d18a51..ea35d0f6dd0 100644
--- a/lib/ci/api/runners.rb
+++ b/lib/ci/api/runners.rb
@@ -28,20 +28,17 @@ module Ci
         post "register" do
           required_attributes! [:token]
 
+          attributes = { description: params[:description],
+                         tag_list: params[:tag_list],
+                         run_untagged: params[:run_untagged] || true }
+
           runner =
             if runner_registration_token_valid?
               # Create shared runner. Requires admin access
-              Ci::Runner.create(
-                description: params[:description],
-                tag_list: params[:tag_list],
-                is_shared: true
-              )
+              Ci::Runner.create(attributes.merge(is_shared: true))
             elsif project = Project.find_by(runners_token: params[:token])
               # Create a specific runner for project.
-              project.runners.create(
-                description: params[:description],
-                tag_list: params[:tag_list]
-              )
+              project.runners.create(attributes)
             end
 
           return forbidden! unless runner
diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index 5d6f5f774ea..eb11258cbbb 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -15,13 +15,17 @@ describe Ci::API::API do
     context 'when runner token is provided' do
       before { post ci_api("/runners/register"), token: registration_token }
 
-      it 'creates runner' do
+      it 'creates runner with default values' do
         expect(response.status).to eq(201)
+        expect(Ci::Runner.first.run_untagged).to be true
       end
     end
 
     context 'when runner description is provided' do
-      before { post ci_api("/runners/register"), token: registration_token, description: "server.hostname" }
+      before do
+        post ci_api("/runners/register"), token: registration_token,
+                                          description: "server.hostname"
+      end
 
       it 'creates runner' do
         expect(response.status).to eq(201)
@@ -30,7 +34,10 @@ describe Ci::API::API do
     end
 
     context 'when runner tags are provided' do
-      before { post ci_api("/runners/register"), token: registration_token, tag_list: "tag1, tag2" }
+      before do
+        post ci_api("/runners/register"), token: registration_token,
+                                          tag_list: "tag1, tag2"
+      end
 
       it 'creates runner' do
         expect(response.status).to eq(201)
@@ -38,6 +45,28 @@ describe Ci::API::API do
       end
     end
 
+    context 'when option for running untagged jobs is provided' do
+      context 'when tags are provided' do
+        it 'creates runner' do
+          post ci_api("/runners/register"), token: registration_token,
+                                            run_untagged: false,
+                                            tag_list: ['tag']
+
+          expect(response.status).to eq(201)
+          expect(Ci::Runner.first.run_untagged).to be false
+        end
+      end
+
+      context 'when tags are not provided' do
+        it 'does not create runner' do
+          post ci_api("/runners/register"), token: registration_token,
+                                            run_untagged: false
+
+          expect(response.status).to eq(404)
+        end
+      end
+    end
+
     context 'when project token is provided' do
       let(:project) { FactoryGirl.create(:empty_project) }
       before { post ci_api("/runners/register"), token: project.runners_token }

From 3b0eeccc0324e2d6c024fd94067933314e45b862 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 7 May 2016 20:23:36 +0200
Subject: [PATCH 0609/1431] Add not null constraint to run untagged runner
 option

---
 db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb | 2 +-
 db/schema.rb                                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
index 38fee17f904..c6753f2b398 100644
--- a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
+++ b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
@@ -6,6 +6,6 @@ class AddRunUntaggedToCiRunner < ActiveRecord::Migration
   # caused by the default value.
   #
   def change
-    add_column :ci_runners, :run_untagged, :boolean, default: true
+    add_column :ci_runners, :run_untagged, :boolean, default: true, null: false
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 5b9fbe79fa2..2e154b98b34 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -269,7 +269,7 @@ ActiveRecord::Schema.define(version: 20160509201028) do
     t.string   "revision"
     t.string   "platform"
     t.string   "architecture"
-    t.boolean  "run_untagged", default: true
+    t.boolean  "run_untagged", default: true,  null: false
   end
 
   add_index "ci_runners", ["description"], name: "index_ci_runners_on_description_trigram", using: :gin, opclasses: {"description"=>"gin_trgm_ops"}

From 8ab4a67ca6a9166168b744bc940da98bf9651efd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 7 May 2016 20:35:08 +0200
Subject: [PATCH 0610/1431] Use form errors helper in CI runner edit form

---
 app/views/projects/runners/edit.html.haml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml
index a5cfa9a8da9..e4aa98080e5 100644
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
@@ -2,10 +2,7 @@
 
 %h4 Runner ##{@runner.id}
 
-- if @runner.errors.any?
-  .error-message.js-errors
-    - @runner.errors.full_messages.each do |error|
-      %div= error
+= form_errors(@runner)
 
 %hr
  = render 'form', runner: @runner, runner_form_url: runner_path(@runner)

From f6dd8a5257bf71f87ea9a2fa2f3d16012e61b6e4 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 7 May 2016 20:36:03 +0200
Subject: [PATCH 0611/1431] Move runner validator to separate private method

---
 app/models/ci/runner.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index f5813589492..cf4d3236519 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -26,12 +26,7 @@ module Ci
         .where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
     end
 
-    validate do |runner|
-      unless runner.has_tags? || runner.run_untagged?
-        errors.add(:tags_list,
-          'can not be empty when runner is not allowed to pick untagged jobs')
-      end
-    end
+    validate :verify_tags_constraints
 
     acts_as_taggable
 
@@ -107,5 +102,14 @@ module Ci
     def has_tags?
       tag_list.any?
     end
+
+    private
+
+    def verify_tags_constraints
+      unless has_tags? || run_untagged?
+        errors.add(:tags_list,
+          'can not be empty when runner is not allowed to pick untagged jobs')
+      end
+    end
   end
 end

From 0fd100d28d3748de90aabc3dbbb789e37399f224 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 7 May 2016 20:42:36 +0200
Subject: [PATCH 0612/1431] Improve setting default runner attrs when using API

---
 lib/ci/api/runners.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ci/api/runners.rb b/lib/ci/api/runners.rb
index ea35d0f6dd0..1dc4c8c2cd1 100644
--- a/lib/ci/api/runners.rb
+++ b/lib/ci/api/runners.rb
@@ -29,8 +29,11 @@ module Ci
           required_attributes! [:token]
 
           attributes = { description: params[:description],
-                         tag_list: params[:tag_list],
-                         run_untagged: params[:run_untagged] || true }
+                         tag_list: params[:tag_list] }
+
+          unless params[:run_untagged].nil?
+            attributes.merge!(run_untagged: params[:run_untagged])
+          end
 
           runner =
             if runner_registration_token_valid?

From bf9cc351c28a349ca4c573978c869d2b90209d52 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 10 May 2016 13:19:25 +0200
Subject: [PATCH 0613/1431] Add minor corrections related to config of runner

---
 app/views/projects/runners/_form.html.haml | 3 ++-
 app/views/projects/runners/edit.html.haml  | 2 --
 doc/ci/runners/README.md                   | 6 +++---
 lib/ci/api/runners.rb                      | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index 147f1a2ebc8..6be406fa186 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -1,4 +1,5 @@
 = form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
+  = form_errors(@runner)
   .form-group
     = label :active, "Active", class: 'control-label'
     .col-sm-10
@@ -10,7 +11,7 @@
     .col-sm-10
       .checkbox
         = f.check_box :run_untagged
-        %span.light This runner can pick jobs without tags
+        %span.light Indicates whether runner can pick jobs without tags
   .form-group
     = label_tag :token, class: 'control-label' do
       Token
diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml
index e4aa98080e5..95706888655 100644
--- a/app/views/projects/runners/edit.html.haml
+++ b/app/views/projects/runners/edit.html.haml
@@ -2,7 +2,5 @@
 
 %h4 Runner ##{@runner.id}
 
-= form_errors(@runner)
-
 %hr
  = render 'form', runner: @runner, runner_form_url: runner_path(@runner)
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index e449d3dc61e..b42d7a62ebc 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -127,9 +127,9 @@ the appropriate dependencies to run Rails test suites.
 
 ### Prevent runner with tags from picking jobs without tags
 
-You can configure runner to prevent it from picking jobs with tags when
-runnner does not have tags assigned. This configuration setting is available
-in GitLab interface when editting runner details.
+You can configure a runner to prevent it from picking jobs with tags when
+the runnner does not have tags assigned. This setting is available on each
+runner in *Project Settings* > *Runners*.
 
 ### Be careful with sensitive information
 
diff --git a/lib/ci/api/runners.rb b/lib/ci/api/runners.rb
index 1dc4c8c2cd1..0c41f22c7c5 100644
--- a/lib/ci/api/runners.rb
+++ b/lib/ci/api/runners.rb
@@ -32,7 +32,7 @@ module Ci
                          tag_list: params[:tag_list] }
 
           unless params[:run_untagged].nil?
-            attributes.merge!(run_untagged: params[:run_untagged])
+            attributes[:run_untagged] = params[:run_untagged]
           end
 
           runner =

From 52ba3a2d05ab93caa5ddbc6207359e99301dda91 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 18 May 2016 17:23:26 +0200
Subject: [PATCH 0614/1431] Display validation errors when admin edits a runner

---
 app/controllers/admin/runners_controller.rb | 26 +++++++++++++--------
 app/views/projects/runners/_form.html.haml  |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index 8b8a7320072..a164209455b 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -9,19 +9,13 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   def show
-    @builds = @runner.builds.order('id DESC').first(30)
-    @projects =
-      if params[:search].present?
-        ::Project.search(params[:search])
-      else
-        Project.all
-      end
-    @projects = @projects.where.not(id: @runner.projects.select(:id)) if @runner.projects.any?
-    @projects = @projects.page(params[:page]).per(30)
+    set_builds_and_projects
   end
 
   def update
-    @runner.update_attributes(runner_params)
+    unless @runner.update_attributes(runner_params)
+      set_builds_and_projects and return render 'show'
+    end
 
     respond_to do |format|
       format.js
@@ -60,4 +54,16 @@ class Admin::RunnersController < Admin::ApplicationController
   def runner_params
     params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
   end
+
+  def set_builds_and_projects
+    @builds = runner.builds.order('id DESC').first(30)
+    @projects =
+      if params[:search].present?
+        ::Project.search(params[:search])
+      else
+        Project.all
+      end
+    @projects = @projects.where.not(id: runner.projects.select(:id)) if runner.projects.any?
+    @projects = @projects.page(params[:page]).per(30)
+  end
 end
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index 6be406fa186..b8fe0a98107 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -1,5 +1,5 @@
 = form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
-  = form_errors(@runner)
+  = form_errors(runner)
   .form-group
     = label :active, "Active", class: 'control-label'
     .col-sm-10

From c3c503d259bbf4691f0fb24fcd713ec5b4474e61 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 18 May 2016 18:38:21 +0200
Subject: [PATCH 0615/1431] Rename method that validates runner tag constrains

---
 app/models/ci/runner.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index cf4d3236519..6829dc91cb9 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -26,7 +26,7 @@ module Ci
         .where("ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true", project_id: project_id)
     end
 
-    validate :verify_tags_constraints
+    validate :tag_constraints
 
     acts_as_taggable
 
@@ -105,7 +105,7 @@ module Ci
 
     private
 
-    def verify_tags_constraints
+    def tag_constraints
       unless has_tags? || run_untagged?
         errors.add(:tags_list,
           'can not be empty when runner is not allowed to pick untagged jobs')

From 4cc77c3bf8ef72d1b08160da9f55eb1c5f95e832 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 19 May 2016 21:27:52 +0200
Subject: [PATCH 0616/1431] Minor runner-related code refactorings

---
 app/controllers/admin/runners_controller.rb | 19 ++++++++++---------
 app/views/projects/runners/_form.html.haml  |  2 +-
 spec/features/runners_spec.rb               |  2 +-
 spec/requests/ci/api/runners_spec.rb        | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index a164209455b..7345c91f67d 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -9,17 +9,18 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   def show
-    set_builds_and_projects
+    assign_builds_and_projects
   end
 
   def update
-    unless @runner.update_attributes(runner_params)
-      set_builds_and_projects and return render 'show'
-    end
-
-    respond_to do |format|
-      format.js
-      format.html { redirect_to admin_runner_path(@runner) }
+    if @runner.update_attributes(runner_params)
+      respond_to do |format|
+        format.js
+        format.html { redirect_to admin_runner_path(@runner) }
+      end
+    else
+      assign_builds_and_projects
+      render 'show'
     end
   end
 
@@ -55,7 +56,7 @@ class Admin::RunnersController < Admin::ApplicationController
     params.require(:runner).permit(Ci::Runner::FORM_EDITABLE)
   end
 
-  def set_builds_and_projects
+  def assign_builds_and_projects
     @builds = runner.builds.order('id DESC').first(30)
     @projects =
       if params[:search].present?
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index b8fe0a98107..d62f5c8f131 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -11,7 +11,7 @@
     .col-sm-10
       .checkbox
         = f.check_box :run_untagged
-        %span.light Indicates whether runner can pick jobs without tags
+        %span.light Indicates whether this runner can pick jobs without tags
   .form-group
     = label_tag :token, class: 'control-label' do
       Token
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 2c9c12b4dfa..49156130ad3 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -129,7 +129,7 @@ describe "Runners" do
     context 'when runner has tags' do
       before { runner.update_attribute(:tag_list, ['tag']) }
 
-      scenario 'user want to prevent runner from running untagged job' do
+      scenario 'user wants to prevent runner from running untagged job' do
         visit runners_path(project)
         page.within('.activated-specific-runners') do
           first('small > a').click
diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index eb11258cbbb..43596f07cb5 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -16,7 +16,7 @@ describe Ci::API::API do
       before { post ci_api("/runners/register"), token: registration_token }
 
       it 'creates runner with default values' do
-        expect(response.status).to eq(201)
+        expect(response).to have_http_status 201
         expect(Ci::Runner.first.run_untagged).to be true
       end
     end
@@ -28,7 +28,7 @@ describe Ci::API::API do
       end
 
       it 'creates runner' do
-        expect(response.status).to eq(201)
+        expect(response).to have_http_status 201
         expect(Ci::Runner.first.description).to eq("server.hostname")
       end
     end
@@ -40,7 +40,7 @@ describe Ci::API::API do
       end
 
       it 'creates runner' do
-        expect(response.status).to eq(201)
+        expect(response).to have_http_status 201
         expect(Ci::Runner.first.tag_list.sort).to eq(["tag1", "tag2"])
       end
     end
@@ -52,7 +52,7 @@ describe Ci::API::API do
                                             run_untagged: false,
                                             tag_list: ['tag']
 
-          expect(response.status).to eq(201)
+          expect(response).to have_http_status 201
           expect(Ci::Runner.first.run_untagged).to be false
         end
       end
@@ -62,7 +62,7 @@ describe Ci::API::API do
           post ci_api("/runners/register"), token: registration_token,
                                             run_untagged: false
 
-          expect(response.status).to eq(404)
+          expect(response).to have_http_status 404
         end
       end
     end
@@ -72,7 +72,7 @@ describe Ci::API::API do
       before { post ci_api("/runners/register"), token: project.runners_token }
 
       it 'creates runner' do
-        expect(response.status).to eq(201)
+        expect(response).to have_http_status 201
         expect(project.runners.size).to eq(1)
       end
     end
@@ -81,7 +81,7 @@ describe Ci::API::API do
       it 'returns 403 error' do
         post ci_api("/runners/register"), token: 'invalid'
 
-        expect(response.status).to eq(403)
+        expect(response).to have_http_status 403
       end
     end
 
@@ -89,7 +89,7 @@ describe Ci::API::API do
       it 'returns 400 error' do
         post ci_api("/runners/register")
 
-        expect(response.status).to eq(400)
+        expect(response).to have_http_status 400
       end
     end
 
@@ -101,7 +101,7 @@ describe Ci::API::API do
 
         it do
           post ci_api("/runners/register"), token: registration_token, info: { param => value }
-          expect(response.status).to eq(201)
+          expect(response).to have_http_status 201
           is_expected.to eq(value)
         end
       end
@@ -112,7 +112,7 @@ describe Ci::API::API do
     let!(:runner) { FactoryGirl.create(:ci_runner) }
     before { delete ci_api("/runners/delete"), token: runner.token }
 
-    it { expect(response.status).to eq(200) }
+    it { expect(response).to have_http_status 200 }
     it { expect(Ci::Runner.count).to eq(0) }
   end
 end

From 52c8b9da37451943fe97f3a687d43ae39105aaa0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 19 May 2016 22:11:40 +0200
Subject: [PATCH 0617/1431] Use migration helper to prevent downtime migration

---
 ...0504112519_add_run_untagged_to_ci_runner.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
index c6753f2b398..84e5e4eabe2 100644
--- a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
+++ b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
@@ -1,11 +1,13 @@
 class AddRunUntaggedToCiRunner < ActiveRecord::Migration
-  ##
-  # Downtime expected!
-  #
-  # This migration will cause downtime due to exclusive lock
-  # caused by the default value.
-  #
-  def change
-    add_column :ci_runners, :run_untagged, :boolean, default: true, null: false
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:ci_runners, :run_untagged, :boolean,
+                            default: true, allow_null: false)
+  end
+
+  def down
+    remove_column(:ci_runners, :run_untagged)
   end
 end

From e3aaab2d266610e85a452df74bd41e75e86b8df3 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 19 May 2016 15:32:07 -0500
Subject: [PATCH 0618/1431] Updated Rubocop for generator_templates/

---
 .rubocop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d2055d76b5..0946ef5d848 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,7 +21,7 @@ AllCops:
     - 'lib/email_validator.rb'
     - 'lib/gitlab/upgrader.rb'
     - 'lib/gitlab/seeder.rb'
-    - 'lib/templates/**/*'
+    - 'generator_templates/**/*'
 
 
 ##################### Style ##################################

From b876993677edde4fee3a8ed349c522f1542190f7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 19 May 2016 13:48:57 -0500
Subject: [PATCH 0619/1431] Fix creation of Ci::Commit object which can lead to
 pending, failed in some scenarios

---
 CHANGELOG                                    |  1 +
 app/services/create_commit_builds_service.rb | 17 +++++++----------
 spec/workers/post_receive_spec.rb            | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9613332774f..d0f3d037325 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.8.0 (unreleased)
   - Toggle sign-up confirmation emails in application settings
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
+  - Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios
   - Improve multiple branch push performance by memoizing permission checking
   - Log to application.log when an admin starts and stops impersonating a user
   - Changing the confidentiality of an issue now creates a new system note (Alex Moore-Niemi)
diff --git a/app/services/create_commit_builds_service.rb b/app/services/create_commit_builds_service.rb
index 0d2aa1ff03d..5b6fefe669e 100644
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
@@ -18,19 +18,16 @@ class CreateCommitBuildsService
       return false
     end
 
-    commit = project.ci_commit(sha, ref)
-    unless commit
-      commit = project.ci_commits.new(sha: sha, ref: ref, before_sha: before_sha, tag: tag)
+    commit = Ci::Commit.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
 
-      # Skip creating ci_commit when no gitlab-ci.yml is found
-      unless commit.ci_yaml_file
-        return false
-      end
-
-      # Create a new ci_commit
-      commit.save!
+    # Skip creating ci_commit when no gitlab-ci.yml is found
+    unless commit.ci_yaml_file
+      return false
     end
 
+    # Create a new ci_commit
+    commit.save!
+
     # Skip creating builds for commits that have [ci skip]
     unless commit.skip_ci?
       # Create builds for commit
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 94ff3457902..2f465bcf1e3 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -48,6 +48,22 @@ describe PostReceive do
         PostReceive.new.perform(pwd(project), key_id, base64_changes)
       end
     end
+
+    context "gitlab-ci.yml" do
+      subject { PostReceive.new.perform(pwd(project), key_id, base64_changes) }
+
+      context "creates a Ci::Commit for every change" do
+        before { stub_ci_commit_to_return_yaml_file }
+
+        it { expect{ subject }.to change{ Ci::Commit.count }.by(2) }
+      end
+
+      context "does not create a Ci::Commit" do
+        before { stub_ci_commit_yaml_file(nil) }
+
+        it { expect{ subject }.to_not change{ Ci::Commit.count } }
+      end
+    end
   end
 
   context "webhook" do

From 3c8d209e16c606c5122d5aee455d051e65c6dab0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 19 May 2016 15:56:29 -0500
Subject: [PATCH 0620/1431] Redesign sublevel nav links; vertically align
 project image; fix spacing

---
 app/assets/stylesheets/pages/projects.scss | 7 ++++++-
 app/views/projects/show.html.haml          | 9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 46981fd0d2c..cb9bef7214d 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -48,15 +48,20 @@
     }
   }
 
+  .cover-title {
+    margin-bottom: 0;
+  }
+
   .project-image-container {
     @include make-sm-column(1);
     max-width: 86px;
     min-width: 86px;
     padding-right: 0;
+    margin: 11px 0;
 
     @media (max-width: $screen-md-max) {
       padding-left: 0;
-      margin-bottom: 10px;
+      margin: 0 0 10px;
       max-width: none;
       min-width: none;
 
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 61f739ad1d4..59a9519ca11 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -17,17 +17,16 @@
     %ul.nav
       %li
         = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-          = pluralize(number_with_delimiter(@project.commit_count), 'commit')
+          #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)})
       %li
         = link_to namespace_project_branches_path(@project.namespace, @project) do
-          = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
+          #{'Branch'.pluralize(@repository.branch_names.count)} (#{number_with_delimiter(@repository.branch_names.count)})
       %li
         = link_to namespace_project_tags_path(@project.namespace, @project) do
-          = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
-
+          #{'Tag'.pluralize(@repository.tag_names.count)} (#{number_with_delimiter(@repository.tag_names.count)})
       %li
         = link_to project_files_path(@project) do
-          = repository_size
+          Files (#{repository_size})
 
       - if default_project_view != 'readme' && @repository.readme
         %li

From 6fb9bf87c4f202dee9815c10cad9486a1077cc99 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 19 May 2016 19:20:06 -0400
Subject: [PATCH 0621/1431] Use the right default notification settings for non
 members

---
 app/models/user.rb                            |  8 +-------
 spec/controllers/projects_controller_spec.rb  |  7 ++++---
 .../merge_requests/update_service_spec.rb     |  1 -
 spec/services/notification_service_spec.rb    | 19 +++++++------------
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 831fbcbb3f5..368a3f3cfba 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -777,13 +777,7 @@ class User < ActiveRecord::Base
   end
 
   def notification_settings_for(source)
-    notification_setting = notification_settings.find_or_initialize_by(source: source)
-
-    if source.is_a?(Project) && !source.team.member?(id) && !notification_setting.persisted?
-      notification_setting.level = :disabled
-    end
-
-    notification_setting
+    notification_settings.find_or_initialize_by(source: source)
   end
 
   private
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 685fe9ffe0b..91b46c4d65c 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -24,20 +24,20 @@ describe ProjectsController do
         context "and does not have notification setting" do
           it "initializes notification as disabled" do
             get :show, namespace_id: public_project.namespace.path, id: public_project.path
-            expect(assigns(:notification_setting).level).to eq("disabled")
+            expect(assigns(:notification_setting).level).to eq("global")
           end
         end
 
         context "and has notification setting" do
           before do
             setting = user.notification_settings_for(public_project)
-            setting.level = :global
+            setting.level = :watch
             setting.save
           end
 
           it "shows current notification setting" do
             get :show, namespace_id: public_project.namespace.path, id: public_project.path
-            expect(assigns(:notification_setting).level).to eq("global")
+            expect(assigns(:notification_setting).level).to eq("watch")
           end
         end
       end
@@ -45,6 +45,7 @@ describe ProjectsController do
 
     context "rendering default project view" do
       render_views
+
       it "renders the activity view" do
         allow(controller).to receive(:current_user).and_return(user)
         allow(user).to receive(:project_view).and_return('activity')
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index e872fc0eed2..213e8c2eb3a 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -17,7 +17,6 @@ describe MergeRequests::UpdateService, services: true do
   before do
     project.team << [user, :master]
     project.team << [user2, :developer]
-    project.team << [user3, :developer]
   end
 
   describe 'execute' do
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 4bf8fcde4dd..cef5e0d8659 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -35,7 +35,7 @@ describe NotificationService, services: true do
 
   describe 'Notes' do
     context 'issue note' do
-      let(:project) { create(:empty_project, :internal) }
+      let(:project) { create(:empty_project, :private) }
       let(:issue) { create(:issue, project: project, assignee: create(:user)) }
       let(:mentioned_issue) { create(:issue, assignee: issue.assignee) }
       let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@mention referenced, @outsider also') }
@@ -52,8 +52,8 @@ describe NotificationService, services: true do
         it do
           add_users_with_subscription(note.project, issue)
 
-          # Ensure create SentNotification by noteable = issue 7 times, not noteable = note
-          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(8).times
+          # Ensure create SentNotification by noteable = issue 6 times, not noteable = note
+          expect(SentNotification).to receive(:record).with(issue, any_args).exactly(7).times
 
           ActionMailer::Base.deliveries.clear
 
@@ -66,7 +66,7 @@ describe NotificationService, services: true do
           should_email(@subscriber)
           should_email(@watcher_and_subscriber)
           should_email(@subscribed_participant)
-          should_email(@u_guest_watcher)
+          should_not_email(@u_guest_watcher)
           should_not_email(note.author)
           should_not_email(@u_participating)
           should_not_email(@u_disabled)
@@ -101,7 +101,7 @@ describe NotificationService, services: true do
           should_email(note.noteable.author)
           should_email(note.noteable.assignee)
           should_email(@u_mentioned)
-          should_email(@u_guest_watcher)
+          should_not_email(@u_guest_watcher)
           should_not_email(@u_watcher)
           should_not_email(note.author)
           should_not_email(@u_participating)
@@ -121,10 +121,7 @@ describe NotificationService, services: true do
       let(:note) { create(:note_on_issue, noteable: confidential_issue, project: project, note: "#{author.to_reference} #{assignee.to_reference} #{non_member.to_reference} #{member.to_reference} #{admin.to_reference}") }
 
       it 'filters out users that can not read the issue' do
-        project.team << [admin, :master]
-        project.team << [author, :developer]
         project.team << [member, :developer]
-        project.team << [assignee, :developer]
 
         expect(SentNotification).to receive(:record).with(confidential_issue, any_args).exactly(4).times
 
@@ -148,7 +145,7 @@ describe NotificationService, services: true do
 
       before do
         build_team(note.project)
-        note.project.team << [[note.author, note.noteable.author, note.noteable.assignee], :master]
+        note.project.team << [note.author, :master]
         ActionMailer::Base.deliveries.clear
       end
 
@@ -190,7 +187,7 @@ describe NotificationService, services: true do
 
       before do
         build_team(note.project)
-        note.project.team << [[note.author, note.noteable.author], :master]
+        note.project.team << [note.author, :master]
         ActionMailer::Base.deliveries.clear
       end
 
@@ -269,7 +266,6 @@ describe NotificationService, services: true do
     before do
       build_team(issue.project)
       add_users_with_subscription(issue.project, issue)
-      project.team << [[issue.assignee, issue.author], :developer]
       ActionMailer::Base.deliveries.clear
     end
 
@@ -510,7 +506,6 @@ describe NotificationService, services: true do
     before do
       build_team(merge_request.target_project)
       add_users_with_subscription(merge_request.target_project, merge_request)
-      project.team << [merge_request.assignee, :developer]
       ActionMailer::Base.deliveries.clear
     end
 

From 260a915cb0aa163bd282557b5584ed368cd9983a Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 10 May 2016 12:26:24 -0300
Subject: [PATCH 0622/1431] Fix group visibility level migration in case all
 visibility levels are restricted

---
 ...03_add_default_group_visibility_to_application_settings.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb b/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
index 75de5f70fa2..72b862d67d2 100644
--- a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
+++ b/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
@@ -7,7 +7,9 @@ class AddDefaultGroupVisibilityToApplicationSettings < ActiveRecord::Migration
     add_column :application_settings, :default_group_visibility, :integer
     # Unfortunately, this can't be a `default`, since we don't want the configuration specific
     # `allowed_visibility_level` to end up in schema.rb
-    execute("UPDATE application_settings SET default_group_visibility = #{allowed_visibility_level}")
+
+    visibility_level = allowed_visibility_level || Gitlab::VisibilityLevel::PRIVATE
+    execute("UPDATE application_settings SET default_group_visibility = #{visibility_level}")
   end
 
   def down

From a5954080e95318f29790ac1baf6588c6c95184eb Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 19 May 2016 21:08:07 -0500
Subject: [PATCH 0623/1431] Upgrade activerecord-sessionstore from 0.1.2 to
 1.0.0.

Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0

Includes Rails 5 support.
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 91ad1706a07..832c5a3ca89 100644
--- a/Gemfile
+++ b/Gemfile
@@ -325,7 +325,7 @@ gem "mail_room", "~> 0.7"
 gem 'email_reply_parser', '~> 0.5.8'
 
 ## CI
-gem 'activerecord-session_store', '~> 0.1.0'
+gem 'activerecord-session_store', '~> 1.0.0'
 gem "nested_form", '~> 0.3.2'
 
 # OAuth
diff --git a/Gemfile.lock b/Gemfile.lock
index b55764504c6..e1c5b9630d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,10 +33,12 @@ GEM
       activemodel (= 4.2.6)
       activesupport (= 4.2.6)
       arel (~> 6.0)
-    activerecord-session_store (0.1.2)
-      actionpack (>= 4.0.0, < 5)
-      activerecord (>= 4.0.0, < 5)
-      railties (>= 4.0.0, < 5)
+    activerecord-session_store (1.0.0)
+      actionpack (>= 4.0, < 5.1)
+      activerecord (>= 4.0, < 5.1)
+      multi_json (~> 1.11, >= 1.11.2)
+      rack (>= 1.5.2, < 3)
+      railties (>= 4.0, < 5.1)
     activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -883,7 +885,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.2.9)
   ace-rails-ap (~> 4.0.2)
-  activerecord-session_store (~> 0.1.0)
+  activerecord-session_store (~> 1.0.0)
   acts-as-taggable-on (~> 3.4)
   addressable (~> 2.3.8)
   after_commit_queue

From a768c04ba511b5f98071d45c31d5c017dd7e4282 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 19 May 2016 22:09:51 -0500
Subject: [PATCH 0624/1431] Fix fork counter ui bug for safari

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/projects.scss | 6 +++++-
 app/views/projects/buttons/_fork.html.haml | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index a3690e40e28..b4702b31182 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -149,6 +149,10 @@
         white-space: nowrap;
         margin: 0 11px 0 4px;
 
+        a {
+          color: inherit;
+        }
+
         &:hover {
           background: #fff;
         }
@@ -161,7 +165,7 @@
   display: inline-table;
   margin-right: 12px;
 
-  a {
+  > a {
     margin: -1px;
   }
 }
diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml
index 5fb5fe5af2f..34ad9fe2c43 100644
--- a/app/views/projects/buttons/_fork.html.haml
+++ b/app/views/projects/buttons/_fork.html.haml
@@ -12,7 +12,8 @@
       = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do
         = icon('code-fork fw')
         Fork
-      = link_to namespace_project_forks_path(@project.namespace, @project), class: 'count-with-arrow' do
+      %div.count-with-arrow
         %span.arrow
         %span.count
-          = @project.forks_count
+          = link_to namespace_project_forks_path(@project.namespace, @project) do
+            = @project.forks_count

From 1472bb92471113790ba3564d16af11d5b96c28aa Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 19 May 2016 23:13:51 -0500
Subject: [PATCH 0625/1431] Updated the DB schema

---
 db/schema.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 2e154b98b34..aee5fb90937 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: 20160509201028) do
+ActiveRecord::Schema.define(version: 20160516174813) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -82,6 +82,7 @@ ActiveRecord::Schema.define(version: 20160509201028) do
     t.integer  "metrics_packet_size",               default: 1
     t.text     "disabled_oauth_sign_in_sources"
     t.string   "health_check_access_token"
+    t.boolean  "send_user_confirmation_email",      default: false
   end
 
   create_table "audit_events", force: :cascade do |t|
@@ -633,10 +634,10 @@ ActiveRecord::Schema.define(version: 20160509201028) do
     t.string   "line_code"
     t.string   "commit_id"
     t.integer  "noteable_id"
-    t.boolean  "system",            default: false, null: false
+    t.boolean  "system",        default: false, null: false
     t.text     "st_diff"
     t.integer  "updated_by_id"
-    t.boolean  "is_award",          default: false, null: false
+    t.boolean  "is_award",      default: false, null: false
     t.string   "type"
   end
 

From aff288a20c3f3891e86d317107494b1cd31e72f5 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 May 2016 16:42:29 +0100
Subject: [PATCH 0626/1431] Project settings UI update

---
 app/assets/stylesheets/pages/profile.scss     |   8 -
 app/assets/stylesheets/pages/projects.scss    |   2 +-
 app/assets/stylesheets/pages/settings.scss    |   8 +
 app/views/profiles/accounts/show.html.haml    |   4 +-
 app/views/projects/_builds_settings.html.haml | 123 +++--
 app/views/projects/edit.html.haml             | 455 ++++++++----------
 6 files changed, 275 insertions(+), 325 deletions(-)

diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 843379a3f54..8040dd0a1d8 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -134,14 +134,6 @@
   }
 }
 
-.change-username-title {
-  color: $gl-warning;
-}
-
-.remove-account-title {
-  color: $gl-danger;
-}
-
 .provider-btn-group {
   display: inline-block;
   margin-right: 10px;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index a3690e40e28..0c5d4a4a01d 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -10,7 +10,7 @@
   margin-bottom: 0;
 }
 .new_project,
-.edit_project {
+.edit-project {
   fieldset.features {
     .control-label {
       font-weight: normal;
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 3fb70085713..2e8f356298d 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -12,3 +12,11 @@
   border: 1px solid $warning-message-border;
   border-radius: $border-radius-base;
 }
+
+.warning-title {
+  color: $gl-warning;
+}
+
+.danger-title {
+  color: $gl-danger;
+}
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index afd3d79321f..01ac8161945 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -70,7 +70,7 @@
 - if current_user.can_change_username?
   .row.prepend-top-default
     .col-lg-3.profile-settings-sidebar
-      %h4.prepend-top-0.change-username-title
+      %h4.prepend-top-0.warning-title
         Change username
       %p
         Changing your username will change path to all personal projects!
@@ -94,7 +94,7 @@
 - if signup_enabled?
   .row.prepend-top-default
     .col-lg-3.profile-settings-sidebar
-      %h4.prepend-top-0.remove-account-title
+      %h4.prepend-top-0.danger-title
         Remove account
     .col-lg-9
       - if @user.can_be_removed?
diff --git a/app/views/projects/_builds_settings.html.haml b/app/views/projects/_builds_settings.html.haml
index 0de019983ca..0568c2d305e 100644
--- a/app/views/projects/_builds_settings.html.haml
+++ b/app/views/projects/_builds_settings.html.haml
@@ -1,74 +1,65 @@
 %fieldset.builds-feature
-  %legend
-    Builds:
-
+  %h5.prepend-top-0
+    Builds
   - unless @repository.gitlab_ci_yml
     .form-group
-      .col-sm-offset-2.col-sm-10
-        %p Builds need to be configured before you can begin using Continuous Integration.
-        = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
-        %hr
+      %p Builds need to be configured before you can begin using Continuous Integration.
+      = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+  .form-group
+    %p Get recent application code using the following command:
+    .radio
+      = f.label :build_allow_git_fetch_false do
+        = f.radio_button :build_allow_git_fetch, 'false'
+        %strong git clone
+        %br
+        %span.descr Slower but makes sure you have a clean dir before every build
+    .radio
+      = f.label :build_allow_git_fetch_true do
+        = f.radio_button :build_allow_git_fetch, 'true'
+        %strong git fetch
+        %br
+        %span.descr Faster
 
   .form-group
-    .col-sm-offset-2.col-sm-10
-      %p Get recent application code using the following command:
-      .radio
-        = f.label :build_allow_git_fetch_false do
-          = f.radio_button :build_allow_git_fetch, 'false'
-          %strong git clone
-          %br
-          %span.descr Slower but makes sure you have a clean dir before every build
-      .radio
-        = f.label :build_allow_git_fetch_true do
-          = f.radio_button :build_allow_git_fetch, 'true'
-          %strong git fetch
-          %br
-          %span.descr Faster
+    = f.label :build_timeout_in_minutes, 'Timeout', class: 'label-light'
+    = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
+    %p.help-block per build in minutes
+  .form-group
+    = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
+    .input-group
+      %span.input-group-addon /
+      = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
+      %span.input-group-addon /
+    %p.help-block
+      We will use this regular expression to find test coverage output in build trace.
+      Leave blank if you want to disable this feature
+    .bs-callout.bs-callout-info
+      %p Below are examples of regex for existing tools:
+      %ul
+        %li
+          Simplecov (Ruby) -
+          %code \(\d+.\d+\%\) covered
+        %li
+          pytest-cov (Python) -
+          %code \d+\%\s*$
+        %li
+          phpunit --coverage-text --colors=never (PHP) -
+          %code ^\s*Lines:\s*\d+.\d+\%
+        %li
+          gcovr (C/C++) -
+          %code ^TOTAL.*\s+(\d+\%)$
+        %li
+          tap --coverage-report=text-summary (Node.js) -
+          %code ^Statements\s*:\s*([^%]+)
 
   .form-group
-    = f.label :build_timeout_in_minutes, 'Timeout', class: 'control-label'
-    .col-sm-10
-      = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
-      %p.help-block per build in minutes
-  .form-group
-    = f.label :build_coverage_regex, "Test coverage parsing", class: 'control-label'
-    .col-sm-10
-      .input-group
-        %span.input-group-addon /
-        = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
-        %span.input-group-addon /
-      %p.help-block
-        We will use this regular expression to find test coverage output in build trace.
-        Leave blank if you want to disable this feature
-      .bs-callout.bs-callout-info
-        %p Below are examples of regex for existing tools:
-        %ul
-          %li
-            Simplecov (Ruby) -
-            %code \(\d+.\d+\%\) covered
-          %li
-            pytest-cov (Python) -
-            %code \d+\%\s*$
-          %li
-            phpunit --coverage-text --colors=never (PHP) -
-            %code ^\s*Lines:\s*\d+.\d+\%
-          %li
-            gcovr (C/C++) -
-            %code ^TOTAL.*\s+(\d+\%)$
-          %li
-            tap --coverage-report=text-summary (Node.js) -
-            %code ^Statements\s*:\s*([^%]+)
+    .checkbox
+      = 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
 
-  .form-group
-    .col-sm-offset-2.col-sm-10
-      .checkbox
-        = 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
-
-  .form-group
-    = f.label :runners_token, "Runners token", class: 'control-label'
-    .col-sm-10
-      = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
-      %p.help-block The secure token used to checkout project.
+  .form-group.append-bottom-0
+    = f.label :runners_token, "Runners token", class: 'label-light'
+    = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
+    %p.help-block The secure token used to checkout project.
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index f6a53fddf17..18b125ff9d4 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -1,261 +1,221 @@
-.project-edit-container.prepend-top-default
-  .project-edit-errors
-  .project-edit-content
-    .panel.panel-default
-      .panel-heading
+.project-edit-container
+  .row.prepend-top-default
+    .col-lg-3.profile-settings-sidebar
+      %h4.prepend-top-0
         Project settings
-      .panel-body
-        = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit_project form-horizontal fieldset-form" }, authenticity_token: true do |f|
-
-          %fieldset
-            .form-group.project_name_holder
-              = f.label :name, class: 'control-label' do
-                Project name
-              .col-sm-10
-                = f.text_field :name, class: "form-control", id: "project_name_edit"
-
-
-            .form-group
-              = f.label :description, class: 'control-label' do
-                Project description
-                %span.light (optional)
-              .col-sm-10
-                = f.text_area :description, class: "form-control", rows: 3, maxlength: 250
-
-            - unless @project.empty_repo?
-              .form-group
-                = f.label :default_branch, "Default Branch", class: 'control-label'
-                .col-sm-10= f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
-
-
-          = render 'shared/visibility_level', f: f, visibility_level: @project.visibility_level, can_change_visibility_level: can_change_visibility_level?(@project, current_user), form_model: @project
-
+    .col-lg-9
+      = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f|
+        %fieldset.append-bottom-0
           .form-group
-            = f.label :tag_list, "Tags", class: 'control-label'
-            .col-sm-10
-              = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"
-              %p.help-block Separate tags with commas.
+            = f.label :name, class: 'label-light' do
+              Project name
+            = f.text_field :name, class: "form-control", id: "project_name_edit"
+          .form-group
+            = f.label :description, class: 'label-light' do
+              Project description
+              %span.light (optional)
+            = f.text_area :description, class: "form-control", rows: 3, maxlength: 250
 
-          %fieldset.features
-            %legend
-              Features:
+          - unless @project.empty_repo?
             .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :issues_enabled do
-                    = f.check_box :issues_enabled
-                    %strong Issues
-                    %br
-                    %span.descr Lightweight issue tracking system for this project
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :merge_requests_enabled do
-                    = f.check_box :merge_requests_enabled
-                    %strong Merge Requests
-                    %br
-                    %span.descr Submit changes to be merged upstream
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :builds_enabled do
-                    = f.check_box :builds_enabled
-                    %strong Builds
-                    %br
-                    %span.descr Test and deploy your changes before merge
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :wiki_enabled do
-                    = f.check_box :wiki_enabled
-                    %strong Wiki
-                    %br
-                    %span.descr Pages for project documentation
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :snippets_enabled do
-                    = f.check_box :snippets_enabled
-                    %strong Snippets
-                    %br
-                    %span.descr Share code pastes with others out of git repository
-
-            - if Gitlab.config.registry.enabled
-              .form-group
-                .col-sm-offset-2.col-sm-10
-                  .checkbox
-                    = f.label :container_registry_enabled do
-                      = f.check_box :container_registry_enabled
-                      %strong Container Registry
-                      %br
-                      %span.descr Enable Container Registry for this repository
-
-          = render 'builds_settings', f: f
-
-          %fieldset.features
-            %legend
-              Project avatar:
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                - if @project.avatar?
-                  = project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
-                %p.light
-                  - if @project.avatar_in_git
-                    Project avatar in repository: #{ @project.avatar_in_git }
-                %p.light
-                  - if @project.avatar?
-                    You can change your project avatar here
-                  - else
-                    You can upload a project avatar here
-                %a.choose-btn.btn.btn-sm.js-choose-project-avatar-button
-                  %i.icon-paper-clip
-                  %span Choose File ...
-                &nbsp;
-                %span.file_name.js-avatar-filename File name...
-                = f.file_field :avatar, class: "js-project-avatar-input hidden"
-                .light The maximum file size allowed is 200KB.
-                - if @project.avatar?
-                  %hr
-                  = link_to 'Remove avatar', namespace_project_avatar_path(@project.namespace, @project), data: { confirm: "Project avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
-
-
-          .form-actions
-            = f.submit 'Save changes', class: "btn btn-save"
-
-
-
-    .danger-settings
-      .panel.panel-default
-        .panel-heading Housekeeping
-        .errors-holder
-        .panel-body
-          %p
-            Runs a number of housekeeping tasks within the current repository,
-            such as compressing file revisions and removing unreachable objects.
-            %br
-
-          .form-actions
-            = link_to 'Housekeeping', housekeeping_namespace_project_path(@project.namespace, @project),
-                method: :post, class: "btn btn-default"
-
-      - if can? current_user, :archive_project, @project
-        - if @project.archived?
-          .panel.panel-success
-            .panel-heading
-              Unarchive project
-            .panel-body
-              %p
-                Unarchiving the project will mark its repository as active.
+              = f.label :default_branch, "Default Branch", class: 'label-light'
+              = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
+        .form-group.project-visibility-level-holder
+          = f.label :visibility_level, class: 'label-light' do
+            Visibility Level
+            = link_to "(?)", help_page_path("public_access", "public_access")
+          - if can_change_visibility_level?(@project, current_user)
+            = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: @project.visibility_level, form_model: @project)
+          - else
+            .info
+              = visibility_level_icon(@project.visibility_level)
+              %strong
+                = visibility_level_label(@project.visibility_level)
+              .light= visibility_level_description(@project.visibility_level, @project)
+        .form-group
+          = f.label :tag_list, "Tags", class: 'label-light'
+          = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"
+          %p.help-block Separate tags with commas.
+        %hr
+        %fieldset.features.append-bottom-0
+          %h5.prepend-top-0
+            Features
+          .form-group
+            .checkbox
+              = f.label :issues_enabled do
+                = f.check_box :issues_enabled
+                %strong Issues
                 %br
-                The project can be committed to.
+                %span.descr Lightweight issue tracking system for this project
+          .form-group
+            .checkbox
+              = f.label :merge_requests_enabled do
+                = f.check_box :merge_requests_enabled
+                %strong Merge Requests
                 %br
-                %strong Once active this project shows up in the search and on the dashboard.
-
-              .form-actions
-                = link_to 'Unarchive project', unarchive_namespace_project_path(@project.namespace, @project),
-                    data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be committed to again." },
-                    method: :post, class: "btn btn-success"
-        - else
-          .panel.panel-warning
-            .panel-heading
-              Archive project
-            .panel-body
-              %p
-                Archiving the project will mark its repository as read-only.
+                %span.descr Submit changes to be merged upstream
+          .form-group
+            .checkbox
+              = f.label :builds_enabled do
+                = f.check_box :builds_enabled
+                %strong Builds
                 %br
-                It is hidden from the dashboard and doesn't show up in searches.
+                %span.descr Test and deploy your changes before merge
+          .form-group
+            .checkbox
+              = f.label :wiki_enabled do
+                = f.check_box :wiki_enabled
+                %strong Wiki
                 %br
-                %strong Archived projects cannot be committed to!
-
-              .form-actions
-                = link_to 'Archive project', archive_namespace_project_path(@project.namespace, @project),
-                    data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
-                    method: :post, class: "btn btn-warning"
-      - else
-        .nothing-here-block Only the project owner can archive a project
-
-      .panel.panel-default.panel.panel-warning
-        .panel-heading Rename repository
-        .errors-holder
-        .panel-body
-          = form_for([@project.namespace.becomes(Namespace), @project], html: { class: 'form-horizontal' }) do |f|
-            .form-group.project_name_holder
-              = f.label :name, class: 'control-label' do
-                Project name
-              .col-sm-9
-                .form-group
-                  = f.text_field :name, class: "form-control"
+                %span.descr Pages for project documentation
+          .form-group
+            .checkbox
+              = f.label :snippets_enabled do
+                = f.check_box :snippets_enabled
+                %strong Snippets
+                %br
+                %span.descr Share code pastes with others out of git repository
+          - if Gitlab.config.registry.enabled
             .form-group
-              = f.label :path, class: 'control-label' do
-                %span Path
-              .col-sm-9
-                .form-group
-                  .input-group
-                    .input-group-addon
-                      #{URI.join(root_url, @project.namespace.path)}/
-                    = f.text_field :path, class: 'form-control'
-                %ul
-                  %li Be careful. Renaming a project's repository can have unintended side effects.
-                  %li You will need to update your local repositories to point to the new location.
-            .form-actions
-              = f.submit 'Rename project', class: "btn btn-warning"
-
-      - if can?(current_user, :change_namespace, @project)
-        .panel.panel-default.panel.panel-danger
-          .panel-heading Transfer project
-          .errors-holder
-          .panel-body
-            = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
-              .form-group
-                = label_tag :new_namespace_id, nil, class: 'control-label' do
-                  %span Namespace
-                .col-sm-9
-                  .form-group
-                    = select_tag :new_namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace', class: 'select2' }
-                  %ul
-                    %li Be careful. Changing the project's namespace can have unintended side effects.
-                    %li You can only transfer the project to namespaces you manage.
-                    %li You will need to update your local repositories to point to the new location.
-                    %li Project visibility level will be changed to match namespace rules when transfering to a group.
-              .form-actions
-                = f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
-      - else
-        .nothing-here-block Only the project owner can transfer a project
-
-      - if @project.forked?
-        - if can?(current_user, :remove_fork_project, @project)
-          = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_namespace_project_path(@project.namespace, @project), method: :delete, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
-            .panel.panel-default.panel.panel-danger
-              .panel-heading Remove fork relationship
-              .panel-body
-                %p
-                  This will remove the fork relationship to source project
-                  #{link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)}.
+              .checkbox
+                = f.label :container_registry_enabled do
+                  = f.check_box :container_registry_enabled
+                  %strong Container Registry
                   %br
-                  %strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.
-                .form-actions
-                  = button_to 'Remove fork relationship', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_message(@project) }
+                  %span.descr Enable Container Registry for this repository
+        %hr
+        = render 'builds_settings', f: f
+        %hr
+        %fieldset.features.append-bottom-default
+          %h5.prepend-top-0
+            Project avatar
+          .form-group
+            - if @project.avatar?
+              = project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
+            %p.light
+              - if @project.avatar_in_git
+                Project avatar in repository: #{ @project.avatar_in_git }
+            %a.choose-btn.btn.js-choose-project-avatar-button
+              Browse file...
+            %span.file_name.prepend-left-default.js-avatar-filename No file chosen
+            = f.file_field :avatar, class: "js-project-avatar-input hidden"
+            .help-block The maximum file size allowed is 200KB.
+            - if @project.avatar?
+              %hr
+              = link_to 'Remove avatar', namespace_project_avatar_path(@project.namespace, @project), data: { confirm: "Project avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
+        = f.submit 'Save changes', class: "btn btn-save"
+  .row.prepend-top-default
+  %hr
+  .row.prepend-top-default
+    .col-lg-3
+      %h4.prepend-top-0
+        Housekeeping
+      %p.append-bottom-0
+        %p
+          Runs a number of housekeeping tasks within the current repository,
+          such as compressing file revisions and removing unreachable objects.
+    .col-lg-9
+      = link_to 'Housekeeping', housekeeping_namespace_project_path(@project.namespace, @project),
+          method: :post, class: "btn btn-save"
+  %hr
+  - if can? current_user, :archive_project, @project
+    .row.prepend-top-default
+      .col-lg-3
+        %h4.warning-title.prepend-top-0
+          - if @project.archived?
+            Unarchive project
+          - else
+            Archive project
+        %p.append-bottom-0
+          - if @project.archived?
+            Unarchiving the project will mark its repository as active. The project can be committed to.
+          - else
+            Archiving the project will mark its repository as read-only. It is hidden from the dashboard and doesn't show up in searches.
+      .col-lg-9
+        - if @project.archived?
+          %p
+            %strong Once active this project shows up in the search and on the dashboard.
+          = link_to 'Unarchive project', unarchive_namespace_project_path(@project.namespace, @project),
+              data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be committed to again." },
+              method: :post, class: "btn btn-success"
         - else
-          .nothing-here-block Only the project owner can remove the fork relationship.
-
-      - if can?(current_user, :remove_project, @project)
-        .panel.panel-default.panel.panel-danger
-          .panel-heading Remove project
-          .panel-body
-            = form_tag(namespace_project_path(@project.namespace, @project), method: :delete, class: 'form-horizontal') do
-              %p
-                Removing the project will delete its repository and all related resources including issues, merge requests etc.
-                %br
-                %strong Removed projects cannot be restored!
-              .form-actions
-                = button_to 'Remove project', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) }
-      - else
-        .nothing-here-block Only the project owner can remove a project.
-
+          %p
+            %strong Archived projects cannot be committed to!
+          = link_to 'Archive project', archive_namespace_project_path(@project.namespace, @project),
+              data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
+              method: :post, class: "btn btn-warning"
+  %hr
+  .row.prepend-top-default
+    .col-lg-3
+      %h4.prepend-top-0.warning-title
+        Rename repository
+    .col-lg-9
+      = form_for([@project.namespace.becomes(Namespace), @project]) do |f|
+        .form-group.project_name_holder
+          = f.label :name, class: 'label-light' do
+            Project name
+          .form-group
+            = f.text_field :name, class: "form-control"
+        .form-group
+          = f.label :path, class: 'label-light' do
+            %span Path
+          .form-group
+            .input-group
+              .input-group-addon
+                #{URI.join(root_url, @project.namespace.path)}/
+              = f.text_field :path, class: 'form-control'
+          %ul
+            %li Be careful. Renaming a project's repository can have unintended side effects.
+            %li You will need to update your local repositories to point to the new location.
+        = f.submit 'Rename project', class: "btn btn-warning"
+  - if can?(current_user, :change_namespace, @project)
+    %hr
+    .row.prepend-top-default
+      .col-lg-3
+        %h4.prepend-top-0.danger-title
+          Transfer project
+      .col-lg-9
+        = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true) do |f|
+          .form-group
+            = label_tag :new_namespace_id, nil, class: 'label-light' do
+              %span Namespace
+            .form-group
+              = select_tag :new_namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace', class: 'select2' }
+            %ul
+              %li Be careful. Changing the project's namespace can have unintended side effects.
+              %li You can only transfer the project to namespaces you manage.
+              %li You will need to update your local repositories to point to the new location.
+              %li Project visibility level will be changed to match namespace rules when transfering to a group.
+          = f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) }
+  - if @project.forked? && can?(current_user, :remove_fork_project, @project)
+    %hr
+    .row.prepend-top-default.append-bottom-default
+      .col-lg-3
+        %h4.prepend-top-0.danger-title
+          Remove fork relationship
+        %p.append-bottom-0
+          %p
+            This will remove the fork relationship to source project
+            = succeed "." do
+              = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
+      .col-lg-9
+        = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_namespace_project_path(@project.namespace, @project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f|
+          %p
+            %strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.
+          = button_to 'Remove fork relationship', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_message(@project) }
+  - if can?(current_user, :remove_project, @project)
+    %hr
+    .row.prepend-top-default.append-bottom-default
+      .col-lg-3
+        %h4.prepend-top-0.danger-title
+          Remove project
+        %p.append-bottom-0
+          Removing the project will delete its repository and all related resources including issues, merge requests etc.
+      .col-lg-9
+        = form_tag(namespace_project_path(@project.namespace, @project), method: :delete) do
+          %p
+            %strong Removed projects cannot be restored!
+          = button_to 'Remove project', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_project_message(@project) }
 
 .save-project-loader.hide
   .center
@@ -264,5 +224,4 @@
       Saving project.
     %p Please wait a moment, this page will automatically refresh when ready.
 
-
 = render 'shared/confirm_modal', phrase: @project.path

From 10e3de7a454cc85bcf21902bb808dd1e0eec47ed Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 17 May 2016 08:59:55 +0100
Subject: [PATCH 0627/1431] Fixed project settings tests

---
 features/steps/shared/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index ea5f9580308..ce9ea7ee18a 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -95,7 +95,7 @@ module SharedProject
   step 'I should see project settings' do
     expect(current_path).to eq edit_namespace_project_path(@project.namespace, @project)
     expect(page).to have_content("Project name")
-    expect(page).to have_content("Features:")
+    expect(page).to have_content("Features")
   end
 
   def current_project

From ce8dd3bd660e18c1a143c24539418c8697fe29b9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 May 2016 12:51:15 +0100
Subject: [PATCH 0628/1431] Fixed issue with merge button color

Closes #17644
---
 app/assets/javascripts/merge_request_widget.js.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index f58647988a2..b6d590f681c 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -113,7 +113,7 @@ class @MergeRequestWidget
       switch state
         when "failed", "canceled", "not_found"
           @setMergeButtonClass('btn-danger')
-        when "running", "pending"
+        when "running"
           @setMergeButtonClass('btn-warning')
         when "success"
           @setMergeButtonClass('btn-create')
@@ -126,6 +126,6 @@ class @MergeRequestWidget
     $('.ci_widget:visible .ci-coverage').text(text)
 
   setMergeButtonClass: (css_class) ->
-    $('.accept_merge_request')
+    $('.js-merge-button')
       .removeClass('btn-danger btn-warning btn-create')
       .addClass(css_class)

From 9f60a2eda24c9017c8b23ae8885ca31d59fbc659 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 May 2016 12:33:08 +0100
Subject: [PATCH 0629/1431] Fixed issue with enter key selecting wrong option
 in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

Closes #17630
---
 app/assets/javascripts/gl_dropdown.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 1d1bfeb2e77..fd97471cdc4 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -460,7 +460,7 @@ class GitLabDropdown
         return false
 
       if currentKeyCode is 13
-        @selectRowAtIndex currentIndex
+        @selectRowAtIndex if currentIndex < 0 then 0 else currentIndex
 
   removeArrayKeyEvent: ->
     $('body').off 'keydown'

From f307ff34134caa376b50e00f8e285c355b4af701 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 May 2016 09:11:28 +0100
Subject: [PATCH 0630/1431] Replaced line breaks

---
 app/views/shared/issuable/_form.html.haml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index d06a287281a..6990863bd35 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -56,8 +56,8 @@
                 placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
                 selected: issuable.assignee_id, project: @target_project || @project,
                 first_user: true, current_user: true, include_blank: true)
-          %br
-          = link_to 'Assign to me', '#', class: 'assign-to-me-link prepend-top-5 inline'
+          %div
+            = link_to 'Assign to me', '#', class: 'assign-to-me-link prepend-top-5 inline'
       .form-group.issue-milestone
         = f.label :milestone_id, "Milestone", class: "control-label #{"col-lg-4" if has_due_date}"
         .col-sm-10{ class: ("col-lg-8" if has_due_date) }
@@ -69,8 +69,8 @@
             .prepend-top-10
             %span.light No open milestones available.
           - if can? current_user, :admin_milestone, issuable.project
-            %br
-            = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+            %div
+              = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
       .form-group
         - has_labels = issuable.project.labels.any?
         = f.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}"
@@ -82,8 +82,8 @@
           - else
             %span.light No labels yet.
           - if can? current_user, :admin_label, issuable.project
-            %br
-            = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+            %div
+              = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
     - if has_due_date
       .col-lg-6
         .form-group

From fac08c3bcd7316794bcbcfb5cec32ac05cb104fe Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 May 2016 09:20:35 +0100
Subject: [PATCH 0631/1431] Fixed up JS comments

---
 app/assets/javascripts/issuable.js.coffee        | 5 ++---
 app/assets/javascripts/lib/url_utility.js.coffee | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 4c4f67f5104..6cb5d86fb93 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -106,9 +106,8 @@ issuable_created = false
   checkChanged: ->
     checked_issues = $('.selected_issue:checked')
     if checked_issues.length > 0
-      ids = []
-      $.each checked_issues, (index, value) ->
-        ids.push $(value).data('id')
+      ids = $.map checked_issues, (value) ->
+        $(value).data('id')
 
       $('#update_issues_ids').val ids
       $('.issues-other-filters').hide()
diff --git a/app/assets/javascripts/lib/url_utility.js.coffee b/app/assets/javascripts/lib/url_utility.js.coffee
index 3d51744614f..e8085e1c2e4 100644
--- a/app/assets/javascripts/lib/url_utility.js.coffee
+++ b/app/assets/javascripts/lib/url_utility.js.coffee
@@ -26,9 +26,9 @@
     newUrl = decodeURIComponent(url)
     for paramName, paramValue of params
       pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
-      if !paramValue?
+      if not paramValue?
         newUrl = newUrl.replace pattern, ''
-      else if url.search(pattern) >= 0
+      else if url.search(pattern) isnt -1
         newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
       else
         newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"

From 7880a300dc9ef3fcceb7f1a6af6a6500b0b46e5c Mon Sep 17 00:00:00 2001
From: Jeroen Jacobs <git@jeroenj.be>
Date: Fri, 12 Feb 2016 21:41:31 +0100
Subject: [PATCH 0632/1431] Allows MR authors to have the source branch removed
 when merging the MR

---
 CHANGELOG                                       |  1 +
 .../projects/merge_requests_controller.rb       |  3 ++-
 app/models/merge_request.rb                     | 17 ++++++++++++++++-
 app/services/merge_requests/create_service.rb   |  7 +++++--
 app/services/merge_requests/merge_service.rb    |  8 ++++++--
 app/services/merge_requests/update_service.rb   |  2 ++
 .../widget/open/_accept.html.haml               |  5 ++++-
 .../open/_merge_when_build_succeeds.html.haml   |  5 ++---
 .../widget/open/_not_allowed.html.haml          |  4 +++-
 app/views/shared/issuable/_form.html.haml       |  7 +++++++
 spec/models/merge_request_spec.rb               |  7 ++++++-
 .../merge_requests/create_service_spec.rb       |  4 +++-
 .../merge_requests/merge_service_spec.rb        | 15 +++++++++++++++
 .../merge_requests/update_service_spec.rb       |  4 +++-
 14 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4c810ab21f2..ca33eeef8d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,7 @@ v 8.8.0 (unreleased)
   - All Grape API helpers are now instrumented
   - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
   - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
+  - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index c5757a24624..f137c12d215 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -334,7 +334,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     params.require(:merge_request).permit(
       :title, :assignee_id, :source_project_id, :source_branch,
       :target_project_id, :target_branch, :milestone_id,
-      :state_event, :description, :task_num, label_ids: []
+      :state_event, :description, :task_num, :force_remove_source_branch,
+      label_ids: []
     )
   end
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 45ddcf6812a..722c258244c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -286,6 +286,18 @@ class MergeRequest < ActiveRecord::Base
       last_commit == source_project.commit(source_branch)
   end
 
+  def should_remove_source_branch?
+    merge_params['should_remove_source_branch'].present?
+  end
+
+  def force_remove_source_branch?
+    merge_params['force_remove_source_branch'].present?
+  end
+
+  def remove_source_branch?
+    should_remove_source_branch? || force_remove_source_branch?
+  end
+
   def mr_and_commit_notes
     # Fetch comments only from last 100 commits
     commits_for_notes_limit = 100
@@ -426,7 +438,10 @@ class MergeRequest < ActiveRecord::Base
 
     self.merge_when_build_succeeds = false
     self.merge_user = nil
-    self.merge_params = nil
+    if merge_params
+      merge_params.delete('should_remove_source_branch')
+      merge_params.delete('commit_message')
+    end
 
     self.save
   end
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index 33609d01f20..96a25330af1 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -8,11 +8,14 @@ module MergeRequests
       @project = Project.find(params[:target_project_id]) if params[:target_project_id]
 
       filter_params
-      label_params = params[:label_ids]
-      merge_request = MergeRequest.new(params.except(:label_ids))
+      label_params = params.delete(:label_ids)
+      force_remove_source_branch = params.delete(:force_remove_source_branch)
+
+      merge_request = MergeRequest.new(params)
       merge_request.source_project = source_project
       merge_request.target_project ||= source_project
       merge_request.author = current_user
+      merge_request.merge_params['force_remove_source_branch'] = force_remove_source_branch
 
       if merge_request.save
         merge_request.update_attributes(label_ids: label_params)
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index 9a58383b398..9aaf5a5e561 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -45,10 +45,14 @@ module MergeRequests
     def after_merge
       MergeRequests::PostMergeService.new(project, current_user).execute(merge_request)
 
-      if params[:should_remove_source_branch].present?
-        DeleteBranchService.new(@merge_request.source_project, current_user).
+      if params[:should_remove_source_branch].present? || @merge_request.force_remove_source_branch?
+        DeleteBranchService.new(@merge_request.source_project, branch_deletion_user).
           execute(merge_request.source_branch)
       end
     end
+
+    def branch_deletion_user
+      @merge_request.force_remove_source_branch? ? @merge_request.author : current_user
+    end
   end
 end
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 477c64e7377..026a37997d4 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -11,6 +11,8 @@ module MergeRequests
       params.except!(:target_project_id)
       params.except!(:source_branch)
 
+      merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch)
+
       update(merge_request)
     end
 
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 807833741af..cfdf4edac37 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -25,7 +25,10 @@
         - else
           = f.button class: "btn btn-create btn-grouped js-merge-button accept_merge_request #{status_class}" do
             Accept Merge Request
-      - if @merge_request.can_remove_source_branch?(current_user)
+      - if @merge_request.force_remove_source_branch?
+        .accept-control
+          The source branch will be removed.
+      - elsif @merge_request.can_remove_source_branch?(current_user)
         .accept-control.checkbox
           = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
             = check_box_tag :should_remove_source_branch
diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
index 2168294c683..b83ddcab3a4 100644
--- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
@@ -2,17 +2,16 @@
   Set by #{link_to_member(@project, @merge_request.merge_user, avatar: true)}
   to be merged automatically when the build succeeds.
 %div
-  - should_remove_source_branch = @merge_request.merge_params["should_remove_source_branch"].present?
   %p
     = succeed '.' do
       The changes will be merged into
       %span.label-branch= @merge_request.target_branch
-    - if should_remove_source_branch
+    - if @merge_request.remove_source_branch?
       The source branch will be removed.
     - else
       The source branch will not be removed.
 
-  - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch && @merge_request.merge_user == current_user
+  - remove_source_branch_button = !@merge_request.remove_source_branch? && @merge_request.can_remove_source_branch?(current_user) && @merge_request.merge_user == current_user
   - user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
   - if remove_source_branch_button || user_can_cancel_automatic_merge
     .clearfix.prepend-top-10
diff --git a/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
index a8145558ca8..57ce1959021 100644
--- a/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
@@ -1,4 +1,6 @@
-%h4 
+%h4
   Ready to be merged automatically
 %p
   Ask someone with write access to this repository to merge this request.
+  - if @merge_request.force_remove_source_branch?
+    The source branch will be removed.
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 5c52cc6d1da..1181edec3f9 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -114,6 +114,13 @@
       - if @merge_request.new_record?
         &nbsp;
         = link_to 'Change branches', mr_change_branches_path(@merge_request)
+  - if @merge_request.can_remove_source_branch?(current_user)
+    .form-group
+      .col-sm-10.col-sm-offset-2
+        .checkbox
+          = label_tag 'merge_request[force_remove_source_branch]' do
+            = check_box_tag 'merge_request[force_remove_source_branch]', '1', @merge_request.force_remove_source_branch?
+            Remove source branch when merge request is accepted.
 
 - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
 .row-content-block{class: (is_footer ? "footer-block" : "middle-block")}
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 9eef08c6d00..e269ff26a04 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -260,13 +260,18 @@ describe MergeRequest, models: true do
   end
 
   describe "#reset_merge_when_build_succeeds" do
-    let(:merge_if_green) { create :merge_request, merge_when_build_succeeds: true, merge_user: create(:user) }
+    let(:merge_if_green) do
+      create :merge_request, merge_when_build_succeeds: true, merge_user: create(:user),
+                             merge_params: { "should_remove_source_branch" => "1", "commit_message" => "msg" }
+    end
 
     it "sets the item to false" do
       merge_if_green.reset_merge_when_build_succeeds
       merge_if_green.reload
 
       expect(merge_if_green.merge_when_build_succeeds).to be_falsey
+      expect(merge_if_green.merge_params["should_remove_source_branch"]).to be_nil
+      expect(merge_if_green.merge_params["commit_message"]).to be_nil
     end
   end
 
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index 120f4d6a669..e433f49872d 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -12,7 +12,8 @@ describe MergeRequests::CreateService, services: true do
           title: 'Awesome merge_request',
           description: 'please fix',
           source_branch: 'feature',
-          target_branch: 'master'
+          target_branch: 'master',
+          force_remove_source_branch: '1'
         }
       end
 
@@ -29,6 +30,7 @@ describe MergeRequests::CreateService, services: true do
       it { expect(@merge_request).to be_valid }
       it { expect(@merge_request.title).to eq('Awesome merge_request') }
       it { expect(@merge_request.assignee).to be_nil }
+      it { expect(@merge_request.merge_params['force_remove_source_branch']).to eq('1') }
 
       it 'should execute hooks with default action' do
         expect(service).to have_received(:execute_hooks).with(@merge_request)
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index ceb3f97280e..1b0396eb686 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -38,6 +38,21 @@ describe MergeRequests::MergeService, services: true do
       end
     end
 
+    context 'remove source branch by author' do
+      let(:service) do
+        merge_request.merge_params['force_remove_source_branch'] = '1'
+        merge_request.save!
+        MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message')
+      end
+
+      it 'removes the source branch' do
+        expect(DeleteBranchService).to receive(:new).
+          with(merge_request.source_project, merge_request.author).
+          and_call_original
+        service.execute(merge_request)
+      end
+    end
+
     context "error handling" do
       let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
 
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 213e8c2eb3a..cc7dc216a76 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -39,7 +39,8 @@ describe MergeRequests::UpdateService, services: true do
           assignee_id: user2.id,
           state_event: 'close',
           label_ids: [label.id],
-          target_branch: 'target'
+          target_branch: 'target',
+          force_remove_source_branch: '1'
         }
       end
 
@@ -61,6 +62,7 @@ describe MergeRequests::UpdateService, services: true do
       it { expect(@merge_request.labels.count).to eq(1) }
       it { expect(@merge_request.labels.first.title).to eq(label.name) }
       it { expect(@merge_request.target_branch).to eq('target') }
+      it { expect(@merge_request.merge_params['force_remove_source_branch']).to eq('1') }
 
       it 'should execute hooks with update action' do
         expect(service).to have_received(:execute_hooks).

From 341c1181d9bb2079c27a6da5b13f9299c7be0952 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 20 May 2016 14:55:27 +0200
Subject: [PATCH 0633/1431] refactor project to include some nicer EE stuff

---
 app/models/project.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 9a34198e098..37de1dfe4d5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base
     state :finished
     state :failed
 
-    after_transition any => :finished, do: :clear_import_data
+    after_transition any => :finished, do: :reset_cache_and_import_attrs
   end
 
   class << self
@@ -360,7 +360,7 @@ class Project < ActiveRecord::Base
     end
   end
 
-  def clear_import_data
+  def reset_cache_and_import_attrs
     update(import_error: nil)
 
     ProjectCacheWorker.perform_async(self.id)
@@ -426,12 +426,7 @@ class Project < ActiveRecord::Base
   end
 
   def safe_import_url
-    result = URI.parse(self.import_url)
-    result.password = '*****' unless result.password.nil?
-    result.user = '*****' unless result.user.nil? || result.user == "git" #tokens or other data may be saved as user
-    result.to_s
-  rescue
-    self.import_url
+    Gitlab::UrlSanitizer.new(import_url).masked_url
   end
 
   def check_limit

From 1a98dcacc527f684bc68eb6c7d7f94371e329fee Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Fri, 20 May 2016 17:24:06 +0000
Subject: [PATCH 0634/1431] Fix grammar in health_check.md

A access token -> An access token
---
 doc/monitoring/health_check.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/monitoring/health_check.md b/doc/monitoring/health_check.md
index 22c53a9aecd..5157cf686a7 100644
--- a/doc/monitoring/health_check.md
+++ b/doc/monitoring/health_check.md
@@ -9,7 +9,7 @@ and access the cache. This endpoint can be provided to uptime monitoring service
 
 ## Access Token
 
-A access token needs to be provided while accessing the health check endpoint. The current
+An access token needs to be provided while accessing the health check endpoint. The current
 accepted token can be found on the `admin/heath_check` page of your GitLab instance.
 
 ![access token](img/health_check_token.png)

From ad17741008b5ec874f92016ed48c2c1e6638dab5 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sat, 21 May 2016 00:37:48 +0700
Subject: [PATCH 0635/1431] Remove todos when destroy project member and specs

---
 app/models/members/project_member.rb       |  4 +-
 app/models/user.rb                         |  2 +-
 spec/models/members/project_member_spec.rb | 43 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 8dae3bb2ef2..0ced9c31581 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -3,9 +3,9 @@ class ProjectMember < Member
 
   include Gitlab::ShellAdapter
 
+  has_many :todos, through: :user
   belongs_to :project, class_name: 'Project', foreign_key: 'source_id'
 
-
   # Make sure project member points only to project as it source
   default_value_for :source_type, SOURCE_TYPE
   validates_format_of :source_type, with: /\AProject\z/
@@ -15,6 +15,8 @@ class ProjectMember < Member
   scope :in_projects, ->(projects) { where(source_id: projects.pluck(:id)) }
   scope :with_user, ->(user) { where(user_id: user.id) }
 
+  before_destroy { todos.each(&:destroy) }
+
   class << self
 
     # Add users to project teams with passed access option
diff --git a/app/models/user.rb b/app/models/user.rb
index 70a966491eb..6a09b78455b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,7 +77,7 @@ class User < ActiveRecord::Base
   has_one  :abuse_report,             dependent: :destroy
   has_many :spam_logs,                dependent: :destroy
   has_many :builds,                   dependent: :nullify, class_name: 'Ci::Build'
-  has_many :todos, -> { joins("join members on members.source_id = todos.project_id and members.user_id = todos.user_id") }, dependent: :destroy
+  has_many :todos,                    dependent: :destroy
   has_many :notification_settings,    dependent: :destroy
 
   #
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index 9f26d9eb5ce..2d2fa91e001 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
@@ -20,6 +20,49 @@
 require 'spec_helper'
 
 describe ProjectMember, models: true do
+  describe 'associations' do
+    it { is_expected.to have_many(:todos).through(:user) }
+    it { is_expected.to belong_to(:project).class_name('Project').with_foreign_key(:source_id) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to allow_value('Project').for(:source_type) }
+    it { is_expected.not_to allow_value('project').for(:source_type) }
+  end
+
+  describe 'modules' do
+    it { is_expected.to include_module(Gitlab::ShellAdapter) }
+  end
+
+  describe "#destroy" do
+    let(:owner)   { create(:project_member, access_level: ProjectMember::OWNER) }
+    let(:project) { owner.project }
+    let(:master)  { create(:project_member, project: project) }
+
+    let(:owner_todos)  { (0...2).map { create(:todo, user: owner.user, project: project) } }
+    let(:master_todos) { (0...3).map { create(:todo, user: master.user, project: project) } }
+
+    before do
+      owner_todos
+      master_todos
+    end
+
+    it "destroy itself and delete associated todos" do
+      expect(owner.todos.size).to eq(2)
+      expect(master.todos.size).to eq(3)
+      expect(Todo.count).to eq(5)
+
+      master_todo_ids = master_todos.map(&:id)
+      master.destroy
+
+      expect(owner.todos.size).to eq(2)
+      expect(Todo.count).to eq(2)
+      master_todo_ids.each do |id|
+        expect(Todo.exists?(id)).to eq(false)
+      end
+    end
+  end
+
   describe :import_team do
     before do
       @abilities = Six.new

From f04c5b27f0c19dfab00a6ac2de8b4168b67fe7a0 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 20 May 2016 13:52:42 -0400
Subject: [PATCH 0636/1431] current_user.confirmed_at.present? =>
 current_user.confirmed?

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

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 26eb15f49e4..75b78a49eab 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -38,7 +38,7 @@ class RegistrationsController < Devise::RegistrationsController
   end
 
   def after_sign_up_path_for(user)
-    user.confirmed_at.present? ? dashboard_projects_path : users_almost_there_path
+    user.confirmed? ? dashboard_projects_path : users_almost_there_path
   end
 
   def after_inactive_sign_up_path_for(_resource)

From 672bd4e6ff52da0acad0a5838324ba0039ed484c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 May 2016 21:52:45 +0100
Subject: [PATCH 0637/1431] Correctly sends project ID

---
 app/controllers/autocomplete_controller.rb | 2 +-
 app/views/shared/issuable/_form.html.haml  | 2 +-
 spec/features/issues/move_spec.rb          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 155c78bcd8a..61e92c1a805 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -40,7 +40,7 @@ class AutocompleteController < ApplicationController
     end
 
     no_project = OpenStruct.new(id: 0, name_with_namespace: 'No project')
-    projects.unshift(no_project.marshal_dump)
+    projects.unshift(no_project.to_h)
     projects.delete(project)
 
     render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index c014332d7f3..ff5224d7df8 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -90,7 +90,7 @@
     = label_tag :move_to_project_id, 'Move', class: 'control-label'
     .col-sm-10
       .issuable-form-select-holder
-        = hidden_field_tag :move_to_project_id, nil, class: 'js-move-dropdown', data: { placeholder: 'Select project', projects_url: autocomplete_projects_path(project_id: '1') }
+        = hidden_field_tag :move_to_project_id, nil, class: 'js-move-dropdown', data: { placeholder: 'Select project', projects_url: autocomplete_projects_path(project_id: @project.id) }
       &nbsp;
       %span{ data: { toggle: 'tooltip', placement: 'auto top' }, style: 'cursor: default',
       title: 'Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location.' }
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 307ecc6fcaf..c7019c5aea1 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -47,7 +47,7 @@ feature 'issue move to another project' do
       expect(page).to have_content(issue.title)
     end
 
-    context 'projects user does not have permission to move issue to exist', js: true do
+    context 'user does not have permission to move the issue to a project', js: true do
       let!(:private_project) { create(:project, :private) }
       let(:another_project) { create(:project) }
       background { another_project.team << [user, :guest] }

From e166a8022a3f239938a1449a0a8ce3485f309766 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Fri, 29 Apr 2016 16:25:03 +0200
Subject: [PATCH 0638/1431] Backend for a gitignores dropdown

---
 app/helpers/blob_helper.rb                |  4 ++
 app/models/repository.rb                  | 20 +++++--
 app/views/projects/blob/_editor.html.haml |  3 +
 app/views/projects/empty.html.haml        | 10 +++-
 lib/api/api.rb                            |  1 +
 lib/api/entities.rb                       |  8 +++
 lib/api/gitignores.rb                     | 29 ++++++++++
 lib/gitlab/gitignore.rb                   | 68 +++++++++++++++++++++++
 lib/tasks/gitlab/update_gitignore.rake    | 26 +++++++++
 spec/lib/gitlab/gitignore_spec.rb         | 38 +++++++++++++
 spec/requests/api/gitignores_spec.rb      | 29 ++++++++++
 11 files changed, 227 insertions(+), 9 deletions(-)
 create mode 100644 lib/api/gitignores.rb
 create mode 100644 lib/gitlab/gitignore.rb
 create mode 100644 lib/tasks/gitlab/update_gitignore.rake
 create mode 100644 spec/lib/gitlab/gitignore_spec.rb
 create mode 100644 spec/requests/api/gitignores_spec.rb

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 93241b3afb7..fb1b7649465 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -184,4 +184,8 @@ module BlobHelper
       Other: licenses.reject(&:featured).map { |license| [license.name, license.key] }
     }
   end
+
+  def gitignores_for_select
+    @gitignores_for_select ||= Gitlab::Gitignore.all
+  end
 end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 47a7223c723..f26278cc3af 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -472,9 +472,7 @@ class Repository
 
   def changelog
     cache.fetch(:changelog) do
-      tree(:head).blobs.find do |file|
-        file.name =~ /\A(changelog|history|changes|news)/i
-      end
+      file_on_head(/\A(changelog|history|changes|news)/i)
     end
   end
 
@@ -482,9 +480,7 @@ class Repository
     return nil unless head_exists?
 
     cache.fetch(:license_blob) do
-      tree(:head).blobs.find do |file|
-        file.name =~ /\A(licen[sc]e|copying)(\..+|\z)/i
-      end
+      file_on_head(/\A(licen[sc]e|copying)(\..+|\z)/i)
     end
   end
 
@@ -496,6 +492,14 @@ class Repository
     end
   end
 
+  def gitignore
+    return nil if !exists? || empty?
+
+    cache.fetch(:gitignore) do
+      file_on_head(/\A\.gitignore\z/)
+    end
+  end
+
   def gitlab_ci_yml
     return nil unless head_exists?
 
@@ -989,4 +993,8 @@ class Repository
   def head_exists?
     exists? && !empty? && !rugged.head_unborn?
   end
+
+  def file_on_head(regex)
+    tree(:head).blobs.find { |file| file.name =~ regex }
+  end
 end
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index fefa652a3da..eac5014b7c9 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -16,6 +16,9 @@
       .license-selector.js-license-selector.hide
         = select_tag :license_type, grouped_options_for_select(licenses_for_select, @project.repository.license_key), include_blank: true, class: 'select2 license-select', data: {placeholder: 'Choose a license template', project: @project.name, fullname: @project.namespace.human_name}
 
+      .gitignore-selector.js-gitignore-selector.hide
+        = select_tag :gitignore_template, options_for_select(Gitlab::Gitignore.all), include_blank: true, class: 'select2 gitignore-select', data: {placeholder: 'Choose a .gitignore template'}
+
       .encoding-selector
         = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'
 
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 1a2e59752fe..636beb73ec2 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -15,10 +15,14 @@
       If you already have files you can push them using command line instructions below.
     %p
       Otherwise you can start with adding a
-      = link_to "README", new_readme_path, class: 'underlined-link'
+      = succeed ',' do
+        = link_to "README", new_readme_path, class: 'underlined-link'
+      a
+      = succeed ',' do
+        = link_to "LICENSE", add_special_file_path(@project, file_name: 'LICENSE'), class: 'underlined-link'
       or a
-      = link_to "LICENSE", add_special_file_path(@project, file_name: 'LICENSE'), class: 'underlined-link'
-      file to this project.
+      = link_to '.gitignore', add_special_file_path(@project, file_name: '.gitignore'), class: 'underlined-link'
+      to this project.
 
 - if can?(current_user, :push_code, @project)
   %div{ class: container_class }
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 360fb41a721..6cd909f6115 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -58,5 +58,6 @@ module API
     mount ::API::Runners
     mount ::API::Licenses
     mount ::API::Subscriptions
+    mount ::API::Gitignores
   end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 8298e3ad34c..31491cf31dd 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -457,5 +457,13 @@ module API
       expose(:limitations) { |license| license.meta['limitations'] }
       expose :content
     end
+
+    class GitignoresList < Grape::Entity
+      expose :name
+    end
+
+    class Gitignore < Grape::Entity
+      expose :name, :content
+    end
   end
 end
diff --git a/lib/api/gitignores.rb b/lib/api/gitignores.rb
new file mode 100644
index 00000000000..1af9ba6b316
--- /dev/null
+++ b/lib/api/gitignores.rb
@@ -0,0 +1,29 @@
+module API
+  class Gitignores < Grape::API
+
+    # Get the list of the available gitignore templates
+    #
+    # Example Request:
+    #   GET /gitignores
+    get 'gitignores' do
+      present Gitlab::Gitignore.all, with: Entities::GitignoresList
+    end
+
+    # Get the text for a specific gitignore
+    #
+    # Parameters:
+    #   key (required) - The key of a license
+    #
+    # Example Request:
+    #   GET /gitignores/elixir
+    #
+    get 'gitignores/:key' do
+      required_attributes! [:key]
+
+      gitignore = Gitlab::Gitignore.find(params[:key])
+      not_found!('.gitignore') unless gitignore
+
+      present gitignore, with: Entities::Gitignore
+    end
+  end
+end
diff --git a/lib/gitlab/gitignore.rb b/lib/gitlab/gitignore.rb
new file mode 100644
index 00000000000..a2de2831e38
--- /dev/null
+++ b/lib/gitlab/gitignore.rb
@@ -0,0 +1,68 @@
+module Gitlab
+  class Gitignore
+    FILTER_REGEX = /\.gitignore\z/.freeze
+
+    attr_accessor :name, :directory
+
+    def initialize(name, directory)
+      @name       = name
+      @directory  = directory
+    end
+
+    def content
+      File.read(path)
+    end
+
+    class << self
+      def all
+        languages_frameworks + global
+      end
+
+      def find(key)
+        file_name = "#{key}.gitignore"
+
+        directory = select_directory(file_name)
+        directory ? new(key, directory) : nil
+      end
+
+      def global
+        files_for_folder(global_dir).map { |f| new(f, global_dir) }
+      end
+
+      def languages_frameworks
+        files_for_folder(gitignore_dir).map { |f| new(f, gitignore_dir) }
+      end
+    end
+
+    private
+
+    def path
+      File.expand_path("#{name}.gitignore", directory)
+    end
+
+    class << self
+      def select_directory(file_name)
+        [self.gitignore_dir, self.global_dir].find { |dir| File.exist?(File.expand_path(file_name, dir)) }
+      end
+
+      def global_dir
+        File.expand_path('Global', gitignore_dir)
+      end
+
+      def gitignore_dir
+        File.expand_path('vendor/gitignore', Rails.root)
+      end
+
+      def files_for_folder(dir)
+        gitignores = []
+        Dir.entries(dir).each do |e|
+          next unless e.end_with?('.gitignore')
+
+          gitignores << e.gsub(FILTER_REGEX, '')
+        end
+
+        gitignores
+      end
+    end
+  end
+end
diff --git a/lib/tasks/gitlab/update_gitignore.rake b/lib/tasks/gitlab/update_gitignore.rake
new file mode 100644
index 00000000000..61cbfd6737d
--- /dev/null
+++ b/lib/tasks/gitlab/update_gitignore.rake
@@ -0,0 +1,26 @@
+namespace :gitlab do
+  desc "GitLab | Update gitignore"
+  task :update_gitignore do
+    dir = File.expand_path('vendor', Rails.root)
+    FileUtils.cd(dir)
+
+    dir = File.expand_path('gitignore', dir)
+    clone_gitignores(dir)
+    remove_unneeded_files(dir)
+
+    puts "Done".green
+  end
+
+  def clone_gitignores(dir)
+    FileUtils.rm_rf(dir) if Dir.exist?(dir)
+    system('git clone --depth=1 --branch=master https://github.com/github/gitignore.git')
+  end
+
+  def remove_unneeded_files(dir)
+    [File.expand_path('Global', dir), dir].each do |path|
+      Dir.entries(path).reject { |e| e =~ /(\.{1,2}|Global|\.gitignore)\z/ }.each do |file|
+        FileUtils.rm_rf File.expand_path(file, path)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/gitignore_spec.rb b/spec/lib/gitlab/gitignore_spec.rb
new file mode 100644
index 00000000000..5dab821a8ec
--- /dev/null
+++ b/spec/lib/gitlab/gitignore_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Gitlab::Gitignore do
+  subject { Gitlab::Gitignore }
+  describe '.all' do
+    it 'strips the gitignore suffix' do
+      expect(subject.all.first.name).not_to end_with('.gitignore')
+    end
+
+    it 'combines the globals and rest' do
+      all = subject.all.map(&:name)
+
+      expect(all).to include('Vim')
+      expect(all).to include('Ruby')
+    end
+  end
+
+  describe '.find' do
+    it 'returns nil if the file does not exist' do
+      expect(subject.find('mepmep-yadida')).to be nil
+    end
+
+    it 'returns the Gitignore object of a valid file' do
+      ruby = subject.find('Ruby')
+
+      expect(ruby).to be_a Gitlab::Gitignore
+    end
+  end
+
+  describe '#content' do
+    it 'loads the full file' do
+      gitignore = subject.new('Ruby', File.expand_path('vendor/gitignore', Rails.root))
+
+      expect(gitignore.name).to eq 'Ruby'
+      expect(gitignore.content).to start_with('*.gem')
+    end
+  end
+end
diff --git a/spec/requests/api/gitignores_spec.rb b/spec/requests/api/gitignores_spec.rb
new file mode 100644
index 00000000000..d0e576e637c
--- /dev/null
+++ b/spec/requests/api/gitignores_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe API::Gitignores, api: true  do
+  include ApiHelpers
+
+  describe 'Entity Gitignore' do
+    before { get api('/gitignores/Ruby') }
+
+    it { expect(json_response['name']).to eq('Ruby') }
+    it { expect(json_response['content']).to include('*.gem') }
+  end
+
+  describe 'Entity GitignoresList' do
+    before { get api('/gitignores') }
+
+    it { expect(json_response.first['name']).to be_truthy }
+    it { expect(json_response.first['content']).to be_falsey }
+  end
+
+  describe 'GET /gitignores' do
+    it 'returns a list of available license templates' do
+      get api('/gitignores')
+
+      expect(response.status).to eq(200)
+      expect(json_response).to be_an Array
+      expect(json_response.size).to be > 15
+    end
+  end
+end

From fab9dbb3eba55151c34fc8bc171e3670e6c7c422 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Fri, 6 May 2016 17:13:16 +0200
Subject: [PATCH 0639/1431] First import of gitignores

Add .gitignore dropdown when creating a new .gitignore file

Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
---
 app/assets/javascripts/api.js.coffee          |   7 +
 .../blob/blob_gitignore_selector.js.coffee    |  62 ++
 .../javascripts/blob/edit_blob.js.coffee      |   1 +
 app/assets/stylesheets/pages/editor.scss      |  21 +-
 app/views/projects/blob/_editor.html.haml     |   6 +-
 vendor/gitignore/Actionscript.gitignore       |  19 +
 vendor/gitignore/Ada.gitignore                |   5 +
 vendor/gitignore/Agda.gitignore               |   1 +
 vendor/gitignore/Android.gitignore            |  39 ++
 vendor/gitignore/AppEngine.gitignore          |   2 +
 .../gitignore/AppceleratorTitanium.gitignore  |   3 +
 vendor/gitignore/ArchLinuxPackages.gitignore  |  13 +
 vendor/gitignore/Autotools.gitignore          |  18 +
 vendor/gitignore/C++.gitignore                |  28 +
 vendor/gitignore/C.gitignore                  |  33 ++
 vendor/gitignore/CFWheels.gitignore           |  12 +
 vendor/gitignore/CMake.gitignore              |   6 +
 vendor/gitignore/CUDA.gitignore               |   6 +
 vendor/gitignore/CakePHP.gitignore            |  25 +
 vendor/gitignore/ChefCookbook.gitignore       |   9 +
 vendor/gitignore/Clojure.gitignore            |   1 +
 vendor/gitignore/CodeIgniter.gitignore        |   6 +
 vendor/gitignore/CommonLisp.gitignore         |   3 +
 vendor/gitignore/Composer.gitignore           |   6 +
 vendor/gitignore/Concrete5.gitignore          |   4 +
 vendor/gitignore/Coq.gitignore                |   3 +
 vendor/gitignore/CraftCMS.gitignore           |   3 +
 vendor/gitignore/D.gitignore                  |  20 +
 vendor/gitignore/DM.gitignore                 |   5 +
 vendor/gitignore/Dart.gitignore               |  27 +
 vendor/gitignore/Delphi.gitignore             |  66 +++
 vendor/gitignore/Drupal.gitignore             |  36 ++
 vendor/gitignore/EPiServer.gitignore          |   4 +
 vendor/gitignore/Eagle.gitignore              |  44 ++
 vendor/gitignore/Elisp.gitignore              |   5 +
 vendor/gitignore/Elixir.gitignore             |   5 +
 vendor/gitignore/Elm.gitignore                |   4 +
 vendor/gitignore/Erlang.gitignore             |  10 +
 vendor/gitignore/ExpressionEngine.gitignore   |  19 +
 vendor/gitignore/ExtJs.gitignore              |   4 +
 vendor/gitignore/Fancy.gitignore              |   2 +
 vendor/gitignore/Finale.gitignore             |  13 +
 vendor/gitignore/ForceDotCom.gitignore        |   4 +
 vendor/gitignore/Fortran.gitignore            |   1 +
 vendor/gitignore/FuelPHP.gitignore            |  21 +
 vendor/gitignore/GWT.gitignore                |  28 +
 vendor/gitignore/Gcov.gitignore               |   5 +
 vendor/gitignore/GitBook.gitignore            |  16 +
 vendor/gitignore/Global/Anjuta.gitignore      |   3 +
 vendor/gitignore/Global/Archives.gitignore    |  27 +
 vendor/gitignore/Global/BricxCC.gitignore     |   4 +
 vendor/gitignore/Global/CVS.gitignore         |   4 +
 vendor/gitignore/Global/Calabash.gitignore    |  10 +
 vendor/gitignore/Global/Cloud9.gitignore      |   3 +
 vendor/gitignore/Global/CodeKit.gitignore     |   3 +
 vendor/gitignore/Global/DartEditor.gitignore  |   2 +
 vendor/gitignore/Global/Dreamweaver.gitignore |   7 +
 vendor/gitignore/Global/Dropbox.gitignore     |   4 +
 vendor/gitignore/Global/Eclipse.gitignore     |  51 ++
 .../gitignore/Global/EiffelStudio.gitignore   |   2 +
 vendor/gitignore/Global/Emacs.gitignore       |  42 ++
 vendor/gitignore/Global/Ensime.gitignore      |   4 +
 vendor/gitignore/Global/Espresso.gitignore    |   1 +
 vendor/gitignore/Global/FlexBuilder.gitignore |   3 +
 vendor/gitignore/Global/GPG.gitignore         |   2 +
 .../Global/IPythonNotebook.gitignore          |   2 +
 vendor/gitignore/Global/JDeveloper.gitignore  |  13 +
 vendor/gitignore/Global/JetBrains.gitignore   |  44 ++
 vendor/gitignore/Global/KDevelop4.gitignore   |   2 +
 vendor/gitignore/Global/Kate.gitignore        |   3 +
 vendor/gitignore/Global/Lazarus.gitignore     |  30 +
 vendor/gitignore/Global/LibreOffice.gitignore |   2 +
 vendor/gitignore/Global/Linux.gitignore       |  10 +
 vendor/gitignore/Global/LyX.gitignore         |   4 +
 vendor/gitignore/Global/Matlab.gitignore      |  19 +
 vendor/gitignore/Global/Mercurial.gitignore   |   6 +
 .../Global/MicrosoftOffice.gitignore          |  16 +
 vendor/gitignore/Global/ModelSim.gitignore    |  23 +
 vendor/gitignore/Global/Momentics.gitignore   |   8 +
 vendor/gitignore/Global/MonoDevelop.gitignore |   8 +
 vendor/gitignore/Global/NetBeans.gitignore    |   7 +
 vendor/gitignore/Global/Ninja.gitignore       |   2 +
 vendor/gitignore/Global/NotepadPP.gitignore   |   2 +
 vendor/gitignore/Global/OSX.gitignore         |  24 +
 vendor/gitignore/Global/Otto.gitignore        |   1 +
 vendor/gitignore/Global/Redcar.gitignore      |   1 +
 vendor/gitignore/Global/Redis.gitignore       |   3 +
 vendor/gitignore/Global/SBT.gitignore         |   9 +
 vendor/gitignore/Global/SVN.gitignore         |   1 +
 vendor/gitignore/Global/SlickEdit.gitignore   |  11 +
 vendor/gitignore/Global/SublimeText.gitignore |  14 +
 vendor/gitignore/Global/SynopsysVCS.gitignore |  36 ++
 vendor/gitignore/Global/Tags.gitignore        |  16 +
 vendor/gitignore/Global/TextMate.gitignore    |   3 +
 vendor/gitignore/Global/TortoiseGit.gitignore |   2 +
 vendor/gitignore/Global/Vagrant.gitignore     |   1 +
 vendor/gitignore/Global/Vim.gitignore         |  10 +
 vendor/gitignore/Global/VirtualEnv.gitignore  |  12 +
 .../Global/VisualStudioCode.gitignore         |   2 +
 vendor/gitignore/Global/WebMethods.gitignore  |  14 +
 vendor/gitignore/Global/Windows.gitignore     |  18 +
 vendor/gitignore/Global/Xcode.gitignore       |  23 +
 vendor/gitignore/Global/XilinxISE.gitignore   |  67 +++
 vendor/gitignore/Go.gitignore                 |  24 +
 vendor/gitignore/Gradle.gitignore             |  14 +
 vendor/gitignore/Grails.gitignore             |  33 ++
 vendor/gitignore/Haskell.gitignore            |  18 +
 vendor/gitignore/IGORPro.gitignore            |   5 +
 vendor/gitignore/Idris.gitignore              |   2 +
 vendor/gitignore/Java.gitignore               |  12 +
 vendor/gitignore/Jboss.gitignore              |  19 +
 vendor/gitignore/Jekyll.gitignore             |   3 +
 vendor/gitignore/Joomla.gitignore             | 546 ++++++++++++++++++
 vendor/gitignore/KiCad.gitignore              |  20 +
 vendor/gitignore/Kohana.gitignore             |   2 +
 vendor/gitignore/LabVIEW.gitignore            |  16 +
 vendor/gitignore/Laravel.gitignore            |  16 +
 vendor/gitignore/Leiningen.gitignore          |  12 +
 vendor/gitignore/LemonStand.gitignore         |  21 +
 vendor/gitignore/Lilypond.gitignore           |   6 +
 vendor/gitignore/Lithium.gitignore            |   2 +
 vendor/gitignore/Lua.gitignore                |  41 ++
 vendor/gitignore/Magento.gitignore            | 104 ++++
 vendor/gitignore/Maven.gitignore              |   9 +
 vendor/gitignore/Mercury.gitignore            |  13 +
 .../gitignore/MetaProgrammingSystem.gitignore |  16 +
 vendor/gitignore/Nanoc.gitignore              |  10 +
 vendor/gitignore/Nim.gitignore                |   1 +
 vendor/gitignore/Node.gitignore               |  37 ++
 vendor/gitignore/OCaml.gitignore              |  20 +
 vendor/gitignore/Objective-C.gitignore        |  51 ++
 vendor/gitignore/Opa.gitignore                |  13 +
 vendor/gitignore/OpenCart.gitignore           |  13 +
 vendor/gitignore/OracleForms.gitignore        |   8 +
 vendor/gitignore/Packer.gitignore             |   5 +
 vendor/gitignore/Perl.gitignore               |  20 +
 vendor/gitignore/Phalcon.gitignore            |   2 +
 vendor/gitignore/PlayFramework.gitignore      |  15 +
 vendor/gitignore/Plone.gitignore              |  18 +
 vendor/gitignore/Prestashop.gitignore         |  32 +
 vendor/gitignore/Processing.gitignore         |   7 +
 vendor/gitignore/Python.gitignore             |  89 +++
 vendor/gitignore/Qooxdoo.gitignore            |   5 +
 vendor/gitignore/Qt.gitignore                 |  38 ++
 vendor/gitignore/R.gitignore                  |  33 ++
 vendor/gitignore/ROS.gitignore                |  47 ++
 vendor/gitignore/Rails.gitignore              |  38 ++
 vendor/gitignore/RhodesRhomobile.gitignore    |   9 +
 vendor/gitignore/Ruby.gitignore               |  50 ++
 vendor/gitignore/Rust.gitignore               |   7 +
 vendor/gitignore/SCons.gitignore              |   2 +
 vendor/gitignore/Sass.gitignore               |   2 +
 vendor/gitignore/Scala.gitignore              |  17 +
 vendor/gitignore/Scheme.gitignore             |   7 +
 vendor/gitignore/Scrivener.gitignore          |   7 +
 vendor/gitignore/Sdcc.gitignore               |   8 +
 vendor/gitignore/SeamGen.gitignore            |  26 +
 vendor/gitignore/SketchUp.gitignore           |   1 +
 vendor/gitignore/Smalltalk.gitignore          |  18 +
 vendor/gitignore/Stella.gitignore             |  12 +
 vendor/gitignore/SugarCRM.gitignore           |  25 +
 vendor/gitignore/Swift.gitignore              |  63 ++
 vendor/gitignore/Symfony.gitignore            |  48 ++
 vendor/gitignore/SymphonyCMS.gitignore        |   6 +
 vendor/gitignore/TeX.gitignore                | 180 ++++++
 vendor/gitignore/Terraform.gitignore          |   3 +
 vendor/gitignore/Textpattern.gitignore        |  11 +
 vendor/gitignore/TurboGears2.gitignore        |  20 +
 vendor/gitignore/Typo3.gitignore              |  20 +
 vendor/gitignore/Umbraco.gitignore            |  19 +
 vendor/gitignore/Unity.gitignore              |  30 +
 vendor/gitignore/UnrealEngine.gitignore       |  62 ++
 vendor/gitignore/VVVV.gitignore               |   6 +
 vendor/gitignore/VisualStudio.gitignore       | 252 ++++++++
 vendor/gitignore/Waf.gitignore                |   4 +
 vendor/gitignore/WordPress.gitignore          |  18 +
 vendor/gitignore/Xojo.gitignore               |  11 +
 vendor/gitignore/Yeoman.gitignore             |   6 +
 vendor/gitignore/Yii.gitignore                |   6 +
 vendor/gitignore/ZendFramework.gitignore      |  25 +
 vendor/gitignore/Zephir.gitignore             |  26 +
 181 files changed, 3780 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
 create mode 100644 vendor/gitignore/Actionscript.gitignore
 create mode 100644 vendor/gitignore/Ada.gitignore
 create mode 100644 vendor/gitignore/Agda.gitignore
 create mode 100644 vendor/gitignore/Android.gitignore
 create mode 100644 vendor/gitignore/AppEngine.gitignore
 create mode 100644 vendor/gitignore/AppceleratorTitanium.gitignore
 create mode 100644 vendor/gitignore/ArchLinuxPackages.gitignore
 create mode 100644 vendor/gitignore/Autotools.gitignore
 create mode 100644 vendor/gitignore/C++.gitignore
 create mode 100644 vendor/gitignore/C.gitignore
 create mode 100644 vendor/gitignore/CFWheels.gitignore
 create mode 100644 vendor/gitignore/CMake.gitignore
 create mode 100644 vendor/gitignore/CUDA.gitignore
 create mode 100644 vendor/gitignore/CakePHP.gitignore
 create mode 100644 vendor/gitignore/ChefCookbook.gitignore
 create mode 120000 vendor/gitignore/Clojure.gitignore
 create mode 100644 vendor/gitignore/CodeIgniter.gitignore
 create mode 100644 vendor/gitignore/CommonLisp.gitignore
 create mode 100644 vendor/gitignore/Composer.gitignore
 create mode 100644 vendor/gitignore/Concrete5.gitignore
 create mode 100644 vendor/gitignore/Coq.gitignore
 create mode 100644 vendor/gitignore/CraftCMS.gitignore
 create mode 100644 vendor/gitignore/D.gitignore
 create mode 100644 vendor/gitignore/DM.gitignore
 create mode 100644 vendor/gitignore/Dart.gitignore
 create mode 100644 vendor/gitignore/Delphi.gitignore
 create mode 100644 vendor/gitignore/Drupal.gitignore
 create mode 100644 vendor/gitignore/EPiServer.gitignore
 create mode 100644 vendor/gitignore/Eagle.gitignore
 create mode 100644 vendor/gitignore/Elisp.gitignore
 create mode 100644 vendor/gitignore/Elixir.gitignore
 create mode 100644 vendor/gitignore/Elm.gitignore
 create mode 100644 vendor/gitignore/Erlang.gitignore
 create mode 100644 vendor/gitignore/ExpressionEngine.gitignore
 create mode 100644 vendor/gitignore/ExtJs.gitignore
 create mode 100644 vendor/gitignore/Fancy.gitignore
 create mode 100644 vendor/gitignore/Finale.gitignore
 create mode 100644 vendor/gitignore/ForceDotCom.gitignore
 create mode 120000 vendor/gitignore/Fortran.gitignore
 create mode 100644 vendor/gitignore/FuelPHP.gitignore
 create mode 100644 vendor/gitignore/GWT.gitignore
 create mode 100644 vendor/gitignore/Gcov.gitignore
 create mode 100644 vendor/gitignore/GitBook.gitignore
 create mode 100644 vendor/gitignore/Global/Anjuta.gitignore
 create mode 100644 vendor/gitignore/Global/Archives.gitignore
 create mode 100644 vendor/gitignore/Global/BricxCC.gitignore
 create mode 100644 vendor/gitignore/Global/CVS.gitignore
 create mode 100644 vendor/gitignore/Global/Calabash.gitignore
 create mode 100644 vendor/gitignore/Global/Cloud9.gitignore
 create mode 100644 vendor/gitignore/Global/CodeKit.gitignore
 create mode 100644 vendor/gitignore/Global/DartEditor.gitignore
 create mode 100644 vendor/gitignore/Global/Dreamweaver.gitignore
 create mode 100644 vendor/gitignore/Global/Dropbox.gitignore
 create mode 100644 vendor/gitignore/Global/Eclipse.gitignore
 create mode 100644 vendor/gitignore/Global/EiffelStudio.gitignore
 create mode 100644 vendor/gitignore/Global/Emacs.gitignore
 create mode 100644 vendor/gitignore/Global/Ensime.gitignore
 create mode 100644 vendor/gitignore/Global/Espresso.gitignore
 create mode 100644 vendor/gitignore/Global/FlexBuilder.gitignore
 create mode 100644 vendor/gitignore/Global/GPG.gitignore
 create mode 100644 vendor/gitignore/Global/IPythonNotebook.gitignore
 create mode 100644 vendor/gitignore/Global/JDeveloper.gitignore
 create mode 100644 vendor/gitignore/Global/JetBrains.gitignore
 create mode 100644 vendor/gitignore/Global/KDevelop4.gitignore
 create mode 100644 vendor/gitignore/Global/Kate.gitignore
 create mode 100644 vendor/gitignore/Global/Lazarus.gitignore
 create mode 100644 vendor/gitignore/Global/LibreOffice.gitignore
 create mode 100644 vendor/gitignore/Global/Linux.gitignore
 create mode 100644 vendor/gitignore/Global/LyX.gitignore
 create mode 100644 vendor/gitignore/Global/Matlab.gitignore
 create mode 100644 vendor/gitignore/Global/Mercurial.gitignore
 create mode 100644 vendor/gitignore/Global/MicrosoftOffice.gitignore
 create mode 100644 vendor/gitignore/Global/ModelSim.gitignore
 create mode 100644 vendor/gitignore/Global/Momentics.gitignore
 create mode 100644 vendor/gitignore/Global/MonoDevelop.gitignore
 create mode 100644 vendor/gitignore/Global/NetBeans.gitignore
 create mode 100644 vendor/gitignore/Global/Ninja.gitignore
 create mode 100644 vendor/gitignore/Global/NotepadPP.gitignore
 create mode 100644 vendor/gitignore/Global/OSX.gitignore
 create mode 100644 vendor/gitignore/Global/Otto.gitignore
 create mode 100644 vendor/gitignore/Global/Redcar.gitignore
 create mode 100644 vendor/gitignore/Global/Redis.gitignore
 create mode 100644 vendor/gitignore/Global/SBT.gitignore
 create mode 100644 vendor/gitignore/Global/SVN.gitignore
 create mode 100644 vendor/gitignore/Global/SlickEdit.gitignore
 create mode 100644 vendor/gitignore/Global/SublimeText.gitignore
 create mode 100644 vendor/gitignore/Global/SynopsysVCS.gitignore
 create mode 100644 vendor/gitignore/Global/Tags.gitignore
 create mode 100644 vendor/gitignore/Global/TextMate.gitignore
 create mode 100644 vendor/gitignore/Global/TortoiseGit.gitignore
 create mode 100644 vendor/gitignore/Global/Vagrant.gitignore
 create mode 100644 vendor/gitignore/Global/Vim.gitignore
 create mode 100644 vendor/gitignore/Global/VirtualEnv.gitignore
 create mode 100644 vendor/gitignore/Global/VisualStudioCode.gitignore
 create mode 100644 vendor/gitignore/Global/WebMethods.gitignore
 create mode 100644 vendor/gitignore/Global/Windows.gitignore
 create mode 100644 vendor/gitignore/Global/Xcode.gitignore
 create mode 100644 vendor/gitignore/Global/XilinxISE.gitignore
 create mode 100644 vendor/gitignore/Go.gitignore
 create mode 100644 vendor/gitignore/Gradle.gitignore
 create mode 100644 vendor/gitignore/Grails.gitignore
 create mode 100644 vendor/gitignore/Haskell.gitignore
 create mode 100644 vendor/gitignore/IGORPro.gitignore
 create mode 100644 vendor/gitignore/Idris.gitignore
 create mode 100644 vendor/gitignore/Java.gitignore
 create mode 100644 vendor/gitignore/Jboss.gitignore
 create mode 100644 vendor/gitignore/Jekyll.gitignore
 create mode 100644 vendor/gitignore/Joomla.gitignore
 create mode 100644 vendor/gitignore/KiCad.gitignore
 create mode 100644 vendor/gitignore/Kohana.gitignore
 create mode 100644 vendor/gitignore/LabVIEW.gitignore
 create mode 100644 vendor/gitignore/Laravel.gitignore
 create mode 100644 vendor/gitignore/Leiningen.gitignore
 create mode 100644 vendor/gitignore/LemonStand.gitignore
 create mode 100644 vendor/gitignore/Lilypond.gitignore
 create mode 100644 vendor/gitignore/Lithium.gitignore
 create mode 100644 vendor/gitignore/Lua.gitignore
 create mode 100644 vendor/gitignore/Magento.gitignore
 create mode 100644 vendor/gitignore/Maven.gitignore
 create mode 100644 vendor/gitignore/Mercury.gitignore
 create mode 100644 vendor/gitignore/MetaProgrammingSystem.gitignore
 create mode 100644 vendor/gitignore/Nanoc.gitignore
 create mode 100644 vendor/gitignore/Nim.gitignore
 create mode 100644 vendor/gitignore/Node.gitignore
 create mode 100644 vendor/gitignore/OCaml.gitignore
 create mode 100644 vendor/gitignore/Objective-C.gitignore
 create mode 100644 vendor/gitignore/Opa.gitignore
 create mode 100644 vendor/gitignore/OpenCart.gitignore
 create mode 100644 vendor/gitignore/OracleForms.gitignore
 create mode 100644 vendor/gitignore/Packer.gitignore
 create mode 100644 vendor/gitignore/Perl.gitignore
 create mode 100644 vendor/gitignore/Phalcon.gitignore
 create mode 100644 vendor/gitignore/PlayFramework.gitignore
 create mode 100644 vendor/gitignore/Plone.gitignore
 create mode 100644 vendor/gitignore/Prestashop.gitignore
 create mode 100644 vendor/gitignore/Processing.gitignore
 create mode 100644 vendor/gitignore/Python.gitignore
 create mode 100644 vendor/gitignore/Qooxdoo.gitignore
 create mode 100644 vendor/gitignore/Qt.gitignore
 create mode 100644 vendor/gitignore/R.gitignore
 create mode 100644 vendor/gitignore/ROS.gitignore
 create mode 100644 vendor/gitignore/Rails.gitignore
 create mode 100644 vendor/gitignore/RhodesRhomobile.gitignore
 create mode 100644 vendor/gitignore/Ruby.gitignore
 create mode 100644 vendor/gitignore/Rust.gitignore
 create mode 100644 vendor/gitignore/SCons.gitignore
 create mode 100644 vendor/gitignore/Sass.gitignore
 create mode 100644 vendor/gitignore/Scala.gitignore
 create mode 100644 vendor/gitignore/Scheme.gitignore
 create mode 100644 vendor/gitignore/Scrivener.gitignore
 create mode 100644 vendor/gitignore/Sdcc.gitignore
 create mode 100644 vendor/gitignore/SeamGen.gitignore
 create mode 100644 vendor/gitignore/SketchUp.gitignore
 create mode 100644 vendor/gitignore/Smalltalk.gitignore
 create mode 100644 vendor/gitignore/Stella.gitignore
 create mode 100644 vendor/gitignore/SugarCRM.gitignore
 create mode 100644 vendor/gitignore/Swift.gitignore
 create mode 100644 vendor/gitignore/Symfony.gitignore
 create mode 100644 vendor/gitignore/SymphonyCMS.gitignore
 create mode 100644 vendor/gitignore/TeX.gitignore
 create mode 100644 vendor/gitignore/Terraform.gitignore
 create mode 100644 vendor/gitignore/Textpattern.gitignore
 create mode 100644 vendor/gitignore/TurboGears2.gitignore
 create mode 100644 vendor/gitignore/Typo3.gitignore
 create mode 100644 vendor/gitignore/Umbraco.gitignore
 create mode 100644 vendor/gitignore/Unity.gitignore
 create mode 100644 vendor/gitignore/UnrealEngine.gitignore
 create mode 100644 vendor/gitignore/VVVV.gitignore
 create mode 100644 vendor/gitignore/VisualStudio.gitignore
 create mode 100644 vendor/gitignore/Waf.gitignore
 create mode 100644 vendor/gitignore/WordPress.gitignore
 create mode 100644 vendor/gitignore/Xojo.gitignore
 create mode 100644 vendor/gitignore/Yeoman.gitignore
 create mode 100644 vendor/gitignore/Yii.gitignore
 create mode 100644 vendor/gitignore/ZendFramework.gitignore
 create mode 100644 vendor/gitignore/Zephir.gitignore

diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee
index dd1bbb37551..c654f8de208 100644
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
@@ -6,6 +6,7 @@
   projects_path: "/api/:version/projects.json"
   labels_path: "/api/:version/projects/:id/labels"
   license_path: "/api/:version/licenses/:key"
+  gitignoretext_path: "/api/:version/gitignores/:key"
 
   group: (group_id, callback) ->
     url = Api.buildUrl(Api.group_path)
@@ -103,6 +104,12 @@
     ).done (license) ->
       callback(license)
 
+  gitIgnoreText: (key, callback) ->
+    url = Api.buildUrl(Api.gitignoretext_path).replace(':key', key)
+
+    $.get url, (gitignore) ->
+      callback(gitignore)
+
   buildUrl: (url) ->
     url = gon.relative_url_root + url if gon.relative_url_root?
     return url.replace(':version', gon.api_version)
diff --git a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
new file mode 100644
index 00000000000..b413f31da00
--- /dev/null
+++ b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
@@ -0,0 +1,62 @@
+class @BlobGitIgnoreSelector
+  constructor: (opts) ->
+    {
+      @dropdown
+      @editor
+      @wrapper        = @dropdown.parents('.gitignore-selector')
+      @fileNameInput  = $('#file_name')
+      @data           = @dropdown.data('filenames')
+    } = opts
+
+    @dropdown.glDropdown(
+      data: @data,
+      filterable: true,
+      selectable: true,
+      search:
+        fields: ['text']
+      clicked: @onClick.bind(@)
+    )
+
+    @toggleGitIgnoreSelector()
+    @bindEvents()
+
+  bindEvents: ->
+    @fileNameInput
+      .on 'keyup blur', (e) =>
+        @toggleGitIgnoreSelector()
+
+  toggleGitIgnoreSelector: ->
+    filename = @fileNameInput.val() or $('.editor-file-name').text().trim()
+    @wrapper.toggleClass 'hidden', filename isnt '.gitignore'
+
+  onClick: (item) ->
+    @requestIgnoreFile(item.text)
+
+  requestIgnoreFile: (name) ->
+    Api.gitIgnoreText name, @requestIgnoreFileSuccess.bind(@)
+
+  requestIgnoreFileSuccess: (gitignore) ->
+    @editor.setValue(gitignore.content, -1)
+
+    # Move cursor position to end of file
+    row = @editor.session.getLength() - 1
+    column = @editor.session.getLine(row).length
+    @editor.gotoLine(row + 1, column)
+    @editor.focus()
+
+class @BlobGitIgnoreSelectors
+  constructor: (opts) ->
+    _this = @
+
+    {
+      @dropdowns = $('.js-gitignore-selector')
+      @editor
+    } = opts
+
+    @dropdowns.each ->
+      $dropdown = $(@)
+
+      new BlobGitIgnoreSelector(
+        dropdown: $dropdown,
+        editor: _this.editor
+      )
diff --git a/app/assets/javascripts/blob/edit_blob.js.coffee b/app/assets/javascripts/blob/edit_blob.js.coffee
index eea9aa972ee..f2efeb3960a 100644
--- a/app/assets/javascripts/blob/edit_blob.js.coffee
+++ b/app/assets/javascripts/blob/edit_blob.js.coffee
@@ -13,6 +13,7 @@ class @EditBlob
 
     @initModePanesAndLinks()
     new BlobLicenseSelector(@editor)
+    new BlobGitIgnoreSelectors(editor: @editor)
 
   initModePanesAndLinks: ->
     @$editModePanes = $(".js-edit-mode-pane")
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 8981f070a20..3030da4e6b2 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -23,7 +23,7 @@
   .file-title {
     @extend .monospace;
 
-    line-height: 42px;
+    line-height: 35px;
     padding-top: 7px;
     padding-bottom: 7px;
 
@@ -43,7 +43,7 @@
 
   .editor-file-name {
     @extend .monospace;
-    
+
     float: left;
     margin-right: 10px;
   }
@@ -59,7 +59,22 @@
   }
 
   .encoding-selector,
-  .license-selector {
+  .license-selector,
+  .gitignore-selector {
     display: inline-block;
+    vertical-align: top;
+    font-family: $regular_font;
+  }
+
+  .gitignore-selector {
+
+    .dropdown {
+      line-height: 21px;
+    }
+
+    .dropdown-menu-toggle{
+      vertical-align: top;
+      width: 220px;
+    }
   }
 }
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index eac5014b7c9..5efec92cf6b 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -16,8 +16,10 @@
       .license-selector.js-license-selector.hide
         = select_tag :license_type, grouped_options_for_select(licenses_for_select, @project.repository.license_key), include_blank: true, class: 'select2 license-select', data: {placeholder: 'Choose a license template', project: @project.name, fullname: @project.namespace.human_name}
 
-      .gitignore-selector.js-gitignore-selector.hide
-        = select_tag :gitignore_template, options_for_select(Gitlab::Gitignore.all), include_blank: true, class: 'select2 gitignore-select', data: {placeholder: 'Choose a .gitignore template'}
+      .gitignore-selector.hidden
+        = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter projects", data: { filenames: Gitlab::Gitignore.all.map.with_index{ |v| {text: v.name} } } } )
+
+        -# = select_tag :gitignore_template, options_for_select(Gitlab::Gitignore.all.map(&:name)), include_blank: true, class: 'select2 gitignore-select', data: {placeholder: 'Choose a .gitignore template'}
 
       .encoding-selector
         = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'
diff --git a/vendor/gitignore/Actionscript.gitignore b/vendor/gitignore/Actionscript.gitignore
new file mode 100644
index 00000000000..11e612e9853
--- /dev/null
+++ b/vendor/gitignore/Actionscript.gitignore
@@ -0,0 +1,19 @@
+# Build and Release Folders
+bin/
+bin-debug/
+bin-release/
+[Oo]bj/ # FlashDevelop obj
+[Bb]in/ # FlashDevelop bin
+
+# Other files and folders
+.settings/
+
+# Executables
+*.swf
+*.air
+*.ipa
+*.apk
+
+# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
+# should NOT be excluded as they contain compiler settings and other important
+# information for Eclipse / Flash Builder.
diff --git a/vendor/gitignore/Ada.gitignore b/vendor/gitignore/Ada.gitignore
new file mode 100644
index 00000000000..b4d703968a4
--- /dev/null
+++ b/vendor/gitignore/Ada.gitignore
@@ -0,0 +1,5 @@
+# Object file
+*.o
+
+# Ada Library Information
+*.ali
diff --git a/vendor/gitignore/Agda.gitignore b/vendor/gitignore/Agda.gitignore
new file mode 100644
index 00000000000..171a38976c1
--- /dev/null
+++ b/vendor/gitignore/Agda.gitignore
@@ -0,0 +1 @@
+*.agdai
diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore
new file mode 100644
index 00000000000..a8368751267
--- /dev/null
+++ b/vendor/gitignore/Android.gitignore
@@ -0,0 +1,39 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+
+# Keystore files
+*.jks
diff --git a/vendor/gitignore/AppEngine.gitignore b/vendor/gitignore/AppEngine.gitignore
new file mode 100644
index 00000000000..62273454531
--- /dev/null
+++ b/vendor/gitignore/AppEngine.gitignore
@@ -0,0 +1,2 @@
+# Google App Engine generated folder
+appengine-generated/
diff --git a/vendor/gitignore/AppceleratorTitanium.gitignore b/vendor/gitignore/AppceleratorTitanium.gitignore
new file mode 100644
index 00000000000..3abea559761
--- /dev/null
+++ b/vendor/gitignore/AppceleratorTitanium.gitignore
@@ -0,0 +1,3 @@
+# Build folder and log file
+build/
+build.log
diff --git a/vendor/gitignore/ArchLinuxPackages.gitignore b/vendor/gitignore/ArchLinuxPackages.gitignore
new file mode 100644
index 00000000000..b73905529f2
--- /dev/null
+++ b/vendor/gitignore/ArchLinuxPackages.gitignore
@@ -0,0 +1,13 @@
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+pkg/
+src/
diff --git a/vendor/gitignore/Autotools.gitignore b/vendor/gitignore/Autotools.gitignore
new file mode 100644
index 00000000000..1e9158e2a85
--- /dev/null
+++ b/vendor/gitignore/Autotools.gitignore
@@ -0,0 +1,18 @@
+# http://www.gnu.org/software/automake
+
+Makefile.in
+
+# http://www.gnu.org/software/autoconf
+
+/autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.h.in
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h1
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
new file mode 100644
index 00000000000..b8bd0267bdf
--- /dev/null
+++ b/vendor/gitignore/C++.gitignore
@@ -0,0 +1,28 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
diff --git a/vendor/gitignore/C.gitignore b/vendor/gitignore/C.gitignore
new file mode 100644
index 00000000000..f805e810e5c
--- /dev/null
+++ b/vendor/gitignore/C.gitignore
@@ -0,0 +1,33 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
diff --git a/vendor/gitignore/CFWheels.gitignore b/vendor/gitignore/CFWheels.gitignore
new file mode 100644
index 00000000000..f2fec34ff89
--- /dev/null
+++ b/vendor/gitignore/CFWheels.gitignore
@@ -0,0 +1,12 @@
+# unpacked plugin folders
+plugins/**/*
+
+# files directory where uploads go
+files
+
+# DBMigrate plugin: generated SQL
+db/sql
+
+# AssetBundler plugin: generated bundles
+javascripts/bundles
+stylesheets/bundles
diff --git a/vendor/gitignore/CMake.gitignore b/vendor/gitignore/CMake.gitignore
new file mode 100644
index 00000000000..b558e9afa6d
--- /dev/null
+++ b/vendor/gitignore/CMake.gitignore
@@ -0,0 +1,6 @@
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Makefile
+cmake_install.cmake
+install_manifest.txt
diff --git a/vendor/gitignore/CUDA.gitignore b/vendor/gitignore/CUDA.gitignore
new file mode 100644
index 00000000000..cb385db83fe
--- /dev/null
+++ b/vendor/gitignore/CUDA.gitignore
@@ -0,0 +1,6 @@
+*.i
+*.ii
+*.gpu
+*.ptx
+*.cubin
+*.fatbin
diff --git a/vendor/gitignore/CakePHP.gitignore b/vendor/gitignore/CakePHP.gitignore
new file mode 100644
index 00000000000..c6597e4eabf
--- /dev/null
+++ b/vendor/gitignore/CakePHP.gitignore
@@ -0,0 +1,25 @@
+# CakePHP 3
+
+/vendor/*
+/config/app.php
+
+/tmp/cache/models/*
+!/tmp/cache/models/empty
+/tmp/cache/persistent/*
+!/tmp/cache/persistent/empty
+/tmp/cache/views/*
+!/tmp/cache/views/empty
+/tmp/sessions/*
+!/tmp/sessions/empty
+/tmp/tests/*
+!/tmp/tests/empty
+
+/logs/*
+!/logs/empty
+
+# CakePHP 2
+
+/app/tmp/*
+/app/Config/core.php
+/app/Config/database.php
+/vendors/*
diff --git a/vendor/gitignore/ChefCookbook.gitignore b/vendor/gitignore/ChefCookbook.gitignore
new file mode 100644
index 00000000000..5ee7b7a9a18
--- /dev/null
+++ b/vendor/gitignore/ChefCookbook.gitignore
@@ -0,0 +1,9 @@
+.vagrant
+/cookbooks
+
+# Bundler
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml
diff --git a/vendor/gitignore/Clojure.gitignore b/vendor/gitignore/Clojure.gitignore
new file mode 120000
index 00000000000..7657a270c45
--- /dev/null
+++ b/vendor/gitignore/Clojure.gitignore
@@ -0,0 +1 @@
+Leiningen.gitignore
\ No newline at end of file
diff --git a/vendor/gitignore/CodeIgniter.gitignore b/vendor/gitignore/CodeIgniter.gitignore
new file mode 100644
index 00000000000..0f77d9e1d17
--- /dev/null
+++ b/vendor/gitignore/CodeIgniter.gitignore
@@ -0,0 +1,6 @@
+*/config/development
+*/logs/log-*.php
+!*/logs/index.html
+*/cache/*
+!*/cache/index.html
+!*/cache/.htaccess
diff --git a/vendor/gitignore/CommonLisp.gitignore b/vendor/gitignore/CommonLisp.gitignore
new file mode 100644
index 00000000000..4806e580b60
--- /dev/null
+++ b/vendor/gitignore/CommonLisp.gitignore
@@ -0,0 +1,3 @@
+*.FASL
+*.fasl
+*.lisp-temp
diff --git a/vendor/gitignore/Composer.gitignore b/vendor/gitignore/Composer.gitignore
new file mode 100644
index 00000000000..c4222678424
--- /dev/null
+++ b/vendor/gitignore/Composer.gitignore
@@ -0,0 +1,6 @@
+composer.phar
+/vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
diff --git a/vendor/gitignore/Concrete5.gitignore b/vendor/gitignore/Concrete5.gitignore
new file mode 100644
index 00000000000..1fe53611e5d
--- /dev/null
+++ b/vendor/gitignore/Concrete5.gitignore
@@ -0,0 +1,4 @@
+config/site.php
+files/cache/*
+files/tmp/*
+.htaccess
diff --git a/vendor/gitignore/Coq.gitignore b/vendor/gitignore/Coq.gitignore
new file mode 100644
index 00000000000..d3083b3a605
--- /dev/null
+++ b/vendor/gitignore/Coq.gitignore
@@ -0,0 +1,3 @@
+*.vo
+*.glob
+*.v.d
diff --git a/vendor/gitignore/CraftCMS.gitignore b/vendor/gitignore/CraftCMS.gitignore
new file mode 100644
index 00000000000..a70d4772c46
--- /dev/null
+++ b/vendor/gitignore/CraftCMS.gitignore
@@ -0,0 +1,3 @@
+# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore]
+/craft/storage/*
+!/craft/storage/logo/*
\ No newline at end of file
diff --git a/vendor/gitignore/D.gitignore b/vendor/gitignore/D.gitignore
new file mode 100644
index 00000000000..b4433f8a512
--- /dev/null
+++ b/vendor/gitignore/D.gitignore
@@ -0,0 +1,20 @@
+# Compiled Object files
+*.o
+*.obj
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.a
+*.lib
+
+# Executables
+*.exe
+
+# DUB
+.dub
+docs.json
+__dummy.html
diff --git a/vendor/gitignore/DM.gitignore b/vendor/gitignore/DM.gitignore
new file mode 100644
index 00000000000..ba5abdab836
--- /dev/null
+++ b/vendor/gitignore/DM.gitignore
@@ -0,0 +1,5 @@
+*.dmb
+*.rsc
+*.int
+*.lk
+*.zip
diff --git a/vendor/gitignore/Dart.gitignore b/vendor/gitignore/Dart.gitignore
new file mode 100644
index 00000000000..7c280441649
--- /dev/null
+++ b/vendor/gitignore/Dart.gitignore
@@ -0,0 +1,27 @@
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+.buildlog
+.packages
+.project
+.pub/
+build/
+**/packages/
+
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these 
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
+*.dart.js
+*.part.js
+*.js.deps
+*.js.map
+*.info.json
+
+# Directory created by dartdoc
+doc/api/
+
+# Don't commit pubspec lock file 
+# (Library packages only! Remove pattern if developing an application package)
+pubspec.lock
diff --git a/vendor/gitignore/Delphi.gitignore b/vendor/gitignore/Delphi.gitignore
new file mode 100644
index 00000000000..19864c6bbef
--- /dev/null
+++ b/vendor/gitignore/Delphi.gitignore
@@ -0,0 +1,66 @@
+# Uncomment these types if you want even more clean repository. But be careful.
+# It can make harm to an existing project source. Read explanations below.
+#
+# Resource files are binaries containing manifest, project icon and version info.
+# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files.
+#*.res
+#
+# Type library file (binary). In old Delphi versions it should be stored.
+# Since Delphi 2009 it is produced from .ridl file and can safely be ignored.
+#*.tlb
+#
+# Diagram Portfolio file. Used by the diagram editor up to Delphi 7.
+# Uncomment this if you are not using diagrams or use newer Delphi version.
+#*.ddp
+#
+# Visual LiveBindings file. Added in Delphi XE2.
+# Uncomment this if you are not using LiveBindings Designer.
+#*.vlb
+#
+# Deployment Manager configuration file for your project. Added in Delphi XE2.
+# Uncomment this if it is not mobile development and you do not use remote debug feature.
+#*.deployproj
+# 
+# C++ object files produced when C/C++ Output file generation is configured.
+# Uncomment this if you are not using external objects (zlib library for example).
+#*.obj
+#
+
+# Delphi compiler-generated binaries (safe to delete)
+*.exe
+*.dll
+*.bpl
+*.bpi
+*.dcp
+*.so
+*.apk
+*.drc
+*.map
+*.dres
+*.rsm
+*.tds
+*.dcu
+*.lib
+*.a
+*.o
+*.ocx
+
+# Delphi autogenerated files (duplicated info)
+*.cfg
+*.hpp
+*Resource.rc
+
+# Delphi local files (user-specific info)
+*.local
+*.identcache
+*.projdata
+*.tvsconfig
+*.dsk
+
+# Delphi history and backups
+__history/
+__recovery/
+*.~*
+
+# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
+*.stat
diff --git a/vendor/gitignore/Drupal.gitignore b/vendor/gitignore/Drupal.gitignore
new file mode 100644
index 00000000000..0d2fe537f46
--- /dev/null
+++ b/vendor/gitignore/Drupal.gitignore
@@ -0,0 +1,36 @@
+# Ignore configuration files that may contain sensitive information.
+sites/*/*settings*.php
+
+# Ignore paths that contain generated content.
+files/
+sites/*/files
+sites/*/private
+
+# Ignore default text files
+robots.txt
+/CHANGELOG.txt
+/COPYRIGHT.txt
+/INSTALL*.txt
+/LICENSE.txt
+/MAINTAINERS.txt
+/UPGRADE.txt
+/README.txt
+sites/README.txt
+sites/all/modules/README.txt
+sites/all/themes/README.txt
+
+# Ignore everything but the "sites" folder ( for non core developer )
+.htaccess
+web.config
+authorize.php
+cron.php
+index.php
+install.php
+update.php
+xmlrpc.php
+/includes
+/misc
+/modules
+/profiles
+/scripts
+/themes
diff --git a/vendor/gitignore/EPiServer.gitignore b/vendor/gitignore/EPiServer.gitignore
new file mode 100644
index 00000000000..97037de743e
--- /dev/null
+++ b/vendor/gitignore/EPiServer.gitignore
@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config
diff --git a/vendor/gitignore/Eagle.gitignore b/vendor/gitignore/Eagle.gitignore
new file mode 100644
index 00000000000..9ced1260266
--- /dev/null
+++ b/vendor/gitignore/Eagle.gitignore
@@ -0,0 +1,44 @@
+# Ignore list for Eagle, a PCB layout tool
+
+# Backup files
+*.s#?
+*.b#?
+*.l#?
+
+# Eagle project file
+# It contains a serial number and references to the file structure
+# on your computer.
+# comment the following line if you want to have your project file included.
+eagle.epf
+
+# Autorouter files
+*.pro
+*.job
+
+# CAM files
+*.$$$
+*.cmp
+*.ly2
+*.l15
+*.sol
+*.plc
+*.stc
+*.sts
+*.crc
+*.crs
+
+*.dri
+*.drl
+*.gpi
+*.pls
+
+*.drd
+*.drd.*
+
+*.info
+
+*.eps
+
+# file locks introduced since 7.x
+*.lck
+
diff --git a/vendor/gitignore/Elisp.gitignore b/vendor/gitignore/Elisp.gitignore
new file mode 100644
index 00000000000..9b4291b7fe8
--- /dev/null
+++ b/vendor/gitignore/Elisp.gitignore
@@ -0,0 +1,5 @@
+# Compiled
+*.elc
+
+# Packaging
+.cask
diff --git a/vendor/gitignore/Elixir.gitignore b/vendor/gitignore/Elixir.gitignore
new file mode 100644
index 00000000000..755b605549d
--- /dev/null
+++ b/vendor/gitignore/Elixir.gitignore
@@ -0,0 +1,5 @@
+/_build
+/cover
+/deps
+erl_crash.dump
+*.ez
diff --git a/vendor/gitignore/Elm.gitignore b/vendor/gitignore/Elm.gitignore
new file mode 100644
index 00000000000..a594364e2c0
--- /dev/null
+++ b/vendor/gitignore/Elm.gitignore
@@ -0,0 +1,4 @@
+# elm-package generated files
+elm-stuff/
+# elm-repl generated files
+repl-temp-*
diff --git a/vendor/gitignore/Erlang.gitignore b/vendor/gitignore/Erlang.gitignore
new file mode 100644
index 00000000000..8e46d5a07f8
--- /dev/null
+++ b/vendor/gitignore/Erlang.gitignore
@@ -0,0 +1,10 @@
+.eunit
+deps
+*.o
+*.beam
+*.plt
+erl_crash.dump
+ebin
+rel/example_project
+.concrete/DEV_MODE
+.rebar
diff --git a/vendor/gitignore/ExpressionEngine.gitignore b/vendor/gitignore/ExpressionEngine.gitignore
new file mode 100644
index 00000000000..314e4df123a
--- /dev/null
+++ b/vendor/gitignore/ExpressionEngine.gitignore
@@ -0,0 +1,19 @@
+.DS_Store
+
+# Images
+images/avatars/
+images/captchas/
+images/smileys/
+images/member_photos/
+images/signature_attachments/
+images/pm_attachments/
+
+# For security do not publish the following files
+system/expressionengine/config/database.php
+system/expressionengine/config/config.php
+
+# Caches
+sized/
+thumbs/
+_thumbs/
+*/expressionengine/cache/*
diff --git a/vendor/gitignore/ExtJs.gitignore b/vendor/gitignore/ExtJs.gitignore
new file mode 100644
index 00000000000..5ffc21546ec
--- /dev/null
+++ b/vendor/gitignore/ExtJs.gitignore
@@ -0,0 +1,4 @@
+.architect
+bootstrap.json
+build/
+ext/
diff --git a/vendor/gitignore/Fancy.gitignore b/vendor/gitignore/Fancy.gitignore
new file mode 100644
index 00000000000..70d6e631e55
--- /dev/null
+++ b/vendor/gitignore/Fancy.gitignore
@@ -0,0 +1,2 @@
+*.rbc
+*.fyc
diff --git a/vendor/gitignore/Finale.gitignore b/vendor/gitignore/Finale.gitignore
new file mode 100644
index 00000000000..7ef08e0c343
--- /dev/null
+++ b/vendor/gitignore/Finale.gitignore
@@ -0,0 +1,13 @@
+*.bak
+*.db
+*.avi
+*.pdf
+*.ps
+*.mid
+*.midi
+*.mp3
+*.aif
+*.wav
+# Some versions of Finale have a bug and randomly save extra copies of
+# the music source as "<Filename> copy.mus"
+*copy.mus
diff --git a/vendor/gitignore/ForceDotCom.gitignore b/vendor/gitignore/ForceDotCom.gitignore
new file mode 100644
index 00000000000..3933cd4dd50
--- /dev/null
+++ b/vendor/gitignore/ForceDotCom.gitignore
@@ -0,0 +1,4 @@
+.project
+.settings
+salesforce.schema
+Referenced Packages
diff --git a/vendor/gitignore/Fortran.gitignore b/vendor/gitignore/Fortran.gitignore
new file mode 120000
index 00000000000..5daba98a3e6
--- /dev/null
+++ b/vendor/gitignore/Fortran.gitignore
@@ -0,0 +1 @@
+C++.gitignore
\ No newline at end of file
diff --git a/vendor/gitignore/FuelPHP.gitignore b/vendor/gitignore/FuelPHP.gitignore
new file mode 100644
index 00000000000..d69f71f4338
--- /dev/null
+++ b/vendor/gitignore/FuelPHP.gitignore
@@ -0,0 +1,21 @@
+# the composer package lock file and install directory
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# /composer.lock
+/fuel/vendor
+
+# the fuelphp document
+/docs/
+
+# you may install these packages with `oil package`.
+# http://fuelphp.com/docs/packages/oil/package.html
+# /fuel/packages/auth/
+# /fuel/packages/email/
+# /fuel/packages/oil/
+# /fuel/packages/orm/
+# /fuel/packages/parser/
+
+# dynamically generated files
+/fuel/app/logs/*/*/*
+/fuel/app/cache/*/*
+/fuel/app/config/crypt.php
diff --git a/vendor/gitignore/GWT.gitignore b/vendor/gitignore/GWT.gitignore
new file mode 100644
index 00000000000..07704e54bbc
--- /dev/null
+++ b/vendor/gitignore/GWT.gitignore
@@ -0,0 +1,28 @@
+*.class
+
+# Package Files #
+*.jar
+*.war
+
+# gwt caches and compiled units #
+war/gwt_bree/
+gwt-unitCache/
+
+# boilerplate generated classes #
+.apt_generated/
+
+# more caches and things from deploy #
+war/WEB-INF/deploy/
+war/WEB-INF/classes/
+
+#compilation logs
+.gwt/
+
+#caching for already compiled files
+gwt-unitCache/
+
+#gwt junit compilation files
+www-test/
+
+#old GWT (1.5) created this dir
+.gwt-tmp/
diff --git a/vendor/gitignore/Gcov.gitignore b/vendor/gitignore/Gcov.gitignore
new file mode 100644
index 00000000000..a6451430e17
--- /dev/null
+++ b/vendor/gitignore/Gcov.gitignore
@@ -0,0 +1,5 @@
+# gcc coverage testing tool files
+
+*.gcno
+*.gcda
+*.gcov
diff --git a/vendor/gitignore/GitBook.gitignore b/vendor/gitignore/GitBook.gitignore
new file mode 100644
index 00000000000..4cb12d8db77
--- /dev/null
+++ b/vendor/gitignore/GitBook.gitignore
@@ -0,0 +1,16 @@
+# Node rules:
+## Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+## Dependency directory
+## Commenting this out is preferred by some people, see
+## https://docs.npmjs.com/misc/faq#should-i-check-my-node_modules-folder-into-git
+node_modules
+
+# Book build output
+_book
+
+# eBook build output
+*.epub
+*.mobi
+*.pdf
diff --git a/vendor/gitignore/Global/Anjuta.gitignore b/vendor/gitignore/Global/Anjuta.gitignore
new file mode 100644
index 00000000000..20dd42c53e6
--- /dev/null
+++ b/vendor/gitignore/Global/Anjuta.gitignore
@@ -0,0 +1,3 @@
+# Local configuration folder and symbol database
+/.anjuta/
+/.anjuta_sym_db.db
diff --git a/vendor/gitignore/Global/Archives.gitignore b/vendor/gitignore/Global/Archives.gitignore
new file mode 100644
index 00000000000..e9eda68baf2
--- /dev/null
+++ b/vendor/gitignore/Global/Archives.gitignore
@@ -0,0 +1,27 @@
+# It's better to unpack these files and commit the raw source because
+# git has its own built in compression methods.
+*.7z
+*.jar
+*.rar
+*.zip
+*.gz
+*.bzip
+*.bz2
+*.xz
+*.lzma
+*.cab
+
+#packing-only formats
+*.iso
+*.tar
+
+#package management formats
+*.dmg
+*.xpi
+*.gem
+*.egg
+*.deb
+*.rpm
+*.msi
+*.msm
+*.msp
diff --git a/vendor/gitignore/Global/BricxCC.gitignore b/vendor/gitignore/Global/BricxCC.gitignore
new file mode 100644
index 00000000000..c1d16a46c98
--- /dev/null
+++ b/vendor/gitignore/Global/BricxCC.gitignore
@@ -0,0 +1,4 @@
+# Bricx Command Center IDE
+# http://bricxcc.sourceforge.net
+*.bak
+*.sym
diff --git a/vendor/gitignore/Global/CVS.gitignore b/vendor/gitignore/Global/CVS.gitignore
new file mode 100644
index 00000000000..1695352e146
--- /dev/null
+++ b/vendor/gitignore/Global/CVS.gitignore
@@ -0,0 +1,4 @@
+/CVS/*
+**/CVS/*
+.cvsignore
+*/.cvsignore
diff --git a/vendor/gitignore/Global/Calabash.gitignore b/vendor/gitignore/Global/Calabash.gitignore
new file mode 100644
index 00000000000..8a75b329dcd
--- /dev/null
+++ b/vendor/gitignore/Global/Calabash.gitignore
@@ -0,0 +1,10 @@
+# Calabash / Cucumber
+rerun/
+reports/
+screenshots/
+screenshot*.png
+test-servers/
+
+# bundler
+.bundle
+vendor
diff --git a/vendor/gitignore/Global/Cloud9.gitignore b/vendor/gitignore/Global/Cloud9.gitignore
new file mode 100644
index 00000000000..3f4384df508
--- /dev/null
+++ b/vendor/gitignore/Global/Cloud9.gitignore
@@ -0,0 +1,3 @@
+# Cloud9 IDE - http://c9.io
+.c9revisions
+.c9
diff --git a/vendor/gitignore/Global/CodeKit.gitignore b/vendor/gitignore/Global/CodeKit.gitignore
new file mode 100644
index 00000000000..bd9e67fcca2
--- /dev/null
+++ b/vendor/gitignore/Global/CodeKit.gitignore
@@ -0,0 +1,3 @@
+# General CodeKit files to ignore
+config.codekit
+/min
diff --git a/vendor/gitignore/Global/DartEditor.gitignore b/vendor/gitignore/Global/DartEditor.gitignore
new file mode 100644
index 00000000000..948920b420e
--- /dev/null
+++ b/vendor/gitignore/Global/DartEditor.gitignore
@@ -0,0 +1,2 @@
+.project
+.buildlog
diff --git a/vendor/gitignore/Global/Dreamweaver.gitignore b/vendor/gitignore/Global/Dreamweaver.gitignore
new file mode 100644
index 00000000000..0621a3d53b5
--- /dev/null
+++ b/vendor/gitignore/Global/Dreamweaver.gitignore
@@ -0,0 +1,7 @@
+# DW Dreamweaver added files
+_notes
+_compareTemp
+configs/
+dwsync.xml
+dw_php_codehinting.config
+*.mno
diff --git a/vendor/gitignore/Global/Dropbox.gitignore b/vendor/gitignore/Global/Dropbox.gitignore
new file mode 100644
index 00000000000..40f4a469d25
--- /dev/null
+++ b/vendor/gitignore/Global/Dropbox.gitignore
@@ -0,0 +1,4 @@
+# Dropbox settings and caches
+.dropbox
+.dropbox.attr
+.dropbox.cache
diff --git a/vendor/gitignore/Global/Eclipse.gitignore b/vendor/gitignore/Global/Eclipse.gitignore
new file mode 100644
index 00000000000..31c9fb31167
--- /dev/null
+++ b/vendor/gitignore/Global/Eclipse.gitignore
@@ -0,0 +1,51 @@
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
diff --git a/vendor/gitignore/Global/EiffelStudio.gitignore b/vendor/gitignore/Global/EiffelStudio.gitignore
new file mode 100644
index 00000000000..f41b4f70216
--- /dev/null
+++ b/vendor/gitignore/Global/EiffelStudio.gitignore
@@ -0,0 +1,2 @@
+# The compilation directory
+EIFGENs
diff --git a/vendor/gitignore/Global/Emacs.gitignore b/vendor/gitignore/Global/Emacs.gitignore
new file mode 100644
index 00000000000..0c96c9ad060
--- /dev/null
+++ b/vendor/gitignore/Global/Emacs.gitignore
@@ -0,0 +1,42 @@
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
\ No newline at end of file
diff --git a/vendor/gitignore/Global/Ensime.gitignore b/vendor/gitignore/Global/Ensime.gitignore
new file mode 100644
index 00000000000..f2daebb9f4b
--- /dev/null
+++ b/vendor/gitignore/Global/Ensime.gitignore
@@ -0,0 +1,4 @@
+# Ensime specific
+.ensime
+.ensime_cache/
+.ensime_lucene/
diff --git a/vendor/gitignore/Global/Espresso.gitignore b/vendor/gitignore/Global/Espresso.gitignore
new file mode 100644
index 00000000000..1234530b5b3
--- /dev/null
+++ b/vendor/gitignore/Global/Espresso.gitignore
@@ -0,0 +1 @@
+*.esproj
diff --git a/vendor/gitignore/Global/FlexBuilder.gitignore b/vendor/gitignore/Global/FlexBuilder.gitignore
new file mode 100644
index 00000000000..bbbfb91d9eb
--- /dev/null
+++ b/vendor/gitignore/Global/FlexBuilder.gitignore
@@ -0,0 +1,3 @@
+bin/
+bin-debug/
+bin-release/
diff --git a/vendor/gitignore/Global/GPG.gitignore b/vendor/gitignore/Global/GPG.gitignore
new file mode 100644
index 00000000000..7740a01538c
--- /dev/null
+++ b/vendor/gitignore/Global/GPG.gitignore
@@ -0,0 +1,2 @@
+secring.*
+
diff --git a/vendor/gitignore/Global/IPythonNotebook.gitignore b/vendor/gitignore/Global/IPythonNotebook.gitignore
new file mode 100644
index 00000000000..27c13510bf5
--- /dev/null
+++ b/vendor/gitignore/Global/IPythonNotebook.gitignore
@@ -0,0 +1,2 @@
+# Temporary data
+.ipynb_checkpoints/
diff --git a/vendor/gitignore/Global/JDeveloper.gitignore b/vendor/gitignore/Global/JDeveloper.gitignore
new file mode 100644
index 00000000000..5bba6f37733
--- /dev/null
+++ b/vendor/gitignore/Global/JDeveloper.gitignore
@@ -0,0 +1,13 @@
+# default application storage directory used by the IDE Performance Cache feature
+.data/
+
+# used for ADF styles caching
+temp/
+
+# default output directories
+classes/
+deploy/
+javadoc/
+
+# lock file, a part of Oracle Credential Store Framework
+cwallet.sso.lck
\ No newline at end of file
diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore
new file mode 100644
index 00000000000..ea83a5eb620
--- /dev/null
+++ b/vendor/gitignore/Global/JetBrains.gitignore
@@ -0,0 +1,44 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
diff --git a/vendor/gitignore/Global/KDevelop4.gitignore b/vendor/gitignore/Global/KDevelop4.gitignore
new file mode 100644
index 00000000000..7ac57b1add4
--- /dev/null
+++ b/vendor/gitignore/Global/KDevelop4.gitignore
@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/
diff --git a/vendor/gitignore/Global/Kate.gitignore b/vendor/gitignore/Global/Kate.gitignore
new file mode 100644
index 00000000000..7ff06ce5390
--- /dev/null
+++ b/vendor/gitignore/Global/Kate.gitignore
@@ -0,0 +1,3 @@
+# Swap Files #
+.*.kate-swp
+.swp.*
diff --git a/vendor/gitignore/Global/Lazarus.gitignore b/vendor/gitignore/Global/Lazarus.gitignore
new file mode 100644
index 00000000000..b32943f1c6e
--- /dev/null
+++ b/vendor/gitignore/Global/Lazarus.gitignore
@@ -0,0 +1,30 @@
+# Lazarus compiler-generated binaries (safe to delete)
+*.exe
+*.dll
+*.so
+*.dylib
+*.lrs
+*.res
+*.compiled
+*.dbg
+*.ppu
+*.o
+*.or
+*.a
+
+# Lazarus autogenerated files (duplicated info)
+*.rst
+*.rsj
+*.lrt
+
+# Lazarus local files (user-specific info)
+*.lps
+
+# Lazarus backups and unit output folders.
+# These can be changed by user in Lazarus/project options.
+backup/
+*.bak
+lib/
+
+# Application bundle for Mac OS
+*.app/
diff --git a/vendor/gitignore/Global/LibreOffice.gitignore b/vendor/gitignore/Global/LibreOffice.gitignore
new file mode 100644
index 00000000000..586beac91d3
--- /dev/null
+++ b/vendor/gitignore/Global/LibreOffice.gitignore
@@ -0,0 +1,2 @@
+# LibreOffice locks
+.~lock.*#
diff --git a/vendor/gitignore/Global/Linux.gitignore b/vendor/gitignore/Global/Linux.gitignore
new file mode 100644
index 00000000000..cc9586893b6
--- /dev/null
+++ b/vendor/gitignore/Global/Linux.gitignore
@@ -0,0 +1,10 @@
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
diff --git a/vendor/gitignore/Global/LyX.gitignore b/vendor/gitignore/Global/LyX.gitignore
new file mode 100644
index 00000000000..8efe0195cf3
--- /dev/null
+++ b/vendor/gitignore/Global/LyX.gitignore
@@ -0,0 +1,4 @@
+# Ignore LyX backup and autosave files
+# http://www.lyx.org/
+*.lyx~
+*.lyx#
diff --git a/vendor/gitignore/Global/Matlab.gitignore b/vendor/gitignore/Global/Matlab.gitignore
new file mode 100644
index 00000000000..32a5ad4c777
--- /dev/null
+++ b/vendor/gitignore/Global/Matlab.gitignore
@@ -0,0 +1,19 @@
+##---------------------------------------------------
+## Remove autosaves generated by the Matlab editor
+## We have git for backups!
+##---------------------------------------------------
+
+# Windows default autosave extension
+*.asv
+
+# OSX / *nix default autosave extension
+*.m~
+
+# Compiled MEX binaries (all platforms)
+*.mex*
+
+# Simulink Code Generation
+slprj/
+
+# Session info
+octave-workspace
diff --git a/vendor/gitignore/Global/Mercurial.gitignore b/vendor/gitignore/Global/Mercurial.gitignore
new file mode 100644
index 00000000000..e65d1137988
--- /dev/null
+++ b/vendor/gitignore/Global/Mercurial.gitignore
@@ -0,0 +1,6 @@
+.hg/
+.hgignore
+.hgsigs
+.hgsub
+.hgsubstate
+.hgtags
diff --git a/vendor/gitignore/Global/MicrosoftOffice.gitignore b/vendor/gitignore/Global/MicrosoftOffice.gitignore
new file mode 100644
index 00000000000..cb891745660
--- /dev/null
+++ b/vendor/gitignore/Global/MicrosoftOffice.gitignore
@@ -0,0 +1,16 @@
+*.tmp
+
+# Word temporary
+~$*.doc*
+
+# Excel temporary
+~$*.xls*
+
+# Excel Backup File
+*.xlk
+
+# PowerPoint temporary
+~$*.ppt*
+
+# Visio autosave temporary files
+*.~vsdx
diff --git a/vendor/gitignore/Global/ModelSim.gitignore b/vendor/gitignore/Global/ModelSim.gitignore
new file mode 100644
index 00000000000..46592b86430
--- /dev/null
+++ b/vendor/gitignore/Global/ModelSim.gitignore
@@ -0,0 +1,23 @@
+# ignore ModelSim generated files and directories (temp files and so on)
+[_@]*
+
+# ignore compilation output of ModelSim
+*.mti
+*.dat
+*.dbs
+*.psm
+*.bak
+*.cmp
+*.jpg
+*.html
+*.bsf
+
+# ignore simulation output of ModelSim
+wlf*
+*.wlf
+*.vstf
+*.ucdb
+cov*/
+transcript*
+sc_dpiheader.h
+vsim.dbg
diff --git a/vendor/gitignore/Global/Momentics.gitignore b/vendor/gitignore/Global/Momentics.gitignore
new file mode 100644
index 00000000000..b14db2d8645
--- /dev/null
+++ b/vendor/gitignore/Global/Momentics.gitignore
@@ -0,0 +1,8 @@
+# Built files
+x86/
+arm/
+arm-p/
+translations/*.qm
+
+# IDE settings
+.settings/
diff --git a/vendor/gitignore/Global/MonoDevelop.gitignore b/vendor/gitignore/Global/MonoDevelop.gitignore
new file mode 100644
index 00000000000..ef38d06b08f
--- /dev/null
+++ b/vendor/gitignore/Global/MonoDevelop.gitignore
@@ -0,0 +1,8 @@
+#User Specific
+*.userprefs
+*.usertasks
+
+#Mono Project Files
+*.pidb
+*.resources
+test-results/
diff --git a/vendor/gitignore/Global/NetBeans.gitignore b/vendor/gitignore/Global/NetBeans.gitignore
new file mode 100644
index 00000000000..520d91ff584
--- /dev/null
+++ b/vendor/gitignore/Global/NetBeans.gitignore
@@ -0,0 +1,7 @@
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+.nb-gradle/
diff --git a/vendor/gitignore/Global/Ninja.gitignore b/vendor/gitignore/Global/Ninja.gitignore
new file mode 100644
index 00000000000..50e58f24cc9
--- /dev/null
+++ b/vendor/gitignore/Global/Ninja.gitignore
@@ -0,0 +1,2 @@
+.ninja_deps
+.ninja_log
diff --git a/vendor/gitignore/Global/NotepadPP.gitignore b/vendor/gitignore/Global/NotepadPP.gitignore
new file mode 100644
index 00000000000..8fbda83a2c9
--- /dev/null
+++ b/vendor/gitignore/Global/NotepadPP.gitignore
@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak
diff --git a/vendor/gitignore/Global/OSX.gitignore b/vendor/gitignore/Global/OSX.gitignore
new file mode 100644
index 00000000000..660b31353e8
--- /dev/null
+++ b/vendor/gitignore/Global/OSX.gitignore
@@ -0,0 +1,24 @@
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon

+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
diff --git a/vendor/gitignore/Global/Otto.gitignore b/vendor/gitignore/Global/Otto.gitignore
new file mode 100644
index 00000000000..5aa263f9db0
--- /dev/null
+++ b/vendor/gitignore/Global/Otto.gitignore
@@ -0,0 +1 @@
+.otto/
diff --git a/vendor/gitignore/Global/Redcar.gitignore b/vendor/gitignore/Global/Redcar.gitignore
new file mode 100644
index 00000000000..b4a9d1d68e3
--- /dev/null
+++ b/vendor/gitignore/Global/Redcar.gitignore
@@ -0,0 +1 @@
+.redcar
diff --git a/vendor/gitignore/Global/Redis.gitignore b/vendor/gitignore/Global/Redis.gitignore
new file mode 100644
index 00000000000..57c1c230f92
--- /dev/null
+++ b/vendor/gitignore/Global/Redis.gitignore
@@ -0,0 +1,3 @@
+# Ignore redis binary dump (dump.rdb) files
+
+*.rdb
diff --git a/vendor/gitignore/Global/SBT.gitignore b/vendor/gitignore/Global/SBT.gitignore
new file mode 100644
index 00000000000..970d897c75c
--- /dev/null
+++ b/vendor/gitignore/Global/SBT.gitignore
@@ -0,0 +1,9 @@
+# Simple Build Tool
+# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
+
+target/
+lib_managed/
+src_managed/
+project/boot/
+.history
+.cache
diff --git a/vendor/gitignore/Global/SVN.gitignore b/vendor/gitignore/Global/SVN.gitignore
new file mode 100644
index 00000000000..1b53ace613f
--- /dev/null
+++ b/vendor/gitignore/Global/SVN.gitignore
@@ -0,0 +1 @@
+.svn/
diff --git a/vendor/gitignore/Global/SlickEdit.gitignore b/vendor/gitignore/Global/SlickEdit.gitignore
new file mode 100644
index 00000000000..f30b8da457c
--- /dev/null
+++ b/vendor/gitignore/Global/SlickEdit.gitignore
@@ -0,0 +1,11 @@
+# SlickEdit workspace and project files are ignored by default because
+# typically they are considered to be developer-specific and not part of a
+# project.
+*.vpw
+*.vpj
+
+# SlickEdit workspace history and tag files always contain user-specific
+# data so they should not be stored in a repository.
+*.vpwhistu
+*.vpwhist
+*.vtg
diff --git a/vendor/gitignore/Global/SublimeText.gitignore b/vendor/gitignore/Global/SublimeText.gitignore
new file mode 100644
index 00000000000..1d4e6137591
--- /dev/null
+++ b/vendor/gitignore/Global/SublimeText.gitignore
@@ -0,0 +1,14 @@
+# cache files for sublime text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# workspace files are user-specific
+*.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
+
+# sftp configuration file
+sftp-config.json
diff --git a/vendor/gitignore/Global/SynopsysVCS.gitignore b/vendor/gitignore/Global/SynopsysVCS.gitignore
new file mode 100644
index 00000000000..eed2432fb78
--- /dev/null
+++ b/vendor/gitignore/Global/SynopsysVCS.gitignore
@@ -0,0 +1,36 @@
+# Waveform formats
+*.vcd
+*.vpd
+*.evcd
+*.fsdb
+
+# Default name of the simulation executable.  A different name can be 
+# specified with this switch (the associated daidir database name is 
+# also taken from here):  -o <path>/<filename>
+simv
+
+# Generated for Verilog and VHDL top configs
+simv.daidir/
+simv.db.dir/
+
+# Infrastructure necessary to co-simulate SystemC models with 
+# Verilog/VHDL models.  An alternate directory may be specified with this
+# switch:  -Mdir=<directory_path>
+csrc/
+
+# Log file - the following switch allows to specify the file that will be
+# used to write all messages from simulation:  -l <filename>
+*.log
+
+# Coverage results (generated with urg) and database location.  The 
+# following switch can also be used:  urg -dir <coverage_directory>.vdb
+simv.vdb/
+urgReport/
+
+# DVE and UCLI related files.
+DVEfiles/
+ucli.key
+
+# When the design is elaborated for DirectC, the following file is created
+# with declarations for C/C++ functions.
+vc_hdrs.h
diff --git a/vendor/gitignore/Global/Tags.gitignore b/vendor/gitignore/Global/Tags.gitignore
new file mode 100644
index 00000000000..c0318165a27
--- /dev/null
+++ b/vendor/gitignore/Global/Tags.gitignore
@@ -0,0 +1,16 @@
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
+TAGS
+.TAGS
+!TAGS/
+tags
+.tags
+!tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+
diff --git a/vendor/gitignore/Global/TextMate.gitignore b/vendor/gitignore/Global/TextMate.gitignore
new file mode 100644
index 00000000000..41e8d07a940
--- /dev/null
+++ b/vendor/gitignore/Global/TextMate.gitignore
@@ -0,0 +1,3 @@
+*.tmproj
+*.tmproject
+tmtags
diff --git a/vendor/gitignore/Global/TortoiseGit.gitignore b/vendor/gitignore/Global/TortoiseGit.gitignore
new file mode 100644
index 00000000000..db89590a629
--- /dev/null
+++ b/vendor/gitignore/Global/TortoiseGit.gitignore
@@ -0,0 +1,2 @@
+# Project-level settings
+/.tgitconfig
diff --git a/vendor/gitignore/Global/Vagrant.gitignore b/vendor/gitignore/Global/Vagrant.gitignore
new file mode 100644
index 00000000000..a977916f658
--- /dev/null
+++ b/vendor/gitignore/Global/Vagrant.gitignore
@@ -0,0 +1 @@
+.vagrant/
diff --git a/vendor/gitignore/Global/Vim.gitignore b/vendor/gitignore/Global/Vim.gitignore
new file mode 100644
index 00000000000..bdc04a0b529
--- /dev/null
+++ b/vendor/gitignore/Global/Vim.gitignore
@@ -0,0 +1,10 @@
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
diff --git a/vendor/gitignore/Global/VirtualEnv.gitignore b/vendor/gitignore/Global/VirtualEnv.gitignore
new file mode 100644
index 00000000000..b2c22f2af7f
--- /dev/null
+++ b/vendor/gitignore/Global/VirtualEnv.gitignore
@@ -0,0 +1,12 @@
+# Virtualenv
+# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
+.Python
+[Bb]in
+[Ii]nclude
+[Ll]ib
+[Ll]ib64
+[Ll]ocal
+[Ss]cripts
+pyvenv.cfg
+.venv
+pip-selfcheck.json
diff --git a/vendor/gitignore/Global/VisualStudioCode.gitignore b/vendor/gitignore/Global/VisualStudioCode.gitignore
new file mode 100644
index 00000000000..faa18382a3c
--- /dev/null
+++ b/vendor/gitignore/Global/VisualStudioCode.gitignore
@@ -0,0 +1,2 @@
+.vscode
+
diff --git a/vendor/gitignore/Global/WebMethods.gitignore b/vendor/gitignore/Global/WebMethods.gitignore
new file mode 100644
index 00000000000..b383c25ca3c
--- /dev/null
+++ b/vendor/gitignore/Global/WebMethods.gitignore
@@ -0,0 +1,14 @@
+**/IntegrationServer/datastore/
+**/IntegrationServer/db/
+**/IntegrationServer/DocumentStore/
+**/IntegrationServer/lib/
+**/IntegrationServer/logs/
+**/IntegrationServer/replicate/
+**/IntegrationServer/sdk/
+**/IntegrationServer/support/
+**/IntegrationServer/update/
+**/IntegrationServer/userFtpRoot/
+**/IntegrationServer/web/
+**/IntegrationServer/WmRepository4/
+**/IntegrationServer/XAStore/
+**/IntegrationServer/packages/Wm*/
diff --git a/vendor/gitignore/Global/Windows.gitignore b/vendor/gitignore/Global/Windows.gitignore
new file mode 100644
index 00000000000..a0d31452b0e
--- /dev/null
+++ b/vendor/gitignore/Global/Windows.gitignore
@@ -0,0 +1,18 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
diff --git a/vendor/gitignore/Global/Xcode.gitignore b/vendor/gitignore/Global/Xcode.gitignore
new file mode 100644
index 00000000000..37de8bb4793
--- /dev/null
+++ b/vendor/gitignore/Global/Xcode.gitignore
@@ -0,0 +1,23 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
diff --git a/vendor/gitignore/Global/XilinxISE.gitignore b/vendor/gitignore/Global/XilinxISE.gitignore
new file mode 100644
index 00000000000..4475f843da9
--- /dev/null
+++ b/vendor/gitignore/Global/XilinxISE.gitignore
@@ -0,0 +1,67 @@
+# intermediate build files
+*.bgn
+*.bit
+*.bld
+*.cmd_log
+*.drc
+*.ll
+*.lso
+*.msd
+*.msk
+*.ncd
+*.ngc
+*.ngd
+*.ngr
+*.pad
+*.par
+*.pcf
+*.prj
+*.ptwx
+*.rbb
+*.rbd
+*.stx
+*.syr
+*.twr
+*.twx
+*.unroutes
+*.ut
+*.xpi
+*.xst
+*_bitgen.xwbt
+*_envsettings.html
+*_map.map
+*_map.mrp
+*_map.ngm
+*_map.xrpt
+*_ngdbuild.xrpt
+*_pad.csv
+*_pad.txt
+*_par.xrpt
+*_summary.html
+*_summary.xml
+*_usage.xml
+*_xst.xrpt
+
+# iMPACT generated files
+_impactbatch.log
+impact.xsl
+impact_impact.xwbt
+ise_impact.cmd
+webtalk_impact.xml
+
+# Core Generator generated files
+xaw2verilog.log
+
+# project-wide generated files
+*.gise
+par_usage_statistics.html
+usage_statistics_webtalk.html
+webtalk.log
+webtalk_pn.xml
+
+# generated folders
+iseconfig/
+xlnx_auto_0_xdb/
+xst/
+_ngo/
+_xmsgs/
diff --git a/vendor/gitignore/Go.gitignore b/vendor/gitignore/Go.gitignore
new file mode 100644
index 00000000000..daf913b1b34
--- /dev/null
+++ b/vendor/gitignore/Go.gitignore
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/vendor/gitignore/Gradle.gitignore b/vendor/gitignore/Gradle.gitignore
new file mode 100644
index 00000000000..77617a15c38
--- /dev/null
+++ b/vendor/gitignore/Gradle.gitignore
@@ -0,0 +1,14 @@
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
diff --git a/vendor/gitignore/Grails.gitignore b/vendor/gitignore/Grails.gitignore
new file mode 100644
index 00000000000..9185f14c37c
--- /dev/null
+++ b/vendor/gitignore/Grails.gitignore
@@ -0,0 +1,33 @@
+# .gitignore for Grails 1.2 and 1.3
+# Although this should work for most versions of grails, it is
+# suggested that you use the "grails integrate-with --git" command
+# to generate your .gitignore file.
+
+# web application files
+/web-app/WEB-INF/classes
+
+# default HSQL database files for production mode
+/prodDb.*
+
+# general HSQL database files
+*Db.properties
+*Db.script
+
+# logs
+/stacktrace.log
+/test/reports
+/logs
+
+# project release file
+/*.war
+
+# plugin release files
+/*.zip
+/plugin.xml
+
+# older plugin install locations
+/plugins
+/web-app/plugins
+
+# "temporary" build files
+/target
diff --git a/vendor/gitignore/Haskell.gitignore b/vendor/gitignore/Haskell.gitignore
new file mode 100644
index 00000000000..096abdd90b3
--- /dev/null
+++ b/vendor/gitignore/Haskell.gitignore
@@ -0,0 +1,18 @@
+dist
+dist-*
+cabal-dev
+*.o
+*.hi
+*.chi
+*.chs.h
+*.dyn_o
+*.dyn_hi
+.hpc
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+*.prof
+*.aux
+*.hp
+*.eventlog
+.stack-work/
diff --git a/vendor/gitignore/IGORPro.gitignore b/vendor/gitignore/IGORPro.gitignore
new file mode 100644
index 00000000000..c62be650036
--- /dev/null
+++ b/vendor/gitignore/IGORPro.gitignore
@@ -0,0 +1,5 @@
+# Avoid including Experiment files: they can be created and edited locally to test the ipf files
+*.pxp
+*.pxt
+*.uxp
+*.uxt
diff --git a/vendor/gitignore/Idris.gitignore b/vendor/gitignore/Idris.gitignore
new file mode 100644
index 00000000000..c28bc7cc675
--- /dev/null
+++ b/vendor/gitignore/Idris.gitignore
@@ -0,0 +1,2 @@
+*.ibc
+*.o
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
new file mode 100644
index 00000000000..32858aad3c3
--- /dev/null
+++ b/vendor/gitignore/Java.gitignore
@@ -0,0 +1,12 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/vendor/gitignore/Jboss.gitignore b/vendor/gitignore/Jboss.gitignore
new file mode 100644
index 00000000000..75d1731ed97
--- /dev/null
+++ b/vendor/gitignore/Jboss.gitignore
@@ -0,0 +1,19 @@
+jboss/server/all/deploy/project.ext
+jboss/server/default/deploy/project.ext
+jboss/server/minimal/deploy/project.ext
+jboss/server/all/log/*.log
+jboss/server/all/tmp/**/*
+jboss/server/all/data/**/*
+jboss/server/all/work/**/*
+jboss/server/default/log/*.log
+jboss/server/default/tmp/**/*
+jboss/server/default/data/**/*
+jboss/server/default/work/**/*
+jboss/server/minimal/log/*.log
+jboss/server/minimal/tmp/**/*
+jboss/server/minimal/data/**/*
+jboss/server/minimal/work/**/*
+
+# deployed package files #
+
+*.DEPLOYED
diff --git a/vendor/gitignore/Jekyll.gitignore b/vendor/gitignore/Jekyll.gitignore
new file mode 100644
index 00000000000..5c91b60c063
--- /dev/null
+++ b/vendor/gitignore/Jekyll.gitignore
@@ -0,0 +1,3 @@
+_site/
+.sass-cache/
+.jekyll-metadata
diff --git a/vendor/gitignore/Joomla.gitignore b/vendor/gitignore/Joomla.gitignore
new file mode 100644
index 00000000000..0d7a0de298f
--- /dev/null
+++ b/vendor/gitignore/Joomla.gitignore
@@ -0,0 +1,546 @@
+/.gitignore
+/.htaccess
+/administrator/cache/*
+/administrator/components/com_admin/*
+/administrator/components/com_ajax/*
+/administrator/components/com_tags/*
+/administrator/components/com_banners/*
+/administrator/components/com_cache/*
+/administrator/components/com_postinstall/*
+/administrator/components/com_joomlaupdate/*
+/administrator/components/com_contenthistory/*
+/administrator/components/com_categories/*
+/administrator/components/com_checkin/*
+/administrator/components/com_config/*
+/administrator/components/com_contact/*
+/administrator/components/com_content/*
+/administrator/components/com_cpanel/*
+/administrator/components/com_finder/*
+/administrator/components/com_installer/*
+/administrator/components/com_languages/*
+/administrator/components/com_login/*
+/administrator/components/com_media/*
+/administrator/components/com_menus/*
+/administrator/components/com_messages/*
+/administrator/components/com_modules/*
+/administrator/components/com_newsfeeds/*
+/administrator/components/com_plugins/*
+/administrator/components/com_redirect/*
+/administrator/components/com_search/*
+/administrator/components/com_templates/*
+/administrator/components/com_users/*
+/administrator/components/com_weblinks/*
+/administrator/components/index.html
+/administrator/help/*
+/administrator/includes/*
+/administrator/language/en-GB/en-GB.com_ajax.ini
+/administrator/language/en-GB/en-GB.com_ajax.sys.ini
+/administrator/language/en-GB/en-GB.com_contenthistory.ini
+/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
+/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
+/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
+/administrator/language/en-GB/en-GB.com_postinstall.ini
+/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
+/administrator/language/en-GB/en-GB.com_sitemapjen.sys.ini
+/administrator/language/en-GB/en-GB.com_tags.ini
+/administrator/language/en-GB/en-GB.com_tags.sys.ini
+/administrator/language/en-GB/en-GB.mod_stats_admin.ini
+/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
+/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_contact.ini
+/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_finder.ini
+/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_categories.ini
+/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
+/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_content.ini
+/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
+/administrator/language/en-GB/en-GB.plg_finder_tags.ini
+/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
+/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
+/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
+/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_tags.ini
+/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
+/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
+/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
+/administrator/language/en-GB/en-GB.tpl_isis.ini
+/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
+/administrator/language/en-GB/install.xml
+/administrator/language/en-GB/en-GB.com_admin.ini
+/administrator/language/en-GB/en-GB.com_admin.sys.ini
+/administrator/language/en-GB/en-GB.com_banners.ini
+/administrator/language/en-GB/en-GB.com_banners.sys.ini
+/administrator/language/en-GB/en-GB.com_cache.ini
+/administrator/language/en-GB/en-GB.com_cache.sys.ini
+/administrator/language/en-GB/en-GB.com_categories.ini
+/administrator/language/en-GB/en-GB.com_categories.sys.ini
+/administrator/language/en-GB/en-GB.com_checkin.ini
+/administrator/language/en-GB/en-GB.com_checkin.sys.ini
+/administrator/language/en-GB/en-GB.com_config.ini
+/administrator/language/en-GB/en-GB.com_config.sys.ini
+/administrator/language/en-GB/en-GB.com_contact.ini
+/administrator/language/en-GB/en-GB.com_contact.sys.ini
+/administrator/language/en-GB/en-GB.com_content.ini
+/administrator/language/en-GB/en-GB.com_content.sys.ini
+/administrator/language/en-GB/en-GB.com_cpanel.ini
+/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
+/administrator/language/en-GB/en-GB.com_finder.ini
+/administrator/language/en-GB/en-GB.com_finder.sys.ini
+/administrator/language/en-GB/en-GB.com_installer.ini
+/administrator/language/en-GB/en-GB.com_installer.sys.ini
+/administrator/language/en-GB/en-GB.com_languages.ini
+/administrator/language/en-GB/en-GB.com_languages.sys.ini
+/administrator/language/en-GB/en-GB.com_login.ini
+/administrator/language/en-GB/en-GB.com_login.sys.ini
+/administrator/language/en-GB/en-GB.com_mailto.sys.ini
+/administrator/language/en-GB/en-GB.com_media.ini
+/administrator/language/en-GB/en-GB.com_media.sys.ini
+/administrator/language/en-GB/en-GB.com_menus.ini
+/administrator/language/en-GB/en-GB.com_menus.sys.ini
+/administrator/language/en-GB/en-GB.com_messages.ini
+/administrator/language/en-GB/en-GB.com_messages.sys.ini
+/administrator/language/en-GB/en-GB.com_modules.ini
+/administrator/language/en-GB/en-GB.com_modules.sys.ini
+/administrator/language/en-GB/en-GB.com_newsfeeds.ini
+/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
+/administrator/language/en-GB/en-GB.com_plugins.ini
+/administrator/language/en-GB/en-GB.com_plugins.sys.ini
+/administrator/language/en-GB/en-GB.com_redirect.ini
+/administrator/language/en-GB/en-GB.com_redirect.sys.ini
+/administrator/language/en-GB/en-GB.com_search.ini
+/administrator/language/en-GB/en-GB.com_search.sys.ini
+/administrator/language/en-GB/en-GB.com_templates.ini
+/administrator/language/en-GB/en-GB.com_templates.sys.ini
+/administrator/language/en-GB/en-GB.com_users.ini
+/administrator/language/en-GB/en-GB.com_users.sys.ini
+/administrator/language/en-GB/en-GB.com_weblinks.ini
+/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.com_wrapper.ini
+/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
+/administrator/language/en-GB/en-GB.ini
+/administrator/language/en-GB/en-GB.lib_joomla.ini
+/administrator/language/en-GB/en-GB.localise.php
+/administrator/language/en-GB/en-GB.mod_custom.ini
+/administrator/language/en-GB/en-GB.mod_custom.sys.ini
+/administrator/language/en-GB/en-GB.mod_feed.ini
+/administrator/language/en-GB/en-GB.mod_feed.sys.ini
+/administrator/language/en-GB/en-GB.mod_latest.ini
+/administrator/language/en-GB/en-GB.mod_latest.sys.ini
+/administrator/language/en-GB/en-GB.mod_logged.ini
+/administrator/language/en-GB/en-GB.mod_logged.sys.ini
+/administrator/language/en-GB/en-GB.mod_login.ini
+/administrator/language/en-GB/en-GB.mod_login.sys.ini
+/administrator/language/en-GB/en-GB.mod_menu.ini
+/administrator/language/en-GB/en-GB.mod_menu.sys.ini
+/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
+/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
+/administrator/language/en-GB/en-GB.mod_online.ini
+/administrator/language/en-GB/en-GB.mod_online.sys.ini
+/administrator/language/en-GB/en-GB.mod_popular.ini
+/administrator/language/en-GB/en-GB.mod_popular.sys.ini
+/administrator/language/en-GB/en-GB.mod_quickicon.ini
+/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
+/administrator/language/en-GB/en-GB.mod_status.ini
+/administrator/language/en-GB/en-GB.mod_status.sys.ini
+/administrator/language/en-GB/en-GB.mod_submenu.ini
+/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
+/administrator/language/en-GB/en-GB.mod_title.ini
+/administrator/language/en-GB/en-GB.mod_title.sys.ini
+/administrator/language/en-GB/en-GB.mod_toolbar.ini
+/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
+/administrator/language/en-GB/en-GB.mod_unread.ini
+/administrator/language/en-GB/en-GB.mod_unread.sys.ini
+/administrator/language/en-GB/en-GB.mod_version.ini
+/administrator/language/en-GB/en-GB.mod_version.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_example.ini
+/administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
+/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
+/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
+/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
+/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
+/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
+/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_geshi.ini
+/administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_joomla.ini
+/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
+/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
+/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
+/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_vote.ini
+/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
+/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors_none.ini
+/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
+/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
+/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
+/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_categories.ini
+/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_contacts.ini
+/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_content.ini
+/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
+/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
+/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_cache.ini
+/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_debug.ini
+/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_highlight.ini
+/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
+/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_log.ini
+/administrator/language/en-GB/en-GB.plg_system_logout.ini
+/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_p3p.ini
+/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_redirect.ini
+/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_remember.ini
+/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_sef.ini
+/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
+/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
+/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
+/administrator/language/en-GB/en-GB.plg_user_joomla.ini
+/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_user_profile.ini
+/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
+/administrator/language/en-GB/en-GB.tpl_bluestork.ini
+/administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini
+/administrator/language/en-GB/en-GB.tpl_hathor.ini
+/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
+/administrator/language/en-GB/en-GB.xml
+/administrator/language/en-GB/index.html
+/administrator/language/overrides/*
+/administrator/language/index.html
+/administrator/manifests/*
+/administrator/modules/mod_custom/*
+/administrator/modules/mod_feed/*
+/administrator/modules/mod_latest/*
+/administrator/modules/mod_logged/*
+/administrator/modules/mod_login/*
+/administrator/modules/mod_menu/*
+/administrator/modules/mod_multilangstatus/*
+/administrator/modules/mod_online/*
+/administrator/modules/mod_popular/*
+/administrator/modules/mod_quickicon/*
+/administrator/modules/mod_status/*
+/administrator/modules/mod_submenu/*
+/administrator/modules/mod_title/*
+/administrator/modules/mod_toolbar/*
+/administrator/modules/mod_unread/*
+/administrator/modules/mod_version/*
+/administrator/modules/mod_stats_admin/*
+/administrator/modules/index.html
+/administrator/templates/bluestork/*
+/administrator/templates/isis/*
+/administrator/templates/hathor/*
+/administrator/templates/system/*
+/administrator/templates/index.html
+/administrator/index.php
+/cache/*
+/bin/*
+/cli/*
+/components/com_banners/*
+/components/com_ajax/*
+/components/com_config/*
+/components/com_contenthistory/*
+/components/com_tags/*
+/components/com_contact/*
+/components/com_content/*
+/components/com_finder/*
+/components/com_mailto/*
+/components/com_media/*
+/components/com_newsfeeds/*
+/components/com_search/*
+/components/com_users/*
+/components/com_weblinks/*
+/components/com_wrapper/*
+/components/index.html
+/images/banners/*
+/images/headers/*
+/images/sampledata/*
+/images/joomla*
+/images/index.html
+/images/powered_by.png
+/includes/*
+/installation/*
+/language/en-GB/en-GB.com_ajax.ini
+/language/en-GB/en-GB.com_config.ini
+/language/en-GB/en-GB.com_contact.ini
+/language/en-GB/en-GB.com_finder.ini
+/language/en-GB/en-GB.com_tags.ini
+/language/en-GB/en-GB.finder_cli.ini
+/language/en-GB/en-GB.lib_fof.sys.ini
+/language/en-GB/en-GB.lib_fof.ini
+/language/en-GB/en-GB.com_content.ini
+/language/en-GB/en-GB.lib_idna_convert.sys.ini
+/language/en-GB/en-GB.com_mailto.ini
+/language/en-GB/en-GB.lib_joomla.sys.ini
+/language/en-GB/en-GB.lib_phpass.sys.ini
+/language/en-GB/en-GB.lib_phpmailer.sys.ini
+/language/en-GB/en-GB.lib_phputf8.sys.ini
+/language/en-GB/en-GB.lib_simplepie.sys.ini
+/language/en-GB/en-GB.com_media.ini
+/language/en-GB/en-GB.mod_finder.ini
+/language/en-GB/en-GB.com_messages.ini
+/language/en-GB/en-GB.mod_tags_popular.ini
+/language/en-GB/en-GB.mod_tags_popular.sys.ini
+/language/en-GB/en-GB.mod_tags_similar.ini
+/language/en-GB/en-GB.mod_tags_similar.sys.ini
+/language/en-GB/en-GB.mod_finder.sys.ini
+/language/en-GB/en-GB.tpl_beez3.ini
+/language/en-GB/en-GB.tpl_beez3.sys.ini
+/language/en-GB/en-GB.com_newsfeeds.ini
+/language/en-GB/en-GB.tpl_protostar.ini
+/language/en-GB/en-GB.tpl_protostar.sys.ini
+/language/en-GB/en-GB.com_search.ini
+/language/en-GB/en-GB.com_users.ini
+/language/en-GB/en-GB.com_weblinks.ini
+/language/en-GB/en-GB.com_wrapper.ini
+/language/en-GB/en-GB.files_joomla.sys.ini
+/language/en-GB/en-GB.ini
+/language/en-GB/en-GB.lib_joomla.ini
+/language/en-GB/en-GB.localise.php
+/language/en-GB/en-GB.mod_articles_archive.ini
+/language/en-GB/en-GB.mod_articles_archive.sys.ini
+/language/en-GB/en-GB.mod_articles_categories.ini
+/language/en-GB/en-GB.mod_articles_categories.sys.ini
+/language/en-GB/en-GB.mod_articles_category.ini
+/language/en-GB/en-GB.mod_articles_category.sys.ini
+/language/en-GB/en-GB.mod_articles_latest.ini
+/language/en-GB/en-GB.mod_articles_latest.sys.ini
+/language/en-GB/en-GB.mod_articles_news.ini
+/language/en-GB/en-GB.mod_articles_news.sys.ini
+/language/en-GB/en-GB.mod_articles_popular.ini
+/language/en-GB/en-GB.mod_articles_popular.sys.ini
+/language/en-GB/en-GB.mod_banners.ini
+/language/en-GB/en-GB.mod_banners.sys.ini
+/language/en-GB/en-GB.mod_breadcrumbs.ini
+/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
+/language/en-GB/en-GB.mod_custom.ini
+/language/en-GB/en-GB.mod_custom.sys.ini
+/language/en-GB/en-GB.mod_feed.ini
+/language/en-GB/en-GB.mod_feed.sys.ini
+/language/en-GB/en-GB.mod_footer.ini
+/language/en-GB/en-GB.mod_footer.sys.ini
+/language/en-GB/en-GB.mod_languages.ini
+/language/en-GB/en-GB.mod_languages.sys.ini
+/language/en-GB/en-GB.mod_login.ini
+/language/en-GB/en-GB.mod_login.sys.ini
+/language/en-GB/en-GB.mod_menu.ini
+/language/en-GB/en-GB.mod_menu.sys.ini
+/language/en-GB/en-GB.mod_random_image.ini
+/language/en-GB/en-GB.mod_random_image.sys.ini
+/language/en-GB/en-GB.mod_related_items.ini
+/language/en-GB/en-GB.mod_related_items.sys.ini
+/language/en-GB/en-GB.mod_search.ini
+/language/en-GB/en-GB.mod_search.sys.ini
+/language/en-GB/en-GB.mod_stats.ini
+/language/en-GB/en-GB.mod_stats.sys.ini
+/language/en-GB/en-GB.mod_syndicate.ini
+/language/en-GB/en-GB.mod_syndicate.sys.ini
+/language/en-GB/en-GB.mod_users_latest.ini
+/language/en-GB/en-GB.mod_users_latest.sys.ini
+/language/en-GB/en-GB.mod_weblinks.ini
+/language/en-GB/en-GB.mod_weblinks.sys.ini
+/language/en-GB/en-GB.mod_whosonline.ini
+/language/en-GB/en-GB.mod_whosonline.sys.ini
+/language/en-GB/en-GB.mod_wrapper.ini
+/language/en-GB/en-GB.mod_wrapper.sys.ini
+/language/en-GB/en-GB.tpl_atomic.ini
+/language/en-GB/en-GB.tpl_atomic.sys.ini
+/language/en-GB/en-GB.tpl_beez_20.ini
+/language/en-GB/en-GB.tpl_beez_20.sys.ini
+/language/en-GB/en-GB.tpl_beez5.ini
+/language/en-GB/en-GB.tpl_beez5.sys.ini
+/language/en-GB/en-GB.xml
+/language/en-GB/index.html
+/language/en-GB/install.xml
+/language/overrides/*
+/language/index.html
+/layouts/joomla/*
+/layouts/libraries/*
+/layouts/plugins/*
+/layouts/index.html
+/libraries/cms.php
+/libraries/cms/*
+/libraries/fof/*
+/libraries/idna_convert/*
+/libraries/joomla/*
+/libraries/legacy/*
+/libraries/phpass/*
+/libraries/phpmailer/*
+/libraries/phputf8/*
+/libraries/simplepie/*
+/libraries/vendor/*
+/libraries/classmap.php
+/libraries/import.legacy.php
+/libraries/index.html
+/libraries/import.php
+/libraries/loader.php
+/libraries/platform.php
+/logs/*
+/media/cms/*
+/media/com_contenthistory/*
+/media/com_finder/*
+/media/com_joomlaupdate/*
+/media/com_wrapper/*
+/media/contacts/*
+/media/editors/*
+/media/jui/*
+/media/mailto/*
+/media/media/*
+/media/mod_languages/*
+/media/overrider/*
+/media/plg_quickicon_extensionupdate/*
+/media/plg_quickicon_joomlaupdate/*
+/media/plg_system_highlight/*
+/media/system/*
+/media/index.html
+/modules/mod_articles_archive/*
+/modules/mod_articles_categories/*
+/modules/mod_articles_category/*
+/modules/mod_articles_latest/*
+/modules/mod_articles_news/*
+/modules/mod_articles_popular/*
+/modules/mod_banners/*
+/modules/mod_breadcrumbs/*
+/modules/mod_custom/*
+/modules/mod_feed/*
+/modules/mod_finder/*
+/modules/mod_footer/*
+/modules/mod_languages/*
+/modules/mod_login/*
+/modules/mod_menu/*
+/modules/mod_random_image/*
+/modules/mod_related_items/*
+/modules/mod_search/*
+/modules/mod_stats/*
+/modules/mod_syndicate/*
+/modules/mod_tags_popular/*
+/modules/mod_tags_similar/*
+/modules/mod_users_latest/*
+/modules/mod_weblinks/*
+/modules/mod_whosonline/*
+/modules/mod_wrapper/*
+/modules/index.html
+/plugins/authentication/example/*
+/plugins/authentication/gmail/*
+/plugins/authentication/joomla/*
+/plugins/authentication/ldap/*
+/plugins/authentication/cookie/*
+/plugins/authentication/index.html
+/plugins/captcha/recaptcha/*
+/plugins/captcha/index.html
+/plugins/content/emailcloak/*
+/plugins/content/example/*
+/plugins/content/finder/*
+/plugins/content/geshi/*
+/plugins/content/joomla/*
+/plugins/content/loadmodule/*
+/plugins/content/pagebreak/*
+/plugins/content/pagenavigation/*
+/plugins/content/vote/*
+/plugins/content/contact/*
+/plugins/content/index.html
+/plugins/editors/codemirror/*
+/plugins/editors/none/*
+/plugins/editors/tinymce/*
+/plugins/editors/index.html
+/plugins/editors-xtd/article/*
+/plugins/editors-xtd/image/*
+/plugins/editors-xtd/pagebreak/*
+/plugins/editors-xtd/readmore/*
+/plugins/editors-xtd/index.html
+/plugins/extension/example/*
+/plugins/extension/joomla/*
+/plugins/extension/index.html
+/plugins/finder/index.html
+/plugins/finder/categories/*
+/plugins/finder/contacts/*
+/plugins/finder/content/*
+/plugins/finder/newsfeeds/*
+/plugins/finder/tags/*
+/plugins/finder/weblinks/*
+/plugins/installer/*
+/plugins/quickicon/extensionupdate/*
+/plugins/quickicon/joomlaupdate/*
+/plugins/quickicon/index.html
+/plugins/search/categories/*
+/plugins/search/contacts/*
+/plugins/search/content/*
+/plugins/search/newsfeeds/*
+/plugins/search/weblinks/*
+/plugins/search/tags/*
+/plugins/search/index.html
+/plugins/system/cache/*
+/plugins/system/debug/*
+/plugins/system/highlight/*
+/plugins/system/languagecode/*
+/plugins/system/languagefilter/*
+/plugins/system/log/*
+/plugins/system/logout/*
+/plugins/system/p3p/*
+/plugins/system/redirect/*
+/plugins/system/remember/*
+/plugins/system/sef/*
+/plugins/system/index.html
+/plugins/twofactorauth/*
+/plugins/user/contactcreator/*
+/plugins/user/example/*
+/plugins/user/joomla/*
+/plugins/user/profile/*
+/plugins/user/index.html
+/plugins/index.html
+/templates/atomic/*
+/templates/beez3/*
+/templates/beez_20/*
+/templates/beez5/*
+/templates/protostar/*
+/templates/system/*
+/templates/index.html
+/tmp/*
+/configuration.php
+/index.php
+/joomla.xml
+/*.txt
+/robots.txt.dist
diff --git a/vendor/gitignore/KiCad.gitignore b/vendor/gitignore/KiCad.gitignore
new file mode 100644
index 00000000000..606ed1c7b4d
--- /dev/null
+++ b/vendor/gitignore/KiCad.gitignore
@@ -0,0 +1,20 @@
+# For PCBs designed using KiCad: http://www.kicad-pcb.org/
+
+# Temporary files
+*.000
+*.bak
+*.bck
+*.kicad_pcb-bak
+*~
+_autosave-*
+*.tmp
+
+# Netlist files (exported from Eeschema)
+*.net
+
+# Autorouter files (exported from Pcbnew)
+.dsn
+
+# Exported BOM files
+*.xml
+*.csv
diff --git a/vendor/gitignore/Kohana.gitignore b/vendor/gitignore/Kohana.gitignore
new file mode 100644
index 00000000000..8b2ab01a800
--- /dev/null
+++ b/vendor/gitignore/Kohana.gitignore
@@ -0,0 +1,2 @@
+application/cache/*
+application/logs/*
diff --git a/vendor/gitignore/LabVIEW.gitignore b/vendor/gitignore/LabVIEW.gitignore
new file mode 100644
index 00000000000..122450865cf
--- /dev/null
+++ b/vendor/gitignore/LabVIEW.gitignore
@@ -0,0 +1,16 @@
+# Libraries
+*.lvlibp
+*.llb
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+
+# Metadata
+*.aliases
+*.lvlps
diff --git a/vendor/gitignore/Laravel.gitignore b/vendor/gitignore/Laravel.gitignore
new file mode 100644
index 00000000000..c491fa2bc6f
--- /dev/null
+++ b/vendor/gitignore/Laravel.gitignore
@@ -0,0 +1,16 @@
+vendor/
+node_modules/
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+bootstrap/cache/
+storage/
+.env.*.php
+.env.php
+.env
+
+# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
+.rocketeer/
diff --git a/vendor/gitignore/Leiningen.gitignore b/vendor/gitignore/Leiningen.gitignore
new file mode 100644
index 00000000000..47fed6c20d9
--- /dev/null
+++ b/vendor/gitignore/Leiningen.gitignore
@@ -0,0 +1,12 @@
+pom.xml
+pom.xml.asc
+*jar
+/lib/
+/classes/
+/target/
+/checkouts/
+.lein-deps-sum
+.lein-repl-history
+.lein-plugins/
+.lein-failures
+.nrepl-port
diff --git a/vendor/gitignore/LemonStand.gitignore b/vendor/gitignore/LemonStand.gitignore
new file mode 100644
index 00000000000..c7d94ad34b0
--- /dev/null
+++ b/vendor/gitignore/LemonStand.gitignore
@@ -0,0 +1,21 @@
+boot.php
+index.php
+install.php
+/config/*
+!/config/config.php
+/controllers/*
+/init/*
+/logs/*
+/phproad/*
+/temp/*
+/uploaded/*
+/installer_files/*
+/modules/backend/*
+/modules/blog/*
+/modules/cms/*
+/modules/core/*
+/modules/session/*
+/modules/shop/*
+/modules/system/*
+/modules/users/*
+# add content_*.php if you don't want erase client changes to content
diff --git a/vendor/gitignore/Lilypond.gitignore b/vendor/gitignore/Lilypond.gitignore
new file mode 100644
index 00000000000..513e6edd9c4
--- /dev/null
+++ b/vendor/gitignore/Lilypond.gitignore
@@ -0,0 +1,6 @@
+*.pdf
+*.ps
+*.midi
+*.mid
+*.log
+*~
diff --git a/vendor/gitignore/Lithium.gitignore b/vendor/gitignore/Lithium.gitignore
new file mode 100644
index 00000000000..7b22568ea89
--- /dev/null
+++ b/vendor/gitignore/Lithium.gitignore
@@ -0,0 +1,2 @@
+libraries/*
+resources/tmp/*
diff --git a/vendor/gitignore/Lua.gitignore b/vendor/gitignore/Lua.gitignore
new file mode 100644
index 00000000000..6fd0a376dec
--- /dev/null
+++ b/vendor/gitignore/Lua.gitignore
@@ -0,0 +1,41 @@
+# Compiled Lua sources
+luac.out
+
+# luarocks build files
+*.src.rock
+*.zip
+*.tar.gz
+
+# Object files
+*.o
+*.os
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+*.def
+*.exp
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
diff --git a/vendor/gitignore/Magento.gitignore b/vendor/gitignore/Magento.gitignore
new file mode 100644
index 00000000000..195c9b7a029
--- /dev/null
+++ b/vendor/gitignore/Magento.gitignore
@@ -0,0 +1,104 @@
+.htaccess.sample
+.modgit/
+.modman/
+app/code/community/Phoenix/Moneybookers/
+app/code/community/Cm/RedisSession/
+app/code/core/
+app/design/adminhtml/default/default/
+app/design/frontend/base/
+app/design/frontend/rwd/
+app/design/frontend/default/blank/
+app/design/frontend/default/default/
+app/design/frontend/default/iphone/
+app/design/frontend/default/modern/
+app/design/frontend/enterprise/default
+app/design/install/
+app/etc/modules/Enterprise_*
+app/etc/modules/Mage_*.xml
+app/etc/modules/Phoenix_Moneybookers.xml
+app/etc/modules/Cm_RedisSession.xml
+app/etc/applied.patches.list
+app/etc/config.xml
+app/etc/enterprise.xml
+app/etc/local.xml.additional
+app/etc/local.xml.template
+app/etc/local.xml
+app/.htaccess
+app/bootstrap.php
+app/locale/en_US/
+app/Mage.php
+/cron.php
+cron.sh
+dev/.htaccess
+dev/tests/functional/
+downloader/
+errors/
+favicon.ico
+/get.php
+includes/
+/index.php
+index.php.sample
+/install.php
+js/blank.html
+js/calendar/
+js/enterprise/
+js/extjs/
+js/firebug/
+js/flash/
+js/index.php
+js/jscolor/
+js/lib/
+js/mage/
+js/prototype/
+js/scriptaculous/
+js/spacer.gif
+js/tiny_mce/
+js/varien/
+lib/3Dsecure/
+lib/Apache/
+lib/flex/
+lib/googlecheckout/
+lib/.htaccess
+lib/LinLibertineFont/
+lib/Mage/
+lib/PEAR/
+lib/Pelago/
+lib/phpseclib/
+lib/Varien/
+lib/Zend/
+lib/Cm/
+lib/Credis/
+lib/Magento/
+LICENSE_AFL.txt
+LICENSE.html
+LICENSE.txt
+LICENSE_EE*
+/mage
+media/
+/api.php
+nbproject/
+pear
+pear/
+php.ini.sample
+pkginfo/
+RELEASE_NOTES.txt
+shell/.htaccess
+shell/abstract.php
+shell/compiler.php
+shell/indexer.php
+shell/log.php
+sitemap.xml
+skin/adminhtml/default/default/
+skin/adminhtml/default/enterprise
+skin/frontend/base/
+skin/frontend/rwd/
+skin/frontend/default/blank/
+skin/frontend/default/blue/
+skin/frontend/default/default/
+skin/frontend/default/french/
+skin/frontend/default/german/
+skin/frontend/default/iphone/
+skin/frontend/default/modern/
+skin/frontend/enterprise
+skin/install/
+var/
diff --git a/vendor/gitignore/Maven.gitignore b/vendor/gitignore/Maven.gitignore
new file mode 100644
index 00000000000..1cdc9f7fd45
--- /dev/null
+++ b/vendor/gitignore/Maven.gitignore
@@ -0,0 +1,9 @@
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
diff --git a/vendor/gitignore/Mercury.gitignore b/vendor/gitignore/Mercury.gitignore
new file mode 100644
index 00000000000..70ec8693971
--- /dev/null
+++ b/vendor/gitignore/Mercury.gitignore
@@ -0,0 +1,13 @@
+Mercury/
+Mercury.modules
+*.mh
+*.err
+*.init
+*.dll
+*.exe
+*.a
+*.so
+*.dylib
+*.beams
+*.d
+*.c_date
diff --git a/vendor/gitignore/MetaProgrammingSystem.gitignore b/vendor/gitignore/MetaProgrammingSystem.gitignore
new file mode 100644
index 00000000000..3e75841041c
--- /dev/null
+++ b/vendor/gitignore/MetaProgrammingSystem.gitignore
@@ -0,0 +1,16 @@
+workspace.xml
+junitvmwatcher*.properties
+build.properties
+
+# generated java classes and java source files
+#   manually add any custom artifacts that can't be generated from the models
+#   http://confluence.jetbrains.com/display/MPSD25/HowTo+--+MPS+and+Git
+classes_gen
+source_gen
+source_gen.caches
+
+# generated test code and test results
+test_gen
+test_gen.caches
+TEST-*.xml
+junit*.properties
diff --git a/vendor/gitignore/Nanoc.gitignore b/vendor/gitignore/Nanoc.gitignore
new file mode 100644
index 00000000000..abc21828a3e
--- /dev/null
+++ b/vendor/gitignore/Nanoc.gitignore
@@ -0,0 +1,10 @@
+# For projects using nanoc (http://nanoc.ws/)
+
+# Default location for output, needs to match output_dir's value found in config.yaml
+output/
+
+# Temporary file directory
+tmp/
+
+# Crash Log
+crash.log
diff --git a/vendor/gitignore/Nim.gitignore b/vendor/gitignore/Nim.gitignore
new file mode 100644
index 00000000000..67d9b34c6ce
--- /dev/null
+++ b/vendor/gitignore/Nim.gitignore
@@ -0,0 +1 @@
+nimcache/
diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore
new file mode 100644
index 00000000000..5148e527a7e
--- /dev/null
+++ b/vendor/gitignore/Node.gitignore
@@ -0,0 +1,37 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
diff --git a/vendor/gitignore/OCaml.gitignore b/vendor/gitignore/OCaml.gitignore
new file mode 100644
index 00000000000..f7817ae5c36
--- /dev/null
+++ b/vendor/gitignore/OCaml.gitignore
@@ -0,0 +1,20 @@
+*.annot
+*.cmo
+*.cma
+*.cmi
+*.a
+*.o
+*.cmx
+*.cmxs
+*.cmxa
+
+# ocamlbuild working directory
+_build/
+
+# ocamlbuild targets
+*.byte
+*.native
+
+# oasis generated files
+setup.data
+setup.log
diff --git a/vendor/gitignore/Objective-C.gitignore b/vendor/gitignore/Objective-C.gitignore
new file mode 100644
index 00000000000..3020bc327a7
--- /dev/null
+++ b/vendor/gitignore/Objective-C.gitignore
@@ -0,0 +1,51 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/vendor/gitignore/Opa.gitignore b/vendor/gitignore/Opa.gitignore
new file mode 100644
index 00000000000..74c6219ceda
--- /dev/null
+++ b/vendor/gitignore/Opa.gitignore
@@ -0,0 +1,13 @@
+_build
+_tracks
+
+opa-debug-js
+
+*.opp
+*.opx
+*.opx.broken
+*.dump
+*.api
+*.api-txt
+*.exe
+*.log
diff --git a/vendor/gitignore/OpenCart.gitignore b/vendor/gitignore/OpenCart.gitignore
new file mode 100644
index 00000000000..28e45aa6aac
--- /dev/null
+++ b/vendor/gitignore/OpenCart.gitignore
@@ -0,0 +1,13 @@
+.htaccess
+/config.php
+admin/config.php
+
+!index.html
+
+download/
+image/data/
+image/cache/
+system/cache/
+system/logs/
+
+system/storage/
diff --git a/vendor/gitignore/OracleForms.gitignore b/vendor/gitignore/OracleForms.gitignore
new file mode 100644
index 00000000000..699a4940118
--- /dev/null
+++ b/vendor/gitignore/OracleForms.gitignore
@@ -0,0 +1,8 @@
+# Compiled Form Modules
+*.fmx
+
+# Compiled Menu Modules
+*.mmx
+
+# Compiled Pre-Linked Libraries
+*.plx
diff --git a/vendor/gitignore/Packer.gitignore b/vendor/gitignore/Packer.gitignore
new file mode 100644
index 00000000000..1b7a03efdd7
--- /dev/null
+++ b/vendor/gitignore/Packer.gitignore
@@ -0,0 +1,5 @@
+# Cache objects
+packer_cache/
+
+# For built boxes
+*.box
diff --git a/vendor/gitignore/Perl.gitignore b/vendor/gitignore/Perl.gitignore
new file mode 100644
index 00000000000..ae2ad536abb
--- /dev/null
+++ b/vendor/gitignore/Perl.gitignore
@@ -0,0 +1,20 @@
+/blib/
+/.build/
+_build/
+cover_db/
+inc/
+Build
+!Build/
+Build.bat
+.last_cover_stats
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
+nytprof.out
+/pm_to_blib
+*.o
+*.bs
+/_eumm/
diff --git a/vendor/gitignore/Phalcon.gitignore b/vendor/gitignore/Phalcon.gitignore
new file mode 100644
index 00000000000..6ffe3aa220a
--- /dev/null
+++ b/vendor/gitignore/Phalcon.gitignore
@@ -0,0 +1,2 @@
+/cache/
+/config/development/
diff --git a/vendor/gitignore/PlayFramework.gitignore b/vendor/gitignore/PlayFramework.gitignore
new file mode 100644
index 00000000000..6d67f119175
--- /dev/null
+++ b/vendor/gitignore/PlayFramework.gitignore
@@ -0,0 +1,15 @@
+# Ignore Play! working directory #
+bin/
+/db
+.eclipse
+/lib/
+/logs/
+/modules
+/project/target
+/target
+tmp/
+test-result
+server.pid
+*.eml
+/dist/
+.cache
diff --git a/vendor/gitignore/Plone.gitignore b/vendor/gitignore/Plone.gitignore
new file mode 100644
index 00000000000..770a8681ac3
--- /dev/null
+++ b/vendor/gitignore/Plone.gitignore
@@ -0,0 +1,18 @@
+*.pyc
+*.pyo
+*.tmp*
+*.mo
+*.egg
+*.EGG
+*.egg-info
+*.EGG-INFO
+.*.cfg
+bin/
+build/
+develop-eggs/
+downloads/
+eggs/
+fake-eggs/
+parts/
+dist/
+var/
diff --git a/vendor/gitignore/Prestashop.gitignore b/vendor/gitignore/Prestashop.gitignore
new file mode 100644
index 00000000000..7c6ae1e31cc
--- /dev/null
+++ b/vendor/gitignore/Prestashop.gitignore
@@ -0,0 +1,32 @@
+# Private files
+# The following files contain your database credentials and other personal data.
+
+config/settings.*.php
+
+# Cache, temp and generated files
+# The following files are generated by PrestaShop.
+
+admin-dev/autoupgrade/
+/cache/
+!/cache/index.php
+!/cache/cachefs/index.php
+!/cache/purifier/index.php
+!/cache/push/index.php
+!/cache/sandbox/index.php
+!/cache/smarty/index.php
+!/cache/tcpdf/index.php
+config/xml/*.xml
+/log/*
+*sitemap.xml
+themes/*/cache/
+modules/*/config*.xml
+
+# Site content
+# The following folders contain product images, virtual products, CSV's, etc.
+
+admin-dev/backups/
+admin-dev/export/
+admin-dev/import/
+download/
+/img/*
+upload/
diff --git a/vendor/gitignore/Processing.gitignore b/vendor/gitignore/Processing.gitignore
new file mode 100644
index 00000000000..85f269a89f6
--- /dev/null
+++ b/vendor/gitignore/Processing.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+applet
+application.linux32
+application.linux64
+application.windows32
+application.windows64
+application.macosx
diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore
new file mode 100644
index 00000000000..72364f99fe4
--- /dev/null
+++ b/vendor/gitignore/Python.gitignore
@@ -0,0 +1,89 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
diff --git a/vendor/gitignore/Qooxdoo.gitignore b/vendor/gitignore/Qooxdoo.gitignore
new file mode 100644
index 00000000000..d0c64102d85
--- /dev/null
+++ b/vendor/gitignore/Qooxdoo.gitignore
@@ -0,0 +1,5 @@
+cache
+cache-downloads
+inspector
+api
+source/inspector.html
diff --git a/vendor/gitignore/Qt.gitignore b/vendor/gitignore/Qt.gitignore
new file mode 100644
index 00000000000..fa24b2efee8
--- /dev/null
+++ b/vendor/gitignore/Qt.gitignore
@@ -0,0 +1,38 @@
+# C++ objects and libs
+
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+qrc_*.cpp
+ui_*.h
+Makefile*
+*build-*
+
+# QtCreator
+
+*.autosave
+
+# QtCtreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCtreator CMake
+CMakeLists.txt.user
+
diff --git a/vendor/gitignore/R.gitignore b/vendor/gitignore/R.gitignore
new file mode 100644
index 00000000000..fcff087aebb
--- /dev/null
+++ b/vendor/gitignore/R.gitignore
@@ -0,0 +1,33 @@
+# History files
+.Rhistory
+.Rapp.history
+
+# Session Data files
+.RData
+
+# Example code in package build process
+*-Ex.R
+
+# Output files from R CMD build
+/*.tar.gz
+
+# Output files from R CMD check
+/*.Rcheck/
+
+# RStudio files
+.Rproj.user/
+
+# produced vignettes
+vignettes/*.html
+vignettes/*.pdf
+
+# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
+.httr-oauth
+
+# knitr and R markdown default cache directories
+/*_cache/
+/cache/
+
+# Temporary files created by R markdown
+*.utf8.md
+*.knit.md
diff --git a/vendor/gitignore/ROS.gitignore b/vendor/gitignore/ROS.gitignore
new file mode 100644
index 00000000000..f8bcd117371
--- /dev/null
+++ b/vendor/gitignore/ROS.gitignore
@@ -0,0 +1,47 @@
+build/
+bin/
+lib/
+msg_gen/
+srv_gen/
+msg/*Action.msg
+msg/*ActionFeedback.msg
+msg/*ActionGoal.msg
+msg/*ActionResult.msg
+msg/*Feedback.msg
+msg/*Goal.msg
+msg/*Result.msg
+msg/_*.py
+
+# Generated by dynamic reconfigure
+*.cfgc
+/cfg/cpp/
+/cfg/*.py
+
+# Ignore generated docs
+*.dox
+*.wikidoc
+
+# eclipse stuff
+.project
+.cproject
+
+# qcreator stuff
+CMakeLists.txt.user
+
+srv/_*.py
+*.pcd
+*.pyc
+qtcreator-*
+*.user
+
+/planning/cfg
+/planning/docs
+/planning/src
+
+*~
+
+# Emacs
+.#*
+
+# Catkin custom files
+CATKIN_IGNORE
diff --git a/vendor/gitignore/Rails.gitignore b/vendor/gitignore/Rails.gitignore
new file mode 100644
index 00000000000..2121e0a8038
--- /dev/null
+++ b/vendor/gitignore/Rails.gitignore
@@ -0,0 +1,38 @@
+*.rbc
+capybara-*.html
+.rspec
+/log
+/tmp
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/public/system
+/coverage/
+/spec/tmp
+**.orig
+rerun.txt
+pickle-email-*.html
+
+# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
+config/initializers/secret_token.rb
+config/secrets.yml
+
+## Environment normalization:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalize the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+/vendor/assets/bower_components
+*.bowerrc
+bower.json
+
+# Ignore pow environment settings
+.powenv
+
+# Ignore Byebug command history file.
+.byebug_history
diff --git a/vendor/gitignore/RhodesRhomobile.gitignore b/vendor/gitignore/RhodesRhomobile.gitignore
new file mode 100644
index 00000000000..a211dcc3b0f
--- /dev/null
+++ b/vendor/gitignore/RhodesRhomobile.gitignore
@@ -0,0 +1,9 @@
+rholog-*
+sim-*
+bin/libs
+bin/RhoBundle
+bin/tmp
+bin/target
+bin/*.ap_
+*.o
+*.jar
diff --git a/vendor/gitignore/Ruby.gitignore b/vendor/gitignore/Ruby.gitignore
new file mode 100644
index 00000000000..5e1422c9c3f
--- /dev/null
+++ b/vendor/gitignore/Ruby.gitignore
@@ -0,0 +1,50 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/vendor/gitignore/Rust.gitignore b/vendor/gitignore/Rust.gitignore
new file mode 100644
index 00000000000..cb14a420640
--- /dev/null
+++ b/vendor/gitignore/Rust.gitignore
@@ -0,0 +1,7 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+Cargo.lock
diff --git a/vendor/gitignore/SCons.gitignore b/vendor/gitignore/SCons.gitignore
new file mode 100644
index 00000000000..39d9743a082
--- /dev/null
+++ b/vendor/gitignore/SCons.gitignore
@@ -0,0 +1,2 @@
+# for projects that use SCons for building: http://http://www.scons.org/
+.sconsign.dblite
diff --git a/vendor/gitignore/Sass.gitignore b/vendor/gitignore/Sass.gitignore
new file mode 100644
index 00000000000..486b32ce90c
--- /dev/null
+++ b/vendor/gitignore/Sass.gitignore
@@ -0,0 +1,2 @@
+.sass-cache/
+*.css.map
diff --git a/vendor/gitignore/Scala.gitignore b/vendor/gitignore/Scala.gitignore
new file mode 100644
index 00000000000..c58d83b3189
--- /dev/null
+++ b/vendor/gitignore/Scala.gitignore
@@ -0,0 +1,17 @@
+*.class
+*.log
+
+# sbt specific
+.cache
+.history
+.lib/
+dist/*
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.scala_dependencies
+.worksheet
diff --git a/vendor/gitignore/Scheme.gitignore b/vendor/gitignore/Scheme.gitignore
new file mode 100644
index 00000000000..cbb89d78da5
--- /dev/null
+++ b/vendor/gitignore/Scheme.gitignore
@@ -0,0 +1,7 @@
+*.ss~
+*.ss#*
+.#*.ss
+
+*.scm~
+*.scm#*
+.#*.scm
diff --git a/vendor/gitignore/Scrivener.gitignore b/vendor/gitignore/Scrivener.gitignore
new file mode 100644
index 00000000000..3b39c66ba12
--- /dev/null
+++ b/vendor/gitignore/Scrivener.gitignore
@@ -0,0 +1,7 @@
+/Files/binder.autosave
+/Files/binder.backup
+/Files/search.indexes
+/Files/user.lock
+/Files/Docs/docs.checksum
+/QuickLook/
+/Settings/ui.plist
diff --git a/vendor/gitignore/Sdcc.gitignore b/vendor/gitignore/Sdcc.gitignore
new file mode 100644
index 00000000000..07ee7d59aba
--- /dev/null
+++ b/vendor/gitignore/Sdcc.gitignore
@@ -0,0 +1,8 @@
+# SDCC stuff
+*.lnk
+*.lst
+*.map
+*.mem
+*.rel
+*.rst
+*.sym
diff --git a/vendor/gitignore/SeamGen.gitignore b/vendor/gitignore/SeamGen.gitignore
new file mode 100644
index 00000000000..a418cf376c5
--- /dev/null
+++ b/vendor/gitignore/SeamGen.gitignore
@@ -0,0 +1,26 @@
+/bootstrap/data
+/bootstrap/tmp
+/classes/
+/dist/
+/exploded-archives/
+/test-build/
+/test-output/
+/test-report/
+/target/
+temp-testng-customsuite.xml
+
+# based on http://stackoverflow.com/a/8865858/422476 I am removing inline comments
+
+#/classes/  		              all class files
+#/dist/                       contains generated war files for deployment
+#/exploded-archives/		      war content generation during deploy (or explode)
+#/test-build/                 test compilation (ant target for Seam)
+#/test-output/                test results
+#/test-report/                test report generation for, e.g., Hudson
+#/target/                     maven output folder
+#temp-testng-customsuite.xml	generated when running test cases under Eclipse
+
+# Thanks to @VonC and @kraftan for their helpful answers on a related question
+# on StackOverflow.com:
+# http://stackoverflow.com/questions/4176687
+# /what-is-the-recommended-source-control-ignore-pattern-for-seam-projects
diff --git a/vendor/gitignore/SketchUp.gitignore b/vendor/gitignore/SketchUp.gitignore
new file mode 100644
index 00000000000..5160df3c6bf
--- /dev/null
+++ b/vendor/gitignore/SketchUp.gitignore
@@ -0,0 +1 @@
+*.skb
diff --git a/vendor/gitignore/Smalltalk.gitignore b/vendor/gitignore/Smalltalk.gitignore
new file mode 100644
index 00000000000..75272b23472
--- /dev/null
+++ b/vendor/gitignore/Smalltalk.gitignore
@@ -0,0 +1,18 @@
+# changes file
+*.changes
+
+# system image
+*.image
+
+# Pharo Smalltalk Debug log file
+PharoDebug.log
+
+# Squeak Smalltalk Debug log file
+SqueakDebug.log
+
+# Monticello package cache
+/package-cache
+
+# Metacello-github cache
+/github-cache
+github-*.zip
diff --git a/vendor/gitignore/Stella.gitignore b/vendor/gitignore/Stella.gitignore
new file mode 100644
index 00000000000..402a5438373
--- /dev/null
+++ b/vendor/gitignore/Stella.gitignore
@@ -0,0 +1,12 @@
+# Atari 2600 (Stella) support for multiple assemblers
+# - DASM
+# - CC65
+
+# Assembled binaries and object directories
+obj/
+a.out
+*.bin
+*.a26
+
+# Add in special Atari 7800-based binaries for good measure
+*.a78
diff --git a/vendor/gitignore/SugarCRM.gitignore b/vendor/gitignore/SugarCRM.gitignore
new file mode 100644
index 00000000000..842c3ec518b
--- /dev/null
+++ b/vendor/gitignore/SugarCRM.gitignore
@@ -0,0 +1,25 @@
+## SugarCRM
+# Ignore custom .htaccess stuff.
+/.htaccess
+# Ignore the cache directory completely.
+# This will break the current behaviour. Which was often leading to
+# the misuse of the repository as backup replacement.
+# For development the cache directory can be safely ignored and
+# therefore it is ignored.
+/cache/
+# Ignore some files and directories from the custom directory.
+/custom/history/
+/custom/modulebuilder/
+/custom/working/
+/custom/modules/*/Ext/
+/custom/application/Ext/
+# Custom configuration should also be ignored.
+/config.php
+/config_override.php
+# The silent upgrade scripts aren't needed.
+/silentUpgrade*.php
+# Logs files can safely be ignored.
+*.log
+# Ignore the new upload directories.
+/upload/
+/upload_backup/
diff --git a/vendor/gitignore/Swift.gitignore b/vendor/gitignore/Swift.gitignore
new file mode 100644
index 00000000000..8a29fa52af4
--- /dev/null
+++ b/vendor/gitignore/Swift.gitignore
@@ -0,0 +1,63 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
diff --git a/vendor/gitignore/Symfony.gitignore b/vendor/gitignore/Symfony.gitignore
new file mode 100644
index 00000000000..7d56f982f81
--- /dev/null
+++ b/vendor/gitignore/Symfony.gitignore
@@ -0,0 +1,48 @@
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+/var/sessions/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+!var/sessions/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# Assets managed by Bower
+/web/assets/vendor/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+# Composer PHAR
+/composer.phar
+
+# Backup entities generated with doctrine:generate:entities command
+*/Entity/*~
diff --git a/vendor/gitignore/SymphonyCMS.gitignore b/vendor/gitignore/SymphonyCMS.gitignore
new file mode 100644
index 00000000000..671c7ff9e32
--- /dev/null
+++ b/vendor/gitignore/SymphonyCMS.gitignore
@@ -0,0 +1,6 @@
+manifest/cache/
+manifest/logs/
+manifest/tmp/
+symphony/
+workspace/uploads/
+install-log.txt
diff --git a/vendor/gitignore/TeX.gitignore b/vendor/gitignore/TeX.gitignore
new file mode 100644
index 00000000000..4123a577c47
--- /dev/null
+++ b/vendor/gitignore/TeX.gitignore
@@ -0,0 +1,180 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+*.fmt
+*.fot
+*.cb
+*.cb2
+
+## Intermediate documents:
+*.dvi
+*-converted-to.*
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.brf
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex
+*.synctex.gz
+*.synctex.gz(busy)
+*.pdfsync
+
+## Auxiliary and intermediate files from other packages:
+# algorithms
+*.alg
+*.loa
+
+# achemso
+acs-*.bib
+
+# amsthm
+*.thm
+
+# beamer
+*.nav
+*.snm
+*.vrb
+
+# cprotect
+*.cpt
+
+# fixme
+*.lox
+
+#(r)(e)ledmac/(r)(e)ledpar
+*.end
+*.?end
+*.[1-9]
+*.[1-9][0-9]
+*.[1-9][0-9][0-9]
+*.[1-9]R
+*.[1-9][0-9]R
+*.[1-9][0-9][0-9]R
+*.eledsec[1-9]
+*.eledsec[1-9]R
+*.eledsec[1-9][0-9]
+*.eledsec[1-9][0-9]R
+*.eledsec[1-9][0-9][0-9]
+*.eledsec[1-9][0-9][0-9]R
+
+# glossaries
+*.acn
+*.acr
+*.glg
+*.glo
+*.gls
+*.glsdefs
+
+# gnuplottex
+*-gnuplottex-*
+
+# hyperref
+*.brf
+
+# knitr
+*-concordance.tex
+# TODO Comment the next line if you want to keep your tikz graphics files
+*.tikz
+*-tikzDictionary
+
+# listings
+*.lol
+
+# makeidx
+*.idx
+*.ilg
+*.ind
+*.ist
+
+# minitoc
+*.maf
+*.mlf
+*.mlt
+*.mtc
+*.mtc[0-9]
+*.mtc[1-9][0-9]
+
+# minted
+_minted*
+*.pyg
+
+# morewrites
+*.mw
+
+# mylatexformat
+*.fmt
+
+# nomencl
+*.nlo
+
+# sagetex
+*.sagetex.sage
+*.sagetex.py
+*.sagetex.scmd
+
+# sympy
+*.sout
+*.sympy
+sympy-plots-for-*.tex/
+
+# pdfcomment
+*.upa
+*.upb
+
+# pythontex
+*.pytxcode
+pythontex-files-*/
+
+# thmtools
+*.loe
+
+# TikZ & PGF
+*.dpth
+*.md5
+*.auxlock
+
+# todonotes
+*.tdo
+
+# xindy
+*.xdy
+
+# xypic precompiled matrices
+*.xyc
+
+# endfloat
+*.ttt
+*.fff
+
+# Latexian
+TSWLatexianTemp*
+
+## Editors:
+# WinEdt
+*.bak
+*.sav
+
+# Texpad
+.texpadtmp
+
+# Kile
+*.backup
+
+# KBibTeX
+*~[0-9]*
diff --git a/vendor/gitignore/Terraform.gitignore b/vendor/gitignore/Terraform.gitignore
new file mode 100644
index 00000000000..7868d16d216
--- /dev/null
+++ b/vendor/gitignore/Terraform.gitignore
@@ -0,0 +1,3 @@
+# Compiled files
+*.tfstate
+*.tfstate.backup
diff --git a/vendor/gitignore/Textpattern.gitignore b/vendor/gitignore/Textpattern.gitignore
new file mode 100644
index 00000000000..3805636d622
--- /dev/null
+++ b/vendor/gitignore/Textpattern.gitignore
@@ -0,0 +1,11 @@
+.htaccess
+css.php
+rpc/
+sites/site*/admin/
+sites/site*/private/
+sites/site*/public/admin/
+sites/site*/public/setup/
+sites/site*/public/theme/
+textpattern/
+HISTORY.txt
+README.txt
diff --git a/vendor/gitignore/TurboGears2.gitignore b/vendor/gitignore/TurboGears2.gitignore
new file mode 100644
index 00000000000..122b3de221f
--- /dev/null
+++ b/vendor/gitignore/TurboGears2.gitignore
@@ -0,0 +1,20 @@
+*.py[co]
+
+# Default development database
+devdata.db
+
+# Default data directory
+data/*
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
diff --git a/vendor/gitignore/Typo3.gitignore b/vendor/gitignore/Typo3.gitignore
new file mode 100644
index 00000000000..cb024fefe99
--- /dev/null
+++ b/vendor/gitignore/Typo3.gitignore
@@ -0,0 +1,20 @@
+## TYPO3 v6.2
+# Ignore several upload and file directories.
+/fileadmin/user_upload/
+/fileadmin/_temp_/
+/fileadmin/_processed_/
+/uploads/
+# Ignore cache
+/typo3conf/temp_CACHED*
+/typo3conf/temp_fieldInfo.php
+/typo3conf/deprecation_*.log
+/typo3conf/AdditionalConfiguration.php
+# Ignore system folders, you should have them symlinked.
+# If not comment out the following entries.
+/typo3
+/typo3_src
+/typo3_src-*
+/.htaccess
+/index.php
+# Ignore temp directory.
+/typo3temp/
diff --git a/vendor/gitignore/Umbraco.gitignore b/vendor/gitignore/Umbraco.gitignore
new file mode 100644
index 00000000000..ea05e1fb2a9
--- /dev/null
+++ b/vendor/gitignore/Umbraco.gitignore
@@ -0,0 +1,19 @@
+# Note: VisualStudio gitignore rules may also be relevant
+
+# Umbraco
+# Ignore unimportant folders generated by Umbraco
+**/App_Data/Logs/
+**/App_Data/[Pp]review/
+**/App_Data/TEMP/
+**/App_Data/NuGetBackup/
+
+# Ignore Umbraco content cache file
+**/App_Data/umbraco.config
+
+# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
+# Make sure to include details from VisualStudio.gitignore BEFORE this
+!**/App_Data/[Pp]ackages/
+!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+
+# ImageProcessor DiskCache 
+**/App_Data/cache/
diff --git a/vendor/gitignore/Unity.gitignore b/vendor/gitignore/Unity.gitignore
new file mode 100644
index 00000000000..5aafcbb7f1d
--- /dev/null
+++ b/vendor/gitignore/Unity.gitignore
@@ -0,0 +1,30 @@
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/Assets/AssetStoreTools*
+
+# Autogenerated VS/MD solution and project files
+ExportedObj/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+
+
+# Unity3D generated meta files
+*.pidb.meta
+
+# Unity3D Generated File On Crash Reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
diff --git a/vendor/gitignore/UnrealEngine.gitignore b/vendor/gitignore/UnrealEngine.gitignore
new file mode 100644
index 00000000000..75b1186b0af
--- /dev/null
+++ b/vendor/gitignore/UnrealEngine.gitignore
@@ -0,0 +1,62 @@
+# Visual Studio 2015 user specific files
+.vs/
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+
+# Builds
+Build/*
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*
diff --git a/vendor/gitignore/VVVV.gitignore b/vendor/gitignore/VVVV.gitignore
new file mode 100644
index 00000000000..5df4324603e
--- /dev/null
+++ b/vendor/gitignore/VVVV.gitignore
@@ -0,0 +1,6 @@
+
+# .v4p backup files
+*~.xml
+
+# Dynamic plugins .dll
+bin/
diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore
new file mode 100644
index 00000000000..f1e3d20e056
--- /dev/null
+++ b/vendor/gitignore/VisualStudio.gitignore
@@ -0,0 +1,252 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
diff --git a/vendor/gitignore/Waf.gitignore b/vendor/gitignore/Waf.gitignore
new file mode 100644
index 00000000000..48e8d8f7be4
--- /dev/null
+++ b/vendor/gitignore/Waf.gitignore
@@ -0,0 +1,4 @@
+# for projects that use Waf for building: http://code.google.com/p/waf/
+.waf-*
+.waf3-*
+.lock-*
diff --git a/vendor/gitignore/WordPress.gitignore b/vendor/gitignore/WordPress.gitignore
new file mode 100644
index 00000000000..97923503c4c
--- /dev/null
+++ b/vendor/gitignore/WordPress.gitignore
@@ -0,0 +1,18 @@
+*.log
+wp-config.php
+wp-content/advanced-cache.php
+wp-content/backup-db/
+wp-content/backups/
+wp-content/blogs.dir/
+wp-content/cache/
+wp-content/upgrade/
+wp-content/uploads/
+wp-content/wp-cache-config.php
+wp-content/plugins/hello.php
+
+/.htaccess
+/license.txt
+/readme.html
+/sitemap.xml
+/sitemap.xml.gz
+
diff --git a/vendor/gitignore/Xojo.gitignore b/vendor/gitignore/Xojo.gitignore
new file mode 100644
index 00000000000..1b036dd4f2e
--- /dev/null
+++ b/vendor/gitignore/Xojo.gitignore
@@ -0,0 +1,11 @@
+# Xojo (formerly REALbasic and Real Studio)
+
+Builds*
+*.debug
+*.debug.app
+Debug*.exe
+Debug*/Debug*.exe
+Debug*/Debug*\ Libs
+*.rbuistate
+*.xojo_uistate
+*.obsolete
diff --git a/vendor/gitignore/Yeoman.gitignore b/vendor/gitignore/Yeoman.gitignore
new file mode 100644
index 00000000000..7170d72018d
--- /dev/null
+++ b/vendor/gitignore/Yeoman.gitignore
@@ -0,0 +1,6 @@
+node_modules/
+bower_components/
+*.log
+
+build/
+dist/
diff --git a/vendor/gitignore/Yii.gitignore b/vendor/gitignore/Yii.gitignore
new file mode 100644
index 00000000000..70f087546f2
--- /dev/null
+++ b/vendor/gitignore/Yii.gitignore
@@ -0,0 +1,6 @@
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/
diff --git a/vendor/gitignore/ZendFramework.gitignore b/vendor/gitignore/ZendFramework.gitignore
new file mode 100644
index 00000000000..80adb154900
--- /dev/null
+++ b/vendor/gitignore/ZendFramework.gitignore
@@ -0,0 +1,25 @@
+# Composer files
+composer.phar
+vendor/
+
+# Local configs
+config/autoload/*.local.php
+
+# Binary gettext files
+*.mo
+
+# Data
+data/logs/
+data/cache/
+data/sessions/
+data/tmp/
+temp/
+
+#Doctrine 2
+data/DoctrineORMModule/Proxy/
+data/DoctrineORMModule/cache/
+
+
+# Legacy ZF1
+demos/
+extras/documentation
diff --git a/vendor/gitignore/Zephir.gitignore b/vendor/gitignore/Zephir.gitignore
new file mode 100644
index 00000000000..839cb5d7070
--- /dev/null
+++ b/vendor/gitignore/Zephir.gitignore
@@ -0,0 +1,26 @@
+# Cache files, generates by Zephir
+.temp/
+.libs/
+
+# Object files, generates by linker
+*.lo
+*.la
+*.o
+*.loT
+
+# Files generated by configure and Zephir,
+# not required for extension compilation.
+ext/build/
+ext/modules/
+ext/Makefile*
+ext/config*
+ext/acinclude.m4
+ext/aclocal.m4
+ext/autom4te*
+ext/install-sh
+ext/ltmain.sh
+ext/missing
+ext/mkinstalldirs
+ext/run-tests.php
+ext/.deps
+ext/libtool

From 1f5fcb638d6b432d76a639ccc35acc94d8ae6ac7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 11 May 2016 19:38:43 -0500
Subject: [PATCH 0640/1431] Dropdown implementation

---
 CHANGELOG                                     |  2 +
 .../blob/blob_gitignore_selector.js.coffee    |  3 +-
 app/assets/javascripts/gl_dropdown.js.coffee  | 67 +++++++++++++++----
 app/assets/stylesheets/pages/editor.scss      |  2 +-
 app/helpers/blob_helper.rb                    |  8 ++-
 app/views/projects/blob/_editor.html.haml     |  4 +-
 .../projects/files/gitignore_dropdown_spec.rb | 30 +++++++++
 7 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 spec/features/projects/files/gitignore_dropdown_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 457af51605c..683f1b1a650 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -71,6 +71,8 @@ v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
+  - Fix import from gitlab.com to a private instance failure
+  - When creating a .gitignore file a dropdown with templates will be provided
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
index b413f31da00..2112f5c855a 100644
--- a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
+++ b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
@@ -29,7 +29,8 @@ class @BlobGitIgnoreSelector
     filename = @fileNameInput.val() or $('.editor-file-name').text().trim()
     @wrapper.toggleClass 'hidden', filename isnt '.gitignore'
 
-  onClick: (item) ->
+  onClick: (item, el, e) ->
+    e.preventDefault()
     @requestIgnoreFile(item.text)
 
   requestIgnoreFile: (name) ->
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 1d1bfeb2e77..0f2ac664ac8 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -60,9 +60,23 @@ class GitLabDropdownFilter
       results = data
 
       if search_text isnt ''
-        results = fuzzaldrinPlus.filter(data, search_text,
-          key: @options.keys
-        )
+        # handle groups
+        if _.isArray(data)
+          results = fuzzaldrinPlus.filter(data, search_text,
+            key: @options.keys
+          )
+        else if _.isObject(data)
+          results = {}
+          for key, group of data
+            tmp = fuzzaldrinPlus.filter(group, search_text,
+              key: @options.keys
+            )
+
+            if tmp.length
+              results[key] = []
+
+              tmp.map (item) ->
+                results[key].push item
 
       @options.callback results
     else
@@ -141,8 +155,9 @@ class GitLabDropdown
     searchFields = if @options.search then @options.search.fields else [];
 
     if @options.data
-      # If data is an array
-      if _.isArray @options.data
+      # If we provided data
+      # data could be an array of objects or a group of arrays
+      if _.isObject(@options.data) and not _.isFunction(@options.data)
         @fullData = @options.data
         @parseData @options.data
       else
@@ -230,19 +245,33 @@ class GitLabDropdown
   parseData: (data) ->
     @renderedData = data
 
-    # Render each row
-    html = $.map data, (obj) =>
-      return @renderItem(obj)
-
     if @options.filterable and data.length is 0
       # render no matching results
       html = [@noResults()]
+    else
+      # Handle array groups
+      if String(data) is "[object Object]"
+        html = []
+        for name, groupData of data
+          # Add header for each group
+          html.push(@renderItem(header: name, name))
+
+          @renderData(groupData, name)
+            .map (item) ->
+              html.push item
+      else
+        # Render each row
+        html = @renderData(data)
 
     # Render the full menu
     full_html = @renderMenu(html.join(""))
 
     @appendMenu(full_html)
 
+  renderData: (data, group = false) ->
+    $.map data, (obj, index) =>
+      return @renderItem(obj, group, index)
+
   shouldPropagate: (e) =>
     if @options.multiSelect
       $target = $(e.target)
@@ -299,11 +328,10 @@ class GitLabDropdown
     selector = '.dropdown-content'
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one .dropdown-content"
-
     $(selector, @dropdown).html html
 
   # Render the row
-  renderItem: (data) ->
+  renderItem: (data, group = false, index = false) ->
     html = ""
 
     # Divider
@@ -346,8 +374,13 @@ class GitLabDropdown
       if @highlight
         text = @highlightTextMatches(text, @filterInput.val())
 
+      if group
+        groupAttrs = "data-group='#{group}' data-index='#{index}'"
+      else
+        groupAttrs = ''
+
       html = "<li>
-        <a href='#{url}' class='#{cssClass}'>
+        <a href='#{url}' #{groupAttrs} class='#{cssClass}'>
           #{text}
         </a>
       </li>"
@@ -377,9 +410,15 @@ class GitLabDropdown
 
   rowClicked: (el) ->
     fieldName = @options.fieldName
-    selectedIndex = el.parent().index()
     if @renderedData
-      selectedObject = @renderedData[selectedIndex]
+      groupName = el.data('group')
+      if groupName
+        selectedIndex = el.data('index')
+        selectedObject = @renderedData[groupName][selectedIndex]
+      else
+        selectedIndex = el.parent().index()
+        selectedObject = @renderedData[selectedIndex]
+
     value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
     field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
     if el.hasClass(ACTIVE_CLASS)
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 3030da4e6b2..22679c764dc 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -72,7 +72,7 @@
       line-height: 21px;
     }
 
-    .dropdown-menu-toggle{
+    .dropdown-menu-toggle {
       vertical-align: top;
       width: 220px;
     }
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index fb1b7649465..a3723d2c349 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -186,6 +186,12 @@ module BlobHelper
   end
 
   def gitignores_for_select
-    @gitignores_for_select ||= Gitlab::Gitignore.all
+    return @gitignores_for_select if defined?(@gitignores_for_select)
+
+    @gitignores_for_select = {
+      Global: Gitlab::Gitignore.global.map{ |v| { text: v.name } },
+      # Note that the key here doesn't cover it really
+      Languages: Gitlab::Gitignore.languages_frameworks.map{ |v| { text: v.name } }
+    }
   end
 end
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 5efec92cf6b..678eadafe15 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -17,9 +17,7 @@
         = select_tag :license_type, grouped_options_for_select(licenses_for_select, @project.repository.license_key), include_blank: true, class: 'select2 license-select', data: {placeholder: 'Choose a license template', project: @project.name, fullname: @project.namespace.human_name}
 
       .gitignore-selector.hidden
-        = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter projects", data: { filenames: Gitlab::Gitignore.all.map.with_index{ |v| {text: v.name} } } } )
-
-        -# = select_tag :gitignore_template, options_for_select(Gitlab::Gitignore.all.map(&:name)), include_blank: true, class: 'select2 gitignore-select', data: {placeholder: 'Choose a .gitignore template'}
+        = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { filenames: gitignores_for_select } } )
 
       .encoding-selector
         = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'
diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb
new file mode 100644
index 00000000000..073a83b6896
--- /dev/null
+++ b/spec/features/projects/files/gitignore_dropdown_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+feature 'User wants to add a .gitignore file', feature: true do
+  include WaitForAjax
+
+  before do
+    user = create(:user)
+    project = create(:project)
+    project.team << [user, :master]
+    login_as user
+    visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: '.gitignore')
+  end
+
+  scenario 'user can see .gitignore dropdown' do
+    expect(page).to have_css('.gitignore-selector')
+  end
+
+  scenario 'user can pick a .gitignore file from the dropdown', js: true do
+    find('.js-gitignore-selector').click
+    wait_for_ajax
+    within '.gitignore-selector' do
+      find('.dropdown-input-field').set('rails')
+      find('.dropdown-content li', text: 'Rails').click
+    end
+    wait_for_ajax
+
+    expect(page).to have_content('/.bundle')
+    expect(page).to have_content('# Gemfile.lock, .ruby-version, .ruby-gemset')
+  end
+end

From 79620c501da19bfda5818b8dca75b6ec9c10e762 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Thu, 12 May 2016 13:27:25 +0200
Subject: [PATCH 0641/1431] Update API and fetching task

---
 lib/gitlab/gitignore.rb                | 40 ++++++++---------------
 lib/tasks/gitlab/update_gitignore.rake | 44 +++++++++++++++++++-------
 spec/lib/gitlab/gitignore_spec.rb      |  4 ++-
 spec/requests/api/gitignores_spec.rb   |  4 +--
 4 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/lib/gitlab/gitignore.rb b/lib/gitlab/gitignore.rb
index a2de2831e38..f46b43b61a4 100644
--- a/lib/gitlab/gitignore.rb
+++ b/lib/gitlab/gitignore.rb
@@ -2,15 +2,16 @@ module Gitlab
   class Gitignore
     FILTER_REGEX = /\.gitignore\z/.freeze
 
-    attr_accessor :name, :directory
+    def initialize(path)
+      @path = path
+    end
 
-    def initialize(name, directory)
-      @name       = name
-      @directory  = directory
+    def name
+      File.basename(@path, '.gitignore')
     end
 
     def content
-      File.read(path)
+      File.read(@path)
     end
 
     class << self
@@ -22,46 +23,33 @@ module Gitlab
         file_name = "#{key}.gitignore"
 
         directory = select_directory(file_name)
-        directory ? new(key, directory) : nil
+        directory ? new(File.join(directory, file_name)) : nil
       end
 
       def global
-        files_for_folder(global_dir).map { |f| new(f, global_dir) }
+        files_for_folder(global_dir).map { |file| new(File.join(global_dir, file)) }
       end
 
       def languages_frameworks
-        files_for_folder(gitignore_dir).map { |f| new(f, gitignore_dir) }
+        files_for_folder(gitignore_dir).map { |file| new(File.join(gitignore_dir, file)) }
       end
-    end
 
-    private
+      private
 
-    def path
-      File.expand_path("#{name}.gitignore", directory)
-    end
-
-    class << self
       def select_directory(file_name)
-        [self.gitignore_dir, self.global_dir].find { |dir| File.exist?(File.expand_path(file_name, dir)) }
+        [gitignore_dir, global_dir].find { |dir| File.exist?(File.join(dir, file_name)) }
       end
 
       def global_dir
-        File.expand_path('Global', gitignore_dir)
+        File.join(gitignore_dir, 'Global')
       end
 
       def gitignore_dir
-        File.expand_path('vendor/gitignore', Rails.root)
+        Rails.root.join('vendor/gitignore')
       end
 
       def files_for_folder(dir)
-        gitignores = []
-        Dir.entries(dir).each do |e|
-          next unless e.end_with?('.gitignore')
-
-          gitignores << e.gsub(FILTER_REGEX, '')
-        end
-
-        gitignores
+        Dir.glob("#{dir.to_s}/*.gitignore").map { |file| file.gsub(FILTER_REGEX, '') }
       end
     end
   end
diff --git a/lib/tasks/gitlab/update_gitignore.rake b/lib/tasks/gitlab/update_gitignore.rake
index 61cbfd6737d..84aa312002b 100644
--- a/lib/tasks/gitlab/update_gitignore.rake
+++ b/lib/tasks/gitlab/update_gitignore.rake
@@ -1,26 +1,46 @@
 namespace :gitlab do
   desc "GitLab | Update gitignore"
   task :update_gitignore do
-    dir = File.expand_path('vendor', Rails.root)
-    FileUtils.cd(dir)
+    unless clone_gitignores
+      puts "Cloning the gitignores failed".red
+      return
+    end
 
-    dir = File.expand_path('gitignore', dir)
-    clone_gitignores(dir)
-    remove_unneeded_files(dir)
+    remove_unneeded_files(gitignore_directory)
+    remove_unneeded_files(global_directory)
 
     puts "Done".green
   end
 
-  def clone_gitignores(dir)
-    FileUtils.rm_rf(dir) if Dir.exist?(dir)
+  def clone_gitignores
+    FileUtils.rm_rf(gitignore_directory) if Dir.exist?(gitignore_directory)
+    FileUtils.cd vendor_directory
+
     system('git clone --depth=1 --branch=master https://github.com/github/gitignore.git')
   end
 
-  def remove_unneeded_files(dir)
-    [File.expand_path('Global', dir), dir].each do |path|
-      Dir.entries(path).reject { |e| e =~ /(\.{1,2}|Global|\.gitignore)\z/ }.each do |file|
-        FileUtils.rm_rf File.expand_path(file, path)
-      end
+  # Retain only certain files:
+  # - The LICENSE, because we have to
+  # - The sub dir global
+  # - The gitignores themself
+  # - Dir.entires returns also the entries '.' and '..'
+  def remove_unneeded_files(path)
+    Dir.foreach(path) do |file|
+      FileUtils.rm_rf(File.join(path, file)) unless file =~ /(\.{1,2}|LICENSE|Global|\.gitignore)\z/
     end
   end
+
+  private
+
+  def vendor_directory
+    Rails.root.join('vendor')
+  end
+
+  def gitignore_directory
+    File.join(vendor_directory, 'gitignore')
+  end
+
+  def global_directory
+    File.join(gitignore_directory, 'Global')
+  end
 end
diff --git a/spec/lib/gitlab/gitignore_spec.rb b/spec/lib/gitlab/gitignore_spec.rb
index 5dab821a8ec..72baa516cc4 100644
--- a/spec/lib/gitlab/gitignore_spec.rb
+++ b/spec/lib/gitlab/gitignore_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::Gitignore do
   subject { Gitlab::Gitignore }
+
   describe '.all' do
     it 'strips the gitignore suffix' do
       expect(subject.all.first.name).not_to end_with('.gitignore')
@@ -24,12 +25,13 @@ describe Gitlab::Gitignore do
       ruby = subject.find('Ruby')
 
       expect(ruby).to be_a Gitlab::Gitignore
+      expect(ruby.name).to eq('Ruby')
     end
   end
 
   describe '#content' do
     it 'loads the full file' do
-      gitignore = subject.new('Ruby', File.expand_path('vendor/gitignore', Rails.root))
+      gitignore = subject.new(Rails.root.join('vendor/gitignore/Ruby.gitignore'))
 
       expect(gitignore.name).to eq 'Ruby'
       expect(gitignore.content).to start_with('*.gem')
diff --git a/spec/requests/api/gitignores_spec.rb b/spec/requests/api/gitignores_spec.rb
index d0e576e637c..aab2d8c81b9 100644
--- a/spec/requests/api/gitignores_spec.rb
+++ b/spec/requests/api/gitignores_spec.rb
@@ -13,8 +13,8 @@ describe API::Gitignores, api: true  do
   describe 'Entity GitignoresList' do
     before { get api('/gitignores') }
 
-    it { expect(json_response.first['name']).to be_truthy }
-    it { expect(json_response.first['content']).to be_falsey }
+    it { expect(json_response.first['name']).not_to be_nil }
+    it { expect(json_response.first['content']).to be_nil }
   end
 
   describe 'GET /gitignores' do

From ab96ca2bf1ae72817ff5cedf1792c8f7563ebdef Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 13 May 2016 10:57:03 -0500
Subject: [PATCH 0642/1431] Dropdown implementation

---
 CHANGELOG                                     |  3 +-
 app/assets/javascripts/api.js.coffee          | 34 ++++++-------
 .../blob/blob_gitignore_selector.js.coffee    | 51 +++++++++----------
 .../javascripts/blob/edit_blob.js.coffee      |  2 +-
 app/assets/javascripts/gl_dropdown.js.coffee  | 43 ++++++++++------
 .../javascripts/lib/type_utility.js.coffee    |  9 ++++
 app/helpers/blob_helper.rb                    | 10 ++--
 app/models/repository.rb                      |  6 ++-
 app/views/projects/blob/_editor.html.haml     |  2 +-
 lib/api/gitignores.rb                         | 10 ++--
 spec/javascripts/project_title_spec.js.coffee |  1 +
 11 files changed, 96 insertions(+), 75 deletions(-)
 create mode 100644 app/assets/javascripts/lib/type_utility.js.coffee

diff --git a/CHANGELOG b/CHANGELOG
index 683f1b1a650..e87fde3fece 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -66,13 +66,12 @@ v 8.8.0 (unreleased)
   - All Grape API helpers are now instrumented
   - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
   - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
+  - When creating a .gitignore file a dropdown with templates will be provided
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
-  - Fix import from gitlab.com to a private instance failure
-  - When creating a .gitignore file a dropdown with templates will be provided
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee
index c654f8de208..3f61ea1eaf4 100644
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
@@ -1,15 +1,15 @@
 @Api =
-  groups_path: "/api/:version/groups.json"
-  group_path: "/api/:version/groups/:id.json"
-  namespaces_path: "/api/:version/namespaces.json"
-  group_projects_path: "/api/:version/groups/:id/projects.json"
-  projects_path: "/api/:version/projects.json"
-  labels_path: "/api/:version/projects/:id/labels"
-  license_path: "/api/:version/licenses/:key"
-  gitignoretext_path: "/api/:version/gitignores/:key"
+  groupsPath: "/api/:version/groups.json"
+  groupPath: "/api/:version/groups/:id.json"
+  namespacesPath: "/api/:version/namespaces.json"
+  groupProjectsPath: "/api/:version/groups/:id/projects.json"
+  projectsPath: "/api/:version/projects.json"
+  labelsPath: "/api/:version/projects/:id/labels"
+  licensePath: "/api/:version/licenses/:key"
+  gitignorePath: "/api/:version/gitignores/:key"
 
   group: (group_id, callback) ->
-    url = Api.buildUrl(Api.group_path)
+    url = Api.buildUrl(Api.groupPath)
     url = url.replace(':id', group_id)
 
     $.ajax(
@@ -23,7 +23,7 @@
   # Return groups list. Filtered by query
   # Only active groups retrieved
   groups: (query, skip_ldap, callback) ->
-    url = Api.buildUrl(Api.groups_path)
+    url = Api.buildUrl(Api.groupsPath)
 
     $.ajax(
       url: url
@@ -37,7 +37,7 @@
 
   # Return namespaces list. Filtered by query
   namespaces: (query, callback) ->
-    url = Api.buildUrl(Api.namespaces_path)
+    url = Api.buildUrl(Api.namespacesPath)
 
     $.ajax(
       url: url
@@ -51,7 +51,7 @@
 
   # Return projects list. Filtered by query
   projects: (query, order, callback) ->
-    url = Api.buildUrl(Api.projects_path)
+    url = Api.buildUrl(Api.projectsPath)
 
     $.ajax(
       url: url
@@ -65,7 +65,7 @@
       callback(projects)
 
   newLabel: (project_id, data, callback) ->
-    url = Api.buildUrl(Api.labels_path)
+    url = Api.buildUrl(Api.labelsPath)
     url = url.replace(':id', project_id)
 
     data.private_token = gon.api_token
@@ -81,7 +81,7 @@
 
   # Return group projects list. Filtered by query
   groupProjects: (group_id, query, callback) ->
-    url = Api.buildUrl(Api.group_projects_path)
+    url = Api.buildUrl(Api.groupProjectsPath)
     url = url.replace(':id', group_id)
 
     $.ajax(
@@ -96,7 +96,7 @@
 
   # Return text for a specific license
   licenseText: (key, data, callback) ->
-    url = Api.buildUrl(Api.license_path).replace(':key', key)
+    url = Api.buildUrl(Api.licensePath).replace(':key', key)
 
     $.ajax(
       url: url
@@ -104,8 +104,8 @@
     ).done (license) ->
       callback(license)
 
-  gitIgnoreText: (key, callback) ->
-    url = Api.buildUrl(Api.gitignoretext_path).replace(':key', key)
+  gitignoreText: (key, callback) ->
+    url = Api.buildUrl(Api.gitignorePath).replace(':key', key)
 
     $.get url, (gitignore) ->
       callback(gitignore)
diff --git a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
index 2112f5c855a..cc8a497d081 100644
--- a/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
+++ b/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
@@ -1,10 +1,10 @@
-class @BlobGitIgnoreSelector
+class @BlobGitignoreSelector
   constructor: (opts) ->
     {
       @dropdown
       @editor
-      @wrapper        = @dropdown.parents('.gitignore-selector')
-      @fileNameInput  = $('#file_name')
+      @$wrapper        = @dropdown.closest('.gitignore-selector')
+      @$filenameInput  = $('#file_name')
       @data           = @dropdown.data('filenames')
     } = opts
 
@@ -13,51 +13,46 @@ class @BlobGitIgnoreSelector
       filterable: true,
       selectable: true,
       search:
-        fields: ['text']
-      clicked: @onClick.bind(@)
+        fields: ['name']
+      clicked: @onClick
+      text: (gitignore) ->
+        gitignore.name
     )
 
-    @toggleGitIgnoreSelector()
+    @toggleGitignoreSelector()
     @bindEvents()
 
   bindEvents: ->
-    @fileNameInput
+    @$filenameInput
       .on 'keyup blur', (e) =>
-        @toggleGitIgnoreSelector()
+        @toggleGitignoreSelector()
 
-  toggleGitIgnoreSelector: ->
-    filename = @fileNameInput.val() or $('.editor-file-name').text().trim()
-    @wrapper.toggleClass 'hidden', filename isnt '.gitignore'
+  toggleGitignoreSelector: ->
+    filename = @$filenameInput.val() or $('.editor-file-name').text().trim()
+    @$wrapper.toggleClass 'hidden', filename isnt '.gitignore'
 
-  onClick: (item, el, e) ->
+  onClick: (item, el, e) =>
     e.preventDefault()
-    @requestIgnoreFile(item.text)
+    @requestIgnoreFile(item.name)
 
   requestIgnoreFile: (name) ->
-    Api.gitIgnoreText name, @requestIgnoreFileSuccess.bind(@)
+    Api.gitignoreText name, @requestIgnoreFileSuccess.bind(@)
 
   requestIgnoreFileSuccess: (gitignore) ->
-    @editor.setValue(gitignore.content, -1)
-
-    # Move cursor position to end of file
-    row = @editor.session.getLength() - 1
-    column = @editor.session.getLine(row).length
-    @editor.gotoLine(row + 1, column)
+    @editor.setValue(gitignore.content, 1)
     @editor.focus()
 
-class @BlobGitIgnoreSelectors
+class @BlobGitignoreSelectors
   constructor: (opts) ->
-    _this = @
-
     {
-      @dropdowns = $('.js-gitignore-selector')
+      @$dropdowns = $('.js-gitignore-selector')
       @editor
     } = opts
 
-    @dropdowns.each ->
-      $dropdown = $(@)
+    @$dropdowns.each (i, dropdown) =>
+      $dropdown = $(dropdown)
 
-      new BlobGitIgnoreSelector(
+      new BlobGitignoreSelector(
         dropdown: $dropdown,
-        editor: _this.editor
+        editor: @editor
       )
diff --git a/app/assets/javascripts/blob/edit_blob.js.coffee b/app/assets/javascripts/blob/edit_blob.js.coffee
index f2efeb3960a..79141e768b8 100644
--- a/app/assets/javascripts/blob/edit_blob.js.coffee
+++ b/app/assets/javascripts/blob/edit_blob.js.coffee
@@ -13,7 +13,7 @@ class @EditBlob
 
     @initModePanesAndLinks()
     new BlobLicenseSelector(@editor)
-    new BlobGitIgnoreSelectors(editor: @editor)
+    new BlobGitignoreSelectors(editor: @editor)
 
   initModePanesAndLinks: ->
     @$editModePanes = $(".js-edit-mode-pane")
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 0f2ac664ac8..8cb31b2dbd7 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -60,23 +60,36 @@ class GitLabDropdownFilter
       results = data
 
       if search_text isnt ''
-        # handle groups
+        # When data is an array of objects therefore [object Array] e.g.
+        # [
+        #   { prop: 'foo' },
+        #   { prop: 'baz' }
+        # ]
         if _.isArray(data)
           results = fuzzaldrinPlus.filter(data, search_text,
             key: @options.keys
           )
-        else if _.isObject(data)
-          results = {}
-          for key, group of data
-            tmp = fuzzaldrinPlus.filter(group, search_text,
-              key: @options.keys
-            )
+        else
+          # If data is grouped therefore an [object Object]. e.g.
+          # {
+          #   groupName1: [
+          #     { prop: 'foo' },
+          #     { prop: 'baz' }
+          #   ],
+          #   groupName2: [
+          #     { prop: 'abc' },
+          #     { prop: 'def' }
+          #   ]
+          # }
+          if gl.utils.isObject data
+            results = {}
+            for key, group of data
+              tmp = fuzzaldrinPlus.filter(group, search_text,
+                key: @options.keys
+              )
 
-            if tmp.length
-              results[key] = []
-
-              tmp.map (item) ->
-                results[key].push item
+              if tmp.length
+                results[key] = tmp.map (item) -> item
 
       @options.callback results
     else
@@ -250,7 +263,7 @@ class GitLabDropdown
       html = [@noResults()]
     else
       # Handle array groups
-      if String(data) is "[object Object]"
+      if gl.utils.isObject data
         html = []
         for name, groupData of data
           # Add header for each group
@@ -269,7 +282,7 @@ class GitLabDropdown
     @appendMenu(full_html)
 
   renderData: (data, group = false) ->
-    $.map data, (obj, index) =>
+    data.map (obj, index) =>
       return @renderItem(obj, group, index)
 
   shouldPropagate: (e) =>
@@ -416,7 +429,7 @@ class GitLabDropdown
         selectedIndex = el.data('index')
         selectedObject = @renderedData[groupName][selectedIndex]
       else
-        selectedIndex = el.parent().index()
+        selectedIndex = el.closest('li').index()
         selectedObject = @renderedData[selectedIndex]
 
     value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
diff --git a/app/assets/javascripts/lib/type_utility.js.coffee b/app/assets/javascripts/lib/type_utility.js.coffee
new file mode 100644
index 00000000000..957f0d86b36
--- /dev/null
+++ b/app/assets/javascripts/lib/type_utility.js.coffee
@@ -0,0 +1,9 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  w.gl.utils.isObject = (obj) ->
+    obj? and (obj.constructor is Object)
+
+) window
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index a3723d2c349..cec2dc753fe 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -185,13 +185,13 @@ module BlobHelper
     }
   end
 
-  def gitignores_for_select
-    return @gitignores_for_select if defined?(@gitignores_for_select)
+  def gitignore_names
+    return @gitignore_names if defined?(@gitignore_names)
 
-    @gitignores_for_select = {
-      Global: Gitlab::Gitignore.global.map{ |v| { text: v.name } },
+    @gitignore_names = {
+      Global: Gitlab::Gitignore.global.map { |gitignore| { name: gitignore.name } },
       # Note that the key here doesn't cover it really
-      Languages: Gitlab::Gitignore.languages_frameworks.map{ |v| { text: v.name } }
+      Languages: Gitlab::Gitignore.languages_frameworks.map{ |gitignore| { name: gitignore.name } }
     }
   end
 end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index f26278cc3af..ecc8795c954 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -245,7 +245,7 @@ class Repository
   def cache_keys
     %i(size branch_names tag_names commit_count
        readme version contribution_guide changelog
-       license_blob license_key)
+       license_blob license_key gitignore)
   end
 
   def build_cache
@@ -256,6 +256,10 @@ class Repository
     end
   end
 
+  def expire_gitignore
+    cache.expire(:gitignore)
+  end
+
   def expire_tags_cache
     cache.expire(:tag_names)
     @tags = nil
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 678eadafe15..4071b59c003 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -17,7 +17,7 @@
         = select_tag :license_type, grouped_options_for_select(licenses_for_select, @project.repository.license_key), include_blank: true, class: 'select2 license-select', data: {placeholder: 'Choose a license template', project: @project.name, fullname: @project.namespace.human_name}
 
       .gitignore-selector.hidden
-        = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { filenames: gitignores_for_select } } )
+        = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { filenames: gitignore_names } } )
 
       .encoding-selector
         = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'
diff --git a/lib/api/gitignores.rb b/lib/api/gitignores.rb
index 1af9ba6b316..270c9501dd2 100644
--- a/lib/api/gitignores.rb
+++ b/lib/api/gitignores.rb
@@ -12,15 +12,15 @@ module API
     # Get the text for a specific gitignore
     #
     # Parameters:
-    #   key (required) - The key of a license
+    #   name (required) - The name of a license
     #
     # Example Request:
-    #   GET /gitignores/elixir
+    #   GET /gitignores/Elixir
     #
-    get 'gitignores/:key' do
-      required_attributes! [:key]
+    get 'gitignores/:name' do
+      required_attributes! [:name]
 
-      gitignore = Gitlab::Gitignore.find(params[:key])
+      gitignore = Gitlab::Gitignore.find(params[:name])
       not_found!('.gitignore') unless gitignore
 
       present gitignore, with: Entities::Gitignore
diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee
index 3d8de2ff989..1cf34d4d2d3 100644
--- a/spec/javascripts/project_title_spec.js.coffee
+++ b/spec/javascripts/project_title_spec.js.coffee
@@ -1,5 +1,6 @@
 #= require bootstrap
 #= require select2
+#= require lib/type_utility
 #= require gl_dropdown
 #= require api
 #= require project_select

From 4474eab4f6a17861a6ed494034bc68acb0724e3c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 20 May 2016 18:43:11 -0500
Subject: [PATCH 0643/1431] Fix container deletion permission issue

---
 .../container_registry_authentication_service.rb    |  2 +-
 .../projects/container_registry/index.html.haml     |  2 +-
 ...ontainer_registry_authentication_service_spec.rb | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 3144e96ba31..f807b8ec09a 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -20,7 +20,7 @@ module Auth
       token.issuer = registry.issuer
       token.audience = AUDIENCE
       token[:access] = names.map do |name|
-        { type: 'repository', name: name, actions: %w(pull push) }
+        { type: 'repository', name: name, actions: %w(*) }
       end
       token.encoded
     end
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index 40957993b22..e1e762410f2 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -4,7 +4,7 @@
 %hr
 
 %ul.content-list
-  .light.prepend-top-default
+  %li.light.prepend-top-default
     %p
       A 'container image' is a snapshot of a container.
       You can host your container images with GitLab.
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 6c9f56a4fba..73b8c3f048f 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -10,7 +10,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
   subject { described_class.new(current_project, current_user, current_params).execute }
 
   before do
-    stub_container_registry_config(enabled: true, issuer: 'rspec', key: nil)
+    allow(Gitlab.config.registry).to receive_messages(enabled: true, issuer: 'rspec', key: nil)
     allow_any_instance_of(JSONWebToken::RSAToken).to receive(:key).and_return(rsa_key)
   end
 
@@ -60,6 +60,17 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     it { is_expected.to_not include(:token) }
   end
 
+  describe '#full_access_token' do
+    let(:project) { create(:empty_project) }
+    let(:token) { described_class.full_access_token(project.path_with_namespace) }
+
+    subject { { token: token } }
+
+    it_behaves_like 'a accessible' do
+      let(:actions) { ['*'] }
+    end
+  end
+
   context 'user authorization' do
     let(:project) { create(:project) }
     let(:current_user) { create(:user) }

From 6d19d6a2fd51a68c150eb7bb8b1112cfadf0ef5d Mon Sep 17 00:00:00 2001
From: ZJ van de Weg <zegerjan@gitlab.com>
Date: Fri, 20 May 2016 20:17:49 -0500
Subject: [PATCH 0644/1431] minor js fixes

---
 app/assets/javascripts/dispatcher.js.coffee |   4 +-
 app/assets/javascripts/notes.js.coffee      |   2 +-
 app/assets/stylesheets/pages/notes.scss     | 257 +++++++++++---------
 app/views/projects/notes/_note.html.haml    |  20 +-
 4 files changed, 151 insertions(+), 132 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index ff8bcf89918..8ee00fb9723 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -23,7 +23,7 @@ class Dispatcher
         new Issue()
         shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
-        window.awards_handler = new AwardsHandler()
+        window.awardsHandler = new AwardsHandler()
       when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
         new Milestone()
       when 'dashboard:todos:index'
@@ -54,7 +54,7 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
-        window.awards_handler = new AwardsHandler()
+        window.awardsHandler = new AwardsHandler()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 6d9d6528f45..b8359c31dfa 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -167,7 +167,7 @@ class @Notes
       return
 
     if note.award
-      awardsHandler.addAwardToEmojiBar(note.note)
+      awardsHandler.addAwardToEmojiBar(note.name)
       awardsHandler.scrollToAwards()
 
     # render note if it not present in loaded list
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index feb42c36d31..a3e1ac13a43 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -20,9 +20,15 @@ ul.notes {
 
   .timeline-content {
     margin-left: 55px;
+
+    &.timeline-content-form {
+      @media (max-width: $screen-sm-max) {
+        margin-left: 0;
+      }
+    }
   }
 
-  .note_created_ago, .note-updated-at {
+  .note-created-ago, .note-updated-at {
     white-space: nowrap;
   }
 
@@ -39,53 +45,6 @@ ul.notes {
     }
   }
 
-  .discussion-header,
-  .note-header {
-    @extend .cgray;
-
-    a:hover {
-      text-decoration: none;
-    }
-
-    .avatar {
-      float: left;
-      margin-right: 10px;
-    }
-
-    .discussion-last-update,
-    .note-last-update {
-      &:before {
-        content: "\00b7";
-      }
-
-      a {
-        color: $gl-gray;
-
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-    .author {
-      color: #4c4e54;
-      margin-right: 3px;
-
-      &:hover {
-        color: $gl-link-color;
-      }
-    }
-    .author-username {
-    }
-
-    .note-role {
-      float: right;
-      margin-top: 1px;
-      border: 1px solid #bbb;
-      background-color: transparent;
-      color: $gl-gray;
-    }
-  }
-
   .discussion-body {
     padding-top: 15px;
   }
@@ -99,12 +58,12 @@ ul.notes {
   .note {
     display: block;
     position: relative;
+    border-bottom: 1px solid $table-border-gray;
 
     &.is-editting {
       .note-header,
       .note-text,
-      .edited-text,
-      .note-awards {
+      .edited-text {
         display: none;
       }
 
@@ -114,16 +73,16 @@ ul.notes {
     }
 
     .note-body {
+      overflow: auto;
+
       .note-text {
         overflow: auto;
         word-wrap: break-word;
         @include md-typography;
 
         // On diffs code should wrap nicely and not overflow
-        pre {
-          code {
-            white-space: pre-wrap;
-          }
+        code {
+          white-space: pre-wrap;
         }
 
         // Reset ul style types since we're nested inside a ul already
@@ -150,6 +109,10 @@ ul.notes {
           border-color: darken(#f5f5f5, 8%);
           margin: 10px 0;
         }
+
+        code {
+          word-break: keep-all;
+        }
       }
     }
 
@@ -157,9 +120,6 @@ ul.notes {
       padding-bottom: 3px;
     }
 
-    &:last-child {
-      border-bottom: 1px solid $border-color;
-    }
   }
 }
 
@@ -177,60 +137,149 @@ ul.notes {
   font-family: $regular_font;
 
   td {
-    border: 1px solid #ddd;
+    border: 1px solid $table-border-gray;
     border-left: none;
 
     &.notes_line {
       vertical-align: middle;
       text-align: center;
       padding: 10px 0;
-      background: #fff;
+      background: $background-color;
       color: $text-color;
     }
+
     &.notes_line2 {
       text-align: center;
       padding: 10px 0;
       border-left: 1px solid #ddd !important;
     }
+
     &.notes_content {
-      background-color: #fff;
+      background-color: $background-color;
       border-width: 1px 0;
-      padding-top: 0;
+      padding: 0;
       vertical-align: top;
-      &.parallel{
+      white-space: normal;
+
+      &.parallel {
         border-width: 1px;
       }
+
+      .notes {
+        background-color: $white-light;
+      }
+
+      a code {
+        top: 0;
+        margin-right: 0;
+      }
     }
   }
 }
 
+.discussion-header,
+.note-header {
+  a {
+    color: inherit;
+
+    &:hover {
+      color: $gl-link-color;
+      text-decoration: none;
+    }
+  }
+
+  .author_link {
+    color: $gl-gray;
+  }
+}
+
+.note-headline-light,
+.discussion-headline-light {
+  color: $notes-light-color;
+}
+
+.discussion-headline-light {
+  a {
+    color: $gl-link-color;
+  }
+}
+
 /**
  * Actions for Discussions/Notes
  */
 
-.discussion,
-.note {
-  .discussion-actions,
-  .note-actions {
-    float: right;
-    margin-left: 10px;
+.discussion-actions,
+.note-actions {
+  float: right;
+  margin-left: 10px;
+  color: $notes-action-color;
+}
 
-    a {
-      margin-left: 5px;
-      color: $gl-gray;
+.discussion-actions {
+  @media (max-width: $screen-md-max) {
+    float: none;
+    margin-left: 0;
 
-      i.fa {
-        font-size: 16px;
-        line-height: 16px;
-      }
+    .note-action-button {
+      margin-left: 0;
+    }
+  }
+}
 
+.note-action-button {
+  display: inline-block;
+  margin-left: 10px;
+  line-height: 24px;
+
+  .fa {
+    color: $notes-action-color;
+    position: relative;
+    top: 1px;
+    font-size: 17px;
+  }
+
+  &.js-note-delete {
+    i {
       &:hover {
-        @extend .cgray;
-        &.danger { @extend .cred; }
+        color: $gl-text-red;
+      }
+    }
+  }
+
+  &.js-note-edit {
+    i {
+      &:hover {
+        color: $gl-link-color;
       }
     }
   }
 }
+
+.discussion-toggle-button {
+  line-height: 20px;
+  font-size: 13px;
+
+  .fa {
+    margin-right: 3px;
+    font-size: 10px;
+    line-height: 18px;
+    vertical-align: top;
+  }
+}
+
+.note-role {
+  position: relative;
+  top: -2px;
+  display: inline-block;
+  padding-left: 4px;
+  padding-right: 4px;
+  color: $notes-role-color;
+  font-size: 12px;
+  line-height: 20px;
+  border: 1px solid $notes-role-border-color;
+  border-radius: $border-radius-base;
+}
+
 .diff-file .note .note-actions {
   right: 0;
   top: 0;
@@ -243,8 +292,7 @@ ul.notes {
 
 .diff-file tr.line_holder {
   @mixin show-add-diff-note {
-    filter: alpha(opacity=100);
-    opacity: 1.0;
+    display: inline-block;
   }
 
   .add-diff-note {
@@ -254,17 +302,12 @@ ul.notes {
     padding: 4px;
     font-size: 16px;
     color: $gl-link-color;
-    margin-left: -60px;
+    margin-left: -56px;
     position: absolute;
     z-index: 10;
     width: 32px;
-
-    transition: all 0.2s ease;
-
     // "hide" it by default
-    opacity: 0.0;
-    filter: alpha(opacity=0);
-
+    display: none;
     &:hover {
       background: $gl-info;
       color: #fff;
@@ -280,38 +323,20 @@ ul.notes {
   }
 }
 
-.note-award-control {
-  display: block;
+.disabled-comment {
+  margin-left: -$gl-padding-top;
+  margin-right: -$gl-padding-top;
+  background-color: $gray-light;
+  border-radius: $border-radius-base;
+  border: 1px solid $border-gray-normal;
+  color: $note-disabled-comment-color;
+  line-height: 200px;
 
-  &:hover,
-  &:focus {
-    text-decoration: none;
+  .disabled-comment-text {
+    line-height: normal;
   }
 
-  .award-control-icon-loading {
-    display: none;
-  }
-
-  &.is-loading {
-    .award-control-icon-normal {
-      display: none;
-    }
-
-    .award-control-icon-loading {
-      display: block;
-    }
-  }
-}
-
-.note-awards {
-  .awards {
-    padding-top: 10px;
-  }
-
-  .award-control {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    color: #8f8f8f;
-    font-size: 13px;
+  a {
+    color: $gl-link-color;
   }
 }
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 13d3f1eceab..9fbc9a45549 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -9,20 +9,14 @@
         = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
     .timeline-content
       .note-header
+        = link_to_member(note.project, note.author, avatar: false)
+        .inline.note-headline-light
+          = note.author.to_reference
+          - unless note.system
+            commented
+          %a{ href: "##{dom_id(note)}" }
+            = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
         .note-actions
-          - if current_user
-            .award-menu-holder.note-action-award-holder.js-award-holder.js-award-action-btn{ data: { target: "##{dom_id(note)} .js-awards-block" } }
-              = link_to '#', title: 'Award emoji', class: 'note-award-control js-add-award', data: { award_menu_url: emojis_path, position: "right" } do
-                = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
-                = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
-          - if note_editable?(note)
-            = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
-              = icon('pencil-square-o')
-
-            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'js-note-delete danger' do
-              = icon('trash-o')
-
-        - unless note.system
           - access = note.project.team.human_max_access(note.author.id)
           - if access
             %span.note-role

From 446059889634bf5682fca1f76fef17c6c8c31aa9 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 20 May 2016 20:50:13 -0500
Subject: [PATCH 0645/1431] Add README for updating .gitignore templates

---
 vendor/gitignore/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 vendor/gitignore/README.md

diff --git a/vendor/gitignore/README.md b/vendor/gitignore/README.md
new file mode 100644
index 00000000000..43131e815cc
--- /dev/null
+++ b/vendor/gitignore/README.md
@@ -0,0 +1,14 @@
+# .gitignore templates
+
+This directory contains language-specific .gitignore templates that are used by GitLab.
+
+These files were automatically pulled from [this repository](https://github.com/github/gitignore).
+Please submit pull requests to that repository. There is no need to edit the files in this directory.
+
+## Bulk Update
+
+To update this directory with the latest changes in the repository, run:
+
+```sh
+bundle exec rake gitlab:update_gitignore
+```

From ad13d357e739216b4617848ce43d2c9f3557ef75 Mon Sep 17 00:00:00 2001
From: Tony Chu <cwq1913@163.com>
Date: Thu, 19 May 2016 06:13:46 +0000
Subject: [PATCH 0646/1431] fix user.name length in milestones participants tab

---
 app/views/shared/milestones/_participants_tab.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/milestones/_participants_tab.html.haml b/app/views/shared/milestones/_participants_tab.html.haml
index 67ae85ac276..549d2e2f61e 100644
--- a/app/views/shared/milestones/_participants_tab.html.haml
+++ b/app/views/shared/milestones/_participants_tab.html.haml
@@ -3,6 +3,6 @@
     %li
       = link_to user, title: user.name, class: "darken" do
         = image_tag avatar_icon(user, 32), class: "avatar s32"
-        %strong= truncate(user.name, lenght: 40)
+        %strong= truncate(user.name, length: 40)
         %br
         %small.cgray= user.username

From 1cbc898223d2f9b78cb6494108d2aed00d19d00e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 20 May 2016 18:50:16 -0500
Subject: [PATCH 0647/1431] Improve design of Pipeline view

---
 CHANGELOG                                     |  1 +
 app/assets/stylesheets/pages/pipelines.scss   | 26 ++++++++++++++--
 .../projects/ci/commits/_commit.html.haml     | 31 ++++++++++---------
 app/views/projects/commit/_ci_stage.html.haml |  1 +
 app/views/projects/pipelines/index.html.haml  |  6 ++--
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 67fca2c6f6d..0884ac1947d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.8.0 (unreleased)
   - Added inline diff styling for `change_title` system notes. (Adam Butler)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
+  - Improve design of Pipeline View
   - Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios
   - Improve multiple branch push performance by memoizing permission checking
   - Log to application.log when an admin starts and stops impersonating a user
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 546176b65e4..87b0562c29a 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,4 +1,24 @@
-.pipeline-stage {
-  overflow: hidden;
-  text-overflow: ellipsis;
+.pipelines {
+  .stage {
+    max-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .duration, .finished_at {
+    margin: 4px 0;
+  }
+
+  .commit-title {
+    margin: 0;
+  }
+
+  .controls {
+    white-space: nowrap;
+  }
+
+  .btn {
+    margin: 4px;
+  }
 }
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 13162b41f9b..2ea9333913c 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -12,10 +12,10 @@
         &middot;
       = link_to commit.short_sha, namespace_project_commit_path(@project.namespace, @project, commit.sha), class: "commit-id monospace"
       &nbsp;
-      - if commit.latest?
-        %span.label.label-success latest
       - if commit.tag?
         %span.label.label-primary tag
+      - elsif commit.latest?
+        %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
       - if commit.triggered?
         %span.label.label-primary triggered
       - if commit.yaml_errors.present?
@@ -23,30 +23,33 @@
       - if commit.builds.any?(&:stuck?)
         %span.label.label-warning stuck
 
-      %p
-        %span
-          - if commit_data = commit.commit_data
-            = link_to_gfm commit_data.title, namespace_project_commit_path(@project.namespace, @project, commit_data.id), class: "commit-row-message"
-          - else
-            Cant find HEAD commit for this branch
+      %p.commit-title
+        - if commit_data = commit.commit_data
+          = link_to_gfm truncate(commit_data.title, length: 60), namespace_project_commit_path(@project.namespace, @project, commit_data.id), class: "commit-row-message"
+        - else
+          Cant find HEAD commit for this branch
 
 
     - stages_status = commit.statuses.stages_status
     - stages.each do |stage|
       %td
-        - if status = stages_status[stage]
-          - tooltip = "#{stage.titleize}: #{status}"
-          %span.has-tooltip{ title: "#{tooltip}", class: "ci-status-icon-#{status}" }
+        - status = stages_status[stage]
+        - tooltip = "#{stage.titleize}: #{status || 'not found'}"
+        - if status
+          = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status || 'skipped'}", title: tooltip do
             = ci_icon_for_status(status)
+        - else
+          .light
+            \-
 
   %td
     - if commit.started_at && commit.finished_at
-      %p
+      %p.duration
         = icon("clock-o")
         &nbsp;
         #{duration_in_words(commit.finished_at, commit.started_at)}
     - if commit.finished_at
-      %p
+      %p.finished_at
         = icon("calendar")
         &nbsp;
         #{time_ago_with_tooltip(commit.finished_at)}
@@ -67,11 +70,9 @@
                   %span #{build.name}
 
       - if can?(current_user, :update_pipeline, @project)
-        &nbsp;
         - if commit.retryable? && commit.builds.failed.any?
           = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
-        &nbsp;
         - if commit.active?
           = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
             = icon("remove")
diff --git a/app/views/projects/commit/_ci_stage.html.haml b/app/views/projects/commit/_ci_stage.html.haml
index aaa318e1eb3..ae7bb01223e 100644
--- a/app/views/projects/commit/_ci_stage.html.haml
+++ b/app/views/projects/commit/_ci_stage.html.haml
@@ -1,6 +1,7 @@
 %tr
   %th{colspan: 10}
     %strong
+      %a{name: stage}
       - status = statuses.latest.status
       %span{class: "ci-status-link ci-status-icon-#{status}"}
         = ci_icon_for_status(status)
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 9d5b6d367c9..4e2e8190700 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -44,7 +44,7 @@
   - else
     #{@scope.titleize} for this project
 
-%ul.content-list
+%ul.content-list.pipelines
   - stages = @pipelines.stages
   - if @pipelines.blank?
     %li
@@ -56,8 +56,8 @@
           %th ID
           %th Commit
           - stages.each do |stage|
-            %th
-              %span.pipeline-stage.has-tooltip{ title: "#{stage.titleize}" }
+            %th.stage
+              %span.has-tooltip{ title: "#{stage.titleize}" }
                 = stage.titleize.pluralize
           %th
           %th

From c6411a785b0c49d17b831a9b4bc05ef4bb68b87f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 01:18:10 -0500
Subject: [PATCH 0648/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 67fca2c6f6d..01585ede586 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.8.0 (unreleased)
   - Added inline diff styling for `change_title` system notes. (Adam Butler)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Escape HTML in commit titles in system note messages
+  - Fix scope used when accessing container registry
   - Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios
   - Improve multiple branch push performance by memoizing permission checking
   - Log to application.log when an admin starts and stops impersonating a user

From bfbbb182c14441ad176b6c7b0ec9e9f38da25ae4 Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sat, 21 May 2016 17:20:44 +0700
Subject: [PATCH 0649/1431] Fix broken specs

---
 app/models/members/project_member.rb       | 3 +--
 spec/models/members/project_member_spec.rb | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 0ced9c31581..fa04963a1b7 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -3,7 +3,6 @@ class ProjectMember < Member
 
   include Gitlab::ShellAdapter
 
-  has_many :todos, through: :user
   belongs_to :project, class_name: 'Project', foreign_key: 'source_id'
 
   # Make sure project member points only to project as it source
@@ -15,7 +14,7 @@ class ProjectMember < Member
   scope :in_projects, ->(projects) { where(source_id: projects.pluck(:id)) }
   scope :with_user, ->(user) { where(user_id: user.id) }
 
-  before_destroy { todos.each(&:destroy) }
+  before_destroy { user.todos.where(project_id: source_id).each(&:destroy) }
 
   class << self
 
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index 2d2fa91e001..46e98c8807b 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
@@ -21,7 +21,6 @@ require 'spec_helper'
 
 describe ProjectMember, models: true do
   describe 'associations' do
-    it { is_expected.to have_many(:todos).through(:user) }
     it { is_expected.to belong_to(:project).class_name('Project').with_foreign_key(:source_id) }
   end
 

From 69a07cf4d4771b9e754ce783b7973b7898480719 Mon Sep 17 00:00:00 2001
From: Sanster <cwq1913@163.com>
Date: Sat, 21 May 2016 22:33:54 +0800
Subject: [PATCH 0650/1431] fix group members api doc: remove emial

---
 doc/api/groups.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/api/groups.md b/doc/api/groups.md
index 2821bc21b81..1ccb9715e96 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -265,7 +265,6 @@ GET /groups/:id/members
   {
     "id": 1,
     "username": "raymond_smith",
-    "email": "ray@smith.org",
     "name": "Raymond Smith",
     "state": "active",
     "created_at": "2012-10-22T14:13:35Z",
@@ -274,7 +273,6 @@ GET /groups/:id/members
   {
     "id": 2,
     "username": "john_doe",
-    "email": "joh@doe.org",
     "name": "John Doe",
     "state": "active",
     "created_at": "2012-10-22T14:13:35Z",

From 8d0332368fba65f167f2109daf8a2184d781082b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 09:52:50 -0500
Subject: [PATCH 0651/1431] Improve status rendering

---
 app/views/projects/ci/commits/_commit.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 2ea9333913c..9c63510d864 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -36,10 +36,10 @@
         - status = stages_status[stage]
         - tooltip = "#{stage.titleize}: #{status || 'not found'}"
         - if status
-          = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status || 'skipped'}", title: tooltip do
+          = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
             = ci_icon_for_status(status)
         - else
-          .light
+          .light.has-tooltip{ title: tooltip }
             \-
 
   %td

From e55ba527b8a85da0fa4b61d9d17128f459acbfec Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sat, 21 May 2016 23:11:26 +0700
Subject: [PATCH 0652/1431] Fix broken specs

---
 spec/models/members/project_member_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index 46e98c8807b..9f13874b532 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
@@ -47,14 +47,14 @@ describe ProjectMember, models: true do
     end
 
     it "destroy itself and delete associated todos" do
-      expect(owner.todos.size).to eq(2)
-      expect(master.todos.size).to eq(3)
+      expect(owner.user.todos.size).to eq(2)
+      expect(master.user.todos.size).to eq(3)
       expect(Todo.count).to eq(5)
 
       master_todo_ids = master_todos.map(&:id)
       master.destroy
 
-      expect(owner.todos.size).to eq(2)
+      expect(owner.user.todos.size).to eq(2)
       expect(Todo.count).to eq(2)
       master_todo_ids.each do |id|
         expect(Todo.exists?(id)).to eq(false)

From 5af73808048a03a3a5e54f08bad1aeb1c74156cf Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Sun, 22 May 2016 09:32:59 +0700
Subject: [PATCH 0653/1431] Fix Member spec

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

diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index fa04963a1b7..5c167db76b1 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -14,7 +14,7 @@ class ProjectMember < Member
   scope :in_projects, ->(projects) { where(source_id: projects.pluck(:id)) }
   scope :with_user, ->(user) { where(user_id: user.id) }
 
-  before_destroy { user.todos.where(project_id: source_id).each(&:destroy) }
+  before_destroy { user.todos.where(project_id: source_id).each(&:destroy) if user }
 
   class << self
 

From 2264bb136b78a07b3dde3aaacbae7ba3918775e0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 22 May 2016 00:41:20 -0500
Subject: [PATCH 0654/1431] Copyedit health check docs

---
 doc/monitoring/health_check.md | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/doc/monitoring/health_check.md b/doc/monitoring/health_check.md
index 5157cf686a7..defbf37ac19 100644
--- a/doc/monitoring/health_check.md
+++ b/doc/monitoring/health_check.md
@@ -1,5 +1,6 @@
 # Health Check
-_**Note:** This feature was [introduced][ce-3888] in GitLab 8.8_
+
+>**Note:** This feature was [introduced][ce-3888] in GitLab 8.8.
 
 GitLab provides a health check endpoint for uptime monitoring on the `health_check` web
 endpoint. The health check reports on the overall system status based on the status of
@@ -14,11 +15,13 @@ accepted token can be found on the `admin/heath_check` page of your GitLab insta
 
 ![access token](img/health_check_token.png)
 
-The access token can be passed as a url parameter:
+The access token can be passed as a URL parameter:
 
-`https://gitlab.example.com/health_check.json?token=ACCESS_TOKEN`
+```
+https://gitlab.example.com/health_check.json?token=ACCESS_TOKEN
+```
 
-or as a http header:
+or as an HTTP header:
 
 ```bash
 curl -H "TOKEN: ACCESS_TOKEN" https://gitlab.example.com/health_check.json
@@ -39,16 +42,22 @@ You can also ask for the status of specific services:
 - `https://gitlab.example.com/health_check/database.json?token=ACCESS_TOKEN`
 - `https://gitlab.example.com/health_check/migrations.json?token=ACCESS_TOKEN`
 
-Example output:
+For example, the JSON output of the following health check:
+
 ```bash
 curl -H "TOKEN: ACCESS_TOKEN" https://gitlab.example.com/health_check.json
+```
+
+would be like:
+
+```
 {"healthy":true,"message":"success"}
 ```
 
 ## Status
 
-On failure the endpoint will return a `500` http status code. On success the endpoint
-will return a valid successful http status code, and a `success` message. Ideally your
+On failure, the endpoint will return a `500` HTTP status code. On success, the endpoint
+will return a valid successful HTTP status code, and a `success` message. Ideally your
 uptime monitoring should look for the success message.
 
 [ce-3888]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3888

From 1a85f80b789ec966742fd58f21e8c347d2ac0a06 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 22 May 2016 10:41:30 -0600
Subject: [PATCH 0655/1431] Fix grammar and wording in text on various pages.

---
 .../doorkeeper/authorizations/new.html.haml   |  2 +-
 app/views/profiles/preferences/show.html.haml |  6 +++---
 app/views/projects/graphs/show.html.haml      |  2 +-
 app/views/projects/labels/index.html.haml     |  2 +-
 .../runners/_specific_runners.html.haml       |  2 +-
 app/views/projects/triggers/index.html.haml   | 20 +++++++++----------
 features/steps/project/issues/labels.rb       |  4 ++--
 7 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml
index eae80e5210f..ce050007204 100644
--- a/app/views/doorkeeper/authorizations/new.html.haml
+++ b/app/views/doorkeeper/authorizations/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page-title Authorize required
+%h3.page-title Authorization required
 %main{:role => "main"}
   %p.h4
     Authorize
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index bfe53be6854..0a3bbe2a815 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -5,7 +5,7 @@
     %h4.prepend-top-0
       Application theme
     %p
-      This setting allows you to customize the appearance of the site, ex. sidebar.
+      Customize the appearance of the interface.
   .col-lg-9.application-theme
     - Gitlab::Themes.each do |theme|
       = label_tag do
@@ -18,7 +18,7 @@
     %h4.prepend-top-0
       Syntax highlighting theme
     %p
-      This setting allow you to customize the appearance of the syntax.
+      Customize the syntax highlighting.
   .col-lg-9.syntax-theme
     - Gitlab::ColorSchemes.each do |scheme|
       = label_tag do
@@ -31,7 +31,7 @@
     %h4.prepend-top-0
       Behavior
     %p
-      This setting allows you to customize the behavior of the system layout and default views.
+      Customize the behavior of the system layout and default views.
   .col-lg-9
     .form-group
       = f.label :layout, class: 'label-light' do
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index ad4a932d391..f82c47301f4 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -19,7 +19,7 @@
   .header.clearfix
     %h3#date_header.page-title
     %p.light
-      Commits to #{@ref}, excluding merge commits. Limited by 6,000 commits
+      Commits to #{@ref}, excluding merge commits. Limited to 6,000 commits.
     %input#brush_change{:type => "hidden"}
   .graphs
     #contributors-master
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index cc41130a9dc..05382b9cee7 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -18,6 +18,6 @@
   - else
     .nothing-here-block
       - if can? current_user, :admin_label, @project
-        Create first label or #{link_to 'generate', generate_namespace_project_labels_path(@project.namespace, @project), method: :post} default set of labels
+        Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
       - else
         No labels created
diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml
index 30cd1263a12..8ae9f0d95f7 100644
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -8,7 +8,7 @@
       Install GitLab Runner software.
       Checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} to install it
     %li
-      Specify following URL during runner setup:
+      Specify the following URL during runner setup:
       %code #{ci_root_url(only_path: false)}
     %li
       Use the following registration token during setup:
diff --git a/app/views/projects/triggers/index.html.haml b/app/views/projects/triggers/index.html.haml
index d73ac987161..7db0beba00b 100644
--- a/app/views/projects/triggers/index.html.haml
+++ b/app/views/projects/triggers/index.html.haml
@@ -5,7 +5,7 @@
     %h4.prepend-top-0
       = page_title
     %p
-      Triggers can be used to force a rebuild of a specific branch or tag with an API call.
+      Triggers can force a specific branch or tag to rebuild using an API call.
   .col-lg-9
     %h5.prepend-top-0
       Your triggers
@@ -19,7 +19,7 @@
           = render partial: 'trigger', collection: @triggers, as: :trigger
     - else
       %p.settings-message.text-center.append-bottom-default
-        There are no triggers to use, add one by the button below.
+        There are no triggers to use, create a trigger using the button below.
 
     = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f|
       = f.submit "Add Trigger", class: 'btn btn-success'
@@ -28,8 +28,7 @@
       Use CURL
 
     %p.light
-      Copy the token above and set your branch or tag name. This is the reference that will be rebuild.
-
+      Copy the token above and set your branch or tag name. This is the reference that will be rebuilt.
 
     %pre
       :plain
@@ -41,10 +40,10 @@
       Use .gitlab-ci.yml
 
     %p.light
-      Copy the snippet to
-      %i .gitlab-ci.yml
-      of dependent project.
-      At the end of your build it will trigger this project to rebuilt.
+      In the
+      %code .gitlab-ci.yml
+      of the dependent project, include the following snippet.
+      The project will rebuild at the end of the build.
 
     %pre
       :plain
@@ -57,9 +56,8 @@
 
     %p.light
       Add
-      %strong variables[VARIABLE]=VALUE
-      to API request.
-      The value of variable could then be used to distinguish triggered build from normal one.
+      %code variables[VARIABLE]=VALUE
+      to API requests. Variable values can be used to distinguish triggered and normal builds.
 
     %pre.append-bottom-0
       :plain
diff --git a/features/steps/project/issues/labels.rb b/features/steps/project/issues/labels.rb
index 0ca2d6257c3..8d87f6a7a58 100644
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -24,8 +24,8 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
 
   step 'I should see labels help message' do
     page.within '.labels' do
-      expect(page).to have_content 'Create first label or generate default set of '\
-                               'labels'
+      expect(page).to have_content 'Create a label or generate a default set '\
+                                   'of labels'
     end
   end
 

From 18dddc0c84f2f88e9b37883f1a745dbbeb74b6f3 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 13 May 2016 11:44:48 -0400
Subject: [PATCH 0656/1431] Initial docker container registry configuration
 docs.

---
 doc/administration/container_registry.md | 127 +++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 doc/administration/container_registry.md

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
new file mode 100644
index 00000000000..d89cfd1d43e
--- /dev/null
+++ b/doc/administration/container_registry.md
@@ -0,0 +1,127 @@
+# GitLab Container Registry Administration
+
+Documentation on how to use Container Registry are under [TODO](TODO.md).
+
+## Configuration
+
+Containers can be large in size and they are stored on the server GitLab is
+installed on.
+
+The Container Registry works under HTTPS by default.
+This means that the Container Registry requires a SSL certificate.
+There are two options on how this can be configured:
+
+1. Use its own domain - needs a SSL certificate for that specific domain
+(eg. registry.example.com) or a wildcard certificate if hosted under a subdomain
+(eg. registry.gitlab.example.com)
+1. Use existing GitLab domain and expose the registry on a port - can reuse
+existing GitLab SSL certificate
+
+Note that using HTTP is possible,
+[see insecure Registry document.](https://github.com/docker/distribution/blob/master/docs/insecure.md)
+
+Please take this into consideration before configuring Container Registry for
+the first time.
+
+## Container Registry under its own domain
+
+Lets assume that you want the Container Registry to be accessible at
+`https://registry.gitlab.example.com`.
+
+### Omnibus GitLab packages
+
+Place your SSL certificate and key in
+`/etc/gitlab/ssl/registry.gitlab.example.com.crt`
+and
+`/etc/gitlab/ssl/registry.gitlab.example.com.key` and make sure they have
+correct permissions:
+
+```bash
+chmod 600 /etc/gitlab/ssl/registry.gitlab.example.com.*
+```
+
+Once the SSL certificate is in place, edit `/etc/gitlab/gitlab.rb` with:
+
+```ruby
+registry_external_url 'https://registry.gitlab.example.com'
+```
+
+Save the file and [reconfigure GitLab][] for the changes to take effect.
+
+Users should now be able to login to the Container Registry using:
+
+```bash
+docker login registry.gitlab.example.com
+```
+
+with their GitLab credentials.
+
+If you have a [wildcard certificate][], you need to specify the path to the
+certificate in addition to the URL, in this case `/etc/gitlab/gitlab.rb` will
+look like:
+
+```ruby
+registry_external_url 'https://registry.gitlab.example.com'
+registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
+registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
+```
+
+## Container Registry under existing GitLab domain
+
+Lets assume that your GitLab instance is accessible at
+`https://gitlab.example.com`. You can expose the Container Registry under
+a separate port.
+
+Lets assume that you've exposed port `4567` in your network firewall.
+
+### Omnibus GitLab packages
+
+Your `/etc/gitlab/gitlab.rb` should contain the Container Registry URL as
+well as the path to the existing SSL certificate and key used by GitLab.
+
+```ruby
+registry_external_url 'https://gitlab.example.com:4567'
+
+## If your SSL certificate is not in /etc/gitlab/ssl/gitlab.example.com.crt
+## and key not in /etc/gitlab/ssl/gitlab.example.com.key uncomment the lines
+## below
+
+# registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
+# registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
+```
+
+Save the file and [reconfigure GitLab][] for the changes to take effect.
+
+Users should now be able to login to the Container Registry using:
+
+```bash
+docker login gitlab.example.com:4567
+```
+
+with their GitLab credentials.
+
+## Container Registry storage path
+
+It is possible to change path where containers will be stored by the Container
+Registry.
+
+### Omnibus GitLab packages
+
+By default, the path Container Registry is using to store the containers is in
+`/var/opt/gitlab/gitlab-rails/shared/registry`.
+This path is accessible to the user running the Container Registry daemon,
+user running GitLab and to the user running Nginx web server.
+
+In `/etc/gitlab/gitlab.rb`:
+
+```ruby
+gitlab_rails['registry_path'] = "/path/to/registry/storage"
+```
+
+Save the file and [reconfigure GitLab][] for the changes to take effect.
+
+**NOTE** You should confirm that the GitLab, registry and the web server user
+have access to this directory.
+
+[reconfigure gitlab]: ../../administration/restart_gitlab.md "How to restart GitLab documentation"
+[wildcard certificate]: "https://en.wikipedia.org/wiki/Wildcard_certificate"

From 63c1792eface9ae8345d2dfe814b83ab8a401ea4 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 15 May 2016 10:02:20 -0500
Subject: [PATCH 0657/1431] Rearrange headings

---
 doc/administration/container_registry.md | 42 +++++++++++++++++-------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index d89cfd1d43e..2b7e143f685 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -1,6 +1,18 @@
 # GitLab Container Registry Administration
 
-Documentation on how to use Container Registry are under [TODO](TODO.md).
+> **Note:**
+This feature was [introduced][ce-4040] in GitLab 8.8.
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [Configuration](#configuration)
+    - [Container Registry under its own domain](#container-registry-under-its-own-domain)
+    - [Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
+- [Container Registry storage path](#container-registry-storage-path)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 ## Configuration
 
@@ -12,23 +24,25 @@ This means that the Container Registry requires a SSL certificate.
 There are two options on how this can be configured:
 
 1. Use its own domain - needs a SSL certificate for that specific domain
-(eg. registry.example.com) or a wildcard certificate if hosted under a subdomain
-(eg. registry.gitlab.example.com)
+   (eg. registry.example.com) or a wildcard certificate if hosted under a subdomain
+   (eg. registry.gitlab.example.com)
 1. Use existing GitLab domain and expose the registry on a port - can reuse
-existing GitLab SSL certificate
+   existing GitLab SSL certificate
 
-Note that using HTTP is possible,
-[see insecure Registry document.](https://github.com/docker/distribution/blob/master/docs/insecure.md)
+Note that using HTTP is possible but not recommended,
+[see insecure Registry document][docker-insecure].
 
 Please take this into consideration before configuring Container Registry for
 the first time.
 
-## Container Registry under its own domain
+### Container Registry under its own domain
 
 Lets assume that you want the Container Registry to be accessible at
 `https://registry.gitlab.example.com`.
 
-### Omnibus GitLab packages
+---
+
+**Omnibus GitLab packages**
 
 Place your SSL certificate and key in
 `/etc/gitlab/ssl/registry.gitlab.example.com.crt`
@@ -66,7 +80,7 @@ registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
 registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
 ```
 
-## Container Registry under existing GitLab domain
+### Container Registry under existing GitLab domain
 
 Lets assume that your GitLab instance is accessible at
 `https://gitlab.example.com`. You can expose the Container Registry under
@@ -74,7 +88,9 @@ a separate port.
 
 Lets assume that you've exposed port `4567` in your network firewall.
 
-### Omnibus GitLab packages
+**Omnibus GitLab packages**
+
+---
 
 Your `/etc/gitlab/gitlab.rb` should contain the Container Registry URL as
 well as the path to the existing SSL certificate and key used by GitLab.
@@ -105,7 +121,9 @@ with their GitLab credentials.
 It is possible to change path where containers will be stored by the Container
 Registry.
 
-### Omnibus GitLab packages
+**Omnibus GitLab packages**
+
+---
 
 By default, the path Container Registry is using to store the containers is in
 `/var/opt/gitlab/gitlab-rails/shared/registry`.
@@ -125,3 +143,5 @@ have access to this directory.
 
 [reconfigure gitlab]: ../../administration/restart_gitlab.md "How to restart GitLab documentation"
 [wildcard certificate]: "https://en.wikipedia.org/wiki/Wildcard_certificate"
+[ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
+[docker-insecure]: https://github.com/docker/distribution/blob/master/docs/insecure.md

From 04d231ef8743db55784f5c1a1f50438445ed908d Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 16 May 2016 19:21:06 -0500
Subject: [PATCH 0658/1431] Rearrange configuration parts

---
 doc/administration/container_registry.md | 76 ++++++++++++------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 2b7e143f685..1791c95df60 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -8,8 +8,8 @@ This feature was [introduced][ce-4040] in GitLab 8.8.
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [Configuration](#configuration)
-    - [Container Registry under its own domain](#container-registry-under-its-own-domain)
     - [Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
+    - [Container Registry under its own domain](#container-registry-under-its-own-domain)
 - [Container Registry storage path](#container-registry-storage-path)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -26,7 +26,7 @@ There are two options on how this can be configured:
 1. Use its own domain - needs a SSL certificate for that specific domain
    (eg. registry.example.com) or a wildcard certificate if hosted under a subdomain
    (eg. registry.gitlab.example.com)
-1. Use existing GitLab domain and expose the registry on a port - can reuse
+1. Use the existing GitLab domain and expose the registry on a port - can reuse
    existing GitLab SSL certificate
 
 Note that using HTTP is possible but not recommended,
@@ -35,6 +35,42 @@ Note that using HTTP is possible but not recommended,
 Please take this into consideration before configuring Container Registry for
 the first time.
 
+### Container Registry under existing GitLab domain
+
+Lets assume that your GitLab instance is accessible at
+`https://gitlab.example.com`. You can expose the Container Registry under
+a separate port.
+
+Lets assume that you've exposed port `4567` in your network firewall.
+
+**Omnibus GitLab packages**
+
+---
+
+Your `/etc/gitlab/gitlab.rb` should contain the Container Registry URL as
+well as the path to the existing SSL certificate and key used by GitLab.
+
+```ruby
+registry_external_url 'https://gitlab.example.com:4567'
+
+## If your SSL certificate is not in /etc/gitlab/ssl/gitlab.example.com.crt
+## and key not in /etc/gitlab/ssl/gitlab.example.com.key uncomment the lines
+## below
+
+# registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
+# registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
+```
+
+Save the file and [reconfigure GitLab][] for the changes to take effect.
+
+Users should now be able to login to the Container Registry using:
+
+```bash
+docker login gitlab.example.com:4567
+```
+
+with their GitLab credentials.
+
 ### Container Registry under its own domain
 
 Lets assume that you want the Container Registry to be accessible at
@@ -80,42 +116,6 @@ registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
 registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
 ```
 
-### Container Registry under existing GitLab domain
-
-Lets assume that your GitLab instance is accessible at
-`https://gitlab.example.com`. You can expose the Container Registry under
-a separate port.
-
-Lets assume that you've exposed port `4567` in your network firewall.
-
-**Omnibus GitLab packages**
-
----
-
-Your `/etc/gitlab/gitlab.rb` should contain the Container Registry URL as
-well as the path to the existing SSL certificate and key used by GitLab.
-
-```ruby
-registry_external_url 'https://gitlab.example.com:4567'
-
-## If your SSL certificate is not in /etc/gitlab/ssl/gitlab.example.com.crt
-## and key not in /etc/gitlab/ssl/gitlab.example.com.key uncomment the lines
-## below
-
-# registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
-# registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
-```
-
-Save the file and [reconfigure GitLab][] for the changes to take effect.
-
-Users should now be able to login to the Container Registry using:
-
-```bash
-docker login gitlab.example.com:4567
-```
-
-with their GitLab credentials.
-
 ## Container Registry storage path
 
 It is possible to change path where containers will be stored by the Container

From 0695cdee178ac995f7dec81dcd734eef7e28e36e Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 18 May 2016 12:03:57 -0500
Subject: [PATCH 0659/1431] Add assumptions section and refactor domain
 configuration

---
 doc/administration/container_registry.md | 56 +++++++++++++++++-------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 1791c95df60..17a0c229b97 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -7,33 +7,49 @@ This feature was [introduced][ce-4040] in GitLab 8.8.
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Configuration](#configuration)
+- [Assumptions](#assumptions)
+- [Container Registry domain configuration](#container-registry-domain-configuration)
     - [Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
     - [Container Registry under its own domain](#container-registry-under-its-own-domain)
 - [Container Registry storage path](#container-registry-storage-path)
+- [Disable Container Registry](#disable-container-registry)
+- [Changelog](#changelog)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## Configuration
+## Assumptions
 
-Containers can be large in size and they are stored on the server GitLab is
-installed on.
+If you are using Omnibus, you have to bare in mind the following:
 
-The Container Registry works under HTTPS by default.
-This means that the Container Registry requires a SSL certificate.
-There are two options on how this can be configured:
+- The container Registry will be enabled by default if GitLab is configured
+  with HTTPS and it will listen on port `5005`. If you want the Registry to
+  listen on a port other than `5005` which is the default, read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
+  on how to achieve that. You will also have to configure your firewall to allow
+  connections to that port.
+- The Container Registry works under HTTPS by default. Note that using HTTP is
+  possible but not recommended and out of the scope of this document,
+  [see the insecure Registry documentation][docker-insecure] if you want to
+  implement this.
 
-1. Use its own domain - needs a SSL certificate for that specific domain
-   (eg. registry.example.com) or a wildcard certificate if hosted under a subdomain
-   (eg. registry.gitlab.example.com)
-1. Use the existing GitLab domain and expose the registry on a port - can reuse
-   existing GitLab SSL certificate
+## Container Registry domain configuration
 
-Note that using HTTP is possible but not recommended,
-[see insecure Registry document][docker-insecure].
+There are two ways you can configure the container Registry domain. Either use
+the existing GitLab domain where in that case the Registry will listen on a port,
+or use a completely separate domain. Since the container Registry requires a
+TLS certificate, in the end it all boils down to how easy or pricey is to
+get a new TLS certificate.
 
-Please take this into consideration before configuring Container Registry for
-the first time.
+1. If the Registry is configured to use its own domain, you will need a TLS
+   certificate for that specific domain (e.g., `registry.example.com`) or maybe
+   a wildcard certificate if hosted under a subdomain (e.g., `registry.gitlab.example.com`).
+1. If the Registry is configured to use the existing GitLab domain, you can
+   expose the Registry on a port so that you can reuse the existing GitLab TLS
+   certificate.
+
+Please take this into consideration before configuring the Container Registry
+for the first time.
+
+Read more about Docker Registry at https://docs.docker.com/registry/introduction/.
 
 ### Container Registry under existing GitLab domain
 
@@ -141,7 +157,13 @@ Save the file and [reconfigure GitLab][] for the changes to take effect.
 **NOTE** You should confirm that the GitLab, registry and the web server user
 have access to this directory.
 
+## Disable Container Registry
+
+
+## Changelog
+
+
 [reconfigure gitlab]: ../../administration/restart_gitlab.md "How to restart GitLab documentation"
 [wildcard certificate]: "https://en.wikipedia.org/wiki/Wildcard_certificate"
 [ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
-[docker-insecure]: https://github.com/docker/distribution/blob/master/docs/insecure.md
+[docker-insecure]: https://docs.docker.com/registry/insecure/

From 0cdc080a4a4d8146f6c874c91b8bff6960214c56 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 20 May 2016 13:18:18 -0500
Subject: [PATCH 0660/1431] Refactor container docs

---
 doc/administration/container_registry.md | 181 ++++++++++++++++++-----
 1 file changed, 148 insertions(+), 33 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 17a0c229b97..15c3c1a7470 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -3,11 +3,18 @@
 > **Note:**
 This feature was [introduced][ce-4040] in GitLab 8.8.
 
+With the Docker container Registry integrated into GitLab, every project can
+have its own space for Docker images.
+
+You can read more about Docker Registry at https://docs.docker.com/registry/introduction/.
+
+---
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Assumptions](#assumptions)
+- [Differences between Omnibus and source installations](#differences-between-omnibus-and-source-installations)
 - [Container Registry domain configuration](#container-registry-domain-configuration)
     - [Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
     - [Container Registry under its own domain](#container-registry-under-its-own-domain)
@@ -17,67 +24,110 @@ This feature was [introduced][ce-4040] in GitLab 8.8.
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## Assumptions
+
+## Differences between Omnibus and source installations
 
 If you are using Omnibus, you have to bare in mind the following:
 
 - The container Registry will be enabled by default if GitLab is configured
   with HTTPS and it will listen on port `5005`. If you want the Registry to
-  listen on a port other than `5005` which is the default, read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
+  listen on a port other than `5005`, read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
   on how to achieve that. You will also have to configure your firewall to allow
   connections to that port.
-- The Container Registry works under HTTPS by default. Note that using HTTP is
-  possible but not recommended and out of the scope of this document,
+- The container Registry works under HTTPS by default. Using HTTP is possible
+  but not recommended and out of the scope of this document,
   [see the insecure Registry documentation][docker-insecure] if you want to
   implement this.
 
+---
+
+If you have installed GitLab from source:
+- Omnibus has some things configured for you
+
+- You will have to install Docker Registry by yourself. You can follow the
+  [official documentation][registry-deploy].
+- The container Registry will not be enabled by default, you will have to
+  configure it in `gitlab.yml`.
+
+The contents of `gitlab.yml` are:
+
+```
+registry:
+  enabled: true
+  host: registry.gitlab.example.com
+  port: 5005
+  api_url: http://localhost:5000/
+  key_path: config/registry.key
+  path: shared/registry
+  issuer: gitlab-issuer
+```
+
+where:
+
+| Parameter | Description |
+| --------- | ----------- |
+| `enabled` | Enables the Registry in GitLab. By default this is false. |
+| `host`    | The host URL under which the Registry will run and the users will be able to use. |
+| `port`    | The port under which the external Registry domain will listen on. |
+| `api_url` | The internal API URL under which the Registry is exposed to. It defaults to `http://localhost:5000`. |
+| `key_path`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
+| `path`    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. |
+| `issuer`  | This should be the same value as configured in Registry's `issuer`. Read the [token auth configuration documentation][token-config]. |
+
 ## Container Registry domain configuration
 
-There are two ways you can configure the container Registry domain. Either use
+There are two ways you can configure the Registry's external domain. Either use
 the existing GitLab domain where in that case the Registry will listen on a port,
 or use a completely separate domain. Since the container Registry requires a
 TLS certificate, in the end it all boils down to how easy or pricey is to
 get a new TLS certificate.
 
-1. If the Registry is configured to use its own domain, you will need a TLS
-   certificate for that specific domain (e.g., `registry.example.com`) or maybe
-   a wildcard certificate if hosted under a subdomain (e.g., `registry.gitlab.example.com`).
-1. If the Registry is configured to use the existing GitLab domain, you can
-   expose the Registry on a port so that you can reuse the existing GitLab TLS
-   certificate.
-
 Please take this into consideration before configuring the Container Registry
 for the first time.
 
-Read more about Docker Registry at https://docs.docker.com/registry/introduction/.
-
 ### Container Registry under existing GitLab domain
 
-Lets assume that your GitLab instance is accessible at
-`https://gitlab.example.com`. You can expose the Container Registry under
-a separate port.
+If the Registry is configured to use the existing GitLab domain, you can
+expose the Registry on a port so that you can reuse the existing GitLab TLS
+certificate.
 
-Lets assume that you've exposed port `4567` in your network firewall.
+Assuming that the GitLab domain is `https://gitlab.example.com` and the port the
+Registry is exposed to the outside world is `4567`, here is what you need to set
+in `gitlab.rb` or `gitlab.yml` if you are using Omnibus GitLab or installed
+GitLab from source respectively.
 
 **Omnibus GitLab packages**
 
+1. Your `/etc/gitlab/gitlab.rb` should contain the Registry URL as well as the
+   path to the existing TLS certificate and key used by GitLab.
+
+    ```ruby
+    registry_external_url 'https://gitlab.example.com:4567'
+
+    ## If your SSL certificate is not in /etc/gitlab/ssl/gitlab.example.com.crt
+    ## and key not in /etc/gitlab/ssl/gitlab.example.com.key uncomment the lines
+    ## below
+
+    # registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
+    # registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
+    ```
+
+1. Save the file and [reconfigure GitLab][] for the changes to take effect.
+
 ---
 
-Your `/etc/gitlab/gitlab.rb` should contain the Container Registry URL as
-well as the path to the existing SSL certificate and key used by GitLab.
+**Installation from source**
 
-```ruby
-registry_external_url 'https://gitlab.example.com:4567'
-
-## If your SSL certificate is not in /etc/gitlab/ssl/gitlab.example.com.crt
-## and key not in /etc/gitlab/ssl/gitlab.example.com.key uncomment the lines
-## below
-
-# registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
-# registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
 ```
-
-Save the file and [reconfigure GitLab][] for the changes to take effect.
+registry:
+  enabled: true
+  host: registry.gitlab.example.com
+  port: 5005
+  api_url: http://localhost:5000/
+  key_path: config/registry.key
+  path: shared/registry
+  issuer: gitlab-issuer
+```
 
 Users should now be able to login to the Container Registry using:
 
@@ -89,7 +139,11 @@ with their GitLab credentials.
 
 ### Container Registry under its own domain
 
-Lets assume that you want the Container Registry to be accessible at
+If the Registry is configured to use its own domain, you will need a TLS
+certificate for that specific domain (e.g., `registry.example.com`) or maybe
+a wildcard certificate if hosted under a subdomain (e.g., `registry.gitlab.example.com`).
+
+Let's assume that you want the container Registry to be accessible at
 `https://registry.gitlab.example.com`.
 
 ---
@@ -114,6 +168,17 @@ registry_external_url 'https://registry.gitlab.example.com'
 
 Save the file and [reconfigure GitLab][] for the changes to take effect.
 
+```
+registry:
+  enabled: true
+  host: registry.gitlab.example.com
+  port: 5005
+  api_url: http://localhost:5000/
+  key_path: config/registry.key
+  path: shared/registry
+  issuer: gitlab-issuer
+```
+
 Users should now be able to login to the Container Registry using:
 
 ```bash
@@ -132,6 +197,17 @@ registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
 registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
 ```
 
+```
+registry:
+  enabled: true
+  host: registry.gitlab.example.com
+  port: 5005
+  api_url: http://localhost:5000/
+  key_path: config/registry.key
+  path: shared/registry
+  issuer: gitlab-issuer
+```
+
 ## Container Registry storage path
 
 It is possible to change path where containers will be stored by the Container
@@ -152,6 +228,17 @@ In `/etc/gitlab/gitlab.rb`:
 gitlab_rails['registry_path'] = "/path/to/registry/storage"
 ```
 
+```
+registry:
+  enabled: true
+  host: registry.gitlab.example.com
+  port: 5005
+  api_url: http://localhost:5000/
+  key_path: config/registry.key
+  path: shared/registry
+  issuer: gitlab-issuer
+```
+
 Save the file and [reconfigure GitLab][] for the changes to take effect.
 
 **NOTE** You should confirm that the GitLab, registry and the web server user
@@ -159,6 +246,31 @@ have access to this directory.
 
 ## Disable Container Registry
 
+**Omnibus GitLab**
+
+```
+# Settings used by GitLab application
+# gitlab_rails['registry_enabled'] = true
+```
+
+```
+# gitlab_rails['registry_host'] = "registry.gitlab.example.com"
+# gitlab_rails['registry_api_url'] = "http://localhost:5000"
+# gitlab_rails['registry_key_path'] = "/var/opt/gitlab/gitlab-rails/certificate.key"
+# gitlab_rails['registry_path'] = "/var/opt/gitlab/gitlab-rails/shared/registry"
+# gitlab_rails['registry_issuer'] = "omnibus-gitlab-issuer"
+
+# Settings used by Registry application
+# registry['enable'] = true
+# registry['username'] = "registry"
+# registry['group'] = "registry"
+# registry['uid'] = nil
+# registry['gid'] = nil
+# registry['dir'] = "/var/opt/gitlab/registry"
+# registry['log_directory'] = "/var/log/gitlab/registry"
+# registry['log_level'] = "info"
+# registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt"
+```
 
 ## Changelog
 
@@ -167,3 +279,6 @@ have access to this directory.
 [wildcard certificate]: "https://en.wikipedia.org/wiki/Wildcard_certificate"
 [ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
 [docker-insecure]: https://docs.docker.com/registry/insecure/
+[registry-deploy]: https://docs.docker.com/registry/deploying/
+[storage-config]: https://docs.docker.com/registry/configuration/#storage
+[token-config]: https://docs.docker.com/registry/configuration/#token

From c6cd07ba3a8ef149ff69e0c1520a810b3001b65f Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 20 May 2016 13:18:39 -0500
Subject: [PATCH 0661/1431] Add link to container registry

---
 doc/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/README.md b/doc/README.md
index 8aed060d247..a297ce54f3e 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -44,6 +44,7 @@
 - [Monitoring uptime](monitoring/health_check.md) Check the server status using the health check endpoint
 - [Sidekiq Troubleshooting](administration/troubleshooting/sidekiq.md) Debug when Sidekiq appears hung and is not processing jobs
 - [High Availability](administration/high_availability/README.md) Configure multiple servers for scaling or high availability
+- [Container Registry](administration/container_registry.md) Configure Docker Registry with GitLab
 
 ## Contributor documentation
 

From 26c768b42cbcb7af47f08254baa305de37828cf0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 20 May 2016 13:18:55 -0500
Subject: [PATCH 0662/1431] Add proper config values for Registry in gitlab.yml

---
 config/gitlab.yml.example | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0cef2794f4e..0510e7df597 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -179,11 +179,11 @@ production: &base
   registry:
     # enabled: true
     # host: registry.example.com
-    # port: 5000
-    # api_url: http://localhost:5000/
-    # key: config/registry.key
-    # issuer: omnibus-certificate
+    # port: 5005
+    # api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API
+    # key_path: config/registry.key
     # path: shared/registry
+    # issuer: gitlab-issuer
 
   #
   # 2. GitLab CI settings

From c1af75192dd281e23249a5d4eb4126dce5bc5efd Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 20 May 2016 13:19:42 -0500
Subject: [PATCH 0663/1431] Add NGINX config file for Registry

---
 lib/support/nginx/registry-ssl | 51 ++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 lib/support/nginx/registry-ssl

diff --git a/lib/support/nginx/registry-ssl b/lib/support/nginx/registry-ssl
new file mode 100644
index 00000000000..af607db0121
--- /dev/null
+++ b/lib/support/nginx/registry-ssl
@@ -0,0 +1,51 @@
+## Lines starting with two hashes (##) are comments with information.
+## Lines starting with one hash (#) are configuration parameters that can be uncommented.
+##
+###################################
+##         configuration         ##
+###################################
+
+## Redirects all HTTP traffic to the HTTPS host
+server {
+  listen *:80;
+  server_name  registry.gitlab.example.com;
+  server_tokens off; ## Don't show the nginx version number, a security best practice
+  return 301 https://$http_host:$request_uri;
+  access_log  /var/log/nginx/gitlab_registry_access.log gitlab_access;
+  error_log   /var/log/nginx/gitlab_registry_error.log;
+}
+
+server {
+  listen *:443 ssl http2;
+  server_name  registry.gitlab.example.com;
+  server_tokens off; ## Don't show the nginx version number, a security best practice
+
+  client_max_body_size 0;
+  chunked_transfer_encoding on;
+
+  ## Strong SSL Security
+  ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
+  ssl on;
+  ssl_certificate /etc/gitlab/ssl/registry.gitlab.example.com.crt
+  ssl_certificate_key /etc/gitlab/ssl/registry.gitlab.example.com.key
+
+  ssl_ciphers 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4';
+  ssl_protocols  TLSv1 TLSv1.1 TLSv1.2;
+  ssl_prefer_server_ciphers on;
+  ssl_session_cache  builtin:1000  shared:SSL:10m;
+  ssl_session_timeout  5m;
+
+  access_log  /var/log/gitlab/nginx/gitlab_registry_access.log gitlab_access;
+  error_log   /var/log/gitlab/nginx/gitlab_registry_error.log;
+
+  location / {
+    proxy_set_header  Host              $http_host;   # required for docker client's sake
+    proxy_set_header  X-Real-IP         $remote_addr; # pass on real client's IP
+    proxy_set_header  X-Forwarded-For   $proxy_add_x_forwarded_for;
+    proxy_set_header  X-Forwarded-Proto $scheme;
+    proxy_read_timeout                  900;
+
+    proxy_pass          http://localhost:5000;
+  }
+
+}

From e9817f21f4baa20244095f56dd0d45b5c2e9c5dc Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sat, 21 May 2016 20:08:26 -0500
Subject: [PATCH 0664/1431] Major overhaul of the Registry admin docs

---
 doc/administration/container_registry.md | 306 ++++++++++++++---------
 1 file changed, 193 insertions(+), 113 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 15c3c1a7470..21f086792cd 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -3,8 +3,8 @@
 > **Note:**
 This feature was [introduced][ce-4040] in GitLab 8.8.
 
-With the Docker container Registry integrated into GitLab, every project can
-have its own space for Docker images.
+With the Docker Container Registry integrated into GitLab, every project can
+have its own space to store its Docker images.
 
 You can read more about Docker Registry at https://docs.docker.com/registry/introduction/.
 
@@ -14,18 +14,22 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Differences between Omnibus and source installations](#differences-between-omnibus-and-source-installations)
+- [How to enable the Container Registry](#how-to-enable-the-container-registry)
 - [Container Registry domain configuration](#container-registry-domain-configuration)
-    - [Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
-    - [Container Registry under its own domain](#container-registry-under-its-own-domain)
+    - [Configure Container Registry under an existing GitLab domain](#configure-container-registry-under-an-existing-gitlab-domain)
+    - [Configure Container Registry under its own domain](#configure-container-registry-under-its-own-domain)
+- [Disable Container Registry site-wide](#disable-container-registry-site-wide)
+- [Disable Container Registry per project](#disable-container-registry-per-project)
+- [Disable Container Registry for new projects site-wide](#disable-container-registry-for-new-projects-site-wide)
 - [Container Registry storage path](#container-registry-storage-path)
-- [Disable Container Registry](#disable-container-registry)
+- [Storage limitations](#storage-limitations)
 - [Changelog](#changelog)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## How to enable the Container Registry
 
-## Differences between Omnibus and source installations
+**Omnibus GitLab installations**
 
 If you are using Omnibus, you have to bare in mind the following:
 
@@ -35,19 +39,21 @@ If you are using Omnibus, you have to bare in mind the following:
   on how to achieve that. You will also have to configure your firewall to allow
   connections to that port.
 - The container Registry works under HTTPS by default. Using HTTP is possible
-  but not recommended and out of the scope of this document,
-  [see the insecure Registry documentation][docker-insecure] if you want to
+  but not recommended and out of the scope of this document.
+  [See the insecure Registry documentation][docker-insecure] if you want to
   implement this.
 
 ---
 
-If you have installed GitLab from source:
-- Omnibus has some things configured for you
+**Installations from source**
 
-- You will have to install Docker Registry by yourself. You can follow the
-  [official documentation][registry-deploy].
-- The container Registry will not be enabled by default, you will have to
-  configure it in `gitlab.yml`.
+If you have installed GitLab from source:
+
+1. You will have to [install Docker Registry][registry-deploy] by yourself.
+1. After the installation is complete, you will have to configure the Registry's
+   settings `gitlab.yml` in order to enable it.
+1. Use the sample NGINX configuration file that is found under
+   [`lib/support/nginx/registry-ssl`][registry-ssl].
 
 The contents of `gitlab.yml` are:
 
@@ -66,26 +72,31 @@ where:
 
 | Parameter | Description |
 | --------- | ----------- |
-| `enabled` | Enables the Registry in GitLab. By default this is false. |
+| `enabled` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. |
 | `host`    | The host URL under which the Registry will run and the users will be able to use. |
 | `port`    | The port under which the external Registry domain will listen on. |
 | `api_url` | The internal API URL under which the Registry is exposed to. It defaults to `http://localhost:5000`. |
 | `key_path`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
-| `path`    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. |
+| `path`    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
 | `issuer`  | This should be the same value as configured in Registry's `issuer`. Read the [token auth configuration documentation][token-config]. |
 
+>**Note:**
+GitLab does not ship with a Registry init file. Hence, [restarting GitLab][restart gitlab]
+will not restart the Registry should you modify its settings. Read the upstream
+documentation on how to achieve that.
+
 ## Container Registry domain configuration
 
 There are two ways you can configure the Registry's external domain. Either use
 the existing GitLab domain where in that case the Registry will listen on a port,
 or use a completely separate domain. Since the container Registry requires a
-TLS certificate, in the end it all boils down to how easy or pricey is to
-get a new TLS certificate.
+TLS certificate, in the end it all boils down to how easy or pricey is to get a
+new TLS certificate.
 
 Please take this into consideration before configuring the Container Registry
 for the first time.
 
-### Container Registry under existing GitLab domain
+### Configure Container Registry under an existing GitLab domain
 
 If the Registry is configured to use the existing GitLab domain, you can
 expose the Registry on a port so that you can reuse the existing GitLab TLS
@@ -96,118 +107,203 @@ Registry is exposed to the outside world is `4567`, here is what you need to set
 in `gitlab.rb` or `gitlab.yml` if you are using Omnibus GitLab or installed
 GitLab from source respectively.
 
-**Omnibus GitLab packages**
+---
+
+**Omnibus GitLab installations**
+
+>**Note:**
+If you are using HTTPS in your Omnibus packages, then the Registry will be
+enabled by default and exposed under port `5005`. Follow the steps below only if
+you want to change the default port.
 
 1. Your `/etc/gitlab/gitlab.rb` should contain the Registry URL as well as the
-   path to the existing TLS certificate and key used by GitLab.
+   path to the existing TLS certificate and key used by GitLab:
 
     ```ruby
+    gitlab_rails['registry_port'] = "4567"
+    gitlab_rails['registry_host'] = "gitlab.example.com"
+
+    # The following setting is needed for NGINX
     registry_external_url 'https://gitlab.example.com:4567'
+    ```
 
-    ## If your SSL certificate is not in /etc/gitlab/ssl/gitlab.example.com.crt
-    ## and key not in /etc/gitlab/ssl/gitlab.example.com.key uncomment the lines
-    ## below
+    If your TLS certificate is not in `/etc/gitlab/ssl/gitlab.example.com.crt`
+    and key not in `/etc/gitlab/ssl/gitlab.example.com.key` uncomment the lines
+    below:
 
-    # registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
-    # registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
+    ```ruby
+    registry_nginx['ssl_certificate'] = "/path/to/certificate.pem"
+    registry_nginx['ssl_certificate_key'] = "/path/to/certificate.key"
     ```
 
 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
 
 ---
 
-**Installation from source**
+**Installations from source**
 
-```
-registry:
-  enabled: true
-  host: registry.gitlab.example.com
-  port: 5005
-  api_url: http://localhost:5000/
-  key_path: config/registry.key
-  path: shared/registry
-  issuer: gitlab-issuer
-```
+1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and
+   configure it with the following settings:
 
-Users should now be able to login to the Container Registry using:
+    ```
+    registry:
+      enabled: true
+      host: gitlab.example.com
+      port: 4567
+    ```
+
+1. Save the file and [restart GitLab][] for the changes to take effect.
+1. Make the relevant changes in NGINX as well (domain, port, TLS certificates path).
+
+---
+
+Users should now be able to login to the Container Registry with their GitLab
+credentials using:
 
 ```bash
 docker login gitlab.example.com:4567
 ```
 
-with their GitLab credentials.
-
-### Container Registry under its own domain
+### Configure Container Registry under its own domain
 
 If the Registry is configured to use its own domain, you will need a TLS
 certificate for that specific domain (e.g., `registry.example.com`) or maybe
-a wildcard certificate if hosted under a subdomain (e.g., `registry.gitlab.example.com`).
+a wildcard certificate if hosted under a subdomain  of your existing GitLab
+domain (e.g., `registry.gitlab.example.com`).
 
 Let's assume that you want the container Registry to be accessible at
 `https://registry.gitlab.example.com`.
 
 ---
 
-**Omnibus GitLab packages**
+**Omnibus GitLab installations**
 
-Place your SSL certificate and key in
-`/etc/gitlab/ssl/registry.gitlab.example.com.crt`
-and
-`/etc/gitlab/ssl/registry.gitlab.example.com.key` and make sure they have
-correct permissions:
+1. Place your TLS certificate and key in
+   `/etc/gitlab/ssl/registry.gitlab.example.com.crt` and
+   `/etc/gitlab/ssl/registry.gitlab.example.com.key` and make sure they have
+   correct permissions:
 
-```bash
-chmod 600 /etc/gitlab/ssl/registry.gitlab.example.com.*
-```
+    ```bash
+    chmod 600 /etc/gitlab/ssl/registry.gitlab.example.com.*
+    ```
 
-Once the SSL certificate is in place, edit `/etc/gitlab/gitlab.rb` with:
+1. Once the TLS certificate is in place, edit `/etc/gitlab/gitlab.rb` with:
 
-```ruby
-registry_external_url 'https://registry.gitlab.example.com'
-```
+    ```ruby
+    registry_external_url 'https://registry.gitlab.example.com'
+    ```
 
-Save the file and [reconfigure GitLab][] for the changes to take effect.
-
-```
-registry:
-  enabled: true
-  host: registry.gitlab.example.com
-  port: 5005
-  api_url: http://localhost:5000/
-  key_path: config/registry.key
-  path: shared/registry
-  issuer: gitlab-issuer
-```
-
-Users should now be able to login to the Container Registry using:
-
-```bash
-docker login registry.gitlab.example.com
-```
-
-with their GitLab credentials.
+1. Save the file and [reconfigure GitLab][] for the changes to take effect.
 
+> **Note:**
 If you have a [wildcard certificate][], you need to specify the path to the
 certificate in addition to the URL, in this case `/etc/gitlab/gitlab.rb` will
 look like:
-
+>
 ```ruby
 registry_external_url 'https://registry.gitlab.example.com'
 registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
 registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
 ```
 
+---
+
+**Installations from source**
+
+1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and
+   configure it with the following settings:
+
+    ```
+    registry:
+      enabled: true
+      host: registry.gitlab.example.com
+      port: 4567
+    ```
+
+1. Save the file and [restart GitLab][] for the changes to take effect.
+1. Make the relevant changes in NGINX as well (domain, port, TLS certificates path).
+
+---
+
+Users should now be able to login to the Container Registry using their GitLab
+credentials:
+
+```bash
+docker login registry.gitlab.example.com
 ```
-registry:
-  enabled: true
-  host: registry.gitlab.example.com
-  port: 5005
-  api_url: http://localhost:5000/
-  key_path: config/registry.key
-  path: shared/registry
-  issuer: gitlab-issuer
+
+## Disable Container Registry site-wide
+
+**Omnibus GitLab**
+
+```ruby
+gitlab_rails['registry_enabled'] = true
 ```
 
+```
+# gitlab_rails['registry_port'] = "5005"
+# gitlab_rails['registry_host'] = "registry.gitlab.example.com"
+# gitlab_rails['registry_api_url'] = "http://localhost:5000"
+# gitlab_rails['registry_key_path'] = "/var/opt/gitlab/gitlab-rails/certificate.key"
+# gitlab_rails['registry_path'] = "/var/opt/gitlab/gitlab-rails/shared/registry"
+# gitlab_rails['registry_issuer'] = "omnibus-gitlab-issuer"
+
+# Settings used by Registry application
+# registry['enable'] = true
+# registry['username'] = "registry"
+# registry['group'] = "registry"
+# registry['uid'] = nil
+# registry['gid'] = nil
+# registry['dir'] = "/var/opt/gitlab/registry"
+# registry['log_directory'] = "/var/log/gitlab/registry"
+# registry['log_level'] = "info"
+# registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt"
+```
+
+## Disable Container Registry per project
+
+If Registry is enabled in your GitLab instance, but you don't need it for your
+project, you can disable it from your project's settings. Read the user guide
+on how to achieve that.
+
+## Disable Container Registry for new projects site-wide
+
+The Registry is enabled by default on all new projects. To disable this function
+and let the owners of a project to enable Registry by themselves, follow the
+steps below.
+
+---
+
+**Omnibus GitLab installations**
+
+1. Edit `/etc/gitlab/gitlab.rb` and add the following line:
+
+    ```ruby
+    gitlab_rails['gitlab_default_projects_features_container_registry'] = false
+    ```
+
+1. Save the file and [reconfigure GitLab][] for the changes to take effect.
+
+---
+
+**Installations from source**
+
+1. Open `/home/git/gitlab/config/gitlab.yml`, find the `default_projects_features`
+   entry and configure it so that `container_registry` is set to `false`:
+
+    ```
+    ## Default project features settings
+    default_projects_features:
+      issues: true
+      merge_requests: true
+      wiki: true
+      snippets: false
+      builds: true
+      container_registry: false
+    ```
+
+1. Save the file and [restart GitLab][] for the changes to take effect.
+
 ## Container Registry storage path
 
 It is possible to change path where containers will be stored by the Container
@@ -244,41 +340,25 @@ Save the file and [reconfigure GitLab][] for the changes to take effect.
 **NOTE** You should confirm that the GitLab, registry and the web server user
 have access to this directory.
 
-## Disable Container Registry
+## Storage limitations
 
-**Omnibus GitLab**
-
-```
-# Settings used by GitLab application
-# gitlab_rails['registry_enabled'] = true
-```
-
-```
-# gitlab_rails['registry_host'] = "registry.gitlab.example.com"
-# gitlab_rails['registry_api_url'] = "http://localhost:5000"
-# gitlab_rails['registry_key_path'] = "/var/opt/gitlab/gitlab-rails/certificate.key"
-# gitlab_rails['registry_path'] = "/var/opt/gitlab/gitlab-rails/shared/registry"
-# gitlab_rails['registry_issuer'] = "omnibus-gitlab-issuer"
-
-# Settings used by Registry application
-# registry['enable'] = true
-# registry['username'] = "registry"
-# registry['group'] = "registry"
-# registry['uid'] = nil
-# registry['gid'] = nil
-# registry['dir'] = "/var/opt/gitlab/registry"
-# registry['log_directory'] = "/var/log/gitlab/registry"
-# registry['log_level'] = "info"
-# registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt"
-```
+Currently, there is no storage limitation, which means a user can upload an
+infinite amount of Docker images with arbitrary sizes. This setting will be
+configurable in future releases.
 
 ## Changelog
 
+**GitLab 8.8 ([source docs][8-8-docs])**
 
-[reconfigure gitlab]: ../../administration/restart_gitlab.md "How to restart GitLab documentation"
-[wildcard certificate]: "https://en.wikipedia.org/wiki/Wildcard_certificate"
+- GitLab Container Registry feature was introduced.
+
+[reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure
+[restart gitlab]: restart_gitlab.md#installations-from-source
+[wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate
 [ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
 [docker-insecure]: https://docs.docker.com/registry/insecure/
 [registry-deploy]: https://docs.docker.com/registry/deploying/
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
 [token-config]: https://docs.docker.com/registry/configuration/#token
+[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/doc/administration/container_registry.md
+[registry-ssl]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/registry-ssl

From 27067e565fb5c425b307a8e28c5dcab95fa8b0bf Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sat, 21 May 2016 20:15:42 -0500
Subject: [PATCH 0665/1431] Clarify how the Registry is enabled in Omnibus

---
 doc/administration/container_registry.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 21f086792cd..435e7f627b0 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -34,14 +34,17 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
 If you are using Omnibus, you have to bare in mind the following:
 
 - The container Registry will be enabled by default if GitLab is configured
-  with HTTPS and it will listen on port `5005`. If you want the Registry to
-  listen on a port other than `5005`, read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
+  with HTTPS in new and existing installations (no action is required from the
+  administrator), and it will listen on port `5005`. If you wish to change it,
+  read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
   on how to achieve that. You will also have to configure your firewall to allow
-  connections to that port.
-- The container Registry works under HTTPS by default. Using HTTP is possible
-  but not recommended and out of the scope of this document.
-  [See the insecure Registry documentation][docker-insecure] if you want to
-  implement this.
+  incoming connections to that port.
+
+>**Note:**
+The container Registry works under HTTPS by default. Using HTTP is possible
+but not recommended and out of the scope of this document.
+Read the [insecure Registry documentation][docker-insecure] if you want to
+implement this.
 
 ---
 

From 13bf612600f126faddb4de5e8376a27a466ff830 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sun, 22 May 2016 22:40:43 +0200
Subject: [PATCH 0666/1431] Test migration helpers using a migration class

---
 spec/lib/gitlab/database/migration_helpers_spec.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index ec43165bb53..642954f8d2d 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -2,15 +2,13 @@ require 'spec_helper'
 
 describe Gitlab::Database::MigrationHelpers, lib: true do
   let(:model) do
-    Class.new do
-      include Gitlab::Database::MigrationHelpers
-
-      def method_missing(name, *args, &block)
-        ActiveRecord::Base.connection.send(name, *args, &block)
-      end
-    end.new
+    ActiveRecord::Migration.new.extend(
+      Gitlab::Database::MigrationHelpers
+    )
   end
 
+  before { allow(model).to receive(:puts) }
+
   describe '#add_concurrent_index' do
     context 'outside a transaction' do
       before do

From 9e92b0eead3c2b6dabf377f119cd1f91fd645a42 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sun, 22 May 2016 22:41:14 +0200
Subject: [PATCH 0667/1431] Add specs for migration helpers and boolean values

---
 spec/lib/gitlab/database/migration_helpers_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 642954f8d2d..35ade7a2be0 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -58,6 +58,12 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
       expect(Project.where(import_error: 'foo').count).to eq(5)
     end
+
+    it 'updates boolean values correctly' do
+      model.update_column_in_batches(:projects, :archived, true)
+
+      expect(Project.where(archived: true).count).to eq(5)
+    end
   end
 
   describe '#add_column_with_default' do

From 2df8b48dbbe57f64d414e7c3395f9d34b01271b0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sun, 22 May 2016 22:44:59 +0200
Subject: [PATCH 0668/1431] Add MySQL compatibility fix in migration helpers

---
 lib/gitlab/database/migration_helpers.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 9b662d163f0..1fe6c1143d5 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -39,7 +39,8 @@ module Gitlab
       def update_column_in_batches(table, column, value)
         quoted_table = quote_table_name(table)
         quoted_column = quote_column_name(column)
-        quoted_value = quote(value)
+        # workaround for #17711
+        quoted_value = connection.quote(value)
         processed = 0
 
         total = exec_query("SELECT COUNT(*) AS count FROM #{quoted_table}").

From 7f9092da1e349c51af9febaa4db4995c851ef2d2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sun, 22 May 2016 23:31:33 +0200
Subject: [PATCH 0669/1431] Extend comment for migrations helper MySQL fix

---
 lib/gitlab/database/migration_helpers.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 1fe6c1143d5..fd14234c558 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -39,7 +39,14 @@ module Gitlab
       def update_column_in_batches(table, column, value)
         quoted_table = quote_table_name(table)
         quoted_column = quote_column_name(column)
-        # workaround for #17711
+
+        ##
+        # Workaround for #17711
+        #
+        # It looks like for MySQL `ActiveRecord::Base.conntection.quote(true)`
+        # returns correct value (1), but `ActiveRecord::Migration.new.quote`
+        # returns incorrect value ('true'), which causes migrations to fail.
+        #
         quoted_value = connection.quote(value)
         processed = 0
 

From 891888aa05bc9a0a156ea098205eb70150d53732 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sun, 22 May 2016 23:33:08 +0200
Subject: [PATCH 0670/1431] Add Changelog entry for MySQL compatibility fix

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 01585ede586..13b937b8c46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+v 8.8.1 (unreleased)
+  - Fix MySQL compatibility in zero downtime migrations helpers
+
 v 8.8.0 (unreleased)
   - Implement GFM references for milestones (Alejandro Rodríguez)
   - Snippets tab under user profile. !4001 (Long Nguyen)

From e955f49fb7d8edeefc0d2647539276acf34d5731 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 22 May 2016 17:23:30 -0500
Subject: [PATCH 0671/1431] Fix Registry docs now that it is not enabled be
 default

---
 doc/administration/container_registry.md | 43 +++++++++++++++---------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 435e7f627b0..a3df14019f3 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -14,7 +14,7 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [How to enable the Container Registry](#how-to-enable-the-container-registry)
+- [Enable the Container Registry](#enable-the-container-registry)
 - [Container Registry domain configuration](#container-registry-domain-configuration)
     - [Configure Container Registry under an existing GitLab domain](#configure-container-registry-under-an-existing-gitlab-domain)
     - [Configure Container Registry under its own domain](#configure-container-registry-under-its-own-domain)
@@ -27,18 +27,19 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## How to enable the Container Registry
+## Enable the Container Registry
 
 **Omnibus GitLab installations**
 
-If you are using Omnibus, you have to bare in mind the following:
+1. Open `/etc/gitlab/gitlab.rb` and edit or add the following line:
 
-- The container Registry will be enabled by default if GitLab is configured
-  with HTTPS in new and existing installations (no action is required from the
-  administrator), and it will listen on port `5005`. If you wish to change it,
-  read [#Container Registry under existing GitLab domain](#container-registry-under-existing-gitlab-domain)
-  on how to achieve that. You will also have to configure your firewall to allow
-  incoming connections to that port.
+    ```ruby
+    gitlab_rails['registry_enabled'] = true
+    ```
+
+1. The next step is to configure the domain name under which the Container
+   Registry will listen to. Read [#container-registry-domain-configuration](#container-registry-domain-configuration)
+   and pick one of the two options that fits your case.
 
 >**Note:**
 The container Registry works under HTTPS by default. Using HTTP is possible
@@ -54,9 +55,10 @@ If you have installed GitLab from source:
 
 1. You will have to [install Docker Registry][registry-deploy] by yourself.
 1. After the installation is complete, you will have to configure the Registry's
-   settings `gitlab.yml` in order to enable it.
+   settings in `gitlab.yml` in order to enable it.
 1. Use the sample NGINX configuration file that is found under
-   [`lib/support/nginx/registry-ssl`][registry-ssl].
+   [`lib/support/nginx/registry-ssl`][registry-ssl] and edit it to match the
+   `host`, `port` and TLS certs paths.
 
 The contents of `gitlab.yml` are:
 
@@ -90,11 +92,15 @@ documentation on how to achieve that.
 
 ## Container Registry domain configuration
 
-There are two ways you can configure the Registry's external domain. Either use
-the existing GitLab domain where in that case the Registry will listen on a port,
-or use a completely separate domain. Since the container Registry requires a
-TLS certificate, in the end it all boils down to how easy or pricey is to get a
-new TLS certificate.
+There are two ways you can configure the Registry's external domain.
+
+- Either [use the existing GitLab domain][existing-domain] where in that case
+  the Registry will have to listen on a port and reuse GitLab's TLS certificate,
+- or [use a completely separate domain][new-domain] with a new TLS certificate
+  for that domain.
+
+Since the container Registry requires a TLS certificate, in the end it all boils
+down to how easy or pricey is to get a new one.
 
 Please take this into consideration before configuring the Container Registry
 for the first time.
@@ -193,6 +199,9 @@ Let's assume that you want the container Registry to be accessible at
 1. Once the TLS certificate is in place, edit `/etc/gitlab/gitlab.rb` with:
 
     ```ruby
+    gitlab_rails['registry_host'] = "registry.gitlab.example.com"
+
+    # The following setting is needed for NGINX
     registry_external_url 'https://registry.gitlab.example.com'
     ```
 
@@ -365,3 +374,5 @@ configurable in future releases.
 [token-config]: https://docs.docker.com/registry/configuration/#token
 [8-8-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/doc/administration/container_registry.md
 [registry-ssl]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/registry-ssl
+[existing-domain]: #configure-container-registry-under-an-existing-gitlab-domain
+[new-domain]: #configure-container-registry-under-its-own-domain

From 646018a40e7d29682f31e774f453a6b3427b4216 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 14:14:12 -0500
Subject: [PATCH 0672/1431] Fix the CI login to Container Registry (the
 gitlab-ci-token user)

---
 CHANGELOG                                                     | 1 +
 app/controllers/jwt_controller.rb                             | 2 +-
 .../auth/container_registry_authentication_service.rb         | 2 +-
 spec/requests/jwt_controller_spec.rb                          | 2 +-
 .../auth/container_registry_authentication_service_spec.rb    | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 13b937b8c46..434c7b554f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 8.8.0 (unreleased)
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
+  - Fix the CI login to Container Registry (the gitlab-ci-token user)
   - Fix API leak of notes of unauthorized issues, snippets and merge requests
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index f5aa5397ff1..156ab2811d6 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -36,7 +36,7 @@ class JwtController < ApplicationController
   end
 
   def authenticate_project(login, password)
-    if login == 'gitlab_ci_token'
+    if login == 'gitlab-ci-token'
       Project.find_by(builds_enabled: true, runners_token: password)
     end
   end
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index f807b8ec09a..2bbab643e69 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -6,7 +6,7 @@ module Auth
       return error('not found', 404) unless registry.enabled
 
       if params[:offline_token]
-        return error('unauthorized', 401) unless current_user
+        return error('unauthorized', 401) unless current_user || project
       else
         return error('forbidden', 403) unless scope
       end
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 7bb71365a48..d006ff195cf 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -23,7 +23,7 @@ describe JwtController do
   context 'when using authorized request' do
     context 'using CI token' do
       let(:project) { create(:empty_project, runners_token: 'token', builds_enabled: builds_enabled) }
-      let(:headers) { { authorization: credentials('gitlab_ci_token', project.runners_token) } }
+      let(:headers) { { authorization: credentials('gitlab-ci-token', project.runners_token) } }
 
       subject! { get '/jwt/auth', parameters, headers }
 
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 73b8c3f048f..3f4a1ced2b6 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -127,12 +127,12 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
   context 'project authorization' do
     let(:current_project) { create(:empty_project) }
 
-    context 'disallow to use offline_token' do
+    context 'allow to use offline_token' do
       let(:current_params) do
         { offline_token: true }
       end
 
-      it_behaves_like 'an unauthorized'
+      it_behaves_like 'an authenticated'
     end
 
     context 'allow to pull and push images' do

From edfb20f2bc067d72887caccb15b8cd323827c897 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 23 May 2016 00:09:42 +0200
Subject: [PATCH 0673/1431] Move registry fix Changelog entry to valid version

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

diff --git a/CHANGELOG b/CHANGELOG
index 434c7b554f8..ef4d72a9e9b 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.8.1 (unreleased)
   - Fix MySQL compatibility in zero downtime migrations helpers
+  - Fix the CI login to Container Registry (the gitlab-ci-token user)
 
 v 8.8.0 (unreleased)
   - Implement GFM references for milestones (Alejandro Rodríguez)
@@ -32,7 +33,6 @@ v 8.8.0 (unreleased)
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
-  - Fix the CI login to Container Registry (the gitlab-ci-token user)
   - Fix API leak of notes of unauthorized issues, snippets and merge requests
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated

From cd26cfbc27218b734a1a78836084f2205a18c580 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 17:58:11 -0500
Subject: [PATCH 0674/1431] Allow anonymous user to access pipelines

---
 CHANGELOG                                | 1 +
 app/helpers/projects_helper.rb           | 4 ++++
 app/models/ability.rb                    | 1 +
 app/views/layouts/nav/_project.html.haml | 3 ++-
 spec/features/pipelines_spec.rb          | 6 ++++++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index ef4d72a9e9b..950002df8f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,7 @@ v 8.8.0 (unreleased)
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
   - Reduce delay in destroying a project from 1-minute to immediately
+  - Fix access to Pipelines by Anonymous user
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
   - Added /health_check endpoint for checking service status
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 0825b5b6437..5e5d170a9f3 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -144,6 +144,10 @@ module ProjectsHelper
       nav_tabs << :merge_requests
     end
 
+    if can?(current_user, :read_pipeline, project)
+      nav_tabs << :pipelines
+    end
+
     if can?(current_user, :read_build, project)
       nav_tabs << :builds
     end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index f7ea2fd2b1f..b354b1990c7 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -60,6 +60,7 @@ class Ability
           :read_project_member,
           :read_merge_request,
           :read_note,
+          :read_pipeline,
           :read_commit_status,
           :read_container_image,
           :download_code
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index a97fefcfb46..6dff488eda5 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -38,7 +38,7 @@
         %span
           Commits
 
-  - if project_nav_tab? :builds
+  - if project_nav_tab? :pipelines
     = nav_link(controller: :pipelines) do
       = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
         = icon('ship fw')
@@ -46,6 +46,7 @@
           Pipelines
           %span.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
 
+  - if project_nav_tab? :builds
     = nav_link(controller: %w(builds)) do
       = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
         = icon('cubes fw')
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 32665aadd22..1d6f4485c81 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -24,6 +24,12 @@ describe "Pipelines" do
       end
     end
 
+    context 'anonymous access' do
+      before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+      it { expect(page).to have_http_status(:success) }
+    end
+
     context 'cancelable pipeline' do
       let!(:running) { create(:ci_build, :running, commit: pipeline, stage: 'test', commands: 'test') }
 

From 11fa89dfa548832cda0f3dafbc902c9193ed3177 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 23 May 2016 00:14:23 +0200
Subject: [PATCH 0675/1431] Move Changelog for pipeline fix to valid version

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

diff --git a/CHANGELOG b/CHANGELOG
index 950002df8f2..88e7cfaf967 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.1 (unreleased)
   - Fix MySQL compatibility in zero downtime migrations helpers
   - Fix the CI login to Container Registry (the gitlab-ci-token user)
+  - Fix access to Pipelines by Anonymous user
 
 v 8.8.0 (unreleased)
   - Implement GFM references for milestones (Alejandro Rodríguez)
@@ -25,7 +26,6 @@ v 8.8.0 (unreleased)
   - Updated gitlab_git to 10.1.0
   - GitAccess#protected_tag? no longer loads all tags just to check if a single one exists
   - Reduce delay in destroying a project from 1-minute to immediately
-  - Fix access to Pipelines by Anonymous user
   - Make build status canceled if any of the jobs was canceled and none failed
   - Upgrade Sidekiq to 4.1.2
   - Added /health_check endpoint for checking service status

From b565cfa50fa53bede268904d318547e593931f0b Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 22 May 2016 18:52:42 -0500
Subject: [PATCH 0676/1431] Fix remaining docs on enabling/disabling Registry

---
 doc/administration/container_registry.md | 65 ++++++++++++------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index a3df14019f3..7d7d5fd1e84 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -120,22 +120,20 @@ GitLab from source respectively.
 
 **Omnibus GitLab installations**
 
->**Note:**
-If you are using HTTPS in your Omnibus packages, then the Registry will be
-enabled by default and exposed under port `5005`. Follow the steps below only if
-you want to change the default port.
-
 1. Your `/etc/gitlab/gitlab.rb` should contain the Registry URL as well as the
    path to the existing TLS certificate and key used by GitLab:
 
     ```ruby
-    gitlab_rails['registry_port'] = "4567"
     gitlab_rails['registry_host'] = "gitlab.example.com"
+    gitlab_rails['registry_port'] = "4567"
 
     # The following setting is needed for NGINX
     registry_external_url 'https://gitlab.example.com:4567'
     ```
 
+    Note how the `registry_external_url` is listening on HTTPS and is a
+    conjunction of `registry_host` and `registry_port`.
+
     If your TLS certificate is not in `/etc/gitlab/ssl/gitlab.example.com.crt`
     and key not in `/etc/gitlab/ssl/gitlab.example.com.key` uncomment the lines
     below:
@@ -213,7 +211,6 @@ certificate in addition to the URL, in this case `/etc/gitlab/gitlab.rb` will
 look like:
 >
 ```ruby
-registry_external_url 'https://registry.gitlab.example.com'
 registry_nginx['ssl_certificate'] = "/etc/gitlab/ssl/certificate.pem"
 registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
 ```
@@ -229,7 +226,6 @@ registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/certificate.key"
     registry:
       enabled: true
       host: registry.gitlab.example.com
-      port: 4567
     ```
 
 1. Save the file and [restart GitLab][] for the changes to take effect.
@@ -246,31 +242,36 @@ docker login registry.gitlab.example.com
 
 ## Disable Container Registry site-wide
 
+>**Note:**
+Disabling the Registry in the Rails GitLab application as set by the following
+steps, will not remove any existing Docker images. This is handled by the
+Registry application itself.
+
 **Omnibus GitLab**
 
-```ruby
-gitlab_rails['registry_enabled'] = true
-```
+1. Open `/etc/gitlab/gitlab.rb` and set `gitlab_rails['registry_enabled']` to
+   `false` and comment out the `registry_external_url`:
 
-```
-# gitlab_rails['registry_port'] = "5005"
-# gitlab_rails['registry_host'] = "registry.gitlab.example.com"
-# gitlab_rails['registry_api_url'] = "http://localhost:5000"
-# gitlab_rails['registry_key_path'] = "/var/opt/gitlab/gitlab-rails/certificate.key"
-# gitlab_rails['registry_path'] = "/var/opt/gitlab/gitlab-rails/shared/registry"
-# gitlab_rails['registry_issuer'] = "omnibus-gitlab-issuer"
+    ```ruby
+    gitlab_rails['registry_enabled'] = false
+    # registry_external_url 'https://registry.gitlab.example.com'
+    ```
 
-# Settings used by Registry application
-# registry['enable'] = true
-# registry['username'] = "registry"
-# registry['group'] = "registry"
-# registry['uid'] = nil
-# registry['gid'] = nil
-# registry['dir'] = "/var/opt/gitlab/registry"
-# registry['log_directory'] = "/var/log/gitlab/registry"
-# registry['log_level'] = "info"
-# registry['rootcertbundle'] = "/var/opt/gitlab/registry/certificate.crt"
-```
+1. Save the file and [reconfigure GitLab][] for the changes to take effect.
+
+---
+
+**Installations from source**
+
+1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and
+   set `enabled` to `false`:
+
+    ```
+    registry:
+      enabled: false
+    ```
+
+1. Save the file and [restart GitLab][] for the changes to take effect.
 
 ## Disable Container Registry per project
 
@@ -280,9 +281,9 @@ on how to achieve that.
 
 ## Disable Container Registry for new projects site-wide
 
-The Registry is enabled by default on all new projects. To disable this function
-and let the owners of a project to enable Registry by themselves, follow the
-steps below.
+If the Container Registry is enabled, then it will be available on all new
+projects. To disable this function and let the owners of a project to enable
+the Container Registry by themselves, follow the steps below.
 
 ---
 

From f55f62853162af86989a8343c6692c956f7ccbb0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 22 May 2016 19:20:28 -0500
Subject: [PATCH 0677/1431] Add note about port needed in NGINX config

---
 lib/support/nginx/registry-ssl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/support/nginx/registry-ssl b/lib/support/nginx/registry-ssl
index af607db0121..92511e26861 100644
--- a/lib/support/nginx/registry-ssl
+++ b/lib/support/nginx/registry-ssl
@@ -16,6 +16,8 @@ server {
 }
 
 server {
+  # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/config/gitlab.yml.example#L182,
+  # it should be declared here as well
   listen *:443 ssl http2;
   server_name  registry.gitlab.example.com;
   server_tokens off; ## Don't show the nginx version number, a security best practice

From f896a4e0c1cb66392e069556c1c298915fc55d0e Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 22 May 2016 19:31:19 -0500
Subject: [PATCH 0678/1431] Refactor storage location section

---
 doc/administration/container_registry.md | 58 ++++++++++++++----------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 7d7d5fd1e84..e9d850ca685 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -319,39 +319,49 @@ the Container Registry by themselves, follow the steps below.
 
 ## Container Registry storage path
 
-It is possible to change path where containers will be stored by the Container
-Registry.
+To change the storage path where Docker images will be stored, follow the
+steps below.
 
-**Omnibus GitLab packages**
+This path is accessible to:
+
+- the user running the Container Registry daemon,
+- the user running GitLab
+- and to the user running the Nginx web server.
+
+> **Warning** You should confirm that all GitLab, Registry and web server users
+have access to this directory.
 
 ---
 
-By default, the path Container Registry is using to store the containers is in
-`/var/opt/gitlab/gitlab-rails/shared/registry`.
-This path is accessible to the user running the Container Registry daemon,
-user running GitLab and to the user running Nginx web server.
+**Omnibus GitLab installations**
 
-In `/etc/gitlab/gitlab.rb`:
+The default location where images are stored in Omnibus, is
+`/var/opt/gitlab/gitlab-rails/shared/registry`. To change it:
 
-```ruby
-gitlab_rails['registry_path'] = "/path/to/registry/storage"
-```
+1. Edit `/etc/gitlab/gitlab.rb`:
 
-```
-registry:
-  enabled: true
-  host: registry.gitlab.example.com
-  port: 5005
-  api_url: http://localhost:5000/
-  key_path: config/registry.key
-  path: shared/registry
-  issuer: gitlab-issuer
-```
+    ```ruby
+    gitlab_rails['registry_path'] = "/path/to/registry/storage"
+    ```
 
-Save the file and [reconfigure GitLab][] for the changes to take effect.
+1. Save the file and [reconfigure GitLab][] for the changes to take effect.
 
-**NOTE** You should confirm that the GitLab, registry and the web server user
-have access to this directory.
+---
+
+**Installations from source**
+
+The default location where images are stored in source installations, is
+`/home/git/gitlab/shared/registry`. To change it:
+
+1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and
+   change the `path` setting:
+
+    ```
+    registry:
+      path: shared/registry
+    ```
+
+1. Save the file and [restart GitLab][] for the changes to take effect.
 
 ## Storage limitations
 

From c01f99b768d0209c67e73b16751cacede2d8d6ad Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sun, 22 May 2016 19:53:19 -0500
Subject: [PATCH 0679/1431] Fixes suggested by Kamil

---
 doc/administration/container_registry.md | 32 +++++++-----------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index e9d850ca685..caf9a5bef2c 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -31,15 +31,9 @@ You can read more about Docker Registry at https://docs.docker.com/registry/intr
 
 **Omnibus GitLab installations**
 
-1. Open `/etc/gitlab/gitlab.rb` and edit or add the following line:
-
-    ```ruby
-    gitlab_rails['registry_enabled'] = true
-    ```
-
-1. The next step is to configure the domain name under which the Container
-   Registry will listen to. Read [#container-registry-domain-configuration](#container-registry-domain-configuration)
-   and pick one of the two options that fits your case.
+All you have to do is configure the domain name under which the Container
+Registry will listen to. Read [#container-registry-domain-configuration](#container-registry-domain-configuration)
+and pick one of the two options that fits your case.
 
 >**Note:**
 The container Registry works under HTTPS by default. Using HTTP is possible
@@ -124,15 +118,11 @@ GitLab from source respectively.
    path to the existing TLS certificate and key used by GitLab:
 
     ```ruby
-    gitlab_rails['registry_host'] = "gitlab.example.com"
-    gitlab_rails['registry_port'] = "4567"
-
-    # The following setting is needed for NGINX
     registry_external_url 'https://gitlab.example.com:4567'
     ```
 
-    Note how the `registry_external_url` is listening on HTTPS and is a
-    conjunction of `registry_host` and `registry_port`.
+    Note how the `registry_external_url` is listening on HTTPS under the
+    existing GitLab URL, but on a different port.
 
     If your TLS certificate is not in `/etc/gitlab/ssl/gitlab.example.com.crt`
     and key not in `/etc/gitlab/ssl/gitlab.example.com.key` uncomment the lines
@@ -197,12 +187,11 @@ Let's assume that you want the container Registry to be accessible at
 1. Once the TLS certificate is in place, edit `/etc/gitlab/gitlab.rb` with:
 
     ```ruby
-    gitlab_rails['registry_host'] = "registry.gitlab.example.com"
-
-    # The following setting is needed for NGINX
     registry_external_url 'https://registry.gitlab.example.com'
     ```
 
+    Note how the `registry_external_url` is listening on HTTPS.
+
 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
 
 > **Note:**
@@ -249,12 +238,10 @@ Registry application itself.
 
 **Omnibus GitLab**
 
-1. Open `/etc/gitlab/gitlab.rb` and set `gitlab_rails['registry_enabled']` to
-   `false` and comment out the `registry_external_url`:
+1. Open `/etc/gitlab/gitlab.rb` and set `registry['enable']` to `false`:
 
     ```ruby
-    gitlab_rails['registry_enabled'] = false
-    # registry_external_url 'https://registry.gitlab.example.com'
+    registry['enable'] = false
     ```
 
 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
@@ -326,7 +313,6 @@ This path is accessible to:
 
 - the user running the Container Registry daemon,
 - the user running GitLab
-- and to the user running the Nginx web server.
 
 > **Warning** You should confirm that all GitLab, Registry and web server users
 have access to this directory.

From 2bf818c4d0e75224f832912642fe319e0bea670a Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 22 May 2016 19:38:22 -0600
Subject: [PATCH 0680/1431] Fix some specs which would have broken in 2017 to
 not break anymore by using a dynamic year value.

---
 .../files/project_owner_creates_license_file_spec.rb |  8 ++++----
 ...k_to_create_license_file_in_empty_project_spec.rb |  4 ++--
 spec/requests/api/licenses_spec.rb                   | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
index 3d6ffbc4c6b..ecc818eb1e1 100644
--- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -25,7 +25,7 @@ feature 'project owner creates a license file', feature: true, js: true do
 
     file_content = find('.file-content')
     expect(file_content).to have_content('The MIT License (MIT)')
-    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     click_button 'Commit Changes'
@@ -33,7 +33,7 @@ feature 'project owner creates a license file', feature: true, js: true do
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
     expect(page).to have_content('The MIT License (MIT)')
-    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 
   scenario 'project master creates a license file from the "Add license" link' do
@@ -48,7 +48,7 @@ feature 'project owner creates a license file', feature: true, js: true do
 
     file_content = find('.file-content')
     expect(file_content).to have_content('The MIT License (MIT)')
-    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     click_button 'Commit Changes'
@@ -56,6 +56,6 @@ feature 'project owner creates a license file', feature: true, js: true do
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
     expect(page).to have_content('The MIT License (MIT)')
-    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 end
diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
index 3268e240200..34eda29c285 100644
--- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -24,7 +24,7 @@ feature 'project owner sees a link to create a license file in empty project', f
 
     file_content = find('.file-content')
     expect(file_content).to have_content('The MIT License (MIT)')
-    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     # Remove pre-receive hook so we can push without auth
@@ -34,6 +34,6 @@ feature 'project owner sees a link to create a license file in empty project', f
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
     expect(page).to have_content('The MIT License (MIT)')
-    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+    expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 end
diff --git a/spec/requests/api/licenses_spec.rb b/spec/requests/api/licenses_spec.rb
index c17dcb222a9..3726b2f5688 100644
--- a/spec/requests/api/licenses_spec.rb
+++ b/spec/requests/api/licenses_spec.rb
@@ -57,7 +57,7 @@ describe API::Licenses, api: true  do
         end
 
         it 'replaces placeholder values' do
-          expect(json_response['content']).to include('Copyright (c) 2016 Anton')
+          expect(json_response['content']).to include("Copyright (c) #{Time.now.year} Anton")
         end
       end
 
@@ -70,7 +70,7 @@ describe API::Licenses, api: true  do
 
         it 'replaces placeholder values' do
           expect(json_response['content']).to include('My Awesome Project')
-          expect(json_response['content']).to include('Copyright (C) 2016  Anton')
+          expect(json_response['content']).to include("Copyright (C) #{Time.now.year}  Anton")
         end
       end
 
@@ -83,7 +83,7 @@ describe API::Licenses, api: true  do
 
         it 'replaces placeholder values' do
           expect(json_response['content']).to include('My Awesome Project')
-          expect(json_response['content']).to include('Copyright (C) 2016  Anton')
+          expect(json_response['content']).to include("Copyright (C) #{Time.now.year}  Anton")
         end
       end
 
@@ -96,7 +96,7 @@ describe API::Licenses, api: true  do
 
         it 'replaces placeholder values' do
           expect(json_response['content']).to include('My Awesome Project')
-          expect(json_response['content']).to include('Copyright (C) 2016  Anton')
+          expect(json_response['content']).to include("Copyright (C) #{Time.now.year}  Anton")
         end
       end
 
@@ -108,7 +108,7 @@ describe API::Licenses, api: true  do
         end
 
         it 'replaces placeholder values' do
-          expect(json_response['content']).to include('Copyright 2016 Anton')
+          expect(json_response['content']).to include("Copyright #{Time.now.year} Anton")
         end
       end
 
@@ -128,7 +128,7 @@ describe API::Licenses, api: true  do
         it 'replaces the copyright owner placeholder with the name of the current user' do
           get api('/licenses/mit', user)
 
-          expect(json_response['content']).to include("Copyright (c) 2016 #{user.name}")
+          expect(json_response['content']).to include("Copyright (c) #{Time.now.year} #{user.name}")
         end
       end
     end

From f23facabe47d0f002ce49ec39593d9a585c68268 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 22 May 2016 23:38:48 -0400
Subject: [PATCH 0681/1431] Update CHANGELOG for 8.8.1

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

diff --git a/CHANGELOG b/CHANGELOG
index 88e7cfaf967..8f4ec3e2714 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,13 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
-v 8.8.1 (unreleased)
+v 8.8.1
+  - Add documentation for the "Health Check" feature
+  - Allow anonymous users to access a public project's pipelines
   - Fix MySQL compatibility in zero downtime migrations helpers
   - Fix the CI login to Container Registry (the gitlab-ci-token user)
   - Fix access to Pipelines by Anonymous user
 
-v 8.8.0 (unreleased)
+v 8.8.0
   - Implement GFM references for milestones (Alejandro Rodríguez)
   - Snippets tab under user profile. !4001 (Long Nguyen)
   - Fix error when using link to uploads in global snippets

From c135a69a877c6b3336dc4d25c2bfc2715abbe838 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 22 May 2016 23:54:29 -0400
Subject: [PATCH 0682/1431] Update CHANGELOG for 8.8.1. Again.

[ci skip]
---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8f4ec3e2714..e5cdcc2ecc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,6 @@ v 8.8.1
   - Allow anonymous users to access a public project's pipelines
   - Fix MySQL compatibility in zero downtime migrations helpers
   - Fix the CI login to Container Registry (the gitlab-ci-token user)
-  - Fix access to Pipelines by Anonymous user
 
 v 8.8.0
   - Implement GFM references for milestones (Alejandro Rodríguez)

From 8ed9b6aa7a31dad147e050d3fe992fbf814712fb Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 23:12:32 -0500
Subject: [PATCH 0683/1431] Initial version of user documentation of container
 registry

---
 doc/README.md                                 |   1 +
 doc/container_registry/README.md              |  84 ++++++++++++++++++
 doc/container_registry/container_registry.png | Bin 0 -> 354050 bytes
 doc/container_registry/project_feature.png    | Bin 0 -> 392842 bytes
 4 files changed, 85 insertions(+)
 create mode 100644 doc/container_registry/README.md
 create mode 100644 doc/container_registry/container_registry.png
 create mode 100644 doc/container_registry/project_feature.png

diff --git a/doc/README.md b/doc/README.md
index a297ce54f3e..8a6adee2fba 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -13,6 +13,7 @@
 - [Profile Settings](profile/README.md)
 - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
 - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
+- [Container Registry](container-registry/README.md) Learn how to use GitLab Container Registry.
 - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
 - [Webhooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
 - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
diff --git a/doc/container_registry/README.md b/doc/container_registry/README.md
new file mode 100644
index 00000000000..5af47f7120d
--- /dev/null
+++ b/doc/container_registry/README.md
@@ -0,0 +1,84 @@
+# GitLab Container Registry
+
+> **Note:**
+This feature was [introduced][ce-4040] in GitLab 8.8.
+
+With the Docker Container Registry integrated into GitLab, every project can
+have its own space to store its Docker images.
+
+You can read more about Docker Registry at https://docs.docker.com/registry/introduction/.
+
+You can read more about administering GitLab Container Registry on [GitLab Container Registry Administration](../administration/container_registry.md)
+
+---
+
+## Start using Container Registry
+
+1. First ask your system administrator to enable GitLab Container Registry following the [administration documentation](../administration/container_registry.md).
+
+2. Go to project settings and enable `Container Registry` feature on your project:
+
+![](project_feature.png)
+
+3. Login to Container Registry with your credentials:
+
+```
+docker login registry.example.com
+```
+
+## Build and push images
+
+Your registry is accessible under address configured via `registry_external_url`.
+To start using it you need to first build and publish images:
+
+```
+docker build -t registry.example.com/group/project .
+docker push registry.example.com/group/project
+```
+
+## Use images from GitLab Container Registry
+
+To download and run container from images hosted in GitLab Container Registry use `docker run`:
+
+```
+docker run [options] registry.example.com/group/project [arguments]
+```
+
+## Control Container Registry from GitLab
+
+GitLab offers simple Container Registry management. Go to your project and click **Container Registry**.
+This view will show you all tags in your repository and will easily allow you to delete them.
+
+![](container_registry.png)
+
+## Build and push images using GitLab CI
+
+> **Note:**
+This feature requires GitLab 8.8 and GitLab Runner 1.2.
+
+Make sure that your GitLab Runner is configured to allow building docker images.
+You have to check the [Using Docker Build](../../ci/docker/using_docker_build.md).
+
+You can use [docker:dind](https://hub.docker.com/_/docker/) to build your images. 
+This is how the `.gitlab-ci.yml` looks like:
+
+```
+ build_image:
+   image: docker:git
+   services:
+   - docker:dind
+   stage: build
+   script:
+     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
+     - docker build -t registry.gitlab.com/group/project:latest .
+     - docker push registry.gitlab.com/group/project:latest
+```
+
+You have to use special credentials `gitlab-ci-token` with password stored in `$CI_BUILD_TOKEN` in order to push to registry connected to your project.
+This allows you to automated building and deployment of your images.
+
+## Limitations
+
+In order to use container image from private project as an `image:` in your `.gitlab-ci.yml` you have to follow
+[Using a private Docker Registry](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/configuration/advanced-configuration.md#using-a-private-docker-registry).
+This workflow will be simplified in the future.
diff --git a/doc/container_registry/container_registry.png b/doc/container_registry/container_registry.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9505a73b408e29a78898014ccfc5b5f8eb80bf9
GIT binary patch
literal 354050
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
Lm*7vI{^frFZcP$s

literal 0
HcmV?d00001

diff --git a/doc/container_registry/project_feature.png b/doc/container_registry/project_feature.png
new file mode 100644
index 0000000000000000000000000000000000000000..57a73d253c0b8ca6c92c80fca13068e5e764a69d
GIT binary patch
literal 392842
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%0D8Dnr10t5hN#J@kzi*e8r>Z~
zD__}4;Efcy>9JfK5X>Qwe=+DM`_OND6T*VLZ{vfaK>qafqGAqn9t_8~4u<2z))xd|
zTUm6i^A>rd;2PP0DytcR62lEoHh_11$CP5-lL*4}ye+mSPaaCDQq(0(8q7U7@WniI
zF5Va}-0id7*egfJnXZCl%s!{M>4MRv7tO#8TXLBl+NPXopgF_Bs*fg(Z(YqVjnz1#
zc9E@1Xga{?i=uhmh7#Q*n~$(su0a%%A0on&v6mX^s{$z3)ReOf86O$m0I04{wzB%I
zzc6SEn<R)oD&vJAa{M&?7@lp#9oKv|MuXTG3$I#pja<qG;<gt&0v@jm2pgyIonPv6
zq*db>QB5CN($tx8V4#{Akpi#votU1{GZXQCi4W{Px5D%~{2#8UUxM+RZZ^yFClRmo
zf;Hu2ieDtiy*t39mw%AL#;OW_g-zHVeeWzd_CPTNB*jH$ib5<-9uKUf7-uC{$1&w$
zotrrtEC~i`7E@D)5U&Ejhy0_HL-#Xk8t}jq?P$g;{tw*P4>qt391<414E5DIN>0O@
z7!u7Y9yKj9Tu(+vr|FrjD^!9y-efsxj-(6$QD0W^9QD&O&D9(dt}bzh%j{l_j4TDR
zw?lc+QeTStoR0U#S?%o!NnoRrIcn%BH_QL2q1cmh^!#avc*f{?!tg}5Ecy!9d6&)N
z3(US<D<@$jPX+;u57M*JQ>xzw53=A3BJn}1tG#Pdb>b$TB@I+%<=u7fs_Uz&(+r7u
zalCgtIDNJ}7`^}x8mOTo75GNGP+v&RQz(Ql)L)O371WtYO>=5riLAi7&R(;<k>oj2
zbE&O5QAn6#Sas?W+=VWkPHn=W*wHoP#vBEaM{DLP{mRn8IBKiYFX+UI7bf7#J)*6H
zl#N*G-lSQuXJiJrt+Io)#-oLj*{tC%GH8liX|!E9E4A(y*?+oOXwZ?#el^0;tbjBp
zDUUnRvenw2<mxP^XS@m~bRc_RVQR?2=wcT~4FmVc?N`8pw>k+mYxKzeiaw5D)2Bik
ziyvI)+HWd%wMYs<`jB5-dn?Wy7Rm{>AHo|pn^&2W&Yn`YS&q3RIgh_6=1}8vM@&?F
zSJ9<1U#@L8cs|<e){IoXI`B~h)|$7MWmDP;nR#8)Gir$N(xC5`u}4KrBadPFc)RZN
zj}T+0(&Th`OGm*<<`NciwX2u6yh;K@u7k4jQZigqEI+`+4wMC5{JFg{EnjC1{Zqo@
zQ^OQ$k<7z0r3Tfcd!Ch>i*h{^4QvI4!092x3}v%1nUZToqE+tbGV#62!LBXc#th{^
zj~&E%{kfG)(X_BmWl+7L&&cZ;CMuuLgAW3#@=XB*XXSu$TcM_@os)xGdz<P0iwI{N
z!C4>N06O$C6ZsU!Z|xL(F;%vgt(c1q;%~88=}>g=Wur!i)zQ7AKLMiEYb9u}iLk}%
zVFQ)=sLdWIqV~F*edc%>L|XsphT-N%edF@ToO`+zBw@~;E&3rCQi2(z>%x|4e2F}o
z`5CD{-_BB*rVfn;id%R202N{cV-~a5P<}&V>a$Pk=XN!H8eSh%F`XCEDx-`u-XCON
zpQSJL?lQ-5bDH=_ml?h|$)*z%@Ca_TS2g`g8%eQ1pFtVqtBgD>Gom^8pjPTvtPvzV
z%lG+Hmo|T3rY@zTSpf@#lqJ9-{z3F9IPT-kTd=dJ{)VhL@VfPb-{ltmt&#Wji_8St
zK`Sjkd!{-4>$K14YyiXvVNAYehFEq3rr-a|f`gy2@pbQ=9OtDm@lT6V*DMTd9#3DC
zdFMmgdQd{0C<MG;=AT!ct*+i6#rBHXrh4H@_0Gvqi;m8FMD_A{H5@s2c4;LTwz0k@
z%DcrktrM_6N0T<=c60?QMlM#4446&GLa-=-@x7&o9sAd`be3v#EZQ{Otrx`=#lPgw
zPy7<S8Luk!&y1E|f(K7ipD|(pMCRurbS!%^uWl@l$vv83jUw%??t|8c#~2BbC9ZSq
zhubfNOKctbtKJn#O-2aU@7+FkR_E9m;3$)DNcA9~*^a0o!*X?&VAo@+eb9xFDh?+f
z!%6EIn1Q13gQuj=^RGX>tRt>@k&sNP+M$#oesl#cq-rsLo-LY0Wq>`fAaL=CfspLo
zvWb^o)kT|c49rS9Pw>Gd{7kY3WL9+wXSsLVsSVsLO-=n@;wxGHtAM`yMw#L?sY5AJ
zw=Mi$$k+6aOUtmP#uP7)?(!eZ;%nR45++B?O!nRgZ<n}^H82Ye%J3#~-#+eNT^-0=
z6-OCr<LKARYW6UNwBF={cTB0a$m*gQ1dNky3lc8z31SKLblDDjY3yA@$SpG#i7O?O
zw^01NE9#Q-s!PT!QpSZ4g;B4C$x)o{#yk8qeoSa2C(aNqO0M3=M_|XsfroU=k)FWT
zR7cUqO6Nn71LXWelWx|@jqKcTk*!d=#lm_*8_hvIfmRp|7CimCEbIU70GA7#^2^LO
zT)wavZ4|s-)o6F!!XP<{RcrO|K#PX**K3FE$`yV19YJ)}%u|FhjN}7$mAJ-tuZuRX
zXm6XrqUF3HOPoPLQj+=_{;fNW)bRS`!qx8ne27Nswq0d<S>*n-`WUwvdO4$TETO)z
z#VR1qT{#`{N#g{XsEF9l_b~IgT@6qVgJf(mM3M+xaacC&_ya4ip=USA^?r*@`IWw0
zcmo-GS+p^pDuOs5$tIQK`@1hZ8!%{%V()#^qPRF*s}pz3IlBoHKbz|#S8CG2DM?^Y
zbdMu>x<{FVpt>gDc@ek!@D?-gS^>6L2gOuCPJ<pDbTxCmTdrQKX*X%MZa-*Xl3~*x
zodL5O?oweRh~KiPC-K3rH?t+#epuLaqL=-UR(Xr`dl&b=&8S&X3jFzGbMzIdGenB_
ziq9PF?R$%Ycrh(8a)q@+jB3`-7JG4mj(t-ZIxV$VM7JR1<51+`=+NQ%x`;EKn1eAr
zdX7K`(m}rU1hy&vS^=ncElM}s%@XeE9Ey9&xl2qhT8}$!P-cpJdlOD-Id!G+=-gg#
zO#a4j@eW*em@$HjVblBlOzFT;g}z@$fn~a-i*4c?b$JqOsW<g4#N^(^Pe<d?f){t5
z<GtyRZnYlnCiR7ddF6t5btJWc&A_o9MrYc4ecRm`*^xH$12zo)+*{8e0l!A|#9@;%
z#O88uFOxI`b&pCm3j9;GVb0yyUqD8NwFJKCL-*CE**QA{e{DS2iw*)Oi0$K9sBAgy
z_Sba|c6Xq=y&pJthvUW5&{^red4!mg;^0)+%Ehv^)pt!3CS?APWO}Tl>yExm-8?t1
z@oq6MrAIMn-InWomso4z);3LmE=dVhN8t8r)j`oLD=fE%a-W-@i!qa$9-TCibgwZ+
z27KY(MG5#EQCMSlI3ABS2n|5FZyJuSHo4-wMdz`q%fcJT{H9A`lD(#-u&|(9C3P}M
zT7B925q{ryy2nmF|758cGQ5*u3+xU;xD>tkr-7GX{B<`)Dk&^p=tC}@_jR|7fW1dw
zu^>BDWGu*2=NGsc<*{^4K5afjxaA(@mTz@QEjvSJx38~(W?;YnCV1){`&j<RAm#$>
z*dRE;VyGbW>HCm+oc9oIAek7Vl-I{Jir0H_;EEim!a2*l-nOwvEnq1`SCmZ}@+`2m
zikRl()hM%Oya!JMcdS*2e58sIZCA73)yl;W8Zn7EZl3V5*C0{bCR?#PV<t6`Tqk5z
zSF25Jb8TkB>iOQj>FY+oG`dGB@1%rOIS=|W&DT%Rbje;l5hFWNsXC<>S>3m9aO}90
zl2z+TgAe6go=R8eADcn(ex-fl57UD@$f-&kp;V-bRakx%6obKZ?V{0WO?yDWk7WgZ
zSXseKXJ>iFVle{)^AW;b_qDZSh-jg*Y5<&SdZ$&6bh_$g(+e|7s@$BM&YLve$?Oa-
zIUH*^_@0W&yxW-Dp&2<D&t+=dUB2m`?10$t>pMm+B?KA(5be7eT>gU@*}KI*5j8}t
z68{%wq)-cSws`$)uwGG6Zqo}nbZbVxPk}N<6zaE+)OXx2^O~7;V{0FwJHuXB($9|4
zoJo*EXfeyKppXl?W}dZt)EYwXo#|zZJopq!f_Re<DJrskPdi+DEoa^ZGsoEJhmgw@
z4BCfm6=RhF30IEEi8y;lp2c=uzk2)oKJ;I&X1`YA*!U33OfbU{-{S><4-SuDugRM6
zKI>dOvmz@WB|0x(!)m3}c6?>pSi`@V%{gRB`q<8&2*Q3C=Wn-}lN1BGDc8xnhWrdw
zv9e!D?%4U!jZ&;bqGQK$cPAO*Hy810?W!~0WP(|;OOTP}zwa-<`_{|65s;}f6VAa+
zL7kdT0rUepLc8|-;gx&JR*=5vc#C(MCs}*)xj&}`yS}>Jr61G8Kw%pry4=^U6t1Z$
z@FyPmzl%eh5+!>FS&FLfsn-L8VHp8;kna2U$7%-ujr16QFyr8s0?Fu6nhNS|=N5aG
zaSN(0>-`VCb7~GZkFUOm%N<&(Q`A?=+&8Y^wvkEj&2}1Q8D70tGzU|DWmVw9cM9zK
z`m?UNr9~BzYL{65F+wAgjx1f^k?3M-j`4F6hJ_~%O=yn&G=}|K>>&Tnc&CmwU)&#Y
zuD=t(U-t6UC3250Qz_s4*$;nf=3l?dS0ty6X+{E|-y5sa$t-jsqwb~WRoTSvB_$Px
ztqWF^r~|<xK|Kc1g%2Lv<ej-}_NL@l{hxuQID{ztOPDSwseA`K&1T9^;%OImx68hq
z&skt)a65N72-Bjpe&7A+azVCybP2C+maFES0b{V3!^G|8>Izm~KaV(%oyZ}Z4}a!D
z|KmW&=sYRi@SFC1_pOqSyx=)I%m9X1Rh-i@&}urm_vnpB$epI<4OO8zr(iebgUhna
zsg;-951bau^<%SiH0Ak!Ko|dcFy*md@h|X8-w~?4Om>C+^DlyOlLILk&qFZPYk|y(
zF~$9t$XrNd0H#m>z1;Pj9T^ke^?EXEAm*vifybyfKToIqa9X1be=uP1XGof0v>7>?
zgg&6n{Ec_}6bnU(lAd{k(&o*6slJsj3;v_KX@$&kLVXNj-Z_j*RVD9<r^e2WJV*Sw
z1Akm_ZXUtHn(5EZe*ay*Y2!Zes1g%%?|t(uYa+7rZg&FD9adu|m1WC;?aI!aZ07{J
zE_R$ZH|VFHez5mf0RG9VG2bL5qt*B(HLt3wS}y9wY0oJ_!hG*%M1D2E{fa1P;<&ZR
zqL;Xs&)RjyC{0P|VwU&MOp}*JNAeUShjf&h{xccJy_mMw(&T#8jaC&d7&8;9CeyH0
z6U|Uw*A-3eYMbZnTmo84JgJ<b4<4mYm$VaI&zpSj`rlm1bAOG~#JWBDrrkB5jpYN`
zmr_n;B!Wlkd6HoZJgCICtgj)8L4*EbO3&%+PN)3MpM4*Gd4sQ^)v$}czpbO-i-M<0
z>yx(ZZpi}(vZU*l^#9;b7HDsXIxM6EjK5W-s?y;wOGwh1sCHUIy)mwIMH;`&9%m@3
zt{gnCI$#Jh(A#rZpUYSBG7Z?!<SA5P7gd>iWu|AR7qDTzSV|f+*?e;3Fh{}Oo>}y|
z-s*k}o0S1A>PP7NA2+v`caJp0hc{O$rhMzlN!sJe>OzwK!ERA+?`+T*E5;6t9#WQ+
zykQ+!owmtUPcJ>@(oUO<gH>AX@DA|zeSqqD)bMI~;&f$p8qacW(?;|d7xAiM2?pK8
znDpuKyHY}2_ASM8%vhxB3e}}8F?&LX<9erOic>}KE4FqN(p)Dm@NUwpcR?F2#gHCI
zz_Am%9Fc8p+KD;AjAcI-FZnKn|6D0@ti#+_zRgnV^)tcxivnYl*o2&C!Iy$gOS^=O
zecA0!%HJ_8vcTVGVQcrPZ$685Y96YMzukJ9ad_vT1Y=B$1?et~ZHP^YE)V5cdy4ab
zZYic%UGfppv)iFR=MbKMaEU>zsQ8QIO!u>ta1kPWL@awnuihzyB7+YW_qu3D^BfP~
znpSYNl;M9LaQRFhvXff}zwP>c3F4^x5s<N=$zrvT&feR&tHg!b*%~`D)Jz+DZ+ASx
zIB=$oTvQww?<%SMF;(0>J3T1#D;dP`t~mZ~evE3IIth@{zFtLEQNY24;rkOAQGcfL
z`@wml=4*WE_P|%-TM@F4HS*aPYMn^nCxw8@jj7eboA`1!lsLLdAer5(N=#|<>Zk|m
zs&!sQZuT*`0f=)D#x)#fNI4D#74jYA4x|)X9mH4BB#RQynMn&_)Fg+q@<NRfMBMU5
zCr%w-5lgfs<f$D#z$b(8dX`%HwW7m5N!k^-h>J4@+&?v8#u+(Ib*a9m{cR&Y<w$WU
zFwW6g>mYd45AlUl#^B72v#E0rNyWo&FI;vkrlE3lJ(w0XW_jcWYpY}*P~ZHeas5qu
z`-M`1OR-LyV7$Xdp5-O`V9_e@!(k8!5KFf{8*?l7@m34pO<>MiUZ*Y|n^!RS7BPK5
zw~=i>iQtjubGPO6)jyDBn|n$VLS%UGcjZd|GtR*)6o_rUo)xy4Yu{d)K+)V0n8|;#
za7ZRKsp)}O=eE^}6YpBZI}pANdFl(O?Dv>CnA}+ZbpN@tGI=Q;48sdPOD{F`NS&O_
zk`9IEih1bLTk2qUMfVN@=xo%=kG}V1fa|Lb9nD(^c`}-g+J2K@A2TWGye6ofU?J5K
z`%Lp^I@s>T*AsC0%QU~eW6zbNYE-E*(<MU;r<t<K?PJ45X5huAlt8UZd5b~X%JTP(
z)^dh;k26x)5;j+~l57Z%g59c*FJbbUlu*fsZ}XjXp5tP{NryKr4)mo<VDw4yEw@q0
zZUi;PsI5prCSLBn-}KBkgZGaLNxqR=o+Gt8MD(|J&orRxFSY>N6VP6sT5lj7i)q;(
z76T`tPdsOPU=2gwDt%AxbfNUw=&J#i7O7`q)f$Z>1#vFuu&H)bjV6N*V5bQ9Fg_1u
za_0Wem2%JNV2wZ%>>J*D-(eG{P6Suc9EJPa$st!t8UprIT2pjkt{M0-qb2c&sYNG5
z{aofu5mt&XQhan=M3RBD9ZvmquHxI6<xdE`H*BW-<}(&jD!hU)Or;Xvv<8|b)^;`p
zYYthb3T&>P_=`m7KWsnpFzOY4GuRECZ!$XN8@zf{+(AX(KQY7vV`x^`_jzo#_6%q|
z{?(*Vc2f!KYMG73!rd!PqKjAn$=ywbIl1`W;Ris4Wqe-4Za_)NYW`S7U|exV)q=k|
z$*)16<3gdEZL6I4Pq)(^#$e&Pn56peFPN_}Zb;~j)pf~RRqO5pqNnEyn}x}{sUJEF
z2&NlkLZ@(jMyVOk!yaYG^}7OuSY9Pp*p<@?g(T?fm}lwHqp;4fu7P%7F4%=OJ?f_>
z&nd~Tma?s~@^5b-AI<nuvl|^9MoWQ%DF=aPN41Ot*bXRnS>K^*yclK6jES~qt7vYl
zV|p^x9S!Evhg~u4F|=bY1K+jpUte*2COZOmQ{R5eD+o^Kc^%_fTLH2`UmgHYKZ)7B
z>u0WuT$_ALj=x!VOXoIkb=?p2P9D?RYstgV0k`H$HqDB!{K01b?X|yeV)9g9QSlsH
zcfXa*lQHISDWI@|Zt4Z}Wv7gkw=_eOn1NdmTohw(VgIU1cN@COS9QJLDqPgcA+Sg5
zvx7=JnT2~-10&D%+nV`dNqxJe79>M59<xV%a~Tl##tTkDw|#6avzmgGuDdqVWA7e$
zS`o0mYCDR{-u~z{rJj^$UBr%#*pCncCP)*(ep`>KoZ+1(f6^5EF4^vNd64(5%v|O%
z>Z*Ql{d*)E4dvv4Ph!brFbF4#w9}p8IN_xAa*@1%sn;E^?Nowq=S0mf)!dm<2g%<(
zdgQ&^iM@4YM_tD}x1Thrq59P^>_BVee={i0UIR_|Vzz-J@75J)0zo;Cb8~m2&lptJ
zsT^6gKH{4bj|l4HBRz*HGaRtJYEM3O<7#Sk!6Oi$)iV6n6XT^XZAZ{K1JDa`g1Z9!
zKNI9KxvVE-E5pj~+m>qQI_JR8kDnBrs4=ab3%*j@%mch5f5T{}2zQz*z8DJE_35_A
zwmIz6Y}3~uCE)r^>YY$+O3xjyqbptvz}i@xlpII(ON?O90G-rokz+Ly{c^ACp&HFa
z2@bt|Q^pNmg<&x4(W3Z(KhLZ0GwkctsjpbH8xr5$V804^B<Vo2ul}5#t01O*&(@9v
zjuEpb+M1QV6$9mxUQtqR4%js_G%HXd=i3M7x<L9omMxek`={{{%SDZbLYgPs=VC=9
zIifUCDPG;9MNsjNW!@W%&B+G`xx8Cv&ums2Yj#`YeTH^;?Tzy3=`(TN>WRoU*e|l(
zr<{oK6d7?9!zs$hxk3iszAdbG3a@?}XOFt=x#54;YEa+pCuvMasP>QE3V1P_5%%5A
z3BJf(7C5D1zki>6Am2G!9XOBeF23m4*ASqGGiqp+qwW}>Y|Sx(i;5ebPbG7PU{p+W
zro|&2JcpP^W$SJUH~5qYz4$n13CtC9_E%16&t|6(m*!S7c4a|9rhy3kRmrK7>bfcq
z$NM2PaPQqmB^Kvzz)jR&O^<C>)8++eV!xa;a8wOH8Dv_Bba|}Bxwv#YTqQwpfUCR5
zM>M6%Yl+KREwQ)_tD(KQqRaWw1ZfTfm;2QXKuq7o$fSQ1*pCpLZpVKfm=}l2etKI`
zdH_`sx1PdvoiF;Sa5c!nb(3QK=Hifri#k_A|8mPg(-XaBJ4>=>xE%$~d&a7sKHdZ7
zCn=aZ3})%6!l+6=+*GbaCS+Rkg*|0o{(!HkX*g2rSmie%6O%2k3E^F*yIy&Q>(OWq
zh}#u=dvjdUmgYnk&pp7{2gSwFF|ifb?)VL3n?Td>CV#4$+UQT`QOPk=Lmq+Eti_wd
zn@%E$94%Zs$56get3N$gcRrfP3@xGg=9dPW^Nin1$uy$7h>5ZHbq;CW2e9VX&w0iz
zB8AuWjT_F%%IYwks0hs_@?WyK4CJzt84xop#w1`|`DHsINYk)ZL~p(3-fi6&Pc&t+
zg~TO8$oL*>Eqtr@g{bJ2?FU%AE~9`^35bsSxpIHCMb}6Dox__tg-0YALZjjtrI>22
zT0F)pcWGIk{4*QtH+A|iTTcQ(*5Cj{w;V$0-(LjddB@$ZN%G&WWmp3etA>oXS7ME!
zUj)=UkIS+-u!KIljskfEuL*}dxA)Zsh|Eo2mVrJ>R!nveoeZ_%L3w`ix5=ZgaNa3B
zc_D2M*5ux0xv@2DHFgh+>_kf5Yc!0D3Jpsa9;&2W>WihbwGTmPZ9YsR=(F3TyqOAn
z8yf@mR2*VBMgXOH(Avx=<zE~qF5FR}i~m@9@&%V#T5fCc8pFZK8Zqq_N5uw&hNDli
z%K`ZCle>aP#h=;Yf7lzHC~OA@0Cl*ZgwVHd{1!srOB6cuEree2Zzrv%=s#g-ISd9e
z$NTRvw4ch9`UVDfppfg}7|qv9<r&~{hs*N1PPVWT?|Z67;BcRANuOK;XKUh32MCTc
zH=>twvJxliVH^N_jvp&m6^-QTyw0zs#2oEtcW1W;+ybY>Axjna99iNXYlKDl8<sXa
z)p;xX@L6bnK5qk?JjOZ&+Wl;ot@J=QDR%9x%R%0MKPLC8l-JxzFRrfEw@q~qjfsg#
z%{ccII@-&5qg#%&8l8EURn~v7R*sX?I?8CsJ}|knn}%p*y<NA5Hm0v;bFip6NUzY?
zv<G_)*lRM?{JTDTzKmwgMx)h0HPq1gIP@97rW=j-+LXp`EbY(tnehA$CR~2y_3Idj
zDPcxeT=J5cFShn6L#341Lt_=c__a>WF9{Nyc~M@ZFOO-LsdW98?nr_LUe%{N{4C}?
z?scwA@x0ad5Z@0z;$Pl!*nBlueiyd+<7)WJXUIRfPTreqPW~{R{`>7iW3paLlnoHM
z_;;?tUp4(iUIOy}<@dh?C!QnM<IdA$kNnU2{bx^eoQiV%tM>o)GmgBk12>0On*5mu
z^oPHoem2SccZ2$u<M+~@Jk;dO?B2&ev6ue%G+8{q{_&HaJpTW-cwRpJK8l&Pw7Lcc
zTb-f3y#KXN!3ESg`T0t@rnGm*y-r#FANJle5YBb$8_y0RNFs?KBuWY*f+(Yxh=eGk
zkKPhdNAGP2f`}Hq3`6ubh~5ba(d&%py$&-NV|4HAbKbM}mghO=dEbBew!e+J$K3Z^
z*SgkPzg2$gMa}TslVREa_%G*WC7qVy>3w}}iCX7>6{oz>d*{1NHL((j{2ze;o{aFn
zcpY`Be_`?e!QuRehxhCjArKjQ@$t()Jo^91TloE3oqsQUpE3sm|4%;rM`TU)I^mp<
z=iT}rZTVlnbpY~vJ|ztR_ygbk_3FR-i7%uGNB>c}+Qa{=wZM}RBGwS($X{kTop*!(
zyW3qSAsm;Cck)sHC(rfAT1*jw6n}5lKbP$9&H6(u{ytfME(P=7C+kmr^S2uOQxpHc
zv{_eCOB(;;0{Fku*?-%wKbPxo`}L=y`rCf}xfaf8&-C%2m;c@|jDMy8soZ0-($r6p
zjwrtwmlDl<S{4ufZ?a*l4HtZ?hde|b|BGw-><T$QsAzbTVzle^I84B!iLr*gyP1{~
zS5S2Lf?h~FX^s7~!*fTosH#3VS+htlD-c|$h>GU7*;bBCW1NxJ8?Q7&VBjNcve{oV
zdE<sc>)eNq8o<^DJyUt}ag<iQIrL|aLpkf6Eb6hd&DGL+b4OEIF8H%&V7L`jc5Rw%
zg*}%e&Lz*(Kw(m^WVks0(~$;Q3Ku3=eM#Yb3gW-y`TybX`waurE9Ja6+zK5>86l2&
zavdYeWO5;0Kbo|Klk&sfI@K9a@=VMu^u-H8C83d(hxm+awNP8VbVvO3Mr&ZQ*3%(L
zpz`ELge(4qf-*FsIuWn}%2*FzRV$*s)Cy{9ctruj>TlNSme##WYFxIXXq#MtIeCAS
z5ad4d)h+*CS9MG)yC-Zw?(Y;w(=^io1vd5-P_oait;{4cRv_w2h8c;0>f_w@^bJho
zky3x12}vl2Hz(UoZXRFPDXO@14!sa~io(Ym&<TeJ<DA8q{t0Kh@UfVj&T_N0oRFxi
z^j4Nd>W~<m3nWEtNF5P+>4{b5Pl%|lhL!>5ivI_NSE^R`3mA`brtCZkWy26A$Z^uj
z0Q-@3zxV*v1f;7auO{^(&=boIV;162NR=pmbM|J|j$*<|xq|BRQ4GKqarV=HmUo8&
z*ME=+Izgg_SjJTCl#TSR^4J#u!6tZ-O4agTh$jiwb?V{uJH9i6z}p%Df7+MdUtNEZ
zp8vetw^XGHvl;NP%oSmA^6|hEZXHC^+Y{Q7Cs1tVTH>ohNiCQd{+3$2R<V|cHym1s
z6W{I6Ves67WtV9%9K6&8a8?HkR2)I$o{DJE>6VD23u2-V-FzQhwEE}oVi>q8;Fa>s
z-;rBT>qr-aC@z1qXh%-?QM*F6ZUM=A7<&oA6zfisIxk&6EF?*ow>($i;8rz<Yss+s
z6<OS$>iD0pQsOW2?2PK=F4cY>K6kAppZ4i6Cs!lnbC)%z!&}7xK~~z;d8gpV_liMj
zBWSfXyHnZkOPbnoBc*E)fD)m7^TwfMUyYBPX8tmp1kI(#WtTlqZ_=_wTB*%kPR)bO
zp!O=CN+{sPt5o7DWqUt(5XHsCO*eU~Dk6%#(n+gCKR&$0aL=!Z9dEf!5+`D9uqj>s
z#%yoYb&Bc+??-nYhm(evtVaA?Z=@EcpL@;87a8U@ZfOj#{0fyl2`XS>YC-wN)$`Sl
zN~tZ&Mo;h*{!o>gXKvK{k-9OT5;LN(tdC2aE0;?O)CNuX;`+{PV0AIb;$&f|xy1RK
zvX41<^gqHpo@h=?@d1<*G{3WpbD*5ptRqq8-dXqCz4ZI<Pcat{zY0}j{1r7eg5EVB
zpyB56KIc)W0d?L?QJS4&_>LKM9K>mYS;&j}0XAnXN$dzVi-H4j1y5$O3l3#s(o1dz
zUmH#wOp+(Ne3?)?9jC;fXI*GMF0p2Bl9}9Ni%oNqd!=|qQeGb%N)L??8E$8JSSOPY
zE>IuS!{qP%aKJG<)iB}i23a-KKU<M4T*qr#X)XN*V5}Z`X!Y|0PuJa~n@wD9H-I>=
zO0Q7~ga9Ltm;On&grq`<kBjr?CS!<NXaR?-g)9gj0TlqZ7>6HCx@VIn>N?VZ+ah=|
zBWau+l!afi<wVvs!xdECK)v_&#z(_JI73Kji7qauS#t_P6}&#L(9Qw)cB_hW`EFhR
zhnrLeA@qeDAj4X%@II$E4SXGsIK;mjM$LFW?AqdZYTTyP<Xi?WQeUZ0HDhQb9iKwe
zI8mbapLu~%ro}W@pRPP{>aobqeJ^Agubfa^e__@h3I~qs)#@Ex8|l)&R(!<GH=$4Y
z`aYHDFq7ULUHZbx%!VPC{ym2D&uzSMCNdW{W=7*z9~N#xiUYZGK)`Td@rqvJ(SR3B
zI>!=}>JhX#W)6GJ_2R1Fux&)2qTqtnr6*O`0_G(T6tA*m|H-(T5!}sf^C|w=!Kq&%
zpr0XkTX>BPBB9$??*_8+ZS)WjNtLzOAIK6oXy{*mm!k`1Xk;6w8JspZok)oi>d-ub
zUSq=2Ob@;FI=!@AeG>^?Ss-0L(8fq4AaTOu`f0Dxnsx^UhHJBph_^6IpP-yCmNCTc
zXtWQ$Y%sj&GrB8?S!9+Q8G1W?13emrKe%HuYWWl&(aa&@fVNSZKFX_9rJm>pfl!C3
z9H#C$?Mq?1zBGw5-Bry;O?#p<3qu1uv|w*dt5REHU)mRS*YtXkkm~AnB9O0!-831J
zFSjJf47z9Pnhx1KW$4uW;sv;g39ia6BR!|LpD`z2v^kTxpIoUba9;4Ag<Y<&!iJt@
znkj=B4w5}m&tBQXq&Ls3hn4}#7B9a*GC)S?$^4hed@Q5Xw+71$u(n>W08MRXa2XEt
zL6ePg*+-au&g9d<3qWe_)gwx3QS7ZAUo|7~Iw`04;_A42K%lR@I<LXpJ)oB$DnwQ@
zuZQ-GFx)z&aO_M%c0oPhti%~?kOVWVdk(c~uxe^Bvr(ICJhYXHm`UhQ&F`Pi?WBMW
zjV>4tXB-qZ`q@m&YblVFGilDb&m?@O?(ZLN#hn&hW#QO8xoO8Gyc1esrCV$#J5b3Q
z7gsdwE2&pxJZ118n6=+99okN+#4(<g;Ij*XS9`~>q2`#DtlD;hL1k<objBa{p5c?E
zWXwWe&`F6dO<QspeJ=SDk%qaJ?6S{jp<Lf9zTZ$wI!fA18dFZ;Ji77R^ipkZo#RyC
z@E!vgv6qmBEL#ycfQdE*MAtH+8&~SP<h}$ux->}^XWRjm?c9J*FH%(DG?U^B!;+bg
z8p*^s7~G3J%HHo6Y2&Fl^-%?UBaokEc+)9?GeQRK>rjP;9iojQK40tyr>U(7wPL+`
z^`f~)K>x-{rHw}w__0R;OxHEsP_OYtp@M(S+r*=TCg`o>?c43bA71(lnk2{HdARkZ
z4gbExK9~$`Q^19Y_R_3G>8y2I!e1`m6$FWuOwb-S`)>5lJUc7JkfQYaY7_!J3?SS`
z_>pSFwpXDoR=(HZODE{tdmYc^;*h5K6fjWNcV<%;<wIhstXJf5;D`Aj0&jp6R|yTX
zp$xGR{XG4diFHauo>SXyfopa(GcQ|Hyy}M+Nt6p_S7lCCKUem3E}bMV{XjIHsb<}E
zf`a0Ukp2i3pI{a&O@E_~BxjwH-@Uad)nG(o&N?sr2<KZ^({tuVqa_VIDq{nGof531
z^ZVHhVK`#wWV+YmgnEbxMjmc@nk``;OTIn5(V5T$*Q4<6*FO{a`AaePhoF|E!AG&Y
zzl7D_7^KS`P2*n%EKREoEO!q?;7V0d=w|V^*Hb{6W8>M$)vWIClseYSvLjF{Q+X$-
z;lt{8%tGwav=PoENPb(R+=-Ro%l_r^mXC(ZYOxgvdJPt1%K~>Dw>|@U-phURO@xH?
zA<orkS!vW9HGBqd=qLV8Oy=)YUE)6G9fzz9Mv_@L<qGO?RPG`tDxF=nn1!@zdv%*P
z7{!fV%Oq21A9~Iw(j&p>l)$e9pGl06CEhwx0FB*Lc{djJg3d+(x49i}*Gdx*DDJxN
z?KapmTDAqAn=ruCkxCPP)nO5gr3HW8#Dl?*Phi%9QG?8n3Dfz(&q==Og!7HINjn)n
zy(b6D4n0v#MNXca%u3n!9eQW7dRkc@(ao(S1H{t2<ks(Obnyl7FaR?11LcP+3_{Ul
zgvu^cE0yi_Ku_0tWz{MyeUTCdfY|zohC;juzo2kceA&mxyS$R7R9oh^zRph8*j%p!
zaWL)rp0SiY+U&iLrp(q|0vUwAs1D{%H8j1}9`gXDU#y#6|KOz0S)j-XuetL<waK<o
z%M4xmE<0P^ZsJXHmtZrBVG02)D}Ijg5a2CFS}3d7h8gBE_-G|Ixvfo3q#(J|%unw<
z`@}5NU0th4DPAV?9gL>DNxUNRTd!&VT1R2Pu@dsC%Lb>R6?!!L9-%LOlf$UQYZ+eN
zNTq+Y*<aCj7BLcsmo79kI{75uh0kjzR!=DM&@LIRpJ@N3z@JcZMSP}LX`7!c|4T;1
zv*=m3j}5N<YxdfDKS{*+(3f~SBW(I45kpd#Sw$(Glgp;5j{NFy*2mGb(N<9L;47=1
zgfy0e!nib8rWeg*A>}onbWk_UDe`)p_0CkmmEb}&64^wLCM&R#b?TDWH|f#-YNu{K
zl|?~XX=P{N8(wkRUz4v$namv~9ts%xF*!jV8<(6He@IT4cJ}!rURxGivC%AFS@)=)
zmf6%_IsVCR#h|=NcpbmAQKNJ0VWBD}z9Ekq44fi(q0{s}-*xNM(h7-J(s}{tyo-Fg
zQ(<(1>#cL<mS@YfxPfFKT7#9@#w2iu+$m*3M;)W8+U|ombqPdTJ6xq(`jJ{hr)B;_
zST-lAss!^%72R-8Vm`=9zlu!%Np%Dp$Jw$S`&pUwRVDrhT%gA6T$<u&>?h&6(^21%
zQKp(cyIT!a*&?w<LJFfwcj5c-x;E2W9PsT3AyCc|xAiEm+tI`_ZX@Ic9U)V?GnRy%
zqATD3F->F&rkOxX@yP?f@<Ub#l`r;ZnxID9$9VW-*BNuKij5iAU}j-X;1!?ERTsCL
zsvxnm56IYqpr;B|#hrJW^Him&dH}d$7{oiUDse?sYEY|jSjx3h(iE)tDUkCKo3L8}
z`go6)f0B55W2O?+tW(MQEzhcH+WEMaW~w=;@aLAojD<P!vggadE*_^_dg>HSCmpn@
znVU(%#enbhZwlKK%B?0b?<YI?oEK=hM|9vI&uvwX3qK8h##fF{^A8I9C*<ze4H=CW
z*T0?e#x$eq?t){xXl%F*En%SLu~q$O0Qf6qoZ0ityUPuv2KOD5E3i6i`I6BqLO$*=
zvwp_hL*xD#vx)NRK~JVJnFy!1;PDO2>X2#xVq800%lC^SYD)T42h)RCku0!WAnMrM
z*-c+aOKq&4AL_95&+qe)fzD_IlC>&TUcK?N!mA#0Sdk1m&DpD>c{J>*Hv+Q8MqEzf
zxp(vs6JZQN{WhAPtCQ-X^<rmIu*Oas`y>$nDQmxCi!{>Y9@XvtRPFV#vi-m-+#_a%
zX4Om3Fmnz9-kpErq+DMv5NoZn1h4g3`7tcMVjjDGTjbDNy@BI0x3H+u%%NvfSuc*s
zJg3hGe4?%k+BoIRG=mFh8k)%9uAcU+ZqyfmF{FHr_+Zy;GeUJqUPCN%rv7-$mp_W*
z{~4vY&hy)Z5#U9UBKa?7V3p(|+P%COpXE?^Ff>HPKBqF*nwH-pP7YPnR?wX07q@y0
zE$^Yeg5NlVcclrdvL^|%UN^6>;)4x4^>Kq2;+)3Zm%h1umWz<n-QQQ#+JdsP@^yod
z$Q567Y7iny6e!8jh4=Z5DJ?p?m6Q>&J?5nG1|qD#mr;c@C=Nk$?{~whl`9i+bSSxZ
z7|Ra@9l8wY-Q)u4NzFZoLhICwj4?56z~PLfgXs&OzxgNW+BX<dz?>ke`sJqe^g!k$
zEXU89TT99BLQ<rR0Dku1)R!#bKM?!+f-j8cq^hZQvnR|@3z7g-p*lA9%@H*4eUVtN
zp0_?9T4$5o>?f9X)3&aU`)Pa0kFblJ4fQGy8fRXcCo{K_Dn1=L@w8|}-8l@J*Q&tB
z-^B=HyX|aVWP}L>22BqpVQmaZQ+YyvimNp1NaCjh)NJQ2Qd95eX!LY)j4V7Da>=DL
z7@&(l>SvsBHEOyo9poUc-dY=Qp-miXvVl=X*7sLdigNnK(*U8XSNVZIlJn~0O$%GY
zxDw-*uI;T^`6{NmMppQb>8c4$PZShwlOzlJWEdLmp6%*y3Cr}B0#m(;Jvc&I<tN`g
zR4+j3h^~ni6AVpq&HG#7&9*t3D?nBCGYw36#scuwa0LmTW9E)?bYW5`O`gyAMYk<*
zcohinxPxj7>_1f%C(@RY0s<y4k@=Sk^kN%kxq6G6^t$DX1OyY~DG@L5{D{6QQm3n3
z;)8Qwfz}lvE{Cl4NTz&bjF@k=1j>u4^L;$${+Pi|*~7)v91qFi*(En{B{hRpd^CuA
zeSDjb`q1|3MLH|31T@^)K;WK^UdpBwvg+fdrR+mpP^As{8GOmp+%A;2F%=B@E`V{j
zPkw6a{_Jqi7Iuglv9dIurjC-p(=Cs=rg>C(7!Ip{^vRNj&6rN6#Ppnq^37l+ULkr|
z@CD<FK#V65)JbFPt&i4DQ`SVvdyA19X$REQK=G_YilzeZey157Cx5byX1xwDX2i;E
zYZq0bmGrD8MPPGhW3>k|Q;C<(;DUY1d4mxZ1ky$lrt~^V?4QTsb<%_uvU=$xk#lCw
zPn+gd(}1viv@dP4Mww$2+Nk1H=tUoN^N|lVlv_z$;pMg`)%>h((K{+a#{pYlEbpl<
z&{1|8(A?Y~mbt8>>oQ4~v@m^**Cdn8)JuZm4B|QQt{|RV91~_=F8^boNYq=(zKK`e
z`J|e)R`5>6k%`-x;`G_xGT<Hs-$!f0wMnuE<+11k###>C!AIv}Vb-33HUfo9|6ETu
z7NSns4t;jJ|2Mq3LZQvIb`u8Ka0P~vR_JlSYy&9E=reb&NA=rFBIIAP@-1NEm-`Z)
zn6Fox5~d7un?AnE`@H~VOn|o|!x8;`DRypOQUy_m;wsw(HlAX9ymP<LAr@<lxRX>;
z8v|jp?GE*|5?x9WbucdxRW{gDKEi$_KTI;A@W*B=@DrX>mA!sE?c>cEzD}K7&dYs<
z=B`!!ZPhcCW_E5JX<)zXmsS&k)XqzK=o>NCFFROr9uJC9ic|{`0-5*quBX(;)+ieA
zv5&mSg<FX&=5qpLxb{e1dhA6U9WTK^AhZqU*pH!^O~k2J26Z<Wa;l3V?YGyL$w^;5
z!xBpWv*&@O`&alpVP2NgS>bzYw&F*k+hYhXaL)?&4)SoiihN=uH+;P6J9So4ylAIr
z8EV2#(_^?>F{iFqTrHn$6jAd!wN~5fhs$`9+spU;jV`^C#uWZeQn{;Gt;8F~Qwokg
zQG{RB$mdfbk+yl1OW<V5`l+I@yZ%8P9otH9m6bW>oxd+~dkKs<ig_Q29Ez$voTd~G
z#G|Hl%K5>_D^vCRrvqoVTP7$p&k5LX#P`_=>GOvG_VWd2tKk>T)(iXnz5Dk&kCw*O
z4U2c)rHKQ)cDGfPgJ>9jt{m=6WYiw-s4n+wRwi?6Zb~9op9K_s4NFmo+3a@eZ@TPl
zraYXGf=xe6K<FB=7!|b>hYS1$-m4NG1;*F-!CndQh31LY6;__U<1QhaKR8^nAre0Z
z^O?GRZfYru4q~k)b9BlP2B$ZqaQfBWZ=TXHf`2UQ_56KmvHoePAr`hnzxh<%KTvmG
zEJ4oLzecrggqDofolx0+({!Kuwpk|Mil~M|Du4oHxO##VUu|p!%t1$MWJs?>-$N;=
zLw<|BS`WH2KOQpavU2AABXtjW&^qPMKTunUIuX`h!T#Vp_WU8Txt(ze-?qcELyE`f
zX+}q@Rn^NB`Orp|{;vvqYpkQRhn%aDPKAE*4&b-030d3Pdo4*}-1Jn?4ilcw<P4@Z
z_5og2eGXuoI5%gtq#KGQomY9HW0P223pg)0%#c<Zu<#z#``BfN(XBv&`0d8bo=;3F
zEO4#twj+^&TE04FEl*a;%)v?AvsJdi4GUkF3^QJTC4@NJKl$#3p(^+=A77<;p^_=9
zex^}vLjvw~fHe}CjlGfx=&rmeo)v_F4=hI~RGQ)B#gBK-JfMSHRdf!c^-Ik|+ee1$
zheuznr2QRPl}5gWcyw)_a$G*E`tl3&&UJA=<Fo2JjpL8#eu;IM5qlGT*&Mw`)pPx}
zw7_i2TOE_2hu`aEY%GN}GA|jix=HHc<WlWc#!0HX0r$*r2L(B93KA7(@6Y$OKD0gi
zTrt?@e<{53uC+6e)RG#6O|fmp)yB{q?nRtLC%vgynq_Nhu#^VWFq|b!#T}0GZ)iis
zr>Zlvm7u=WQeY!?)o{!$**qUqs5_q(uomoCm9w0gGZ|rcJ?c?gvuLXDj1S8TL{ACp
zM9`VI5WjF(rs%sNfd9fhtqazrQc3q+rw*!ZzLj2=lB}B6_N&-4m+v?l&VyjQ+Vf&%
z!ss`&JdXs9C+r`mf%o<zp43POVosldC)F<r5W3Pp6upsjqSiwroyp$4OJ;AoT*b0B
z0zF4XonqK5UgUTv2pL@gcrFnd96IroF5a2@0K2Qw!EVd??&ZNoYg_-2iEi_%Pp~Yh
z*J+*sDZhO{*W*6n!Zz0DXI3I+^m0zW@zk{v*TUT{NjK**AmH-Kk?JSKZc`81SizGA
zNg^B_564YzBCG+!<}+FPSnYyB_x>Y^-p0k_bPOs6Uuv$O`@7?KJQ-ZG9BlaM0o<ig
zPujCekQLD7LU1#YK{G`lxmv70`LsSZg8V>(Vz6nJM91sFw$Eh)5!qi<M4c>w!m_R-
zN%!3Qez&PUI9;l(rJuTQemB~P@}{%FATM0EN>L&HiNon6&UD6EZ!fD#>f=UzTX9F=
zu_m8&)fTBV@VD{&y2+#s550&=yN9A)ur1CihD{Atz0)7X0tBQ_SKW*FSh>e66wF)3
zX0hH&QUzw?#UV!zWwzF>LkL@onb_Nd*|`POPY`B?HIufrlk5sBuvdjmIUo)yIeTt-
zSDAHkN1i;J^&B|;mR~}avh}26Tql>Uab<Y=Qh!qnL}saWS<BKtNgnIan?@kP6d3ks
zkbxqLhs3Luhu5R!o9_-zeHc#UXr6^<SmQ3jIj~_jkQtlY+=v2BSo*gs24asDKjl=%
zqV<GXR%(a@r&_)eJ&1UXaaw^<hjcMu4h+(D>^ALFF$Q)`n^xc*;&5L4%s>jolugN?
zUcJFrUus`$80pHuN;}Nk8S%qKf_yapM63#L@VehAy6@$}WLj32t%QDwOQ@Lzx|P~T
z%06Q83h+^4L1%5%a-whEjan97Oz@A&;OKMv@f)$og8{#@?`XyC#b4@3Kgjv*&vo&X
zTWvbDKjOF8ETm3$SJ(VmOq`1ATP&q~!fT221}dRSmhHc?ImmTYkQBU!^WP-hyy~_H
z{_1}*U-&qWSFVlE05E}VXWRcS7igU<t}Kh9(6JC?w3sX)Wzt14)XG{?@tYh9y69-u
zCCwsrbrEg~Utpr0@A&5QCJTt-0MidMJFei0t9@B+ni7wgNxE%{&uHG5dP6gyIgxY1
zxIv4y^H=iDIjQpALyx=4IwP8G=IB=nk&=;izR=3+C)@oqO(I0yRSARTFt9^c7xzf?
zv7Uy(7tnW9uZ6s6lUM#*+(n%D5fAlph52q{i=mshC`+}<OA?HQ<rhSd8Qefbt0c>m
zWAjsz?!;bVZyG>BSe)Y;dZeLV#D19JbkV*;`G=h2&k|Ih1c!`)XB6GdKHSAeUfslo
z%N>OqK&=*&otF#x>U@!P+H{ZO<JLE;3$i9F&e9sa{0hsPu#hvLeiU;Ka~8j`tK8Qs
z_rtXVZ%=&NRN)-vu~fETTO%>Q7QyC_9O2M@H>UF&kI1T0%1?RlWY^C!^DL+2k@>>x
zsyn%+bypeGLo^H6KVM4Dx^er~m68vybXZr;in_~TE~Z~-K7I0rjZ%y{9T?5@hnM=C
zo*l;7J(SKi%xvBGhVFK#qs47y8Rhn2Z)56Plh~{j8cB2JCnMFDDj03;e&)AFv=C(!
zIi^Y&HEGnYHO=t$m?B1|g;;FJn@Dr;A}P_=RR3s^{71ozJtO&6NiB9OYuNN$Ldn?M
zkDuE2z7epAyW9)fR8rgpf1J40d|y4bd_XaL1uBYd9U<xJg~Bd`Z6B=yqZ~WE`!Acp
zN(kdwEqrW?@u7!8<d?f9CbA{4FZbMKq&!%)jqU=I-J>bk;<L*=N{(Lx@>#$*9FRjg
z2XhCZJ$r--p|;IMkAhFrFPC$FQLSgqyizX(i%WN+T{)=YRf^QH*CW#Vil6-=I2}#?
zK=y7e>8XO>7kpW7MTehSj#+Q^!I<Al+uUeoHK&Si*@*+Y_yZO5nLB3u1&<j0M5IUk
zC!Xr`1KgM!G(I{S)#>-~)IXnCnsjBawofYP?N2zI!1dbHFE(c<pJl%+WYT4DoDsn)
zEgydJVdBkLcvV8^L)D5(E-46i%ggvFO!N6{Ht9Ge*-6YWQcYsjoe8(M#)(x55re|@
zPCAa2->@GA&_-%G-|YxEN?9$x&w`PsPLdlCEu#1J(iT5)+PyO)`gvph<+N)S=Mczj
zw#L@!-j$}I{8K-kgO10Fjmz}F6?gmTOF*<s@{juY9++22tIqb!V8CGnn?2GBSb(%W
zs?!V-%aon!v#;#5#=UJ|Vl5Ys{l&C@`fx!#lQlzz@!a0did}!yR6E4eXc+7&QN_JC
zl6GT(Pw{EHZ}*o<-KMFBn1>d7#biZcR`%`}rE|XNlyRVjo=K8Idmla6u73KcWV~|4
zT($!ac+^jfx>LPHd^4;`d{8w|@p_b9tpfsh!{2f~JYF%5Lp~j$;uSi69G6&L{#LbO
zwzKn5Td~FDKeu#`MnuOfWRmDB-uTGvtok@cJ;-%GE{BQu`4>lWe#vQdI$f2?3HC0I
z%VJC-d)~?plTuRsu_1W2m!Vt~BV&63@p=6Z@k|*noi9OI@%j|T2E4wX8+i_07wae+
zXQ6L~l!Q;^<y}JrAQ1IgVL=g^BOM8!D2LqJLR$u#+b?H9)_H>qksBjboO%_e-2w=)
z<GghgT7ma6SCrR%*s^l3Fk^|CR^0;REzDn1==zc^AX8CdGt!zr(8qo7c>80-g1dbh
zn~&W=f&G%DP6#GR(D4Oa(pPnQd$y<inD?w)45(!YTI_x5uF~v2$6`dkRtJ{2DXYgO
z*!k8dH>821Z=*I%zyGa5`Anj48WMPqFqv~q9dDH!hL<jDWRv_QyHrM~>}BD2<#T=`
z^{HQR3>p=Y6NiOWAl8cQ_`%F?o{X192<4PHN8j?c0y1A{Bldy7=bkMxht2u8;NFvd
zCTTypJu)|~YCafK4pYkmMED3`4wLurvc<X0sJx(*6G0D-ZXy|mtCV@QV4)%dX#>tf
z8Azy@Y;-<%(IT;%(Bad4Xxp?ai^|A^T{Bg5H#|Vn^Le<R-^b?>qJs6flXfEV7)Gnn
zQCGkOnR@qQ&`pmEd@*LcU8RNezARB#1~seuW}VYSNO6lxMmt;&;Nu`BAIfVLf_YVl
zJH>BUiuN5n-ZRS@(Z%emsx--)(U{E)6_fVVM%t6+XP=T)?xW#vkIGlad3^)TgbK_y
zeRB9pH}z1G1L+KVc`sfE$89)qHoRaz8EU!J5&-Yd=UZL2FN9zM%s#4mJ*h0c@2LwL
zXeY%NusurSCJ>$yy07R=c%EQ1HdjR#nO3@qr8qm)bv290LqkFO`gsi-yYGo~qZ`@g
z*Dx9>3l1nie<C-$45L}OIc+*E8$nu?`|h_*h;cQ8P)-l1;KTJN{I&+HQWl+^(|Xe)
z28XMaOgPYtjZ8c)5U>)v&f8J$J%`X5x1`5c93p#N%G?iSNmF)F{84V-`P00Z_Qy^f
zG9;g<jEUQ;D2pNaO*dg-_%?g3a&*%Y&D0wov`;I(ekQgu(f^kO%yW_)v~M~&JjCXl
zgk12WV^e7`E7xSGQ3p1)<b18VG^KL_q2_EJ4BL+`d6J;ljIkZX0^t$N6qY>)o1VH~
zkR_Z$d*ZN=p^+*5!gZqr%PFJDA`Y6j7Q3m{&Z`N%hs6hF-rp4Ssx~{}k1J%!DPRR~
z(^2WJDaXS29`Vl!Mu&~@-mcj@8x<i~8eiAOkI7YDxsH5aLG_qAAh%}mu(_l|AeX>r
zT{{NRtmVcT5Hx8X;JfKMRbAFnT=cfr=uxg|aLL&NtDipghVZ<h+>-jqMZo5<WhT8|
z<5v#$1c(Mo>n%sp;l{@pZMg$uC1Vk7s>{17kYd}$1IN_W<7^+v6<xS~{GH6*mRBHn
zJ!X`}1m(OL%pHG}YT~(Pv>v7!RwNayh8WZ+obX95>EfQuJD|<B>KnLs;(N8%?*ip;
zmtJ$jlSf)xGXADDM1Id2`_EpGYCahNdFVKhEIo8=qP}eoq!NU__iC98@I}{<dg)o=
z;-(#)`V!WoYi$`Uy)>`(P9F^~K#lSdET>UW|L<%Njz$fXBJ=vS8ELa`#EVl++aM5x
zFo}IqUyH5IP;)^&e7%aRo;Ir+h2#+IJk44>`SRFl@8@q&hH$|6{*nBYu0x<crV$=+
zma7U}F!&)SK6;-chw}%Xn8dT~hNuR1v|gj}bsQIim$anaVX?0G<tQwn6sDrF2|?g&
zZ`#a#Y~)qgmB5Ac<||p&3&x{F>+fuYC24VncpaLHs{3;|4Ii6`;;crI2D(QFcXp!`
z%lkL?F1@bRPevsddYFA&->4y4V4Z_~$dy#Lk66gB+A8-&6AWK6eo$-Vb>B({tx*Pk
zS|Y=|c`7}k#Y8*Ks8)F2yWP8~7GOpyzqdY<CYm1T>ls(3=Iwi5X=i!|&wcbUGAXwj
zr$qTgIGaW4YbAREmukpf;uipef>}O|@^EH{YGKa22yoFLYPZ(S)#_5o#ArC#q>u3^
zi*EIyu7S1BjM&~zc>(xJ7_BI^f#T`OEFpDeS?bG%wt;J*3Q(Y^?$M{}4o#1!&LP_m
z4_lgB?&p_Mo_m)-hVUsHKq;OfOnI70ziBruJ2E)_*602M)A%BU`Nx3fPA+Ya1c3&R
zNZ0E9j4aOyjp_$O2}ulx{nFBpD+28Gbv?1>8lzPmS~}JAuGZxo5~{}?T^z1gcubhK
z;X*_^&m)Da)ybXleOJfpJgQHYO!YF!)~%dbcZ%K4wn(lfJrk-AX0@N4-UJ;&H?Qs`
zoNo4BwX(a`FZ%Q?P&%2DMcqgY!fUy~9SscstfN1sfJ-_igfFggA*R$yY&e_t%p%qz
z6X0az+V*={rSsigmg7rK^cw0@*MQ#EG#o<hqpeZ40OY7}Vd-eMAkso7zLBmh+MUjl
zf{X7r*`{~(QLYHvdLunp5$Fqd9`Dm}jhfV(LNlF7-+d{+Syj7G7JDr)A}T#GU!x*u
zHU%VKD=a%AtPL1^PNlgsO2f=Lghmaro*<j%0r-OTpEG%1B@qk8_4KZ!fgSGU5mzj}
zk<at2u-BeuS>k5wR6DfX_Wg}|TkMz3W~kSK@W{K{%^{Mb_i4<7-q*{gaVr4&Mb8=s
ziw_OHUSnD6#vR3L%9iGpJQ;o2^|Ww0<$={$`NZ*yg4|a|2WoP&EkY{*B!K$Sw}T3@
zjY=eWSMRNf@TQeO;S#TP|0Akc5r7d`(0ZWjCN?ar_M3-t*s!27^@4tRj8BBgUbovo
z0~30@RtaxiTuxLZzQXr>dI<s0W#FaP-&oPB+bMZ!^7K%~*V?WKanh!zp$D=~fK4_o
zaj>Gu4a^w_IU^J@E8c!K2sZ!jl3y&Ko>z5*@ha!bEfU(Yb;)5|(TBy2T3*DEquc`C
z_CbDjPg@G<pcYa>vkK+dkqI1*J*x@RZU|$q7}vzKngsW8^C2Ow-s@FwXDBh?C)dFk
z%RQ(al$O@d-XZPz&GQAGoxighmH89K5B^n@`#k)fz^8R{lYyYeonQPT?{g;|m=;V|
zs8>QYlcVOJ4`*5E;H1ZE9pF1eSmsMC^1bY;ah<-Q48$wqDQcx^0904N(4k<&NpXKO
z{WjnCFy2KwhXOh}cI14QK~6AiGQYArG~=NHD1>g!W@WVb`rb>3u2dkS*IVdgdB^)J
zy-(B-@xhe{o@o6H+;>E7Y^`QZs#|Bxqt;jE?7Fp;G7&lkC;7k^1FspX{lhaj*I4SR
z%>q6imqs|}3!9FYV&xE{MU{9%ixOe2qLOr{9$cAJ_k$?Yc#Ek$S&)GhzBOsA8uo%t
zC;RY?$_gn?uYQ=Tw|~!#3uM+(P-@z`A}UwDkM`RhPtBl4F{$-lqDoxE7^?L5;2Nz`
z8Q}&@4zb@mYtjCXovpL--wd0KYZ~0hwoy~{h+`DUd`YwKPYt)Id3%_-`^E-<_cE2s
zB2_Dh*RmOoiM0EY8yoJ;z;>$d<UIXledwd;sT{~O%J$=3kgcaSwBYOo)6R-Le^;Ch
z%m^20A-&|-pXYe`u&=)-8Z>@d<Ma)fc^gY7JPlalgxGq{N&umE9NT&tg|?nJ3a}2<
zk$s#h2SfJ)fh6=WA(+>F*BNiq_U$6Y-6`s6D-2@-neHw(9i7ujp;Q`sEywP_0-)dt
zg<{OQqH!ZP+<ftHM{LCw<Jq$Ubw;dnU&`SS6u#tpQvZp)Af};O4E|$i2$eeO5G79&
zcnL0=tAZ0~tgw!9V_9te(!Vt3m8!IF@cJ;7;Aw3xzI3sSfJ0NgzBDr0u$b6x0Yn&F
zVl}1;uTn?(&?<m*mSn^aMq+eP&43Lz|7z0h3gv|<yj&xbn)6s(Usb|t-6vy&1#;uO
zSYA)O>!%Z=qS#>iO`dj5dsSj(&mDETKy~1pQ;B?FBRjF8%+#Mt?R}fwAnWAw(eVUr
zB5zSM<H_JhsHXTE37vliLxggPVZP{K^9o6EadFt8lamRM!c7MHYKc(A*+NHcPf3}7
z2Cwe1py#Tc#B^>Z=N@3o<0O>QlgbC%h{V^uz%TN#`XZK><e<&Qeq}?_O})-$rAXOe
z=iM4IZ-rFzWy3gLR&8?&2cGJwwsnup{@p?1=e0m0^%by`Yy5F}$M-Ijz~+Xet+zhw
z_^P;i>oEZblV81Xnf+eK;dA-qt!0%nRa_ERvij@8Bp$ytvMG8YPYpY|%v$t~-p&u1
zY4k`ww;41vnztjYb?=k;t*XyHPT~!aA->1mED4E@J-0#z69`C2&(l{cS4nqt_(vkm
z;*#aXgwm;okW|czo{a+5ZAN==-r3a|4>u^v8%Cp_oT_rh0EcFQ3T;k2Q8rGP#C-}B
zqrSZ*TF6GBSQ3d{t*IqjHssYpM+q<M-Y#kSVE|mMrKx>%74Nq813JXQs`On%k^)->
z_uHD+_rI!K2TULESBQ)ILBePr9u<Qt^jR>l+U~(6=ND|Ar7vN#=LYdaoxSA?KR-h}
z3nZShILhIaY#v8q@mp)&+=-gX%fi=~zZsUpc<d70KB^fwra6PB{R6ugF%Zj-VF%uK
zHnmowVv^0#U%n8+2;C8T5%TD1g7B9wt@7*V<`hzSX}R0n6vvx~T9<7Swls0(NXgwt
z>n<H%|FXjjNhk6)OmYz4_N-sE(Zolq(On9b<SEpkzxQWxJ+plkMGEIk3=W60L>B3E
z{rIuvt!s<idyz08Mj#}Q(EcWeqC}W=c6HSadmkf@uRxhllysUw>P^aE@gdg=$d|pN
zZhFkH##;Vx5|?wD(?m1uM=qao5pLk0P2^!!-$a&ssO&_{8NI|8eTOUX<-c;jKYQ_;
zmTsM6uQIQ~?}(y|Rr|So-41zlp&**xz_P2C<AZ1|-{<ZMKDUfb#S97asgR;v^Oa7X
z^kL$U_UzrafxG;dK*qq=W=+gW{e8gFtE|2^P2bYqYM0ansk9N@p%R^uO9qaM&+<-(
z!0^vza?N_JCSH^TFCLnRN0P_XeQLZ(CO(?MoMTFxC-ihcH&$cNmF>-Kc+od}r0Z!b
zEiqf1hMi_0<}(w$V_YgUck+vbjqR2a^zbN?^`eTyrB=ds-!PJ7!`|)C%6uzsa?=C<
z-McCKZDHwC7{!xXFOF#mSf}%_V`}m>r455QYPsFXG`arHqKUZpZ2wMoA-2K17c-PP
z%e4YzC2<dRl{C*`li6eH|I`uB3T&~tI<=-p<Ne6>x|7xl=0wf~5goWknCPWgd0})-
zgF;>6JV?H9ahT&7^W?6l`kh}d{G-BqrRm)fr7IKEZDjpfBmnyA$2{ZEX^<CabU8^9
zakpm>5lSb^{vxC||JJNXs=PthuY8ln;{@Iem+{X0Ul~*Uuv*MdWi;k5#i+{6SH=*W
z&G{RzIJic4M$9TBwDUzZ>JMB^mlN`e-2H-P7>5Hh8$Cb6rD1JN7dZrMH03tFF3jgA
z^I!hP+2TSkNKN(&w7Z^og8=?}KMcQk@aq*JT4MdWM~In7)!LIns>75pURI5JAvc~e
z-}BRlpXJ&N5do|=aWqeVP8FMBsp_(pV=bqGnl&s9byx3I-AH`%Tk$aarJVoLyPg9w
zMm`*&v7`Gk^iqVTuD@1%y6$ZMg+!_)9QSHsaPMHa18WJCy>m`aUpf6B^t4mI#lHxU
z{hZW{owcPgN!Nu&^|N!cA0oeZK6>yaxswpTBD;L$u6W*_mTzIE-7aczH81yltVdEE
zKZchYQt^sp><UrB1r8lnop&hbXest<fAxFJidx2Y#C42}(#(33v%|u!^yiXT*(f`c
z^*SByu6=l!BIYqvF3G`xQYzok!}3}CObbf>KRoe-aog79zh+vmKQrzkQ5%Yd86QKZ
zst7uqD~y`>dZLwIQNx=!C=(5FpBZ7r%MUgN{>xmid8+?(7Jf+s{O>=F+X+*Z1Wl9~
zuKr?Y|1*U_DWQvfLF7Mw=9jC9gTG7Q>i_R_3V+|{A6xr>O+)eby8XRwzazlE<=}5Q
z_*)MCFkXM_(f=>)b{rw#`Y$ekbB_GE*wgPisF-fblRol%lju|UMK)RGweKdmI7bXS
z1EUapL3(Jmewy{I;X_Wv1g`Gn>_R6q@LI6Br6Kv*8KMHl{P+)&z5ng-{CT5UF#<_3
zT1<S~`TV$}#1AdA^|`wnpVh6_B(i6A6`T~kC#+HC@%;Gbc5-bdY8}v_uV*6gTq7?d
zt+xtG2jwo<rSdqB8^1YFZL@Ozx3J-#-Jyz#1eTl-k0|=TI-J*qFvNRFv(>qjO(jN*
zl5h&{Ph7lycC4qI)=8$Wx_%D4Ja$e!vZLwLx83APr-k7Cv<e)GDtG_mpx&p{1ZN8v
z_}KJ(sBh&%3*N}3@bgLRG=01p&{;3*Ld`3K%As1t$qAC>l_l7)h`^%e*_JiLwsQ>E
zuY%utcNi?QBrm7#8lN;8M{@4D|2QK5SXr~ImNDGbZ($F!2G6&`*0LLud_^z_W#8ai
z%I^*%rnS4CqTWVz-F)X-1BbFs^idI65bAi43$bBY4TUB*%LDL5s(U(H+)IO}M2BCU
zg0m<f*uK*_%DUAZNBEQ8%8BkjXr=$;>-ggpF>#;2B!-l}jsE;bw2a*|1_oP&6R(i@
zD>%xipRL+!>S!j7S?2Z~^XF%h;y7imr({bEO=Yc!aA<(Mmt}*Tnmt|tdwZp5rE?@?
znDswh{tvX*!~}<!Lc28Ryucb0Uz!omChROG=^BEb%(jdMoU8%<2rAr|CsA8|DJS!j
zW%#L^cT#W!qechxLD|{1*h)ZM!9(s+1|uFS<)t0M<NipR*EXmA4=e9aveCRmiZMH1
zoB3?ko7#PEfc<1=-!i)|#7<;nI9J&#&#d>OxJQ9+vPPkGVT4|>M1Y^YB`wE9MV;W{
zL-U^0I~BQhMyalXl$Z9hHCG4g#8MA<7A^wc{EHszzZ@dMampgh_aZtzx9JxynnPPU
z2i2{3hBFK;Wc)*^k!B>#-w#8O+=YsSJ6|g-=Br*@E3p#Ddm^bWEG*pB)1&&mZc|rh
z_O4qm+(-6GN-ms^R_VmT-uzl%@~@EfPsvOCaxv_`gD<Q`v%hNzC}GU-R+8{$*YSgv
zR1p{XQzq2x##s3#69=&3#(WXG8eF8PPNMcFm+QFJ&`$hX#8LeByir9;FERd`w%7dZ
zdA<q#dv2<hq?-i&q1dU;eNNKsX~-KUz2uz~({(EbXOE@qG0kU9ylRtml|9*!E7?iu
zf@=vKGPuQ16MFCdYznTL7QQ$7S;j*DToz?6fwnf5`mjAz3%B8jLJ5Ofe~X;5B|ElE
zqhc|$ORo8qiHV8pRVQAGiXx#=>w1LCED0{`XK;^vL2*s7h7N`@5A{RO6SH_{U1(0s
z7OCvKwsM5$n2Hq^VAE4bpzab5(tovH+WQ%%)VSL%(1>(UB+AT$EnppKQRAi@&IWRZ
zH>F%{ad*Yik+eo5a}S7iVpDjPLqm%-$JmNNuU&Pu^;)l7QAYzfG>n%a3~1rJm1N(X
zYlTHoH^Q^b@^;(%^BrHl?h%N%b{7%aj~V6$o+)`ACS(-7Ot4(*NC4}6Uh4Zb#`Wi+
zX&E65u@D3l$DXGS=y~PWMwHu|XZr<e8-6jt=d+$mn!>O@CGo{EO~a@H)Q+0-#Bdv7
zq-VUjbBzUyj*GSnOa1PK-N4>dFZoAv?5%Nl#9r0q@8*wj+q!XC;p>5QA^=j;o{^kF
z1pxksas@=z>3xIQ=qp01sd}O#qR&eo^gYVIXXD{?+#DBR1g+sDs}eYEGBssoXQOFg
zmQ*!)Mopcoypgt!J|*&8^wX^jzGi4Hk3m~#Ihiy%b`?|{M39@305~So-)<1q%}x1g
z*_fn9PCse1DkvOO_SMNQu`5t<kCb&W#t4EYZYB3ue6E+a;RKGSHp^4aloJR+QHCm^
zV}DBeudkSsTZD}4UUavgFXy=6=cGEj|0!vnf85@_>6)IOy{}I%iIkMRPiRraSY74r
z#s1j*Q%ID=?~)&_6EuFOLio*f{USB>jT^l~yw8UZB5L3CP~1uW9`;0VdY(}zz20ty
zQTTFSl1C}98PY8(pW@_Jgd5E4J?t`w3Ybkf@SLD`UTODCqO%N$R|(h)GPvPCdr?Ow
z?4WutFrK#nGE*Z;xB+vn4$5}OKo9@8bC^-%;eXJi`vlfStiskWq;=_E-FhqXcrMNr
z5oYKlS*j+SR<C}2qac|wFK3dCQ_iNB2P0l1;<n}`3Vf%jUyoGvcvCNBwLjYXw*MK7
zmi+dE$@|gMHLI=D7R_eZVZAQylIshD?);xw2$DGy_{-k(%){lXpv#$aFFSdDW{|E^
zz7W2BhOWvnviKR*;5$QA01kb6H}yey<M>1t22FW2t30yo-;43H){Ba-qMtI*ozq-?
zSoK*5)n)VhlNqkl<UZv?Jt4_&ZeF{>IBX{!+F3G^iHB>}jrndRkyd7YdGP3a0dT^l
z_d6HoE3$Ehs;Hf>ECoe91KPgOWZn9<2yP?2Yz08hmoGd^zV^019abVTd(R5uFPDGr
zQVh_AfCDA?U0+D%fmLL!0tK|<gvul8rw=kQkG$`z<-bK-IvK0PR$wM7t<cwsy-Tx|
zj%=IcIohFV{N*p=d_8M@&dSBDD8lDa5GmOpt!};t8x{$tm0aHB<7Hjphda6PuOQs(
zA*n8oeU~T3_bEV}dJL~U5f1f=7yrFimqCa$(Z&T4owF1z2W+1_qWG<YghK@$Pd;&K
zIkenl)HKvwRGm8=zKhK*mw3Rbc{dfLmC?Ngm2H!GUZ{;_S0;1>n{Bhjvm=OGNm^TW
zK;9mH<n4qGqMf=jg$hrXkVylRIY0XYFfM_EV`B{j-yKZ2w|V67UIifA0@KKwFN_E8
zpHz@t3c8xVITJv1QslZ=GM)hhe-sCH)nj~L-N9%$4H(-zu<|Tc=O}2fyk9Ba{3f7E
zlQSlGJ?MKKzKT9Dn8?%V8k5hxC$~$o3S`_g7CoqL6%8PpeHE&$!B;d)FRopKKC6ok
zx#C0nqxTnI<WGHf;o^<oNk)IPDxF)m+2dQ<7D4JLclBfjVV~XrUaviC@j;O+Nki{1
zj(q+d5HD<&UVWNm{#d!>b*imcviIfd^6n0Sq;ppz8_YjqWwl7E6*OO^Ox%rlaJ_FP
zN7e0ph_Z4+p=u0sv9Dqz<0wi>%3?aY5Lr@2v?u1J&w81w_~HpCUs_uS4pmylS6R?X
zHyfX=?CVgQ>{czpE1%isx7CtP1Pk|uto0MRfsn3U&kf=pxZs0wEB5Y6?tA|9+e<sK
z+l24|_lV0)AZ4tDE=Z9<bP%ZZKM>D9C*GfMx_lY>i$pxJ*FipEIOe9x77(p#-Jswa
z5Pd+qj&*4s)v|k~<uOMp_TY#3*`XX{K~iZoRh@Qi-h=i9cgtO27x}Vvd1pC2?V`JY
zPP#ONu2#ts(*c;;NG!`7=Kc85R#!pC#{kg<g>^^B6SteE?6x0E{k#2X_@>t9Kh3s=
za(7;ne`9myboo<|2L0VI^IZBtFRClIE6NYGJoONZVmzlO-sc_azdrfXz>6_kqj+{}
zhL^u^hbk7fAcV_tyI@Q=y)vg-Vln`+M#6fX3jhFN8n8|1v+Ymlleu@f;j}gS@=2mv
zmX`T2e%0KUfcy?c<`j@ttAg(5#|h?EZiOb=6;ZC6HQ1^jFPDu<x=#YWzf|H8_u?zt
z<Uz4Ew#HU$MXl?9ez2fZ85EhbV%_b0{CT$Mvb?ivvdcLE`x6Bbs=K(KGWgEGwqH5_
z<z0fmDP%+(@8cd{{50T$OVU2CR;&;JY^5=pB3!pW9}4L3uA7=JWlbP^U%%B#0q8i^
zw#?wfKnZ<-1n2G>Z9+W!%&YOIXTo?p=R+gtsq4}UvzNH|MC*$9PE5+R5p@d;hX`+-
z?suxh48R-w{rIWu>K>mJ{z6-P{oGiub5#t!<6S9Z@*!_rT3SZbtKgo&!NI`fJJXN<
znxFf_>;GrY?o({b;>o6HzS*Z=x=?1VuO}w(>JgwCVtbk0!1&ErMqq(XW~<IuTjV4A
z+#a!9LOO3R?4tQ*q`=J-ge2cu!Rc0$*zayc`4zXOywP@cX5RzdDcwpn53;aJ3664g
z=7)pn?!~dM9u&Q_e9@(EnkfCX{Jks6oO`d({pEgawyHeYhU>LOv#u)n%Utya+)NB0
zLn-Di^s5QKXFfB!ee;sZ6{>6cw1N0ii_IA;R98c(=a}DLHN#(J>s^b+?{WILy4dsM
zm3p4}LAlf5M0P32Zt>iuI%dzODb!nL;TLH!Z%Dq@0<TY2QkZuZJg7C*?w6?Q;F;IW
zDFCBK0r{Eq0+|`vS=sF3;;kB=sq#kRDqjh+LaO;9=>|8q2CU+;MBQX`+&D+#4%B2-
zepAz%5)jAw(Zjj6FSX&AtdZ!t1PzZfWa1KRRg^C8M=Ye4y<R+PquuV9+u&rtb16x?
z=5rrYewDD0M&D!O*Ju_$$7p>$ZH>3`tCt^VoAi&4H0(2Js3tD`lq?G1Jo_9KIh{4M
z@hlzo;J5$4pZ}2M`k5e&97x*iyfphI-T&k<Xbox7Cg4}(yCfaH@mu*+n~?yPb#Ff2
ziIq_9Pas*f?o|f{{^9CN@lu<1mV>16hMzr_jq2Exo8V0gwp4k7T23py!^cI|*+8Mw
zuFcC8*wGQVfzec6bQ$GZwGCSZIx1LWJq*9YhV{-_jcl%v_p(a%-_xba5kS`|NOpE=
zwOdqsLQa03^dIg1%%N_wRA`fh-Lag2>j^aFZBkBs_K&?a<&4tZ9IIlh+4!nyQ@_b#
zY9=2LAZ0RkFvK}Z+vOC1efT9#ZHpbWELgzvh}ll%D!^_1=zyiJX}^u$>nPFC(k3An
z%Ic2kJi3{fBM>4G{cn-s>@k7<7kw<$zkBl>cuf4%Le3{{MF9D~gYqbz?<uS<4gT<`
z*&^l|4XOzch*wW@Opco!TPcJHLoR>7ty@^e;;3voxeG@QafNYr?4Ie%e?HB6QD8^O
z>7cS{Grd}=6-k&IRI}RFmQC%WiC_WV=z2P5-#8`Z=lWpN#Y)UQ8+j|2!)B1WOUq=-
z!da8=QvL3p=<@LHJr;~|#p{D+uv;N_bf4|=2Z9Y3^w-q1Iq)}^N2I69*<@KF4y{h!
zIzd#7itfwSO(3j&{NvH$htprF3wR-Ke`#U)i<4~3OTs!g5!`8g&GbBn)a4Y;i)niE
zLv=%AU3EW1v-7D31O~rLG8BM<K=GjE#V0zCkHSLKpe;jF$h=-R4B``aWC(^rucxRW
z;(Io#S%Z_xj@D((9p^q`GEKz(cxLy*<Ip#8Hy_Q<+8ue1kvp4wLtkB2nJMKCQ0PX^
zloast9qZjyIH*g7F^ifHZC_2ve^65I*o{-3K(;$OE+6BhjF?hIb^d++jaiPscpOdq
zQ1m>`<f72_1N$C1Boz0hF458T*~qwtvN88jT`(Wg&Fs|ifb+6)U+&}Z={)wJ%4M=1
zYRb%HO;f;@O9u?|@(Vsx>L=ehJlwNd3TDM2yyt&9=wyF4EUWNDnT%K2#yMuh#w6=x
z6#zwDX4an@sdB+<%4Mj9=UAH2l=0ZR@><^+DhtL`@{b>F+b6wT8n3|0fl4l?-ULVl
zY|*@TyWeP^z0NpQ+_m&_t`qXV*n7{grnYWvSP{E`NR_G}pdg}D>8J?OrT3x;0V2JZ
z5J3eMX-e-cl+a7)Bp@nMLl3=54Iw}XB?0oqectD6@$Bb$uk-i2-ha80xmM<yYs}H+
zxbNXF92N(hj0?s0vVb|Wc^CezmODW~$Cw~C%Qky;PLSK6{z==zUCEj@(_PMVa@j;N
zjKf}fOb$%&kt?2QeX_zu-cn1`@aC9k+rT5cZyJRh_tJlLVI|)^MVA68zuPJ@mY$Zz
zp><eSmwECOpvqY97d1hOc2JAA*2?Ikyup5uDq<y`jFw96st)WzIN2JLzTE4yr#tlO
zAly6YV!gQZ;bp;u`fI<x@_W&EWMaE%2=)4qp||Mi3+jS83ri(^DfdXs0BfnuMeNYd
z!{jsU19>J_`Kx7;ng>&ysPKqP_~(9^cvHSf-ghrsC~P3#q>&C81+AwJSN+jsNS>Kn
za<xsD#6pg;5FnqFPneRKEx^6zG|M<WYOH$x{0J_7T}XN;2Gk!T3vPkrhHGCTl0B?E
zf4x(OAivH*XXEgM^0`H!9|nF^N?KlrF`@swwCDd-#*&DTMd~Oig)9xMM!{tJctnx*
zXqr*lxX*muoZ#+Hv9X?c`+LRv<++PK(+5UZyDS@J(}(?XFm}Y}nB91>sk{Q=d?$e>
z*nOO2%^~`IfE4bl35~3+qiGnzajJNR^j&IE{pw%kETAM3ixcY4R9*9>D`ga;PIZ3O
zN2PPRew!oqP2^lj=vhs4Z6d&9!`xX}xO+SA;sB(x!gggfWz>W)Yn&7>TzAqXumWWY
zp0&gW*jkVzi%ZUN+84d-Q5q7ZIRnvf=h@PF7T;fq>(Y9vecmz0#-_0O;A?{qx;so@
zU$HZyu=hQ$8|0>dgqAT~x3b@H+wr?{{B-%r&r*_#p7QZ3lM_LSx2;ZBgWSryBE_EK
z6HP*fP;_h);v)yn4i@B+b@RZ2tG?<i>>T~G@#!eU8_E_HNkaDH;S=NkM;?DGDf-)G
zak)dLKli?qszEp&NTx7R*qfN8kezEOzwzP_^YOu%5juNVj>GE@*~o`1w=NR@DGT?1
zzOy=WPQ9B=OeAAol=k;0BbOB{UZ6KPc>95O<e&mJURA&azoo=yB-(x~L_L1V%q22C
z{=`+elX`z7;-g+E_?1`7)#-Lm6D2^1I&<#64^O(aN5jEcNCUIdMvtTOY~k+@k9jc1
zB(uxoB>Z&33Lt9dxU0NWsGwTH4;4@3tO*G{Bjz!e^L?>vAcYo}D5Z6EWkprXnqv@$
z-^!T&x3^x3CsXAwq4slYjtyy+yg8#|;#a-YHeR>pUKZ(b{`jLFbA6wm?~3q@vOac$
zW7Geq_nCqrr`%I9fOk88*qeVE{P%ZX>B%JhyfkP3!)rJ;x4+(Vj~Ce@^z4Wz{wGoR
zpO-!V6@h;aef__BFhB!&K>@_8S^w9jRey^%`P02$acz6+gMYu-{-+cNRsL$eTX}e?
zPwszpSps?Gzx|xOcFaB=o6Y}x;^xsi<T|g>zz{pm|IK9z>g1JwzV&}^c=h|!&AeoC
zNySj*{HGP1VPe)t_RX`nHpC<)LAQ(4A&`x{Km>LAA5&i{JwcL^10!W+k2?%Kz@XV4
zfQP?EwodrN9;jozv&O71=3d}ZD88!+oc-P6v)ha4Y8klxH~aY|u5XHz2j97Ml<K_X
zjL1w0ZX&b_{k%Lgh$Hpu6Z0x6nijS_DhUgAc^r+!O3GcG()eujb}zd?%#}}eGj{P)
zep*S0d<Emovyb{UU*gv8b3RJ#_RGk9FpM6lD;nFW9j4!U?v<2Mhz5MamSvw>mD-9E
zb%tMXs|?QPgMeHo&<|oOj>kHClzZ;{@f62jMYH5JD<!2BnVd(Z-i1qF%T|zYJNB$1
z<lKBSFW@Q|_Bj#OX@SX6+~Ef;AZliH5Yu<1k8!7S=^nmxXmp&9rf!ntr<lzRNz}<c
zH-h5a^`XyPneLW6FXo+GIMDc^2&HXUs@`b&^qLtel4Ed3mL0CnGiHHMIUNl?e@^gz
z2}UGP?##{#N$i13nxX5{Fp*fqt82B_KDqnNUm{UUkJ(V@)O3RL81#qifREE21qhEZ
z5iPv+z8`O%efh@S_uw<<_~WVml<C~ZRx?(WUhC&LuYN0$`GqbhLUnvH^Jfxxf4<B0
zg|s{PDYHHp`HJr{l3WbAwynax-qzPDQt9W#oSq2RMJF=N5TtQS*Q!pZe11wRawWyu
zaHGM_NJth-(_MZAk7lQP%ErSorL9VC;zkHy+nXJTxK<mW??`Yr&&~GBbdUJZKaV|o
zi}s0<)!v4h7dffc18&;a6#n+OoAuBlGU@H{RNX6E>p%BYvpNIw{imhU)?^MlcGi{Q
zH1lLn??X9b>u=><E<v-8{H$=cj^gs;EHvF4J-q?H79gmd?ul-@=YGVTu!pNlPRjg<
zx*5C9uE1-rR)Ok?;t!uF7-C`y9l9^v<4DnH?V!JyV{VX@AuVXVPLF!Bd2BN%98fF`
zrc=ye#c%zgJ#8DCpEh_6S5wwUo8&+}({)$o-n!L=4(&FO<IWlj$EK+pO+swLE@GDS
zXPa%8lR6=n20R4luUS)rhZ8aZ(YC*=k}lWNS^@{AF-wiFyEYTYNYB5U!Xi2dk@Nz)
zdF(%YIGy{GE30?&w9W-jWVYDqsz0)RK+ot$e&>94G{x`MC0Fegf>|qG6#uu@|Lc=F
zw7ECha3Rc91eYUd*lmrD1&{<JG**lk_-_ju0&sLtd*<G_QbPfM9aDv80HtQRc0jJ5
z!(Z)+@4Hj1Z$in)<1&{<#ig&CdS_;(_<H8mF>eH9wchGVvSVv^3F@)glfSRn-64tt
zybtv4EzaMkM|KTVDG5?w$M|ITd8!C9r)~`ZQue$l4SH@$Vz#*Nq$fKeHDZU#uImN-
zCMf6vqh;<y(U0u%OEgr8w8CA&D9WFZH>81aS*fDg-NxySZVffVH#f-M&?lky{rv+B
zne<d_n0~amvz^^bb@w}}C<v!TQE+3?IeQJ$iEI{@K%_&gS#FPLVe@Pt3~`V|n1XEy
z^(x25-5lp|{Qg;#01lvHSzXalMrl*|cHDKmX;k!OqUh%S1Pcet&RFfo@I2aC73J{s
zJjet42{+b?mPeS?9h<A{(goM8?H`?n&<LT%tm7SH`Ujepob&T^*+V0km9K{0W-u#P
z^fhj|d`g*SRl>XtU$T<dwNDxuf^<X#5ZD<S#CqNJ5YofhL7CoSwyAlwIH?ckO+0}=
zm<jPJb>cE_>xP_5^46^v{VE9em$(GG1bS^w*IkI)K(QSTIF=Nav`+eEJOA)Uyb#oD
zQ7$6#=%}=t(dAN|H%Bcts{fpN->XlQVp&RZpF;0|m~^II)rAHE)-zA06NA;l8?Ku3
z4KFO*me>-z{E|*g<B4fX@)7f!zDy4G)%!Ve?ynQnjBxT5ijZ%0(di-)6ceqdr2Kw*
zukM$gYyt{Lgm?D^XGIoNU6Z*XX`zL)8jQlWFprAtyQ7zb0iIlk=ek*e{yyYRqKLq*
zS~&1i_r1tiHGL1?Okcp)4hFPQ7D#JGl3@itknbl&v(g(ahpg0O>PCG6s>QM{NOBhP
zO<7NE)lV&ppdztNrg~Wu+pbv%Hb)VmhO*s{pkm3XlZUAozix*bNt%myi215qX4$mk
z$-Vw}Yj2<ltE)cd%4b5lPGUXF_9`fB-qt5FWe`EQhE}_4B$dyA5t*As{$g{oaxK&5
zGCa};YyK}MrWvj@?NETuTZSRji786=ryne6ZsA%>yi<Vfni87C6r|_4T>h!~m$jjT
zo@K2EB@RvgAk-({T*Ux<QdSE7absZ7DjVvN9ZQ2HukrFd0pNjJ@UGthL)5Y4NRLR+
z1|mBhaKeM>j~$YGA!m$=3>T<wlB*MF9YgGb9lUk@zdjcU<M(L$&d+e4%Yd*epV{D5
z<2MlR*sJS(`(nFvQLev}p>?UZw>BBrAV`y{1GUte2#g<-Q4xkMY??4guQJQkTas|V
zh9ReJ8kYJOadz|5(*^x&GvF;6??5ff$-Xre^Ky(Uh|mP^Tq?=Un24>@a`1d0qs@Gk
zMKbUy70IM<aXmUiScX+{VJy(uGb#**z$Jq9G_oZ=3c><DuR_(nY(;P!MmvpHw^dFj
z=DK4IhD7&!1M1G0dZ7z@MqRUGuI9fmlHUt0g|@qO77fnBP-uCt$x>O`Yij&8b_1)=
z>28le2*m0_o>~X7oBF_-1DfL75%k*<MLThT?NqFIp#()_toP7&jEOFb-_$9=@akds
zE+?$8o%2FMwxgC@&cn7_YCp%AF_IafH7F?eLsP04ekdYKD26G5b??QOOMjh#vd#zY
zcM#-tGv`hBUzD8hw97(ya>->been%f?Zj{BqO(7WuMFd+8_n_XHs$?XGKT94vmBqT
z>Fr%l?|g^H5A5(Eb-E-U({Q0{qPodlxXiDc0UNf=`nX3m1(~g5AL4i$mz&crbq_`D
z41qN~1&`2zE_(Zg+Z(b#`mKb`8_etWC=t>QyI4)=glJm!;;N7d1mj(*U4o@$STinB
zPJ<fcG<4L%lQ<jAso;z1KSVm*`}(rWhTiXR7rnYEJ#mO343|tggm1gt^(7;{`bg&5
zGMOg^6Hq#XaK57yw<+(!YWV_WePHI<nxXLr9bPCj<U=@3AyiamuTPWinN5DBv1OtC
zIU!_@;H}Qc+G)#=m5x2$?{;hF*`w-JBT*n7<dlEjnld!@CZISiz|My4=zY`KLyV}F
z5XSi~!ctWE=rAkC?en^s`JDecH4r;I&Tw#HZD_sQ63@Wo7pZmN%>-^p3EVs=i5h_|
zl?rYxDR#)XBO~`pAd{>)RPbs0PrjClaa-#eO)iS5M3!wA^GdF!@9~DtD8g2hw@N>j
zR+&WS*XA>x*44z(`Q})J<PvzXOAgVXh5geOLz}<Mee)Vn9`gdCL@-m)-`ASjOD-)Z
z`a4ImPy%A*M*4~{HPeNsP92qhR{zl+%5<7Pu-N=CNDw==OxrZ~j%H<q<lxgll*T8?
zTOMiDchUY7_Sm>O2^UnooDvHtGlzLQ4xI$LTwR*0@10sDBAr*T4})iN0?ZSa-sM;5
zhL#wee8&!*gmb%*$2Zn|s||RheCqbp!>)X}BOYr_my9$pf+!30xPiSQ7*6uxN_Rgn
zXFGUbUD6=(oa_`i`Oi~}iISesOmT2fE){z#`g=`quCJ~4mzX-CN(et5xEwWVz>;A#
zB6lm2y}@gw9c-yLIRyZ$nPjD>jPHfr3wTQ76v0RdfB~L%<HZQ;Et}(Gb-OM3WWVxL
z*P#y1ds<|cGlFLn_?!ae`A{w*mtd&7Rbr3`epF0&9B=)O*B@bg71JLm{T=dz6Crb%
zQo_T<d5t*YRytlnMqpF0@iefvP~Xy~pzr<>#CKqv1=-|`+#bzL8b`2@kM32cCUY7%
z#yR6Q?QnM{;l743*X}!SMMv;DP7ywW*mKNGa=03D7}=N4gIxBgsX2#{YYB}{k(B9S
zUSzQR`)%&pH$O~UQ|0>&*T)#d&h>N*jg>tjdEMPU$x$Z*bbg5PtU%ss1MLp*t>0_u
zBp?3=XgHNj=7J8jd+gshQL)+e8fKIEkK4z`*TSwnbgJy^tA2vLOk|I8Ri~mkGIzP0
z(w+teX|p|WQE5CYTg<U_6iCZMo_7CKt(qzOE{SuEII64gk#u9HA<R6Z)wz*u4eEE+
zK5&()S9OW(AG}*KAvE7;6yj3z-8C_M?yXzwkVXE#0uyu%(6Ce6`3w=!j!<4ZN|xr`
za`y1Dp*8#jM{&n>96xhyKCnMQ`KOC+o26hfdx7p_{~D`UHxc5BM~3NncA88+HM!iz
zG+ORYJ_6H)w{*&!595d87ql$1_uVI@wzjnNfZ&yp;xUB3YUH4=@;$eOJDZg4RmOEn
z7CL$7PyFz@lq?#sXSHD`&MuVrs{8`O{UdTy)O`WzULHi(Cgi}Sfn%i4PGW+^c%@{V
zUoRoGq%TMlgk=@uz27Z0Q8)&k$|Gn9a2>TGn!XK4eZFHE%R0Q=p*A5kCNHtNUE%dM
zjbX`$+jbBNHPy4IH?qg3_Z|Td#b^At^Tk1!hO_#n`fMq(EyZ6ty2oO`W*}0XDV5`t
zcurhVe|_@SLLzuTomFD#br|nc!n-pdb7PCT2Zbe;MbXo;rOt!mNtbV6`zOlUYHY(l
zcooX&S3GSxn>Jh$VlaL5Kn#P{Sy63!B2aSL<aw6gm~_#NM1D)+<5(fV{sWKrkjTa&
zKH#c4bEdaFp@!58z=i>SUKf!z)(We}IBhP(bPQt#J02>(c@d0KTB;;nspW8w19s-}
zGbBq|7OxO2_9OH38``#EcEtwLp*N~bXN|7P<~vJ<=vOGgpoACYiNPp!XB7TJpq&y;
z)tzuyvSC}w)`0fh8$)Xg)OmuUlVS-!KW=EzU*X_qUTIP^y;|!hYIcW8q^HB^2Zi3b
zC{IplC2MkS7yn%do%9&Dz#)~DepqTEwjZ*D77Mb$$IEA}_RrkwFPaJ6jFX(_d5809
zhk6n!SxW}Lt#kVkXa(MN#+MgspAC&a9d1xJQ_<P|z<I;MR=W<qH|oZa7+5#a>Q}d-
zG9*SUIhs<EMd5GF+m<{t43g7ND~MpkrtVe_-_b9+bqP4xTv)u=zG$w~*>NiEv!7Gb
z0^eX{8Dr?$-3NIzLu=*fn5jNS)XD(r_SQ%Eu0!X**rZ)rcOnBp-SwKCa8Arjw<1yQ
zJ+dI$V%qo~H?r7t7f|mu`%MZ?vd5IAfBvuH2J+GQCHCG!*i^Jy6MMHPHotV4koDH~
z1Z-Za_W*>8*pz?p`WA2F(72Oj=YA*3p*#HXqU1O?iow^FUTp4($mZ@$OUPL^gk=Kl
zL)0WBIi8Up6a35*UWTF+^G(MOA5QC7lx|JX7mt)_t9?IH)ll8yO=Xi5P;+xy=F-Hv
zq)Eb@qfQp0;l9+1Qq5_RAwwH36mE3m;GM5v-6wy`5dim=YHzHa(k-}+V;!T=lY#fG
zM0~0_)sA$2)6@YCJxY#V)Nk1XuKdMBK6Tg6XkqQQGazy?lsTD{t_LroPWn9`L;haB
zIW`Y3rf>U6rA>GwGh_@?kBJM1lKKMiXQ^Zto=8lsHV1+lMmgP{<vuSQD=F4r=;%~6
zG%<<$V5qlJp0uhk$t_6ekt2;b*O9+mDSW1gSltfQ_w{Dq9}0>Zlio&W_s~KnRu5uj
zIZ`^}5>A|$cC*6PoC><eGelS%79+RSLA$6LWJ1^d6?xOXHdM(MpDI_HRWUC~A`q+m
zjLR=vP}75Rr4<N)Y?34OM8xKL_<;KQ+EBCkPid)u;BV^#ar(S>yK63qlWqj)-6yrY
z53H}y(=o}?nmVwT27C`y(=*Y5_Uqs(UnZ(vn7hPLuJ!}<JroTK#0w9QgP)j^;X~F=
zOm<pq*TR@nZdwt)kao3-u1>kdI2&j!@Cdc@!(i&8J>jP#tNyd#P>zC9eSC*ahe*%|
z`&;%M;w{Oh-clvW>r0;Z(}08O&vtqj{iI*<<~{$sZbU0XR=}tbbk?N?L?>d6D!9_C
zw#(C^-mPhs6J!)Q1#=5-0WK`omyx+!d2V%5zSo~NEDhxh)DuX>of{X^np2HIOKGRu
z2?{hG4e)mLHGHg+%PTo|%EI#?eF?LM0&l7MA2xfR+ATkCKe*%Ur0?sR)<4i66Kh%|
zW{N0qAYSEy4a&01RpgkD>6QG<_an}aRoT8>V(IA+>?545kydg>50yqxMw-RxZ19cg
z8E39KM&^3~VR8F}*tj%Dip+I!-PSW{BSMWXU!4v<p`9yG{$N5nOIgi<fbG~MBlrZ=
zW1cU5k0xQo=TurjyBre;!aGLOpiOHqwmW<}STi=8iYEEiqt39{*tFcLZ8JerP$);~
zXl^Qv!Q(_0@y6b-M7cU-LD#~NEp$c0<XI}#0~aBRY{vk@*3Rr!vy0MUA`n#)ayDnV
zk|kAPo6#n?2>xwmn+3)s?=Az``eNaYb#}xLSKZr|hS|j7Qa#rPL8=BtPhI1dTEv{>
z1RgxZKA=0H2OtGTL!n8|4&lC}T;rgZC87)^`NP~1yS?7YMblT!Iz+JbpZZz1uM!!O
zv*sXEyVDgmJX@mD1=Hq59FL92eRUj$QkL-n)iUx~=4$O^3!4&su0cn?{8^swq5(O)
zL^Z1QcjI+3izA)yks4luSB5H!Gqb<!M{1Ck5^GU;i1@*GzbDQCs#ZIR&;-9fT*S*y
z46gB%K8%#Dc+BwlD2g8Z{xzAJ!_<2+Fzjj*F#Y+r*Zc1G<)y)l%nV&DsY|2+mydf3
zYRer0DDy(MwU>@sqzUSGCI_2^Ylo$W(1CmSm8ig>MXIvSTgK~G+rO#qb*L$?Z3|x)
zLTrWm*go8-`l&O0SBRI{q15^74d9I$DzHAsv%!YjpvACGkPX%9Msi<v5%lOtXrAq4
zPoJp&5arE;Yce8FG)8pH_IZ>u)Ejm*TnNZAibq}_>)GAykFG!5)_y`*PA-5>`9`X;
zXXB0S2jXvw%`zSF=(1uhOM6F(gMsqvT2{FTHun@utdpTv0aShC=~tf*6I#pP6;89f
z?>mjnypCzg`_3`+jU^Q`1^uLOIBcSWQnKopD2Z=XHgQWlk-L3vNwW5&tw25}yPw!v
zu6trMEgwrhvq5LAG?xWRWnZyC7;R0^mF~%VBoE@b;nArsJ33bzX-H2XIKd!dm)T6q
zSA_H~FD7Sg;n5VR*(Zf*Vb%^~Hw86ZYCOR*`CGkV(<~r+-(}pe@mn>X!a_X@W|`nr
ziMML$MxNQJJ|4GS`f})R54nLqrkuY`oy;+m#5e?(>8zTNe>kg`VybnK4jnpK*UK=_
zgB?LS0~OmeOc=M;$}4gf82C~5dadp5Js4Nn0ac{w7TBP-Hwas0R-?h_4vdvH+D6RD
zCvio~`knR<g?DM|c|!GEF3yxeH_Ej2AP6&B<T;n<4$U>$k<p14XNe1X2^lNrbUy)N
zr(RCea3dra&vAJGyCf-%W*E0b?~YEJbK%{_(h5|}kbrME?qOKWGLftQ{QELweFQY_
z^w~E5PY?z)QUJpgD;0R4M((q6?wk5_iHK{dmL)d-*x67I#jmrL;Li$l$4tmc$}3DR
zHVlOhz+#TcI+el>3Tw+fwU^E%1Li}!tIY~OB)%U}K1<K`n;$vv?>xFB53!q-ew$u&
zDWFf@#|Q)unyg?HD&LK)I^@5bG|-E7z<p~r^BoB1$DLO6<g}v+kQ@a++3|7VF+}TF
zZol%MdADY;5VImocY9WRAn43tf<eRL>8zXIvmP5W=%YXT&WG@foS`+$a;;}vNow9L
zp{-0~mv-O2E@E!KH|O?IJSJ=KoQl~+MoA^(tMbj(J{iiX7$QC!z_R^Sf@4_7?+~`L
z+Pi5te*@xBa-PG!6s(|ew4JyxRwowVQT?KXD&G32Ybws9xMBA^UE>J%G-S<rc`yAI
z89SgkR5<AkdaNZ=sU`b}?oRt1n=b;|CFmCcSvA)mcRH1n(bUL!U;FX07RMv)bI*OB
z%B#1a0sBrCn%(t8EuH`UmWRqM0|@ub+6b1gR-X&t89Th*-EiaXhnZT(tLz5IK241C
zel*K!dT;AAp&->}BUV%Sl~%P=?Y)hI>Re^dJ3aQ=BAuj$gX^5S?oO#<#NqjMWpXul
zy#GviGj9AN#oj2I!dvYp+dMXP4bHcd@=2KSg%Y(}gHPI;08d(5v$S)YJw0YY1a9nd
zL4;*I-ud0c&di&>nk;hpkbf`X@C!+S+%C&0`j+%hS*Izq?MK7YPL;DW_viDARgS#l
z%d+w|6O$(J0lDd%^X6*rn}ojfC{su?TCg*Ri+&-=Mk~Dk9Az_x#jDtfJpMfe-2Cy%
zyN#uZt3!b-VZUoha?19V^0i6z@tVbmEBe&C%Wnbc2IjiSk8(|6-hpZ~@~|n|qWSx5
zRjb3Mhe6j38DE^C=nVd3%nBDGG?hE@ZAa`9fg(jC&p}+u@DsTxkNmdc3A6Y!7T_U?
zE9$v%W)>M?VH#OZIEWASq{!n%me>R+LE5r1ulaTz!HuX!=&K1`J6xU29(Nw48&2tE
zFJ+Uu^O#wOZ>d5J<Ms%51Cg5b_%Uw=Bzs(Ua6<*CSI->MZkS+oKFFO-Pk~$*x*#q1
zfcRQG>#_X(E8#mpQe?XRyq3uzD}-Np^<5#t-tWuDDEf0rPrsk#K4Zh{?)X#xAQozI
z$SPLl&nnqJ39V<rS${V(v8Yoml=Dozn#ms_&zV^8f#l~OyKlc?p2zLrScE(HNgoRw
z0+1mKuIuy`-nLxdZlXMe<!H4&Is^Pv>dxCc#4V`|Y+5%->1FCznwcu2h1QBBCN96b
z#13ks-Aiy)>5`tmqIKgVcExQ@wxMywSY;y%FIIwZN2DDFW}8T{p`7hnb%S3&x#+xy
zRdrn5F_TYQ(MBcQx+m)!ocFk?;J~dRr$DOa=)#qiQ2A1v`!=SA0*OsIoy6HDxX{IE
z57HsXok!j}ysm@hg*(?`%Vc$uc-wD!3Ak0c1l66(d+~mU;}SV#<4VLhu$2aiED&9B
zEZr=-Vk~A}4-pM-s%)gv3)(G^fSvt&N3fV5M6RD6H>wgVtjhUZrg5yJ@1G$_9{1KE
zF;6u%0ZB*xvPad?$J3cqCzakvOZ0Fz{q7W#Gn*UdYx~_`&%4?ER@+mdw_P=7QBVN&
z8+A+O$KCgy7_4FUglb2a@@EBaULKDs`J_WyR^s;Ce~RF1K?^m_X(SluK3*j5p8j?e
zE#-&bdglB}eM#tWz6G*67Ad7fb%CA(G8FBl+#WL+lNG)C9_~C-{JD=NEn7K+S}xnO
zW)d<P-a{@nTVRSUaC3ZX{k6{SM8Tp$4GXL3>j5upU(F8w4d8=YQY)R*?w$zbU+hZ4
zlUAjC?;LTMA*l0tj?_-$5AL#%<|L>OnJ`NIMyB-&#!h=Oq8kcturTifpgn&+aS<Ey
z#9&w7d<f^$C5L^7yZaew<KRKl*TnolCoQl^F7P7zv$LD@Xy8)gK8|;Au9AE6Rhq9$
z>N<3kot(N!N-VATpjyoDTIDua?o@1RNtYl#A}I@XHyIps6ZF*Nkvxf1aNK;Mn#CFP
zfdbgWuS~kUbj~tpjTV(+qojV>9&k-}3t8}Ffv+6NkdP~B=kx8xhmWa4l>Xmo2iO`u
z?nOvVzwVh9n(K6=P&$<-Xv+u~y*E#neYAc>=fFcwcYe*<<sy4x&oYiX4R|YP_puA$
z^EAuV-uB)lr!9zP;~RSfif>BM?U+*OVstqGy4rfb89rWGLGH16BkEJ(P%=l%x)^tf
z&sn|!XX?b2)7&4U7-NtxKT3L;F{3Seu!!vWh^ij!Ad|U!EScQc)RoxD8<j8f7$fAX
z?A_7m@ZS4H>0?e2ZcowVD87~0_{b-`ua*tr(RDF?;TI~|W2G-jv|JmnF?_;ZuI$)h
zWHe(p=}}ydS28R$AGHZ%8bL38>*zfxTbA8-kD!}4e7LX#tGbJl5J)t2A4`I@d21+%
zpHDFa3L<VQPr{>NW2<RTi9@@-<ZvFx3v#U0GqQk$b|5m+dQLew33L0x&h|W0JM`+_
z@6CqtM+k@KO<txei`LJFYS64)d?YJXR%#sXuYNa!<l`Jx?W{474FhsTyj;=}UrARX
zDmrV=;?oUm=beyG4A|wT@-jcjbjuPd#z4lx0u%#2eqNH}SDK8F(Vs=`zN>0_md7GZ
zfpRupkOIL23fu;C8z&_qzvS-NSzAHSBmg#WCL6lm7zqwK|M~ixH#b6VWV9%LJI7M|
zY9!cER}A*4zW0K;S`7_M$POYXC!pn8U|KG;{eW|<!=S#yVa3Vb(2mtqcl`TUl~86O
zW6}2yw6S)VKZ)`N(LX$Q^{1rw(NtpBo5X|kpY9+k_w~A^G<mE)fH(0#25{6CreEG&
zxGOKj_H-rdszbpjdu`|ir#-9XqBJjLV1VV?_<b%jBY*kSTZbYdSxr4YZBs&6UE1%X
zmc~=#5QGD3uwNFKdJGItK&;-0UEnQjtz>hEagyrSXU-07TAw;vy8>a#90k?wJ_KG^
z$Jh1D;*Mz9^z8W8kzu_9{xE=GC)?ho9>Kv^8o?ulQ;DCSH`e%@$}at03e&tyUk1vS
zlRC*P_Qx^*6UHZfHt|de3iq7{wO@jr-TA$f5~Dk7(iU1;yFY=H_*ml`7M!J6Mvw;e
z#U}wrHvGb2X+uVB(>`i=4Hds`CQjj{Qv*!^h<f}=TG2WT-e{>IXugGPTBzUZh<Zh{
z^z$}y%_@!GOr@ivlXb$1%Q@0|uSTVm@Ooc;MYmdhqv7@Jvrmp&oc<8%P>?1oG5Xxf
zO;5#}l6J;K0q-+M%WM1=P;7}YbM=8uUVX6ZLjcC`!Dwndpj{m^R`t+Swgfh|jnyBk
z&b@J2eE_^0^2k?Y(Z0@iqF=8VI|)-cQZwF9*EiX2&MGTc#KO4+wQ!7gBqB}q4!`bJ
z6-+R(44Y(j97;I6CpT`x?kc{ygHP9b(;-sY%h%PBH(t!-hpzO4I3{jcY<3^mRg{=s
zHv2vxHSQaM@to+*x1~Fv^<6NoNuoaUg((Kqqlosv+V)5i1w|<>_dVAKA_WdXUiK^I
z(?eg%c6&5yWcAwQGiKbUVmY-#$heV*AwW{CGKTl^I!qqEEHKj_Do@WcA$<*1&H0^{
zEn0%19~pAWK@?S178!ptr{}&r9f1hq4`^%}^}aDq;n)q#?$&#rtX3|ePdzKyCwKM{
z7|x9C(6)d(PJmWj?IxQJM|tAzY%ffO8GylqlDDViv#5GIB5}B^Jm_=TVZWK7nWe`7
zLzgRGuOF~oH7>;)l~OMJ?rB@yJ#EC|c^78?2fj69nzG1d(jXbai0-NA8i>wrc?z>@
zG0aRAZc$h|6Yo_Ncu=!-=Ov3t$C!WJTzrfC-K0eEinSoBh=6W^>bP1_(>Cd`!!~*U
zVCff(8I9W%Bu;p-f-K!*YsX^ZcHWZ3c5HMBd@H~ij<r-?9GvNoEsnJ{;1N)_$`_Ak
ztIm-37aD^WR`Eq?X9(mH+xRtlk{Ivz``&Q7i9{n$zkWyYHv5KD<fS$nLlA0Wdw;9~
z%|+=p;{566DV$Bi;%$@^9VNi=BD|5`=diG5#dRFd`Od#J(Y#1(+MMp?z|mO`OVV?H
zH>gh^OYyDq@Z7bQ=tGc};_86H9_6^J!&Eo~K1tnF28_1|7?qf`+!IdAjp6RzkrFSB
zv0M+|T7Pc4Mo5&u(3j#pwSC+4Go6h;PvU4!a41DV9Aec5tZs76eTFWmL4Nm)In%GB
ziNN6od5n&hRc2mZvHv!TaM)rjEK)KQyJIX|OgOU)Do4(5T)MWW^+diqAV@k8YpNt+
zbYorbNvbQDmr`kDX}6$Onqz?y(BmQU2nrszwuO8=y2`Xa&<b9+lHFZ&zq`E@2IbWA
zp*SMswPkwl5&&OVluZA{1rX0HHBjR(<aX*%XX&ml>7C3&0SP!VY#INC{k_zoWpdh)
z@djVT1Wos)BO3aiOd^{~Bg!v9qTyI|!y38djCCje9rYg=oi`UfhV@sHZTH&^DhKDx
zEgMZ^iCkwti|S(s7x}SnIR@<U-6<Rv`d<&fpyMe?*QU!&ldCaQJz2BT*$}@5aV+()
zIbrluSq5LIt+`mIVZ8wZ16*Edv1j=7trpun&`gCw;ud=Y$e!-D_cPnFs93k2-cJ=)
zceNLCvCI3pJ-x#4rrcAW4q^0cbmbn-!azK3t7&!E&lCo)ED(O03GAUtvS$U34bBJ`
z6gQ*~A4Of5ASV*i#r1b;ZS&Wdvhc8)K@K~|J)Q_QNsi%LH9Lo^w6SgU88L<WHF1=N
zRBE?|p*G)w2>cR<p{oa|TAE!Y&=9u?Xj*e9)a;_Ah+}xrD5h&7FsPcFcf!-}1>ONO
zVamDbq8282ZD`tAx59G${X4-iVd9K+A&-M_ajl|zfO4VtOML0Oq6uJY+-6lr0(?Tp
z_TuhnMSEj}<FzzDlPa7A)~zsY@}qF<*y|29<BoPb+dWd%>I(Gmh#l*$23v0cRRY=<
zdQZKs^{y%~eHGbYlg_ap_{~^qc5n@?7GPt7e~q7}rW|Gj%|Wd$ha%!m!mC&D_Yc^&
zWs?K%RG)r5{1Rapd$u0o4`a{oM>rOKAix>j^0o&?h&yr&;yv&+sXX-S$1N9%c56Yi
zitB!uM(0Wl=$297hHev)ttt?H4jv$YPsL1v;Ts<zO)6(sv(KJVVsR!NtX(NsENcv`
z-+kzSiI)l;B`W_o(Io8(vQWG)uVc_E!Z5}<yVL@bMr3z1M;6?P1-($(*v>p)Q>jJy
zMTOJ<ZoY1WG#itYyS_4?X*%Ak>oT(jg(H>o8Cy+}i_7-J@6uJW*$NQO{fs;JC6uYX
zvn`4UFfSD45rrM^a{=8%S^iG;OKbK%I}&3J*OcRz0Dgems)+?)6O$agbP=Aqo4-Im
z+0*pVd$`NInTDnpI#pK7-XF4?kf+e{T#%o-Ct$H%g!IDF?X7W-hnCCm{m=2z4fk(Y
z^+@7%7=WRP+&{>L=EH9%3kSNA4WRkYo4o7vMb-tq1GK>wjSnS2%U3i+pV@bxwKQDl
zX@j-hMw^s*G_4ym*MH0?ek;cZ<QGSWA?fWm0gN|+!D=dwrD#Nr;aEwSn&sYFW0aSU
z+l82CZjFWzC02O7N~dA0y#wmmVfmaZrbLz~Bj4lh_FC<0l5rHrNF1P~^P5yX>2y=F
zM=WDc=S6$>4ewy<k){RHqzTwV!&C|F_4%{-L9mk;ig$<OE!h4uxzz#>0&YGvqDkkm
zm)$hh7*L(}Wom+Toxoo_T|Mp&E;*bN;Ws9nj_qoCYHVBFvsjacimZ7_;~_r3rPgrv
z`soPO1~|CXt0t-3*`g3|p$ll!E>`c7gg1FP9Hw<-G)_^Oys-Lw{C3cxtJX+8t=K4Q
zdVZ{@bW~pdx6@;~PBe2KEAu#R#F6d9wpKOD^|deibS{fEspTRc`e(HF_8?7lA+Has
z{idTt$Y`FOl6D9`OF(JP7FB&Is7}rkPtP7`Q^O&&Ycb$7$@b=>LXF0W&8B2t;J2(o
z(Z1Q?7K99>c%dcnz2B<pB7{>k=!brq0z85m9DcPv&?4~bz?r!*f~h{)AWx0X@uV9%
z4Jlb(HVmyUC4D+FsaKaU1C{%d<e&%{-IA@zDgPh7Ew_u!q8y<vg#wpz#xka5n+yl!
zT<e5Wr@TX_B4zJB#N){(Jf&&c+u<mW5l9Sivt$?=+k=z>H$Na(uZYmiM7I+4;Kk1q
zC|i6RMv{>a64QkY#scB_#S=vfrCog=kkk2UZv8{PjmD*jrv+^q8v&ulR);0ZDEkl*
zrJ+Cq+2#-Xfw7NEo8(v7sIi=V%69DUvAC?I`T%8VC~WjV#^^4%yrk*tZG>Z-YT)4t
z$pC@@SfLJt>>m91m~`quvVQ<M!uwUe&jNkV{OpBeeq<T#Ig+O5h{wl>-vggt8I;Q!
z*ZikcWfP?Ir^jl!nSF*#3RUUe>0I5+c|N%x&U3xx#w|&vgpAvkGjVw3uMKdBH0NYd
zB3%AH)1Agg0@S3!>h&F^JD!7j_F=vr<HC!;*80cSTO5Og6XTa1Dk;qM?=C7-hUJ~6
z_P-KQKzL>R5GHl`=8NEk#gVwuig+)^RrGFYe?82UqUD5thlWe6yi>D5^-lZJpe@BL
z#iqw~-SeXtzDKWJ5E|FErl529;x0?%DU`6Y7|HQcZ7@quo9`c%mAgC-chr4yF5`pR
zB6<=!*@9*<XyEoQkuxsSmkzk64AUR?h$mIN@L0*l#VNuW;eKn@@06~nUG=Y7!*|_0
zEOHYN-!IWB<ga!b99?X#K-oBtr(rb!t8t}*`a=Zvv`GWHjQv6&$MBbjA{Yyy^>F$&
zN=R~2qha<Ved+21<y`}t;CoIDJoj16bFP%=0VBAvk5}@=N@K&1!mgOq+pVZ}Q%}S!
z8d+k`O9$HNX8Jd6lzWR*Rjm7ql+-=Ay0BwBQPLOds}1)O0oBbPF%VENQ_${vB-|gC
zga~-eI0|@;i%s;M*H{d<F`fCC)ZsX01;%yW96q>(4LNh_tg5os2o|wiRV^XvuiukM
zcxhjfIMhc>8#OV{3}2+(wY3eYZ)wzexrxv+VxTw6Q_D7wI)YapibZS$C0~Oypo9iU
z76{qPZ06>5=0iK^Md>^UCPBrR%yhzE`}GYC(U!CL&UBG8Y`UPk)7DRI$88M+O0Ph6
zt)Sg@`P@&9Vq=zfbvFiMu7-Im&9OM%F5R>d&ksQJKHhtGF^xV=O6^hk<os;xnO)41
zzuWvFn<$^Lyk(Ie))EHkAev~mayU*h-+Ef5M8f$c+m29RFc@VPhjg&ldp&!Xy%s$o
zY?IY#TAf4frE73-3dTf{Ig?MI1Q})*t5~ZEYv}Ao7SU?{5F84L%_La|>qAS^xn;vi
zFXgRwJAtxap0*!vqk8*foYI2aANidpPlCD<FT(cw$W4ju-@9p)8UO5t%vCV>xs0=P
zU!uwSkx~q<64VED>+XEd)HD^-6g1j@C0=C01_^YYq;a$;2(a8p!Mv~()^#r}r+9N<
z8vP+JIRg^a4SxgOZC;Zcc%(Yw&E|{SZqD8Xt{iarR|`54Y;3RAlN!>`pJ_?V?rFD;
zyKH$YK5<jvs5`Uhr6rZ^nMNvB1EA&&AG%kS&krA&$c<l^J2%Z{vH>II*|@Lq9tqc(
zG%k*tR36MH%^_K^S|jPHCbdqlAKpnNxu8ui)V(=6Xs&d;q|{3L_If)F#9lSh&k+=>
zsiNza5%~Fu!0;riLBY+Z${QI1-Vp|qr2J|}BbFbR*q_^xDBiw2514&eoW!|3zWMcH
zQ1<2&Ys5=;AxDwY%x^eZ5&UWX3LfDPomEG(mB=Te{`<0ic8C1k5+bpWr`+_b9bON6
zCPT`ccNJxJJsahs+h}<ta2F<DG%P<xnX_*ZF3NW%)+o@(G(HGhqKsF8#k(%}St<*t
zaUp{jf86PN<SiKHGwHT;d$>lTRC_dbi2(iRA~ME$G3OB$VOJXYvuXw?%_F(}Sg&!-
zshD5z!XUGHttepAL6(rM3>%dH$zfp{A2)SbW+-QI`mRK+y2}q*tR~oU{D?)_$58iz
z8vgJsR>$6TLyS#_H~UHF`hnLE^v|uwBxW<!0eUCU0w&6)z+Y@fu1V|Lp6{Ic&YLaY
z@9}ai(&G+4thljVW>uQIrFX)7oEt7IqI*I)hRlx^-f~Yol11=+^@>zpPmBdhBT(tD
z4P-UDO^;q(UD9Dt^zE#gIu%!3XPI6}F8#*jL5P;fQQPXrg(Vxs&hljH6{azR()FfZ
z{(1~vIrTN}=vf1k-=1&Q_=)0=_vMAShMplbZGhr--OouBlbMh(Rm0`XvvH>_!>U_B
zL^jFJJtRS-`utb)JaAH+{?qSX{wsxd%?VLWQ<$$N%32Ft>=%)h*mOaRJO{F}sVFw0
zic=72DHjJ2*t@G!_hf(8_vp|yml`d^$0S%=vi1Pi^<NB4&F`-G?5yyGddQHuozr%3
zTOoe-u<JG%uH*usYqOMNrb&Y%0g4fWdUcWPpULfS7G3~$m}Q<(Rjf1zvb#f)3V`)7
zpVLc!+<Wc>6Js~XPR!vOx{X6+>Mf{uN9cH6UYWo^<tOY2*1`1?x$bwS6S$9D1FQ%`
zQ+jzyBACcljDe0r+*U;^H#K+7_>_kNwvkUG&90jz25P@Q3TQHz6@wW&`j@<yoKrQd
zw)ejr$}yE%2C6YxT^)Q`qEXTCNM%K`qw^9?@Fi)8y!Sj@qR78drCYgc@&y+$qOO~>
z&OMi3Wb0y9TUx#J_@GC=F*`L~nQK4MB*noZ4A3A>c5}8z?h#vRL2G=<sx|gx0{-W5
z0<eg>s@0a_Nr2)<kEHg>Mru}}I=028&f>uo`wq>p%d>PV0U{CghuGzxU)$YML`!pg
zdcyTA<rnJ4P4&E&^UVsVal=V3ri5^3u!j|#r5J?>?rqQK7T(6PjmjS4_9W@H7zc}F
z^AffNfU>X9d;hgZ2XaI6hqiLl)NK8<bPg{W<2ep?dpU@Veq}Z3ua8W|Ojo;+LW>-C
zOPO%<VZPXIZQCO3$s<)RIhr}-9oK1pT4}Z<$;+N0)x99+r(<h}OOJP{$K56zp`}1^
zEbU@t4!4T&z!v?0<BRVyPt&=}4?m{fFZE0oSNT_^m(|ycm*Nqh#l*!Ox)ScGYH97t
zm~IRQHk$590(w&38-2Tnju)=9v9+CYN}IYH>4m%R$T55#OH3>F$T_t0m0cjBrN%4m
z`v-EH%zV;7)9LHom4_*5{j+UFAYdhd*%7^xaF}A$If^`=Gmm&gk$2`w`EZ|Z-IKO2
zxHTd`jTqU6dnp8jaATA^aq*E0qnurg7UDYOPU7Hnh1zC}@?TH_s~f-I|5r-+t^Zs5
zE0riL1@Ucv!^2OrU5s0u^=I6vRmA>?wR-W_c9A{5;oJ9_y6x{&N=O(P$VK^Obp5ga
z(<E6(hV#>raZ9ClbbLwoi0(xTYfF^<238FJOnZH9TQx&PeqVyzKUfm+Vv{0x#&6+=
z3i*$kpD@kfp66IT`+f|1`bfy7TK`rEJaqeiqR_}Q3VL>9#tAy?Y`NN7m&mu>!0D*#
zSy<{`as^azzj`4kw9jSvFOIk76Xd73r%<MM{CrH2mW-LZaB1|IUijAun&OpwqHdj6
z3@U`ZqxS<oUDwv=&VS_zvJGD$!}|O&S0#TB;4X!em*vsC=0DO7oWIpuVwiUEVsK|_
zwiwU=dOx{z?8?@setWX`SSe8MH8Ni|;QtGd@!uBM@AAxe9f!+56Nf3}D|}#_+%1zE
z^wXLDo;qv~xhXBeQ+3Y&zaAw4c~(xSmg?_!_G_(L$TWpcE=~6T#KCs0?=&0lo?!A!
zjUwXX_Agimv&%_2p))B7XO7+EWJ9wNk^0xH|M7hsFLwXekSiKwG@fF^^X)&1;s5pf
zKi}+{BKfMz)L#Gm>%Y17|NYh93-kXL@V|xh|B1!_|HY!2wxW&tcZK{bsFywG;pMfu
zG22QQpFYYR9yVZ?_0!|iO509}PDv@+-uAG0@xrbn=2nuFCp1M9Km&6<_s=@)zqHUY
zC%J})&=&niZ(>@(-oC!fnkhduXT)K3kyWkAXWm<af*NE(N*4LRM!;I0X6h&Xbu5_F
zK+P_dV`vG|UrGnV@6^sv)R~pgVp?bZgOand`<0G10h=7h>4r2lx4b^9udAC~QgX)z
z003_NY*$rP{nR?!n{dxs)N9QM$vg!nfl?*im7HqEb$5P5b3+RYbwQw}4<9~wO!+QR
z5zG4@{0B|`<QGKw3a-8ncx;f>Q%Vc)p=Z-phd@VXC$8(rR?yQywn(AYb^g0=@XT6}
zi^1KAm4Q6jAQw7b^``~~aV)H?_yZgg{q;TFFUqI0km+*qIVWdrUDG_a9(o%<?l(V{
zV@EZA3+rE>tP;os2NGR(&P^VtX$c8?#Xz|`7bfHvjOvkGVnc4_wzs#ZL7o<0yAKq<
zkA5~?bal2Ul;ILUFxGGDr;3&@&|a_b4v_UuiwhA9Q(^VeJ6n(Czc~;BHqTlMB52fA
zsx$;1#-#bK+lYx)L0hZV+-&R!kKH}yw~+bw-7{FIFO}20*VHGi#uL!z+Z!&Ibm3Do
zJ|#2pBS%9WB>ydi&WWJFE6hF96}tnM3(g#uuWJ@3fs%tD;?Bw^wL5(=w{&AZec}>0
z*JDCGlyvfr%!xaVfdWr^_@x66e2}f+H2pj=-H9ln&tr93k)y#gMMvI)2Fojl5EF6t
z6Sg71(LyrIV$s;${D=sHAw5I>n({8nFH{N*&oKBvRPiCA@TpB<Q^+Or`gi31Zs-23
z84t>&BfARAYxc+KubAT~*xA{~5MV@)?5-K|Q~uGl`=r}0<sM@fVsJvK4zff}b93{w
z`a_YfZ#t+~F|KU}K+{RNp+;0@vk+2cX?bhzU?xy~sLFn+rv7ZpX|3*|i4_n{FghK6
z#-AZgbyXafETS2@!7_SW)PLU`86--I>4ja(*ug&tRil1ToTX;l@Q|06x1{6K-0q?T
zoUXvzR#MCrjm{K7w2Q0smjp^1xeCLLD{b+)9Y>OUHdz%K8dT3<kYr=*n(2H=@!0e9
zGu`^o(CS5jv@$X8NgVWCqDuEvuu8+7f$f;GMvJu_WlR6Q+j)QH3;)J5-@Q#H@MUF;
z57In7ruEUxV1cfb$8r>(Rkz8PK@)0N%>$Pm+Ful-O{61YlDK2i>guXT-(x1<I1N}l
zYoiAo-uNt*gV+K_KMmDQP3=$7DjodtkXQw95_@~L3=$dX&sddv3XG8}n$RgGedn_A
z6fZ32HU~w%CNHQL_NL@Ny0w2z>qZFKSAFlAy3BJ-Vcxw-K}AKCmN=fPp2(FqFe*fb
zBt@9ExEQ1wOrE9Th#86#do=OX@zy?W8|J@=?>(>=<Gc|0M(u<2<#i)mxszkpt%e70
z?G5%!Rn00pJqvF}^~r;%^q8!<zBAZb7ll9n_cPkIAbWdL<F35NCp1Tyl$;zJ8@q7c
zs4`9zgYAY6TnMQgD;rylSE%jb#T*W#<L3%X3*p~bJr>ow_4*){G0EZ&$YMwi4Q%Kg
zrn+P*vBN=4$O1UG%a0po^*>ifJ7gxaPGLpSKg(O8k`D4t{mL}Ukx2PcQC)zcPW56>
z@^vDc+fIL~pr>EneyxQxv&DN4Xr>8L-Z^-c7umaZb(pJor&!l>2s~V}WZBz7uonJ2
zbhT35+-1S6J6&GOcV}f@ia28EoxFoM$l7V#gW4B<8;DCOs4rXQ7ra?#vTrXtdFl>N
za*OvccA!)MTpB-ZudN(<(h~yQfu;A)ofes+W~ma0`m^WH-)iw1M^GBPFCvel<BucC
zk0*kx+agvb+>x;iW#YD734xr^`g!`^etz{+pxsG1lqKoFt9V+cAj(Hvs~83?n4-%(
zx>Uz8RWui)DO=-N$p1*Qt2c?J%V0|y(MJf6rR@<jW*-`ZL!?}a?%<yZCfi4<Uu5ey
zMeIk28-yTlF3DP$mupO!2z%tML?SMD4_L_hpltO+w>zcUKIYj*@>e@+udF%)M_)Q`
zm=R5zu)xU@OuaYohV+1m28_S6#-XQQ+H?F%qBg~t1AgSScVT9|_<cJq=mQ2*iRDD5
zxRnN=D)HGUs%&-iczpD`R=5`2JaW$W#qZgDav1kf=Oj?6^gSJ)!`es?(X$Ua?$9dY
zZ^W504y^$?e!W(k#_xG1xL&8fwR1m0@_Q)f@-unDTt>v^B+I*}S}t;RJp}$qFXfzT
zwY>xU64RNOA;+mM3;a-V(>S7}feZ~BH66#TjY~Nq&#8IS1YcxazKdEaH`i#nr1S3u
z{ZdAA^P!FP32BX?KL(xRc3B;~#ly$vZ~K}xpKQ7Oip7hn{hI2~+nmW<U1M?D8ChnA
zG(#L>VOeQ5?rl@0Gg*a`Xpi(&_zj0$omBYIAUYa0&eio2b$Cf2&#iNQ>rDbat5gsv
zpW7Wv6)iyB-aVA$eEVblb|EZgZM0gJ0jxtDz2M4r+$8-iW@Ni{*~)$}P$B2SaTg%x
z+(%XkCxtjgs@?M7*<X`{aSXD~@-f{WezbdAC#ijU_bX`3$bwEM>t(l}xny5v%FK<I
z*V_)Id))5~&3#*0br4pIUZ=L)(M>{lB<4cZ$UBz*KHn(Vq-M$ePLoR5fL6Xe^7EKE
zYxS_b)B8Bk8e8i9dk>Zprn_kLjua;u-MSO9he!v;=1JU5+XKo~kbd#Bh)Kdc+{T2>
z*;1OuZai*slHg!NA1`P)8mqhAQ;8VdfwIIFSrk6MD6+c9s;gAa2%dZ1L?p70(Q#O!
zHd3bSE$NL2Vh;Lj{~b5{E@OW!OGYG_A_h+zHE;}h5EOl5#zSgobo5qyCqx9$v+e&h
zML!Q;_DfG;hL0@FYeolD<IS*SR=U-c{Y+msGRd9Qo^g<^g<1X=<|L07Ou)XZ=XEq5
zo-}U+jG(4WacANTF$JX2Z#=?7%L*tCx^qk{PiuS@1o^2vay7=m=IjRg<>D`olD0r~
zxVU0nTypvVwW%1`Z-rgZn9<U5d{;JaBd&;-ae6<Bv3pyosrzP1!G73y?5DUZ!+Gls
zry+$^PNOo|B3I73r`}-K*DuZ20xAB3!MGGfHW;TU)nLbDR)On6PHyh%&-Tx0R<NK|
z1j9K1>=|qb-F*)}UVvdIry}Kj1a7U>o_}9CtQda%au4`<p7fV5dCFS(1N85f;#Zyw
zRV8npl^XDUQd&hY#mgI_YoxvTzf}jkv<`*Q+uyB1%EcHF{p_ZbkIn=mzuEHMCnt{N
zMdGgAFHoqNSi2Zpsp+9Puu!Mt_!_~OcI=%TlWAs|ARl-GXQM^mm1FkhRddui^(0Z1
zwn$Et<Wh==mB^Q0#yIWQzH5M}Cl{FM|KM<k`J=_V<w=D}lI0p&G6ZhZ9|<)K0@O~m
zP6qEx_o^GRxMY9|J4<F_0wv9GD?TX?;hvc<Gj%!tLwf#uXDwU)iX%{;$BqpNdc*kS
z|6}hh!=hT(fMG?DQc#glQYmTa4n^sZ?odj)y95*rq(fprB!?KJyF}?ufuWlLhVEg$
z#Xfs)!7ZMBzF+TqUGE>RwPu*L?&t33u18*8O-Bcmt<MQ#bz1)JMH*Z)mMk7jFFane
zX2KFH5d-8I*b9wHEa{7a%q%Mr??M?EO2r5dY2Urme%3cPXShq|&w?+uVp(5%4mNzA
z(stE&cN00)CySmT<^_~>40ZN8jXE>&Ad>DA2Y%6|0}jqs$ps8ZNo4Wx5@N2aGIG2t
z{saBJu2^qfqRz~WF->%HEZ$x@o4VeK7i?Hq5pi+E`=Oyp%MMyZnr)sdV?AR_qIF`D
zKWXMuzEQ|Wlw#|4JO|XDPR|el>axPZ!Xl!h)6>#uWD^92*eRjF&c+ZZs|5Bm4M5cs
z+7}H+ElYLFZ6ot>q)C-q6c*MTOFv;0ld=~Jji9}pTzHY8sl>vE0&CBp?>Z*=J?$3{
z*>V*_kM|QC-#T_wsvj<W=&DNfH#yEYpk|LC%(FNA$(){slL(M}>ITP8(Pyw$`w>(9
zfmwTd`yU(3_;?ceYfxY(<VJdB9@p2tVl;s-$0X~0wdIQ2(jmXa1G8J2)stG~J^f%O
zcK%p)>c^(0bW5!)RY7fwEu5h2BIm+MqpJR5iEpMmZ9-|Jy$%{a%6L6b-dAs0M;^>s
zrnVGb{Zv)0>Ajcbpkr#=bj3Mu$5B%ubkRcgc>uqYIU>!%veYv)Kc|>4PI<qc$<21-
zMvfL6dm-bWfx%M?`rBu{qI7X&aIwBHz~QILIQ=JR@p9=M{BVK(zP=_YE%tg1Eo<LN
z;3$F<H=kMowzQ;d=$n`Ac39|0)>EzOel^FfI#ViqPWO}YX54C?fq0)w6H@@CMl%@P
z($c0X1(hwg^l>^aHY-|W$Wjq7c{}#qUYUW+L!^Km(dc%#+~<faROcUv4p8nYH>t4F
zJGRG<)=u73EO)ROZ_R{kUp?>@FZ$di^pWUL)1``FJ}OJV;egjsIT{u;TchycLAjYZ
z0-Za{?08ottWgd94xvBk8N2nj{GCLO>1s=c>NoPc=+68Lu-gWl-%lMKa#aUQS+Shv
zQM5!ISY`#jlMO+n#7grgTk1}`jDagQfRwEFIj(;rY|X6bjANH3jCGVYw}eFvC`Y!s
zJsQE9V;pFSd>3I7O#V*wdy8{NSL3@>%l^q%nkrR|#34I_qLwt*An@LLUhLMwXC2ms
zj=`293C8@&Ix65b=4F?eXw9|S8)%wA$+<=)EK2*sE0ca~hom$Z9b;Yr#e(V(hLx2^
zJntCKK!0k17g7EFL@d0kh;Rf`anG>q1r$Ge{dO!9G)UEY1F@NfMFeM7-1cXbk!%WX
zhWj0Ed)&xs$2R(D7Hg0>Fbm(Pe@Iv>ZO)_T5%^nP|0><!a4uXq4jvD|n2%Lav5XTP
zgyw70j4>~%ZVrkn1n=WMip^^GX53ru^36pEGcm1#i}X!7mwS`sMyfSXxdy8FHl(&E
zV!!Q#C#TEuzpr-cSjDfp{f`oizuA-GeitBlR}1fNpRGg31V$-BG^As=xVg=d$B2Y^
zrF6Mww>`h9?2p{Y`j$=dl0<|4Ztn*+x?Rm0;PuvG)#qv;{Gr(=s!lFl8s%a2bF$7e
zkqZ^D=q!rLjNI8|bX+<rGNy;YG$yjJs5r8*kn~5f1dyT3t62nD_mW5G#;&OO&qe2S
zm5^77v)3CJze~@J`Sz~O!rB>}&BLuJN>8tmb|}lwF0k@-uD>e(p3NwBnBQO7gntO0
zNFr*()}jTx`S)2IETKSU=0CDH-oU)qZvxDkHabIob20x3;`>~uUR&;!$60h)g24n=
z=4WTGnhHNZ@#l!-PzKn*1Bc1mpQFTN<>d!~;7eqDJY#w<ai~!wuj@ui5V<e}FfDGz
z?+eDHa{_8)yx)T@$K^bY3?6^xQwt^VUXr4Y5fOk7q$b0wvIIL<6tX;v<n2Fibp#Yz
z80#x^>yrwmLCwthvKtH(GwX8<tni4U!jsz~K0hxcgT039n`pheEqmdUcC#J1eQRW7
zszt#SbM<W9mr~Qq<|Y-fZP}iUZBS>Nk~+Io23mfljsotRNtXF%EaKlroFWv>zjeGh
zJ5sD6@YeJ`^RQbn7t&s!dUF1|8gJg9{ql$XjX{f;n3$5dbndp~Q31KQfFj10!)g--
zQd40~UHSdv@{S#g*sVfS7QzIR@!fRyO$*`lbca1w^YP(qA+ZrRK4W3p0lOW06w~Sf
zoF^ea`GBu!^wIJ`-pBhV8+A=hO^2DL>+(;u-Q6p)FYuTbw4|h@Jnu=7Ovs<ZzC=w;
z{WvRMe&2faSgC3M)}V*fJ1LWwGaCH%VXEe$M&=S;Z<D!eu=pdQK-Oe;RIV-ru`?;{
z&s|3nnCOA%S~^(zC~%mL@7P{G>#Lk*C6nt5?IlPPa9I6MqD`q%i)GQu%ATYVoHR1r
zuTFj&I-t3ar=oj+)?VR~+0#a430kpqgRyij3D*O|O|*45Mq~Bkew7pYOPPp;0lpvQ
zq8S^(8C|2VjFGbNCFaEUvMekbu3lueESY^IMZlt!8gr>6)-;8t`TR4pF8DmSM#PU{
z*@gP^8i6*(<gHEmw*?Kn((s<x9$@hFC!U}G>C~dBd@rznq5h)sDfrZfC(@RLV#;2$
z+I^_9-<!BFAKAZzA$S{VKWo-eL_R2+I(Sd`y`GQX{ghwx+sWFAG*FK4^$m68#m-7`
zAlXHe1gYp8R@{=|5zT(5tq<j4ijjR!6Li2*^3qD0Sg?;l3B<mk=lT+X#(?)Hw%Kp8
zd<Nv&*Vk<BQ8SHfuHn$SKMH*N;2%2U2M35OqZk;lNJ*Zd$X^6IcS-(<043|;v0aq^
z%kO-6fRNU^OYc6Nf%XS1zrL!M2Ld{i&aw;Fe?z=~tWbpHWCW+rV}<_-z)4zQ1m{`>
z&DL*&_diLr2n7y6hN;?5_x=|EYu8RfqkB4dZa>8zf7q*EU0n+RFmJ1`aPx1C_Fstw
zB!>4+;@(FPOu@gC_2-iI)EBQs0nGD!zIXQMqko|KEZOcKoy0A@249k$@2dY|VPEfv
zP-v5=-#kAw^NV#7d7%VN4pRREgCdM5AhS&CQ2wY-I*L+q2|e+7H`A{ChB{QS09M~P
zeOowta@LC%Y9A4fqZLl!ng-iVI+^0+>KS!GuV5DDiqaMMkohOZx;r0B$Qf{dlXQ?U
zJV}1+FLgVg;Y587Y#tIR?&)COYpV+iAdXpdAoQ8@*1agNXUWKaK%i3N8(s4LCswC3
zzdD11%VGd|d~8#H9t~Z0(+1!CTPBPHoF#3H-`Awo!+ZNJ5l5qocWFXz8)oBAN5Y*U
z#-%&8&TE&Fq(DE3s2@X!ZbsR+Z+=1}BNI4b1E;v;AJTAw%WlJ_pF-~vBt9L?WwO@O
zT04C?Q3rfgo}YD@ENT0UjKig+TD$SdKjbVI$dJxkS@-yqm^qf_wX<Iuec5J8FMvdu
zHM;CR;S@&(vQpU|8-6jJSIkuuXOWdV5ET|RU>U{Z?EVg?uM+I6IV|&rDs@(-{}tg)
zdUooK+%-^|oO!caOl(h2C8_nWUXI$hDTk-DVh37*vi64+x;o*X)_LkSP}!$x{8MmW
zHyiWMH0XmYWzud<H!}2hb%P8lwCS~~bft~w9fdRGRz~*)Eg=~}HZm>u==&`htOo+$
zSeuR#a%bL2QT8j&M!aRB6*WHzlZtfdR3wZa!-o}bm90*FGj}-rH1)Z*%n7j(r>F2Z
z3p}8b7Et0PBR}d{LGPRAthlNucu@O=#}CzVl<KFms7{ek1c+A3z7Xnp{4>l4;<cV4
zaYDP)mcs<V2(A%{0D7+6{tm>-=rFWqvl<xvr8+qfD`mMCof!M1!li^u&~`Wa)8#si
zB9&<Cp7NDZznQS3@UB$yzMaEkY7UH!cr_c@>kn+!b#YqG`qQUyNELr#Q=!z!KYJIW
zsPU3d*;5@ECfjXh7JBaDDXSW+7-twR3TGNxh35B=n0e2$xH;6Ty5htn;|uTmS(P_(
zg=@|W2^z<lSsv%}7cCpGM^4?B&L(rwkUs_j#W6A8qaZpdH%;CSKx&k%$z8RyxZxqr
zQ)O2obN1q~w8tQ&qmr?6*w02v5W11*#<uM2JvpVK+#R5#2-}rmBvj7wyXGt}ILR(N
zQ>qwD#quS0^J@R_N}Ml5|5%Z!tXN|8z>Sx=d6%oH=F|#*(uRThJ{aTi!4utV9A^pO
z6G~@OC{{BPnTn~SbG?CEvOtJKYbfDk!A;NQcUjwG<opixQ)n%P2-SEt1D}D>@l<^C
z64y(EW{Le;E7+XupB=zeOE;JpPDcMS2C!k9nC}aYI2b5Z<QG(x#k^vV1Y`H9e-`Bz
zcwi;h9?!4Ej$khZYN|)Faw4lSxC$6y`B%r4Osi|2yftQ2hoH-@L096c>TH75mQ|Wt
zT#pMX1UvQe9xxE@`Ho{@SCG<PI@iAVgx=FXZ1JYT31<CC!v|vd1l?ZwzLeOSbNE`C
zjl5@Lilg(Q_>KjWR!>zREiGKMoXa_m-ow_E)JlujeYlNycaWxJ&S=Ct$LRww0gkw?
z0J^jxhd$q)zqHm^x{tMzoBbq<1*BCzOn^Gy${`<9VBP1T7U>jM&Zo<t!PTzhBAw9l
zxYZ#`7=zh`@9h5jjH(o?e1RZ7ye_PM`ONeefQ}-iBJR>vKr%gp+kCud(iwM&6FFmH
z)&&a~=HPE9w4001u&~eHwec&4+QwxPddnG6+ebzd5R4LxN%SG)NQH==KT*>Y9F1^j
zCB5N5%S$3BE5{um@W62;?NLg58_n)e@Ymu;7Ad{I@nI=^fW*A?#5?i9pF(XOD7UDG
z*K(+(oD&0ysG^o}jW_)qxfb{Jgi|-hmBDpF260H26ch34>T<6bSBu?-<QQ+~XzOhO
zyLVE`PD)@%LJXk^MXXl4Y#mMn(3{ahS!CI1p3|M=#4fE}Lak-b$&_Al(RJst#JLho
z5#n+Zt{US^Zv2VsCsBZudunRa0o+1sq?&fin=9(jcjzcphyGq{YAZ`?m$j3!Kj~&P
zYgQ~l)Y2iY+~D*GnUayC4NZxEEWKqBSsAsa_pTj&LKU%(R5%LwJ6_Q1n)bLC<rvbr
z4Y~}}KjGq(#gWkVd94ScUA0*_Q#S|H{$<=;2(<09ba%`Z#9#)BuAv8}?VwOvxVD)U
z^$NHzXn0|pm(Aq)P%QdZOtIU_s0w(4)L50*d)=QtM=$zQ02fQB^#c`TXhx?_G3BP(
zXlg#x(D7yNdou<~@p7z~y>{k@XOGG~ZTx(A)GRJu`AKekPzk>4m9bwdocpt5mn%RU
z=-6e5+~H9a*G!mW(zYTi$vAieH&t>iD)BIXMZY_qLCyXwhM)rsHD%r(G$B1{UiHep
z;~?l1?DrE5PTdC5`{X5?6<#4Y3xIwE_J@z`<4%@Cj!%J8(tO5b;#ZZ|KXGa*g~4()
z)9-dH41fom%vTf-=bns})oo^aJxSs^eA;vB$v>$$ifiG3foEk^_{m4sPr)SNwG*(A
zuv$6nr=-Wtw!iIFDi@rsn*(x()#JE0YiR~u-n3k|s!NsE+Ex|a<<!Q`)%zrJPuo1T
zy1+BnA{`xO0T_R`FEhRrDW}MN8ppumFtE1fyd7~9WU<b!^n%aJ8yFDxa`)B}jxzIC
z5I*Zq&_>)PFcO+6*zG&fM&#^?)LpUSod2WYN^0vB_29x6Q(n8$xb3NM;elc^@6oby
zmvV2{-mX;nEH1&1mHagyrNe`lSXipFq^&hGjv`_-%L*l6&V4Ra<_z5C`waGlQ=8mN
zVet-*WYz;P7UiY&w}MMgLRZ}!K*l_HSfGw`cWxB-Cr)BfJgirL!tRyVFJidb$=!_m
z$!!UWKKq+Qc&V1*$IZNVHdpyJ@IDiR0nc(U(yV<%6~+ry&`M<@&bmv$q*<<5fUvbO
z2KSe7dnsz|F0V!A^zXcPM(g0`+e~grjQRBCmGkp{cVs4$O0`6#zu<7Wt^7yr`wGcO
z*D6`|x0kNo<C)gBxLj8*@smzJ1>Su-RG{y9Mq66!?C~Ih%opb$$=dJxFUzpqF=4eZ
z{Z{T?PmjOfSpb@90VS*K3TIjpM_smSL|5!tp50wY+RoyrxmO=$E<cxP(SJEdOZ|Cg
zM1f5bSN1*3=1n+>M@4tEgW1>yx&v}4mHxG26+?-7>i{&j6R1-$6az)BkOxW!eYkd%
zvl)1H>v75rs%^SX)Qc<nrYI<(<uM-t5U3H>8uk`QFmc!TBaV|$<H6Xey7n~1E_9=Q
z^XPC|hLmp3wi}rIM8?r+@gL?7yys(*=w&C-sHCR{Hx*`Kv6eV|F#X4Om*^%`rFB5D
zvx<LJz88A6zqPb?E(R|?Dc~ca!C0AL<)tw(HFGlVtaF)*FBhd*YmcNizg@Bg9Osq#
zC`jAf8mwkuA3(R%m1m%+Di_4otB%WAoF#gW6<f%uwb|#_Ffd34;#SE(y;)}gCz-kM
z7}HTakSBbUJ@sMxarO`!JG(Wvy!8k13fFipT-eK9&rVgo9<Rd6gbjovXl00F(X>~W
zS)j8TF26fB<RvG+xMna=U8La|SiJ4f<|X%^qU+EaTU-*Fv&SKv6jtA~xyN4fB&Lca
zwmv4U^2@|V3ag4iM|1Fcd_<c7{!XzytE2zJ^A$%R<3)3SR<5&t(N8k`kJ}rnFK$iV
z*y-tBS4T~gZCBBiE6y)qi)3}pr;&}#c!NjNv`CU`ivwTr9$ry3nWrNawteW0JhUw$
z<NcI2N6^pBwb(W3uO6H9yY1g8CO_e!D@lNY6MZe;dx-^z)m?AnTI(o0#arhx-5+1n
zKEe9TvGioAm+LqC&7WQfxFLyv3jkxkga40je)qO3sV9Jf<wwp(`Y)d6NkDN8()m*P
zUoYtdg!>UE`YKh(@_bL>7th<$030kKJjILu3oZZ*0?~?ygTk{X3;tpyr<dJja*_#^
zkw82B;V(cs`xsF=AmH;WVkLZ;`1sc>fZsjw{}Jv7gZ>{uxc}RU6_jKVUwmCe-v%{J
z*S2U5=)k3;2E(cbx3;9=ICAy%+4v;>Lug6-zgy=Il86Wck-tIt5M{qw8-miKdZPoE
zIv06DdGfy3S6?#F?-yF>+9buVI<0u`U?K(~T`y|7r|!qYA0PZKNObDeS6*I_PR4mj
z?|Aoq8)~_n^JO=OmQj3(;Eb0rv(W?GO%6_WB@LyH-T*7zv@%H7^&qT(t~&*1I&)4v
z?W}BK1Y(_px4#(~hhPMv_!LTFfu`(y)6(Ai+Oj|Tw^rmjMx!jC1t>*7u5(toa_~g-
zG97MN7}zA9nVIm@i%;LyHsND{L`-Lb!b9)8sC`Z7qNY{t8jZ!mCqCV-4jXe(qZK>)
zaEsz!D!3QawShKJbU*t0mS(FTi=!ppKkX$~gQehnxKMiAcjDkuIN$l6?`cQa=jC;M
zvC@}i%9P2;uDnBh4y8{GucRf4vu<&j#`2BQfjELYb{+PbnlUJ4RJ-x*IkIft(v*?d
zQPIY2h!<L`r8?E%fh$!W=cmodYz*}8?}}6@nds!;cC@JZgT+_F-46Q+Pgu^sc#%(y
zoN50BR=(1#4Nu=XaFWI`VTA)vp|Za9ml+FLuF+kK;$jpuiPK2?!GQm~3Y0jZ>WmR-
zwO>m|3rRJIcq-v)PJ5ZAC)`XYY)L$0u*Q3Z-)*P{M&H-oYSqUXoiMNA)R(y8eOw!l
zR(_nSw-h(xv|r%c$xGe`f(cFX!u#Tc2i0l@Q&h(H^vW&XGN?DC2;DbHXc5}atoH82
zRWaC^Kd#R?(3VtCcQ4pV3d4oP<iu_Ds#Tzmd2Vf%z{1f6zGU=({b~l(xK&(xj?SiO
z&R^L5{F93Mp+V>G@0krYW}XhFPxd4w6_&ZSV`*K3nj&T!gVB5^*mCy*2UrqG2|@;R
zEL-ro7rg?s%#qV&U49^AU*2$oSLyF-KFh>$y;sZRR%I%TcNDOXvO?H_k8L(C9n9c&
z`_l9}uDs<m)2(>my?~MP307D`y;#V<Mf96ejI%IPs_8E`k=~{x4nhg1ktGQly-nbG
zn?9~AalafQ$il;~HCiCtN6Au%Cc{?_y-oN%Jcum2o4w|sjBMmU&uwGq_K-n$4-4W0
z1kO6ZN`yMNUc$ZI#^MDTUv<?=x7<!A&>_6y%kL>;y}a*7RuUyz#GT^cxs`TzM1$)5
zUHoZozKAMT07MGk&t(at8YJ>O{c^1^mPi)omF%3aQTevt(8Z4ioHYZU!UY60SFLDu
z5iwqB{7U3<;9hyM!=z&<kwBW7Ubj-Nx8}GOYbUpXcDb?lnzkUKucG+jWV4dntXi;X
zYcIM7dO~j^?s%s4vFLOC5pccx_5>ohRc{GbCD&{vjit3@1Dw`&ZveI6_0pTQrQg(!
zpNTD9BXUG(!{A<G-tWTsz8IKKGuP#0u3jj#z{N{_5FN*Y8;Edd)kTbZ=VC37;K>WP
z1Y6Z`Gh%e;)uOgkL2twZ3h4_rLj0~k;sAqi)i@C8VzMh;GVM>mB7pOh0+k>SY{n?j
zw*r>Z^ppBHW-sslW{Y;#-wAwn(fB3tH$v}w{z4sfOoZ*8YZm1)gdP3EoQY2|YuHJx
z&0&JUS>I~Nd+qbn<PtN%N*fW&#VC`@*coD36EDYHIZKz#J}ajSsO+(gAzJOPo4E1Y
zeBZK>v$<RmUWfI+0P-nJZ2g<bLbB4w0()PpGSA2QZxp1HiZ@uRNG^%bZM7;NbZ0rP
z@ApPTuD+$)Vk*?!jGDgEzP`!{E>039#4i=7z!CrYP>R4>BXq0jH|gNh8wjzA3kuZ9
z2ppoB^+cx%^s;YXO|3p#^t^-g2Gpx#32oex%{fTI37AE9vNty0&f#7RqZ<<`67dqI
z8J4%V-lC*c`Fk^rps|^2y9MI0eFy@9fb#mD#ohsn+CMjnXNBz#d**qah}$Y2C_9^R
z;NyJy1@-+c_B57$TV@mtBA>i_6!$-%fI#V&3(8)anM+vqm@E#+6F%OFtrXeKJ(PKV
z4GIRP^rp^lZ;}hAIqGR8(~d8{_FyjiVJR`0^wFv~xw*4)a%6!fBq|K%q+A-%PZ^g#
z1<YrXO5YP{258rlzqqZ)mjdw+98XDQfH|c57@|KSgshCi^xrYw|IQ_@caZ9pyMNG!
zACrJ1TV?#l>Ifm|w)DEnyZIn}gn(W!#8Jw7zdv}Zsh87-grS?-*dF`hQ}n-(PIM7v
zK*lB~CnrH;A{)uxJ!|JmHh@fOI@g)#;=X8(78DeO(^)U2HQs1!WW>s@J+98{9)W$I
z5_+%Z;$`<eU^lm3XT|n(m{=yRHz09PaKveG(Xys%vbIGPT)ti`Z|<vOu|cB4Wu#3p
zU!*7Soe6{4Cgevs0MJ?g8Bj^p9(leK`2_`>rae@h90*FYkSjlR(EKgcM0YR3y!nc&
zor|iyi>d>Ps)LKFqm4u__>5r#&XhZU$MP!?SZK&%gPTHqlb}(TMNk#kdK}5_DlBBa
zrT*B)sl--kZn1UH1U(cai6uwuD#OXbi55JhNY|lHr}d-L`vMRgT=SlM=6RhRD6mH*
z!_@gT1%V2z+!x!3tZl*UqWzj^((0;I6O1d?fEo4Q-M(d8Wo~A5%hq5i_u|zkS@CIe
zK7H8MWF|RG-Wyv6JN+HOF-v<9DK3qY3I_vIDNND`7BvFzY3#IrHA`E&x(GpCpwjt!
zP?W!1?TVB8ZFxC4vU0gDwsX9i`&g()<MjssC}^U_uQ9H?2DYJ>zDT8Zqb?CscHSe%
zIeOkg&JkxT`81n$TQ67zOc`R1Rubv5dmGm0KyM=w4Xsp#MUAHfGpm1$6E0DVt3Gt}
zETs@s*Z+_n)_`ULAx^Y^WmR^Z-<7H#;EG%%`wI?0Zh#*6b&f_08$Ym|)(?R=eRcmf
z+Mm$9zZ`hW=NLG393p%ZOlj;R8bJJvnSU4yCtLRZ1q*Ge?+sFj<<toaPl&Jl^I4UF
zWoz`Uud9B=><tXaw`d1#?c9sQyoB`qYD3_Omv+VZ)hSBFvnr|Uqtag!@JRgU<5%s&
zQL!K0o}X+m@F{LcO-RRO(N4*tLC=@?g-$pP<KK#!Dg(eBrrYEK7f?0p09w9s(>phh
zH>8->$$A7lJW*&vf4t|IP|sPj$BkGR;x>vSVzwDx45C3SrsFPTArI%VUVeCm{>{<p
zUf02*fm<$<job4tqypU)7-|bo&Ec<kd7msjstEGO&kNp^klwYeK58A$WHzM0i?Bl3
z{{HWLO<=OPmcERzgYW>K8$IEoIxtlLX<>?7cS%?=`p?jT<BdE4t-65Fmd7o)ottp2
zaGlf-jgPS*4DMY51$XYRp+GF!YuutbY^fKO2QjO5JG>D4?;mL|acPlP9b=`^I)V}K
zb~oEW2CR-(+-rd+(Uv?+fy1rvJbaRmiYF5>VmCK7E@z-+p412U*Ia<Vsz=`L7X9@u
zfQT2RewKe|vM0EqK}<usAuT=KJt2o-MeiY3LKc~qT;Z%qFzKcoGCU^6wE~R1y7`<N
z*Bp|-KDS;CACeLu4vrdBs;+?)2*%L}S`N3qnjhLlERG3`bS~17dbJIgaAgH|7bgS_
zb-pQzN5qTpl?LfkygN}i*B;ci9T!(*(tq)J)N0m4o&b?4l<U>|HI!%lAAk}*WT@G<
z8vZp+{zE$nbwCZA#K%qsh5W6-{_B<W3lW~xOaIGHfSPh(#z7Jb`8j6hFB|aFt8GO7
zX7&Fr66@IULY|uN8f5kSQ;^_E=cxfu1HG=+a0`Q?ixybu!Pmy-Uy9K$o}DZSsIrq*
z(WQljuI6ys{{DXa8yL|M5h*h>hGp8!vLEh0z(JqnO<p|K&laVvWw885pW;tzIdx0n
zgE~Ai;t164f%qJyrW=ESlUQPD<l>1ioC<trfQrafS9PNtws2Z`RiKv^<$W0BZpg`@
zz|?b&$%FrP1%CHzmcO$W6&JT??r;bTk8hHURdOC`0WDbbK>yTmSJ%h6IpfYiTQC?r
z`3-PaeY|cGjRZR?-~+6<h8(IOTr17o>^jU1HI!@;`@)v*@#eiXPs6qA_X%nJZ${r#
z90|}8Zc=*g_S{{fnueOg79$`yJ}fHbW$FHlmvAZp%f;~6O;kCXivf82RC0H4P%Xk=
z$FXv8(d^MMQW`WzF=Bcjf?}MF+Xsf(-BY>|HHjvL1G+GsXhd9$K%Pqx_g`B3w;T}2
zbFr!-j;3yrbSzCaZcf%0Td$C&%``ixJC6??9R*`6@xmJ$gh^}Lzr|X;wg|a%X0RwJ
zyK$gQf<W0sRyQl3>U>uj&oz;c-l!5UVdQGY|F+Bs@MwVY>`=f%iQ#iJ%gq&QTq5Bk
zJOL~C1gz<n?0*XurO3oWce0|U=53g5hC*~!uw*~412YclwFPpYp5vG(jeomSx<)jH
zGCDf?rlJ%mrhlaSdTeoJwE`};HE!3+q^PUA`d)A`B|IfH^|6DTY~VDYR;I8*Fx0f=
zjZb;a`dz58&Q)~i!;fha__WLr$Of{)s=WK>6Rcig!VgzSLZHXtXm5RNrKG5+`7J)f
z%=Vz3{1$wuKwK4~O{b!wA~@w3ggD%N*CBaV8<*_%wS@uzOP(}_D5o^d0gX+DX>g$<
zzL2=73aC$o7RiE$6W&jQuCGP)QC+ob^kXpOLR#0@D2oNU_&^{*6S+*(d(=v<Yec>%
z%q3aUd=C0HHwCzedaoa`$q@GCx~Y8C^IL+F{F)N?3sE^ta~SpzAB6@uJW3^PXcJtX
zebU04;$U3`TKS8C{xfFt*Bwdri}An{o_P2qjQ33C)&-t^+BLc^8gnaTW;XxrTOr8?
z)zJ0MlIG<NuA!qq>N-=G@Ioh4G^Dj~fKDeQNL02bzDa^Ha+uEXi|n@B?W>VdL37-*
zVA_O;L0oixKCTClqd1r!`~hUtu{o|rgAzCQ7;G^Vx1TTj!4Yz_uHt<+noH&l33O{I
zcSe{@kCM1}x&3X7<EqL=3@oa3c^Il!IHxw)j7z3Yt%bu^Ps`Eto*ThkX5&=UD{)Ta
zxPRsg7F$_z+k;dVPf4d$C|xXSy0cGj{VI-guPk@7bM+=Erm$i^_u!K%tDRT1Hh4`y
zwZx<o=klpJD?U%}-7jYQ?m)wx{(`|pT623xaaN`0^Yf@|jVemcVzGvG<QBG#jK7uM
z=G8KDkTHX72>y7D8gKw-QS}7xttSFL#cABL-^Qz{YCLy@jizz9vn=vG*wzJKYi7v~
zj625(ly;Mb2MU%NBxh@uDR|}0Y;Lp@Gh@sKk%c+#B5*ZkZ>1+YTWB*mqvp;s97{q>
zGd7v4%@Lk<hknHFJERs7=&O6a7RaNL8Gr0g;cIR<DQLg8NtZ<@_SUC0T8oQ|)50f!
zQ3iO<-f{fSR(IzT+*d<$J!To+pz_K_RKTkb^H;ABCNP*klLJ(TJj&60p3pig(T}J4
zRAVVO_vDT-7wjzL<S2@3q(*QeAF8I|J*R2fAV$i}p<&vC2*U3%%=Y!^e4f+U=iDDy
zv~HQ4sCzdJn{SSYcW!KneHk7hviLprV_LIf9VNTMEjtuzLDxiq&($VuaaJ6Iheg}M
zs~u9laYcLd`+dB4vnwWpO|kErD=JrXylaj`+nYDG8Rk<V6&hsw6>&!IXQM9XgcC<K
zktYa>^X(p~Ca9ONf-1^s_82-{$1AjMKje1i-&&&7khH;@V+j?;2^$-8J5U(<Oc}FZ
zetewULYMBL7u8M!V?&ewIRp4dEU)(SweQuQ?svOo!zZ>N)&<7xQgA?;3for+N*rOT
zK=Ye@4?-Eh7ZTMDvFm%R6&Z6{vr#ZT;WSEMyfS_>Gwb0T`Wu^O^n|EZ-%WxR-}q+B
zR5qgo>h+ZLG~e3S*E4vGik0Q=Mc+n{6)xk?W2Scxx;zg*l0J}ob2l1NDh{#Eko~In
zdF`RbQ5^bg)^4tRJX{^Y(o;$m*)`CA*E&6X!npapvq!UQ;Nq)%i~X#Pb{1&lf!Ate
zz<_0>zd01HSCC!pEbFFM5S1H}tJfPMptljwv*yRriXaY?^u$F@nAok4s$qd`OquCV
z>w~`y+7(wHfB(y6Fi3^rTw9Ey+TiA!>#;<;wU=<4f=KyimJ2$`HU{f2UninNq5ASZ
z!Z{4~!-oK>!bewnCUq4$#Dy>W=#biF<OuS9DwN91%17pUH71FMEi*+fEg817Ckbj9
zwZg2MlP0+Ajc5m2mU}xRZWRp;Iki{lMh=d702T_<Hxo9SY{C*zPIQZ3$FhB6F3NI4
zbu&p{-l(n%%;wx-0lvD@TJ<Q48}6#)R9z+=>)4);m+G}-5yNgR)$u3^62xU{u0|D_
zIl;1)pDV;!U@+6*;D|O|jw>~t<}epdf>Sx{J2w-^J0~M6+l@pih#sZFWh~gW%Yxd~
zgYvmM^DW_(2|-|i-3Esn@mJ&Q>aONLYbDSq(={1pkUw6MHC5;0FZ~9!&{(g+&)*=H
zZ%sc=j5B<&U}ddXB_dQarMUm4#qkYz$I2|CnBsaz^=%z@u4XrPsO{{t{YvUO>QB<M
zzBQGS1J<RKF%l)a!n3n;470w5Ub=UE$$v>3iu;9VK(3q;7?9%CA#3Iv&mze@Pr-Nn
zM3TplLVfACZk?$gxWwF5yzSjexGF_6tIVu%2NxPreyIG6)^cMHx#yeRP5eZ*RH_;n
zA-mBU>CJ-6z2nhlSg%sj@|J-RIEjG{*9(CoIfKrtRv<+`JFJCNh+=x(GHe<?o_&yL
zhb$K}QBE7S>BlPDZ@Fy!Npl1;-h@2rKuirqS!pv@t<#hpf1!}1^Kh_;1X}X=sbd<r
z9;kXCbxl79rZ`vxWLF&K8mdeYxXZ~jX4#GCjYi5vN%_Mg4{HuyZAs{i2&dycbks-V
zV|>iIn-8xnXCk%fCO<$f<v(4t18XBirWDe(5{4KpAKcZRnpPU6U|4mk5nlw~h+M)=
zWGFDy*|3j}ETYdp{MNoWp%H!Lv$f~mMbT}w7>1coy`C}Xm!D)Cto@nFL#t`)CLr7A
z?lUO-YcW}$VVs_>;*-SugpaGLJ~ltW8?I=~?Z&^SRJPI(S0!n~_h5Rd!mz(Qv58xF
zkR6k`tX9Ew4^k5?>y}(X)_7+>xaLsX@J75pH$<1NBxfmx%6Xw*e8#>+oVsqY$uED^
zhku5kQ@zSMZq!3M1sZ3V&KjWUKqmO<Sy<H($z_x}@ydMlk!*e)=Gc%}3pkBy7Sr6<
zl>ll)Xqdrb1^Q);l#PvsM-4{LJ{5HE_VZ7IO%fxmtcN#s%jM3o9Dl6bjkasECS==+
zOziLIAi#fsTI8WeSJE(emwQmjSo0i0GP)lKb%rld^fS6<Yi-+P5<p+A_}7F8n|+{h
z=SHZjLWV=kgn`l3;u6e#;u3s~Sy|P0vU=qSb0TKBy)>c{2nCq)Q)G*Uc3(sHYY!f6
zjX5$HA;Qp&fJ1DA#c?=WxK}m9W59OR(6w){nRq2ysllX@8A7B}ZuU?Zv@pnXt$w%Z
zDs}-}f{>Ojld<4onrgL3wOeCO{$>?uqqYh+{l*dvsymWBCNj1#D@!I#<L*;qs-mYf
zU9KEU%yy|g#^lE+5b#RQVDETL%aHw7Pq(E|2je+LUZ$yfB|%rYkhT(`^_Y<gOOp_x
z5(>ogew5+|zw3ZV0bK9t<oln{(quu5N=tt8R`S`An6!zEv>*<-29V3Ai0I(Ru%4O5
znhL<j;|r36g;H)DALiJtRqduMiWDpl4N}3E$M`>amh$}RP7>vy6wJIsZgFa;M<2|K
ztVC|?>RE)cK;vYTr88vI8J#^g3)uL#Uw4;F3p13E4^uirB#p~gT;@{SD5)H4lVmq)
z`3{kCk#-2sc%-z6`i^>JTgBStGFl173f`iI-~o#;>clFFyuLJYMAqi>9{brK_!w0|
zuP9*?XNjj8&6x8$fl}6(oWf%t^46YLi7Wf1&0j5EAu~W#B4$QG%Rn=vKzwPXorcZW
zLk)fRdmd6^SFZb*V$Z!z5h{R@Yp@J5R_2T64<+a!B)D!?jvMa>d&>&FRS!tuvbGzz
z5|h$OK`FNh_ee}#;_Fs;6Rh2OeLl!eL&^4R0oK{gFDshF%XgTMzpvfwdc+kr<UjA;
z2>H_jf2={JpY^xqm9zmHWp)a%NVI4qN=d{~=p7x(+yKVw?(CCG)8b2to2X883^<zi
zI5)<6EE0mKc!-%4D{R1w5N#G>U+Bl=+$yGk85Hp9cluz9CTI|>2j4qE(pMUn2{&xc
zDx!!OF0~3@xV%4<HQ2h1t*GI)SX!-Ip2F@)n5&<VF_T)&Soi%RVMeTz@miT~^bvGf
zhe;3lpvYsJC0fFAjb##2Oyj!R>>Y(ZU_s}i=kB!~k}d6R(HSXR<sepPPbF*^^Ymz1
zz~I68y=FdR7;6<fV;QWcLcBgt8SZP)s2m>OdU9JJtvkpLy!A3-Ad$YnH)KX|@)6q|
z()`1fDlT;bCO*y#XGxps(d^{HLTxz+X6y}26U#T+1rSebqt(l5WjrodvJPKJnz*cC
z^kxyrha4(N+FQe+wD}Z=-Pv*+DyU&7{Z}`l)!M`Ol{%M4D<&V5@w#j;K0ki%0rPpk
zNY_!d-pfYqDfT-pb6J{Va~yKn96kHYq{&P7CdPK!G>Sc9<M9R3ZN+I4+ZPMX?iIAh
z`b899l8tdy8(-(u0Ij~uAc5Y67rs$0Bx^zKi-%6<MaIa5hT~~CG>_O66&6<L^j&{_
z^Mmv3;LJciQhwEqC%iHW6B03-h^%aqhvO!EjNQLta!_9+xZ#KN@;+D%V1sGyw_?M-
zJc$2I1yC&oMhFHs#scH128CJ)ynC>3Xpu`bVpw~G&3kXA-Se<SuicA8YqbjVt|^tg
zt#_2O%wzMYrKKgM+za9{)8?wEGj<1=#}|%D7`aN<LnFLDr-m22BOBWhJz}j9#qO%K
zCG<`qaeW}U=b5!!naaJ>9_A0@q|bvvBJ8ED>oSQJ!)u?`*T0WcF9w4pfq4jbPR6DM
z-eNcA(I#+zr2ifJ5kkuAyB-nY->%(>P+g+!T4XHR+bn6_XvVkWII>Wt6_YYIbP74@
zB>*|jh|w+u;F7F%i(Nv=L(5!BnfxN1dPm@+WyMj)>PwzUN;@+Z9+A$988zWjS+cRP
z#fsw&mR1343mP$BbYyielo~s2>nPoMq<XN|IV$cb6wUR<5|kJGYy8&gV{>qEwd9nH
z(F2jJ4G`Qz+_*h9vWQyt#bHl$HB|r(X;>tKS_|NShxd14o<t}_I>#G!JNeqq^lwqB
ze$=Ls$6oa);&xTb$&1`(GZJ&m&SDZa`ZUHaeS>m$HT=?pXWEgwdUQHHTg65UZ~8!N
z%<SIxY3zk_W$c~W`AwZLOp+BpE`HN%!l~GhOqY1o-)j_oG*>q=<8!sSal>pgjO937
zn~!pd%Sy%W;EP7S+xreTWnC}V5^X*sF*mNP%Izg-)yUY`gse1v@LBEkmn&Brg7<;l
zL~hE;hTnNrhN{x@aAZ8H%zmC`r_6GMYrjRUI!wa1m%pJsj@!CvCGqN=`-*6CL}0=O
z$1_%01T&%~0#{a!rTAEHuqkOvV^zv@Te&$9dN0`8Yy+34P|^$fLDD(SYw4?u_C8Nc
zln@MK^-;7?vvRCn2XvdE_qGBo#P1a}lld7zY=ECgxWGP~xR<zUX;?U9d8?RtsBnp^
z%-fR&a}zlHA%d9TfZS0Z59HRNp&HqsS4kwG%;~|=?4LLiA8A)NB#1Zrg_7sjIUb)R
z%KKK((yyQij&51_fzxI?cWV@r)(w^%^SGVG(J787pd$n5_<96%d>P}P3a5w_)-DT|
z(}Z_9*?>Gu`qL(!h9xBDNRC0LQ<@_?!-aJc%8ZU04%J$$W4}<w&4yY-6TJdcWYn3X
z%R5sTLHD*7Ez12i3bwTh2(7Fltj9d8=OB7RRf`2}(>k~<J5{8MPV}NrK0>SfG*cst
zO>&K_d0dcc$D@AvMdDnV;%lY7)=h4$x$%H`=$_vOs$w#|L)-^Vzr>D}Jb4s8VWk-+
zY?|Y-vu|hh?9rM5+-yI3+kKf)VO0|;I;0O%We&UCnXFWB+2$ORCMx$aElsTYa1`DW
zAbj+c*KX!@wtC*(^`7$LQRi{bx?T!1e`xj4H55vX7xS0i&p1b$pN?~VM9m~<GRXz8
zI15x#=S>AU?zUWI0WokN?<?|FRg3Xy;x@rLbHmAVhKK|h0blAE2<%iUcXU^_3R7+l
zLhm$(y3Zc7Ad4)@c35T%?B%0&cE`eKk&clTc_~TyJ6XqWU_)V-BB{CdL<;jA8giX7
zqixVedol6M(&KQ$U1{PO@htAIE)Hfp(>jB>m0D@g1429F$L}gj_jm2)W?QK?BtKj-
z5{MmK{7wlw-gR?TyV?+h?`j<${=HOf;OLOvlo5|N4WU9Fg@m=dYUZyfvW$%6&W&jJ
zShj9o6E2;LWG`E5Q%Z5{jN5o8P8RV#b~=g=asXohb*e;j2yNiz+ku3}I1p>Px4b9R
zHvA6Bq7zKR8fU)mZO$UACm({P+PEJx*Hk~?g7ic_<`UXd*?%yPrQv1#z7jDtZHKIH
zc3ROoB9u;5WjHUsMujHFGl|-*W@3^a5s6mw+94=2lU}3D&gkyN)j#5c&u_#Ro9gX#
z@mf^dkk12=eCLZdCJ(HduKXqIKwROb9z`i#Z1~}9O+{>l*&dCVmEMz1=!(qU`L}q}
za>TlJJNYcF^WzB3Io2?D?v_i=Mr8akw<;bdcp^gD%q3C_B0Hm4ykTPd!)oLqhPpip
z8pt(7z7RWwjur_t6ehK6Wdlw?lV%~*K<e{ZwU(pLb~r97g<@XKcj<u})khiT$M=S3
zMzy#~Bi{*pUZ3pS$I);cTv_}ag+|yKh$iT58jAC=Cl|$XWUw{Uag}(9*;)DaV6HS(
z1+}JMWzlRD#$bPfOpvq#NrYq8D*ia*JL@CWo%zfamHk0ZAlfEA7gy@_-r9jpilz^J
zJO^8e_AWa!g1F2U##CoQzaKO5*(}vUVwZ*?JlaD+$o;`;W46D)%^Ai016!9EKfW<H
z@DuJ5^w|3>^WlC{<5KLJQ>Wl=6Ce_xg^JlIt&~cE?dXZ5=OEGf9$sD`8ncJuQSjEf
z<#bqcOXuU#O-w7hD88kX2BftycF0CJZ5r7a5ws?g{%Dsul`W5X|G9Wog^Fn@Kc{re
ztER$ASaXV*ExBAw{3mVZ(n+iR0m9r!jm4_;k`Ecma#kTQH4o|Iwy+7s(OD(th>9BT
zbZtkgIacth1gY~h>3Ddjm_Ss1q177?_zvt_$?}YSZkTsDcPa58FS(R#O!X6IOuED>
znbk^LN!2(|WtDxR3LU!WM~+f#ZK#1=WQy=q|5dvYVQ*=O4hf>Hd~#>P-f<EbK-Ow*
zSd26XBb|>|k>jJ@0^N(owl3GIF7>F!iv%aQujBxcL;~a68K+IdkHWOtkem1D=t5gs
zq)e@>f}n{s)t)QndeW7j!X_L(p9&1KKK{VAN>VoE;W^2*E1)-efK4~5o^#ldJj^I0
z2W}3i=FxL6ZSUCjzP{~rGhJt|d3G0-8b}qK7&uC)iI_w|){Madlg@;%2TEx#Z%|%#
zRAUSR+Q6Tik5L}tkVLkur`GAUyphSyjUHYSxaC=A<m5;aHVP-fu-lPJh1o<0<|fiO
zvNlk^EFU%;94JZggf=S<dli1p6C=s4fq^L2bL>2(RNXl7U@7I|c1dW#P`ea__0tXe
zNDsXV9GFS6(4O|yHl1TWoR!cO>nhr5IdI5;bHz*qZ$YZnO|LYu)sj~Xr?ltao)pm{
z3J?s10IsZ>oG@Z*BDlTR`>j@&k+Y*?vw3b64Up!FQj+6MZTz0J!9SFg9}J8kZ3adx
z0W-a56zD%B5W2l=1UxY)|EsYa`QYK<;W)pk_Y?gDmF0fXIC~T-W~0tz{ZUz?b1iC@
zrD+BnroULOmi4<Ul^fXg*L%7_0#;d<n)>I1-Vo0RNe;U2uE^k~pS2fzXqjf|P0O0z
zdXRyh4YL?l{_XF5+CJ6QJ(&~N)37}R*GCTWy^d5~lj!>hc|s0K2RD}J@;}~*)Rql$
zB<H*p^n)FKT-DZMpJWF@FO(QG;_$8%_PP~aB+Zg^_%i|YV(e+)`E8OvqQrk*37{O5
z_5w2mrL?r-mZ4?6c%c=NjSK1^%E4qM`_6|z=lKlYM3Bw?OMe&d{!+YvJ)EJx>mJT{
zr9TwGpI7%iPE_#Auatbjr2J7XkIaB!B5fdkZn%Nswr$2pv1Rzcz`$2Zg>BZv|DU<5
zM<27ZWz5XY@ze^ukzPZUt_8|!YP72xX{kG~ZeUv7iSv009fwNFljLNG8=e6Z&GjZ+
z)NA+3f&9;7TBC=j9G2gNk1hc7@9qPoFkcO1Id4HeeR>GYN4eqb=05$N`$n_%Nz$v8
ziH=T^>Kn*q>dl)O?ka3;AnEihyQ2;WRU>Fc?rI}}7MSz1SZ6R-i*dcHG1lxxJWYiu
zI9O<9VL>8-++*#*6g{UH97Ro6H{o7m5NVu5ASI^NOAn0Fz&lJLccCF(?%zrN?Hit4
z?|R84Yt?Ib0;!QvDj)*_>pg;IHPsw<<nZPSXMpUS&vlCHR{HT8zuOF+Mw$LgjOV_@
zl2(*6?K5m*ffr2EDd%!#9-jV}zvcGVfjXaVI$$9S9^++Z|B@^x9IXHKWNY_qOo|!x
zAFO@;%ZWfIf$xr8P}cb~NdE~gu&g&W|8H4;;Q2giQKZ)b8ukVPm^j#ZOPuyRmJ}IB
zUEck?<33c~-tZh%EEhm*@^009%b6XskAzQ8PtPMgcXxNgE2L+n<cBuAfZ|E`dAxoY
zZgeO_$xd;f4~R1ngW&vXXWMjUZt|>u#lu6KRB?RQqnslVIUlw<l!HSxgkUxq0G}`I
zQ{Y`xsA1kyxc`_}6!hZw%PcT=ya&)Vva+&@8X7S!z%XB41?4mAIL(-Dlpkx{1>Lru
zPxX(EG96T?-I#QvY$ifw0~peX@n=^c1@$CV0E`(A@k7U@37gc^(t50Sj>iiq<8Sy~
zR6GdJ>|@=NZJ8Sjpn2dcM5lrtz)}LA`-Fwvh~cq)Hq~JRjJtmGk_XZH2uS#!BbC*d
z3vfNoi;&7n0b5$0u!)1Y=I5x&FCOs-q5njYP?Uq#=*-N_uMBLj&wbt>G8+QyiD$Mo
z$W9~XocI6u7at+a5R5@uq07GxM4aY`Q-ED523X4vf%94DJXZYG4}sxjKtTo`x!<{T
z{1v#DwSawaofo=W$?^KwRfB)q$^if{bDe^l7PsrkGR<|Xd({lfm_L^N->)c6mY4^|
z_`6#2SFrv38PQvS;jVsjekJ&8@AFq!0Y3XmKyjU!3*YAyhJPI>IsJQ41pqHedyvnx
z=W*Gu7U}aHfbd(|-D|*?5?I<>>yO#sg}gTZ{dNC=4Txy>+{wo+KFJne!S<0ybd$G?
zd+g-SG<7F$ED9s7d-_KO8F$)g{vC;ZLK$mGC&e}@T8r+y5K%y5#FV2&M3W0Wx}mM$
z81r*`{jb&oe6~;pP^zkg7>hC(_m%8tbW}0F7jdY&qvS^gM_VQ}L|3ERInVFS{^4!i
zk40_zcB=u-^~R<i);`_JRXN7u#QzXg!k74tHC6O46Xd4}0$@nwDay>!%{k7DZh#Hw
zy~n<7w|*t0XTiI8QrRT=uPd9bP+r_{@!yMkd>7i~>bIAF1+?o6q6oQ0ff<C0@~<Rr
z<{HH~EqaHDb0`LP*HkvpgH``<qL8;>)>`OLjm@}?$kk<gdZRZH@l1U=PWInm2f$PE
z3CH<(4>IBPwfKx*WVri6MAwJgxthAhZHN0!sqk^KaD+yBM-#vQg@478MExjHxQ4SC
z4MYp?SV$MpG;jfG65*T_JlX9Ej!Ro?e+p&^^FBIQ*%(Kz$_=d#KqfzX?);eQaSfvo
z?xjnndH8lg*rTz%Mh0^Hz3+i7FSJm841SXr4AE_fHY$D+fpA=nYV<Bu)%1PG2r86-
zlr1~hMl~@KKpe@UJZ0hUl;f$ki>B+V>JJ23+|~7N#{D{M2SC@v0BC>RyC{H*REQOF
zg<Esn6+-+cUy22ZI8P~-`zGq>G#`lQja179w}!t*S8SCFOGP@y^hJMXew$ZgWh$?&
zXY;<D$&N8&UiKvnN=VfyNLQToW}Y#+wKKCo_9~36WcPD52UqY<%=Pzei1-Wf<hhGW
zM!O==u_uEQfMe-J@Y%4`#0wE0&*9|(m>>a~qQvf)zfA!VE6Pg#w5&9D?>n>b<T}vg
zThCJO$*7LJ);x*BG15gUo~!1bdP<98Us&&tc}6Z-n1{~I%}w;*MXcE_z;=kv0p%_N
z6wZFl^>OlsC)IUGsWm@&-;^60F^cHJ7lx&G*10}o{>2CSL|DpAflB7_o@x?C@iLqy
zkGz!`XgWi(bwE7D!cn(g@&=?i6Fq~^(az>Il40x0xA0R^qqBO1o|AwOA-T8_ICT&I
z+Vt_H%f)((tC;FE3m=}iv&uVO1&t5T&q3Q>T|jX~WxOR<&wQ|VcfXO}DjIgYVc*j)
z$P@g%r9h|rhlcWhUE8;r8^Vybf=#A3%!JRWl*$F1A&ss-ZKO2&R-Pr=lL=JL5W`pG
zbb)~M1GRsO^Foib6oW58`wNE1J0XO(hDp<Zt-2>L)PsT|<<u0i_`JPy75c8?_BR8L
zR3=<zr+TY?EK$;FD9aXTn9#i_?QafW2q_u&3ZUZ2z489X<AzYE75N>_oRnBQ-S(Yt
zQL8wz6=i-PzC~}pU9kJ4OlIdCy>y95<kPUoyWMAkfG^}T&?yRKkyGA?Bkt`SdFqCG
z%?6F*)+!P)wmV9*^w-OP?#G4Ih~gcCH!ucpMi^F=r;173vim%#>uy)~gw-=@MGe6R
zX)<y2(+1GR><Wa<eW&2c5jTzx_c)#GssiO@py7E1IkJjb(khW-kEK(LcIEaF6#+NQ
z)dsyKj0Y-k_m_FagQHgUk#*#pUq`*2O)3h>rH$iMlvVcO6SF+quWb)fQXXdBg%mXk
zxpO#3ZLT^SBI`syjoi}GU<yxbj~LDz6CB_$U<fnsT-?<OgTWOJA<Us0>l;aB_9?|7
zFk8kR;PAi3)xN`|#5cBhG|hpFj$zxjSVG*^@PjH60XG?k#n|TbmU!@WctwGKC%^qD
z^<t;;{G{<vkx6hN*@|47aP_Jvn~7TvvI<AY6_|PHT{F?N?v*xZ`)q6c#zx)Kq3y${
ztqOOJy}%Om_BZ>!17z^Wck{JyxL3jj4{=+%^@GClBH5l!-2~?nljk+gY>lok<y*tO
zct7kxE+@v=;u-d&G%FI%x5kd$IUU;n;Yx_*h(MquD+PlYXt&=I%H7p|3V-YMIytNt
zEAGwnzXa-!eU$!dY(N3Zd2RI-e`TKc+A!l?>9RH&#pb7Kdc0)Y#xu`WHj|yfpIFp7
zVB*D0T)YBjl_RDB<vkK|JZ^iUC|_aWu`CW0eV{h)+l?kB(y<5~ytZhbx%MUy7SgF*
zai8C`rQ+e*wU!=({KF!XnfXr3O*pbL)vh^adnlRTxz#{eo1vMS!LZqJu({1pC;@Mf
zuI8{A*J$&i<<hO`+ff~wcfGyVWlSt8%|=$on}>_yln$H7*y$uN>?QNvlRHR81l$v9
zw%F}fF>_n-%yk#?I_3zunxOL9K>r%}jpn_q(V`DETYRQG1NVXjx22};Bx(4hhR=k1
z=gXv_J7<sVZm`TYPq0Tja#%&_$(w~_MKMLJYmnAm5(jl!$Xm~sGjsq88KlTXZb-U5
z6<4<@u*isEQPW#z1!D?UIP7i)HxH|Ytqab}Tcs74h9B9;8bDFMI{Y;YV2X;gcfa^(
zFF;<>e85Y~NObMic!<@ehgWQIOK0LR#o@O5H6ePMX4)t(skxWjx2Tw`yq!P-Ro{@F
zSs!@Rj`f@G#z;NXR*$ehL$<&6!2X{^ATKMEO2;3J_G0>#AFOFs)(EK^zQ)PzyjXFn
zXjy*?Bf{|5$!tU^nC3>9holWwzWJu+elt8)fXi~@C>i%LP*ME?k((V&E?iL1_<d^w
zAKj>aI;$Xj!gnEdsCSCG4lR#KD<P`rx};6{8iX(*BC(QW%-bg5{)!AqYSJS?b9fZx
zA{Di~%)wn>j<T>Ps*$px$pV##Tl)%+Zp7n^)bPiDjWl3OXDG;lx{vK_Em458Om4)>
z7OgBc&K40=B*qkpMZ`QdYGon28pbFHRQnW~*9a8t+}a;yZ|;n@E`}i9Z+vBO_cH#f
zQ9ln_wer?c72XP=#bhqhY$b5r0_O-uJ2Cfj*WfIy%8WHWfhn*KN5h}HAG*3empy^N
zYMe!0_`qOjEK0C<)g<w?jIZ<+{?D=l5HE-c%CjAg_+R_mfIo(aK_=VVf4$apr1qYu
zE}7?%@DtH>IUA2I@%4Z(=~ISY|30deUxlQO!?C!booq~H4N#@}|1tLEaY?3K|FbmD
zEX|BlPMWzjZB~|!nY&;!El!I$R_+Uprj{r!geZtkt5a^3nYlqTRGPBnf{F`HrI-sa
zrhp4bhJu1Xiim*d?{1!F-gkO_(_8<6pO4)4b)9p*=X<{AS{l-8H^D9&#YQcQAl*y@
zNC|>l*MQSpxeL3qX5Y>3#r=g(hv4OhIzE-vpr!Edl7ePo5aI}@r)T9-RcWB~pb?aB
z+kC9yS!Ge*dNJ0{s|mOc=Y~Pq>a6woy+)h1e5CVOUi|3MlJ(u4Ez8E|^(@9{Mrp=w
zbg~%~l6qmdzQ@qpO7XNXn|RIMX!%?znCSS!`IuWykl{@w$lK|oL#Q=>u#3+d$ielK
zkCmqm#NFE+j}F5Qw^%zs3R@PR!CdseO<iILu-z7BPJ4}Pmnx39JUAYP)*8=V<!cF%
zC9y{*7JQEsTU)v*Htwn(2c@RVP(ualhH1jhL&&}(4-{<EKQ<E|q;6qAHi^r?d$%{2
zjB9WoD@Wo+&b!UD^1<Hs)r~7p{#01}i%p45M$24&O&jH4y8dj$_D3}v7Qm&phzI2(
z$;iT|`_Nlrbw@P^uWdc;In}O7>atpQD#oketi|X~mOhpkdw8L)yT2{XE6T<VR8(QY
zONCv4kF=YJ(~cS8TtGiOU1>pXiZ74Vs``I(`W@Oh*YZ5<=QmXB&sVLjq&n|KKr9|V
zf?id+=^u^opObi&UGbQ*TC(tC|C{XpP5l6mTf6dRH(@{SMwU1EFl28>Z|(T3bjwq`
z0jK~K8&%aZhsy7Dw_anoDM=qw61k?J+ofmu1hcaC2=22Yl(r+u>)HxngJjpKM&pd;
zP-e@iFw{~)B>lIEq$@-S#8S?Lhi!)&+vaD9K00{n0e-t+X=lQ<?lN0<1&;zPO?y!c
zjm!nDtc$5EMa-NiLJuovg%q+gl4QLUWgS&&<qt`Ua!st15DuR@!xhe+irDojS*2F|
zP;#X3`N8`inLEHezVQ#)ZG|asRTk=vU1tB-ShKO<&i#DGQ`D)roRB1j)kNR(RroG5
z>W4K@Nb`WVEbb83*(H8zA}Ojh2e++ovFljsq5ykjGqS!r*y~ZjlzmWE0?>T0aPLOc
z)a`aW6!GGNLy^NgmtB0?YUa8T9NJO8mi_FYxC>|FW{*)nshK%G@mm%7I;?hhIe2Jv
zm$yijvQM%jFwO7Uio)9s`{-QO^(-=Wn`PXY!s7L-ZoWZ95C3$|;e8@mh$)%QbHPYI
zZ+5iEk!18-)tu|2PESB~BB6Hb8|clbzuWG;bDx|`gxdlOrVnTO9x2Sj+1X)G&)Kr6
zaU%b_$9WUGrxuQ^4si{kvosaGKj^RcahF8vf8GA#c1muB{+E{twIs!sNB4B_X%BPz
zwFON6>~Hz291(r@iZ(e%d-x*yPnE*MremfC_RpTN`jjam<J4nk!$T7AZD)6tsKnNY
z(W<gdji(k<T;ig<P^UWxn}N*u>&4ERu3hMGQM}f*sVutSz9;>`&F)nH#Vh$M3fCP!
zX1g+KF8W45!`bGBt#ff6DGH}@fo>gj>q|wEwNsdpP3iUFv(3{P9xAV%V)DUcRZ48!
z!D}o0OWSGA-R=Karhof*1*+spMC#sFb4A1sQ3y?w8EFdaSJBn0RC~GH89f@&`+Cb`
z#RnAo@+h-sE{DpJUf$t<addp3f6gZHyVXBlYaFL-`eDY!t_(TwjpeDRq?kwiaig7E
zork)M)<?73mP_|)+iF`K%JyyD<;%nt9{j2&%-veKt-0!x=rvY3%4Yu)QLD#z?WEgK
zNed0%p4xln0s6+5Hu=XT`iTB-s<#X8HgyN~njA0E>~ST2=r2oO=J%p4-CdKDUg{It
z?6066mKkn8&N}ghgx`5gP+Ieun3+bb8SC?%Rf-|`qI%}J=J)*m@nGYVr&i866qb{P
zp7k(GvW*_MRqM?9VJ*qB&hA3WH}l`+HGiCC*}k)O_iF|8S9fd5+yi6o+G!fQ=fCW`
zS#ov#lq?~5%U(%=mE{fp*`Fv*UFV+D{e=Bj5*<&L9&x6MLDhr?a%9RfDxPQ&JSpAq
zQEq%jd|UqKh#RHjtfB1*oUn`0qmRQrXWDHFA1ywUzd!6Ccwu+aS)Zik4US(?Cx1tr
ztvBy-m(){yEVPC6mMq1Pq5FM5TuJaTt3n%)=Mp!+<T(6n7jX6O;TF1A>E`J4xsAKx
zQA7`_onrfnfA)cx6`yr=^$mXiLib_fL#`qZDq)xMR+0Q;FS!0<ptv(z``T&f<6lpr
zAk(7btzG=t(G^FIqpsdqya^X~F-eYREI)H%ZBJZ+#Z8K0JKo!T_vE?Jw8YYZ`WkKR
zxE5-YPtC7UlyXrgGu_n#5wr0I%g5&LVebaL99{drQp(>x{XV&Ry=V08Rsl1flR3o9
zstwiuPH+7%c;ISl*%R81M6N>S>Z7}F{+}ZH-!ypZ)jew6$D8$E4J4|L<u|34lr%d=
z%tX%iJtx7+EEg=(iwB>6>U&I(;gp`$!kO0NZj5G(|9noqR<@jEd0O!(jHQ2ZlX>G_
z4|v0~A~(0%%6c%AyIEM?y}yT4kk{bQGr!ZeOR)}liiRh;jdywWO!RXxy{XwToCIL^
z$6x&H@1NEO|DKdq6ReM37yLtu+u``mHRvyqw4Zz}iET%@21j`->O$gA$BU{B;=Yk)
za;sgEWI5p1NFQ)t^Op)iS?bLQf22ed7kTWs`C@*pL#kWtjcSKu!Tt{Gb=%IaT3)&k
zc>dzuMW+ZUTh=@atG+wke&h%=p|JIN>_ba#@z5WWL_{<0mtO=GHy7feYfXuSn3l<b
zE3B|HSF*`O8RBu!L0@8Ta7yCKpdD^Fh?NvFgyVVYjLz^d!2L+uag~GdpZ}xIi1%7w
zT4D%hiGQ8Bl-uWmwx>4~hBJgE=%@8Frw2yc9Q3b{SlDZ6bzklO^oQ5R_WO$S7tNOY
zw%F>Ekxfuu=KXs&k`JAF+*RahFHcE^Zz!@hcmAWGQHMLDGjI&>`-VM*N$#>!9}VTC
zrxdp2)6B6B^Q}AFTpH~|QN{dO$x*LMN=r??YEgK4XULtH7UdP^q+Yj2Zt*R`IK|N5
zW}*z_abmNT*R?sPa!g4qb7oXsYF~NpNEEj1$gSQ(tR10z5I1+7m)mQh{+CnYe^`Ii
z<|wZPJ6h8*v^QRC(I-3*ydlI6yfy8%=bZoftk=5YxINN(LHE1}n-`s?8=}+@`3G)x
z7g-j?SRE52!2G^v4M*3P%Z&=ZJm@zZd<p_T`<wsPCjas)`iAzw<*6e5;jV*8$6Vtp
zLc=hd^IsMYwvUy~E^PEZe3+bkGy2ECvR>@%D?{~5g|o@SF6>eM4i<Q(r+1^R{n&u^
z;GLMq2d9cgkgeOBYr)6(HOisRNPRsIpugHcAV=6j&yVu}iGrt@GQh?LxB1nhz|HG;
zHROZCyA1z@w2Qrg14y=ebE`|Mcf+$`QQ9xOMA%n|*G%_6zW$5#kJ;{bD=1eBa057W
z_OR{_#nb(1#2@qhkd@Mspr`mBbWlrLs_aAK=#0G@*EH^d*Y0Z1{`wqAKRXxUag%Nm
z{d94gFmifu^^j7sWhi-le!y{8;Ri0QbSgZg<E&=ilYOZ*Gkd=OHFBhXHXhy3^V|OD
zuFRvP8xfv@LeL20mT|)*-q)%-5=RZWe@kU}TfW@)f!fkN`)pF^rPwoGVZw9%oNl4H
zxa)C$<-~K6(|Ct}GS#4aN1Bjdgr-vDX$R{w7ETofI)&XhA2~aADf+31LcS~F+j@iM
z9+p;5x)=F{ZXkXvxGrdYcxhAPW43PhZ@=BQSvV1UeZcB_&Jr2-G}Rb$V#`^}n>%xC
zyGgft(Gtj3-StOq9FJ{Q8MEJO{up!|qT&PZ<C=ezoLBrl2e2^12KQ|b;&Wp^0XMs`
z0yagnbk|OF+odl5ZjqX*%&KuqnM?3`a*T@l2@_7`Vzm#ZV+`hB&PCJ^6K{ni$kU3B
z1#h%Udr6xfoGWd4D42ITdjIo2&ow&!>Aw|%|6{B@z@E+>WGlhHcH6*WX;dvfW2=IA
zn(G#{dhF`IjNlt|FWV2odK@B2sRUbYiuUh7_TIVQKC7EX?Z=Kx6eaOOsEapJL9P<x
zrRp8vmLSLJA3z>;hz57{iI<X9se49K%DwJ035V2;PJ|@s)X!;aSa-fxd+70&tA=L2
zN8S5yB<vbx<XQQKHTkFLjeBc)4t{bLb;0dyWLad{iBk7%KU5CiI#T&;U#o-n(?M2<
zRsZp>pVu5`6?$W<y|JjxMPF|IZg|9+MKnH~(^E|N-4GcJ1KD}y{fjmJUG}{bXW~o0
znK|zcUGwZ_^hQ`iFe~hFYt6L9gW_$LWm;$|47q(viXiM0`Jl)mKZ<c}uUqoH8xuSW
zV&PL>t<egh>2dR&HJS$wH7<zcQ^O|5oLV=e?1*pO(HvgAxKRDY)TvHB+1*O}ndMG0
z?HgdXOldlteoI<5egk<|8Z-2bDRy|(m)@n`u?rV_yVBS#cDw&kCja*8N53T{)qyI>
zUy;HY$DbDCHzeQnSVsx4q%~Up3tW+S@0Y*h$+@34e+%QJ)-?Wf8Obsf+uZPmpsx?4
zpnFb@c5u7b;7(sFUf<S<yqR0FNxXyly-m`M=evJ8omQZi`8~Ml>{P5|j6tod*4a8f
zS=`(c*=53v@Gg6wIuAJpzn`Y9fuFxf!FD!2h<?iE?#$0)RvbkP#}ox14em|+nzh!$
z(}?-3eY4weWc=hzZ9l8c{b7kBw5=}cavIPIxZWcwA4l878)kO%>Rr^a_60d!o5D69
zwWi;fheww!?P9iUW*+gi(hby#!HLs@gv&hWI1N@(0c5Dl0jUY%C)4<SN86^o$4ei`
zby2H?<Jp`2dup;gZlrE{C<bk-f^6+EX4HHaIDz&m>a4sqz|4nwz%T9YO~76+SrfWF
zUxeN0AEKL?L)(d8R890B2G-(T@kth*T6zH-EhG6dDX{-dTOmH&`QvG9-yZRIU(|Wx
zxKgQk&)E+X#ZT9Wr7Ih#VvU5B4pkPwN`f1t{f=nOFwf4Y{N9#zO=4F^UX=dU%}J?2
z!&LkWm6NhOG<kv|U>^h)(Y=bbwFf`&2-V}iYb^z#=QnY1yCS>q$S-sNCCIr)MyCaO
zf_q)^;c!!-C~ONi?CVW85cLP)@T@v>>8%^pzQ>LSTl;?G&aBfX)Yi2KwneV7`T_ki
ztt&s~=$ETUKf8U0yp{iGNdVfxkF<LFaoKm_CwO{f!{L7UmMKETjT_9P4=NrM6mO6<
zM+#tPY*(%>bZx#Ty7|1XWQ<qU?$B^pNsBs@U$cIj{KIVzDz6XE_;ek`><>>fJ2!s|
z^K35tWgZ+OJ&(LsPuh}#{LJ~h;@I(*p`Xz{zY;9*EjwY@JAqMNSbDBE2)_`2^yTgT
z=UK;-Z<L1Ehjnjwj4<XuTHMLVyr;Z)(!WfW^ga9FG1KfWySqO#4F74BBCs0!a(9N+
zNJBghSY>}8CMIU}J(M){SI?B*8R1e$&67+6tNSD(QD1Ur_Q1=Sm0{YGpC0z>pS|!0
zmGTi|6x`q;aCgl#jX*$}DS;2FX-yPOcUl}Qqfzdb7t@~%ip}e)ox~*yTkKPo9EVJu
zc<a{Od+D8_Any{O=C@1?A1Apy7Rp-GZc&?FOZdQbOp@<zMEV{Jwru%qUCF1UwGeBS
z&|dsunDs$<+jGR>?dLuHj@qUKl)mqvT5@AY=6$i6c)oG8DVo(0Xt!c}j3lyY+3}Z|
z`v$bbh)2k6oK<N{F;YpyrJx@VN}6NDH~$jO|EDwaC&l>j+Rr5=c!b*B-G>CuVK|M3
zKUU6*Q)wWzcv$b)z`sNg7_Gf*XsiU5%6!M9_>sU7IffC{Z}_#pSj*p^_0`U=tc<Pv
zkI-l#`o88__1AEl<<FiF5O+5}R;j*_OBWjB+en5KKN_tO3fv*{+NAu`@BQ_+R^!RI
zbnk)2QAN8)4Ou#eXvy%uFyQ(O=pgj0ReR-_7D6pMZtoS_a@?u&hb-Uucku`B1h}|#
z+_sXNB?=GB>3-M{vUss(N&EX`iw|6<{Vm*c?&E^jXxF)O#=tVogSNv3B%i-;Fnp~_
z*aKW9brF6xE!F*B*Q;3JsNl=$RSw>~#)_FIwAQnOkneU~i9O;0$xQ!Ii_S?ad@g?k
zZuAqG9`<<c#eaObCr}UQ-{q`p@{{9(S1ZqV+W&8&{qIlbe%f-9>g*?(=W9=fGWSgX
zw4O8R-*z2XLlL|lqtq7jqAY)=G4b4MP#ZxQh3K}HZ4~m+^8P~~{RdM1U0mFm{9ujm
zA{;+iapZrynSWW~KbHP>d<Af{$f!~5p=C#2QVI{G9j=3n;I+J&L`g?+Re<hFt@xWY
z_UkNj)~Ojx<H9P4E=^CXuQ0f1%ZbyiUpqL&W>Y<4J{W#YF?oFg|7&#X+x9@ARifu-
z|7FYQs(!*?cd?@|W4mHn$b7m;(tkTmpD3<wTy^|Q?mlPCULoy4YijK*qpV86Esyh&
zjp_GyG$pRXLz;3o#u2?>AHRWV{!@Lm^~gyvv#j_+|EiYVR-J`n;nB4P0->q@4+P>^
zNvF21m#d%~1?3IL|El~v1(4}4O20T!4Svr@xd2{4bL68>pck6b5{K_+j$WNPeHgBE
zyJDaIkA?DoP4d6L?jf&uwQq>=$YmYycu#|#zJplRPC=*0`V=#PAjAJr6QKOMN&a(Z
z-u-=zOYJ+yKQzo`D-(iK$YX0k-0A*}Xk?rIMRo2xaqRs!G%Wuq2=}C)19mkar4n`(
z<ns-AE66X+#~!D;(LTl44I8PqZgP~D;%#8Nf%O{tJMB4Amcc<9s8O%I2hAXB_)coY
zlHOWR-6neH#das}entqa6%_#6p_UlWwZj(*MdO2GB1u3=ut<uG&{bI=4HAV~C{7Pn
zBpkZf?-cRv=(Te}{h?M&O3abym#%X$!mMTSo_^Z$=aM(5um3c^UmZWmZ$d1mN{J0i
zxb=%azI+y9=9Jm#bl90}1!;-T9j*Ifz*Ro_m@Aq8f~p0cZ2dKPZG5_&C_!x=4R$&p
zl~b7$^=JN72`))lzEzl^ThW!!{p1aO&%fj3f2^DSzSsFz>*TSMa`~v`KIoUZ{4bac
zR`r#~abu+xS@0fbJ6IYGWhb(xn`!1<w(9R)sFC~;ctS8}_fc%8u>#t^?TL&A&&jH#
z<+7jTQ0hr{S}8KUx*-nGqYZYRcGf+=`@k~j+xnL9u<#Wgud(g_JKlEwF)&bvP)XS2
zC7EDJ=6zvPBj!6#=*wqjW{l42($YJ{&S`NRV;f90P4ied=Wb@q7MVihXfA~K_CmbF
zs-uFlP7iu9c)T`E<`d_NW037o?I7<1x{L$Fa!C7=M^$bqM<jX3<s})t>v%cN*FN#Z
zKxJiO`ORCm*dJB-Ys&Aw;S`boe-P)cTPFbL!PEoU-09U7pbD^>2XD4aUl<dBmKT*H
z=dEF%hIyVZ-2CX$svQa|o&}ie>{R~;yo6P@(Z6I~6RymuURo6xl;j7ovHADXdLVMk
zM_>qRnd`KB<ympxT1d!=VCPXLKc#{AM-!OD5!E!s=O*B=g)7K4&wWi=cF)M#pZl(A
zq5sQPwlc3TmEvU(yfF<XqdhZ^)&mRmdHxNKkSS<CVmd)OEW$Rc5+DO9P<6qWCe6+#
z4r5~KU?uzi9poQk^V^mcNt<mZns0nh*M>g<7N`evF^ytBgF;wHBMZdxHBe8bo+wdK
z@5#TjjEspJgG0Hu<<Aj2QYatWdZj@DinDcq`TQP6?(S-n27?DezPb_M<X`Hx#h))q
zib$eRF@6ol#1B!G#gUTvz}OR|rcgV-%blXD3~n^sX!Wa=@0qjaW1kalAKd2}P14M&
zOiOK<+^CsLH(m2An!FpZr_ZK0VuHAZ>2|~c+bUYyt@Y(f&FZnbRwwewfV{*pN4JJ&
zoNA?WBx$Xzf3KMGga{2@aIa+0gQrZRF)$M+rup92MYn&#<v;)S^3wqDFJx9+mZ3Q7
zQ-DyzLb)}{grX{2vnuiYXL&0dMyR)pr1h$LSXa!gm-mqw{Y_;fE%M?Z1It9=W8rL>
zv}NoG*C@A7nU<*0V&I|}>-jV)XM1D(R;$NrlI*VX3NPOMo~{eW#3jyKB1`F0W6cLj
zo`l!c*;d|irK@K*cYO3~U{?}~6oHqoj@HW;|6}Tgvr^Xv;GW^q$na`dOUHgnV4E9f
zn70ekW@<`ON5-buFyATpolN;G0OlE=jEj#Yr9*HdM!sB35adLWE#2Ihq+`M<f!~)9
zA5;VBg~KoGXo~YwtA@;iE*qE{!_;Na*!V96&XC{%-lcY}Xi}OYDE)BM@!0CIua63@
zRb0e}V0<Q9O$;3h>qkC5pq}IqZDSO}@tLx&Lr~;lY5y^ZPiFc91mmSOk0c~|Nl}CA
z<k(jp$3_r{Vh%;XB-Yu{Xs6C5*<|%QW>H*rFq!;xXzlF;93^-vtcudHQ@6`ezOMbB
zJD~sN+rR%|^t7<#8dQBLTh(!S<gvJ^o)T!%u+uDF9Mps;Va2WN9HiRPWl|`A{<nLI
z1g=_@IkF>cBrbjom2xDW#izVrUWXnb(HfNoR~oP11ZdBX82cwz4$<nr7bC^LR7y)Z
z<@YR_3KRHz$cZ%4?e_LxEnzK)Asz~beh6-;tA-tE^kNYO5?D56s3qCLhT_4yFGdY6
zcGZrv5+Dn_9ENX0qLDE8u<mi9k>Zw51b^-SEKvEc!Ti_PJv_4uA&HmfsMWAg!KZEp
zg;ecqN0Z*KK{E&Vy_PUwhiaVZx;5^dr7WN&I_7m4uNLNhp?JjHNp~W5e0{7*Ipho}
zQRQ5{v9ED4zBc`bq|I)Zbh5qoB6z5!f*Y&kX?`pRZ|4KiT@=VjCgY6QkvWVPJxtHy
z?&3v>9W$|+AfBVN_L#Wt$uOZV*_xl+0MpZs3FjVSV)(;#q|A}R*sjI15%7-413&&<
z6Zk)J#Ak+EH(5P09w~7|W|LuYev&nTeE-WMJ4WNUO=Zn`SV?_zrW;)Xo1!0JKbb+v
z-F6(+@zyrT0nc2?GPJM+t8)w*66K$KuHNUYf3NZ2LFT>9l~gTUbxB;Ue0e)f>}XT@
zd0yVt+T<)iA$)RgzBzMUU<n%oleZWtn0N%Tv?CyRfXes@IznYc3km!egu3~J7P26m
z;%!he!sOTQ+tX`_F;V2^P|bdNH)wslVn^n$PK5>WvA^nJEy3JYs@SjLnXJLln#f}E
zpAn&@7Q<0MzHMNH69>Q`-k&yuB85cQJyT0kv+xOq%8Uykt!=P1!zp;?roINOG5Un0
zzcEcO57|os^9;vOA6CZSwzccx%AvImPcUQfEcjt3x+F;QE4s!Jgp{ISnUoP{s6k#s
z^3J&IV1qm^xa5f>s3|i(dqk0I&>*GCp6uMoq+dQPQ&WbVrQByCO4BXsmu1}CmjHIJ
zGn6+ZzGJ<%$Lw6V$YQ*>hbxBmgPLW)P)S`(;@Qr?VA?Z!W8zp7RyQ1L2{Tz^3Tv=)
zB$oxBkvTFC$r`{}lxJ}br~zkbLp5!enIRb2xu8vpbKO$OFN@#D&OEfC^igJh9x98d
zTm!Wkx!_hF%w2j(%}G3*)psoK<x-m7sKl%fo=t(8SdinIE>ombHgUkwt<KB9G~c~v
zX-e+mo*CcL5sYI*LH88^l1RtJkvZP{S6GkjoMHTYr2f)PM}LwXb-oa4hIu#BHm!Ie
zTHAg_3H(x0Sun0Zdo+N52#BdOQyd4syoBbCO=$ZF9^6!TYmB;MbQmzUPL$AjSqf|6
zs2)02S*<Ix)M(58*vA%8lGQw7a0a9&oEg|l)t(LAyLlDK+jtfH;cuN@L7#O}BlsxN
zy`4u7gC4`T1h3Scfm88k!-9K&xBx8c#2Jpwma*so&1Je5d`Ce_14LY_ij$AlX+#e-
zk6$^2vS6LmVyv|pGw@C+;yvJK*~vKC`S?<@m)Z=5WbvC!p)x<MmcR(-{pquuC<F*N
zEj0LyUC{7P)hJk^Ur<Sb5%eAqp_Gx7hO<IcaD(P-3$Y;H#)(NBc?C7pNS-sY_aWg`
zS#d7y!rX_a4hD>^utr)^Ul3S1YBn%DHy(uu(Ge_ch%9>ZJ-0&2NDwDl=5x<98etuG
zWFcgP$T*Zm*;UCmm(qjy^YP-uL!mv$xhNZfd)+%_g!ex1`9L#k_?ZkT<TsHNSe=9u
zb<d3sWKkI3IND+i3_?O^&PWK1?*yF30N-EW2%HG$Xw3%$;O5ta8PIM0*358h?!s3E
zH&1N!OtAsXCNAdY^fy`f=xPI;Y<RayzsX+_CH4!N^&eQbPRu+rGYnHDoWTImChL#u
zZz9G?PnUEI^JvaleL%Dio;rMgr$4SEXiDxmk`}R(voo%={*qcmS5f4oelGP*Yf=Bp
zL7yDIV@v(?RhFZlsa<RBHN+$iBv)k~1{A>&D%pcqZihPEtSFfLT>sEHu3iI}u-Wd{
zGtbHaPvjTos9zB@?la_IinL$poM|fNAYvEXnQ1<D9i`SWIlt8#bna^mc~ASVi}|@P
z>L-ewDp_SCMBNLb;1J|UsiP@5a^R;cC&!KnpTs50OAhOJ8wJJdpt{;7w^7NMgN%15
ztAAIemo80r<*K?vV&;>{6k1%$MRp$h+j^w`s?A^fdbJ3B4N9s2Lz+iK92LI?ZY``2
zY`F#Fn=7g^g?xBU!;@EF4lS{OO>r=ovDC*iS3X70Y?QkjiRDD&p2#l}#dW!jaYi1~
z-PeKb%p*>F1gD*5x<IydK$=brl8iBNv0eIp^Z2e%KuC3PgyG_m^)$4XpSmM+WZIQC
zPpg}9r_E?YNS!XoDL+K{b@)xF#p{iRH>EY8QQyw6d%DK|2Z%EVq-G220<(jg5SWiu
zyf|gqh+7<H?3pN0$a5?aa7FV&3l-18pG2N$A%}K~*2QC7>;FKdWMlKXFYIgN#W$xv
z+|jqKQeN^XoS1!eh7w$|Ipxw}Da-eA=U^(yZa5kk%da}MxluU=1~P+U{F-K9B_nd?
zs@yAAYwc($QuyJV{*4kXaER19ZuIz<-+GwM-co1C5n6phTUqdfbpWDsqX2hCWPQ=l
zY&X`_5%d5)dEJ)zg5UUkrz$x%`~uc;OymB|l`UEQ`4y;vL7x%u>eXX&jQaL1>YO=B
zXB=F-txg{NMD!4BO>7;!$FQ`46Y<q!8>c1o#)HvD(b6e*BWR-EW$q_9-3uTE*i`bh
zb#<82Ai=N7A)lwtrh8xCjr2z4V{ZQ)C(UO*5x)&1GGMr17CSo8uc?}2R9?3h*}^7z
zA4Z?Sp#z$OoAk6Mx@472KCxrjB-%V{8%ILZyr`eDNUQD`9{IV~-VC6(LtZ~hY;T81
z8!@m@^$VcbdI=`7x)a*aBs-tX%^87HK)swWl|^yPK^O=uV!;6F0gQ#8)7PX5G?80o
zD}SvkeAJlEd8dg#_sIC=1hjpq003ZyC`rd_nr{}<P~XHENv-*g#F3u)uh{Xjb<vqQ
zIolnWbm~1@u$eTg+9ehPIb-K1x|+zXb4Hd1H>6v`Re?wBy3YlbbJ6BsUP(YDe)izX
zp;l0u5EFNasbG$A_^EZF27)D`t;ux_@cLoFoqsa*m4!xzFs}0Ds)DtmdSI|Af>gjM
zL9h}Mz8bYa+BlT2nJRJWKm6u{ie3wdweIJfsRlIu{v7MO{BU9&Vw!g-uA!-b<|yrd
zMhqs580F5WG~onBPJ@P0w-M6TamFMU0gSu3J{TE6fa#Ovx9YL=RD{$0YfbTALV_XU
z9j6w5ZvXPshSKvvkB?=9g+RDdj1<Azxc(<d2330lzsn;IhCI@^)6kq8)pc@gm-{fk
znMk(dSRgIykEQ_J!IsH2vM?6&`0&z&inW057HSN|zms|1Uvc%DubgbZfrK=Aq><1R
zN9(v{poAgL<<x>9Q}z4Ve1rr2MVbuO)<M0eGCp>h+*QV!zgAU80Sa?W{pI*0CxYYY
zjc^sB#m%3j-9y~?VbLdr((@nJcqcyTI#N#?5p#s|x)(ghDsiwt|K4drvoVlr;q-0%
z)F(4?Y+7P{-b-f?Qumw0ktu7a|Nd~<UIPI*AJnnzvKDHzy#4m7*Jl4sweDs79-7&e
z?{%1&R|WJjJ^^-*yptC#hM6>2<o3hSQ^UytCFHu>jrW+pW){HsWr8>^YT=X4CcT^o
zYv#PliixipO@F#s?=Rawc3s8%sJ{KT(VvIiHKIQnL+pI?ux5aV>6=t9moONbV@anu
z8O>M&<%Zh@86^#-m>N3dbzBlR=!XE#0GPXDVYrU<ipQqD;ozg!5(6OHoa@{26?5zp
zNXD;v+CoAJfKX7aWUL-whPBBJpL3sx<pHwVrHbSRNW|R3#Kgm<`D;tp#UmQ(D36s*
zc76>3Zd?G*^e`No*z3T_sip$;bOwpaPn~583HkB4=XJoKNYB48O8of)==lQ0FA^ms
zbA$(PfJygJ&SVUv*LinRGfT{(R3XAR0?`udt>dRAsYXKNw-f%o^*>anMGYcU2n+f<
zZaUoi-S36mF?p4fe$38C3~MH1s~B1!WlJ3<sja}1<<bVnojW;)8f<yE?A)a(dZyGd
zer|FankbAVRn#YBEQEAwhLb2_Y5&qHc=pYG&ggvMrpqc3qhEu8H_OJFh{D{g;qn|x
zy16vBmP(lG2!=Ecr1DbSSjN$Mz_muF-34im-n3mY7N&({!3%BGS#m=g=VaJFFQ)i!
z_xgR!!?ceY82&6{G0<zAaBTovBMg8(SI0K~?GS{t)<MM^<~<uG)-5EQ(F5d;j1Y|F
zveQ8ZmPW$*;1W|yUxPe2D=QGmwH38|2<HB9@Z!oRQ>Ldr4FUKWi>oj-gu#L0dt|MQ
z`-GoQ32b)DtRJG9mdj89$8Njf>POaAL8mOn5{=@aje1U$kZ3F64QGCThRe1@&rs(&
zU3=dxf#AK@mll5Izh2PzYEHSY#2~+hU1ssJOE+PJ;07v%5!V3JZ8<=(glbHb2SAY#
zt3N#ELGW;=$FYnp<qg$i$!<s;ze!~rBr4em_^9-YD+|Bg`Xu`4*a|Z3<WwnDR13ro
zagEg$_faQ0_r8z-3OT@dkSHJ9Qgw;!Vpb*GG1^^0CGd^K%!tIqo(j#2T&pkNDYjp=
zb7_mY&fLQIKT!&L5%AioU=yI;8%ZTS<BIDqNl{obV?MIlFQysY2$X8agmrQ^;0-QE
z5Cw4nDb&+YrFKRU_u?($dbpMjHkGY|%Kb#cW=zHA$3yfrhw|@U#k3c3!yn&kHkS6+
zhahA~^4<tl0#H}QA;oZA9V~P6wf&5UMA%erwJJ>y^rDx>P8c+QS>9Uf|4y#7*8Brn
zX|A(B7FtTSJz4@ZO|22$R0*fBYEDIs8*5SkQb$}vYfOpao?bqd`$ebt>Z`{_@aGds
zh><gZOqV%AU>%aG3lhWAgtHVCw?)HY40)U|97`*4{5@f|(AM#23Df^+h*5lG$`=iM
zVsHo`*vLLnZ1l(FChFq8-1$U#y2P|f4^%iX9Q^<ViZgf2EX(Xk)337xtQK#_l%Zs<
ze3ww;hBDXJI&J^d8~F2Y-~RZ)t&ty}qW&Z%FbJfP0Rl4Nm`j=r5CW)&8d$`Ub;D7%
z4S+fpfGg<YOjDj<jD)6^PMorh?s+5SO8v5oKawPMzOnU>E0fF1Vt9?a3$y!Qd#?R<
zsw*t}^oLJZezNmS+c%ZE;}M83=`L&pgD8rYLMU7bs9_vD1sss@VW+WE)4=XZ{*{Sz
zOsOhYvda&RimlI0aaY+#PFpKg4Wf;^D!a4<b2cHVSx=3hE>KR(gh#y;U5M#2F=LP)
z0a}(f$FQc|o6!ty$ERPd-}Cc(?|-o3lQ(=g$1)zIMm*GQL(T`Wvy(u#q-Mg{Xi=bP
zL>U(ovv?Yd!L&8W9o(p4hUoVE8Q1hk+ESD|6b+-uLDl|w`uIu6UUHAB?W#opuT}7&
zr;9*4Wjv;}%C+5SYcA_WFUN+eyNj)>C$E%a?YNk>FrBw>d8sRep41l7>0CKgO~_j+
zmP!ddGh1;87c7xQ8@e5xgAraqFqc1F*!zFJ`=7%~u|L<MNa(Ci2Ht-zB$S(4N+Gd&
zYwL3nVd~t4tz2QVlu(794*>SGIN&f2mP*2d8G?-3*EBzo?jO-gCM!eqpxPA0a-%A~
z`4i;)%3o|9ZO_O;?yh4;6WZJ|c2ncYQt2cMdz(uO;99{=sxT%!#l@x_F&J_vu~rdE
zcZR0ZoR4E$>9d4ZN8y1t&-Gts_`P<;tj!a1ou$m7C+`KQK8VZfb5|k=%7hB3D=Q?Y
zBP}{qDgh6TM6`luXHK=`LW(lPyKY5byxS$N>h59J`KHlesLmY?pVoL(FG-EZ<cl|i
znKuhb68F*S+T5mT7S<vQ;jZ^A!GJ6%c-~ec3KCSEkuK^hlA~A~b>o^S^c=i=h>*TU
zfhNXGyvaHKdSSqULZA2YFZjx~awDn`40DEk+d3$TDO7eg(U}BjhP*EV(dJ_luAc&3
z$92TSgZ9p!qKS9G+_$~N<*V?sRmK-{wNV-ik6IE1pGr@r`*`Jaw2=GBq758w?I5A8
zQ`u_5(o0+;DD^nJs0OTl8j=gbA>Ls!-#gd2f*Eovh@G4C*G#$zEAG?7N4eXA;H!EN
zxwQcbvI>uVD$b|i1IQ1grJaN5yzsz`-OTx^nSkX=vD2dQ*oz)wVYOBp2pOCNIT$HZ
zW@A06L8i)4%j%R}7Rn|hL2BQf6HXEPD(jxwjiQrB(Fdg29k+2HktTbGJ-0I`7>>t4
zM@#>&So`;MKD7R}8J94SG2qmrUWf^Wdn$dv5%`&{Mw+00aV?@TGM+ORAlhi*O@iwE
zMQ(-CAYAn{S?WsGaZ-t08vD*AIW1k(jH^*wg<V`Z7aa=jZjBaB9-gH5<X02OQgB}J
zQtAN*sy{KODP`9!DS47B@U@Ztc7L9OD2vv!tJ6tU=*f-$H!Qq*)kVK^s0?9mw7aBa
z0-Z)7QSqrFcsA>XvM=T9Dh=3@h~BYt<LELMPR&j94VK2l(UqSU^`t<eLvtxM;-ZqA
zK&1G#q6y9_m#dh@W2^0LllbqiLW|N7v}WY|xU)n`ZNf4la8D<W+u|ltH~K@v%c$96
z)Ctq-v>F@TF0d&+y&<{2v-U+IY0-Tq*F8FiozjaYiK87>DZFXqPAO`RR_tW;){&&Q
z{mwMM5PGSs)z1OX^C5`xL`5t+us_pNSQJ3aNrjaEBtn6?tt4`-htQ4_!1UBbdNbIm
z@&W{=ci0S_P9cF1G|3Qy-zt!!8ziHe4Lr`rgIllKK4)hAfM_cf2jm%6r_Ayx_gT=;
zUQbO>KH75!Hl=f`5j8t6W&@7pvlJW3=?w7j&QUO-8D)xj$b)7jsJbxo?e3D0`MVr+
z(U%WI9wJmcV<JKAW(8P6<AL`hKcL=LBRF|U_~9@CR03{w<jkC6aV5~uh^kZudx@r~
zu#u9pkqYF*=iV|6>x*XbezJA2Y%Vt@Ih+#Zm}ehN%Bu<?5|yKdR4l7_9T`!SXNScG
zcPyO=Se!zu5OFy?Jd5dZC&<3UvJB8-<Ju3*JS8U$L8MW-fgt$1K^^G{)BG~Qye#sT
zsVq3cUp&O^bPmp8YqtAK!^60J#@;zx1d&nfGmZ1=1_vHjOO(UM#X}_#j0p>qo|%ez
zu@sCCkq38%ak-TF=|yJi(N<mga#n)ok)r7=rPjLz?u)#s_&pFOgwZ&i?pSy3c4Guy
zJKR=zg*SagEgr2c#$8q1zAKQMNTWd#A_cLGrv*WezCE`DeA+9wBA_-jj5t+FtL>#h
zZpG1rJXP;?siujx%ThJ&W^XJ_2@j3HfU2&fxVO^e1sYd+3pfz>Dzkg4JT*LYgN-y=
z7^>@?_sCwJ+u!))!=s;lAn*O?Zkg7{iyjqWVXLfWre@EyyV%cr-yuM~#wATmsEtT7
zlozwh5~S*~k0g+!?n>5LVXVd_N~ahY81=!dGi$Aq!=tb|G777bv)$f~;OEq<fjpm}
zYWGC5X7MR`Y(!aSpww0D!bzhiO#^O9Ust8%;pyS&btFt+aD-i+mAaUHYN<-w3`X0B
zaVg~rw<?96LK2}`NYdt*G)IqMj}h^`8SmCljDL8a)^xJ2n;TMQwY2pX706FC62&er
z%{@^b6fC^%(Y@cxoeDT++cGDuOfffKJi081*X0f<Gd$H%Rijv`lx_N(BW_`b{(<Ic
zP7Er~;cuDe4b<hN{~dwXpv;sln?~HbuO@J6LvqAvj`Zj(-VTV+UsQ#CYCa)Mn;94m
zS<Vj_M|pF&b^=^AjhSNUiE!`}yR}lH*um0K*ix7A7&Dw+c=jyyjBh>_EOOapA?-^u
z%F?>~540OfUGoNG`0!Sm2yWq^m~Ah5b_aK+AZr-QVmXbF6&}H2a8bsoHk!Zu%%-;@
z(I?ZNgiz5BB_<QO;UEatQ`xJw1EbqfX?3J(H_?;@I%hsBjiFNc*hqvA&>8z_5e@=4
zo<``hgC>F2A!80;ERA&+vl3<^r^CK?J>IN~G?xu2skwGoXEZ&$Olf9s6p_vhw0WT!
zr&W_MMdS!F1C#s$f%9ib#R^5pL`<AM+rdKVOX7-L(Me?y!{Xr|-W~^y+h3)us5Z7m
zbW&?Q;Eqf`E|A8xw_8ErAj^)JbO+0c1L9wreB<WYk4uw6J6*{XDso&n1tcG}0KbTw
zSeov|M#reV6Cx(8LM~?InO^g^F(YbYNX&fX*Ci7*j-7<8YI+h@xYe>c{ku5dLh4%S
zadpKESU{9w{JE-HE+}fIVv5@5Dml=0y&@;Npk!kCjQc{qj@*4f5ytLW^%kD{{s(Q|
zC&jss*xr~r^>&YL)nE*$hn>RIt;IQo1EauQVGpxgM9;wCCV2rkv9<y>U|OvmXgx5q
zt|xVV-1Sv>1oZ<QJ4%?0DnXx-AGdkT`0)cx?`C|NHYi^S7NzdOO3gfH@Bs{U>a;1&
z{>99I#(!KIACxVL@h;;od5Tp$4A}?vbq@{e7UT&bceN(dCyCxcoI!S~Kqmof-+_jG
zlQ3`dn2`Rp;uRW|D9xl)`{XDywgq5=-7Nc@q*bOJwN~_$n)|HfgY}Es9VM(*opU9l
zReBraP+yEALS(90UIq*$#1~#p)<!%02MIdK(mwYH7Y;U?LHCKvQ;il|GNM%`ma2UO
z4+<FGTuo?mWiIvgzNl4aOE%VD1yYV4jx+Og2!BI#{>`V(`F}F5zhs6SEuz@XTfy-Q
zJ_NbHxUW!Z1|=}<Ga}7Yz2UVf*v(2z>(yu*x@#Wj#e-^B77qZDzO~g$;})xM41Z87
znY+~9l%9K7(I##C#Q0;A(BGQQR#-WOf~0s1#Y1dIH%vCkQk}+9uCuHd(bR0N-u@Q4
z{k8_Mhrl6EIWC?=&xb%f^;_#-J!J^Jk&8=VO}f-}RzR}fo`tV{P^<g2NMMpTe|y4n
z#v+&qm7m6HJn261IqcNNjwZU+H4fb}KTr%-VDM>lX0~R@9^`|jD5lZ!ina*?GW23q
z3NG1h>w0A`0t<Pz{T6lTHhQ3%dw@g_Hy2+CaCfmRvxCyMFY8@m;ziNb_L`t(dlswy
zxT!;He!Nred+*uCAKdrdiKWvZNf%Nznk`<dNqgqRZI0kaaNr2VQ2L9vn&Nlyr_(&U
zM(u-SHI|+80+bvT3WZ}M(&(iEI}S+VE~vfAh}mTk;f}}~TCAECP)wu|{EbPq2w6{Y
zVC+pYMd940>SeXufk!IJus)2V1nz*UD3vpBm%amJB=sS1ImNE5rgd&^ma;_0TPlD0
zaIG7Jz263Vb|DC(H}BZh)*b0(&f;*x-i12Yf5Z%1AH>c}@~p;^rS?h!=9HN#><SxO
zmYUY)<5a~+vxH(8Y|T+GB7}j4)qxGOhPC5?(CO3Z_r#}J%T#6CC&+~w$g!^=`$BF=
zgwsOVK&037b*1Y8cLBB7ljK3Mg*)6*n$_OVEs{nMQ$_AOC2q+PLxw6%yVw~OgBg&|
znaQ?!|IL}-ke3=a{GqU$p04h<uN=CfDsBSXvxdQRv9vlMFTAy$Gmy$*2b5V(cvAWd
zy+t&?<)sp;*>agaERvQdSQB;l-13gvyv^hgv*9Tdc1RAJ1`L*AcQ+}0H#5c`<KQpW
zd_fGyt0M*W^ga)IHgS{-&E-`4le-4Dh6&6y_~IalnlWmIE_;W(`Mh$^sOO}xNMD0w
z+XJj612x_23WaC4!m&cw4oPjagIsg~0rF${iL085tCYSOoc&%IG4g5m`AQH*0ii7I
zT;AWf_;~jFfb=T}%v?u@MIc0sr}c^(D+4ELJm@Je^bWVA#aXFf{NmPIDg*)Hu+*KJ
z&PfvwA?8%rCjVX`oQa)eMEe#x;H%|!-Ja8u(OP}`J4h9Ve^Qv^GI?vI=>%$80@U#C
zoeRA#ti-RgLPSWqFJr5J1Ogjv(vh2VUEwY77gjSva)IgLifgs&6lgVqsISnxDw`Io
zjI&VjkUUyTS@C2~lNp>GVwr;n)kNQvR;NL-#|&FlT>-fcTybE21k0m_gq!LH<Chi*
ziK9z|B#NVSm*cQCJi3#n9!gieHSXR!xBV4tSEk=G?Lfx@g;d{S><+0kKs;6(1R!aE
ztC|<H><g=7Re%L<rf^&!O<v^S1_~VM^hD{xYy&f1EIY*f-fOcBh*=Jxp#b2_qSq{)
zCWt2~*L$ph`pYiDB{vChWr89?1hJdX*zGBGK2Gj}GhYlDYJ9!q{Zb@4rp@II-ut)I
z`P}AQi}IR~NegUlQh(d?H;}khDt5ja35yP4mokVFWvQD(pxZifdyF@(6E!#P;z`ZR
zYaPj0W%E#ZjI)MUwp3QkZuZo>RfqL+XP7`*3G`}z5;x!v2Z$xK&5xxk5l_Y6?m&l<
zJXQFB0Z(@<TXDKv1T9pw4JpkvSmLNEH1fdPBk%S~f_zJF^O9R_Evqu>=ExOxv1^{8
z$h8y5*FatEPoM5Wj-z(xhW8n>b`;K#E6Hu3<T{d$JpX`NmYSich%S#BD6IC>!EwQK
zWb-G+mfO$Cn?k<Ul?_#KEE%4fbv>-(0*DfL?O78@PSx<!iGH<oCZsK?m*s$pW~mT!
z)AXd}ioEh+fUYe^F?{&Q&J;hjiT^LF|2D607zoztAsRVW0lO*qH)>e2qoz%SOst#3
z4C6p3N90ORi?Io(GH15>DKQpOd^t^AF~2oK9OkJQX10w0ZUI`5d~lqT6GNiM2-unm
z+X!TiW+<Xm76{d*ar%X=3c0G!;}?7yR$O5->*-MK&zZQbGkt5Uz5jt?%QdxWlDn(m
zXy`yT)<Pkj1hO(@A|{jxCtysZfaEwgM=MhuWlZW<WkokES81j3^8<tO7WKSJ4)#(1
zpeR!F!gQv#k3TvVCaFC67l_LuK>n=IP{>eiF+r4i-<MHFEz8(fTl@<vDV0uesWfFP
z=1-BYzda=<l<#R(KSbyKI!|EUK;Vn}ngJwh;^c~|29Mf6Elez@zIYP2-0g&pS(djb
zg4NwT*bb>j(%DsV0VKF}(O2x_%XMMRZ1t$@8N>_QJRWgl>R-+7EwnjXHtxAx;fKL%
zeRik=CTh0OD}V(qv}u!^z=(Gs`5|l8@((^8ECR9S_Q|GACV*o5K2r!nfQoTBk@~&>
zK`2z3<_Gsoqj-)V@W$>;LX1NFsbRV*E;1}h@?)O7wZE<M&wmr;rpo&|UrMTRVT#fR
zKpp{9Mr{ij>OKBqD2EZVJanqYTXaA;*@}0ydxv7Y`P0(Y&ncC-i30#lWpP!f!B;OK
z=+VNX41zjvrp%sQ>?v;b;LMDRb${jSvIkwmeT~XoAHlA9CII}-3(SeTfsC!-t19)}
zt3(I5?2b;YJR1bfMw)~4d{0%L$Wre^)^2R*R@X*jazXK4Z}9%V@!b^Tb1i~vLOC^8
zve5&5fNJ3eD1|O8JLb2=<ZwVrLa+iEp)>5}4Tat`TTZl?>X}RNh=}e4ZtRU=($u%K
zNPrYt?y`+$fL{XaUe+GtRi;)B@J?f^&7c|dq>zc4`+4^HKCis9A{wCJKJwhbNz0zC
z^*YjI>oXk2MNacJe+PVoooi{kCLGcOEne7M_6q>tjsvAoPKQepzZ2m0QcSbd8ol2e
ztOuFoCEo0LRSXcM$I&q@Oiu@VfGm(<ITb2HAC^0XTwM9f&;)_MP(h*tXH>*nVI5qU
zTKhJ)+<6yC4t6NN)xqOxS(m4*Amcqe)@QnRsSmfDMXU9mpP!iqOWq-Z?a!s#e#5QR
z`nsbdc&Skc{K8fv#pFyANf`!+m71XdjyOP2SdE_{Vf(<VdaPL2rDkZLxObQ88jl}G
zGdbMRhT9&>4Iyd2<Fih<ed2~D#2lcOy^>G?Y=zL12r!eLYE<O(=@8XG2owHF(7(!F
z+^Do){w0dC3h=UMx8rUSa&?+IhM*F?HBJ65_&R{U^C>TMSG7Q1i&Dqpd=|HIln6`|
zxRMc&J2M0y?R-_ZqS%Jiv>I^dFJkx3bv-mQs2AN&6=*N*Ny}|U1TJUKoQX~meN=ui
zWzO79UsW6k1F9up&<n8$%<i@uEUcN-&7RZg3604p6Qg5dk+jOJ5O>5f`6*Z6llHZn
z<bek4F-+zL8@?UCM}419Zw9tK_@sZmGS8<4FeDey^3$9EObM`*rlM@PRmDDlebee7
zfFnS-OISdbZxva)=8;h~$cFnIwPre`RsKvn1cVl<!qe7FHphx#wxi>KMn+nF6S!C*
z@<afD2J=1MhIb`{OvpfKw8&hTG|*Of0C=t{jg~^m?~>TfS1?C21|Q(~ZG$=LCN|2-
zADRSk|Bvw+pcXNc0#aMz&8z@$U|~c%ph(C1ji}`aylO}CW($yJ03JQvyKs7$(;RY9
z7k@wf5tK68#V*EcwzgfBiDr*;v_7#nSxo{k-J?<4CRj?vfZvKn&*2|Q%rmVEvy)L#
z4$U)R4MB?W7)D>(O-Khx^uqXNs|zOp*XfE4l=;u=;)%N4;x9f5OP!hOL(1mJF;P^X
zmQFuuSqRakIBzyO0<T?o|CD<tQ0ys~Xg+ZB51_|N0^2qSGW@B8VF1I}DO_+B^6A@U
zf)xioK!*M@JQVF~{}=sX^?CxGgSF8ud3atyfb4-X4U*I0j^&4t_2pDmbgW;AM$61r
zC6?b;52)~Z1bJ$)K@YSPE|6??Fp@x{T%a?+;4AU^0|1+_ZFwbgOxmjk3H5YkXzk1q
zS!|x?iy4Ed+>9esZ%a#;lCZZ<-p_m1OsZEWg+fWatZ73^Z8X3v^TI)GKqm>n^p5DK
zDY?jw+<Cy0^Hh^2Wp>gSn+QxPyZ1$3TenItNY@_(^myfDID5OtUxSpogZGl)gzBNR
z6K+@8OM&2+7cSiyzGch7z!|6*lF)p~j&2gQ?4~|*;_ZQv@!iQ}*7G9u`eZe@vIMA@
z%L0fGlndqqDz?T)P_XFZ4MG!%Gi>)HPj7*`Vku_HS3yP5GE{mxAa1?yUs(O8fq~YN
zEH;egT4mDVSzU|Xk8$?|+EpkUj;A+9;3F&3EMyifH^T+&Fmk#;vLos35X1VcMQiaL
z&6ds=S0vvO0FeObDCpfD-I<=8@qh?K`b`}BKnvJSw+}-c2?VrzBX5D!TB|}9R3R+w
zGbZlcZ62jGvnpY)sQfFs0fwg|6lJspJC+1!KzRfKy1zE}6_f<JLvv>X{X4Be6u~=m
zg<i@(@V9X_SM|;|&-jD_qQU~utsy4`77CBX5vjxe>c(9Pkek%UtNq0ToX~n!k1WuU
zf)qZ|Tv4;aZ8*AUxqTTx>N{mwN2-eLsep(><TO(WJ$7x4P0Z9>{);0m98vRu2x66T
zNsb={s4+&6t;qIY`gI?xfL5lg_~z~6<>KAn+2~bn$ZfCMC_wQ~;5ayyWMV`~gz8%5
zkOcx4=#|6Of(3z|UK!dY(DGAl5!xe(bVgxq`?%v93+l@g9_?~)RTF^7fAU={qq&P9
zk7=1#AsOyaKqJ%kg;foYLf?Tetbb{CuFCj!vi8-humfaO%CD-VwaVd)dUY&jIXPOd
zIx=(|>R;WfN*usBRE2POF0^S3nFeUp$dKE^d|?IbmSqQ;K=#BD0a`^SQvI1oR-ZH+
zGdIAx4n(^s`>oCdP}IDYA+0HO{SB2x0Hv}(p9)1w-8V_K<)SM1TnNDv@N$u7^;5=+
zAvJK(O0?!mR>GCk&U+PQpxl@!4S--;S1`~CNd>A1pb5io8ips+P@b&Nz&sS-cp#~N
zJLK(9@ZPzq5BzN{Wpn22-dD;#s3uIs;e{#}V9E0mgx-yaK1J%(qA21DM|G&GjQBu>
z*Yvp@02y>HJ>K8A$F(Wep*t@e-+JJcD(<PT8ZItj=$5LQDu4>zAMTS;#{?niG=GIl
zx2OK7mw;RRc541I_#+GI#kzj<3HxqHj*7-^5=q=?VxZfHl*TMqmW#Dbihd;?(H_M*
z-4=uflqE}-<+-ecb2RuWNk!Bx4?_i|N>vMI4Q8C;3+yY4IyTTy2he26+xr{<g<HZ*
zNeP|u$Opds9Zpvj?I=df|7-7B!<snreRXwvvDJFCvT6aXZMD+E+2)|dm_*yvtOpb+
zVoJHBYpb!)ih__xNTS{Kijr+DW>u23rb4-<8WBiHLal%b%q&8J0g^!>1VWO5+$Lm5
zvM-+J>2tp9Ci~@lI{B15Fz@?+|JUFDGBX^it%P((X-hVdHhv86t7eTvaJ+GmdN7^B
zGrpGoT|`FB6(e(4A_tW{<gJbNkA*S3Tgn5s;HnLIis3PiLTUbAVD+Ej0(H_*cSi!z
zM~#)utWzzSh-GN2`)Q^pm==liz651KZFy)aeU#VgSs8t&HS7j^wfU(UO4|yNEZ_Nb
z>|^B`-Uuzr%g&Xi%&ZfzosQ3nm_@gE7%7zPDQ`@U87qYTl&+`8hO|zv#=E@9W1!)q
z=(WDjn)xz$>Si2-%ZZ!dMoe|V;%L=zN&Id=EH_q*Lp9<Q;>~e%g{JImSJs*cc#K28
zjH-#Th$bK+J;YIAO$a;?ul|X>ILrBYK_M+xHu&qpD=$&md;n|!E`%$@tB2LOGxv)R
zKVR5q{6WttG4GuQ*tr<i4m0{Ve3`Fa1u<;O(Sv$efJ09>>W?WCO&|8K3$O^+*$^T)
zx41<UpG4#U#67canHJcDFazVj?mq7(7}*Yf!0vGqBv-U^4b?bO4`0V3Gj_>ujh`%6
zKsOX{lKy|9qPB0V=2P^xA?{PI(PyDfbsKca?K%}`@=BdfQcVa594N$tlh=hJAd!ZZ
zks8+{MeT4y-qG@;o&M3noHiOMRc7wGBIIOQvsAcB6S2r>cs!fO3_<bn3Xq1@+5rm<
zpu6auQI<<*cP-IMm`}wcN~C<yHqn^u_#?;4(au;HENz@6K4_vfQ`W+#FI`dOlrj1%
zDZp(}r>bulu(3^JkZrbl2@26Z4!v8dt{zN6F9X5`;DCKwqbIi{dfiiMR7(^e=22lN
zBC0wmQ0g74gug&Q`-4!gbKLWoF;ebcWl+c2!g%4;i~>2HEIfuBvewv2JO}v^M8(1$
zhV#5z*t&NLL>F=v*XRJngVwP8(Q6NrtWQNk`;^E5jG(?rjFqU)w8{noDWp0WRQO1Q
zjVoX+D9*QvnlOv-Nl+4=IT3z>o0?t0Xcz^r_jLi34)o8#2l-r7EUhpCh@2w9Y$FFy
z$Uv?$^kh@^`3?!dZM5)ZWl0uo8bmNP;kK-A*Up*Uk(C{h-h+IdK_|N?t*4pUybKsh
z&+ZICKg6#eHqEb)0ZGGl8LN?>%WNxf_g5Zs*2w&4+6kL}p^buPOZ&6Fw65%eo0+}5
zG)smbG`>&Rn*VmRKq~R3a4!*;L~3kz3$pHDHn~ouK#XIXbp!2$dgVsI559Y82!kF)
z-?T`=E<w&nP2H@*`7Mw1cssiPmT5ir+kyMkE-8=e06JiYGLLVnq8k}ageiT0l3stK
z6dB8?_TFnHOyCc|6BKK4n`hQjD2tbekV#_;I-~bni|l%XM4sxO)q(08N%Z$FJdr%A
zDR>3s@FS9PvP`DA!Y>QB0V=#+ru<$09`ytI{R@Sei?8a=8%Wg`Ses=c$snaGfHUf;
z0NVhx6)2e|mOU<k|FkG*>>M)9H$494VJX4lt})k*Y$r)RDw0V&QTt>}ll04@r-Xyu
zswQeU4Xw(LjN>(c=*_~6*9f?^Hv+_3Cg`PG+U{TpRxn2edfa4jcj~+UwjL7aiH`j|
zZZRlav%qNCqF;a}&Zf<gtq0hdXQ_#sWmwUEIKaVt5bv6H3KH;a<N=+p#4H_UaF};t
z%aQU8ybUrD7|S5~QZEie+*HL1w4dQx7#H;X$6MAuH<-WN+({<ZS6_*0N`ludLv*0F
z)0KsuZ_k|SGz3aX5SZry12K9V3*#!#46SkkRCyP2u=(XOz=%jq4bYkJDWdycB=m(;
zh#u5j#ZgOgHr1iW&KI_Z5HjXL^g8nag+MYJ2cnu%VL(8usX0p3A4OuI51Nm>Hfakx
zV<RJ_zJkKNu}sqeoJ5SEe6J(gP5Iwa(gdzJn@#NEpO+T(tugh6-~>r0XqlJf-a5TX
zA_pdfSF&dQgMo5i7pNyShSVN_**Sc<imjGoA2<>lEqT~-simPOZ;$K&oGW7$jmrjg
zo-8TwQrw0&&GyTjQ=Q`F=-@;rTN6Uf*RT_~_XGwu>wi;?(vbsT`mjhW8+==3zK^t5
zVF^36qm8m0tqlzBG&msZ6{cUky=&3b`QikcdvH7sT!cb;CA}!Jnj|fv6LF(THdR78
zz%CA+m(BBk(-Iygge*6b6;(|{CdQo_NVPUyL~75<y{{@8wElC`73r@Pw#7*;O#`y3
zG~*L${R4G!bYM;m^ldCvT&;CY+x$wj+m)!qy7MMN8oo-*$d!8ydX-R~(nT~rp|M<>
zU181r60K&sRMbzoLirT#W=FS^$8W+isIUOhdnIzJz1mRS<XK!>$h1#?u(^NjMDFG^
zF-I~5DYxUrp@9IQ;3{ORPvh;u{>as^W5d)JQqWyw9-WGRmQli(kf8^Qv??k}Dh>Q4
zklj181#TWXT7c@kvvjTxi>{to&+Jt^<qfL@a-_rt@PmOOlZio|w!nQ;zYS(ylN;xe
zpS;^WQq6K&7+z);KP%!sMYfT}cf-<88f;k{x9`f-#ppY4cnQ(3Wau0TaFSJF`o%wX
zo?k>!uuVj$1U3XL$9hAMYvwzL-TO2;M~05qz^JhOII4GO@UfbD_hkn&u3gKRt$HWW
zq7$rcOK-U5RpW5atD4PM5^qR2H>2BSE*-6%=>8GE9Kue|)y%gwzL;OYe<~%%YR5T}
zedT+FG_7XpzZ0#2SVyArBWGtGU56*YyR6}{Ov_@5Q^>JL-o4y!iNj0!nfY8-84ao6
zhmc2PouJYGD)*`g9AZ7Qckl+a2qEGl=#vEN8j_CvUzu@mw<xiT_XK#PEh5g><7U5t
z!_<O_AX--nE(DLJ`8zt8jR`|R&%C4|sAD(H-EY-ZviI+t*;`;>me&RR1sKXv7x=~n
z=S0W+)ok(jK&`%Vpz>^_eV2aMP9OEiZGW9X4(q1ZFvxgxD9u3H3p2fMR8kG>+sq1X
z#hWUDP%gZpSK1qXQZTe8R(%Xk8zx|xO6>7qPUDNtPWW&>D&r_z#C*^e`bAeuOuI^X
zK)@MrRx?|zQH+G*Vpa2Ps#o*(s|h4U{p>oc>(c~PjEP8VhhM{TB~+8>m+)R-1TQ!(
z3qIsqc;(pgdiW8+3R{GvIP$}*?DXY4vyui?g*LI6m~p6ZM9E;oy{OivZDl%Z`u#rf
zu|(A8nm}@YKlX}v*i3}n!b;xhelH)qd_4>Kf{Srw*qKl?(DM8s=s=md46ot)4M*WJ
z33nw8H%Cw%wC3Tl7Z(|M1KT7Fo`~wE4B(w!hK=OiD&imq`T9puNIm<_{1DI~b1BPc
zte_(Kw*v{j%l)1RaR!|i#XwTn%u(3DGric*J9BE5UsLDeck@-lUj!7I3QU)`A34~Z
zC++s{3%<vkx$rBEj`uYhCFEA7aRR3xkrWG5x^kM2JF8&lJ$9X2WF@9WQv6XQS7g_0
zU9o#chw}|@h0qrD6wifKXIx``niqDL)xyYqjcSbd!$w3+P?<?Y#<9lHhRpSa8dIT@
zM8l=djPbLPk2EU(aC5d;g=S1JDM*I6haB`2E$9*!wqPeyh?>bXZ=LgQ%tRL5zdq6m
zb4uE1O4Hb@4Mv{BD5i046AgL!d>Uq4gqqnh-Uf0uqQiqX{Q;1SSi;httfFGd{(xCk
z#dGQN`NHXHgDmgTKo%EomC(2<qQP}9f}*)fX`>p%|BkLsLUSqkTg@dH`DS~fYc%Ka
z*O)0nF+8g$<!NUBoj0!0cx^<GAVpC02(OGUsz9;23AH^A(I8F146kMF3p4%2JFFdz
zcph1fBx29P62`&1r#onBbaD%G*-U9MQR**aD$x>-VLu-<K1&F7Zb1l${bg2Ni!3Hp
ze<Pr<EJp5zGvXW<R9+4PDu}nz6~~=sm~Fysk0we;_R~yLW|K)b6%HMCcZSk7Lf@WT
z7*=lE{7X1ne}l?3F>R&nx;C0RC;w8#sQ<~fYhq6)Q{|{r+WIR3Tg3G_JeXJ$c*x*9
zo5T2Lm62cdh_`hJPEYp+=%X_7L<VlCPn<b4>!OjL!5A<0MMIxYQ@oktYC^fF5Z5>L
znNNGGuo`F;HE3r0@~X+A6SR!GatDcNd*u$mPI#@am(7HkY&~7|tutBdOGP<tD)><z
zMxD8c8c32&!6NvU<1O^1p8N58VHQSkpGR6{Zj!ePtjdR6z0Dol0}cx1^T`?}B^&Yl
zo}7m&coy+dt%9QP1yc<W`_`ODl)vukl##PhhLz}zW?R-Gdf0BSFMgjsLa|PEVw618
z`)7`ZZ6<bwkW9`a(}z;R8b#A0P&;wF6ma59$kV$*An<qLJrOWBAj1L;qnNqEfOF;&
zf*<{v6XK<w%Hoe<E-J$)UWn`UQBCYr!~E-ka_+MiX~M@T=yZ<p$cP>ykgu-`p79;u
z@<Q{#wi=qyl!ERsb$b>vekYuu?u(A-(jl#*8WYQfk0LGH(Is$mV0=#qNLmy#c~(%B
z$r%O8>8@3G#2ql<UpFrJL$;ggn67lp^s@VqlD9)3tcAYVQ`teMxC}bXd&qQI=rA4$
zD|6pNy2isH$3n&<+`T6R$oU*dq>1V7!qbFa)S`!yVfV5;!DYAl6tljtJx@6dzJ6Z%
zt10}8FYq!}dvONJD)&SfT<Ng?LRmj@@_KT5V5wT6Q;1_)DaNv6nQKBhnW&{AeXtPA
zQ{mHY?n^OMxy#2lIoCeo+*uBDf1{ov2xE7LFyF>H*^<+I#`U~-d<o<^hai>A#yv;R
zWq&lY;}lT%)$XgmZBmVg4S)16&h+$8Lw}x^&Mkxlt{rvYI#W^FB8z!0{2NxSEBPIY
zYw!Z{O>j`SWr)9^$h_@lA_+_L4W@r34@`KD_9RjQKIF&nQ0&BzG}IIGSB`fYF>ieQ
zu*ab)K@Q*pWZ0oPMhpdh48Aov5PjZv8_qK^ImcoISEGBr+~}V_te#xnpgw#u7!PJW
zS;c(tZrPu}1&O>VW^7~2QNf6T%+uj9Jhzg5dVO%?Y(bZLI>K7~b_Q=;sx$r|$PFMJ
zje*G4$A8hR{(5c*3&hV$H}^9R)aT^KUytA3@So&cXVIb6s)|@VQ?xz%)1WI1ZJi^i
ziI`XPp#nAT_=z|mx5y+;`3j_cqDFZ(1SuYGk<5)&lh(76)y1@pTgiV~iF7U5{pF4j
z9Q~Hry%DhYc16ctc(;<5i1hf%3qqL8d3n`OQA75Dy52>arcYcSOfFJsG54zP3WA<?
zmZ}AF!jNU}p?}N$-W;wjbujEC(Z-&wq0qZ(etJ>-*+t<Q-+BKYb7=UHYT%{U-v~ud
zc)MDzH_$z$inm=0)V-}#J16Gw4<W>sd0gS~_#Cw@Dx9|}Owtz3d&kV2>{A^P3xZ2#
zQZX-`g=Zk9@x<Y|y`SHt=!Tf~wd#V%P#QlQ=0?kvU9>6Dvqyd&C#eOAn@f?0Yq{A_
zLU2BLj?EDaa{WY)XGvqTbBg|0>UoBHTKy#3xjN{PPf*?-dUqhwZ$}<W0RCBsd_`!M
z9Otb>J+<#G3F;?bo*ONk4*w^2$OgSSc;oc{R}RU*La~VdoB#2&&J8S@^U;HJ6}063
RGvKph+pa&<z5mHq{{RwoT&w^9

literal 0
HcmV?d00001


From a006ff74c78b88cbf6c7a1ee9122a0528a0e844d Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 23 May 2016 06:36:25 +0200
Subject: [PATCH 0684/1431] Serialize application setting as Array by default

---
 CHANGELOG                         | 3 +++
 app/models/application_setting.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e5cdcc2ecc3..3e459f8b2ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+v 8.8.2 (unreleased)
+  - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
+
 v 8.8.1
   - Add documentation for the "Health Check" feature
   - Allow anonymous users to access a public project's pipelines
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index f5079f92444..9a14954b4a7 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base
 
   serialize :restricted_visibility_levels
   serialize :import_sources
-  serialize :disabled_oauth_sign_in_sources
+  serialize :disabled_oauth_sign_in_sources, Array
   serialize :restricted_signup_domains, Array
   attr_accessor :restricted_signup_domains_raw
 

From 9bb0d0b4079bc88134399f175ce9631005044060 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 22 May 2016 23:35:18 -0700
Subject: [PATCH 0685/1431] Fix Error 500 in CI charts by gracefully handling
 commits with no durations

Closes #17730
---
 CHANGELOG                  | 1 +
 lib/ci/charts.rb           | 3 ++-
 spec/lib/ci/charts_spec.rb | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e459f8b2ba..9fa1e1cada3 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.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
+  - Fix Error 500 in CI charts by gracefully handling commits with no durations
 
 v 8.8.1
   - Add documentation for the "Health Check" feature
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
index d53bdcbd0f2..e1636636934 100644
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
@@ -64,7 +64,8 @@ module Ci
 
         commits.each do |commit|
           @labels << commit.short_sha
-          @build_times << (commit.duration / 60)
+          duration = commit.duration || 0
+          @build_times << (duration / 60)
         end
       end
     end
diff --git a/spec/lib/ci/charts_spec.rb b/spec/lib/ci/charts_spec.rb
index 50a77308cde..9d1215a5760 100644
--- a/spec/lib/ci/charts_spec.rb
+++ b/spec/lib/ci/charts_spec.rb
@@ -12,5 +12,12 @@ describe Ci::Charts, lib: true do
       chart = Ci::Charts::BuildTime.new(@commit.project)
       expect(chart.build_times).to eq([2])
     end
+
+    it 'should handle nil build times' do
+      create(:ci_commit, duration: nil, project: @commit.project)
+
+      chart = Ci::Charts::BuildTime.new(@commit.project)
+      expect(chart.build_times).to eq([2, 0])
+    end
   end
 end

From f2f345e6048f80e4d6510db102cd046fca43d4e4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 23 May 2016 09:05:01 +0200
Subject: [PATCH 0686/1431] avoid encoding import url and delegate good format
 to user

---
 lib/gitlab/import_url.rb           |  6 +-----
 spec/lib/gitlab/import_url_spec.rb | 12 ------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/lib/gitlab/import_url.rb b/lib/gitlab/import_url.rb
index f1191cc3a50..3cfbc17b89b 100644
--- a/lib/gitlab/import_url.rb
+++ b/lib/gitlab/import_url.rb
@@ -1,7 +1,7 @@
 module Gitlab
   class ImportUrl
     def initialize(url, credentials: nil)
-      @url = URI.parse(encode(url))
+      @url = URI.parse(url)
       @credentials = credentials
     end
 
@@ -37,9 +37,5 @@ module Gitlab
     def valid_credentials?
       credentials && credentials.is_a?(Hash) && credentials.any?
     end
-
-    def encode(url)
-      URI.decode(url).size < url.size ? url : URI.encode(url)
-    end
   end
 end
diff --git a/spec/lib/gitlab/import_url_spec.rb b/spec/lib/gitlab/import_url_spec.rb
index 46029b121dc..7948386b0e6 100644
--- a/spec/lib/gitlab/import_url_spec.rb
+++ b/spec/lib/gitlab/import_url_spec.rb
@@ -19,16 +19,4 @@ describe Gitlab::ImportUrl do
   describe 'credentials' do
     it { expect(import_url.credentials).to eq(credentials) }
   end
-
-  context 'URL encoding' do
-    describe 'not encoded URL' do
-      let(:url) { "https://github.com/me/my project.git" }
-      it { expect(import_url.sanitized_url).to eq("https://github.com/me/my%20project.git") }
-    end
-
-    describe 'already encoded URL' do
-      let(:url) { "https://github.com/me/my%20project.git" }
-      it { expect(import_url.sanitized_url).to eq("https://github.com/me/my%20project.git") }
-    end
-  end
 end

From d83ce65c1a0a8bcec603faf342cd2d78075ffb8d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 23 May 2016 09:11:21 +0200
Subject: [PATCH 0687/1431] fix changelog and merge

---
 CHANGELOG                   | 4 +++-
 lib/gitlab/url_sanitizer.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1c26692f3ab..21b383b200d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -83,9 +83,11 @@ v 8.8.0
   - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
   - When creating a .gitignore file a dropdown with templates will be provided
 
+v 8.7.7
+  - Fix import by `Any Git URL` broken if the URL contains a space
+
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
-  - Fix import by `Any Git URL` broken if the URL contains a space
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
 
diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb
index c59d53b941a..7d02fe3c971 100644
--- a/lib/gitlab/url_sanitizer.rb
+++ b/lib/gitlab/url_sanitizer.rb
@@ -7,7 +7,7 @@ module Gitlab
     end
 
     def initialize(url, credentials: nil)
-      @url = Addressable::URI.parse(URI.encode(url))
+      @url = Addressable::URI.parse(url)
       @credentials = credentials
     end
 

From a69ab104de873f11dc9004edbf39210000d4e50a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 May 2016 11:34:40 +0100
Subject: [PATCH 0688/1431] Added remove due date button In the sidebar when
 there is a due date, a link to remove due date becomes visible

Closes #17392
---
 .../javascripts/due_date_select.js.coffee     | 21 ++++++++++++++++---
 app/assets/stylesheets/pages/issuable.scss    |  4 ++++
 app/views/shared/issuable/_sidebar.html.haml  | 14 +++++++++----
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
index a4304786cbb..172b4ebe7b1 100644
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ b/app/assets/javascripts/due_date_select.js.coffee
@@ -11,6 +11,7 @@ class @DueDateSelect
       $block = $dropdown.closest('.block')
       $selectbox = $dropdown.closest('.selectbox')
       $value = $block.find('.value')
+      $valueContent = $block.find('.value-content')
       $sidebarValue = $('.js-due-date-sidebar-value', $block)
 
       fieldName = $dropdown.data('field-name')
@@ -26,8 +27,12 @@ class @DueDateSelect
       addDueDate = ->
         # Create the post date
         value = $("input[name='#{fieldName}']").val()
-        date = new Date value.replace(new RegExp('-', 'g'), ',')
-        mediumDate = $.datepicker.formatDate 'M d, yy', date
+
+        if value isnt ''
+          date = new Date value.replace(new RegExp('-', 'g'), ',')
+          mediumDate = $.datepicker.formatDate 'M d, yy', date
+        else
+          mediumDate = 'None'
 
         data = {}
         data[abilityName] = {}
@@ -43,13 +48,23 @@ class @DueDateSelect
             $selectbox.hide()
             $value.removeAttr('style')
 
-            $value.html(mediumDate)
+            $valueContent.html(mediumDate)
             $sidebarValue.html(mediumDate)
+
+            if value isnt ''
+              $('.js-remove-due-date-holder').removeClass 'hidden'
+            else
+              $('.js-remove-due-date-holder').addClass 'hidden'
         ).done (data) ->
           $dropdown.trigger('loaded.gl.dropdown')
           $dropdown.dropdown('toggle')
           $loading.fadeOut()
 
+      $block.on 'click', '.js-remove-due-date', (e) ->
+        e.preventDefault()
+        $("input[name='#{fieldName}']").val ''
+        addDueDate()
+
       $datePicker.datepicker(
         dateFormat: 'yy-mm-dd',
         defaultDate: $("input[name='#{fieldName}']").val()
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d06086a581b..787c387379e 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -150,6 +150,10 @@
       font-weight: 600;
     }
 
+    .light {
+      font-weight: normal;
+    }
+
     .sidebar-collapsed-icon {
       display: none;
     }
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index ed1b8a8da2a..c1eec450193 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -87,10 +87,16 @@
             - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
               = link_to 'Edit', '#', class: 'edit-link pull-right'
           .value.bold.hide-collapsed
-            - if issuable.due_date
-              = issuable.due_date.to_s(:medium)
-            - else
-              .light None
+            %span.value-content
+              - if issuable.due_date
+                = issuable.due_date.to_s(:medium)
+              - else
+                None
+            - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
+              %span.light.js-remove-due-date-holder{ class: ("hidden" if issuable.due_date.nil?) }
+                \-
+                %a.js-remove-due-date{ href: "#", role: "button" }
+                  remove due date
           - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
             .selectbox.hide-collapsed
               = f.hidden_field :due_date, value: issuable.due_date

From 9052ec8d37537aac58d6ede8faf1b021b7ea60e9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 May 2016 12:19:19 +0100
Subject: [PATCH 0689/1431] Added due date tests

---
 spec/features/issues_spec.rb | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index dd114db7e88..749ee01890c 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -489,6 +489,43 @@ describe 'Issues', feature: true do
     end
   end
 
+  describe 'due date' do
+    context 'update due on issue#show', js: true do
+      let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
+
+      before do
+        visit namespace_project_issue_path(project.namespace, project, issue)
+      end
+
+      it 'should add due date to issue' do
+        page.within '.due_date' do
+          click_link 'Edit'
+
+          page.within '.ui-datepicker-calendar' do
+            first('.ui-state-default').click
+          end
+
+          expect(page).to have_no_content 'None'
+        end
+      end
+
+      it 'should remove due date from issue' do
+        page.within '.due_date' do
+          click_link 'Edit'
+
+          page.within '.ui-datepicker-calendar' do
+            first('.ui-state-default').click
+          end
+
+          expect(page).to have_no_content 'None'
+
+          click_link 'remove due date'
+          expect(page).to have_content 'None'
+        end
+      end
+    end
+  end
+
   def first_issue
     page.all('ul.issues-list > li').first.text
   end

From d3bdbf55c7505f7d25d9a105d894b7289dfc6bb1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 23 May 2016 09:33:48 +0100
Subject: [PATCH 0690/1431] Fixed issue with dropdown not opening after
 removing due date

---
 app/assets/javascripts/due_date_select.js.coffee | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
index 172b4ebe7b1..3cc70185178 100644
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ b/app/assets/javascripts/due_date_select.js.coffee
@@ -24,7 +24,7 @@ class @DueDateSelect
           $value.removeAttr('style')
       )
 
-      addDueDate = ->
+      addDueDate = (isDropdown) ->
         # Create the post date
         value = $("input[name='#{fieldName}']").val()
 
@@ -44,8 +44,9 @@ class @DueDateSelect
           data: data
           beforeSend: ->
             $loading.fadeIn()
-            $dropdown.trigger('loading.gl.dropdown')
-            $selectbox.hide()
+            if isDropdown
+              $dropdown.trigger('loading.gl.dropdown')
+              $selectbox.hide()
             $value.removeAttr('style')
 
             $valueContent.html(mediumDate)
@@ -56,21 +57,22 @@ class @DueDateSelect
             else
               $('.js-remove-due-date-holder').addClass 'hidden'
         ).done (data) ->
-          $dropdown.trigger('loaded.gl.dropdown')
-          $dropdown.dropdown('toggle')
+          if isDropdown
+            $dropdown.trigger('loaded.gl.dropdown')
+            $dropdown.dropdown('toggle')
           $loading.fadeOut()
 
       $block.on 'click', '.js-remove-due-date', (e) ->
         e.preventDefault()
         $("input[name='#{fieldName}']").val ''
-        addDueDate()
+        addDueDate(false)
 
       $datePicker.datepicker(
         dateFormat: 'yy-mm-dd',
         defaultDate: $("input[name='#{fieldName}']").val()
         altField: "input[name='#{fieldName}']"
         onSelect: ->
-          addDueDate()
+          addDueDate(true)
       )
 
     $(document)

From 164a839c23f8c263eb1b516627dfb7a1f71699e7 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 23 May 2016 11:14:25 +0200
Subject: [PATCH 0691/1431] Use gitlab-shell 3.0.0

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

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 37c2961c243..4a36342fcab 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.7.2
+3.0.0

From 85031223cd89db86a9ae2347daa1a6f9f5b26ff2 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 23 May 2016 08:47:25 -0500
Subject: [PATCH 0692/1431] Move tags into column

---
 app/views/projects/ci/builds/_build.html.haml | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 962b9fb2595..e23a3782c6b 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -42,18 +42,18 @@
   %td
     = build.name
 
-    .pull-right
-      .label-container
-        - if build.tags.any?
-          - build.tags.each do |tag|
-            %span.label.label-primary
-              = tag
-        - if build.try(:trigger_request)
-          %span.label.label-info triggered
-        - if build.try(:allow_failure)
-          %span.label.label-danger allowed to fail
-        - if defined?(retried) && retried
-          %span.label.label-warning retried
+  %td
+    .label-container
+      - if build.tags.any?
+        - build.tags.each do |tag|
+          %span.label.label-primary
+            = tag
+      - if build.try(:trigger_request)
+        %span.label.label-info triggered
+      - if build.try(:allow_failure)
+        %span.label.label-danger allowed to fail
+      - if defined?(retried) && retried
+        %span.label.label-warning retried
 
   %td.duration
     - if build.duration

From e76d11dce96672a6f791fb4f249a3c1384f0a7f0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 23 May 2016 14:58:48 +0100
Subject: [PATCH 0693/1431] Related merge request text alignment

---
 app/assets/stylesheets/pages/issues.scss            | 5 -----
 app/views/projects/issues/_merge_requests.html.haml | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index fc9db97132d..58bd12ffd6b 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -96,8 +96,3 @@ form.edit-issue {
 .issue-form .select2-container {
   width: 250px !important;
 }
-
-.issue-closed-by-widget {
-  color: $gl-text-color;
-  margin-left: 52px;
-}
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index e953353567e..2f9dc867d0d 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -24,5 +24,8 @@
             MERGED
           - elsif merge_request.closed?
             CLOSED
-    - if @closed_by_merge_requests.present?
+    %li
       = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
+    - if @closed_by_merge_requests.present?
+      %li
+        = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}

From 9c1b3d88db1482bb1fb394275c8119a77fdf9b88 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 23 May 2016 09:30:54 -0500
Subject: [PATCH 0694/1431] Move build info out of pipeline conditional

---
 .../projects/commit/_ci_commit.html.haml      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 8228c067be0..290e19c69e3 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -12,16 +12,16 @@
       Pipeline
       = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
       with
-      = pluralize ci_commit.statuses.count(:id), "build"
-      - if ci_commit.ref
-        for
-        = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace"
-      - if defined?(link_to_commit) && link_to_commit
-        for commit
-        = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
-      - if ci_commit.duration
-        in
-        = time_interval_in_words ci_commit.duration
+    = pluralize ci_commit.statuses.count(:id), "build"
+    - if ci_commit.ref
+      for
+      = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace label label-info"
+    - if defined?(link_to_commit) && link_to_commit
+      for commit
+      = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
+    - if ci_commit.duration
+      in
+      = time_interval_in_words ci_commit.duration
 
 - if ci_commit.yaml_errors.present?
   .bs-callout.bs-callout-danger

From 3fa32fa2d5c2674bea0768fd4e70132c71e19051 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 23 May 2016 16:36:00 +0200
Subject: [PATCH 0695/1431] Use gitlab-workhorse 0.7.3

---
 GITLAB_WORKHORSE_VERSION    | 2 +-
 doc/install/installation.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 39e898a4f95..f38fc5393ff 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.7.1
+0.7.3
diff --git a/doc/install/installation.md b/doc/install/installation.md
index fa11eb9ba6a..526f127178d 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -394,7 +394,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 v0.7.1
+    sudo -u git -H git checkout v0.7.3
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features

From 27a5a4e4306be921a2b6e09f2c306408b828c0cd Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 23 May 2016 09:46:06 -0500
Subject: [PATCH 0696/1431] Put column headers back

---
 app/views/projects/commit/_ci_commit.html.haml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 290e19c69e3..1abd4e6f3d3 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -37,5 +37,16 @@
 
 .table-holder
   %table.table.builds
+    %thead
+      %tr
+        %th Status
+        %th Build ID
+        %th Name
+        %th Tags
+        %th Duration
+        %th Finished at
+        - if @project.build_coverage_enabled?
+          %th Coverage
+        %th
     - ci_commit.statuses.stages.each do |stage|
       = render 'projects/commit/ci_stage', stage: stage, statuses: ci_commit.statuses.where(stage: stage)

From 66cebb6f61193a5fb4199b85580a312ed6d94b42 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 21 May 2016 18:02:49 -0500
Subject: [PATCH 0697/1431] Remove `event_to_atom` helper

---
 app/helpers/events_helper.rb                  | 22 -------------------
 .../dashboard/projects/index.atom.builder     |  4 +---
 app/views/events/_event.atom.builder          | 20 +++++++++++++++++
 app/views/groups/show.atom.builder            |  4 +---
 app/views/projects/show.atom.builder          |  4 +---
 app/views/users/show.atom.builder             |  4 +---
 6 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 app/views/events/_event.atom.builder

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index e1489381706..bfedcb1c42b 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -159,28 +159,6 @@ module EventsHelper
     "--broken encoding"
   end
 
-  def event_to_atom(xml, event)
-    if event.visible_to_user?(current_user)
-      xml.entry do
-        event_link = event_feed_url(event)
-        event_title = event_feed_title(event)
-        event_summary = event_feed_summary(event)
-
-        xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
-        xml.link    href: event_link
-        xml.title   truncate(event_title, length: 80)
-        xml.updated event.created_at.xmlschema
-        xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
-        xml.author do |author|
-          xml.name event.author_name
-          xml.email event.author_email
-        end
-
-        xml.summary(type: "xhtml") { |x| x << event_summary unless event_summary.nil? }
-      end
-    end
-  end
-
   def event_row_class(event)
     if event.body?
       "event-block"
diff --git a/app/views/dashboard/projects/index.atom.builder b/app/views/dashboard/projects/index.atom.builder
index d4daf07c6c0..fb5be63b472 100644
--- a/app/views/dashboard/projects/index.atom.builder
+++ b/app/views/dashboard/projects/index.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      dashboard_projects_url
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(partial: 'events/event', collection: @events) if @events.any?
 end
diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder
new file mode 100644
index 00000000000..7890e717aa7
--- /dev/null
+++ b/app/views/events/_event.atom.builder
@@ -0,0 +1,20 @@
+return unless event.visible_to_user?(current_user)
+
+xml.entry do
+  xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
+  xml.link    href: event_feed_url(event)
+  xml.title   truncate(event_feed_title(event), length: 80)
+  xml.updated event.created_at.xmlschema
+  xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
+
+  xml.author do
+    xml.name event.author_name
+    xml.email event.author_email
+  end
+
+  xml.summary(type: "xhtml") do |summary|
+    event_summary = event_feed_summary(event)
+
+    summary << event_summary unless event_summary.nil?
+  end
+end
diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder
index c66b82bb484..b68bf444d27 100644
--- a/app/views/groups/show.atom.builder
+++ b/app/views/groups/show.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      group_url(@group)
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(@events) if @events.any?
 end
diff --git a/app/views/projects/show.atom.builder b/app/views/projects/show.atom.builder
index 9b3d3f069d9..11310d5e1e1 100644
--- a/app/views/projects/show.atom.builder
+++ b/app/views/projects/show.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      namespace_project_url(@project.namespace, @project)
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(@events) if @events.any?
 end
diff --git a/app/views/users/show.atom.builder b/app/views/users/show.atom.builder
index e9e466c6350..6c85e5f9fbd 100644
--- a/app/views/users/show.atom.builder
+++ b/app/views/users/show.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      user_url(@user)
   xml.updated @events[0].updated_at.xmlschema if @events[0]
 
-  @events.each do |event|
-    event_to_atom(xml, event)
-  end
+  xml << render(@events) if @events.any?
 end

From 692f11b05d6ec751d1944cb025812481345329a8 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 21 May 2016 18:04:28 -0500
Subject: [PATCH 0698/1431] Render a collection for the Commits atom feed

---
 app/views/projects/commits/_commit.atom.builder | 14 ++++++++++++++
 app/views/projects/commits/show.atom.builder    | 15 +--------------
 2 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 app/views/projects/commits/_commit.atom.builder

diff --git a/app/views/projects/commits/_commit.atom.builder b/app/views/projects/commits/_commit.atom.builder
new file mode 100644
index 00000000000..1657fb46163
--- /dev/null
+++ b/app/views/projects/commits/_commit.atom.builder
@@ -0,0 +1,14 @@
+xml.entry do
+  xml.id      namespace_project_commit_url(@project.namespace, @project, id: commit.id)
+  xml.link    href: namespace_project_commit_url(@project.namespace, @project, id: commit.id)
+  xml.title   truncate(commit.title, length: 80)
+  xml.updated commit.committed_date.xmlschema
+  xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(commit.author_email))
+
+  xml.author do |author|
+    xml.name commit.author_name
+    xml.email commit.author_email
+  end
+
+  xml.summary markdown(commit.description, pipeline: :single_line)
+end
diff --git a/app/views/projects/commits/show.atom.builder b/app/views/projects/commits/show.atom.builder
index e310fafd82c..30bb7412073 100644
--- a/app/views/projects/commits/show.atom.builder
+++ b/app/views/projects/commits/show.atom.builder
@@ -6,18 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      namespace_project_commits_url(@project.namespace, @project, @ref)
   xml.updated @commits.first.committed_date.xmlschema if @commits.any?
 
-  @commits.each do |commit|
-    xml.entry do
-      xml.id      namespace_project_commit_url(@project.namespace, @project, id: commit.id)
-      xml.link    href: namespace_project_commit_url(@project.namespace, @project, id: commit.id)
-      xml.title   truncate(commit.title, length: 80)
-      xml.updated commit.committed_date.xmlschema
-      xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(commit.author_email))
-      xml.author do |author|
-        xml.name commit.author_name
-        xml.email commit.author_email
-      end
-      xml.summary markdown(commit.description, pipeline: :single_line)
-    end
-  end
+  xml << render(@commits) if @commits.any?
 end

From 526da93052dd794c82f49c1b908d9a4c33d91dcf Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 23 May 2016 11:47:19 -0500
Subject: [PATCH 0699/1431] Fix link to container Registry user docs

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

diff --git a/doc/README.md b/doc/README.md
index 8a6adee2fba..d1345ab2493 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -13,7 +13,7 @@
 - [Profile Settings](profile/README.md)
 - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
 - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
-- [Container Registry](container-registry/README.md) Learn how to use GitLab Container Registry.
+- [Container Registry](container_registry/README.md) Learn how to use GitLab Container Registry.
 - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
 - [Webhooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
 - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.

From e8f869f96b81d2621b5914c9b7ac95073fcfde05 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 23 May 2016 12:04:55 -0500
Subject: [PATCH 0700/1431] Revert commit info change

---
 .../projects/commit/_ci_commit.html.haml      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 1abd4e6f3d3..ce5c550b441 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -12,16 +12,16 @@
       Pipeline
       = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
       with
-    = pluralize ci_commit.statuses.count(:id), "build"
-    - if ci_commit.ref
-      for
-      = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace label label-info"
-    - if defined?(link_to_commit) && link_to_commit
-      for commit
-      = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
-    - if ci_commit.duration
-      in
-      = time_interval_in_words ci_commit.duration
+      = pluralize ci_commit.statuses.count(:id), "build"
+      - if ci_commit.ref
+        for
+        = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace"
+      - if defined?(link_to_commit) && link_to_commit
+        for commit
+        = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
+      - if ci_commit.duration
+        in
+        = time_interval_in_words ci_commit.duration
 
 - if ci_commit.yaml_errors.present?
   .bs-callout.bs-callout-danger

From 013bccbd93c4d44994126a52bf997ea59ffe594e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 13:06:36 -0400
Subject: [PATCH 0701/1431] Enable Style/DefWithParentheses cop and fix single
 offense

---
 .rubocop.yml       | 2 +-
 lib/api/helpers.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..d09e493ef38 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -152,7 +152,7 @@ Style/ConstantName:
 
 # Use def with parentheses when there are arguments.
 Style/DefWithParentheses:
-  Enabled: false
+  Enabled: true
 
 # Checks for use of deprecated Hash methods.
 Style/DeprecatedHashMethods:
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index cadf9f98fe3..2aaa0557ea3 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -29,7 +29,7 @@ module API
       @current_user
     end
 
-    def sudo_identifier()
+    def sudo_identifier
       identifier ||= params[SUDO_PARAM] || env[SUDO_HEADER]
 
       # Regex for integers

From 51c167eeb75f429098b7128f9d9f33a6eec4145f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 13:10:42 -0400
Subject: [PATCH 0702/1431] Enable Performance/RangeInclude cop and fix single
 offense

---
 .rubocop.yml                          | 3 +--
 lib/gitlab/bitbucket_import/client.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..26929e03456 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -957,10 +957,9 @@ Performance/EndWith:
 Performance/LstripRstrip:
   Enabled: true
 
-# TODO: Enable RangeInclude Cop.
 # Use `Range#cover?` instead of `Range#include?`.
 Performance/RangeInclude:
-  Enabled: false
+  Enabled: true
 
 # TODO: Enable RedundantBlockCall Cop.
 # Use `yield` instead of `block.call`.
diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb
index 9b83292ef33..8d1ad62fae0 100644
--- a/lib/gitlab/bitbucket_import/client.rb
+++ b/lib/gitlab/bitbucket_import/client.rb
@@ -121,7 +121,7 @@ module Gitlab
 
       def get(url)
         response = api.get(url)
-        raise Unauthorized if (400..499).include?(response.code.to_i)
+        raise Unauthorized if (400..499).cover?(response.code.to_i)
 
         response
       end

From 2de1109da39a46200e741b5a6643ce7fb1418041 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 13:21:02 -0400
Subject: [PATCH 0703/1431] Enable Performance/StartWith cop and fix offenses

---
 .rubocop.yml                          | 3 +--
 app/helpers/gitlab_markdown_helper.rb | 2 +-
 app/helpers/tab_helper.rb             | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..861dde41494 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -985,11 +985,10 @@ Performance/RedundantMerge:
 Performance/RedundantSortBy:
   Enabled: false
 
-# TODO: Enable StartWith Cop.
 # Use `start_with?` instead of a regex match anchored to the beginning of a
 # string.
 Performance/StartWith:
-  Enabled: false
+  Enabled: true
 
 # Use `tr` instead of `gsub` when you are replacing the same number of
 # characters. Use `delete` instead of `gsub` when you are deleting
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 3a45205563e..0a1b48af219 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -13,7 +13,7 @@ module GitlabMarkdownHelper
   def link_to_gfm(body, url, html_options = {})
     return "" if body.blank?
 
-    escaped_body = if body =~ /\A\<img/
+    escaped_body = if body.start_with?('<img')
                      body
                    else
                      escape_once(body)
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 96a83671009..b4b4d804203 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -112,7 +112,7 @@ module TabHelper
   end
 
   def profile_tab_class
-    if controller.controller_path =~ /\Aprofiles/
+    if controller.controller_path.start_with?('profiles')
       return 'active'
     end
 

From c49f5f73356ac30270bb2ba52ae3f417ca06b802 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 23 May 2016 12:31:52 -0500
Subject: [PATCH 0704/1431] Copyedit Registry user docs

---
 doc/container_registry/README.md              |  83 ++++++++++++------
 .../{ => img}/container_registry.png          | Bin
 .../{ => img}/project_feature.png             | Bin
 3 files changed, 56 insertions(+), 27 deletions(-)
 rename doc/container_registry/{ => img}/container_registry.png (100%)
 rename doc/container_registry/{ => img}/project_feature.png (100%)

diff --git a/doc/container_registry/README.md b/doc/container_registry/README.md
index 5af47f7120d..4df24ef13cc 100644
--- a/doc/container_registry/README.md
+++ b/doc/container_registry/README.md
@@ -3,33 +3,48 @@
 > **Note:**
 This feature was [introduced][ce-4040] in GitLab 8.8.
 
+> **Note:**
+This document is about the user guide. To learn how to enable GitLab Container
+Registry across your GitLab instance, visit the
+[administrator documentation](../administration/container_registry.md).
+
 With the Docker Container Registry integrated into GitLab, every project can
 have its own space to store its Docker images.
 
 You can read more about Docker Registry at https://docs.docker.com/registry/introduction/.
 
-You can read more about administering GitLab Container Registry on [GitLab Container Registry Administration](../administration/container_registry.md)
-
 ---
 
-## Start using Container Registry
+## Enable the Container Registry for your project
 
-1. First ask your system administrator to enable GitLab Container Registry following the [administration documentation](../administration/container_registry.md).
+1. First, ask your system administrator to enable GitLab Container Registry
+   following the [administration documentation](../administration/container_registry.md).
+   If you are using GitLab.com, this is enabled by default so you can start using
+   the Registry immediately.
 
-2. Go to project settings and enable `Container Registry` feature on your project:
+1. Go to your project's settings and enable the **Container Registry** feature
+   on your project. For new projects this might be enabled by default. For
+   existing projects you will have to explicitly enable it.
 
-![](project_feature.png)
+    ![Enable Container Registry](img/project_feature.png)
 
-3. Login to Container Registry with your credentials:
+## Build and push images
+
+After you save your project's settings, you should see a new link in the
+sidebar called **Container Registry**. Following this link will get you to
+your project's Registry panel where you can see how to login to the Container
+Registry using your GitLab credentials.
+
+For example if the Registry's URL is `registry.example.com`, the you should be
+able to login with:
 
 ```
 docker login registry.example.com
 ```
 
-## Build and push images
-
-Your registry is accessible under address configured via `registry_external_url`.
-To start using it you need to first build and publish images:
+Building and publishing images should be a straightforward process. Just make
+sure that you are using the Registry URL with the namespace and project name
+that is hosted on GitLab:
 
 ```
 docker build -t registry.example.com/group/project .
@@ -38,18 +53,25 @@ docker push registry.example.com/group/project
 
 ## Use images from GitLab Container Registry
 
-To download and run container from images hosted in GitLab Container Registry use `docker run`:
+To download and run a container from images hosted in GitLab Container Registry,
+use `docker run`:
 
 ```
 docker run [options] registry.example.com/group/project [arguments]
 ```
 
-## Control Container Registry from GitLab
+For more information on running Docker containers, visit the
+[Docker documentation][docker-docs].
 
-GitLab offers simple Container Registry management. Go to your project and click **Container Registry**.
-This view will show you all tags in your repository and will easily allow you to delete them.
+## Control Container Registry from within GitLab
 
-![](container_registry.png)
+GitLab offers a simple Container Registry management panel. Go to your project
+and click **Container Registry** in the left sidebar.
+
+This view will show you all tags in your project and will easily allow you to
+delete them.
+
+![Container Registry panel](img/container_registry.png)
 
 ## Build and push images using GitLab CI
 
@@ -57,10 +79,10 @@ This view will show you all tags in your repository and will easily allow you to
 This feature requires GitLab 8.8 and GitLab Runner 1.2.
 
 Make sure that your GitLab Runner is configured to allow building docker images.
-You have to check the [Using Docker Build](../../ci/docker/using_docker_build.md).
+You have to check the [Using Docker Build documentation](../../ci/docker/using_docker_build.md).
 
-You can use [docker:dind](https://hub.docker.com/_/docker/) to build your images. 
-This is how the `.gitlab-ci.yml` looks like:
+You can use [docker:dind](https://hub.docker.com/_/docker/) to build your images,
+and this is how `.gitlab-ci.yml` should look like:
 
 ```
  build_image:
@@ -69,16 +91,23 @@ This is how the `.gitlab-ci.yml` looks like:
    - docker:dind
    stage: build
    script:
-     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
-     - docker build -t registry.gitlab.com/group/project:latest .
-     - docker push registry.gitlab.com/group/project:latest
+     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.example.com
+     - docker build -t registry.example.com/group/project:latest .
+     - docker push registry.example.com/group/project:latest
 ```
 
-You have to use special credentials `gitlab-ci-token` with password stored in `$CI_BUILD_TOKEN` in order to push to registry connected to your project.
-This allows you to automated building and deployment of your images.
+You have to use the credentials of the special `gitlab-ci-token` user with its
+password stored in `$CI_BUILD_TOKEN` in order to push to the Registry connected
+to your project. This allows you to automated building and deployment of your
+Docker images.
 
 ## Limitations
 
-In order to use container image from private project as an `image:` in your `.gitlab-ci.yml` you have to follow
-[Using a private Docker Registry](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/configuration/advanced-configuration.md#using-a-private-docker-registry).
-This workflow will be simplified in the future.
+In order to use a container image from your private project as an `image:` in
+your `.gitlab-ci.yml`, you have to follow the
+[Using a private Docker Registry][private-docker]
+documentation. This workflow will be simplified in the future.
+
+[ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
+[docker-docs]: https://docs.docker.com/engine/userguide/intro/
+[private-docker]: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/configuration/advanced-configuration.md#using-a-private-docker-registry
diff --git a/doc/container_registry/container_registry.png b/doc/container_registry/img/container_registry.png
similarity index 100%
rename from doc/container_registry/container_registry.png
rename to doc/container_registry/img/container_registry.png
diff --git a/doc/container_registry/project_feature.png b/doc/container_registry/img/project_feature.png
similarity index 100%
rename from doc/container_registry/project_feature.png
rename to doc/container_registry/img/project_feature.png

From 17eaecd6c7cb33d0f171ae10da190fa120a817f3 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 23 May 2016 19:43:58 +0200
Subject: [PATCH 0705/1431] Enable Style/InfiniteLoop Rubocop cop

---
 .rubocop.yml                | 2 +-
 app/models/network/graph.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..3f5a7052694 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -299,7 +299,7 @@ Style/IndentHash:
 
 # Use Kernel#loop for infinite loops.
 Style/InfiniteLoop:
-  Enabled: false
+  Enabled: true
 
 # Use the new lambda literal syntax for single-line blocks.
 Style/Lambda:
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index f4e90125373..9259cb1a0fa 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -253,7 +253,7 @@ module Network
       leaves = []
       leaves.push(commit) if commit.space.zero?
 
-      while true
+      loop do
         return leaves if commit.parents(@map).count.zero?
 
         commit = commit.parents(@map).first

From 75532a65702cafc890ec83126a8ca948a8683015 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 23 May 2016 12:54:04 -0500
Subject: [PATCH 0706/1431] Change rgba to hex; use sass variables to calculate
 header height

---
 app/assets/stylesheets/framework/nav.scss       | 2 +-
 app/assets/stylesheets/framework/variables.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 4e4a1d71a47..c70be58f48f 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -290,6 +290,6 @@
   }
 
   .right-sidebar {
-    top: 102px;
+    top: ($header-height * 2) + 2;
   }
 }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index a769077bc83..9ad20ad22ab 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -119,7 +119,7 @@ $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
 $border-white-dark: #c6cacf;
 
-$border-gray-light: rgba(209, 209, 209, 0.70);
+$border-gray-light: #dcdcdc;
 $border-gray-normal: rgba(0, 0, 0, 0.10);
 $border-gray-dark: #c6cacf;
 

From 6898087b97234516b1d31ac731653bebbd9a171e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 14:03:04 -0400
Subject: [PATCH 0707/1431] Update rubocop to 0.40.0

---
 .rubocop.yml | 18 ++++++++++++++++++
 Gemfile      |  4 ++--
 Gemfile.lock | 14 +++++++-------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..81ab2e8143b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -333,6 +333,12 @@ Style/MethodName:
 Style/ModuleFunction:
   Enabled: false
 
+# Checks that the closing brace in an array literal is either on the same line
+# as the last array element, or a new line.
+Style/MultilineArrayBraceLayout:
+  Enabled: false
+  EnforcedStyle: symmetrical
+
 # Avoid multi-line chains of blocks.
 Style/MultilineBlockChain:
   Enabled: false
@@ -341,10 +347,22 @@ Style/MultilineBlockChain:
 Style/MultilineBlockLayout:
   Enabled: true
 
+# Checks that the closing brace in a hash literal is either on the same line as
+# the last hash element, or a new line.
+Style/MultilineHashBraceLayout:
+  Enabled: false
+  EnforcedStyle: symmetrical
+
 # Do not use then for multi-line if/unless.
 Style/MultilineIfThen:
   Enabled: false
 
+# Checks that the closing brace in a method call is either on the same line as
+# the last method argument, or a new line.
+Style/MultilineMethodCallBraceLayout:
+  Enabled: false
+  EnforcedStyle: symmetrical
+
 # Checks indentation of method calls with the dot operator that span more than
 # one line.
 Style/MultilineMethodCallIndentation:
diff --git a/Gemfile b/Gemfile
index 832c5a3ca89..790c457e1dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -293,9 +293,9 @@ group :development, :test do
   gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'rubocop', '~> 0.38.0', require: false
+  gem 'rubocop', '~> 0.40.0', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
-  gem 'coveralls',  '~> 0.8.2', require: false
+  gem 'coveralls', '~> 0.8.2', require: false
   gem 'simplecov', '~> 0.11.0', require: false
   gem 'flog', require: false
   gem 'flay', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e1c5b9630d3..52aee37d737 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -551,7 +551,7 @@ GEM
     orm_adapter (0.5.0)
     paranoia (2.1.4)
       activerecord (~> 4.0)
-    parser (2.3.0.6)
+    parser (2.3.1.0)
       ast (~> 2.2)
     pg (0.18.4)
     poltergeist (1.9.0)
@@ -686,15 +686,15 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.4.1)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.1)
     ruby-saml (1.1.2)
       nokogiri (>= 1.5.10)
       uuid (~> 2.3)
@@ -841,7 +841,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.0.5)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -1015,7 +1015,7 @@ DEPENDENCIES
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.4.0)
   rspec-retry
-  rubocop (~> 0.38.0)
+  rubocop (~> 0.40.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.0)
@@ -1060,4 +1060,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.12.3
+   1.12.4

From 3ba72f69af69d9fb2c46cb6c25d571f92ffd2ee1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 14:16:35 -0400
Subject: [PATCH 0708/1431] Enable Style/SpaceAroundKeyword cop and fix
 offenses

---
 .rubocop.yml                                             | 3 +--
 app/helpers/application_helper.rb                        | 3 +--
 lib/ci/ansi2html.rb                                      | 2 +-
 spec/controllers/projects/group_links_controller_spec.rb | 2 +-
 spec/factories_spec.rb                                   | 2 +-
 spec/models/concerns/token_authenticatable_spec.rb       | 2 +-
 spec/services/issues/create_service_spec.rb              | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0946ef5d848..69a65b7a180 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -525,10 +525,9 @@ Style/SpaceAfterSemicolon:
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-# TODO: Enable SpaceAroundKeyword Cop.
 # Use a space around keywords if appropriate.
 Style/SpaceAroundKeyword:
-  Enabled: false
+  Enabled: true
 
 # Use a single space around operators.
 Style/SpaceAroundOperators:
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3e0074da394..e6e2546b92f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -110,8 +110,7 @@ module ApplicationHelper
     ]
 
     # If reference is commit id - we should add it to branch/tag selectbox
-    if(@ref && !options.flatten.include?(@ref) &&
-       @ref =~ /\A[0-9a-zA-Z]{6,52}\z/)
+    if @ref && !options.flatten.include?(@ref) && @ref =~ /\A[0-9a-zA-Z]{6,52}\z/
       options << ['Commit', [@ref]]
     end
 
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb
index 5fed43aaebd..c628257e3f4 100644
--- a/lib/ci/ansi2html.rb
+++ b/lib/ci/ansi2html.rb
@@ -98,7 +98,7 @@ module Ci
         open_new_tag
 
         s = StringScanner.new(ansi)
-        while(!s.eos?)
+        until s.eos?
           if s.scan(/\e([@-_])(.*?)([@-~])/)
             handle_sequence(s)
           elsif s.scan(/\e(([@-_])(.*?)?)?$/)
diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb
index 40bd83af861..1bd1fc5189e 100644
--- a/spec/controllers/projects/group_links_controller_spec.rb
+++ b/spec/controllers/projects/group_links_controller_spec.rb
@@ -28,7 +28,7 @@ describe Projects::GroupLinksController do
         expect(group.shared_projects).to include project
       end
 
-      it 'redirects to project group links page'do
+      it 'redirects to project group links page' do
         expect(response).to redirect_to(
           namespace_project_group_links_path(project.namespace, project)
         )
diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb
index 62de081661d..a073a1f9d7c 100644
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
@@ -5,7 +5,7 @@ describe 'factories' do
     describe "#{factory.name} factory" do
       let(:entity) { build(factory.name) }
 
-      it 'does not raise error when created 'do
+      it 'does not raise error when created' do
         expect { entity }.to_not raise_error
       end
 
diff --git a/spec/models/concerns/token_authenticatable_spec.rb b/spec/models/concerns/token_authenticatable_spec.rb
index 30c0a04b840..b6adc2bf247 100644
--- a/spec/models/concerns/token_authenticatable_spec.rb
+++ b/spec/models/concerns/token_authenticatable_spec.rb
@@ -49,7 +49,7 @@ describe ApplicationSetting, 'TokenAuthenticatable' do
 
     context 'token is generated' do
       before { subject.send("reset_#{token_field}!") }
-      it 'persists a new token 'do
+      it 'persists a new token' do
         expect(subject.send(:read_attribute, token_field)).to be_a String
       end
     end
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index ac28b6f71f9..6aa0a89f893 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -54,7 +54,7 @@ describe Issues::CreateService, services: true do
             label_ids: [label.id] }
         end
 
-        it 'does not assign label'do
+        it 'does not assign label' do
           expect(issue.labels).to_not include label
         end
       end

From e8c8c9d7b275a9037d181e71ef77e29a5f649cf7 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 23 May 2016 21:25:45 +0300
Subject: [PATCH 0709/1431] Fix emoji counter issue.

---
 app/assets/javascripts/awards_handler.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index ff12cce4859..64f93d21fd8 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -108,7 +108,7 @@ class @AwardsHandler
       if @isActive($emojiBtn)
         @decrementCounter($emojiBtn, emoji)
       else
-        counter = $emojiBtn.siblings(".js-counter")
+        counter = $emojiBtn.find('.js-counter')
         counter.text(parseInt(counter.text()) + 1)
         $emojiBtn.addClass("active")
         @addMeToUserList(emoji)

From da5943fc9585d9728da1a9c1c43296f838faad37 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 23 May 2016 20:32:19 +0200
Subject: [PATCH 0710/1431] Enabled multiple Rubocop cops that can be enabled

This enables multiple Rubocop cops that already conform to our codebase
and do not require fixes.
---
 .rubocop.yml | 65 +++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 832c31be162..e7eac17db35 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -755,19 +755,19 @@ Lint/BlockAlignment:
 # Default values in optional keyword arguments and optional ordinal arguments
 # should not refer back to the name of the argument.
 Lint/CircularArgumentReference:
-  Enabled: false
+  Enabled: true
 
 # Checks for condition placed in a confusing position relative to the keyword.
 Lint/ConditionPosition:
-  Enabled: false
+  Enabled: true
 
 # Check for debugger calls.
 Lint/Debugger:
-  Enabled: false
+  Enabled: true
 
 # Align ends corresponding to defs correctly.
 Lint/DefEndAlignment:
-  Enabled: false
+  Enabled: true
 
 # Check for deprecated class method calls.
 Lint/DeprecatedClassMethods:
@@ -783,15 +783,15 @@ Lint/DuplicatedKey:
 
 # Check for immutable argument given to each_with_object.
 Lint/EachWithObjectArgument:
-  Enabled: false
+  Enabled: true
 
 # Check for odd code arrangement in an else block.
 Lint/ElseLayout:
-  Enabled: false
+  Enabled: true
 
 # Checks for empty ensure block.
 Lint/EmptyEnsure:
-  Enabled: false
+  Enabled: true
 
 # Checks for empty string interpolation.
 Lint/EmptyInterpolation:
@@ -799,37 +799,36 @@ Lint/EmptyInterpolation:
 
 # Align ends correctly.
 Lint/EndAlignment:
-  Enabled: false
+  Enabled: true
 
 # END blocks should not be placed inside method definitions.
 Lint/EndInMethod:
-  Enabled: false
+  Enabled: true
 
 # Do not use return in an ensure block.
 Lint/EnsureReturn:
-  Enabled: false
+  Enabled: true
 
 # The use of eval represents a serious security risk.
 Lint/Eval:
-  Enabled: false
+  Enabled: true
 
 # Catches floating-point literals too large or small for Ruby to represent.
 Lint/FloatOutOfRange:
-  Enabled: false
+  Enabled: true
 
 # The number of parameters to format/sprint must match the fields.
 Lint/FormatParameterMismatch:
-  Enabled: false
+  Enabled: true
 
 # Don't suppress exception.
 Lint/HandleExceptions:
   Enabled: false
 
-# TODO: Enable ImplicitStringConcatenation Cop.
 # Checks for adjacent string literals on the same line, which could better be
 # represented as a single string literal.
 Lint/ImplicitStringConcatenation:
-  Enabled: false
+  Enabled: true
 
 # TODO: Enable IneffectiveAccessModifier Cop.
 # Checks for attempts to use `private` or `protected` to set the visibility
@@ -840,7 +839,7 @@ Lint/IneffectiveAccessModifier:
 # Checks for invalid character literals with a non-escaped whitespace
 # character.
 Lint/InvalidCharacterLiteral:
-  Enabled: false
+  Enabled: true
 
 # Checks of literals used in conditions.
 Lint/LiteralInCondition:
@@ -848,7 +847,7 @@ Lint/LiteralInCondition:
 
 # Checks for literals used in interpolation.
 Lint/LiteralInInterpolation:
-  Enabled: false
+  Enabled: true
 
 # Use Kernel#loop with break rather than begin/end/until or begin/end/while
 # for post-loop tests.
@@ -857,11 +856,11 @@ Lint/Loop:
 
 # Do not use nested method definitions.
 Lint/NestedMethodDefinition:
-  Enabled: false
+  Enabled: true
 
 # Do not omit the accumulator when calling `next` in a `reduce`/`inject` block.
 Lint/NextWithoutAccumulator:
-  Enabled: false
+  Enabled: true
 
 # Checks for method calls with a space before the opening parenthesis.
 Lint/ParenthesesAsGroupedExpression:
@@ -870,11 +869,11 @@ Lint/ParenthesesAsGroupedExpression:
 # Checks for `rand(1)` calls. Such calls always return `0` and most likely
 # a mistake.
 Lint/RandOne:
-  Enabled: false
+  Enabled: true
 
 # Use parentheses in the method call to avoid confusion about precedence.
 Lint/RequireParentheses:
-  Enabled: false
+  Enabled: true
 
 # Avoid rescuing the Exception class.
 Lint/RescueException:
@@ -909,7 +908,7 @@ Lint/UnusedMethodArgument:
 
 # Unreachable code.
 Lint/UnreachableCode:
-  Enabled: false
+  Enabled: true
 
 # Checks for useless access modifiers.
 Lint/UselessAccessModifier:
@@ -921,19 +920,19 @@ Lint/UselessAssignment:
 
 # Checks for comparison of something with itself.
 Lint/UselessComparison:
-  Enabled: false
+  Enabled: true
 
 # Checks for useless `else` in `begin..end` without `rescue`.
 Lint/UselessElseWithoutRescue:
-  Enabled: false
+  Enabled: true
 
 # Checks for useless setter call to a local variable.
 Lint/UselessSetterCall:
-  Enabled: false
+  Enabled: true
 
 # Possible use of operator/literal/variable in void context.
 Lint/Void:
-  Enabled: false
+  Enabled: true
 
 
 ##################### Performance ############################
@@ -942,11 +941,10 @@ Lint/Void:
 Performance/Casecmp:
   Enabled: true
 
-# TODO: Enable DoubleStartEndWith Cop.
 # Use `str.{start,end}_with?(x, ..., y, ...)` instead of
 # `str.{start,end}_with?(x, ...) || str.{start,end}_with?(y, ...)`.
 Performance/DoubleStartEndWith:
-  Enabled: false
+  Enabled: true
 
 # TODO: Enable EndWith Cop.
 # Use `end_with?` instead of a regex match anchored to the end of a string.
@@ -980,10 +978,9 @@ Performance/RedundantMerge:
   MaxKeyValuePairs: 2
   Enabled: false
 
-# TODO: Enable RedundantSortBy Cop.
 # Use `sort` instead of `sort_by { |x| x }`.
 Performance/RedundantSortBy:
-  Enabled: false
+  Enabled: true
 
 # Use `start_with?` instead of a regex match anchored to the beginning of a
 # string.
@@ -1024,11 +1021,11 @@ Rails/Delegate:
 
 # Prefer `find_by` over `where.first`.
 Rails/FindBy:
-  Enabled: false
+  Enabled: true
 
 # Prefer `all.find_each` over `all.find`.
 Rails/FindEach:
-  Enabled: false
+  Enabled: true
 
 # Prefer has_many :through to has_and_belongs_to_many.
 Rails/HasAndBelongsToMany:
@@ -1040,7 +1037,7 @@ Rails/Output:
 
 # Checks for incorrect grammar when using methods like `3.day.ago`.
 Rails/PluralizationGrammar:
-  Enabled: false
+  Enabled: true
 
 # Checks for `read_attribute(:attr)` and `write_attribute(:attr, val)`.
 Rails/ReadWriteAttribute:
@@ -1048,7 +1045,7 @@ Rails/ReadWriteAttribute:
 
 # Checks the arguments of ActiveRecord scopes.
 Rails/ScopeArgs:
-  Enabled: false
+  Enabled: true
 
 # Checks the correct usage of time zone aware methods.
 # http://danilenko.org/2012/7/6/rails_timezones

From 85e9eece7ecac4eaecd12c85de76ddf9c5acc241 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 23 May 2016 21:33:58 +0300
Subject: [PATCH 0711/1431] Fix displaying emoji only comments.

To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly.
---
 app/assets/javascripts/awards_handler.coffee | 66 +++++++++++++-------
 app/assets/javascripts/notes.js.coffee       |  4 +-
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 64f93d21fd8..0ab3796118e 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -20,7 +20,9 @@ class @AwardsHandler
       .off "click", ".js-emoji-btn"
       .on "click", ".js-emoji-btn", @handleClick
 
+
   handleClick: (e) =>
+
     e.preventDefault()
     $emojiBtn = $(e.currentTarget)
     $addAwardBtn = $('.js-add-award.is-active')
@@ -31,14 +33,14 @@ class @AwardsHandler
     else if $votesBlock.length is 0
       $votesBlock = $addAwardBtn.closest('.js-awards-block')
 
-    $votesBlock.addClass 'js-awards-block-current'
+    $votesBlock.addClass 'js-awards-block'
     awardUrl = $votesBlock.data 'award-url'
-    emoji = $emojiBtn
-      .find(".icon")
-      .data "emoji"
+    emoji = $emojiBtn.find('.icon').data('emoji')
     @addAward awardUrl, emoji
 
+
   showEmojiMenu: ($addBtn) ->
+
     $menu = $('.emoji-menu')
 
     if $menu.length
@@ -55,23 +57,29 @@ class @AwardsHandler
         $menu.addClass "is-visible"
         $("#emoji_search").focus()
     else
-      $addBtn.addClass "is-loading is-active"
-      $.get $addBtn.data('award-menu-url'), (response) =>
-        $addBtn.removeClass "is-loading"
-        $('body').append response
-
-        $menu = $(".emoji-menu")
+      $addBtn.addClass 'is-loading is-active'
+      url = $addBtn.data 'award-menu-url'
 
+      @createEmojiMenu url, =>
+        $addBtn.removeClass 'is-loading'
+        $menu = $('.emoji-menu')
         @positionMenu($menu, $addBtn)
-
         @renderFrequentlyUsedBlock()
 
         setTimeout =>
-          $menu.addClass "is-visible"
-          $("#emoji_search").focus()
+          $menu.addClass 'is-visible'
+          $('#emoji_search').focus()
           @setupSearch()
         , 200
 
+
+  createEmojiMenu: (awardMenuUrl, callback) ->
+
+    $.get awardMenuUrl, (response) =>
+      $('body').append response
+      callback()
+
+
   positionMenu: ($menu, $addBtn) ->
     position = $addBtn.data('position')
 
@@ -170,8 +178,9 @@ class @AwardsHandler
     ), 200
 
 
-  createEmoji: (emoji) ->
-    emojiCssClass = @resolveNameToCssClass(emoji)
+  createEmoji_: (emoji) ->
+
+    emojiCssClass = @resolveNameToCssClass emoji
 
     buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
       <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
@@ -179,16 +188,28 @@ class @AwardsHandler
     </button>"
 
     emoji_node = $(buttonHtml)
-      .insertBefore(".js-awards-block-current .js-award-holder:not(.js-award-action-btn)")
-      .find(".emoji-icon")
-      .data("emoji", emoji)
+      .insertBefore '.js-awards-block .js-award-holder:not(.js-award-action-btn)'
+      .find '.emoji-icon'
+      .data 'emoji', emoji
+
     $('.award-control').tooltip()
 
-    $currentBlock = $('.js-awards-block-current')
-    if $currentBlock.is('.hidden')
+    $currentBlock = $ '.js-awards-block'
+
+    if $currentBlock.is '.hidden'
       $currentBlock.removeClass 'hidden'
 
+
+  createEmoji: (emoji) ->
+
+    return @createEmoji_ emoji if $('.emoji-menu').length
+
+    awardMenuUrl = $('[data-award-menu-url]').data 'award-menu-url'
+    @createEmojiMenu awardMenuUrl, => @createEmoji emoji
+
+
   resolveNameToCssClass: (emoji) ->
+
     emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
     if emoji_icon.length > 0
@@ -197,7 +218,8 @@ class @AwardsHandler
       # Find by alias
       unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
 
-    "emoji-#{unicodeName}"
+    return "emoji-#{unicodeName}"
+
 
   postEmoji: (awardUrl, emoji, callback) ->
     $.post awardUrl, { name: emoji }, (data) ->
@@ -205,7 +227,7 @@ class @AwardsHandler
         callback.call()
 
   findEmojiIcon: (emoji) ->
-    $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']")
+    $(".js-awards-block.awards > .js-emoji-btn [data-emoji='#{emoji}']")
 
   scrollToAwards: ->
     $('body, html').animate({
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 6d9d6528f45..687dc285519 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -167,8 +167,8 @@ class @Notes
       return
 
     if note.award
-      awardsHandler.addAwardToEmojiBar(note.note)
-      awardsHandler.scrollToAwards()
+      awards_handler.addAwardToEmojiBar(note.name)
+      awards_handler.scrollToAwards()
 
     # render note if it not present in loaded list
     # or skip if rendered

From 3258ad60cbf3fa22144a2745a1df1be67136fa5a Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chrisjwilson.com>
Date: Mon, 23 May 2016 18:35:04 +0000
Subject: [PATCH 0712/1431] Update Google integration API workflow

---
 doc/integration/google.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/integration/google.md b/doc/integration/google.md
index f9a20dd840d..82978b68a34 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -11,9 +11,9 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
     - Project ID: Must be unique to all Google Developer registered applications. Google provides a randomly generated Project ID by default. You can use the randomly generated ID or choose a new one.
 1. Refresh the page. You should now see your new project in the list. Click on the project.
 
-1. Select "APIs & auth" in the left menu.
+1. Select the "Google APIs" tab in the Overview.
 
-1. Select "APIs" in the submenu.
+1. Select and enable the following Google APIs - listed under "Popular APIs"
     - Enable `Contacts API`
     - Enable `Google+ API`
 

From c6f5af1985e63b90b8984b0eb7a9db6539d08846 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 23 May 2016 20:51:42 +0200
Subject: [PATCH 0713/1431] Its time for 8.9

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG | 2 ++
 VERSION   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9fa1e1cada3..b1ce7f22c04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+v 8.9.0 (unreleased)
+
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
   - Fix Error 500 in CI charts by gracefully handling commits with no durations
diff --git a/VERSION b/VERSION
index d5a967c3933..6c07f656285 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.8.0-pre
+8.9.0-pre

From 12bd78103153fce845eed1566918083b52e814df Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 23 May 2016 10:17:07 -0500
Subject: [PATCH 0714/1431] Fix backups if registry is disabled

---
 lib/backup/manager.rb                 | 13 +++++++++++--
 lib/tasks/gitlab/backup.rake          | 20 ++++++++++++++------
 spec/tasks/gitlab/backup_rake_spec.rb | 18 ++++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 7d0608f09da..5a727f5be5b 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -1,5 +1,8 @@
 module Backup
   class Manager
+    ARCHIVES_TO_BACKUP = %w{uploads builds artifacts lfs registry}
+    FOLDERS_TO_BACKUP = %w{repositories db}
+
     def pack
       # Make sure there is a connection
       ActiveRecord::Base.connection.reconnect!
@@ -157,11 +160,17 @@ module Backup
     end
 
     def archives_to_backup
-      %w{uploads builds artifacts lfs registry}.map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
+      (ARCHIVES_TO_BACKUP - disabled_features).map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
     end
 
     def folders_to_backup
-      %w{repositories db}.reject{ |name| skipped?(name) }
+      (FOLDERS_TO_BACKUP - disabled_features).reject{ |name| skipped?(name) }
+    end
+
+    def disabled_features
+      features = []
+      features << 'registry' unless Gitlab.config.registry.enabled
+      features
     end
 
     def settings
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index d97d974ec20..596eaca6d0d 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -179,18 +179,26 @@ namespace :gitlab do
       task create: :environment do
         $progress.puts "Dumping container registry images ... ".blue
 
-        if ENV["SKIP"] && ENV["SKIP"].include?("registry")
-          $progress.puts "[SKIPPED]".cyan
+        if Gitlab.config.registry.enabled
+          if ENV["SKIP"] && ENV["SKIP"].include?("registry")
+            $progress.puts "[SKIPPED]".cyan
+          else
+            Backup::Registry.new.dump
+            $progress.puts "done".green
+          end
         else
-          Backup::Registry.new.dump
-          $progress.puts "done".green
+          $progress.puts "[DISABLED]".cyan
         end
       end
 
       task restore: :environment do
         $progress.puts "Restoring container registry images ... ".blue
-        Backup::Registry.new.restore
-        $progress.puts "done".green
+        if Gitlab.config.registry.enabled
+          Backup::Registry.new.restore
+          $progress.puts "done".green
+        else
+          $progress.puts "[DISABLED]".cyan
+        end
       end
     end
 
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 8aeb013eec6..25da0917134 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'rake'
 
 describe 'gitlab:app namespace rake task' do
+  let(:enable_registry) { true }
+
   before :all do
     Rake.application.rake_require 'tasks/gitlab/task_helpers'
     Rake.application.rake_require 'tasks/gitlab/backup'
@@ -15,6 +17,10 @@ describe 'gitlab:app namespace rake task' do
     FileUtils.mkdir_p('public/uploads')
   end
 
+  before do
+    stub_container_registry_config(enabled: enable_registry)
+  end
+
   def run_rake_task(task_name)
     Rake::Task[task_name].reenable
     Rake.application.invoke_task task_name
@@ -143,6 +149,18 @@ describe 'gitlab:app namespace rake task' do
 
       expect(temp_dirs).to be_empty
     end
+
+    context 'registry disabled' do
+      let(:enable_registry) { false }
+
+      it 'should not create registry.tar.gz' do
+        tar_contents, exit_status = Gitlab::Popen.popen(
+          %W{tar -tvf #{@backup_tar}}
+        )
+        expect(exit_status).to eq(0)
+        expect(tar_contents).not_to match('registry.tar.gz')
+      end
+    end
   end # backup_create task
 
   describe "Skipping items" do

From 5b046f8571ba360ec7b87d01db7b0933ab4388bf Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 23 May 2016 22:38:34 +0300
Subject: [PATCH 0715/1431] Fix variable name because of a wrong resolved merge
 conflict.

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

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 687dc285519..b8359c31dfa 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -167,8 +167,8 @@ class @Notes
       return
 
     if note.award
-      awards_handler.addAwardToEmojiBar(note.name)
-      awards_handler.scrollToAwards()
+      awardsHandler.addAwardToEmojiBar(note.name)
+      awardsHandler.scrollToAwards()
 
     # render note if it not present in loaded list
     # or skip if rendered

From 43d9e06b68d82588ca582f43971cae040b04674f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 21 May 2016 18:27:15 -0500
Subject: [PATCH 0716/1431] Add rubocop-rspec

Almost all cops are starting as disabled until we can fix their
violations.
---
 .rubocop.yml           | 50 ++++++++++++++++++++++++++++++++++++++++++
 Gemfile                |  1 +
 Gemfile.lock           |  3 +++
 lib/tasks/rubocop.rake |  1 +
 4 files changed, 55 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 03e026ccee9..ca5afde75b1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+require: rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.1
   # Cop names are not displayed in offense messages by default. Change behavior
@@ -1071,3 +1073,51 @@ Rails/TimeZone:
 # Use validates :attribute, hash of validations.
 Rails/Validation:
   Enabled: false
+
+##################### RSpec ##################################
+
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false
+
+RSpec/DescribeMethod:
+  Enabled: false
+
+RSpec/DescribedClass:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+  Max: 5
+
+RSpec/ExampleWording:
+  Enabled: false
+  CustomTransform:
+    be: is
+    have: has
+    not: does not
+  IgnoredWords: []
+
+RSpec/FilePath:
+  Enabled: false
+  CustomTransform:
+    RuboCop: rubocop
+    RSpec: rspec
+
+RSpec/Focus:
+  Enabled: true
+
+RSpec/InstanceVariable:
+  Enabled: false
+
+RSpec/MultipleDescribes:
+  Enabled: false
+
+RSpec/NotToNot:
+  EnforcedStyle: not_to
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
index 790c457e1dc..e854a31b425 100644
--- a/Gemfile
+++ b/Gemfile
@@ -294,6 +294,7 @@ group :development, :test do
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
   gem 'rubocop', '~> 0.40.0', require: false
+  gem 'rubocop-rspec', '~> 1.5.0', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
   gem 'coveralls', '~> 0.8.2', require: false
   gem 'simplecov', '~> 0.11.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 52aee37d737..4533aa31d5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -692,6 +692,8 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.5.0)
+      rubocop (>= 0.40.0)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
     ruby-progressbar (1.8.1)
@@ -1016,6 +1018,7 @@ DEPENDENCIES
   rspec-rails (~> 3.4.0)
   rspec-retry
   rubocop (~> 0.40.0)
+  rubocop-rspec (~> 1.5.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.0)
diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake
index ddfaf5d51f2..78ffccc9d06 100644
--- a/lib/tasks/rubocop.rake
+++ b/lib/tasks/rubocop.rake
@@ -1,4 +1,5 @@
 unless Rails.env.production?
   require 'rubocop/rake_task'
+
   RuboCop::RakeTask.new
 end

From 87195b9ae49273dd3eadfb7c772f00f9b66b3358 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 16:20:53 -0400
Subject: [PATCH 0717/1431] Add descriptive comments for rubocop-rspec cops

[ci skip]
---
 .rubocop.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index ca5afde75b1..4e6ced4e1ab 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1076,22 +1076,30 @@ Rails/Validation:
 
 ##################### RSpec ##################################
 
+# Check that instances are not being stubbed globally.
 RSpec/AnyInstance:
   Enabled: false
 
+# Check that the first argument to the top level describe is the tested class or
+# module.
 RSpec/DescribeClass:
   Enabled: false
 
+# Use `described_class` for tested class / module.
 RSpec/DescribeMethod:
   Enabled: false
 
+# Checks that the second argument to top level describe is the tested method
+# name.
 RSpec/DescribedClass:
   Enabled: false
 
+# Checks for long example.
 RSpec/ExampleLength:
   Enabled: false
   Max: 5
 
+# Do not use should when describing your tests.
 RSpec/ExampleWording:
   Enabled: false
   CustomTransform:
@@ -1100,24 +1108,30 @@ RSpec/ExampleWording:
     not: does not
   IgnoredWords: []
 
+# Checks the file and folder naming of the spec file.
 RSpec/FilePath:
   Enabled: false
   CustomTransform:
     RuboCop: rubocop
     RSpec: rspec
 
+# Checks if there are focused specs.
 RSpec/Focus:
   Enabled: true
 
+# Checks for the usage of instance variables.
 RSpec/InstanceVariable:
   Enabled: false
 
+# Checks for multiple top-level describes.
 RSpec/MultipleDescribes:
   Enabled: false
 
+# Enforces the usage of the same method on all negative message expectations.
 RSpec/NotToNot:
   EnforcedStyle: not_to
   Enabled: false
 
+# Prefer using verifying doubles over normal doubles.
 RSpec/VerifiedDoubles:
   Enabled: false

From 2f1828a981e5cf193f95cfacbfd5d50fd255e589 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 23 May 2016 22:42:05 +0200
Subject: [PATCH 0718/1431] Add changelog item for project navigation UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index b1ce7f22c04..d26a0bff2e6 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.9.0 (unreleased)
+  - Redesign navigation for project pages
 
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources

From 7001842dc463f1ba9ac4f1479c7310c75707c35b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 17:06:26 -0400
Subject: [PATCH 0719/1431] Remove `issue_to_atom` helper

---
 app/helpers/issues_helper.rb                 | 17 -----------------
 app/views/dashboard/issues.atom.builder      |  5 +----
 app/views/groups/issues.atom.builder         |  5 +----
 app/views/issues/_issue.atom.builder         | 14 ++++++++++++++
 app/views/projects/issues/index.atom.builder |  4 +---
 5 files changed, 17 insertions(+), 28 deletions(-)
 create mode 100644 app/views/issues/_issue.atom.builder

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 198d39455d7..551409e8855 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -105,23 +105,6 @@ module IssuesHelper
     return 'hidden' if issue.closed? == closed
   end
 
-  def issue_to_atom(xml, issue)
-    xml.entry do
-      xml.id      namespace_project_issue_url(issue.project.namespace,
-                                              issue.project, issue)
-      xml.link    href: namespace_project_issue_url(issue.project.namespace,
-                                                    issue.project, issue)
-      xml.title   truncate(issue.title, length: 80)
-      xml.updated issue.created_at.xmlschema
-      xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
-      xml.author do |author|
-        xml.name issue.author_name
-        xml.email issue.author_email
-      end
-      xml.summary issue.title
-    end
-  end
-
   def merge_requests_sentence(merge_requests)
     # Sorting based on the `!123` or `group/project!123` reference will sort
     # local merge requests first.
diff --git a/app/views/dashboard/issues.atom.builder b/app/views/dashboard/issues.atom.builder
index 0d7b1b30dc3..83c0c6da21b 100644
--- a/app/views/dashboard/issues.atom.builder
+++ b/app/views/dashboard/issues.atom.builder
@@ -6,8 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      issues_dashboard_url
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
-  @issues.each do |issue|
-    issue_to_atom(xml, issue)
-  end
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
 end
-
diff --git a/app/views/groups/issues.atom.builder b/app/views/groups/issues.atom.builder
index a6eb9abada6..c19671295af 100644
--- a/app/views/groups/issues.atom.builder
+++ b/app/views/groups/issues.atom.builder
@@ -6,8 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      issues_group_url
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
-  @issues.each do |issue|
-    issue_to_atom(xml, issue)
-  end
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
 end
-
diff --git a/app/views/issues/_issue.atom.builder b/app/views/issues/_issue.atom.builder
new file mode 100644
index 00000000000..68a2d19e58d
--- /dev/null
+++ b/app/views/issues/_issue.atom.builder
@@ -0,0 +1,14 @@
+xml.entry do
+  xml.id      namespace_project_issue_url(issue.project.namespace, issue.project, issue)
+  xml.link    href: namespace_project_issue_url(issue.project.namespace, issue.project, issue)
+  xml.title   truncate(issue.title, length: 80)
+  xml.updated issue.created_at.xmlschema
+  xml.media   :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
+
+  xml.author do |author|
+    xml.name issue.author_name
+    xml.email issue.author_email
+  end
+
+  xml.summary issue.title
+end
diff --git a/app/views/projects/issues/index.atom.builder b/app/views/projects/issues/index.atom.builder
index ee8a9414657..7ad7c9c87e8 100644
--- a/app/views/projects/issues/index.atom.builder
+++ b/app/views/projects/issues/index.atom.builder
@@ -6,7 +6,5 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.id      namespace_project_issues_url(@project.namespace, @project)
   xml.updated @issues.first.created_at.xmlschema if @issues.any?
 
-  @issues.each do |issue|
-    issue_to_atom(xml, issue)
-  end
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
 end

From 3d4ef74d360cf977ff514c937b0e6f6498caa3f6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 24 May 2016 00:23:23 +0200
Subject: [PATCH 0720/1431] Use start_with? instead of regex

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/helpers/tab_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 0fe94c395ec..563ddd2a511 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -95,7 +95,7 @@ module TabHelper
   end
 
   def project_tab_class
-    if controller.controller_path =~ /\Aprojects/
+    if controller.controller_path.start_with?('projects')
       return 'active'
     end
 

From f34a9f17babdeb4aaff81dc75035d56389e67baf Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 24 May 2016 00:41:07 +0200
Subject: [PATCH 0721/1431] Fix badge count UI for pipelines menu item

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_project.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 1db95c9089a..33ba654bbee 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -50,7 +50,7 @@
         = icon('ship fw')
         %span
           Pipelines
-          %span.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
+          %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
 
   - if project_nav_tab? :builds
     = nav_link(controller: %w(builds)) do

From 510b5c5f396711b0bb45bad0a25da3a891583ebc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 24 May 2016 00:41:31 +0200
Subject: [PATCH 0722/1431] Move files tab before commits tab to follow same
 order as top navigation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/show.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 59a9519ca11..a19c7c406a0 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -15,6 +15,9 @@
 .project-stats.row-content-block.second-block
   .container-fluid.container-limited
     %ul.nav
+      %li
+        = link_to project_files_path(@project) do
+          Files (#{repository_size})
       %li
         = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
           #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)})
@@ -24,9 +27,6 @@
       %li
         = link_to namespace_project_tags_path(@project.namespace, @project) do
           #{'Tag'.pluralize(@repository.tag_names.count)} (#{number_with_delimiter(@repository.tag_names.count)})
-      %li
-        = link_to project_files_path(@project) do
-          Files (#{repository_size})
 
       - if default_project_view != 'readme' && @repository.readme
         %li

From 1d7c3c79b1060e62ee1aa8a0e173334bb9180706 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 24 May 2016 03:10:38 +0300
Subject: [PATCH 0723/1431] Handle thumbsup and thumbsdown mutuality.

---
 app/assets/javascripts/awards_handler.coffee | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 0ab3796118e..7235ec57851 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -24,6 +24,7 @@ class @AwardsHandler
   handleClick: (e) =>
 
     e.preventDefault()
+
     $emojiBtn = $(e.currentTarget)
     $addAwardBtn = $('.js-add-award.is-active')
     $votesBlock = $($addAwardBtn.closest('.js-award-holder').data('target'))
@@ -36,6 +37,13 @@ class @AwardsHandler
     $votesBlock.addClass 'js-awards-block'
     awardUrl = $votesBlock.data 'award-url'
     emoji = $emojiBtn.find('.icon').data('emoji')
+
+    if emoji in [ 'thumbsup', 'thumbsdown' ]
+      mutualVote = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
+
+      isAlreadyVoted = $("[data-emoji=#{mutualVote}]").parent().hasClass 'active'
+      @addAward awardUrl, mutualVote if isAlreadyVoted
+
     @addAward awardUrl, emoji
 
 

From c697c9601d921b841fe791c4ea96a68aa6de0001 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 24 May 2016 03:44:19 +0300
Subject: [PATCH 0724/1431] Fix award tooltip after voting.

---
 app/assets/javascripts/awards_handler.coffee | 52 ++++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 7235ec57851..e535bd525b8 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -156,26 +156,46 @@ class @AwardsHandler
 
     $emojiBtn.removeClass("active")
 
+
+  getAwardTooltip: ($awardBlock) ->
+
+    return $awardBlock.attr('data-original-title') or $awardBlock.attr('data-title')
+
+
   removeMeFromUserList: ($emojiBtn, emoji) ->
-    award_block = $emojiBtn
-    authors = award_block
-      .attr("data-original-title")
-      .split(", ")
-    authors.splice(authors.indexOf("me"),1)
-    award_block
-      .closest(".js-emoji-btn")
-      .attr("data-original-title", authors.join(", "))
-    @resetTooltip(award_block)
+
+    awardBlock    = $emojiBtn
+    originalTitle = @getAwardTooltip awardBlock
+
+    authors = originalTitle.split ', '
+    authors.splice authors.indexOf('me'), 1
+
+    newAuthors = authors.join ', '
+
+    awardBlock
+      .closest '.js-emoji-btn'
+      .removeData 'original-title'
+      .removeData 'title'
+      .attr 'data-original-title', newAuthors
+      .attr 'data-title', newAuthors
+
+    @resetTooltip(awardBlock)
+
 
   addMeToUserList: (emoji) ->
-    award_block = @findEmojiIcon(emoji).parent()
-    origTitle = award_block.attr("data-original-title").trim()
-    users = []
+
+    awardBlock = @findEmojiIcon(emoji).parent()
+    origTitle  = @getAwardTooltip awardBlock
+    users      = []
+
     if origTitle
-      users = origTitle.split(', ')
-    users.push("me")
-    award_block.attr("title", users.join(", "))
-    @resetTooltip(award_block)
+      users = origTitle.trim().split(', ')
+
+    users.push('me')
+    awardBlock.attr('title', users.join(", "))
+
+    @resetTooltip(awardBlock)
+
 
   resetTooltip: (award) ->
     award.tooltip("destroy")

From 46de0366b1cc50e67747a457810a54e679bec151 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 17 May 2016 13:59:29 -0500
Subject: [PATCH 0725/1431] Fix concurrent request when updating build log in
 browser

---
 CHANGELOG                              | 1 +
 app/assets/javascripts/ci/build.coffee | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d26a0bff2e6..80b9833edd5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@ v 8.8.0
   - Upgrade Sidekiq to 4.1.2
   - Added /health_check endpoint for checking service status
   - Make 'upcoming' filter for milestones work better across projects
+  - Fix concurrent request when updating build log in browser
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index fca0c3bae5c..d700742e4a9 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -28,12 +28,13 @@ class CiBuild
       #
       CiBuild.interval = setInterval =>
         if window.location.href.split("#").first() is build_url
+          last_state = @state
           $.ajax
             url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
             dataType: "json"
             success: (log) =>
-              @state = log.state
-              if log.status is "running"
+              if last_state is @state and log.status is "running"
+                @state = if log.state then log.state else ""
                 if log.append
                   $('.fa-refresh').before log.html
                 else

From cdec9e472db581acbee72cdcaa703e4155cb4cfb Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 23 May 2016 20:38:30 -0500
Subject: [PATCH 0726/1431] Replace \n to <br>

---
 app/assets/javascripts/ci/build.coffee | 6 ++++--
 lib/ci/ansi2html.rb                    | 4 +++-
 spec/lib/ci/ansi2html_spec.rb          | 9 +++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index d700742e4a9..98d05e41273 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -33,8 +33,10 @@ class CiBuild
             url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
             dataType: "json"
             success: (log) =>
-              if last_state is @state and log.status is "running"
-                @state = if log.state then log.state else ""
+              return unless last_state is @state
+
+              if log.state and log.status is "running"
+                @state = log.state
                 if log.append
                   $('.fa-refresh').before log.html
                 else
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb
index c628257e3f4..229050151d3 100644
--- a/lib/ci/ansi2html.rb
+++ b/lib/ci/ansi2html.rb
@@ -90,7 +90,7 @@ module Ci
 
       def convert(raw, new_state)
         reset_state
-        restore_state(raw, new_state) if new_state
+        restore_state(raw, new_state) if new_state.present?
 
         start = @offset
         ansi = raw[@offset..-1]
@@ -105,6 +105,8 @@ module Ci
             break
           elsif s.scan(/</)
             @out << '&lt;'
+          elsif s.scan(/\n/)
+            @out << '<br>'
           else
             @out << s.scan(/./m)
           end
diff --git a/spec/lib/ci/ansi2html_spec.rb b/spec/lib/ci/ansi2html_spec.rb
index 04afbd06929..898f1e84ab0 100644
--- a/spec/lib/ci/ansi2html_spec.rb
+++ b/spec/lib/ci/ansi2html_spec.rb
@@ -175,5 +175,14 @@ describe Ci::Ansi2html, lib: true do
 
       it_behaves_like 'stateable converter'
     end
+
+    context 'with new line' do
+      let(:pre_text) { "Hello\r" }
+      let(:pre_html) { "Hello\r" }
+      let(:text) { "\nWorld" }
+      let(:html) { "<br>World" }
+
+      it_behaves_like 'stateable converter'
+    end
   end
 end

From 24ef7063bee25c76ecfc8c14c494161208b01352 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 23 May 2016 21:58:16 -0500
Subject: [PATCH 0727/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 80b9833edd5..d07c95600b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.9.0 (unreleased)
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
   - Fix Error 500 in CI charts by gracefully handling commits with no durations
+  - Fix concurrent request when updating build log in browser
 
 v 8.8.1
   - Add documentation for the "Health Check" feature
@@ -38,7 +39,6 @@ v 8.8.0
   - Upgrade Sidekiq to 4.1.2
   - Added /health_check endpoint for checking service status
   - Make 'upcoming' filter for milestones work better across projects
-  - Fix concurrent request when updating build log in browser
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.

From 97c904a322a51df9517123c6ea969644639e2d4b Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 24 May 2016 00:32:44 -0700
Subject: [PATCH 0728/1431] Add CHANGELOG entry about using gitlab-shell v3.0.0

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

diff --git a/CHANGELOG b/CHANGELOG
index d26a0bff2e6..a79c3048b79 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.9.0 (unreleased)
   - Redesign navigation for project pages
+  - Use gitlab-shell v3.0.0
 
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources

From 5cca2d3bb171c260ad4b07f2a69962d3856c4d99 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 23 May 2016 09:49:13 +0100
Subject: [PATCH 0729/1431] Updated Ruby based on feedback

---
 app/assets/javascripts/issuable.js.coffee  |  4 ++--
 app/helpers/application_helper.rb          | 17 ++++-------------
 spec/features/issues/filter_issues_spec.rb | 10 +++++-----
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 6cb5d86fb93..6504e481102 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -1,7 +1,7 @@
 issuable_created = false
 @Issuable =
   init: ->
-    if not issuable_created
+    unless issuable_created
       issuable_created = true
       Issuable.initTemplates()
       Issuable.initSearch()
@@ -28,7 +28,7 @@ issuable_created = false
           $input = $("input[name='#{$search.attr('name')}']", $form)
 
           if $input.length is 0
-            $form.append "<input type='hidden' name='#{$search.attr('name')}' value='#{$search.val()}'/>"
+            $form.append "<input type='hidden' name='#{$search.attr('name')}' value='#{_.escape($search.val())}'/>"
           else
             $input.val $search.val()
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 59a04578c58..a3fe1d01292 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -263,7 +263,8 @@ module ApplicationHelper
       assignee_id: params[:assignee_id],
       author_id: params[:author_id],
       sort: params[:sort],
-      issue_search: params[:issue_search]
+      issue_search: params[:issue_search],
+      label_name: params[:label_name]
     }
 
     options = exist_opts.merge(options)
@@ -276,19 +277,9 @@ module ApplicationHelper
 
     params = options.compact
 
-    path = request.path
+    params.delete(:label_name) unless add_label
 
-    if !params.nil?
-      path << "?#{params.to_param}"
-      if add_label
-        if params[:label_name].present? and params[:label_name].respond_to?('any?')
-          params[:label_name].each do |label|
-            path << "&label_name[]=#{label}"
-          end
-        end
-      end
-    end
-    path
+    "#{request.path}?#{params.to_param}"
   end
 
   def outdated_browser?
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index c7ffee7d09c..bfbd06a29e2 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -159,7 +159,7 @@ describe 'Filter issues', feature: true do
     before do
       create(:issue, title: "Bug", project: project)
 
-      create(:label, project: project, title: 'bug')
+      bug_label = create(:label, project: project, title: 'bug')
       milestone = create(:milestone, title: "8", project: project)
 
       issue = create(:issue,
@@ -168,7 +168,7 @@ describe 'Filter issues', feature: true do
         milestone: milestone,
         author: user,
         assignee: user)
-      issue.labels << project.labels.find_by(title: 'bug')
+      issue.labels << bug_label
 
       visit namespace_project_issues_path(project.namespace, project)
     end
@@ -264,12 +264,12 @@ describe 'Filter issues', feature: true do
 
   describe 'filter issues and sort', js: true do
     before do
-      create(:label, project: project, title: 'bug')
+      bug_label = create(:label, project: project, title: 'bug')
       bug_one = create(:issue, title: "Frontend", project: project)
       bug_two = create(:issue, title: "Bug 2", project: project)
 
-      bug_one.labels << project.labels.find_by(title: 'bug')
-      bug_two.labels << project.labels.find_by(title: 'bug')
+      bug_one.labels << bug_label
+      bug_two.labels << bug_label
 
       visit namespace_project_issues_path(project.namespace, project)
     end

From fcd723eda6ab1c1f8839570140db54ae3f7ff837 Mon Sep 17 00:00:00 2001
From: Aran Koning <arankoning@gmail.com>
Date: Mon, 23 May 2016 16:35:19 +0200
Subject: [PATCH 0730/1431] Seconds plural slack

---
 CHANGELOG                                     |  1 +
 .../slack_service/build_message.rb            |  4 ++--
 .../slack_service/build_message_spec.rb       | 23 +++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a79c3048b79..104f41e6034 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Redesign navigation for project pages
   - Use gitlab-shell v3.0.0
+  - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
 
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
diff --git a/app/models/project_services/slack_service/build_message.rb b/app/models/project_services/slack_service/build_message.rb
index c124cad4afd..69c21b3fc38 100644
--- a/app/models/project_services/slack_service/build_message.rb
+++ b/app/models/project_services/slack_service/build_message.rb
@@ -35,8 +35,8 @@ class SlackService
     private
 
     def message
-      "#{project_link}: Commit #{commit_link} of #{branch_link} #{ref_type} by #{user_name} #{humanized_status} in #{duration} second(s)"
-    end
+      "#{project_link}: Commit #{commit_link} of #{branch_link} #{ref_type} by #{user_name} #{humanized_status} in #{duration} #{'second'.pluralize(duration)}"
+    end   
 
     def format(string)
       Slack::Notifier::LinkFormatter.format(string)
diff --git a/spec/models/project_services/slack_service/build_message_spec.rb b/spec/models/project_services/slack_service/build_message_spec.rb
index 621c83c0cda..7fcfdf0eacd 100644
--- a/spec/models/project_services/slack_service/build_message_spec.rb
+++ b/spec/models/project_services/slack_service/build_message_spec.rb
@@ -15,7 +15,7 @@ describe SlackService::BuildMessage do
       commit: {
         status: status,
         author_name: 'hacker',
-        duration: 10,
+        duration: duration,
       },
     }
   end
@@ -23,9 +23,10 @@ describe SlackService::BuildMessage do
   context 'succeeded' do
     let(:status) { 'success' }
     let(:color) { 'good' }
-
+    let(:duration) { 10 }
+    
     it 'returns a message with information about succeeded build' do
-      message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker passed in 10 second(s)'
+      message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker passed in 10 seconds'
       expect(subject.pretext).to be_empty
       expect(subject.fallback).to eq(message)
       expect(subject.attachments).to eq([text: message, color: color])
@@ -35,9 +36,23 @@ describe SlackService::BuildMessage do
   context 'failed' do
     let(:status) { 'failed' }
     let(:color) { 'danger' }
+    let(:duration) { 10 }
 
     it 'returns a message with information about failed build' do
-      message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 10 second(s)'
+      message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 10 seconds'
+      expect(subject.pretext).to be_empty
+      expect(subject.fallback).to eq(message)
+      expect(subject.attachments).to eq([text: message, color: color])
+    end
+  end 
+  
+  describe '#seconds_name' do
+    let(:status) { 'failed' }
+    let(:color) { 'danger' }
+    let(:duration) { 1 }
+
+    it 'returns seconds as singular when there is only one' do
+      message = '<somewhere.com|project_name>: Commit <somewhere.com/commit/97de212e80737a608d939f648d959671fb0a0142/builds|97de212e> of <somewhere.com/commits/develop|develop> branch by hacker failed in 1 second'
       expect(subject.pretext).to be_empty
       expect(subject.fallback).to eq(message)
       expect(subject.attachments).to eq([text: message, color: color])

From 07a3b09b7640a9c75d62574936d443664548b734 Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <nblock@archlinux.us>
Date: Tue, 24 May 2016 10:17:40 +0000
Subject: [PATCH 0731/1431] Update branch name from 8-7-stable to 8-8-stable

---
 doc/install/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 526f127178d..108ceb593d0 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -271,7 +271,7 @@ sudo usermod -aG redis git
     # Clone GitLab repository
     sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-8-stable gitlab
 
-**Note:** You can change `8-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `8-8-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ### Configure It
 

From d3c5650e178f3711cc56cd86e5bb78d4682cc408 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 08:59:18 -0500
Subject: [PATCH 0732/1431] Move tags to column in generic_commit_status

---
 .../_generic_commit_status.html.haml               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 8129514964a..5041f0f5c03 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -40,13 +40,13 @@
   %td
     = generic_commit_status.name
 
-    .pull-right
-      - if generic_commit_status.tags.any?
-        - generic_commit_status.tags.each do |tag|
-          %span.label.label-primary
-            = tag
-      - if defined?(retried) && retried
-        %span.label.label-warning retried
+  %td
+    - if generic_commit_status.tags.any?
+      - generic_commit_status.tags.each do |tag|
+        %span.label.label-primary
+          = tag
+    - if defined?(retried) && retried
+      %span.label.label-warning retried
 
   %td.duration
     - if generic_commit_status.duration

From 7ab09fdb78c00493595d2e2c30d56b652dfe845c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 24 May 2016 15:00:25 +0100
Subject: [PATCH 0733/1431] Fixed issue with GitLab import buttons having a
 spinner Closes #17232

---
 app/views/import/gitlab/status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/import/gitlab/status.html.haml b/app/views/import/gitlab/status.html.haml
index e3a356b5379..aedb8468eca 100644
--- a/app/views/import/gitlab/status.html.haml
+++ b/app/views/import/gitlab/status.html.haml
@@ -47,7 +47,7 @@
           %td.import-target
             = repo["path_with_namespace"]
           %td.import-actions.job-status
-            = button_tag class: "btn js-add-to-import" do
+            = button_tag class: "btn btn-import js-add-to-import" do
               Import
               = icon("spinner spin", class: "loading-icon")
 

From d1f99bcc1d52ebbbeab3a35c560f35edaff239c7 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 24 May 2016 09:04:43 -0600
Subject: [PATCH 0734/1431] Resolve some issues Jacob brought up.

---
 app/views/profiles/preferences/show.html.haml | 6 +++---
 app/views/projects/triggers/index.html.haml   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 0a3bbe2a815..1b1b16d656f 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -5,7 +5,7 @@
     %h4.prepend-top-0
       Application theme
     %p
-      Customize the appearance of the interface.
+      This setting allows you to customize the appearance of the site, e.g. the sidebar.
   .col-lg-9.application-theme
     - Gitlab::Themes.each do |theme|
       = label_tag do
@@ -18,7 +18,7 @@
     %h4.prepend-top-0
       Syntax highlighting theme
     %p
-      Customize the syntax highlighting.
+      This setting allow you to customize the appearance of the syntax.
   .col-lg-9.syntax-theme
     - Gitlab::ColorSchemes.each do |scheme|
       = label_tag do
@@ -31,7 +31,7 @@
     %h4.prepend-top-0
       Behavior
     %p
-      Customize the behavior of the system layout and default views.
+      This setting allows you to customize the behavior of the system layout and default views.
   .col-lg-9
     .form-group
       = f.label :layout, class: 'label-light' do
diff --git a/app/views/projects/triggers/index.html.haml b/app/views/projects/triggers/index.html.haml
index 7db0beba00b..7f3de47d7df 100644
--- a/app/views/projects/triggers/index.html.haml
+++ b/app/views/projects/triggers/index.html.haml
@@ -5,7 +5,7 @@
     %h4.prepend-top-0
       = page_title
     %p
-      Triggers can force a specific branch or tag to rebuild using an API call.
+      Triggers can force a specific branch or tag to rebuild with an API call.
   .col-lg-9
     %h5.prepend-top-0
       Your triggers
@@ -19,7 +19,7 @@
           = render partial: 'trigger', collection: @triggers, as: :trigger
     - else
       %p.settings-message.text-center.append-bottom-default
-        There are no triggers to use, create a trigger using the button below.
+        No triggers have been created yet. Add one using the button below.
 
     = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f|
       = f.submit "Add Trigger", class: 'btn btn-success'
@@ -28,7 +28,7 @@
       Use CURL
 
     %p.light
-      Copy the token above and set your branch or tag name. This is the reference that will be rebuilt.
+      Copy the token above, set your branch or tag name, and that reference will be rebuilt.
 
     %pre
       :plain
@@ -57,7 +57,7 @@
     %p.light
       Add
       %code variables[VARIABLE]=VALUE
-      to API requests. Variable values can be used to distinguish triggered and normal builds.
+      to an API request. Variable values can be used to distinguish between triggered builds and normal builds.
 
     %pre.append-bottom-0
       :plain

From cee07c5919e1a9c792e44c261dd8abfd76a2a993 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Tue, 24 May 2016 17:07:41 +0200
Subject: [PATCH 0735/1431] Measure proxy timing: needs influxdb code

---
 config/initializers/proxy_timing.rb   |  1 +
 lib/gitlab/middleware/proxy_timing.rb | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 config/initializers/proxy_timing.rb
 create mode 100644 lib/gitlab/middleware/proxy_timing.rb

diff --git a/config/initializers/proxy_timing.rb b/config/initializers/proxy_timing.rb
new file mode 100644
index 00000000000..9161bd9b6c9
--- /dev/null
+++ b/config/initializers/proxy_timing.rb
@@ -0,0 +1 @@
+Rails.application.config.middleware.use(Gitlab::Middleware::ProxyTiming)
diff --git a/lib/gitlab/middleware/proxy_timing.rb b/lib/gitlab/middleware/proxy_timing.rb
new file mode 100644
index 00000000000..9094d6b1e7d
--- /dev/null
+++ b/lib/gitlab/middleware/proxy_timing.rb
@@ -0,0 +1,22 @@
+# This Rack middleware is intended to measure the latency between
+# gitlab-workhorse forwarding a request to the Rails application and the
+# time this middleware is reached.
+
+module Gitlab
+  module Middleware
+    class ProxyTiming
+      def initialize(app)
+        @app = app
+      end
+      
+      def call(env)
+        proxy_start = env['HTTP_GITLAB_WORHORSE_PROXY_START'].to_f / 1_000_000_000
+        if proxy_start > 0
+          # send measurement
+          puts "\n\n\n#{(Time.now - proxy_start).to_f}\n\n\n"
+        end
+        @app.call(env)
+      end
+    end
+  end
+end

From a29b45b061a0f2669818fde8fa324baac92b1d71 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 24 May 2016 16:57:26 +0100
Subject: [PATCH 0736/1431] Clicking search pill focuses field

When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field.

Fixed an issue where clicking out of the field wouldn't remove the focus
outline

Also reduced some of the HTML to remove what isn't needed
---
 .../javascripts/search_autocomplete.js.coffee | 22 +++++++++----------
 app/assets/stylesheets/pages/search.scss      |  4 +++-
 app/views/layouts/_search.html.haml           |  7 ++----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 6a7b4ad1db7..2122e80f57a 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -20,8 +20,7 @@ class @SearchAutocomplete
     @dropdown = @wrap.find('.dropdown')
     @dropdownContent = @dropdown.find('.dropdown-content')
 
-    @locationBadgeEl = @getElement('.search-location-badge')
-    @locationText = @getElement('.location-text')
+    @locationBadgeEl = @getElement('.location-badge')
     @scopeInputEl = @getElement('#scope')
     @searchInput = @getElement('.search-input')
     @projectInputEl = @getElement('#search_project_id')
@@ -133,7 +132,7 @@ class @SearchAutocomplete
       scope: @scopeInputEl.val()
 
       # Location badge
-      _location: @locationText.text()
+      _location: @locationBadgeEl.text()
     }
 
   bindEvents: ->
@@ -143,12 +142,14 @@ class @SearchAutocomplete
     @searchInput.on 'click', @onSearchInputClick
     @searchInput.on 'focus', @onSearchInputFocus
     @clearInput.on 'click', @onClearInputClick
+    @locationBadgeEl.on 'click', =>
+      @searchInput.focus()
 
   onDocumentClick: (e) =>
     # If clicking outside the search box
     # And search input is not focused
     # And we are not clicking inside a suggestion
-    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).parents('ul').length
+    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).closest('.search-form').length
       @onSearchInputBlur()
 
   enableAutocomplete: ->
@@ -221,10 +222,8 @@ class @SearchAutocomplete
     category = if item.category? then "#{item.category}: " else ''
     value = if item.value? then item.value else ''
 
-    html = "<span class='location-badge'>
-              <i class='location-text'>#{category}#{value}</i>
-            </span>"
-    @locationBadgeEl.html(html)
+    badgeText = "#{category}#{value}"
+    @locationBadgeEl.text(badgeText).show()
     @wrap.addClass('has-location-badge')
 
   restoreOriginalState: ->
@@ -233,9 +232,8 @@ class @SearchAutocomplete
     for input in inputs
       @getElement("##{input}").val(@originalState[input])
 
-
     if @originalState._location is ''
-      @locationBadgeEl.empty()
+      @locationBadgeEl.hide()
     else
       @addLocationBadge(
         value: @originalState._location
@@ -244,7 +242,7 @@ class @SearchAutocomplete
     @dropdown.removeClass 'open'
 
   badgePresent: ->
-    @locationBadgeEl.children().length
+    @locationBadgeEl.length
 
   resetSearchState: ->
     inputs = Object.keys @originalState
@@ -257,7 +255,7 @@ class @SearchAutocomplete
       @getElement("##{input}").val('')
 
   removeLocationBadge: ->
-    @locationBadgeEl.empty()
+    @locationBadgeEl.hide()
 
     # Reset state
     @resetSearchState()
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 2bff70c8c64..037ad520545 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -28,6 +28,7 @@
   }
 
   .search-input {
+    padding-right: 20px;
     border: none;
     font-size: 14px;
     outline: none;
@@ -47,6 +48,7 @@
     display: inline-block;
     background-color: $location-badge-bg;
     vertical-align: top;
+    cursor: default;
   }
 
   .search-input-container {
@@ -55,7 +57,7 @@
     position: relative;
   }
 
-  .search-location-badge, .search-input-wrap {
+  .search-input-wrap {
     // Fallback if flexbox is not supported
     display: inline-block;
   }
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index 6b208c3d0bb..b49207fc315 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -6,11 +6,8 @@
 .search.search-form{class: "#{'has-location-badge' if label.present?}"}
   = form_tag search_path, method: :get, class: 'navbar-form' do |f|
     .search-input-container
-      .search-location-badge
-        - if label.present?
-          %span.location-badge
-            %i.location-text
-              = label
+      - if label.present?
+        .location-badge= label
       .search-input-wrap
         .dropdown{ data: {url: search_autocomplete_path } }
           = search_field_tag "search", nil, placeholder: 'Search', class: "search-input dropdown-menu-toggle", spellcheck: false, tabindex: "1", autocomplete: 'off',  data: { toggle: 'dropdown' }

From b2c411710d80a8d801876ec406f1c6035cc5b23f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 10:59:59 -0500
Subject: [PATCH 0737/1431] Increase max-width of stage cells

---
 app/assets/stylesheets/pages/pipelines.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 87b0562c29a..ce917a471c7 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,6 +1,6 @@
 .pipelines {
   .stage {
-    max-width: 0;
+    max-width: 80px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

From b0082bec7305f9bf4322d8d532807e5607f5655a Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 24 May 2016 19:34:08 +0300
Subject: [PATCH 0738/1431] Get award menu url from gl object.

---
 app/assets/javascripts/awards_handler.coffee   | 2 +-
 app/views/award_emoji/_awards_block.html.haml  | 3 +++
 app/views/emoji_awards/_awards_block.html.haml | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index e535bd525b8..b4a341675bd 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -232,7 +232,7 @@ class @AwardsHandler
 
     return @createEmoji_ emoji if $('.emoji-menu').length
 
-    awardMenuUrl = $('[data-award-menu-url]').data 'award-menu-url'
+    awardMenuUrl = gl.awardMenuUrl or '/emojis'
     @createEmojiMenu awardMenuUrl, => @createEmoji emoji
 
 
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index 86931c70f33..19d1275a926 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -7,6 +7,9 @@
         = awards.count
 
   - if current_user
+    :javascript
+      gl.awardMenuUrl = "#{emojis_path}"
+
     .award-menu-holder.js-award-holder
       %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
         = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml
index 1b840d88752..e9b286b7c3f 100644
--- a/app/views/emoji_awards/_awards_block.html.haml
+++ b/app/views/emoji_awards/_awards_block.html.haml
@@ -7,6 +7,9 @@
         = awards.count
 
   - if current_user
+    :javascript
+      gl.awardMenuUrl = emojis_path
+
     .award-menu-holder.js-award-holder
       %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
         = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})

From f2fb574d0421eb3b24b640766fa2265fafe20130 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 24 May 2016 17:39:56 +0100
Subject: [PATCH 0739/1431] Updated erorr message when project limit is zero
 When the project limit is zero & the user tries to create a project, the
 error displayed is now 'Personal project creation is not allowed. Please
 contact your administrator with questions'

Closes #17691
---
 app/models/project.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 37de1dfe4d5..2876150cd6e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -431,7 +431,13 @@ class Project < ActiveRecord::Base
 
   def check_limit
     unless creator.can_create_project? or namespace.kind == 'group'
-      self.errors.add(:limit_reached, "Your project limit is #{creator.projects_limit} projects! Please contact your administrator to increase it")
+      projects_limit = creator.projects_limit
+
+      if projects_limit == 0
+        self.errors.add(:base, "Personal project creation is not allowed. Please contact your administrator with questions")
+      else
+        self.errors.add(:base, "Your project limit is #{projects_limit} projects! Please contact your administrator to increase it")
+      end
     end
   rescue
     self.errors.add(:base, "Can't check your ability to create project")

From 4c058fc429a4173e033a4babcb379c52b5ed13e3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 12:16:37 -0500
Subject: [PATCH 0740/1431] Remove icons from tables; remove timestamp from
 pipelines, remove info block at top of pipelines

---
 app/assets/stylesheets/framework/nav.scss              |  2 +-
 app/assets/stylesheets/pages/merge_requests.scss       |  6 ------
 app/assets/stylesheets/pages/pipelines.scss            |  2 +-
 app/views/projects/ci/builds/_build.html.haml          |  4 ----
 app/views/projects/ci/commits/_commit.html.haml        |  7 -------
 .../_generic_commit_status.html.haml                   |  4 ----
 app/views/projects/pipelines/index.html.haml           | 10 +---------
 7 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index c70be58f48f..afb0cd1a1e6 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -281,7 +281,7 @@
 }
 
 .page-with-layout-nav {
-  margin-top: 50px;
+  margin-top: $header-height + 2;
 
   &.controls-dropdown-visible {
     @media (max-width: $screen-xs-min) {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index c4005ba1e69..4f8a8748d3f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -280,11 +280,5 @@
       background-color: $white-light;
       color: $gl-placeholder-color;
     }
-
-    th,
-    td {
-      padding: 16px;
-    }
   }
 }
-
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ce917a471c7..6128868b670 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,6 +1,6 @@
 .pipelines {
   .stage {
-    max-width: 80px;
+    max-width: 100px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e23a3782c6b..5bd6e3f0ebc 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -57,14 +57,10 @@
 
   %td.duration
     - if build.duration
-      = icon("clock-o")
-      &nbsp;
       #{duration_in_words(build.finished_at, build.started_at)}
 
   %td.timestamp
     - if build.finished_at
-      = icon("calendar")
-      &nbsp;
       %span #{time_ago_with_tooltip(build.finished_at)}
 
   - if defined?(coverage) && coverage
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 9c63510d864..5b6b940a0c4 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -45,14 +45,7 @@
   %td
     - if commit.started_at && commit.finished_at
       %p.duration
-        = icon("clock-o")
-        &nbsp;
         #{duration_in_words(commit.finished_at, commit.started_at)}
-    - if commit.finished_at
-      %p.finished_at
-        = icon("calendar")
-        &nbsp;
-        #{time_ago_with_tooltip(commit.finished_at)}
 
   %td
     .controls.hidden-xs.pull-right
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 8129514964a..8be124f387a 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -50,14 +50,10 @@
 
   %td.duration
     - if generic_commit_status.duration
-      = icon("clock-o")
-      &nbsp;
       #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)}
 
   %td.timestamp
     - if generic_commit_status.finished_at
-      = icon("calendar")
-      &nbsp;
       %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
 
   - if defined?(coverage) && coverage
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 4e2e8190700..a6c12814adf 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -36,14 +36,6 @@
         = icon('wrench')
         %span CI Lint
 
-.row-content-block
-  - if @scope == 'running'
-    Running pipelines for this project
-  - elsif @scope.nil?
-    Pipelines for this project
-  - else
-    #{@scope.titleize} for this project
-
 %ul.content-list.pipelines
   - stages = @pipelines.stages
   - if @pipelines.blank?
@@ -59,7 +51,7 @@
             %th.stage
               %span.has-tooltip{ title: "#{stage.titleize}" }
                 = stage.titleize.pluralize
-          %th
+          %th Duration
           %th
         = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
 

From 65925e699839e1f2e01c6c5f7a355d9fae0337d9 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 12:31:46 -0500
Subject: [PATCH 0741/1431] Remove top block from builds page

---
 app/views/admin/builds/index.html.haml    | 1 -
 app/views/projects/builds/index.html.haml | 3 ---
 spec/features/builds_spec.rb              | 1 -
 3 files changed, 5 deletions(-)

diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index ed24757087b..d74cf8598e8 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -47,4 +47,3 @@
           = render "admin/builds/build", build: build
 
     = paginate @builds, theme: 'gitlab'
-
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 98f4a9416e5..7c0bec264ab 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -35,9 +35,6 @@
         = icon('wrench')
         %span CI Lint
 
-.row-content-block
-  #{(@scope || 'all').capitalize} builds from this project
-
 %ul.content-list
   - if @builds.blank?
     %li
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index f83a78308e3..090a941958f 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -43,7 +43,6 @@ describe "Builds" do
       end
 
       it { expect(page).to have_selector('.nav-links li.active', text: 'All') }
-      it { expect(page).to have_selector('.row-content-block', text: 'All builds from this project') }
       it { expect(page).to have_content @build.short_sha }
       it { expect(page).to have_content @build.ref }
       it { expect(page).to have_content @build.name }

From 20e6e0dbe609f7b0fdd480281223a1a98d645f34 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 24 May 2016 20:47:10 +0300
Subject: [PATCH 0742/1431] Handle posting emoji only vote +1 and -1 comments.

And remove mutual votes.
---
 app/assets/javascripts/awards_handler.coffee | 54 +++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index b4a341675bd..67f04dcac73 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -25,26 +25,9 @@ class @AwardsHandler
 
     e.preventDefault()
 
-    $emojiBtn = $(e.currentTarget)
-    $addAwardBtn = $('.js-add-award.is-active')
-    $votesBlock = $($addAwardBtn.closest('.js-award-holder').data('target'))
-
-    if $addAwardBtn.length is 0
-      $votesBlock = $emojiBtn.closest('.js-awards-block')
-    else if $votesBlock.length is 0
-      $votesBlock = $addAwardBtn.closest('.js-awards-block')
-
-    $votesBlock.addClass 'js-awards-block'
-    awardUrl = $votesBlock.data 'award-url'
-    emoji = $emojiBtn.find('.icon').data('emoji')
-
-    if emoji in [ 'thumbsup', 'thumbsdown' ]
-      mutualVote = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
-
-      isAlreadyVoted = $("[data-emoji=#{mutualVote}]").parent().hasClass 'active'
-      @addAward awardUrl, mutualVote if isAlreadyVoted
-
-    @addAward awardUrl, emoji
+    emoji = $(e.currentTarget).find('.icon').data 'emoji'
+    @getVotesBlock().addClass 'js-awards-block'
+    @addAward @getAwardUrl(), emoji
 
 
   showEmojiMenu: ($addBtn) ->
@@ -105,16 +88,21 @@ class @AwardsHandler
 
     $menu.css(css)
 
-  addAward: (awardUrl, emoji) ->
+
+  addAward: (awardUrl, emoji, checkMutuality = yes) ->
+
     emoji = @normilizeEmojiName(emoji)
     @postEmoji awardUrl, emoji, =>
-      @addAwardToEmojiBar(emoji)
+      @addAwardToEmojiBar(emoji, checkMutuality)
 
       $('.js-awards-block-current').removeClass 'js-awards-block-current'
 
-    $(".emoji-menu").removeClass "is-visible"
+    $('.emoji-menu').removeClass 'is-visible'
 
-  addAwardToEmojiBar: (emoji) ->
+
+  addAwardToEmojiBar: (emoji, checkForMutuality = yes) ->
+
+    @checkMutuality emoji  if checkForMutuality
     @addEmojiToFrequentlyUsedList(emoji)
 
     emoji = @normilizeEmojiName(emoji)
@@ -131,6 +119,24 @@ class @AwardsHandler
     else
       @createEmoji(emoji)
 
+
+  getVotesBlock: -> return $ '.awards.js-awards-block'
+
+
+  getAwardUrl: -> @getVotesBlock().data 'award-url'
+
+
+  checkMutuality: (emoji) ->
+
+    awardUrl = @getAwardUrl()
+
+    if emoji in [ 'thumbsup', 'thumbsdown' ]
+      mutualVote = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
+
+      isAlreadyVoted = $("[data-emoji=#{mutualVote}]").parent().hasClass 'active'
+      @addAward awardUrl, mutualVote, no if isAlreadyVoted
+
+
   isActive: ($emojiBtn) ->
     $emojiBtn.hasClass("active")
 

From 12cf4f885a160c7d2e29875f09dda0fba4e7ad54 Mon Sep 17 00:00:00 2001
From: sebastian-schmid <mail@sebastian-schmid.de>
Date: Tue, 24 May 2016 20:26:43 +0200
Subject: [PATCH 0743/1431] fixing typo in link #17809

---
 doc/monitoring/health_check.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/monitoring/health_check.md b/doc/monitoring/health_check.md
index defbf37ac19..0d17799372f 100644
--- a/doc/monitoring/health_check.md
+++ b/doc/monitoring/health_check.md
@@ -11,7 +11,7 @@ and access the cache. This endpoint can be provided to uptime monitoring service
 ## Access Token
 
 An access token needs to be provided while accessing the health check endpoint. The current
-accepted token can be found on the `admin/heath_check` page of your GitLab instance.
+accepted token can be found on the `admin/health_check` page of your GitLab instance.
 
 ![access token](img/health_check_token.png)
 

From 75739e54be0fca389c05d3d9d3de69737c0ff3ab Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 23 May 2016 19:37:59 -0400
Subject: [PATCH 0744/1431] Enable RSpec/NotToNot cop and auto-correct offenses

Also removes the note from the development/testing.md guide
---
 .rubocop.yml                                       |  2 +-
 doc/development/testing.md                         |  2 +-
 features/steps/admin/users.rb                      |  2 +-
 features/steps/dashboard/todos.rb                  |  2 +-
 features/steps/project/commits/commits.rb          |  2 +-
 features/steps/project/issues/award_emoji.rb       |  4 ++--
 features/steps/project/issues/issues.rb            |  4 ++--
 features/steps/project/merge_requests.rb           |  4 ++--
 features/steps/shared/note.rb                      |  2 +-
 spec/controllers/admin/projects_controller_spec.rb |  2 +-
 .../projects/compare_controller_spec.rb            |  4 ++--
 .../projects/group_links_controller_spec.rb        |  2 +-
 .../controllers/projects/issues_controller_spec.rb |  2 +-
 .../projects/project_members_controller_spec.rb    |  2 +-
 spec/controllers/registrations_controller_spec.rb  |  2 +-
 spec/controllers/sessions_controller_spec.rb       |  6 +++---
 spec/factories_spec.rb                             |  2 +-
 spec/features/admin/admin_runners_spec.rb          |  2 +-
 spec/features/admin/admin_users_spec.rb            |  2 +-
 spec/features/builds_spec.rb                       |  4 ++--
 spec/features/commits_spec.rb                      | 10 +++++-----
 spec/features/issues/update_issues_spec.rb         |  2 +-
 spec/features/pipelines_spec.rb                    | 14 +++++++-------
 spec/features/runners_spec.rb                      |  4 ++--
 spec/features/variables_spec.rb                    |  2 +-
 spec/helpers/auth_helper_spec.rb                   |  2 +-
 spec/helpers/merge_requests_helper_spec.rb         |  2 +-
 spec/lib/award_emoji_spec.rb                       |  2 +-
 spec/lib/ci/gitlab_ci_yaml_processor_spec.rb       |  6 +++---
 spec/lib/container_registry/registry_spec.rb       |  2 +-
 spec/lib/container_registry/repository_spec.rb     |  6 +++---
 spec/lib/container_registry/tag_spec.rb            |  4 ++--
 spec/lib/gitlab/bitbucket_import/client_spec.rb    |  2 +-
 .../ci/build/artifacts/metadata/entry_spec.rb      |  2 +-
 spec/lib/gitlab/gfm/reference_rewriter_spec.rb     |  4 ++--
 spec/lib/gitlab/gfm/uploads_rewriter_spec.rb       |  8 ++++----
 spec/lib/gitlab/lfs/lfs_router_spec.rb             |  4 ++--
 spec/lib/gitlab/metrics/instrumentation_spec.rb    |  8 ++++----
 spec/lib/gitlab/metrics/sampler_spec.rb            |  2 +-
 .../metrics/subscribers/active_record_spec.rb      |  2 +-
 spec/lib/gitlab/sherlock/collection_spec.rb        |  6 +++---
 spec/lib/gitlab/sherlock/query_spec.rb             |  2 +-
 spec/lib/gitlab/sherlock/transaction_spec.rb       |  4 ++--
 spec/lib/json_web_token/rsa_token_spec.rb          |  2 +-
 spec/mailers/shared/notify.rb                      |  4 ++--
 spec/models/build_spec.rb                          |  8 ++++----
 spec/models/ci/commit_spec.rb                      |  2 +-
 spec/models/ci/runner_spec.rb                      |  2 +-
 spec/models/concerns/issuable_spec.rb              |  2 +-
 spec/models/concerns/token_authenticatable_spec.rb |  4 ++--
 spec/models/generic_commit_status_spec.rb          |  4 ++--
 spec/models/issue_spec.rb                          |  2 +-
 .../project_services/hipchat_service_spec.rb       |  2 +-
 spec/models/project_spec.rb                        |  4 ++--
 spec/models/repository_spec.rb                     | 10 +++++-----
 spec/requests/api/project_members_spec.rb          |  2 +-
 spec/requests/api/system_hooks_spec.rb             |  2 +-
 spec/requests/ci/api/builds_spec.rb                |  4 ++--
 ...ntainer_registry_authentication_service_spec.rb |  4 ++--
 spec/services/create_commit_builds_service_spec.rb |  2 +-
 spec/services/groups/create_service_spec.rb        |  2 +-
 spec/services/issues/create_service_spec.rb        |  4 ++--
 spec/services/issues/move_service_spec.rb          |  6 +++---
 .../merge_when_build_succeeds_service_spec.rb      |  6 +++---
 spec/workers/post_receive_spec.rb                  |  2 +-
 65 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 4e6ced4e1ab..9fc1e7d0faf 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1130,7 +1130,7 @@ RSpec/MultipleDescribes:
 # Enforces the usage of the same method on all negative message expectations.
 RSpec/NotToNot:
   EnforcedStyle: not_to
-  Enabled: false
+  Enabled: true
 
 # Prefer using verifying doubles over normal doubles.
 RSpec/VerifiedDoubles:
diff --git a/doc/development/testing.md b/doc/development/testing.md
index 33eed29ba5c..513457d203a 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -65,7 +65,7 @@ the command line via `bundle exec teaspoon`, or via a web browser at
 - Use `context` to test branching logic.
 - Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
 - Don't supply the `:each` argument to hooks since it's the default.
-- Prefer `not_to` to `to_not`.
+- Prefer `not_to` to `to_not` (_this is enforced by Rubocop_).
 - Try to match the ordering of tests to the ordering within the class.
 - Try to follow the [Four-Phase Test][four-phase-test] pattern, using newlines
   to separate phases.
diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb
index 4bc290b6bdf..8fb8a86d58b 100644
--- a/features/steps/admin/users.rb
+++ b/features/steps/admin/users.rb
@@ -158,7 +158,7 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
 
   step 'I should not see twitter details' do
     expect(page).to have_content 'Pete'
-    expect(page).to_not have_content 'twitter'
+    expect(page).not_to have_content 'twitter'
   end
 
   step 'click on ssh keys tab' do
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index 2b23df6764b..d3b6c7f6a15 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -106,7 +106,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
       if pending
         expect(page).to have_link 'Done'
       else
-        expect(page).to_not have_link 'Done'
+        expect(page).not_to have_link 'Done'
       end
     end
   end
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index f33f37be951..e1b29f1e57a 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -105,7 +105,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I should not see button to create a new merge request' do
-    expect(page).to_not have_link 'Create Merge Request'
+    expect(page).not_to have_link 'Create Merge Request'
   end
 
   step 'I should see button to the merge request' do
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index c5d45709b44..1b14659b4df 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -39,8 +39,8 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
 
   step 'I can see the activity and food categories' do
     page.within '.emoji-menu' do
-      expect(page).to_not have_selector 'Activity'
-      expect(page).to_not have_selector 'Food'
+      expect(page).not_to have_selector 'Activity'
+      expect(page).not_to have_selector 'Food'
     end
   end
 
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index fc12843ea5c..f2c68f007ef 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -216,7 +216,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
       page.within 'li.issue:nth-child(3)' do
         expect(page).to have_content 'Bugfix'
-        expect(page).to_not have_content '0 0'
+        expect(page).not_to have_content '0 0'
       end
     end
   end
@@ -235,7 +235,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
       page.within 'li.issue:nth-child(3)' do
         expect(page).to have_content 'Bugfix'
-        expect(page).to_not have_content '0 0'
+        expect(page).not_to have_content '0 0'
       end
     end
   end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index b79d19f1c58..cfa586f859f 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -203,7 +203,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
       page.within 'li.merge-request:nth-child(3)' do
         expect(page).to have_content 'Bug NS-05'
-        expect(page).to_not have_content '0 0'
+        expect(page).not_to have_content '0 0'
       end
     end
   end
@@ -222,7 +222,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
       page.within 'li.merge-request:nth-child(3)' do
         expect(page).to have_content 'Bug NS-05'
-        expect(page).to_not have_content '0 0'
+        expect(page).not_to have_content '0 0'
       end
     end
   end
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index a3c3887ab46..3d7c6ef9d2d 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -107,7 +107,7 @@ module SharedNote
   end
 
   step 'I should see no notes at all' do
-    expect(page).to_not have_css('.note')
+    expect(page).not_to have_css('.note')
   end
 
   # Markdown
diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb
index 2ba0d489197..4cb8b8da150 100644
--- a/spec/controllers/admin/projects_controller_spec.rb
+++ b/spec/controllers/admin/projects_controller_spec.rb
@@ -17,7 +17,7 @@ describe Admin::ProjectsController do
 
     it 'does not retrieve the project' do
       get :index, visibility_levels: [Gitlab::VisibilityLevel::INTERNAL]
-      expect(response.body).to_not match(project.name)
+      expect(response.body).not_to match(project.name)
     end
   end
 end
diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb
index 788a609ee40..4018dac95a2 100644
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
@@ -19,7 +19,7 @@ describe Projects::CompareController do
         to: ref_to)
 
     expect(response).to be_success
-    expect(assigns(:diffs).first).to_not be_nil
+    expect(assigns(:diffs).first).not_to be_nil
     expect(assigns(:commits).length).to be >= 1
   end
 
@@ -32,7 +32,7 @@ describe Projects::CompareController do
         w: 1)
 
     expect(response).to be_success
-    expect(assigns(:diffs).first).to_not be_nil
+    expect(assigns(:diffs).first).not_to be_nil
     expect(assigns(:commits).length).to be >= 1
     # without whitespace option, there are more than 2 diff_splits
     diff_splits = assigns(:diffs).first.diff.split("\n")
diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb
index 1bd1fc5189e..fbe8758dda7 100644
--- a/spec/controllers/projects/group_links_controller_spec.rb
+++ b/spec/controllers/projects/group_links_controller_spec.rb
@@ -43,7 +43,7 @@ describe Projects::GroupLinksController do
       end
 
       it 'does not share project with that group' do
-        expect(group.shared_projects).to_not include project
+        expect(group.shared_projects).not_to include project
       end
     end
   end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 2b2ad3b9412..c469480b086 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -56,7 +56,7 @@ describe Projects::IssuesController do
           move_issue
 
           expect(response).to have_http_status :found
-          expect(another_project.issues).to_not be_empty
+          expect(another_project.issues).not_to be_empty
         end
       end
 
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index ed64e7cf9af..750fbecdd07 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -38,7 +38,7 @@ describe Projects::ProjectMembersController do
       include_context 'import applied'
 
       it 'does not import team members' do
-        expect(project.team_members).to_not include member
+        expect(project.team_members).not_to include member
       end
 
       it 'responds with not found' do
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index df70a589a89..fbe50d10ec5 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -16,7 +16,7 @@ describe RegistrationsController do
       it 'logs user in directly' do
         post(:create, user_params)
         expect(ActionMailer::Base.deliveries.last).to be_nil
-        expect(subject.current_user).to_not be_nil
+        expect(subject.current_user).not_to be_nil
       end
     end
 
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 83cc8ec6d26..ab57c52c7cd 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -47,7 +47,7 @@ describe SessionsController do
               authenticate_2fa(login: another_user.username,
                                otp_attempt: another_user.current_otp)
 
-              expect(subject.current_user).to_not eq another_user
+              expect(subject.current_user).not_to eq another_user
             end
           end
 
@@ -56,7 +56,7 @@ describe SessionsController do
               authenticate_2fa(login: another_user.username,
                                otp_attempt: 'invalid')
 
-              expect(subject.current_user).to_not eq another_user
+              expect(subject.current_user).not_to eq another_user
             end
           end
 
@@ -73,7 +73,7 @@ describe SessionsController do
               before { authenticate_2fa(otp_attempt: 'invalid') }
 
               it 'does not authenticate' do
-                expect(subject.current_user).to_not eq user
+                expect(subject.current_user).not_to eq user
               end
 
               it 'warns about invalid OTP code' do
diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb
index a073a1f9d7c..675d9bd18b7 100644
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
@@ -6,7 +6,7 @@ describe 'factories' do
       let(:entity) { build(factory.name) }
 
       it 'does not raise error when created' do
-        expect { entity }.to_not raise_error
+        expect { entity }.not_to raise_error
       end
 
       it 'should be valid', if: factory.build_class < ActiveRecord::Base do
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 26d03944b8a..8ebd4a6808e 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -79,7 +79,7 @@ describe "Admin Runners" do
       end
 
       it 'changes registration token' do
-        expect(page_token).to_not eq token
+        expect(page_token).not_to eq token
       end
     end
   end
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 6dee0cd8d47..96621843b30 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -152,7 +152,7 @@ describe "Admin::Users", feature: true  do
         it 'sees impersonation log out icon' do
           icon = first('.fa.fa-user-secret')
 
-          expect(icon).to_not eql nil
+          expect(icon).not_to eql nil
         end
 
         it 'can log out of impersonated user back to original user' do
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index f83a78308e3..716c4accf43 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -47,7 +47,7 @@ describe "Builds" do
       it { expect(page).to have_content @build.short_sha }
       it { expect(page).to have_content @build.ref }
       it { expect(page).to have_content @build.name }
-      it { expect(page).to_not have_link 'Cancel running' }
+      it { expect(page).not_to have_link 'Cancel running' }
     end
   end
 
@@ -63,7 +63,7 @@ describe "Builds" do
     it { expect(page).to have_content @build.short_sha }
     it { expect(page).to have_content @build.ref }
     it { expect(page).to have_content @build.name }
-    it { expect(page).to_not have_link 'Cancel running' }
+    it { expect(page).not_to have_link 'Cancel running' }
   end
 
   describe "GET /:project/builds/:id" do
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index dacaa96d760..20f0b27bcc1 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -137,8 +137,8 @@ describe 'Commits' do
           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')
+          expect(page).not_to have_link('Cancel running')
+          expect(page).not_to have_link('Retry failed')
         end
       end
 
@@ -155,9 +155,9 @@ describe 'Commits' 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')
+          expect(page).not_to have_link('Download artifacts')
+          expect(page).not_to have_link('Cancel running')
+          expect(page).not_to have_link('Retry failed')
         end
       end
     end
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index b03dd0f666d..466a6f7dfa7 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -95,7 +95,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
       find('.dropdown-menu-milestone a', text: "No Milestone").click
       click_update_issues_button
 
-      expect(first('.issue')).to_not have_content milestone.title
+      expect(first('.issue')).not_to have_content milestone.title
     end
   end
 
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 1d6f4485c81..bef0578a9bb 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -41,7 +41,7 @@ describe "Pipelines" do
       context 'when canceling' do
         before { click_link('Cancel') }
 
-        it { expect(page).to_not have_link('Cancel') }
+        it { expect(page).not_to have_link('Cancel') }
         it { expect(page).to have_selector('.ci-canceled') }
       end
     end
@@ -57,7 +57,7 @@ describe "Pipelines" do
       context 'when retrying' do
         before { click_link('Retry') }
 
-        it { expect(page).to_not have_link('Retry') }
+        it { expect(page).not_to have_link('Retry') }
         it { expect(page).to have_selector('.ci-pending') }
       end
     end
@@ -75,7 +75,7 @@ describe "Pipelines" do
       context 'without artifacts' do
         let!(:without_artifacts) { create(:ci_build, :success, commit: pipeline, name: 'rspec', stage: 'test') }
 
-        it { expect(page).to_not have_selector('.build-artifacts') }
+        it { expect(page).not_to have_selector('.build-artifacts') }
       end
     end
   end
@@ -104,23 +104,23 @@ describe "Pipelines" do
     end
 
     context 'retrying builds' do
-      it { expect(page).to_not have_content('retried') }
+      it { expect(page).not_to have_content('retried') }
 
       context 'when retrying' do
         before { click_on 'Retry failed' }
 
-        it { expect(page).to_not have_content('Retry failed') }
+        it { expect(page).not_to have_content('Retry failed') }
         it { expect(page).to have_content('retried') }
       end
     end
 
     context 'canceling builds' do
-      it { expect(page).to_not have_selector('.ci-canceled') }
+      it { expect(page).not_to have_selector('.ci-canceled') }
 
       context 'when canceling' do
         before { click_on 'Cancel running' }
 
-        it { expect(page).to_not have_content('Cancel running') }
+        it { expect(page).not_to have_content('Cancel running') }
         it { expect(page).to have_selector('.ci-canceled') }
       end
     end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 49156130ad3..a5ed3595b0a 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -29,8 +29,8 @@ describe "Runners" do
     end
 
     before do
-      expect(page).to_not have_content(@specific_runner3.display_name)
-      expect(page).to_not have_content(@specific_runner3.display_name)
+      expect(page).not_to have_content(@specific_runner3.display_name)
+      expect(page).not_to have_content(@specific_runner3.display_name)
     end
 
     it "places runners in right places" do
diff --git a/spec/features/variables_spec.rb b/spec/features/variables_spec.rb
index 48e2dae4884..a2b8f7b6931 100644
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
@@ -34,7 +34,7 @@ describe 'Project variables', js: true do
       find('.btn-variable-delete').click
     end
 
-    expect(page).to_not have_selector('variables-table')
+    expect(page).not_to have_selector('variables-table')
   end
 
   it 'should edit variable' do
diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index 16fbb5dcecb..49ea4fa6d3e 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -36,7 +36,7 @@ describe AuthHelper do
         )
 
         expect(helper.enabled_button_based_providers).to include('twitter')
-        expect(helper.enabled_button_based_providers).to_not include('github')
+        expect(helper.enabled_button_based_providers).not_to include('github')
       end
     end
   end
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index 600e1c4e9ec..8e7ed42e883 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -17,7 +17,7 @@ describe MergeRequestsHelper do
     it 'does not include api credentials in a link' do
       allow(ci_service).
         to receive(:build_page).and_return("http://secretuser:secretpass@jenkins.example.com:8888/job/test1/scm/bySHA1/12d65c")
-      expect(helper.ci_build_details_path(merge_request)).to_not match("secret")
+      expect(helper.ci_build_details_path(merge_request)).not_to match("secret")
     end
   end
 
diff --git a/spec/lib/award_emoji_spec.rb b/spec/lib/award_emoji_spec.rb
index 88c22912950..c3098574292 100644
--- a/spec/lib/award_emoji_spec.rb
+++ b/spec/lib/award_emoji_spec.rb
@@ -5,7 +5,7 @@ describe AwardEmoji do
     subject { AwardEmoji.urls }
 
     it { is_expected.to be_an_instance_of(Array) }
-    it { is_expected.to_not be_empty }
+    it { is_expected.not_to be_empty }
 
     context 'every Hash in the Array' do
       it 'has the correct keys and values' do
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 9eef8ea0976..7375539cf17 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -619,19 +619,19 @@ module Ci
       context 'no dependencies' do
         let(:dependencies) { }
 
-        it { expect { subject }.to_not raise_error }
+        it { expect { subject }.not_to raise_error }
       end
 
       context 'dependencies to builds' do
         let(:dependencies) { ['build1', 'build2'] }
 
-        it { expect { subject }.to_not raise_error }
+        it { expect { subject }.not_to raise_error }
       end
 
       context 'dependencies to builds defined as symbols' do
         let(:dependencies) { [:build1, :build2] }
 
-        it { expect { subject }.to_not raise_error }
+        it { expect { subject }.not_to raise_error }
       end
 
       context 'undefined dependency' do
diff --git a/spec/lib/container_registry/registry_spec.rb b/spec/lib/container_registry/registry_spec.rb
index 2638401ae6e..4f3f8b24fc4 100644
--- a/spec/lib/container_registry/registry_spec.rb
+++ b/spec/lib/container_registry/registry_spec.rb
@@ -10,7 +10,7 @@ describe ContainerRegistry::Registry do
   it { is_expected.to respond_to(:uri) }
   it { is_expected.to respond_to(:path) }
 
-  it { expect(subject.repository('test')).to_not be_nil }
+  it { expect(subject.repository('test')).not_to be_nil }
 
   context '#path' do
     subject { registry.path }
diff --git a/spec/lib/container_registry/repository_spec.rb b/spec/lib/container_registry/repository_spec.rb
index e6d66b11e4e..279709521c9 100644
--- a/spec/lib/container_registry/repository_spec.rb
+++ b/spec/lib/container_registry/repository_spec.rb
@@ -6,7 +6,7 @@ describe ContainerRegistry::Repository do
 
   it { expect(repository).to respond_to(:registry) }
   it { expect(repository).to delegate_method(:client).to(:registry) }
-  it { expect(repository.tag('test')).to_not be_nil }
+  it { expect(repository.tag('test')).not_to be_nil }
 
   context '#path' do
     subject { repository.path }
@@ -27,7 +27,7 @@ describe ContainerRegistry::Repository do
     context '#manifest' do
       subject { repository.manifest }
 
-      it { is_expected.to_not be_nil }
+      it { is_expected.not_to be_nil }
     end
 
     context '#valid?' do
@@ -39,7 +39,7 @@ describe ContainerRegistry::Repository do
     context '#tags' do
       subject { repository.tags }
 
-      it { is_expected.to_not be_empty }
+      it { is_expected.not_to be_empty }
     end
   end
 
diff --git a/spec/lib/container_registry/tag_spec.rb b/spec/lib/container_registry/tag_spec.rb
index 12cf91127ed..858cb0bb134 100644
--- a/spec/lib/container_registry/tag_spec.rb
+++ b/spec/lib/container_registry/tag_spec.rb
@@ -50,13 +50,13 @@ describe ContainerRegistry::Tag do
       context '#config' do
         subject { tag.config }
 
-        it { is_expected.to_not be_nil }
+        it { is_expected.not_to be_nil }
       end
 
       context '#created_at' do
         subject { tag.created_at }
 
-        it { is_expected.to_not be_nil }
+        it { is_expected.not_to be_nil }
       end
     end
   end
diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb
index af839f42421..7718689e6d4 100644
--- a/spec/lib/gitlab/bitbucket_import/client_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb
@@ -59,7 +59,7 @@ describe Gitlab::BitbucketImport::Client, lib: true do
                                                              bitbucket_access_token_secret: "test" } })
       project.import_url = "ssh://git@bitbucket.org/test/test.git"
 
-      expect { described_class.from_project(project) }.to_not raise_error
+      expect { described_class.from_project(project) }.not_to raise_error
     end
   end
 end
diff --git a/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb b/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
index 46a5b7fce65..711a3e1c7d4 100644
--- a/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
@@ -122,7 +122,7 @@ describe Gitlab::Ci::Build::Artifacts::Metadata::Entry do
 
   describe 'empty path', path: '' do
     subject { |example| path(example) }
-    it { is_expected.to_not have_parent }
+    it { is_expected.not_to have_parent }
 
     describe '#children' do
       subject { |example| path(example).children }
diff --git a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
index 0a7ca3ec848..0af249d8690 100644
--- a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
+++ b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
@@ -33,8 +33,8 @@ describe Gitlab::Gfm::ReferenceRewriter do
         end
 
         it { is_expected.to include issue_first.to_reference(new_project) }
-        it { is_expected.to_not include issue_second.to_reference(new_project) }
-        it { is_expected.to_not include merge_request.to_reference(new_project) }
+        it { is_expected.not_to include issue_second.to_reference(new_project) }
+        it { is_expected.not_to include merge_request.to_reference(new_project) }
       end
 
       context 'description ambigous elements' do
diff --git a/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb b/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
index eda956e6f0a..6eca33f9fee 100644
--- a/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
+++ b/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
@@ -32,13 +32,13 @@ describe Gitlab::Gfm::UploadsRewriter do
       let(:new_paths) { new_files.map(&:path) }
 
       it 'rewrites content' do
-        expect(new_text).to_not eq text
+        expect(new_text).not_to eq text
         expect(new_text.length).to eq text.length
       end
 
       it 'copies files' do
         expect(new_files).to all(exist)
-        expect(old_paths).to_not match_array new_paths
+        expect(old_paths).not_to match_array new_paths
         expect(old_paths).to all(include(old_project.path_with_namespace))
         expect(new_paths).to all(include(new_project.path_with_namespace))
       end
@@ -48,8 +48,8 @@ describe Gitlab::Gfm::UploadsRewriter do
       end
 
       it 'generates a new secret for each file' do
-        expect(new_paths).to_not include image_uploader.secret
-        expect(new_paths).to_not include zip_uploader.secret
+        expect(new_paths).not_to include image_uploader.secret
+        expect(new_paths).not_to include zip_uploader.secret
       end
     end
 
diff --git a/spec/lib/gitlab/lfs/lfs_router_spec.rb b/spec/lib/gitlab/lfs/lfs_router_spec.rb
index 3325190789b..88814bc474d 100644
--- a/spec/lib/gitlab/lfs/lfs_router_spec.rb
+++ b/spec/lib/gitlab/lfs/lfs_router_spec.rb
@@ -368,7 +368,7 @@ describe Gitlab::Lfs::Router, lib: true do
               expect(response['objects']).to be_kind_of(Array)
               expect(response['objects'].first['oid']).to eq(sample_oid)
               expect(response['objects'].first['size']).to eq(sample_size)
-              expect(lfs_object.projects.pluck(:id)).to_not include(project.id)
+              expect(lfs_object.projects.pluck(:id)).not_to include(project.id)
               expect(lfs_object.projects.pluck(:id)).to include(public_project.id)
               expect(response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
               expect(response['objects'].first['actions']['upload']['header']).to eq('Authorization' => @auth)
@@ -430,7 +430,7 @@ describe Gitlab::Lfs::Router, lib: true do
 
               expect(response_body['objects'].last['oid']).to eq(sample_oid)
               expect(response_body['objects'].last['size']).to eq(sample_size)
-              expect(response_body['objects'].last).to_not have_key('actions')
+              expect(response_body['objects'].last).not_to have_key('actions')
             end
           end
         end
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb
index 7b86450a223..220e86924a2 100644
--- a/spec/lib/gitlab/metrics/instrumentation_spec.rb
+++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb
@@ -67,7 +67,7 @@ describe Gitlab::Metrics::Instrumentation do
         allow(Gitlab::Metrics).to receive(:method_call_threshold).
           and_return(100)
 
-        expect(transaction).to_not receive(:add_metric)
+        expect(transaction).not_to receive(:add_metric)
 
         @dummy.foo
       end
@@ -147,7 +147,7 @@ describe Gitlab::Metrics::Instrumentation do
         allow(Gitlab::Metrics).to receive(:method_call_threshold).
           and_return(100)
 
-        expect(transaction).to_not receive(:add_metric)
+        expect(transaction).not_to receive(:add_metric)
 
         @dummy.new.bar
       end
@@ -220,7 +220,7 @@ describe Gitlab::Metrics::Instrumentation do
 
       described_class.instrument_methods(@dummy)
 
-      expect(@dummy).to_not respond_to(:_original_kittens)
+      expect(@dummy).not_to respond_to(:_original_kittens)
     end
 
     it 'can take a block to determine if a method should be instrumented' do
@@ -228,7 +228,7 @@ describe Gitlab::Metrics::Instrumentation do
         false
       end
 
-      expect(@dummy).to_not respond_to(:_original_foo)
+      expect(@dummy).not_to respond_to(:_original_foo)
     end
   end
 
diff --git a/spec/lib/gitlab/metrics/sampler_spec.rb b/spec/lib/gitlab/metrics/sampler_spec.rb
index 38da77adc9f..59db127674a 100644
--- a/spec/lib/gitlab/metrics/sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/sampler_spec.rb
@@ -130,7 +130,7 @@ describe Gitlab::Metrics::Sampler do
       100.times do
         interval = sampler.sleep_interval
 
-        expect(interval).to_not eq(last)
+        expect(interval).not_to eq(last)
 
         last = interval
       end
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index e3293a01207..49699ffe28f 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
     describe 'without a current transaction' do
       it 'simply returns' do
         expect_any_instance_of(Gitlab::Metrics::Transaction).
-          to_not receive(:increment)
+          not_to receive(:increment)
 
         subscriber.sql(event)
       end
diff --git a/spec/lib/gitlab/sherlock/collection_spec.rb b/spec/lib/gitlab/sherlock/collection_spec.rb
index de6bb86c5dd..2ae79b50e77 100644
--- a/spec/lib/gitlab/sherlock/collection_spec.rb
+++ b/spec/lib/gitlab/sherlock/collection_spec.rb
@@ -11,13 +11,13 @@ describe Gitlab::Sherlock::Collection, lib: true do
     it 'adds a new transaction' do
       collection.add(transaction)
 
-      expect(collection).to_not be_empty
+      expect(collection).not_to be_empty
     end
 
     it 'is aliased as <<' do
       collection << transaction
 
-      expect(collection).to_not be_empty
+      expect(collection).not_to be_empty
     end
   end
 
@@ -47,7 +47,7 @@ describe Gitlab::Sherlock::Collection, lib: true do
     it 'returns false for a collection with a transaction' do
       collection.add(transaction)
 
-      expect(collection).to_not be_empty
+      expect(collection).not_to be_empty
     end
   end
 
diff --git a/spec/lib/gitlab/sherlock/query_spec.rb b/spec/lib/gitlab/sherlock/query_spec.rb
index 05da915ccfd..0a620428138 100644
--- a/spec/lib/gitlab/sherlock/query_spec.rb
+++ b/spec/lib/gitlab/sherlock/query_spec.rb
@@ -85,7 +85,7 @@ FROM users;
       frames = query.application_backtrace
 
       expect(frames).to be_an_instance_of(Array)
-      expect(frames).to_not be_empty
+      expect(frames).not_to be_empty
 
       frames.each do |frame|
         expect(frame.path).to start_with(Rails.root.to_s)
diff --git a/spec/lib/gitlab/sherlock/transaction_spec.rb b/spec/lib/gitlab/sherlock/transaction_spec.rb
index 7553f2a045f..9fe18f253f0 100644
--- a/spec/lib/gitlab/sherlock/transaction_spec.rb
+++ b/spec/lib/gitlab/sherlock/transaction_spec.rb
@@ -203,7 +203,7 @@ describe Gitlab::Sherlock::Transaction, lib: true do
     end
 
     it 'only tracks queries triggered from the transaction thread' do
-      expect(transaction).to_not receive(:track_query)
+      expect(transaction).not_to receive(:track_query)
 
       Thread.new { subscription.publish('test', time, time, nil, query_data) }.
         join
@@ -226,7 +226,7 @@ describe Gitlab::Sherlock::Transaction, lib: true do
     end
 
     it 'only tracks views rendered from the transaction thread' do
-      expect(transaction).to_not receive(:track_view)
+      expect(transaction).not_to receive(:track_view)
 
       Thread.new { subscription.publish('test', time, time, nil, view_data) }.
         join
diff --git a/spec/lib/json_web_token/rsa_token_spec.rb b/spec/lib/json_web_token/rsa_token_spec.rb
index 0c3d3ea7019..18726754517 100644
--- a/spec/lib/json_web_token/rsa_token_spec.rb
+++ b/spec/lib/json_web_token/rsa_token_spec.rb
@@ -23,7 +23,7 @@ describe JSONWebToken::RSAToken do
 
       subject { JWT.decode(rsa_encoded, rsa_key) }
 
-      it { expect{subject}.to_not raise_error }
+      it { expect{subject}.not_to raise_error }
       it { expect(subject.first).to include('key' => 'value') }
       it do
         expect(subject.second).to eq(
diff --git a/spec/mailers/shared/notify.rb b/spec/mailers/shared/notify.rb
index 5a85cb501dd..93de5850ba2 100644
--- a/spec/mailers/shared/notify.rb
+++ b/spec/mailers/shared/notify.rb
@@ -146,8 +146,8 @@ shared_examples 'it should have Gmail Actions links' do
 end
 
 shared_examples 'it should not have Gmail Actions links' do
-  it { is_expected.to_not have_body_text '<script type="application/ld+json">' }
-  it { is_expected.to_not have_body_text /ViewAction/ }
+  it { is_expected.not_to have_body_text '<script type="application/ld+json">' }
+  it { is_expected.not_to have_body_text /ViewAction/ }
 end
 
 shared_examples 'it should show Gmail Actions View Issue link' do
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index abae3271a5c..55b7af441d6 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -90,7 +90,7 @@ describe Ci::Build, models: true do
         build.update_attributes(trace: token)
       end
 
-      it { is_expected.to_not include(token) }
+      it { is_expected.not_to include(token) }
     end
   end
 
@@ -317,7 +317,7 @@ describe Ci::Build, models: true do
 
     context 'when build does not have tags' do
       subject { create(:ci_build, tag_list: []) }
-      it { is_expected.to_not have_tags }
+      it { is_expected.not_to have_tags }
     end
   end
 
@@ -534,7 +534,7 @@ describe Ci::Build, models: true do
       end
 
       it 'should set erase date' do
-        expect(build.erased_at).to_not be_falsy
+        expect(build.erased_at).not_to be_falsy
       end
     end
 
@@ -606,7 +606,7 @@ describe Ci::Build, models: true do
 
         describe '#erase' do
           it 'should not raise error' do
-            expect { build.erase }.to_not raise_error
+            expect { build.erase }.not_to raise_error
           end
         end
       end
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 1b5940ad5a8..22f8639e5ab 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -247,7 +247,7 @@ describe Ci::Commit, models: true do
           expect(commit.builds.pluck(:status)).to contain_exactly('pending')
           commit.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.running_or_pending).to_not be_empty
+          expect(commit.builds.running_or_pending).not_to be_empty
 
           expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test')
           expect(commit.builds.pluck(:status)).to contain_exactly('success', 'pending')
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 7c6e39419ed..5d04d8ffcff 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -140,7 +140,7 @@ describe Ci::Runner, models: true do
 
     context 'when runner does not have tags' do
       subject { create(:ci_runner, tag_list: []) }
-      it { is_expected.to_not have_tags }
+      it { is_expected.not_to have_tags }
     end
   end
 
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 4a4cd093435..77b9cd5db33 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -165,7 +165,7 @@ describe Issue, "Issuable" do
       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)
+      expect(data).not_to have_key(:assignee)
     end
 
     context "issue is assigned" do
diff --git a/spec/models/concerns/token_authenticatable_spec.rb b/spec/models/concerns/token_authenticatable_spec.rb
index b6adc2bf247..9e8ebc56a31 100644
--- a/spec/models/concerns/token_authenticatable_spec.rb
+++ b/spec/models/concerns/token_authenticatable_spec.rb
@@ -28,14 +28,14 @@ describe ApplicationSetting, 'TokenAuthenticatable' do
     context 'token is not generated yet' do
       describe 'token field accessor' do
         subject { described_class.new.send(token_field) }
-        it { is_expected.to_not be_blank }
+        it { is_expected.not_to be_blank }
       end
 
       describe 'ensured token' do
         subject { described_class.new.send("ensure_#{token_field}") }
 
         it { is_expected.to be_a String }
-        it { is_expected.to_not be_blank }
+        it { is_expected.not_to be_blank }
       end
 
       describe 'ensured! token' do
diff --git a/spec/models/generic_commit_status_spec.rb b/spec/models/generic_commit_status_spec.rb
index 0caf5869c24..d0e02618b6b 100644
--- a/spec/models/generic_commit_status_spec.rb
+++ b/spec/models/generic_commit_status_spec.rb
@@ -27,13 +27,13 @@ describe GenericCommitStatus, models: true do
     describe :context do
       subject { generic_commit_status.context }
 
-      it { is_expected.to_not be_nil }
+      it { is_expected.not_to be_nil }
     end
 
     describe :stage do
       subject { generic_commit_status.stage }
 
-      it { is_expected.to_not be_nil }
+      it { is_expected.not_to be_nil }
     end
   end
 end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 8ab00c70f9d..6540d77fbc0 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -192,7 +192,7 @@ describe Issue, models: true do
                                                source_project: subject.project,
                                                source_branch: "#{subject.iid}-branch" })
       merge_request.create_cross_references!(user)
-      expect(subject.referenced_merge_requests).to_not be_empty
+      expect(subject.referenced_merge_requests).not_to be_empty
       expect(subject.related_branches(user)).to eq([subject.to_branch_name])
     end
 
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 6fb5cad5011..f887ed4bafc 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -303,7 +303,7 @@ describe HipchatService, models: true do
         it "should notify only broken" do
           hipchat.notify_only_broken_builds = true
           hipchat.execute(data)
-          expect(WebMock).to_not have_requested(:post, api_url).once
+          expect(WebMock).not_to have_requested(:post, api_url).once
         end
       end
     end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 60e1ec43f2b..4d36a539a69 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -791,7 +791,7 @@ describe Project, models: true do
 
     subject { project.container_registry_repository }
 
-    it { is_expected.to_not be_nil }
+    it { is_expected.not_to be_nil }
   end
 
   describe '#container_registry_repository_url' do
@@ -809,7 +809,7 @@ describe Project, models: true do
         }
       end
 
-      it { is_expected.to_not be_nil }
+      it { is_expected.not_to be_nil }
     end
 
     context 'for disabled registry' do
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 583151023b6..92ec51eabd4 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -443,7 +443,7 @@ describe Repository, models: true do
       end
 
       it 'does nothing' do
-        expect(repository.raw_repository).to_not receive(:autocrlf=).
+        expect(repository.raw_repository).not_to receive(:autocrlf=).
           with(:input)
 
         repository.update_autocrlf_option
@@ -511,7 +511,7 @@ describe Repository, models: true do
 
     it 'does not expire the emptiness caches for a non-empty repository' do
       expect(repository).to receive(:empty?).and_return(false)
-      expect(repository).to_not receive(:expire_emptiness_caches)
+      expect(repository).not_to receive(:expire_emptiness_caches)
 
       repository.expire_cache
     end
@@ -674,7 +674,7 @@ describe Repository, models: true do
       end
 
       it 'does not flush caches that depend on repository data' do
-        expect(repository).to_not receive(:expire_cache)
+        expect(repository).not_to receive(:expire_cache)
 
         repository.before_delete
       end
@@ -951,7 +951,7 @@ describe Repository, models: true do
 
       expect(repository.avatar).to eq('logo.png')
 
-      expect(repository).to_not receive(:blob_at_branch)
+      expect(repository).not_to receive(:blob_at_branch)
       expect(repository.avatar).to eq('logo.png')
     end
   end
@@ -1045,7 +1045,7 @@ describe Repository, models: true do
         and_return(true)
 
       repository.cache_keys.each do |key|
-        expect(repository).to_not receive(key)
+        expect(repository).not_to receive(key)
       end
 
       repository.build_cache
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
index c112ca5e3ca..44b532b10e1 100644
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
@@ -133,7 +133,7 @@ describe API::API, api: true  do
       delete api("/projects/#{project.id}/members/#{user3.id}", user)
       expect do
         delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      end.to_not change { ProjectMember.count }
+      end.not_to change { ProjectMember.count }
       expect(response.status).to eq(200)
     end
 
diff --git a/spec/requests/api/system_hooks_spec.rb b/spec/requests/api/system_hooks_spec.rb
index 3e676515488..94eebc48ec8 100644
--- a/spec/requests/api/system_hooks_spec.rb
+++ b/spec/requests/api/system_hooks_spec.rb
@@ -49,7 +49,7 @@ describe API::API, api: true  do
     it "should not create new hook without url" do
       expect do
         post api("/hooks", admin)
-      end.to_not change { SystemHook.count }
+      end.not_to change { SystemHook.count }
     end
   end
 
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 7ebf8e41f3b..e5124ea5ea7 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -253,13 +253,13 @@ describe Ci::API::API do
           it "using token as parameter" do
             post authorize_url, { token: build.token }, headers
             expect(response.status).to eq(200)
-            expect(json_response["TempPath"]).to_not be_nil
+            expect(json_response["TempPath"]).not_to be_nil
           end
 
           it "using token as header" do
             post authorize_url, {}, headers_with_token
             expect(response.status).to eq(200)
-            expect(json_response["TempPath"]).to_not be_nil
+            expect(json_response["TempPath"]).not_to be_nil
           end
         end
 
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 3f4a1ced2b6..98ef9d21035 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -52,12 +52,12 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
   shared_examples 'an unauthorized' do
     it { is_expected.to include(http_status: 401) }
-    it { is_expected.to_not include(:token) }
+    it { is_expected.not_to include(:token) }
   end
 
   shared_examples 'a forbidden' do
     it { is_expected.to include(http_status: 403) }
-    it { is_expected.to_not include(:token) }
+    it { is_expected.not_to include(:token) }
   end
 
   describe '#full_access_token' do
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index ea5dcfa068a..9ae8f31b372 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -78,7 +78,7 @@ describe CreateCommitBuildsService, services: true do
       expect(commit).to be_persisted
       expect(commit.builds.any?).to be false
       expect(commit.status).to eq('failed')
-      expect(commit.yaml_errors).to_not be_nil
+      expect(commit.yaml_errors).not_to be_nil
     end
 
     describe :ci_skip? do
diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb
index 6aefb48a4e8..a97ac3ead45 100644
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -14,7 +14,7 @@ describe Groups::CreateService, services: true do
 
     context "cannot create group with restricted visibility level" do
       before { allow(current_application_settings).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC]) }
-      it { is_expected.to_not be_persisted }
+      it { is_expected.not_to be_persisted }
     end
   end
 end
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 6aa0a89f893..1ee9f3aae4d 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -55,7 +55,7 @@ describe Issues::CreateService, services: true do
         end
 
         it 'does not assign label' do
-          expect(issue.labels).to_not include label
+          expect(issue.labels).not_to include label
         end
       end
 
@@ -69,7 +69,7 @@ describe Issues::CreateService, services: true do
         end
 
         it 'does not assign milestone' do
-          expect(issue.milestone).to_not eq milestone
+          expect(issue.milestone).not_to eq milestone
         end
       end
     end
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index c15e26189a5..95fe6c2400a 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -194,10 +194,10 @@ describe Issues::MoveService, services: true do
           include_context 'issue move executed'
 
           it 'rewrites uploads in description' do
-            expect(new_issue.description).to_not eq description
+            expect(new_issue.description).not_to eq description
             expect(new_issue.description)
               .to match(/Text and #{FileUploader::MARKDOWN_PATTERN}/)
-            expect(new_issue.description).to_not include uploader.secret
+            expect(new_issue.description).not_to include uploader.secret
           end
         end
       end
@@ -231,7 +231,7 @@ describe Issues::MoveService, services: true do
 
       context 'user is reporter in both projects' do
         include_context 'user can move issue'
-        it { expect { move }.to_not raise_error }
+        it { expect { move }.not_to raise_error }
       end
 
       context 'user is reporter only in new project' do
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index 52a302e0e1a..82247849814 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -75,7 +75,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
         allow(ci_commit).to receive(:success?).and_return(true)
         allow(old_build).to receive(:sha).and_return('1234abcdef')
 
-        expect(MergeWorker).to_not receive(:perform_async)
+        expect(MergeWorker).not_to receive(:perform_async)
         service.trigger(old_build)
       end
     end
@@ -88,7 +88,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       it "doesn't merge a requests for status on other branch" do
         allow(project.repository).to receive(:branch_names_contains).with(commit_status.sha).and_return([])
 
-        expect(MergeWorker).to_not receive(:perform_async)
+        expect(MergeWorker).not_to receive(:perform_async)
         service.trigger(commit_status)
       end
 
@@ -122,7 +122,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       end
 
       it "doesn't merge if some stages failed" do
-        expect(MergeWorker).to_not receive(:perform_async)
+        expect(MergeWorker).not_to receive(:perform_async)
         build.success
         test.drop
       end
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 2f465bcf1e3..20d3dfb42b3 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -61,7 +61,7 @@ describe PostReceive do
       context "does not create a Ci::Commit" do
         before { stub_ci_commit_yaml_file(nil) }
 
-        it { expect{ subject }.to_not change{ Ci::Commit.count } }
+        it { expect{ subject }.not_to change{ Ci::Commit.count } }
       end
     end
   end

From 996240a4895abddf069eb6fc195bacee5e344e16 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 27 Apr 2016 12:35:30 -0300
Subject: [PATCH 0745/1431] Fix issues/MRs filter when ordering by milestone
 due date

---
 app/finders/issuable_finder.rb        |  4 +--
 app/models/concerns/issuable.rb       |  4 ++-
 spec/models/concerns/issuable_spec.rb | 41 ++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 5849e00662b..0e3dfa74ac4 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -253,9 +253,9 @@ class IssuableFinder
         items = items.where(milestone_id: [-1, nil])
       elsif filter_by_upcoming_milestone?
         upcoming_ids = Milestone.upcoming_ids_by_projects(projects)
-        items = items.joins(:milestone).where(milestone_id: upcoming_ids)
+        items = items.left_joins_milestones.where(milestone_id: upcoming_ids)
       else
-        items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] })
+        items = items.left_joins_milestones.where(milestones: { title: params[:milestone_title] })
 
         if projects
           items = items.where(milestones: { project_id: projects })
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index c1248b53031..db73588a948 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -35,10 +35,12 @@ module Issuable
     scope :only_opened, -> { with_state(:opened) }
     scope :only_reopened, -> { with_state(:reopened) }
     scope :closed, -> { with_state(:closed) }
+
+    scope :left_joins_milestones,    -> { joins("LEFT OUTER JOIN milestones ON #{table_name}.milestone_id = milestones.id") }
     scope :order_milestone_due_desc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date DESC, milestones.id DESC') }
     scope :order_milestone_due_asc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date ASC, milestones.id ASC') }
-    scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
 
+    scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
     scope :join_project, -> { joins(:project) }
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 4a4cd093435..fa06a6f7ecf 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Issue, "Issuable" do
-  let(:issue) { create(:issue) }
+  let!(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
   describe "Associations" do
@@ -114,6 +114,45 @@ describe Issue, "Issuable" do
     end
   end
 
+  describe "#sort" do
+    #Correct order is:
+    #Issues/MRs with milestones ordered by date
+    #Issues/MRs with milestones without dates
+    #Issues/MRs without milestones
+    let(:project) { issue.project }
+    let!(:early_milestone) { create(:milestone, project: project, due_date: 10.days.from_now) }
+    let!(:late_milestone) { create(:milestone, project: project, due_date: 30.days.from_now) }
+    let!(:issue1) { create(:issue, project: project, milestone: early_milestone) }
+    let!(:issue2) { create(:issue, project: project, milestone: late_milestone) }
+    let!(:issue3) { create(:issue, project: project) }
+
+
+    context "milestone due later" do
+      subject { Issue.where(project_id: project.id).order_milestone_due_desc }
+      before  { @issues = subject }
+
+      it "puts issues with nil values at the end of collection" do
+        expect(@issues.first).to eq(issue2)
+        expect(@issues.second).to eq(issue1)
+        expect(@issues.third).to eq(issue)
+        expect(@issues.fourth).to eq(issue3)
+      end
+    end
+
+    context "milestone due soon" do
+      subject { Issue.where(project_id: project.id).order_milestone_due_asc }
+      before  { @issues = subject }
+
+      it "puts issues with nil values at the end of collection" do
+        expect(@issues.first).to eq(issue1)
+        expect(@issues.second).to eq(issue2)
+        expect(@issues.third).to eq(issue)
+        expect(@issues.fourth).to eq(issue3)
+      end
+    end
+  end
+
+
   describe '#subscribed?' do
     context 'user is not a participant in the issue' do
       before { allow(issue).to receive(:participants).with(user).and_return([]) }

From 673196e0a866683aecb9332f4554e72985e2ac87 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 27 Apr 2016 17:31:57 -0300
Subject: [PATCH 0746/1431] Fix ordering for Mysql

---
 app/models/concerns/issuable.rb                          | 4 ++--
 spec/features/issues/filter_by_milestone_spec.rb         | 8 ++++----
 spec/features/merge_requests/filter_by_milestone_spec.rb | 8 ++++----
 spec/models/concerns/issuable_spec.rb                    | 4 +++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index db73588a948..4b21cf02919 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -37,8 +37,8 @@ module Issuable
     scope :closed, -> { with_state(:closed) }
 
     scope :left_joins_milestones,    -> { joins("LEFT OUTER JOIN milestones ON #{table_name}.milestone_id = milestones.id") }
-    scope :order_milestone_due_desc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date DESC, milestones.id DESC') }
-    scope :order_milestone_due_asc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date ASC, milestones.id ASC') }
+    scope :order_milestone_due_desc, -> { left_joins_milestones.reorder('CASE WHEN milestones.due_date IS NULL then 0 ELSE 1 END DESC, CASE WHEN milestones.id IS NULL then 0 ELSE 1 END DESC, milestones.due_date DESC') }
+    scope :order_milestone_due_asc,  -> { left_joins_milestones.reorder('CASE WHEN milestones.due_date IS NULL then 1 ELSE 0 END ASC, CASE WHEN milestones.id IS NULL then 1 ELSE 0 END ASC, milestones.due_date ASC') }
 
     scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
     scope :join_project, -> { joins(:project) }
diff --git a/spec/features/issues/filter_by_milestone_spec.rb b/spec/features/issues/filter_by_milestone_spec.rb
index 99445185893..666993d19d4 100644
--- a/spec/features/issues/filter_by_milestone_spec.rb
+++ b/spec/features/issues/filter_by_milestone_spec.rb
@@ -15,14 +15,14 @@ feature 'Issue filtering by Milestone', feature: true do
   end
 
   context 'filters by upcoming milestone', js: true do
-    it 'should not show issues with no expiry' do
+    it 'should show issues with no expiry' do
       create(:issue, project: project)
       create(:issue, project: project, milestone: milestone)
 
       visit_issues(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.issue', count: 0)
+      expect(page).to have_css('.issue', count: 2)
     end
 
     it 'should show issues in future' do
@@ -36,7 +36,7 @@ feature 'Issue filtering by Milestone', feature: true do
       expect(page).to have_css('.issue', count: 1)
     end
 
-    it 'should not show issues in past' do
+    it 'should show issues in past' do
       milestone = create(:milestone, project: project, due_date: Date.yesterday)
       create(:issue, project: project)
       create(:issue, project: project, milestone: milestone)
@@ -44,7 +44,7 @@ feature 'Issue filtering by Milestone', feature: true do
       visit_issues(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.issue', count: 0)
+      expect(page).to have_css('.issue', count: 2)
     end
   end
 
diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb
index e3ecd60a5f3..db3efca21c8 100644
--- a/spec/features/merge_requests/filter_by_milestone_spec.rb
+++ b/spec/features/merge_requests/filter_by_milestone_spec.rb
@@ -21,14 +21,14 @@ feature 'Merge Request filtering by Milestone', feature: true do
   end
 
   context 'filters by upcoming milestone', js: true do
-    it 'should not show issues with no expiry' do
+    it 'should show issues with no expiry' do
       create(:merge_request, :with_diffs, source_project: project)
       create(:merge_request, :simple, source_project: project, milestone: milestone)
 
       visit_merge_requests(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.merge-request', count: 0)
+      expect(page).to have_css('.merge-request', count: 2)
     end
 
     it 'should show issues in future' do
@@ -42,7 +42,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
       expect(page).to have_css('.merge-request', count: 1)
     end
 
-    it 'should not show issues in past' do
+    it 'should show issues in past' do
       milestone = create(:milestone, project: project, due_date: Date.yesterday)
       create(:merge_request, :with_diffs, source_project: project)
       create(:merge_request, :simple, source_project: project, milestone: milestone)
@@ -50,7 +50,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
       visit_merge_requests(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.merge-request', count: 0)
+      expect(page).to have_css('.merge-request', count: 2)
     end
   end
 
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index fa06a6f7ecf..2bb770df4fd 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Issue, "Issuable" do
-  let!(:issue) { create(:issue) }
+  let(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
   describe "Associations" do
@@ -119,6 +119,8 @@ describe Issue, "Issuable" do
     #Issues/MRs with milestones ordered by date
     #Issues/MRs with milestones without dates
     #Issues/MRs without milestones
+
+    let!(:issue) { create(:issue) }
     let(:project) { issue.project }
     let!(:early_milestone) { create(:milestone, project: project, due_date: 10.days.from_now) }
     let!(:late_milestone) { create(:milestone, project: project, due_date: 30.days.from_now) }

From 3b2223f11676831f9e995095de13926e1a39b462 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 5 May 2016 16:23:51 -0300
Subject: [PATCH 0747/1431] improve ordering sql for milestones

---
 app/models/concerns/issuable.rb       |  4 +--
 spec/models/concerns/issuable_spec.rb | 49 +++++++++++----------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 4b21cf02919..ce73fe7035e 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -37,8 +37,8 @@ module Issuable
     scope :closed, -> { with_state(:closed) }
 
     scope :left_joins_milestones,    -> { joins("LEFT OUTER JOIN milestones ON #{table_name}.milestone_id = milestones.id") }
-    scope :order_milestone_due_desc, -> { left_joins_milestones.reorder('CASE WHEN milestones.due_date IS NULL then 0 ELSE 1 END DESC, CASE WHEN milestones.id IS NULL then 0 ELSE 1 END DESC, milestones.due_date DESC') }
-    scope :order_milestone_due_asc,  -> { left_joins_milestones.reorder('CASE WHEN milestones.due_date IS NULL then 1 ELSE 0 END ASC, CASE WHEN milestones.id IS NULL then 1 ELSE 0 END ASC, milestones.due_date ASC') }
+    scope :order_milestone_due_desc, -> { left_joins_milestones.reorder('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date DESC') }
+    scope :order_milestone_due_asc,  -> { left_joins_milestones.reorder('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date ASC') }
 
     scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
     scope :join_project, -> { joins(:project) }
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 2bb770df4fd..56a4313e8af 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -115,41 +115,30 @@ describe Issue, "Issuable" do
   end
 
   describe "#sort" do
-    #Correct order is:
-    #Issues/MRs with milestones ordered by date
-    #Issues/MRs with milestones without dates
-    #Issues/MRs without milestones
+    let(:project) { build_stubbed(:empty_project) }
 
-    let!(:issue) { create(:issue) }
-    let(:project) { issue.project }
-    let!(:early_milestone) { create(:milestone, project: project, due_date: 10.days.from_now) }
-    let!(:late_milestone) { create(:milestone, project: project, due_date: 30.days.from_now) }
-    let!(:issue1) { create(:issue, project: project, milestone: early_milestone) }
-    let!(:issue2) { create(:issue, project: project, milestone: late_milestone) }
-    let!(:issue3) { create(:issue, project: project) }
+    context "by milestone due date" do
+      #Correct order is:
+      #Issues/MRs with milestones ordered by date
+      #Issues/MRs with milestones without dates
+      #Issues/MRs without milestones
+
+      let!(:issue) { create(:issue, project: project) }
+      let!(:early_milestone) { create(:milestone, project: project, due_date: 10.days.from_now) }
+      let!(:late_milestone) { create(:milestone, project: project, due_date: 30.days.from_now) }
+      let!(:issue1) { create(:issue, project: project, milestone: early_milestone) }
+      let!(:issue2) { create(:issue, project: project, milestone: late_milestone) }
+      let!(:issue3) { create(:issue, project: project) }
 
 
-    context "milestone due later" do
-      subject { Issue.where(project_id: project.id).order_milestone_due_desc }
-      before  { @issues = subject }
-
-      it "puts issues with nil values at the end of collection" do
-        expect(@issues.first).to eq(issue2)
-        expect(@issues.second).to eq(issue1)
-        expect(@issues.third).to eq(issue)
-        expect(@issues.fourth).to eq(issue3)
+      it "sorts desc" do
+        issues = project.issues.sort('milestone_due_desc')
+        expect(issues).to match_array([issue2, issue1, issue, issue3])
       end
-    end
 
-    context "milestone due soon" do
-      subject { Issue.where(project_id: project.id).order_milestone_due_asc }
-      before  { @issues = subject }
-
-      it "puts issues with nil values at the end of collection" do
-        expect(@issues.first).to eq(issue1)
-        expect(@issues.second).to eq(issue2)
-        expect(@issues.third).to eq(issue)
-        expect(@issues.fourth).to eq(issue3)
+      it "sorts asc" do
+        issues = project.issues.sort('milestone_due_asc')
+        expect(issues).to match_array([issue1, issue2, issue, issue3])
       end
     end
   end

From 45e516b8174c174951a97438c83fd659782e2347 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 6 May 2016 12:42:29 -0300
Subject: [PATCH 0748/1431] Fix bug when ordering by milestone due date and
 filtering by milestone

---
 app/models/concerns/issuable.rb       | 1 -
 spec/features/issues_spec.rb          | 2 --
 spec/models/concerns/issuable_spec.rb | 1 -
 3 files changed, 4 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index ce73fe7035e..d34308204e5 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -44,7 +44,6 @@ module Issuable
     scope :join_project, -> { joins(:project) }
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
-    scope :outer_join_milestone, -> { joins("LEFT OUTER JOIN milestones ON milestones.id = #{table_name}.milestone_id") }
 
     delegate :name,
              :email,
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 749ee01890c..a4de7c004c7 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -185,14 +185,12 @@ describe 'Issues', feature: true do
       visit namespace_project_issues_path(project.namespace, project, sort: sort_value_recently_created)
 
       expect(first_issue).to include('baz')
-      expect(last_issue).to include('foo')
     end
 
     it 'sorts by oldest' do
       visit namespace_project_issues_path(project.namespace, project, sort: sort_value_oldest_created)
 
       expect(first_issue).to include('foo')
-      expect(last_issue).to include('baz')
     end
 
     it 'sorts by most recently updated' do
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 56a4313e8af..c7e98e8309b 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -130,7 +130,6 @@ describe Issue, "Issuable" do
       let!(:issue2) { create(:issue, project: project, milestone: late_milestone) }
       let!(:issue3) { create(:issue, project: project) }
 
-
       it "sorts desc" do
         issues = project.issues.sort('milestone_due_desc')
         expect(issues).to match_array([issue2, issue1, issue, issue3])

From dac9b4212d700272160dff1e0a86c20cb72afedd Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 19 May 2016 18:30:38 -0400
Subject: [PATCH 0749/1431] Fix outer join when filtering milestones

---
 CHANGELOG                                                | 1 +
 app/finders/issuable_finder.rb                           | 4 ++--
 app/models/concerns/issuable.rb                          | 2 ++
 spec/features/issues/filter_by_milestone_spec.rb         | 8 ++++----
 spec/features/issues_spec.rb                             | 2 ++
 spec/features/merge_requests/filter_by_milestone_spec.rb | 8 ++++----
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a79c3048b79..59b14de68c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Redesign navigation for project pages
   - Use gitlab-shell v3.0.0
+  - Fix issues filter when ordering by milestone
 
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 0e3dfa74ac4..8ed3ccf1c02 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -250,12 +250,12 @@ class IssuableFinder
   def by_milestone(items)
     if milestones?
       if filter_by_no_milestone?
-        items = items.where(milestone_id: [-1, nil])
+        items = items.left_joins_milestones.where(milestone_id: [-1, nil])
       elsif filter_by_upcoming_milestone?
         upcoming_ids = Milestone.upcoming_ids_by_projects(projects)
         items = items.left_joins_milestones.where(milestone_id: upcoming_ids)
       else
-        items = items.left_joins_milestones.where(milestones: { title: params[:milestone_title] })
+        items = items.with_milestone(params[:milestone_title])
 
         if projects
           items = items.where(milestones: { project_id: projects })
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index d34308204e5..91315b3459f 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -31,6 +31,7 @@ module Issuable
     scope :unassigned, -> { where("assignee_id IS NULL") }
     scope :of_projects, ->(ids) { where(project_id: ids) }
     scope :of_milestones, ->(ids) { where(milestone_id: ids) }
+    scope :with_milestone, ->(title) { left_joins_milestones.where(milestones: { title: title }) }
     scope :opened, -> { with_state(:opened, :reopened) }
     scope :only_opened, -> { with_state(:opened) }
     scope :only_reopened, -> { with_state(:reopened) }
@@ -45,6 +46,7 @@ module Issuable
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
 
+
     delegate :name,
              :email,
              to: :author,
diff --git a/spec/features/issues/filter_by_milestone_spec.rb b/spec/features/issues/filter_by_milestone_spec.rb
index 666993d19d4..99445185893 100644
--- a/spec/features/issues/filter_by_milestone_spec.rb
+++ b/spec/features/issues/filter_by_milestone_spec.rb
@@ -15,14 +15,14 @@ feature 'Issue filtering by Milestone', feature: true do
   end
 
   context 'filters by upcoming milestone', js: true do
-    it 'should show issues with no expiry' do
+    it 'should not show issues with no expiry' do
       create(:issue, project: project)
       create(:issue, project: project, milestone: milestone)
 
       visit_issues(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.issue', count: 2)
+      expect(page).to have_css('.issue', count: 0)
     end
 
     it 'should show issues in future' do
@@ -36,7 +36,7 @@ feature 'Issue filtering by Milestone', feature: true do
       expect(page).to have_css('.issue', count: 1)
     end
 
-    it 'should show issues in past' do
+    it 'should not show issues in past' do
       milestone = create(:milestone, project: project, due_date: Date.yesterday)
       create(:issue, project: project)
       create(:issue, project: project, milestone: milestone)
@@ -44,7 +44,7 @@ feature 'Issue filtering by Milestone', feature: true do
       visit_issues(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.issue', count: 2)
+      expect(page).to have_css('.issue', count: 0)
     end
   end
 
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index a4de7c004c7..749ee01890c 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -185,12 +185,14 @@ describe 'Issues', feature: true do
       visit namespace_project_issues_path(project.namespace, project, sort: sort_value_recently_created)
 
       expect(first_issue).to include('baz')
+      expect(last_issue).to include('foo')
     end
 
     it 'sorts by oldest' do
       visit namespace_project_issues_path(project.namespace, project, sort: sort_value_oldest_created)
 
       expect(first_issue).to include('foo')
+      expect(last_issue).to include('baz')
     end
 
     it 'sorts by most recently updated' do
diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb
index db3efca21c8..e3ecd60a5f3 100644
--- a/spec/features/merge_requests/filter_by_milestone_spec.rb
+++ b/spec/features/merge_requests/filter_by_milestone_spec.rb
@@ -21,14 +21,14 @@ feature 'Merge Request filtering by Milestone', feature: true do
   end
 
   context 'filters by upcoming milestone', js: true do
-    it 'should show issues with no expiry' do
+    it 'should not show issues with no expiry' do
       create(:merge_request, :with_diffs, source_project: project)
       create(:merge_request, :simple, source_project: project, milestone: milestone)
 
       visit_merge_requests(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.merge-request', count: 2)
+      expect(page).to have_css('.merge-request', count: 0)
     end
 
     it 'should show issues in future' do
@@ -42,7 +42,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
       expect(page).to have_css('.merge-request', count: 1)
     end
 
-    it 'should show issues in past' do
+    it 'should not show issues in past' do
       milestone = create(:milestone, project: project, due_date: Date.yesterday)
       create(:merge_request, :with_diffs, source_project: project)
       create(:merge_request, :simple, source_project: project, milestone: milestone)
@@ -50,7 +50,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
       visit_merge_requests(project)
       filter_by_milestone(Milestone::Upcoming.title)
 
-      expect(page).to have_css('.merge-request', count: 2)
+      expect(page).to have_css('.merge-request', count: 0)
     end
   end
 

From 810d0bf313f32f971c377b0fd9ebc297c3d13732 Mon Sep 17 00:00:00 2001
From: Ryan Rustong <ryan.rustong@gmail.com>
Date: Tue, 24 May 2016 20:53:27 +0000
Subject: [PATCH 0750/1431] Update health_check.md - Fix spelling of
 admin/health_check path.  [ci skip]

---
 doc/monitoring/health_check.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/monitoring/health_check.md b/doc/monitoring/health_check.md
index defbf37ac19..0d17799372f 100644
--- a/doc/monitoring/health_check.md
+++ b/doc/monitoring/health_check.md
@@ -11,7 +11,7 @@ and access the cache. This endpoint can be provided to uptime monitoring service
 ## Access Token
 
 An access token needs to be provided while accessing the health check endpoint. The current
-accepted token can be found on the `admin/heath_check` page of your GitLab instance.
+accepted token can be found on the `admin/health_check` page of your GitLab instance.
 
 ![access token](img/health_check_token.png)
 

From 77a1565c806fece3a1d664c2c069f38dcb371c5c Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 24 May 2016 15:24:11 -0600
Subject: [PATCH 0751/1431] Replace `link_to_gfm` with `link_to` in merge
 request and issue titles.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused some users, so it’s removed.

On the issue/MR page itself, the formatting is preserved. This only effects index pages.

This is also ever so slightly more performant :)

This fixes #17614 and #17230.
---
 app/views/projects/issues/_issue.html.haml                 | 2 +-
 app/views/projects/merge_requests/_merge_request.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 5cf70ea3bb7..78f64150601 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -6,7 +6,7 @@
   .issue-title.title
     %span.issue-title-text
       = confidential_icon(issue)
-      = link_to_gfm issue.title, issue_path(issue)
+      = link_to issue.title, issue_path(issue)
     %ul.controls
       - if issue.closed?
         %li
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 2c54171c6bd..c02f94490a0 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,7 +1,7 @@
 %li{ class: mr_css_classes(merge_request) }
   .merge-request-title.title
     %span.merge-request-title-text
-      = link_to_gfm merge_request.title, merge_request_path(merge_request)
+      = link_to merge_request.title, merge_request_path(merge_request)
     %ul.controls
       - if merge_request.merged?
         %li

From b359d5d57f4b836c04e9e2ef7e1fcb3775bd5305 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 24 May 2016 17:55:57 -0700
Subject: [PATCH 0752/1431] Fix groups API to list only user's accessible
 projects

Closes #17496
---
 CHANGELOG                            |  1 +
 app/finders/group_projects_finder.rb |  2 +-
 lib/api/groups.rb                    |  3 +--
 spec/requests/api/groups_spec.rb     | 21 ++++++++++++++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a79c3048b79..0866ad89ddd 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.9.0 (unreleased)
   - Redesign navigation for project pages
+  - Fix groups API to list only user's accessible projects
   - Use gitlab-shell v3.0.0
 
 v 8.8.2 (unreleased)
diff --git a/app/finders/group_projects_finder.rb b/app/finders/group_projects_finder.rb
index 3b9a421b118..aa8f4c1d0e4 100644
--- a/app/finders/group_projects_finder.rb
+++ b/app/finders/group_projects_finder.rb
@@ -18,7 +18,7 @@ class GroupProjectsFinder < UnionFinder
     projects = []
 
     if current_user
-      if @group.users.include?(current_user)
+      if @group.users.include?(current_user) || current_user.admin?
         projects << @group.projects unless only_shared
         projects << @group.shared_projects unless only_owned
       else
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 91e420832f3..9d8b8d737a9 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -95,8 +95,7 @@ module API
       #   GET /groups/:id/projects
       get ":id/projects" do
         group = find_group(params[:id])
-        projects = group.projects
-        projects = filter_projects(projects)
+        projects = GroupProjectsFinder.new(group).execute(current_user)
         projects = paginate projects
         present projects, with: Entities::Project
       end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 37ddab83c30..7ecefce80d6 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -12,6 +12,7 @@ describe API::API, api: true  do
   let!(:group2) { create(:group, :private) }
   let!(:project1) { create(:project, namespace: group1) }
   let!(:project2) { create(:project, namespace: group2) }
+  let!(:project3) { create(:project, namespace: group1, path: 'test', visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
 
   before do
     group1.add_owner(user1)
@@ -147,9 +148,11 @@ describe API::API, api: true  do
     context "when authenticated as user" do
       it "should return the group's projects" do
         get api("/groups/#{group1.id}/projects", user1)
+
         expect(response.status).to eq(200)
-        expect(json_response.length).to eq(1)
-        expect(json_response.first['name']).to eq(project1.name)
+        expect(json_response.length).to eq(2)
+        project_names = json_response.map { |proj| proj['name' ] }
+        expect(project_names).to match_array([project1.name, project3.name])
       end
 
       it "should not return a non existing group" do
@@ -162,6 +165,16 @@ describe API::API, api: true  do
 
         expect(response.status).to eq(404)
       end
+
+      it "should only return projects to which user has access" do
+        project3.team << [user3, :developer]
+
+        get api("/groups/#{group1.id}/projects", user3)
+
+        expect(response.status).to eq(200)
+        expect(json_response.length).to eq(1)
+        expect(json_response.first['name']).to eq(project3.name)
+      end
     end
 
     context "when authenticated as admin" do
@@ -181,8 +194,10 @@ describe API::API, api: true  do
     context 'when using group path in URL' do
       it 'should return any existing group' do
         get api("/groups/#{group1.path}/projects", admin)
+
         expect(response.status).to eq(200)
-        expect(json_response.first['name']).to eq(project1.name)
+        project_names = json_response.map { |proj| proj['name' ] }
+        expect(project_names).to match_array([project1.name, project3.name])
       end
 
       it 'should not return a non existing group' do

From 718fe268c48b3b77b2b3d901b0c688a06e82053d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 24 May 2016 22:52:31 -0500
Subject: [PATCH 0753/1431] Improve after review

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

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 5a727f5be5b..3e07096e6cc 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -1,7 +1,7 @@
 module Backup
   class Manager
-    ARCHIVES_TO_BACKUP = %w{uploads builds artifacts lfs registry}
-    FOLDERS_TO_BACKUP = %w{repositories db}
+    ARCHIVES_TO_BACKUP = %w[uploads builds artifacts lfs registry]
+    FOLDERS_TO_BACKUP = %w[repositories db]
 
     def pack
       # Make sure there is a connection
@@ -150,7 +150,7 @@ module Backup
     end
 
     def skipped?(item)
-      settings[:skipped] && settings[:skipped].include?(item)
+      settings[:skipped] && settings[:skipped].include?(item) || disabled_features.include?(item)
     end
 
     private
@@ -160,11 +160,11 @@ module Backup
     end
 
     def archives_to_backup
-      (ARCHIVES_TO_BACKUP - disabled_features).map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
+      ARCHIVES_TO_BACKUP.map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
     end
 
     def folders_to_backup
-      (FOLDERS_TO_BACKUP - disabled_features).reject{ |name| skipped?(name) }
+      FOLDERS_TO_BACKUP.reject{ |name| skipped?(name) }
     end
 
     def disabled_features

From 2c7439db4d118587d27107989d8c013620618e26 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 25 May 2016 06:06:09 +0200
Subject: [PATCH 0754/1431] Enable multiple compatible Rubocop cops

Closes #17406
---
 .rubocop.yml                       | 68 ++++++++++++++++++------------
 lib/ci/gitlab_ci_yaml_processor.rb |  2 +-
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 4e6ced4e1ab..25596762e58 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -59,7 +59,7 @@ Style/AndOr:
 
 # Use `Array#join` instead of `Array#*`.
 Style/ArrayJoin:
-  Enabled: false
+  Enabled: true
 
 # Use only ascii symbols in comments.
 Style/AsciiComments:
@@ -71,7 +71,7 @@ Style/AsciiIdentifiers:
 
 # Checks for uses of Module#attr.
 Style/Attr:
-  Enabled: false
+  Enabled: true
 
 # Avoid the use of BEGIN blocks.
 Style/BeginBlock:
@@ -83,7 +83,7 @@ Style/BarePercentLiterals:
 
 # Do not use block comments.
 Style/BlockComments:
-  Enabled: false
+  Enabled: true
 
 # Put end statement of multiline block on its own line.
 Style/BlockEndNewline:
@@ -124,7 +124,7 @@ Style/ClassCheck:
 
 # Use self when defining module/class methods.
 Style/ClassMethods:
-  Enabled: false
+  Enabled: true
 
 # Avoid the use of class variables.
 Style/ClassVars:
@@ -218,7 +218,7 @@ Style/EmptyLiteral:
 
 # Avoid the use of END blocks.
 Style/EndBlock:
-  Enabled: false
+  Enabled: true
 
 # Use Unix-style line endings.
 Style/EndOfLine:
@@ -226,7 +226,7 @@ Style/EndOfLine:
 
 # Favor the use of Fixnum#even? && Fixnum#odd?
 Style/EvenOdd:
-  Enabled: false
+  Enabled: true
 
 # Do not use unnecessary spacing.
 Style/ExtraSpacing:
@@ -234,11 +234,16 @@ Style/ExtraSpacing:
 
 # Use snake_case for source file names.
 Style/FileName:
-  Enabled: false
+  Enabled: true
+
+# Checks for a line break before the first parameter in a multi-line method
+#   parameter definition.
+Style/FirstMethodParameterLineBreak:
+  Enabled: true
 
 # Checks for flip flops.
 Style/FlipFlop:
-  Enabled: false
+  Enabled: true
 
 # Checks use of for or each in multiline loops.
 Style/For:
@@ -250,7 +255,7 @@ Style/FormatString:
 
 # Do not introduce global variables.
 Style/GlobalVars:
-  Enabled: false
+  Enabled: true
 
 # Check for conditionals that can be replaced with guard clauses.
 Style/GuardClause:
@@ -271,7 +276,7 @@ Style/IfUnlessModifier:
 
 # Do not use if x; .... Use the ternary operator instead.
 Style/IfWithSemicolon:
-  Enabled: false
+  Enabled: true
 
 # Checks that conditional statements do not have an identical line at the
 # end of each branch, which can validly be moved out of the conditional.
@@ -309,7 +314,7 @@ Style/Lambda:
 
 # Use lambda.call(...) instead of lambda.(...).
 Style/LambdaCall:
-  Enabled: false
+  Enabled: true
 
 # Comments should start with a space.
 Style/LeadingCommentSpace:
@@ -329,7 +334,7 @@ Style/MethodDefParentheses:
 
 # Use the configured style when naming methods.
 Style/MethodName:
-  Enabled: false
+  Enabled: true
 
 # Checks for usage of `extend self` in modules.
 Style/ModuleFunction:
@@ -370,6 +375,11 @@ Style/MultilineMethodCallBraceLayout:
 Style/MultilineMethodCallIndentation:
   Enabled: false
 
+# Checks that the closing brace in a method definition is symmetrical with
+# respect to the opening brace and the method parameters.
+Style/MultilineMethodDefinitionBraceLayout:
+  Enabled: false
+
 # Checks indentation of binary operations that span more than one line.
 Style/MultilineOperationIndentation:
   Enabled: false
@@ -392,7 +402,7 @@ Style/NegatedWhile:
 
 # Avoid using nested modifiers.
 Style/NestedModifier:
-  Enabled: false
+  Enabled: true
 
 # Parenthesize method calls which are nested inside the argument list of
 # another parenthesized method call.
@@ -429,7 +439,7 @@ Style/OneLineConditional:
 
 # When defining binary operators, name the argument other.
 Style/OpMethod:
-  Enabled: false
+  Enabled: true
 
 # Check for simple usages of parallel assignment. It will only warn when
 # the number of variables matches on both sides of the assignment.
@@ -509,7 +519,8 @@ Style/Semicolon:
 
 # Checks for proper usage of fail and raise.
 Style/SignalException:
-  Enabled: false
+  EnforcedStyle: only_raise
+  Enabled: true
 
 # Enforces the names of some block params.
 Style/SingleLineBlockParams:
@@ -534,11 +545,11 @@ Style/SpaceAfterMethodName:
 
 # Tracks redundant space after the ! operator.
 Style/SpaceAfterNot:
-  Enabled: false
+  Enabled: true
 
 # Use spaces after semicolons.
 Style/SpaceAfterSemicolon:
-  Enabled: false
+  Enabled: true
 
 # Checks that the equals signs in parameter default assignments have or don't
 # have surrounding space depending on configuration.
@@ -572,7 +583,7 @@ Style/SpaceBeforeFirstArg:
 
 # No spaces before semicolons.
 Style/SpaceBeforeSemicolon:
-  Enabled: false
+  Enabled: true
 
 # Checks that block braces have or don't have surrounding space.
 # For blocks taking parameters, checks that the left brace has or doesn't
@@ -594,11 +605,12 @@ Style/SpaceInsideParens:
 
 # No spaces inside range literals.
 Style/SpaceInsideRangeLiteral:
-  Enabled: false
+  Enabled: true
 
 # Checks for padding/surrounding spaces inside string interpolation.
 Style/SpaceInsideStringInterpolation:
-  Enabled: false
+  EnforcedStyle: no_space
+  Enabled: true
 
 # Avoid Perl-style global variables.
 Style/SpecialGlobalVars:
@@ -606,7 +618,8 @@ Style/SpecialGlobalVars:
 
 # Check for the usage of parentheses around stabby lambda arguments.
 Style/StabbyLambdaParentheses:
-  Enabled: false
+  EnforcedStyle: require_parentheses
+  Enabled: true
 
 # Checks if uses of quotes match the configured preference.
 Style/StringLiterals:
@@ -619,7 +632,9 @@ Style/StringLiteralsInInterpolation:
 
 # Checks if configured preferred methods are used over non-preferred.
 Style/StringMethods:
-  Enabled: false
+  PreferredMethods:
+    intern: to_sym
+  Enabled: true
 
 # Use %i or %I for arrays of symbols.
 Style/SymbolArray:
@@ -677,15 +692,16 @@ Style/UnneededPercentQ:
 
 # Don't interpolate global, instance and class variables directly in strings.
 Style/VariableInterpolation:
-  Enabled: false
+  Enabled: true
 
 # Use the configured style when naming variables.
 Style/VariableName:
-  Enabled: false
+  EnforcedStyle: snake_case
+  Enabled: true
 
 # Use when x then ... for one-line cases.
 Style/WhenThen:
-  Enabled: false
+  Enabled: true
 
 # Checks for redundant do after while or until.
 Style/WhileUntilDo:
@@ -693,7 +709,7 @@ Style/WhileUntilDo:
 
 # Favor modifier while/until usage when you have a single-line body.
 Style/WhileUntilModifier:
-  Enabled: false
+  Enabled: true
 
 # Use %w or %W for arrays of words.
 Style/WordArray:
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 504d3df9d34..e4b4760c53b 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -1,6 +1,6 @@
 module Ci
   class GitlabCiYamlProcessor
-    class ValidationError < StandardError;end
+    class ValidationError < StandardError; end
 
     DEFAULT_STAGES = %w(build test deploy)
     DEFAULT_STAGE = 'test'

From 53866711d4c4f728f86d061984437bdd65f15bed Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 17 May 2016 17:12:23 +0100
Subject: [PATCH 0755/1431] Show loading indicator for autocomplete

Closes #15435
---
 .../javascripts/gfm_auto_complete.js.coffee   | 78 +++++++++++++++++--
 1 file changed, 73 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 41dba342107..b13a431a52f 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -22,6 +22,24 @@ GitLab.GfmAutoComplete =
   Milestones:
     template: '<li>${title}</li>'
 
+  Loading:
+    template: '<li><i class="fa fa-refresh fa-spin"></i> Loading...</li>'
+
+  DefaultOptions:
+    sorter: (query, items, searchKey) ->
+      return items if items[0].name? and items[0].name is 'loading'
+
+      $.fn.atwho.default.callbacks.sorter(query, items, searchKey)
+    filter: (query, data, searchKey) ->
+      return data if data[0] is 'loading'
+
+      $.fn.atwho.default.callbacks.filter(query, data, searchKey)
+    beforeInsert: (value) ->
+      if value.indexOf('undefined')
+        @at
+      else
+        value
+
   # Add GFM auto-completion to all input fields, that accept GFM input.
   setup: (wrap) ->
     @input = $('.js-gfm-input')
@@ -53,18 +71,37 @@ GitLab.GfmAutoComplete =
     # Emoji
     @input.atwho
       at: ':'
-      displayTpl: @Emoji.template
+      displayTpl: (value) =>
+        if value.path?
+          @Emoji.template
+        else
+          @Loading.template
       insertTpl: ':${name}:'
+      data: ['loading']
+      callbacks:
+        sorter: @DefaultOptions.sorter
+        filter: @DefaultOptions.filter
+        beforeInsert: @DefaultOptions.beforeInsert
 
     # Team Members
     @input.atwho
       at: '@'
-      displayTpl: @Members.template
+      displayTpl: (value) =>
+        if value.username?
+          @Members.template
+        else
+          @Loading.template
       insertTpl: '${atwho-at}${username}'
       searchKey: 'search'
+      data: ['loading']
       callbacks:
+        sorter: @DefaultOptions.sorter
+        filter: @DefaultOptions.filter
+        beforeInsert: @DefaultOptions.beforeInsert
         beforeSave: (members) ->
           $.map members, (m) ->
+            return m if not m.username?
+
             title = m.name
             title += " (#{m.count})" if m.count
 
@@ -76,11 +113,21 @@ GitLab.GfmAutoComplete =
       at: '#'
       alias: 'issues'
       searchKey: 'search'
-      displayTpl: @Issues.template
+      displayTpl:  (value) =>
+        if value.title?
+          @Issues.template
+        else
+          @Loading.template
+      data: ['loading']
       insertTpl: '${atwho-at}${id}'
       callbacks:
+        sorter: @DefaultOptions.sorter
+        filter: @DefaultOptions.filter
+        beforeInsert: @DefaultOptions.beforeInsert
         beforeSave: (issues) ->
           $.map issues, (i) ->
+            return i if not i.title?
+
             id:     i.iid
             title:  sanitize(i.title)
             search: "#{i.iid} #{i.title}"
@@ -89,11 +136,18 @@ GitLab.GfmAutoComplete =
       at: '%'
       alias: 'milestones'
       searchKey: 'search'
-      displayTpl: @Milestones.template
+      displayTpl:  (value) =>
+        if value.title?
+          @Milestones.template
+        else
+          @Loading.template
       insertTpl: '${atwho-at}"${title}"'
+      data: ['loading']
       callbacks:
         beforeSave: (milestones) ->
           $.map milestones, (m) ->
+            return m if not m.title?
+
             id:     m.iid
             title:  sanitize(m.title)
             search: "#{m.title}"
@@ -102,11 +156,21 @@ GitLab.GfmAutoComplete =
       at: '!'
       alias: 'mergerequests'
       searchKey: 'search'
-      displayTpl: @Issues.template
+      displayTpl:  (value) =>
+        if value.title?
+          @Issues.template
+        else
+          @Loading.template
+      data: ['loading']
       insertTpl: '${atwho-at}${id}'
       callbacks:
+        sorter: @DefaultOptions.sorter
+        filter: @DefaultOptions.filter
+        beforeInsert: @DefaultOptions.beforeInsert
         beforeSave: (merges) ->
           $.map merges, (m) ->
+            return m if not m.title?
+
             id:     m.iid
             title:  sanitize(m.title)
             search: "#{m.iid} #{m.title}"
@@ -128,3 +192,7 @@ GitLab.GfmAutoComplete =
     @input.atwho 'load', 'mergerequests', data.mergerequests
     # load emojis
     @input.atwho 'load', ':', data.emojis
+
+    # This trigger at.js again
+    # otherwise we would be stuck with loading until the user types
+    $(':focus').trigger('keyup')

From 56c00d1ce3369641d5d744130a6018b30bcdba73 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 17 May 2016 10:14:09 +0100
Subject: [PATCH 0756/1431] Increased zindex of layout nav This fixes issues
 where group inputs would be above the dropdown in the nav

Closes #17524
---
 app/assets/stylesheets/framework/nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index c70be58f48f..cb4ddac179e 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -196,7 +196,7 @@
   position: fixed;
   top: $header-height;
   width: 100%;
-  z-index: 3;
+  z-index: 11;
   background: $background-color;
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;

From 497a28c59f042fcce36d1d0682cf225c9743369f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 25 May 2016 08:52:13 +0100
Subject: [PATCH 0757/1431] Fixed project model tests

---
 app/models/project.rb       | 4 ++--
 spec/models/project_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 2876150cd6e..f3a56b86d5a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -434,9 +434,9 @@ class Project < ActiveRecord::Base
       projects_limit = creator.projects_limit
 
       if projects_limit == 0
-        self.errors.add(:base, "Personal project creation is not allowed. Please contact your administrator with questions")
+        self.errors.add(:limit_reached, "Personal project creation is not allowed. Please contact your administrator with questions")
       else
-        self.errors.add(:base, "Your project limit is #{projects_limit} projects! Please contact your administrator to increase it")
+        self.errors.add(:limit_reached, "Your project limit is #{projects_limit} projects! Please contact your administrator to increase it")
       end
     end
   rescue
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 60e1ec43f2b..34dcbf133d6 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -60,7 +60,7 @@ describe Project, models: true do
       project2 = build(:project)
       allow(project2).to receive(:creator).and_return(double(can_create_project?: false, projects_limit: 0).as_null_object)
       expect(project2).not_to be_valid
-      expect(project2.errors[:limit_reached].first).to match(/Your project limit is 0/)
+      expect(project2.errors[:limit_reached].first).to match(/Personal project creation is not allowed/)
     end
   end
 

From 897273d17974e414501c4152182a7cb634602d1b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 25 May 2016 11:45:34 +0200
Subject: [PATCH 0758/1431] Couple ProxyTiming to Metrics middleware

---
 config/initializers/metrics.rb      | 1 +
 config/initializers/proxy_timing.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 config/initializers/proxy_timing.rb

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 2338916e9da..2a7979cae54 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -12,6 +12,7 @@ if Gitlab::Metrics.enabled?
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Metrics::RackMiddleware)
+    config.middleware.use(Gitlab::Middleware::ProxyTiming)
   end
 
   Sidekiq.configure_server do |config|
diff --git a/config/initializers/proxy_timing.rb b/config/initializers/proxy_timing.rb
deleted file mode 100644
index 9161bd9b6c9..00000000000
--- a/config/initializers/proxy_timing.rb
+++ /dev/null
@@ -1 +0,0 @@
-Rails.application.config.middleware.use(Gitlab::Middleware::ProxyTiming)

From 1e45fb2f2d886584aef9973a2b50a261dce72e6b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 25 May 2016 09:59:11 +0100
Subject: [PATCH 0759/1431] Fixed issue with button color when no CI enabled
 Closes #17844

---
 app/assets/javascripts/merge_request_widget.js.coffee | 3 ++-
 app/controllers/projects/merge_requests_controller.rb | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index b6d590f681c..d16f44d52f8 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -106,6 +106,7 @@ class @MergeRequestWidget
         @firstCICheck = false
 
   showCIStatus: (state) ->
+    return if not state?
     $('.ci_widget').hide()
     allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"]
     if state in allowed_states
@@ -126,6 +127,6 @@ class @MergeRequestWidget
     $('.ci_widget:visible .ci-coverage').text(text)
 
   setMergeButtonClass: (css_class) ->
-    $('.js-merge-button')
+    $('.js-merge-button,.accept-action .dropdown-toggle')
       .removeClass('btn-danger btn-warning btn-create')
       .addClass(css_class)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index f137c12d215..17ce8e2ad20 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -229,6 +229,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     if ci_commit
       status = ci_commit.status
       coverage = ci_commit.try(:coverage)
+
+      status ||= "preparing"
     else
       ci_service = @merge_request.source_project.ci_service
       status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch) if ci_service
@@ -238,8 +240,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
-    status = "preparing" if status.nil?
-
     response = {
       title: merge_request.title,
       sha: merge_request.last_commit_short_sha,

From 664bdfae8454e3ba714f56d393779047a215c44d Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <fp@xell.at>
Date: Wed, 25 May 2016 11:16:23 +0200
Subject: [PATCH 0760/1431] Update docs: previous version is 8.7

---
 doc/update/8.7-to-8.8.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/update/8.7-to-8.8.md b/doc/update/8.7-to-8.8.md
index b4d9212289c..57d43ae61ad 100644
--- a/doc/update/8.7-to-8.8.md
+++ b/doc/update/8.7-to-8.8.md
@@ -137,7 +137,7 @@ To make sure you didn't miss anything run a more thorough check:
 
 If all items are green, then congratulations, the upgrade is complete!
 
-## Things went south? Revert to previous version (8.6)
+## Things went south? Revert to previous version (8.7)
 
 ### 1. Revert the code to the previous version
 

From 33be8181ac7a7885ccf5ea4850a87908d974ac28 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 28 Apr 2016 13:54:13 -0500
Subject: [PATCH 0761/1431] Add target status

---
 app/assets/stylesheets/pages/todos.scss   | 8 ++++++++
 app/helpers/todos_helper.rb               | 9 +++++++++
 app/views/dashboard/todos/_todo.html.haml | 4 ++++
 3 files changed, 21 insertions(+)

diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index e51c3491dae..7301d84ba21 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -29,6 +29,14 @@
 .todo-item {
   .todo-title {
     @include str-truncated(calc(100% - 174px));
+    overflow: visible;
+  }
+
+  .status-box {
+    margin: 0;
+    float: none;
+    display: inline-block;
+    font-weight: normal;
   }
 
   .todo-body {
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 81b9b5d7052..5d020e7f241 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -37,6 +37,15 @@ module TodosHelper
     end
   end
 
+  def todo_target_state_pill(todo)
+    klass = 'status-box '
+    klass << "status-box-#{todo.target.state.dasherize}"
+
+    content_tag(:span, nil, class: klass) {
+      todo.target.state.capitalize
+    }
+  end
+
   def todos_filter_params
     {
       state:      params[:state],
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 539f1dc6036..1f4a03cda2e 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -17,6 +17,10 @@
 
       &middot; #{time_ago_with_tooltip(todo.created_at)}
 
+      - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+        %span.target-status
+          = todo_target_state_pill(todo)
+
     - if todo.pending?
       .todo-actions.pull-right
         = link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do

From 38d6bc77f9d0b9be1d953d436384e2b023b465c5 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 28 Apr 2016 15:26:18 -0500
Subject: [PATCH 0762/1431] Add tests for Todos target's state

---
 .../features/todos/target_state_todos_spec.rb | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 spec/features/todos/target_state_todos_spec.rb

diff --git a/spec/features/todos/target_state_todos_spec.rb b/spec/features/todos/target_state_todos_spec.rb
new file mode 100644
index 00000000000..c7c5cdb66b0
--- /dev/null
+++ b/spec/features/todos/target_state_todos_spec.rb
@@ -0,0 +1,84 @@
+require 'rails_helper'
+
+describe 'Todos > Target State Labels' do
+  let(:user)          { create(:user) }
+  let(:author)        { create(:user) }
+  let(:project)       { create(:project) }
+  let(:issue_open)    { create(:issue) }
+  let(:issue_closed)  { create(:issue, state: 'closed') }
+  let(:mr_open)       { create(:merge_request, :simple, author: user) }
+  let(:mr_merged)     { create(:merge_request, :simple, author: user, state: 'merged') }
+  let(:mr_closed)     { create(:merge_request, :simple, author: user, state: 'closed') }
+
+  describe 'GET /dashboard/todos' do
+    context 'On a todo for a Closed Issue' do
+      before do
+        create(:todo, :mentioned, user: user, project: project, target: issue_closed, author: author)
+        login_as user
+        visit dashboard_todos_path
+      end
+
+      it 'has closed label' do
+        page.within '.todos-list' do
+          expect(page).to have_content('Closed')
+        end
+      end
+    end
+
+    context 'On a todo for a Open Issue' do
+      before do
+        create(:todo, :mentioned, user: user, project: project, target: issue_open, author: author)
+        login_as user
+        visit dashboard_todos_path
+      end
+
+      it 'does not have a open label' do
+        page.within '.todos-list' do
+          expect(page).not_to have_content('Open')
+        end
+      end
+    end
+
+    context 'On a todo for a merged Merge Request' do
+      before do
+        create(:todo, :mentioned, user: user, project: project, target: mr_merged, author: author)
+        login_as user
+        visit dashboard_todos_path
+      end
+
+      it 'has merged label' do
+        page.within '.todos-list' do
+          expect(page).to have_content('Merged')
+        end
+      end
+    end
+
+    context 'On a todo for a closed Merge Request' do
+      before do
+        create(:todo, :mentioned, user: user, project: project, target: mr_closed, author: author)
+        login_as user
+        visit dashboard_todos_path
+      end
+
+      it 'has closed label' do
+        page.within '.todos-list' do
+          expect(page).to have_content('Closed')
+        end
+      end
+    end
+
+    context 'On a todo for a open Merge Request' do
+      before do
+        create(:todo, :mentioned, user: user, project: project, target: mr_open, author: author)
+        login_as user
+        visit dashboard_todos_path
+      end
+
+      it 'does not have a open label' do
+        page.within '.todos-list' do
+          expect(page).not_to have_content('Open')
+        end
+      end
+    end
+  end
+end

From 2d810b61ad18920845f6aaafdbd5c63798691a9c Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 28 Apr 2016 15:43:18 -0500
Subject: [PATCH 0763/1431] Move todo target state to the top and fix styles on
 mobile

---
 app/assets/stylesheets/pages/todos.scss   | 6 ++++--
 app/views/dashboard/todos/_todo.html.haml | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index 7301d84ba21..afc00a68572 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -37,6 +37,9 @@
     float: none;
     display: inline-block;
     font-weight: normal;
+    padding: 0 5px;
+    line-height: inherit;
+    font-size: 14px;
   }
 
   .todo-body {
@@ -84,12 +87,11 @@
 
 @media (max-width: $screen-xs-max) {
   .todo-item {
-    padding-left: $gl-padding;
-
     .todo-title {
       white-space: normal;
       overflow: visible;
       max-width: 100%;
+      margin-bottom: 10px;
     }
 
     .avatar {
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 1f4a03cda2e..45dbc234cbc 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -3,6 +3,10 @@
     = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
     .todo-title.title
       - unless todo.build_failed?
+        - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+          %span.target-status
+            = todo_target_state_pill(todo)
+
         %span.author-name
           - if todo.author
             = link_to_author(todo)
@@ -17,10 +21,6 @@
 
       &middot; #{time_ago_with_tooltip(todo.created_at)}
 
-      - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
-        %span.target-status
-          = todo_target_state_pill(todo)
-
     - if todo.pending?
       .todo-actions.pull-right
         = link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do

From 76697c9b1b8f58fd05c7903398be776f5e364f21 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 28 Apr 2016 15:48:41 -0500
Subject: [PATCH 0764/1431] Update CHANGELOG

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 017dff0fa81..defa4031a9b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -110,6 +110,11 @@ v 8.7.4
   - Running rake gitlab:db:drop_tables now drops tables with cascade !4020
   - Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
   - Use a case-insensitive comparison in sanitizing URI schemes
+  - Fix always showing build notification message when switching between merge requests
+  - Links for Redmine issue references are generated correctly again (Benedikt Huss)
+  - Fix an issue when filtering merge requests with more than one label. !3886
+  - Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
+  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From 7586807fc3e01d641dfb1211e7c0a6a92e5e68c0 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 28 Apr 2016 16:37:00 -0500
Subject: [PATCH 0765/1431] Fix syntax

---
 app/helpers/todos_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 5d020e7f241..e01ff8407c3 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -41,9 +41,9 @@ module TodosHelper
     klass = 'status-box '
     klass << "status-box-#{todo.target.state.dasherize}"
 
-    content_tag(:span, nil, class: klass) {
+    content_tag(:span, nil, class: klass) do
       todo.target.state.capitalize
-    }
+    end
   end
 
   def todos_filter_params

From 2c8000e302c7c5382caaa235ece133ade687c7ac Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 3 May 2016 10:30:33 -0500
Subject: [PATCH 0766/1431] Move conditional to a method

---
 app/helpers/todos_helper.rb               | 4 ++++
 app/views/dashboard/todos/_todo.html.haml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index e01ff8407c3..150d826ac44 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -46,6 +46,10 @@ module TodosHelper
     end
   end
 
+  def show_todo_state?(todo)
+    (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+  end
+
   def todos_filter_params
     {
       state:      params[:state],
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 45dbc234cbc..f544f87b581 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -3,7 +3,7 @@
     = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
     .todo-title.title
       - unless todo.build_failed?
-        - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+        - if show_todo_state?(todo)
           %span.target-status
             = todo_target_state_pill(todo)
 

From 7d7ded5ee9ce05c41e1143d43cb49e261fb86423 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 16:43:31 -0500
Subject: [PATCH 0767/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index defa4031a9b..f18867c5379 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -101,6 +101,7 @@ v 8.7.5
   - Fix always showing build notification message when switching between merge requests !4086
   - Fix an issue when filtering merge requests with more than one label. !3886
   - Fix short note for the default scope on build page (Takuya Noguchi)
+  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
@@ -114,7 +115,6 @@ v 8.7.4
   - Links for Redmine issue references are generated correctly again (Benedikt Huss)
   - Fix an issue when filtering merge requests with more than one label. !3886
   - Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
-  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From fd0c40fc801b766622654485717532f821efb795 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 17:19:26 -0500
Subject: [PATCH 0768/1431] Address feedback

Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
---
 CHANGELOG                                     |  1 -
 app/helpers/todos_helper.rb                   | 21 +++--
 app/views/dashboard/todos/_todo.html.haml     |  3 +-
 spec/features/todos/target_state_spec.rb      | 65 ++++++++++++++
 .../features/todos/target_state_todos_spec.rb | 84 -------------------
 5 files changed, 78 insertions(+), 96 deletions(-)
 create mode 100644 spec/features/todos/target_state_spec.rb
 delete mode 100644 spec/features/todos/target_state_todos_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index f18867c5379..57020ca9ca1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -114,7 +114,6 @@ v 8.7.4
   - Fix always showing build notification message when switching between merge requests
   - Links for Redmine issue references are generated correctly again (Benedikt Huss)
   - Fix an issue when filtering merge requests with more than one label. !3886
-  - Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 150d826ac44..27f33b3eded 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -38,18 +38,15 @@ module TodosHelper
   end
 
   def todo_target_state_pill(todo)
-    klass = 'status-box '
-    klass << "status-box-#{todo.target.state.dasherize}"
-
-    content_tag(:span, nil, class: klass) do
-      todo.target.state.capitalize
+    if show_todo_state?(todo)
+      content_tag(:span, nil, class: 'target-status') do
+        content_tag(:span, nil, class: "status-box status-box-#{todo.target.state.dasherize}") do
+          todo.target.state.capitalize
+        end
+      end
     end
   end
 
-  def show_todo_state?(todo)
-    (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
-  end
-
   def todos_filter_params
     {
       state:      params[:state],
@@ -108,4 +105,10 @@ module TodosHelper
 
     options_from_collection_for_select(types, 'name', 'title', params[:type])
   end
+
+  private
+
+  def show_todo_state?(todo)
+    (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+  end
 end
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index f544f87b581..db567d6df3b 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -4,8 +4,7 @@
     .todo-title.title
       - unless todo.build_failed?
         - if show_todo_state?(todo)
-          %span.target-status
-            = todo_target_state_pill(todo)
+          = todo_target_state_pill(todo)
 
         %span.author-name
           - if todo.author
diff --git a/spec/features/todos/target_state_spec.rb b/spec/features/todos/target_state_spec.rb
new file mode 100644
index 00000000000..604b3ee4056
--- /dev/null
+++ b/spec/features/todos/target_state_spec.rb
@@ -0,0 +1,65 @@
+require 'rails_helper'
+
+feature 'Todo target states', feature: true do
+  let(:user)          { create(:user) }
+  let(:author)        { create(:user) }
+  let(:project)       { create(:project) }
+
+  before do
+    login_as user
+  end
+
+  scenario 'on a closed issue todo has closed label' do
+    issue_closed = create(:issue, state: 'closed')
+    create_todo issue_closed
+    visit dashboard_todos_path
+
+    page.within '.todos-list' do
+      expect(page).to have_content('Closed')
+    end
+  end
+
+  scenario 'on an open issue todo does not have an open label' do
+    issue_open = create(:issue)
+    create_todo issue_open
+    visit dashboard_todos_path
+
+    page.within '.todos-list' do
+      expect(page).not_to have_content('Open')
+    end
+  end
+
+  scenario 'on a merged merge request todo has merged label' do
+    mr_merged = create(:merge_request, :simple, author: user, state: 'merged')
+    create_todo mr_merged
+    visit dashboard_todos_path
+
+    page.within '.todos-list' do
+      expect(page).to have_content('Merged')
+    end
+  end
+
+  scenario 'on a closed merge request todo has closed label' do
+    mr_closed = create(:merge_request, :simple, author: user, state: 'closed')
+    create_todo mr_closed
+    visit dashboard_todos_path
+
+    page.within '.todos-list' do
+      expect(page).to have_content('Closed')
+    end
+  end
+
+  scenario 'on an open merge request todo does not have an open label' do
+    mr_open = create(:merge_request, :simple, author: user)
+    create_todo mr_open
+    visit dashboard_todos_path
+
+    page.within '.todos-list' do
+      expect(page).not_to have_content('Open')
+    end
+  end
+
+  def create_todo(target)
+    create(:todo, :mentioned, user: user, project: project, target: target, author: author)
+  end
+end
diff --git a/spec/features/todos/target_state_todos_spec.rb b/spec/features/todos/target_state_todos_spec.rb
deleted file mode 100644
index c7c5cdb66b0..00000000000
--- a/spec/features/todos/target_state_todos_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-require 'rails_helper'
-
-describe 'Todos > Target State Labels' do
-  let(:user)          { create(:user) }
-  let(:author)        { create(:user) }
-  let(:project)       { create(:project) }
-  let(:issue_open)    { create(:issue) }
-  let(:issue_closed)  { create(:issue, state: 'closed') }
-  let(:mr_open)       { create(:merge_request, :simple, author: user) }
-  let(:mr_merged)     { create(:merge_request, :simple, author: user, state: 'merged') }
-  let(:mr_closed)     { create(:merge_request, :simple, author: user, state: 'closed') }
-
-  describe 'GET /dashboard/todos' do
-    context 'On a todo for a Closed Issue' do
-      before do
-        create(:todo, :mentioned, user: user, project: project, target: issue_closed, author: author)
-        login_as user
-        visit dashboard_todos_path
-      end
-
-      it 'has closed label' do
-        page.within '.todos-list' do
-          expect(page).to have_content('Closed')
-        end
-      end
-    end
-
-    context 'On a todo for a Open Issue' do
-      before do
-        create(:todo, :mentioned, user: user, project: project, target: issue_open, author: author)
-        login_as user
-        visit dashboard_todos_path
-      end
-
-      it 'does not have a open label' do
-        page.within '.todos-list' do
-          expect(page).not_to have_content('Open')
-        end
-      end
-    end
-
-    context 'On a todo for a merged Merge Request' do
-      before do
-        create(:todo, :mentioned, user: user, project: project, target: mr_merged, author: author)
-        login_as user
-        visit dashboard_todos_path
-      end
-
-      it 'has merged label' do
-        page.within '.todos-list' do
-          expect(page).to have_content('Merged')
-        end
-      end
-    end
-
-    context 'On a todo for a closed Merge Request' do
-      before do
-        create(:todo, :mentioned, user: user, project: project, target: mr_closed, author: author)
-        login_as user
-        visit dashboard_todos_path
-      end
-
-      it 'has closed label' do
-        page.within '.todos-list' do
-          expect(page).to have_content('Closed')
-        end
-      end
-    end
-
-    context 'On a todo for a open Merge Request' do
-      before do
-        create(:todo, :mentioned, user: user, project: project, target: mr_open, author: author)
-        login_as user
-        visit dashboard_todos_path
-      end
-
-      it 'does not have a open label' do
-        page.within '.todos-list' do
-          expect(page).not_to have_content('Open')
-        end
-      end
-    end
-  end
-end

From bc38bfada7eb0f99be02399fcee6672011f29c79 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 18 May 2016 20:15:08 -0500
Subject: [PATCH 0769/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 57020ca9ca1..b81481b1c0e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -90,6 +90,7 @@ v 8.8.0
   - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
   - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
   - When creating a .gitignore file a dropdown with templates will be provided
+  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
@@ -101,7 +102,6 @@ v 8.7.5
   - Fix always showing build notification message when switching between merge requests !4086
   - Fix an issue when filtering merge requests with more than one label. !3886
   - Fix short note for the default scope on build page (Takuya Noguchi)
-  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.7.4
   - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)

From 77ca4a675ac7f8684f0b7c10592140365fc13a2d Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 18 May 2016 20:23:00 -0500
Subject: [PATCH 0770/1431] Make conditional a guard clause

---
 app/helpers/todos_helper.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 27f33b3eded..b9d7edb4185 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -38,11 +38,11 @@ module TodosHelper
   end
 
   def todo_target_state_pill(todo)
-    if show_todo_state?(todo)
-      content_tag(:span, nil, class: 'target-status') do
-        content_tag(:span, nil, class: "status-box status-box-#{todo.target.state.dasherize}") do
-          todo.target.state.capitalize
-        end
+    return unless show_todo_state?(todo)
+
+    content_tag(:span, nil, class: 'target-status') do
+      content_tag(:span, nil, class: "status-box status-box-#{todo.target.state.dasherize}") do
+        todo.target.state.capitalize
       end
     end
   end

From da14205b61e51a2bfb4b7f0c6c8e3d13aa1bead4 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 18 May 2016 21:37:13 -0500
Subject: [PATCH 0771/1431] Update CHANGELOG

---
 CHANGELOG | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b81481b1c0e..c59a66874c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.9.0 (unreleased)
   - Use gitlab-shell v3.0.0
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Fix issues filter when ordering by milestone
+  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.8.2 (unreleased)
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
@@ -90,7 +91,6 @@ v 8.8.0
   - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
   - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
   - When creating a .gitignore file a dropdown with templates will be provided
-  - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
@@ -111,9 +111,6 @@ v 8.7.4
   - Running rake gitlab:db:drop_tables now drops tables with cascade !4020
   - Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
   - Use a case-insensitive comparison in sanitizing URI schemes
-  - Fix always showing build notification message when switching between merge requests
-  - Links for Redmine issue references are generated correctly again (Benedikt Huss)
-  - Fix an issue when filtering merge requests with more than one label. !3886
 
 v 8.7.3
   - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented

From 0f63d34447dee488a861ad4d32d0165740a8262b Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 23 May 2016 19:34:55 -0500
Subject: [PATCH 0772/1431] Remove conditional

---
 app/views/dashboard/todos/_todo.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index db567d6df3b..98f302d2f93 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -3,8 +3,7 @@
     = image_tag avatar_icon(todo.author_email, 40), class: 'avatar s40', alt:''
     .todo-title.title
       - unless todo.build_failed?
-        - if show_todo_state?(todo)
-          = todo_target_state_pill(todo)
+        = todo_target_state_pill(todo)
 
         %span.author-name
           - if todo.author

From 9a10205a4fdb79346f087318ec35110b17ba9153 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 24 May 2016 12:52:31 -0500
Subject: [PATCH 0773/1431] Reduce spacing

---
 spec/features/todos/target_state_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/features/todos/target_state_spec.rb b/spec/features/todos/target_state_spec.rb
index 604b3ee4056..72491ac7e61 100644
--- a/spec/features/todos/target_state_spec.rb
+++ b/spec/features/todos/target_state_spec.rb
@@ -1,9 +1,9 @@
 require 'rails_helper'
 
 feature 'Todo target states', feature: true do
-  let(:user)          { create(:user) }
-  let(:author)        { create(:user) }
-  let(:project)       { create(:project) }
+  let(:user)    { create(:user) }
+  let(:author)  { create(:user) }
+  let(:project) { create(:project) }
 
   before do
     login_as user

From 3c785a761c162745fc26a4fa8b8aeb347b943840 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 25 May 2016 14:28:21 +0200
Subject: [PATCH 0774/1431] Send data to InfluxDB instead of stdout

---
 lib/gitlab/middleware/proxy_timing.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/gitlab/middleware/proxy_timing.rb b/lib/gitlab/middleware/proxy_timing.rb
index 9094d6b1e7d..b276eef90a8 100644
--- a/lib/gitlab/middleware/proxy_timing.rb
+++ b/lib/gitlab/middleware/proxy_timing.rb
@@ -10,11 +10,13 @@ module Gitlab
       end
       
       def call(env)
-        proxy_start = env['HTTP_GITLAB_WORHORSE_PROXY_START'].to_f / 1_000_000_000
-        if proxy_start > 0
-          # send measurement
-          puts "\n\n\n#{(Time.now - proxy_start).to_f}\n\n\n"
+        trans = Gitlab::Metrics.current_transaction
+        proxy_start = env['HTTP_GITLAB_WORHORSE_PROXY_START'].presence
+        if trans && proxy_start
+          # Time in milliseconds since gitlab-workhorse started the request
+          trans.set(:proxy_flight_time, Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000)
         end
+
         @app.call(env)
       end
     end

From c049534da635b3252c564162150b041a2b823860 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 25 May 2016 14:55:23 +0200
Subject: [PATCH 0775/1431] Align class name with field name

---
 config/initializers/metrics.rb                                  | 2 +-
 lib/gitlab/middleware/{proxy_timing.rb => proxy_flight_time.rb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/gitlab/middleware/{proxy_timing.rb => proxy_flight_time.rb} (96%)

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 2a7979cae54..540e10c1ec1 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -12,7 +12,7 @@ if Gitlab::Metrics.enabled?
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Metrics::RackMiddleware)
-    config.middleware.use(Gitlab::Middleware::ProxyTiming)
+    config.middleware.use(Gitlab::Middleware::ProxyFlightTime)
   end
 
   Sidekiq.configure_server do |config|
diff --git a/lib/gitlab/middleware/proxy_timing.rb b/lib/gitlab/middleware/proxy_flight_time.rb
similarity index 96%
rename from lib/gitlab/middleware/proxy_timing.rb
rename to lib/gitlab/middleware/proxy_flight_time.rb
index b276eef90a8..042bcdacf8b 100644
--- a/lib/gitlab/middleware/proxy_timing.rb
+++ b/lib/gitlab/middleware/proxy_flight_time.rb
@@ -4,7 +4,7 @@
 
 module Gitlab
   module Middleware
-    class ProxyTiming
+    class ProxyFlightTime
       def initialize(app)
         @app = app
       end

From c2bd71fda65d5e2eae5f4c36bb8548a7a8c1937e Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 25 May 2016 16:05:56 +0300
Subject: [PATCH 0776/1431] " :arrow_right: '.

---
 app/assets/javascripts/awards_handler.coffee | 85 ++++++++++----------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 67f04dcac73..ffe060e8c23 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,24 +1,26 @@
 class @AwardsHandler
+
   constructor: ->
+
     @aliases = emojiAliases()
 
     $(document)
-      .off "click", ".js-add-award"
-      .on "click", ".js-add-award", (event) =>
+      .off 'click', '.js-add-award'
+      .on  'click', '.js-add-award', (event) =>
         event.stopPropagation()
         event.preventDefault()
 
         @showEmojiMenu $(event.currentTarget)
 
-    $("html").on 'click', (event) ->
-      if !$(event.target).closest(".emoji-menu").length
-        if $(".emoji-menu").is(":visible")
+    $('html').on 'click', (event) ->
+      unless $(event.target).closest('.emoji-menu').length
+        if $('.emoji-menu').is(':visible')
           $('.js-add-award.is-active').removeClass 'is-active'
-          $(".emoji-menu").removeClass "is-visible"
+          $('.emoji-menu').removeClass 'is-visible'
 
     $(document)
-      .off "click", ".js-emoji-btn"
-      .on "click", ".js-emoji-btn", @handleClick
+      .off 'click', '.js-emoji-btn'
+      .on  'click', '.js-emoji-btn', @handleClick
 
 
   handleClick: (e) =>
@@ -37,16 +39,16 @@ class @AwardsHandler
     if $menu.length
       $holder = $addBtn.closest('.js-award-holder')
 
-      if $menu.is ".is-visible"
-        $addBtn.removeClass "is-active"
-        $menu.removeClass "is-visible"
-        $("#emoji_search").blur()
+      if $menu.is '.is-visible'
+        $addBtn.removeClass 'is-active'
+        $menu.removeClass 'is-visible'
+        $('#emoji_search').blur()
       else
-        $addBtn.addClass "is-active"
+        $addBtn.addClass 'is-active'
         @positionMenu($menu, $addBtn)
 
-        $menu.addClass "is-visible"
-        $("#emoji_search").focus()
+        $menu.addClass 'is-visible'
+        $('#emoji_search').focus()
     else
       $addBtn.addClass 'is-loading is-active'
       url = $addBtn.data 'award-menu-url'
@@ -81,10 +83,10 @@ class @AwardsHandler
 
     if position? and position is 'right'
       css.left = "#{($addBtn.offset().left - $menu.outerWidth()) + 20}px"
-      $menu.addClass "is-aligned-right"
+      $menu.addClass 'is-aligned-right'
     else
       css.left = "#{$addBtn.offset().left}px"
-      $menu.removeClass "is-aligned-right"
+      $menu.removeClass 'is-aligned-right'
 
     $menu.css(css)
 
@@ -114,7 +116,7 @@ class @AwardsHandler
       else
         counter = $emojiBtn.find('.js-counter')
         counter.text(parseInt(counter.text()) + 1)
-        $emojiBtn.addClass("active")
+        $emojiBtn.addClass('active')
         @addMeToUserList(emoji)
     else
       @createEmoji(emoji)
@@ -137,8 +139,8 @@ class @AwardsHandler
       @addAward awardUrl, mutualVote, no if isAlreadyVoted
 
 
-  isActive: ($emojiBtn) ->
-    $emojiBtn.hasClass("active")
+  isActive: ($emojiBtn) -> $emojiBtn.hasClass 'active'
+
 
   decrementCounter: ($emojiBtn, emoji) ->
     isntNoteBody = $emojiBtn.closest('.note-body').length is 0
@@ -152,15 +154,15 @@ class @AwardsHandler
     if counterNumber > 1
       counter.text(counterNumber - 1)
       @removeMeFromUserList($emojiBtn, emoji)
-    else if (emoji == "thumbsup" || emoji == "thumbsdown") && isntNoteBody
-      $emojiBtn.tooltip("destroy")
+    else if (emoji == 'thumbsup' || emoji == 'thumbsdown') && isntNoteBody
+      $emojiBtn.tooltip('destroy')
       counter.text('0')
       @removeMeFromUserList($emojiBtn, emoji)
     else
-      $emojiBtn.tooltip("destroy")
+      $emojiBtn.tooltip('destroy')
       $emojiBtn.remove()
 
-    $emojiBtn.removeClass("active")
+    $emojiBtn.removeClass('active')
 
 
   getAwardTooltip: ($awardBlock) ->
@@ -194,19 +196,20 @@ class @AwardsHandler
     origTitle  = @getAwardTooltip awardBlock
     users      = []
 
+    if origTitle
     if origTitle
       users = origTitle.trim().split(', ')
 
     users.push('me')
-    awardBlock.attr('title', users.join(", "))
+    awardBlock.attr('title', users.join(', '))
 
     @resetTooltip(awardBlock)
 
 
   resetTooltip: (award) ->
-    award.tooltip("destroy")
+    award.tooltip('destroy')
 
-    # "destroy" call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
+    # 'destroy' call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
     setTimeout (->
       award.tooltip()
     ), 200
@@ -247,10 +250,10 @@ class @AwardsHandler
     emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
 
     if emoji_icon.length > 0
-      unicodeName = emoji_icon.data("unicode-name")
+      unicodeName = emoji_icon.data('unicode-name')
     else
       # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
+      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name')
 
     return "emoji-#{unicodeName}"
 
@@ -274,10 +277,10 @@ class @AwardsHandler
   addEmojiToFrequentlyUsedList: (emoji) ->
     frequently_used_emojis = @getFrequentlyUsedEmojis()
     frequently_used_emojis.push(emoji)
-    $.cookie('frequently_used_emojis', frequently_used_emojis.join(","), { expires: 365 })
+    $.cookie('frequently_used_emojis', frequently_used_emojis.join(','), { expires: 365 })
 
   getFrequentlyUsedEmojis: ->
-    frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
+    frequently_used_emojis = ($.cookie('frequently_used_emojis') || '').split(',')
     _.compact(_.uniq(frequently_used_emojis))
 
   renderFrequentlyUsedBlock: ->
@@ -287,26 +290,26 @@ class @AwardsHandler
       ul = $("<ul class='clearfix emoji-menu-list'>")
 
       for emoji in frequently_used_emojis
-        $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
+        $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
 
-      $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
+      $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
 
   setupSearch: ->
-    $("input.emoji-search").on 'keyup', (ev) =>
+    $('input.emoji-search').on 'keyup', (ev) =>
       term = $(ev.target).val()
 
       # Clean previous search results
-      $("ul.emoji-menu-search, h5.emoji-search").remove()
+      $('ul.emoji-menu-search, h5.emoji-search').remove()
 
       if term
         # Generate a search result block
-        h5 = $("<h5>").text("Search results").addClass("emoji-search")
+        h5 = $('<h5>').text('Search results').addClass('emoji-search')
         found_emojis = @searchEmojis(term).show()
-        ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
-        $(".emoji-menu-content ul, .emoji-menu-content h5").hide()
-        $(".emoji-menu-content").append(h5).append(ul)
+        ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(found_emojis)
+        $('.emoji-menu-content ul, .emoji-menu-content h5').hide()
+        $('.emoji-menu-content').append(h5).append(ul)
       else
-        $(".emoji-menu-content").children().show()
+        $('.emoji-menu-content').children().show()
 
   searchEmojis: (term)->
-    $(".emoji-menu-content [data-emoji*='#{term}']").closest("li").clone()
+    $(".emoji-menu-content [data-emoji*='#{term}']").closest('li').clone()

From 9777a3d39de8c483ab1a3a6dc325b0a7f32eff68 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 25 May 2016 16:34:39 +0300
Subject: [PATCH 0777/1431] Remove accidentally duplicated line.

:facepalm:
---
 app/assets/javascripts/awards_handler.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index ffe060e8c23..766c653111a 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -196,7 +196,6 @@ class @AwardsHandler
     origTitle  = @getAwardTooltip awardBlock
     users      = []
 
-    if origTitle
     if origTitle
       users = origTitle.trim().split(', ')
 

From 6523002267e63e301693c141f6de2c6bbf6e2e73 Mon Sep 17 00:00:00 2001
From: ZJ van de Weg <zegerjan@gitlab.com>
Date: Wed, 25 May 2016 15:43:07 +0200
Subject: [PATCH 0778/1431] Remove old tests, and use right factories

---
 features/steps/project/issues/issues.rb  | 10 ++--
 features/steps/project/merge_requests.rb |  8 ++--
 spec/models/note_spec.rb                 | 60 ------------------------
 3 files changed, 9 insertions(+), 69 deletions(-)

diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index 78ddaee8771..530ba604300 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -192,14 +192,14 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
   step 'issue "Release 0.4" have 2 upvotes and 1 downvote' do
     awardable = Issue.find_by(title: 'Release 0.4')
-    create_list(:upvote, 2, project: project, awardable: awardable)
-    create(:downvote, project: project, awardable: awardable)
+    create_list(:award_emoji, 2, awardable: awardable)
+    create(:award_emoji, :downvote, awardable: awardable)
   end
 
   step 'issue "Tweet control" have 1 upvote and 2 downvotes' do
-    issue = Issue.find_by(title: 'Tweet control')
-    create(:upvote, project: project, noteable: issue)
-    create_list(:downvote, 2, project: project, noteable: issue)
+    awardable = Issue.find_by(title: 'Tweet control')
+    create(:award_emoji, :upvote, awardable: awardable)
+    create_list(:award_emoji, 2, awardable: awardable, name: 'thumbsdown')
   end
 
   step 'The list should be sorted by "Least popular"' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index bdb126c6ede..692a01c7f74 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -179,14 +179,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'merge request "Bug NS-04" have 2 upvotes and 1 downvote' do
     merge_request = MergeRequest.find_by(title: 'Bug NS-04')
-    create_list(:upvote, 2, project: project, awardable: merge_request)
-    create(:downvote, project: project, awardable: merge_request)
+    create_list(:award_emoji, 2, awardable: merge_request)
+    create(:award_emoji, :downvote, awardable: merge_request)
   end
 
   step 'merge request "Bug NS-06" have 1 upvote and 2 downvotes' do
     awardable = MergeRequest.find_by(title: 'Bug NS-06')
-    create(:upvote, project: project, awardable: awardable)
-    create_list(:downvote, 2, project: project, awardable: awardable)
+    create(:award_emoji, awardable: awardable)
+    create_list(:award_emoji, 2, awardable: awardable, name: "thumbsdown")
   end
 
   step 'The list should be sorted by "Least popular"' do
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 4448eefad00..a3ab1b796be 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -113,66 +113,6 @@ describe Note, models: true do
     end
   end
 
-  describe '#active?' do
-    it 'is always true when the note has no associated diff' do
-      note = build(:note)
-
-      expect(note).to receive(:diff).and_return(nil)
-
-      expect(note).to be_active
-    end
-
-    it 'is never true when the note has no noteable associated' do
-      note = build(:note)
-
-      expect(note).to receive(:diff).and_return(double)
-      expect(note).to receive(:noteable).and_return(nil)
-
-      expect(note).not_to be_active
-    end
-
-    it 'returns the memoized value if defined' do
-      note = build(:note)
-
-      expect(note).to receive(:diff).and_return(double)
-      expect(note).to receive(:noteable).and_return(double)
-
-      note.instance_variable_set(:@active, 'foo')
-      expect(note).not_to receive(:find_noteable_diff)
-
-      expect(note.active?).to eq 'foo'
-    end
-
-    context 'for a merge request noteable' do
-      it 'is false when noteable has no matching diff' do
-        merge = build_stubbed(:merge_request, :simple)
-        note = build(:note, noteable: merge)
-
-        allow(note).to receive(:diff).and_return(double)
-        expect(note).to receive(:find_noteable_diff).and_return(nil)
-
-        expect(note).not_to be_active
-      end
-
-      it 'is true when noteable has a matching diff' do
-        merge = create(:merge_request, :simple)
-
-        # Generate a real line_code value so we know it will match. We use a
-        # random line from a random diff just for funsies.
-        diff = merge.diffs.to_a.sample
-        line = Gitlab::Diff::Parser.new.parse(diff.diff.each_line).to_a.sample
-        code = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
-
-        # We're persisting in order to trigger the set_diff callback
-        note = create(:note, noteable: merge, line_code: code)
-
-        # Make sure we don't get a false positive from a guard clause
-        expect(note).to receive(:find_noteable_diff).and_call_original
-        expect(note).to be_active
-      end
-    end
-  end
-
   describe "editable?" do
     it "returns true" do
       note = build(:note)

From 50a16c4bd75307f05bcffa4d1231872a1346ae6e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 25 May 2016 15:26:02 +0100
Subject: [PATCH 0779/1431] Updated Ruby

---
 app/controllers/autocomplete_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 61e92c1a805..3865b2d61fd 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -39,8 +39,11 @@ class AutocompleteController < ApplicationController
       current_user.can?(:admin_issue, project)
     end
 
-    no_project = OpenStruct.new(id: 0, name_with_namespace: 'No project')
-    projects.unshift(no_project.to_h)
+    no_project = {
+      id: 0,
+      name_with_namespace: 'No project',
+    }
+    projects.unshift(no_project)
     projects.delete(project)
 
     render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)

From 6ec2730fb371dbfdf84f98e2061431367c3927d1 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 25 May 2016 16:37:18 +0200
Subject: [PATCH 0780/1431] Test ProxyFlightTime middleware

---
 .../middleware/proxy_flight_time_spec.rb      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 spec/lib/gitlab/middleware/proxy_flight_time_spec.rb

diff --git a/spec/lib/gitlab/middleware/proxy_flight_time_spec.rb b/spec/lib/gitlab/middleware/proxy_flight_time_spec.rb
new file mode 100644
index 00000000000..f59166d5c29
--- /dev/null
+++ b/spec/lib/gitlab/middleware/proxy_flight_time_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Gitlab::Middleware::ProxyFlightTime do
+  let(:app) { double(:app) }
+  let(:middleware) { described_class.new(app) }
+  let(:env) { {} }
+  let(:transaction) { double(:transaction) }
+
+  before { expect(app).to receive(:call).with(env).and_return('yay') }
+
+  describe '#call' do
+    it 'calls the app when metrics are disabled' do
+      expect(Gitlab::Metrics).to receive(:current_transaction).and_return(nil)
+      expect(middleware.call(env)).to eq('yay')
+    end
+
+    context 'when metrics are enabled' do
+      before { allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction) }
+
+      it 'calls the app when metrics are enabled but no timing header is found' do
+        expect(middleware.call(env)).to eq('yay')
+      end
+
+      it 'sets proxy_flight_time and calls the app when the header is present' do
+        env['HTTP_GITLAB_WORHORSE_PROXY_START'] = '123'
+        expect(transaction).to receive(:set).with(:proxy_flight_time, an_instance_of(Float))
+        expect(middleware.call(env)).to eq('yay')
+      end
+    end
+  end
+end

From 5273335247660465a39ffdcb1c801807e84b3eba Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 24 May 2016 17:53:53 -0400
Subject: [PATCH 0781/1431] Fix forks creation when visibility level is
 restricted

---
 CHANGELOG                                   |  1 +
 app/services/projects/fork_service.rb       | 14 ++++++++++-
 lib/gitlab/visibility_level.rb              |  7 ++++++
 spec/services/projects/fork_service_spec.rb | 27 +++++++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c59a66874c3..73f21ed4d8a 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.9.0 (unreleased)
+  - Allow forking projects with restricted visibility level
   - Redesign navigation for project pages
   - Use gitlab-shell v3.0.0
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb
index 0577ae778d5..de6dc38cc8e 100644
--- a/app/services/projects/fork_service.rb
+++ b/app/services/projects/fork_service.rb
@@ -3,7 +3,7 @@ module Projects
     def execute
       new_params = {
         forked_from_project_id: @project.id,
-        visibility_level:       @project.visibility_level,
+        visibility_level:       allowed_visibility_level,
         description:            @project.description,
         name:                   @project.name,
         path:                   @project.path,
@@ -19,5 +19,17 @@ module Projects
       new_project = CreateService.new(current_user, new_params).execute
       new_project
     end
+
+    private
+
+    def allowed_visibility_level
+      project_level = @project.visibility_level
+
+      if Gitlab::VisibilityLevel.non_restricted_level?(project_level)
+        project_level
+      else
+        Gitlab::VisibilityLevel.highest_allowed_level
+      end
+    end
   end
 end
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index a1ee1cba216..9462f3368e6 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -32,6 +32,13 @@ module Gitlab
         }
       end
 
+      def highest_allowed_level
+        restricted_levels = current_application_settings.restricted_visibility_levels
+
+        allowed_levels = self.values - restricted_levels
+        allowed_levels.max || PRIVATE
+      end
+
       def allowed_for?(user, level)
         user.is_admin? || allowed_level?(level.to_i)
       end
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index d1ee60a0aea..31bb7120d84 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -42,6 +42,33 @@ describe Projects::ForkService, services: true do
         expect(@to_project.builds_enabled?).to be_truthy
       end
     end
+
+    context "when project has restricted visibility level" do
+      context "and only one visibility level is restricted" do
+        before do
+          @from_project.update_attributes(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+          stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::INTERNAL])
+        end
+
+        it "creates fork with highest allowed level" do
+          forked_project = fork_project(@from_project, @to_user)
+
+          expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PUBLIC)
+        end
+      end
+
+      context "and all visibility levels are restricted" do
+        before do
+          stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC, Gitlab::VisibilityLevel::INTERNAL, Gitlab::VisibilityLevel::PRIVATE])
+        end
+
+        it "creates fork with private visibility levels" do
+          forked_project = fork_project(@from_project, @to_user)
+
+          expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
+        end
+      end
+    end
   end
 
   describe :fork_to_namespace do

From b10b6f963dd0d0da26e1750263e6b970b839ba0f Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Wed, 25 May 2016 11:30:11 -0500
Subject: [PATCH 0782/1431] Add new HA diagrams [ci skip]

---
 doc/administration/high_availability/README.md  |   4 ++++
 .../high_availability/active-active-diagram.png | Bin 0 -> 29607 bytes
 .../active-passive-diagram.png                  | Bin 0 -> 24246 bytes
 3 files changed, 4 insertions(+)
 create mode 100644 doc/administration/img/high_availability/active-active-diagram.png
 create mode 100644 doc/administration/img/high_availability/active-passive-diagram.png

diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md
index 43d85ffb775..d74a786ac24 100644
--- a/doc/administration/high_availability/README.md
+++ b/doc/administration/high_availability/README.md
@@ -19,6 +19,8 @@ Components/Servers Required:
 
 - 2 servers/virtual machines (one active/one passive)
 
+![Active/Passive HA Diagram](../img/high_availability/active-passive-diagram.png)
+
 ### Active/Active
 
 This architecture scales easily because all application servers handle
@@ -26,6 +28,8 @@ user requests simultaneously. The database, Redis, and GitLab application are
 all deployed on separate servers. The configuration is **only** highly-available
 if the database, Redis and storage are also configured as such.
 
+![Active/Active HA Diagram](../img/high_availability/active-active-diagram.png)
+
 **Steps to configure active/active:**
 
 1. [Configure the database](database.md)
diff --git a/doc/administration/img/high_availability/active-active-diagram.png b/doc/administration/img/high_availability/active-active-diagram.png
new file mode 100644
index 0000000000000000000000000000000000000000..81259e0ae9348a16e66407946719ddf3d75d974b
GIT binary patch
literal 29607
zcmeFZcTg1F*Dl&1AP5L1aug6G3J54jQppI2<eYO(Lk1N@$vH|+l5-juf=C>48VLiE
z!68T((hyGL`~K>yI_IBr>z;F~Zq?UdIo)*c-h1t}S9sR5=ZlJx4Dl_hTL1tM%gMf0
z1pu5%0KnG5#{;jptkF|}{}DLJYP$je;l1mBSU~Dm3h*MOo0OK@J4XvQh_Q<~AZg}k
zV$L9EZ)|C<YHn=i<=kif0svf}%Dt9U^PJg2287dCW-J_A`a7MNCOwh~(=A)U&-oPZ
zam*mEBXE%EoI^hDbor!m?&Q<^U7FHxn$$|=jy+Op{^vNP!4!J~;s)3;+m+6ro8G&M
zx!Qe}zT4UBw$lg+!Fg7xsU!C@!mU%AeN28HIZJCJw})`D*!T5mC0S2N{k>BR{uGuh
z@MMkfBPZ3BMb-8B(VOdDHfFA_<KQT+k8CQ&cI>~OBzp0|!CxPwPq8`w`GgYz5dQN?
zlIcIUjr{j**CP4<n?P#c6IUuFkw4n*R2O+OZM`!#w)IlNT(_EJe7}YZ(aS*3kUdeu
z)zjjaTsKas`-vSLyIC&_lfNkcxfz5^oHQ2S8Q*fmq>6l*+B#S@$Ph~1Znl84k2w=E
zyg++j#QQySEMzSrCaNUaa;sNk*DqiP7&w>T>oaQ{=9J`-Yq{`hj1zWRS-l<g3df@+
zj0vlaHE5X(b;>TAJtW*M!qq)$3QrVW{XNTFlTn-DW2Zw;UX*m$<C^AWfp(T}ur;QL
z#KeD?UeMoZjvP({MnXSnI;z}b0|<;3Dtiuv2&%x>N#baEFV?PbXS~=y4_EY{^Lnve
zcUyac@JR|Ql|zD?R}LGOq=kupCfsRyEc6w(PA-?M&ZH|(6v=cUI(bU+l`aou@$dT5
zR9OkFKg(hfD#wr+KOwvIHvo)@t772i&*bT5NX2xGC5b@n`)0^)s?YJx+dCH`1q77<
z14Hfww}hf63zz<om66j-Gn+2DlMr(dnod_GP8VSv^OpTrs|#1O9{lrTT}Xa-5=<e@
zdk0bfj)!t=AMWwu;jF;x9=}xKTP^{GNXRSCd7P0OpjazM9X<wWPR}$r8ZzB~Z8-9P
z48XqklCV^J_j{2IPw~)e1H*~(;IKjN-cM$RO@yb#Q%Sbz8oQIYzQC+OuE8e<kuzw(
z&Fl=}$K#~wLRg0si|R+WX`UH5Afe`sdv^h&pJ;*hu_;XlqNIf6KmGc4>S-+jJ-_;>
z-1M#Zlr@+2t+g+Bp)1D^V3p;9)F(4OnbbZOQtO7YRXddWhNimisk~e|_?sB^n9~)%
zuyV0&6nU*4N#}<~tRmCj)AUKQi4b86q~@SUL)*QWvt$Hclk*VsS3N7|x7*zg#qPR1
z^Own^`%TVM#SW+X6JfJ!>h`O5^^aR1E#gb`{Ll(^3rmF`HavKxjsjwd4Q=Pp$WU4$
zy_*yebW0AVF%|8+U=1t0P=xSl`NTP2%+T(B8K$PaeV%dFGCf#DoOL3fKNjH)Q<7RS
zb90;6T4-CCYxPU(2LPhug&$%S3-k+*!U)lQU%CIRV(+Drw=|*^H(ir-T97cu{(z`Y
z%yLbH9zuBW7@n%U8xgzElS#rMP;>oGPd_+B?e)ipCK~fv&_mJ6UXlYj$G&o?PI}oH
z{cna5D5^E$JOg-^f&Ba>n-?m{zA-ObvIo6nkIK{Raqhw7(C2t!`WG%^cS;B^&YWy$
zp%(%v`!G!=^o#si{<u!(1vwbxAVsPALN(DAYG|2Cvm5t3Q>gldqXtYkLr%2^2;7o|
z3vOl*0PRmukib>LXXefbj;3g?v~*-x|NO+`h8Nbjyq5Jn>n_8}4NXrVyD?-IJ4@xU
zOD6u0RAuUt5xz++zp@I<xze^1S?Xk)&bQs%Cmp_Krb4R3#+f}mDY!Sf&RCG^B^K+?
zEIH23eZxp|r{2IkP0QYRldm{j?6*GO{oXw8t!<}z)1Q=_tB_uA&<j=M-P7k5`pZn%
zfiFF{`C$H1IGf8?$+M@j_92z^SZd{p{qW1Q<+|DB);RCoBYtEoodSoBCgHrl{^5{c
zjXl};wigrpz=GAC2<RnUHpT)z>9_T?ryg;i{2nFTOFq@qac>?)Xl(ghbj&xmX2piR
zZ60t@q+C6=oyYZ=d!{ckZ@ExoQonmBU^+ARoO3Lqc;~l#!)P6y&gY5Q&JotJ$s)4p
za%gLhXkBVfD;cPkxvFu5b5KyTG&Bn@&>Quf)>bN^6RviF3H1g8LmIC~xgEo_C&KJX
z=<c!9G*d5^w@c{;4L*JR?#;*d)?7Yg7uE5L>*EP!zkk0*{Y0LYo21_KW^K998ov-Q
zpK<fqHoGb)J0=nvmrLi3NmI7c*Hcg-*H0Hx%~+Vp5UOh}wrIv|r+8eCm+tR)r>)w}
zbwg7u&eW58yYf)QD@lbDJAU)Qi}EGMuTRLE>XHe&tRU<GmrXRNTy>%Eo5^9?;uFPP
z6LNZ|$la1r@2xBYJxa~-aPg`47N~%q`D27n&+R{>Uh3Mavcl?T){g6YV2}Y;dxAud
ztAe8Aa<TEpVoV${&O-(6Ek*V4;a@E=>s6wZ(~+AN*S$KShtQG`0)fU8yJT9IT}ZQD
za&g{|0gzYRuP+>g<hWNf50_qWzy703ouCthukHHLM!6~RT}&dsGnPglJp=Sjdh`1_
za{kh!7S!v0;oS<usB|mHvjFNJJT3O0<>xLcrX}VtjTRm^k_pv}ok{C1HV#X==~n;K
zxff#NgOSEUpMA&{eNqpk*O*_ACmNNbwbW5g(3?Fs0Ewo(${l30j5z>&l5e|F3WXR8
z*?V~GQSNbLV`h|ebln=A^EJ@l=j%Q<rY?IcSgbP)4MIcEHB#NUj#rbg>WMVB<HMWF
z4jwUd#Jn~iRe54|?DBg(D8^gD)Jwvy{BfHJEigMD5iQ#;%O-=tE^~!t#|FLy+rr#l
z>kU$lr!@svWxs`4&`;@~J2r^aV*!+LdzExAJdLIh2v<YI1?HIklle^&Iz_ZWlWR`=
z+wPs%oha+M7O$E;He=+EAFr2=`_ATQsm;^FsquiW(OrN;n9cPYxx~SIu!Eajs#0Q7
zt$@ms<UEYb&K>fWl0QSOpjK)qC((6=@Wm3hg{?)ih|w4pI<0PNqt@WuiAgyOnz13}
zUmK=A=(DX@vWGnTfvYY}pI^!W^&@<q*bsM-Rxp2XqPT06#EVLJb!0EFuamJJ(Gs=o
zg}mLiN`<_MmDRIPN22f{i$wf<<otYHJmBPOkfid9y`a<Y<gFw7u)7R?hodqiuh<wF
zCq{E+X7RLz9OkS_H9zpneBk$TY<}{4IZ9km{9;oXg5zU&zC=!Kjt3C6w&H2ctPbe^
zfOlDSwT-}EO6%W423v^=J1B*a*T)$I#+bqGp1rtR!`T%56}?s_&F!#SH~#o{Zk)(u
zlS9yWOmmC?VP#(PqTP4rZ&dH)6jjFLU=xQXK70-rl!&l^m^M?Di(X%}Y?g~~<w0l5
zjxwcNThgKnD@N!I%<?S7!FdaMpjS6LtlfVg?XdpFese8kD&HW1K%z?aPj!90VEin%
zJ|KQ|It+o)2+<|l+Q-+~BFeY%vx0D5Au0?V&*wOQ#CpvKTwUmwbuvfCu4j6!r4%qG
zmMTwCAD{c|!Yo_QS9yeptC(BPR^pUBM0c^vm}DaVbleEU5~7o!%%dKQHTbGO;)q_w
zwq|k3P7zddCXXgR+|hpLyr>n|Oq(j}wC^-WPCMRxA(r{;rOM?ko(&)Qc^{28=k3TH
zKYyX(E;7l!Qb-5q@_jCE{UQsut=!^rN9jzFnLHL1IiC2{i#WNLghlU&?>~Z7|8S>w
zgOtaet_iSx^CCZtxY(K6+)mOVLz~q1xVoS+$4<|A)BE2<=BlCZHuYv&YZ%bJ>m_lz
z@H2O#S1PosN)%`y@fKWDCC3Ok!yuRx2jhNQbmNl!cnh7v4!>$Ys%6wno1frDZ{GS~
zs%B4|{m}yzwu-OC>9r)RA!e=>E&g6-@&<%S46k%%h;lnaNYcm+eR<=|R|V)2gG@&M
z^s{p1rQ&LdpY|!Idf3OWvzWzBsW~rUv#k%Mi$qKrjpeXAG~HDbSe{R+r#9_B=xj0;
zj@&+7{E8Jwhw=%`FRNU^Mh0v7!@q3cT8=rMlEW&0=v(y#>v28OvKDL|`Z`U=0R62m
zVemQLx~>cNGBk1V<=p<PTSw{_y(fYtB9O&xNTG1qtiWWR7{`2l)3)oufRDMM;@gD>
zJoq}{k5M*e;=|sIL3<x!yJS68;ol6H=bq(aO!!m{Alc%yO-v?2=q2ub`YE|MG6M(0
zgj8D0W9-kRO;4;0UL`l$ms;r6J49lhqUSd)q3WVddr-PPv3rkPN-;?7H@DY`+ji!v
z-1??Qzu+Lh+)Ec?%62ai#tYrZOE;j+*@k`RCNTuvK^-AE^4UA*_tCZGw)yH$rhW??
zd+P<RcF)*I^(R;c3Ye|qIY%nf2O3ZlXOnsxvlw;_Yz8NZ??mdU^-=K2#6_;>k?XF?
zj;Nq=d<k^~+oTfD{lC{b5WhvQ?e%OvX5C=lgh=Yxxn@I`MWGk0wc+SqT$|@Jeo9FJ
zGieP-2~=6XQ7Z0>n2RmLAOyO}W#9<GSDGZ{7*Ogt%icyG5u}Nnf}5lXyP%>STvQAA
zW4ttA7n2oJT&@I>qY5)Nd>pj93-Q+?5FYx_Mn^nh<NX4`)HD4B2R$?B)oJ)ieAldd
zeb9z%T?3F1WKO1}q|AN@0KtN>i1sLn!djn2o&gQbANM9?7mhy8MJVgsYBHK8kvw;>
zAH!aMDj=xV^GW>nG*fN+_sS9Omz`t%OLb56gMOpEm+AXoh1_OIz4BSW(COpzKQaw9
z2lb9~Jw*K6cpPC)Q%r8)$#_&}VfyxTcA=Co+l|Y9@|FUgspC}epLEE)_4F-NiQ$FK
zZ!)cXRcq$1Q{!*k#apNEf83WCj(CTQuTs*{Fq#&)v`9;xM$~9{0DW-RfCy2w7)7ng
z((*kTQ~uaNs9CQ;0dJpfO>*u)$3bJ+SZ;&~a%oHUs191PkQ*fiMJWYF;uuDW9%+pq
z_uCFmJ-#s|L=90$<mk|-`K36Y<a#W*r_(`#)FcKDDY3|2z7Bj4y`fJn(Eg|AhY7H|
z`0VzI>t=U_YuO&zH%g)=4kEL;6waORA;@YP5(OQ(KBH|u0Lmm86Qnu#fmtXDC!QWO
z+mTOfOiXgB1~epNgDf0iE{N|N2ZK8jY;*zVd)=l_U&I-esQ*e#$jKx$c&-j6{38$?
zE&Lejnoyub*)7X0fD{5LYz@K4q#KJ9M{E%D#NK8j0X7&3KAW}gJA@F#RBrUfFhv;k
z*8PrUcx+9{{KMsA3A{SCJ}{R16JOIG1)T)BlZ2pnb)CSb^7!f@jcjtjsFKu(@fn|y
zcpd2v|7Tof6$3}eJIM4?=E~TPz7iaYPRZtYdCd+v<T0UNOA`QO1&@x7N<*4UyE|k5
zuvrJ*pM28*%QM!F$I(b{B?m|aLFnR*H9`{l#hFId3XLy-1$<<L?}5k$eixhib>e<M
zEIdT&_&FdELu!Ntp5rp>pGZqff5QhP82`B<buJU&R$Joy4SeYLF4aFzjh~!&n!W&W
z5j<KfGVn1KBR;xB9BnX{;Jb{){q5#u{4StWUniA|Wbr6ztFtt{VEgG~v{50yhfdx2
z-;`TvH&*iynoLt~4?4txy1Ke<+CQXpoARCqYj0|rn&iMR22XY21}D!q>)^1X^WTQw
zV?w8Ig%+SUq3LAXYIW$=nGilXl^V194;+>=iRN9ckFuxY#aP98?wg4#ZhDl>Y?sOy
zl;3ww!vcc$-=}A^Kz0q5$zPWK={4H9YvOk_ZK)=`Z%PG_lIj={SB<X*Q(~MtwunMs
z%N1&iC_jIs(l;BfSx`KEYn<lPOT(~&%nH&gIGk3NXfa9#kwRJk63$=i#;H*#)Y{SZ
z>;zt@i{cFc`>tvr3uB*N975x#`n0gVLG+YHQcK}^maIX^VbzYl!V_0(>!a|i54GQ`
zNup%KST35_3esRIzd$M6e_f;o)vG|XSqHqhh7ax#J+bz3*NC((#s<D$x2s=hvlW}s
z^y|X+;aGpM2ef4bzvgT-_{kSzA{YD$0AL&^^yfaq0wlQciV3spsdUB+Aw&)ihH+%C
zxZ|gJEfQNF?It)lM>u~P(6G%7wqi3{*B|quhL7+j%~8B|_Z!X`nmw#*Tumv{P<pT{
zTD@b#y6m$lsP2{)UT&DE{^n%<aYea@`yIO}dzBs=P@9|WzjaOK5AAk8<FKV%haLCt
zTFyb;ejSwz&hKImY228zZRpjmFi;$*k9d7F*tu?UG#iOXrJ*nPS)kOsimB?7KRXMh
zyFt=JR&${LWVQ_X!)@-UZhCF*h~Qc`0Y(biyze%FZ_(U`7Y>>=XN^nPj0AVK+y?D%
zb@?qsYMmFqs}oZ#4g5ru|L%hMWa8XOVg_vXW)$OA`_9Ux=9!`ns7#o1X5G{q`bex-
z)(HucRuQu%q3+FrMR%w1G?Vhl93iuYUnZtw@t!!exeaj3{631czGGl+C65r=P4JO|
z^KNgWtas6m{f2g-&nH&}*I~+kySC9Bjm=45QD9nN^^K7$MX#Zr(EHAA$UBmr(J>8f
z4&k;S9rJWOD<*h`y(*nh^y$~u9>;07>@M3uY|b{{{S5wj4>cVe!?*rU0_*ngCUvLW
z(##u=E10(v3oso>N~cNPhFSUugf8xfGf(LS&4Z)&K4lK|y136*lh>E}HTRG5Yn`Y@
z6W^5^<b})Ra+N`U>3Ek}(Q<m~8|iCnws;F~i;8b=J03&7Oh`^YrN396gu%J)cwj4G
z5utIP9faiYlzb{erQaYLjtj+k{%(eLNZ$^TqknR^<SW3J`0kCah1|CZ_N~31PsP?x
zo=&dSX~1WlWyCQV4;<6XsmW$>$XFb8*B|PW*v{B=6SvRXyx?shw(eGoHCOURm3yP~
z1!f`q@uy4B*X35}W!|&?gR{rnPHu2ljL2rAl|O7)%HP90(^|D&Nij8f$9J9=irR@d
zYVtNqBZuw8In+Nj?O1L7N7(os8w_MRJQGN%R#d@c<L9UpNEb;(t$LF9no3Dk>~CK3
z^KFAPMd%A+b`4b=Jb&4HLR0Eo7Oka?zw88rhY~MasZw}sdi+1vo~I6+oM=U0p5L^L
z-Ll<2dQMxEHuhv2gtNf|dPkM8^yd^Om#miiWb;UQJ%#5SaRIGK0~-Nxfns%4^tsV*
za)XleZ+%3F&6AH^Jw<8TSa6J_PQ@VVG6UT$dC>gX!aE7Bf#iWn&RM#Y#*G~RqsS=~
z^uMZQbSb;)YoCKQ0joyeiG?x57X8$A-@0gmqwIUKM_DBEPb(a)yR|EG@<pu7iq*5#
zSs3?uFx(3kB7{L}GCWq@KK3afHDJp-?1i*{J3L0&3n<*cMpR3`{L&4~ADwo|BDhl4
z7bPbBg-T@MU;S+mq1~*Ey|oRZ9JJ*%JCh1EdofG%@Aw9F5AvoXTS`66qfO0J1IneF
zf3Dii+l6S3IuBRt4Kr;0D-c29tkuLoiSGmioc)hnG+z#Pl4<Z_NiX!AjFJu}Fv%U)
zd*|I2UX6-+TJo_|1};cRa7s7d#LM?78I|*#GNl6H{(N&gfFOcyROC*E)g6OV)7&>w
z{yPP;$j)YV>7MWMf99X|n2-Fcnx#P#*l=PuTFb6F!BC=4uq=pgoCQ~e2G8Y*OgFU~
zQjDhpahPN9AtfV<Fb^W8H{y~o;DNsiP3ekp@Mj@-X*L4E)Yt|Km<AZ|iFC4Quemi>
z{dfp*i9c&BcHbbuHXQZiGhY|aMLEBpZTZAYqT9yuGqNS&p*Sls4zkKk5@pnHcQY^D
z#WcK$8n4t7Zr{C)h{X$0t?x^2wmEybzzP6vd3xONh1#*PG1ao+RjawWnM6}FmEVsK
z`ECFsMW9J&+Ay%$PYvSYj&~`u)6j!c5tO<OFtu@H2jRKw?dlW^NOS*22K)1zmIZm(
z87e{~9yi;K$4|kT&d#kbV0Sc9lAT-fxMy(aBgm|0(zjnKUQkqIkh%L4!1|#((nfdr
z9h(f7t*sjyia}&#vzQg*GfF6=PumRiRw$64sR?r`O_tCH1XOHP7pAuKlm*PE1ypqj
z-n_P2pV^b({Ab5?X7#$`@P&=0{Ct+H07goFm;NE1VIF2ZkLZpF4$T1tcjV<pePIkV
zLzt}%vyW)wRn)(dDVjm=2jBr&tbbjLqVpB-`bu_qbGehyi$GvNgS^w5Ir-V*;DQ3{
zz!2HHFsdg%>Z12_UyE+}KQaz-3#$>&;1$uOEc1pdOqeSoeAE!D5am+q3z|t`w*v&s
z-s#G!tWkJ-l3|mp_N=FDbm@)mQq#7!wTmx}fWBMvc(fh2s*I}vvI{0N1rb(F^#0%;
zd~F<@BtQEWEjzeWZ(Lk4cJvAmH-sNI*iB+)*AjUh3kR{vJ_PqNo26CE*r)z>N~uD}
zFN)dv@><nnm#SB6?Obi!>c`Upfojr%LPABsG}c0G*2L6S{pp6H@P;PxL;59t3rm!6
zn{F0PV3dj}5LgRFf+Cjm2Ivg$Z8Us*{aeZrvnQV}<7eLvzV(KgQQ-CEr%VS#Y7ZA{
zd4f6}S7o)9MTz-OgatYvKGhFKBcEb=G+Rz)K=o|s=en|M5J}gmV~<p>=&`f@jjZ+V
zBJBG?w%Y2G+^!<s10&o8cbUfq!0yq36X#&peFkb>$_8r2kK5XlUpo&PqtZJSg;J%=
zq0}5ou7)Rlnq$KQM)+~G*r+JyT6dx_dHTx86ICLs+kk{){v|byy;NSAAGcRU^ArPz
zM@FtSq1nQ&!!0$w*~Pb}__)n2-UH`j@}*!-%<8_Z#%=Z#Z^DdqRbh5UURQ1VCmv>A
zqtoW8!)qpV#e4O!Gk4SUCLR*~Y0Zb`Neo-xJa`h075nQqcK0v&kB)5y_5-ppm#;NY
zE2g)AMe6)pDx^DUlBYeZ<YVsdSWjiT9MkJ0)Ukk(cMph(p{I9?9O`#hwk~(z@!lyj
zOMS$9l{s+jiG?J$xk9!S!|#!)$KpMu)_x(2Pc@*NhOyfoNGyH*{^e2+Q@ie94f2_R
z^$MA_xJqYs)uR$;^M+ylF$6VIfeDrFP<{0X=2fl33NSd;w!dWDNM}P?V1}f}=fzw0
zhx>BG8AJhKgA&rv5oyhl`dnzlCr#tkcA|QM3X_E*E4ggn)!k8^mK?5xJWiLJ?V*09
z`PS+8wF^s?UnX^N!;^wqDt4l@S-9XjNUXPT)v@CtTS`56O+xZ^$|xVV^c2%o7}ut)
zzmV#*hc%b`cgH@9fb!|%(&S_S?o*z)DvSjzGPU<l=jTuJ)s56Z%Ts!PYJy??E|t*R
zFJeWD5sm^5rTH(OQjS|o!kMx9Uar(Nwkxjf?H2!39XL`#`K-e0`H}HFgRLV@cIrt@
zv03Fqva*)-&Fg)+IFJbH_17;MAgp~&y?no+;f+<TsqUSno8CD{@_Zuq3J&u`6b^tB
z{<o-kLAo8g28E-;J!Im@p0oHpoi|muTm17F9(6Zsz`YVy0)@TljCbfKe>KH|^;6wG
zUF{9kQX|%^J7=Xfa;;lS=cuW=;j45b^Xg=x?%VuF@JJ?ex9sVhsgU!QT#Qlof4#{o
z*2!3NV~OPJHgW&_y_wjerG#PP=T46++`Vs%DFCkOs5~<AhpTVJ>^oQ(vr(aJ%ZBRX
zZaouZx?>L&=9lp#kDH(N*C$keld+d%ncapkxs{cjlO3m&-TNos0e}^`mn7D-{9LBg
z=;kN$v^!)uixKtT<e^_<8~nb=8JRC|ypM{1^&#(`SA0buR9~Ukx`x(7F6lczt=-3X
zE-E8AiiYK#K>gVLA)g+lT8t6hb>~ByNx{l6gK~MZ221q5?1t*D1%qdu>65*uhmqms
zv$J+etG0EQsd!=>Wk+Eil#03PnypHW(Dcy}`<}q#=hwYs`&&p}>8?BD)n)t<yn%ZB
zD)xb&a)WV~nd0-cw85<%|BVZ7RMIawohvmF&Q5E;t5Oe+twvutSrxLHj1YG!{x-YZ
z@Fe%_K8)U<HODrL7s4l%GZ$I43{_4XIMUJ>1vtjt!E8Z_{3RG5th|AKlT%S2O?*05
zZK0m2Fdp0I&eWU*Nlw$z(GlJr9(lM?^qWE{OeeAg+9IcKk;|bofLS?J5T=Vu3y`K?
z7lx&!$4lLOmpR#2*C?;s%9bL7r`h%kif01|RlwcdcXgg})oMlBW((x*x}pL+Z%SQ7
zei5#`_~0-s0DHICdBIuX?o`+(#nn9VipzWb$JZ$W0H2iWx~?A0LEu#jPbIWwz8}*r
z`I3}CT8Wi1MD8Pg${g}ffr-xafMALqA>HFwle(W?7~1oGiVb3v8T3eIdZ!O>88L?q
zY`Rzq{6yvXzI8}>fPlWy?MNSS8BX4wdgnR_W%tHx)$ZiRY9?{Fh>V)0DWRZq{uyKT
zzw_!+ZJh<oQ-i)fF9qi#D`s%;jSZOfW<_W!O%6?mXu=8&d@lA6pWEQIlYYJO(0e-L
zx`1DYorSP^kNY>`3e39mH%$gL0SwmuUIOr`{-(g-$p`7c|A)7M01Eh=L?h@|W)A}b
zz;}bM11JP*|C?U`%H_Wa7k@SE{{sdJb>TJb2LNQt4JtCLN!GUynd{zT9lcK<N|eus
ze^k-Z`A6-eqd}$t#di)OvFD!_Mofi0|5a3m=hj~4-QC>-^Dv*m3{jtNF+_7PAH-ZU
zBr0@cftS{ogY!QvNWcul?P^yaEUMRoxCsIuca;3bXlnF7)SAF}{EBMGuXZecKE9Vy
z3}pYVEP{CXeCmmp{?alsgO?YWBK#lp^lH~|6^Kc_ueFQYNs+k!@2&WF%f^hi|8sH+
zJPG}mwSyD9S6PWl&iZGh5>^x>gsslSe;WaUWV<`P|NMHdZD=^`r+>V=AauNgv_1Fz
z^Q%K`7v_iY$PMT7NOB8MTwWVYi;y8eJ$m%$ZkzHHE9yb@P)-!}e-{1+mc@ZG-G+g+
zH4890VA$v+5r2AJN1+#EH6FRA{KB~PPcTodZv~F*H3Hd5Dld!gez-AOFF6%KEkuP%
z_%#p%;+?bH;b$kyQG?0>XXCUT^W<$OUD7FG|BfT@>;Kgn&Ha7PhyNHK2G+Y~vI=R&
zZYO_?50=7sEUG!dS`ca}=>b7k&SHYHjx1P&^52ike7ZfuHmuOgTvoL716KtsSwN`D
zI`X8{=UiC6*>uBr?1j1|CH}FDvReu7>IQS{$5BazGCyk;;ifN2Jr;AQE!nwAW2fB9
zYHxMxz}5_+2rK8bbjxI$LMe=#|N1fjctUy&iZeRWNdIeijTjpDDyttNX>_gKH9I_(
zed?fb#?8$%f<B^sNW2;f2<K}z#=oEk11n$j@e`7z41`M!6^Q}}B88>8Z`!(Rw#m@@
zxgpX4T7nchpRKBb-2_Bx**k2g#j-=6OTMjf4R7s=pVXEZ+rKQYFT4h7!cz9c<Br;q
zAuKn_;Q!mea+!{{=;g_BM30r{qYjOdcKeZk9ZBGOCaf4Dt=6V#q#rIbr?AV4EE9!G
z8Fa>d?*Pugm`JS$Q%~w-+iYcvBW%l4PYE)Vlhw}0O)f<w<mw~7OUnG~a_}OlN#McH
zkpC+V3}HAH3IQp2;6d@);RWY?`hQmkg%%&3#%S~K`+pY*(X-9(LVVvZa6|uz2|+aX
zDJ4lsn)A0O04ACJpOx~_!PoceUgfR-+;aazcnFImS!l?A7Vy;6)VClBUOEllI||oa
zIxNtmKGigq&=RX0kNdl-sx61<Y?z<iHIVy^p0><<OW7B-`RiYCM9*o9z^YnX9UK-~
z-`Hod^|<}nc!_`gYKfQms+-k*Ck2$z8XOXYE<^$Ez{f_h|5EY-?;n1+;uF9+y!|)4
z0B`?)V>JJ<hJo`%2vp%#r<aK6bgsI;QDF_(0lqpCfI{sbtLOc?vqVU7_d7=}%KH_9
z7-*Ns!Mz5<M?}W<`@<t5QeZyEsiHndE70n?Isw<+dC{8I)}5(09Gw4k>p#4vL`@ie
zMNsLhsr(Ex9)K;>rK!cb&^BfrM9t;4@8A17Ca}~e<%#}7f9ZU=dNZ1yIHthFpm?^(
zqA)l=KYx-g-gHWAVAi@zNoJbA>lNWOWijjKHRH#>6k=u;)PHk?kT6D0_FL^luEyKD
zdS$<vZhfvWz4Z$TSx8v>b+rl_Z@0JrolAO=3;JO(%vR=GU9brtu#}67YfvhaBMDBv
z^-8KR_$#8#ik@uxUYAs$Kzm|Rl3}as`j9v@;Of%Qo*$*)k?M0WD6|_M6?N6Ix7-sD
zHgn^;nH9yC90U~wZ-%hQLZbj%fQyHRzKVo=`*3W-YTqD>nwlE3yU=!J2s>R%TbQY_
z9A5AO0s1R}y1)2YZzq`g$~WmH(nG>y%roN_%v;zA>hpZE!;{qO4m5M&l?Ow~+oXz5
zyC*|+Gl{kw=ry)nBBe8u+y||m=Y=hr=!NkHMetVQ4eaml6CN#c)l3!_=VD0+2?}=a
zBAbsxc3TdHcHiZK9bIhpIW9k)9`>I~Ua<rya8_NK^2Dc@hV=z>-^aV1x*AX55~rRY
z!zpx<w$wrgn&Webst2^WIzNaF{jTPfuzD{b@w5eMQuu1;x%GPiK|u?U{P2!PS;rKH
z*=bg&{Q<5Be1ze7mtitUDRAm>z2*{looyBt(E!=5jBlCR$2#U%d}BMNlusb66MNOn
zTE#Z-GC9Atfp_)8r;I;q<>*Z0P-RfRE9>2hch$E&hK(58sW{0a$PJ#4-71L#6iUm=
zE)+0-?Ja3m;~)9Pb^IzI=;4^R{C8G@lstGwkWBfinv`MMK_`d0z^p!QNsJfjGW_T`
z)#Ht#jVd;8gVOhsj@N+#3})>fm_NRAws(!(XX5ps_gXKGW*uJ~&$%w-C4$cP``)jP
zk3awP#~?Die?R6I8)`cQK7eT?E92-_asvXP$jRbJ`v;cne2xtevUs#YqldZ<B&DpX
zUSnGSV+c4KJxv87Z=3IU*!cNfII6-x=^HnB9aua%03>)gxws;F%>v@FCRi9^r{0Z9
zPU}B&FY2qcop;bxunzRlfip`^)op0$QV_kuxDU=cwq4Bi_Vyx#goLj6F{su?FECbc
z{E4Uld2UxrRi-@-hb5)LN0V`7YbnXePar#Un^vb|w@{$^U+|ngCrd<jch;Zt%%1tn
zDZ5o|i8b353fXCk|62ZQUW`ZgN|+mC$+Yj@Pv0|0d?Np$C|B-d5odQv^=^`eUYM|l
zhN%i<Th;TEsNl0t?CsviNXXU9$D1UVeQRrL2cUZ2BUm_!z#Q)eV9FZip(0{pmxUf@
zyKVak73bDbVgAKPqOpj|aX{hc*@;g<kE!v+pAd0h2YdVNIy4&HW{hYPUz}zBb#|2I
z*m`PYXSam}3x8gC**5_|$_)%s6xXl<4Rm#MQpdSJJfMw7Mi{H}>+0WFtqT?miy5(=
zvWxnXAk}1c!D^RMo>InJk6($`tK!C}XJ8;^QW%z-n;QUaZN1Daz^|aI-kpW)&cpV%
zXB)0o!1`~~<-E@>x_TDb=fNKy9{%)YsnWEtS1SV3nRtvLp?mQx;bF@@T%@(W{^$de
zHQ;1Q*RgEI&m}R69{||yQqIbEH`;vKs{n8ul<0Xphvi6F^iT6})gGVW!49(CjrYi}
zc%?WBS~Hr>Z(ttWXd;<e=*n^YwZC7DL%qJ`_H9-}-UK9Q&$R_y^?_BwtL>ZOCmn4U
zlZN2$Zihun{9z`IZh53eWmT2)Hw5ODf0CaGs;0!eyrP1>e!OA9AG7T!3hJ!kvMDhD
zguZ-P+}JUf>ACbJaghu-OmmwBE!$YAO}CiF)^0?{I9#`ZM2}DRW3htls*a_c0tZ2A
z<Zq1a%!8_>!DgHKU5B57fnyp*W9F524=!<!#*7}j5pr6un$ox0Kjqx4Pl#3iP$~l1
zIWMC>|8?^!GkoFx_al!Qdk-IJZ<zS&#04t(uu`D~--Dy(-Bt`Uy**euy{{~OQF~fv
zh!HrbtMDu1?Hk^w0f+$dyP|fu`A7og<TCCLcbVmE*$Il6^->QON=?<8*3IY$@>VWn
z;!5>;T7|QBQ+Q_~^6||~LsdR_@Xt8BQhCOG4LQRKg!!`#j+W4JkbD*JjF)#$kM0I+
zcKew%{pGXG^J@F_`tLI!cQ>X5PsXuc{0C3KsY2YU^D|*#Z_D8fQA6`A2q2O8KVzPh
zd2cHa)K`Zz!fxLRQ5T2f%G6OHGav{SczY;7<Wjp~T`ZCb5Y_A@(}Kg{`@?2-S`W+O
z^H?+zcjlT7e$33w(0{7j*02A5W>Il0(_kLSWNK4ZQE_GH+wwQ0XZ!RW_xeem<n)Ee
zomh9Hhdc8yj1Z`Wu!XJTqxCx@t1xje{^m2>1y@*P>%ox7RdUp`Yc~UYtoY1TIn<EG
z7}Z>7XJ;pifCW&!#9g^F;=X9oObPn9yjjCF4u5dPi2q``ef>oHFAlZ9x|WvnYB{H#
z))t+|NKn&8FuQG6$NUCcy4DLL))JPe6`R|b<x}Q^wL4IIJG<~U@SSbLJv7%11a=4-
zRBn4c-weN-3~H(PcmiBv1zZ==B9!MfrHPMkbn@`<6naMyZj9Xyzuc-BzSI^!?g2vs
zK5>Sv%M)VEA6?&xQIc!g__WP~{&Zg6-jz=jmJ0b}=Ec|>naX0PuRoPqowqnHh#mYi
zje7eS2+USZ{wrG<#Sc@ON_5NIUqH(uo^9SY1{rT<v=4jK<Z38>EMtJgH<vhuEchK)
z?7fw#u=YfMVr=>TE6((UShN7^@Fys}fy}GZ%ryGTKOt)};%9G7V>4Hudl7>S$G3T8
zT1A&t9`C<|>nG%+(eB!73-#g_&jTCXn0y}(QZr{MjDH`P>hZalqkmYTq2&>9E_Adw
zeA1ZPGt}%l2&RFrsM8#b<WL`94BeCURUE%XxKRbJ#@RWjyDj2i|7*(;m{O?9frC-W
z<E<3FrMM4H%E!`O>11!3(ps)mkc4pgstp`O*^;23pwj+Z8J<ZLx>H)$04&ccKnHtI
ziTxyPUuN|%*S0w?OOGQ~1rTMVKwu7sY9Ly5Mrg(TZ4+n`IG3e74kI9`+tielr<rFk
zab_p@^7o0Is8^uSc|bO~h|@0#ZlNV0aAdB@l{L-_G+G~C;{4S=xBb?ZZhaj?!-cff
zXIgyG&3(=^rF(mOS0~^s`j6~h#2~sZLHmxsY?Pe@hFZinj6LFdM=h{`D}VOu(3heB
z75KrfXHjV(S*AgNRud)L9R^E2B9^-$EHd1sas&=e9jrVk|8c$<`fBLGnCLwq)Xv34
zwbjb*4B7(vLEs5dDBovHp9A-YYB~{#8=Tg`ZY-T$@<J~uC5}~QwrvG|?QLvqd|d8{
zx@ySYA|aSt$*iK;DL&w&hXnN^-`XV8i1|K4XLT-M=8vgNVK2}V?;_-SJ+<h4|GYol
ziwc-KfvK^Je!T*-+O>=01;_LA0si4+P%*@O-((~qR>=;d#4kOIT~6R=1S?1;f}{If
z_jSnNp@|pQ#KuhDeYxS^SQ5K0Kr;~0d|S}xT6cJb4<AI2H!2i_X~;U)QZJs??%E>0
z+xhyQi)3%deTCkkTVB3>pTsmAi%pmyC5m2r9)FwmR68RM0g8-lS*>FVcjWBMy8zw-
zMwKx%q3l>w+HpA#5(zh!>Xmg3FEl=5K4Qu7+O;0$^Q3?oT<ys037ALpQFx_r$92qM
z5q&f~O)#`p1oM}g92_kfsFy1p690gqta7U>6G!Xn;r3A%uGaGM^3{{VoYs-SwABx4
z{VnzN-K_Utz1k^7*nEw9crv#x))RTX^Jyd|$BpsDm^w>%q{Te3xtZCDf|uO}7*TM~
zgs34em+A+_j*;L5WDZ*gxFP+jH^}#a>ZErNr)%SY#U>w!)@UH?Wqfj~8ac~RR@s{A
z$tu%*T0QH%-L#$|l45#V4rvAmkkwmMwM|W@Qerz2RdO7H(EHa4)TI^=prpaap}13^
zqUn0sm)_p+A5&U*)9iQGK=kVTz>5SdrO)CvIs|D~!7-2NAz8lyMx_5mNx&AeK40y=
z!_}?6t=Qeub7h*bnm`IyV%?5vvn^Df9TW#$LU#I^52=B<b_h)}pc-><0xsR6>x3)I
zC^VMTY-~mjJFXP(Ha#uvMSxG$VoxNkNLx#b@93qcJS(Ndg`D5%jj}X2=)w-WBxmW%
zsTV=$0|BpwYp*TeCc4=KYpLzN9*GK#6hURVWmWW-FJHQm_|3$MwW}lO7QuR*GP-g#
zc9P~dHc8*ZgxzbyNsmLKNl_rmqs{qSUu>uSPc-Ru3?|`xe~II_X-}lN;Jg|c5`Q%<
zK(~NH+tIR4N7RIMdWv(0&hu>|3!L-plJxn!^Bsvm3b1wtuI9vt#C*&*QrjlngTtdB
z$R$fRw?i1GkfM%4N|^{rYq7HEZbpe3JK`NT>htui_SS6Wi(awg)E7z4VWk5{Avhnv
z=#7@g6pXp>=-t5vL0*z(3^u1VdfeS8wyRO$T8|)P)Op5nIGQ}On<^{j1X-=d>!%Rt
zw&s?bD3#SFpP8_AeRt29^guB)g^2As%&PuFDGFS!4ay*48?lF}xqTmth^)KwT2Od~
zG1#RX9%t#CWD|pp3NG1C1qF}V-1ZIZ)!oO^GL-++J8m2nbLWl^ishk?MLZ}M5NCFZ
zwDkl1ZUJuhj3UCr&l&06jXe82wX~7fB?~|z;Qpg_VUMk!tE;Pa4o?wp0tLjx{CPG{
zG-rh6cW6Avwpx6Q+C(eHcdecykwoUr+^p8w39FYB)YPa(>TH-5((IhWs8P<d4zz2o
zm?L}k>y(Z{Wf^ytZd2(vqMRc?%sJ_3Yx*FdK21hfM}HuvRCGU2Np;?Fc0ZuUE~3pn
zmmKp7RhO%wWol~5;X8oU``io+G4<=#uHl&xaVctw6_Z4Aks=OPH?{8-0b@3F#1-Yq
z9Rw9iz6$k{4fzRh?J_5jtXFfx*X__<Y>fg3IrlBlUQrr)S3XP$Yy<dMsKQlQJ3CWo
zaU8f_<UY1!X<}j`AbBjgIdtTURgCdMCMM}_MTL0;d>u9k*!XE;;pZnh=tDQ+NBVK;
z42_B)I2CsK1teUzMU?e$KJ{^2`}c_E`1tTD5U$9$DxZ8Iyf)czOAWCwX5a4@@VT~Z
z30zTaoia4-k>cJ*EkpVQVDu8$!EexR54Ads^hL^#-?B9^S;~O1oqZInNoP0mgA1nb
zPF^<p96OAKO+;K9Z8Cc2pq-+^3>!tO?JjadMfHHVxVSZx;g$E6k9@xBvfdatk058>
zuBC0-W%<Ry0Dlt?YOjahQPFy8)DGm^0TQ2Y9Sa<S=BRu&L{Vp+nHD0aV>s<)Sc7Wq
zU`$xJbVB0CQP9(0AtuBEEzDkUHW`CC1K3ZM3IF?++lSVOgt#Y9z?A6ZFvT+Cw1<Gq
zYgCE;{<jSACw+KB!)5_i`mEEAd`FXxfA*yD|G{>^F74x9&s^Z22Yl^gi7M;WS{lvH
zNzA{lw`S#(zfX{t>SsCd*9o*qw11XAdw<}P^m>&<M+st&;Fsj5Q88*HGq;$i93S>P
z1)CWm3EmcW-uhW}07iXx$zT(ME;A9$wT=s|;<8Tb9U<%q{koGj>N?C9VOSMQHPu|O
zd3s?j|8a@-)*~_q-D|eYJ0dVf$WV(PMzHRE4$U}#H`3jW2hJshr&Qa6cZjm|JZj?_
zXVs(Kg{wu)*8PM9#pVI|e3wzNb0k(dqOD|h<lurab(^HQV&^))1#^W6QV?>6A1$VR
z(%_)*{R=i(12@(>KHglLD$`ZN0gQe<@W#>Igw}(`aO~2vODRNHKeF~DM*K2n-Jkb5
z)Gma_1K)JY`lCKh-7Oja!#;lD4Dz{YhvhuYGq2d`t%F|koHT9R1P-MNA$qs~!)qzW
z_bl08++0Php;o8&z=`}`a^vQ0n(d?Vk2ikaEm{7<4!_8T_|1uZ7HIJX;SuXiaCv{4
zUt23U1p|_624FCsFcI};@S}y@l?#VCmMTz$$JO{1G{ixdPy!z#$m3bVUBQ-qn*e-7
z#E94>%i;qt04CcMa5`8U)Q5qJLE*OCS)F}1)#_M)GU#Zsb~h8$3_CCvxH`Y)0IxwB
zK~t$&Jo%f@qNHT>;Jtc!kfKXN2Z|At9gkQYW@Uk1-2YtYrP$7OMQi2hJDLi^47zMG
zV8~D6+Xf##z*aqKJfmeTU|#5Y)Kj>1m?|gOSUqsie61gHbc+cf7@BS{;u1VUrO^K;
zHU2T`Pci(0@%_y1%%<$db$2CrM$AdUxTrhCIX8+{!~-ezHO|`0>-4jquOw@xo2!q)
z`gRI9x8*uz2DRcD4dX&*YEoB2N|pz=%JHlNKy?dJgx;EO^=rOkf(59U1>dd&hf|@+
zo)9n&nw{5X(60#Lv9Vtp@%l${HIrTCnv#h)n(O%rrb?J)*=7~aj~C8)njO?&PsB&B
zd!l%Y+DN@*GIJ)xu<G5s=@jRT`$eg0kuNU_*EX7Y*_4)7S90pHh-k{5P2OxqkktAC
zk^h$9SHwPjpI3mapML$Ui(t@lG;bV0l$(=*`I~JCQ#9P^O|7ku)zBoGxD8M|Vv@3T
z&@0n0Y#?dd7Im*tEjmy5I)zriIF0!H&YW?F#U32VA%qD&D9vo<-zGoM7tybZ!x42{
z)iZd!E>%O@;@4Atu=;h11$CNu$=)#s_o{nz10c#w22gbf9_7qji)d+>f#dms-^NIG
z<otqtQip2Mk0jfTmGg$>z-0v;;6f!CP=M}FhXhy`!roY%#>waJt4gC{fel1z3+Hy@
zmC_XQmTtThxX;7lIQi{c(DgCxw)b-+#TQLKGq}s0USr;rJPI`s)HSv0s#8L3dKv(M
zFAdxK7O1c}-SX1_jxg?zI9eNj&OtysYZp(feT+=A%{=v{=3Ald!-Dk7o;=35Po`IO
z>8%zX^^G=Cm(3>^ExKm7jp9nFE6W~z>9_MSOAk_FKPgg0rccP}<g%QSJVETi0w0k-
zcJY;u##|S)9vKRMts{peg}@%-S4NL6e44;YJa6+~AEK?Pub)Dn5mb&Wo<;$L5(~s;
zf%(~!)-?j%>J5T!q5Q?~8vHE^6{Lu3p4JMRS5xMqFdop+mAXz3Z?TVryiNGcipjxW
zc~n*o{@@9`$39)F4AH{T>fP9VRSekr`N2lbolH%c;?VbuvO5nz03PIF`jbNJFAf`4
zcgxZ*ZEl+nvFF)HeW+ikpM7ZR+Gmv}o_J-rby(p&Ir*gX!uf}tyJq}m-li{2xkbjX
z*F9z<3~kC*eebTrizk~pr)2uXF^vC93C^jftd)K|sR%C%vf|6S4l-RxjRMunG%U9}
z7x+(u)Uzi}<Ag8Psd5@sP?_Kg2yQ<L5w~hN_x)ysS!P)dcJlDa*Ub&m)>I_HYm(u;
z&cDtmSzG#lw)$bHZcr$M;T+QF8^5RPtA;axK-3*Yi996saI(oK4Y{L_dK3e*-X}6g
zdoSCXscjnCT_0h{G_pm^>R**<y0>4tx(U55{I}TWikjkjSKGXS9oP%~+Y&F;OGa>2
zx?>oSsP1W&2;md^vN-?kDA%LKsKGzMn$CH*FSSrOvUzIk$Sg9K^G*R_8_>8bO95;&
zn|y3oqSuy!7l8%tLax*Cn;qd|9E#Hs0^Nqo%?{0?OMQb$C>AMTJ^cvDkCla=CskAn
zHEH1hfK-%i7%Oeo#k1z@qGeSX7}bXUO{*)x$@z%}ds=;qEQs0W-!z%(Q3wgWAW!Rw
zN%67ouFnELxa;eQvM5^3^e!LW)J=L{BmeVddLe(F1bLG6Hm`#Mud9n=YH@MUf3JaA
zE{S2>`YO7I&S&5SSQ9GhU*tg;W`0AUxDc$veYV=196Co}+V#_SzmHY4<R&nkeJzx}
z!)Dy6s{wBO;>e-5$cZ~oWGPIE+8J{H{taD*t5K(ukf?cc8rPmS9$Ku%zPr*QzEW<z
zkOQ4POLSwY#eC$Aj4tBw+f-N^m7(W46!ZsOh=rHe^KtXY@NlO;0EO(>@6cu<Y#>@s
zyqUCB30+uR(sENxTuK1^5T<scni(=hP0w@W$0>H)G+YJZ=XVUSfM_M~W<Dn$EqC`I
zn}YH{NibWNW&zDCfIB%1py*XDBqt}OMEvB{8_-4B=m(_C)?Ly`FTuZOC7+QQZKk6y
zgY-wHG7p!ygS;(aHEIxD%O*lb(hd6B(YG~!GwF5-u)N^EJd~xaSPj-SLJKNxfGI;l
z5~v|O#2=f4T;Kiv7J^yMLDI8cpB~T_F%@IsC(R`|fk9>j;WL1OIp8!Yz*_8dB~CFB
z4T2~sJ@f%z<#B=g{Z?&+Dn)9Sp?;q2<v&;7Pra!)?g8C?v)UE+!nKk#`eBX)bWE>-
zDYi%z2QPF^`aB;Nj?Md@Bf^{HP4M{#BBI0PRwu2C+!5{ICJI6T?@MiR&g6Xn7{t9p
zq0XKF+3F;;;Ao`uP`$}xm40X&Fjq;!I;i2qzm<1e$tE43ASGJ6MxyR3JmJcCT6rq!
z@#Pfe|4DQHGP-@uT*U9m56sK@3-j-wdV<Fp$2V@D1bOogu@{z~YFHBO4qSC^f~myj
z)MKvYPgU0!2z71(c&8+^*IQ@-;D+OiT5LH~u1y_#cHfhTFO$a(AGwZth++JT5BOi0
znvB|$vXN4fC_wK!I5?<M0w2%^nO7~m=8J@eCofI0fh^hXSDf*9&rK(7&`C#oMjgi;
zgZ^{&PgXCZ8P;)|#kpsC93S`w_=YqSV|P7VoCFiMK@d7FA_6*~kll>GfIj>T+&ZZo
zj1Anfe6jLfuJT=(1_&n6@mO87nKtY-Nj@&c5%CC+g*Q5qy9Jz=BfAg2k_9e--z^XY
ze#e00GWH$d<u%C7kc10Juyw!U$-;RtY2!Y1c_N;?<n}n8`(qpVn5X9BqaLqj@$#Sa
zJgNU&<>8-yaOSQ0^QRHD>mz*v`WK$<9e50~cZKh~0GWq#Ck*#hKV}5m)OjPt#Ge0h
zzkH9(VEWjC<=_Nq79X1K(Y)y!&|=ZBPE&||IEzLhsPFB&gUkf>YpGI5+?dRf`<O{7
zLcFB8p}LkLNmB6;v;5W1vtMa}wtYz<CG%km_NT3=`3*J*%XO@bH`1FmpHQSz*6Kh%
zl>A3GM$XASTeYY~b>)WKuA1kN5)ZC{8bSHc^o4V9l=!|H2(hvvz>QmPDY2kF$K1=t
z?pbQ=5kv<^Z7#)+0@lwHdn#bywn7>iJmFJJ`#Qx9kIPx-xfxgbo;!gV)btY{Y#9#a
z+a;$|a6nCJG@)0*qcOXqhvf+p9Y93OQt`S#Xe1F%a)#$AIaM*+6JSwjxak@LI=MDS
zINI^kUf}+RQl_K5(sYCRcWtRzzBcuEY2uD>_w*={Gh=)EGUuBwf@HvbN4iraHVS6f
zttE$(o4<Pc#3o1@)Rl#qkm_`AcaEeq51nfB6I~irlH(rtng>Sdb(rONKeu=D#)&~1
zN#@n&jRP4H^nON#tolL%;P#w<Y7AfrGQ3~bU-1U$LT_Z60>Bt0&yw`1q-vc`dL2od
zb)n@}tx&Fd?}JT@$C)Ae_7^LdIMsV_LoxYQr(C*0?=Sjir!tB=p`KEYV6PsMViPzm
zL_63tI4%?js>GX8Nk|9KpU~U@qKA5)c%+Xw*Zf#eJW0GlD$(E7SgjXV`W?l3uXQyv
z-GNkt(GBgbuS1(5bb%?L?fu~U)(QMZ4`RO(4Ls)_;L7ipYq-O30MXLztX*je444@+
zjN;Bce-(&p^lUf)WGb9F#Iu9K0gwNKUnwJ@yXxXKu7qH_QrSMRRdt-e0T^(WuNg7z
zP9Rx0?#OsbY21T-bKG5oYo-WVTU#p}<i3QRcFzNY;;m4?7c@7dUc_HI!3O>*m}?tW
zGM{ye4LcrL3joY#Uu7FB&FZo72=0=(#jdY!GiT-&F_z~{e;tlPJZr6w;=vreShoix
zIBMH}@6vmmGQp~AYu#$6#f3gOo&au6mp~v6vsSbQuj`Rs^)FFz%VA#rBj;|hHoiP}
zrdd%Yv=PcE=2b9QTN}9+5dd_`y~MdkKprl}nmzdBrcjuUc+K<4kF~O?D<?C?u~E!G
z)`M&AWZ)umnPI_LJ>Pz}Ky09ieA2rJyazL)r6wMc0c!lZTrR(3yz<qHP$nL73kQ`6
zMclRqnMr7bd-`PZ{-7ty9i=C$Eu?CoedL>Z_NCNka(4cKpWnQv{yiACE1^fmb9+B=
z>i~b|>N!H_9Bo-jt-*?D*wN|u{DH&O3ECjSAq3UUhAu@VkD{Y$r-w?QTh-|eQ-gc?
z?jDZ|lsszrhFsG02%qR{jGJn$b8S{>^6fFsT5EoK+VdD-5bbUUvo#8(o$ps4KHZSh
zpCml&mYDO-7OTh(3>f7(P=89JHFCP@r|_nGDs|#mF?IV1+%Qph{e$Mtsq9aNS!cOU
zyny-qcz6DM<4^ITZ;_s;j8MB>b>fTHNRIK)hIIE`w4BJ5o7rBqXo-bLylVmMxXDG<
zihp;~RDB_!uT{fZ)q|X>zs1$Q{@}y(4wV-C*NKb!67(Lo=jxDenwvl5f3){qQB8GS
zyMb2}5k+1)ND(O_z4t0bs*M^TfRQdBT|kN=B2pFUP3eR{=nz^E6r@Io5TvRB0)!$Z
zASLAA!S9SS&gJ>Xxi}a94TGJs=H7F)`ONh^GYNlwE<Fvf30)Ik33cXhZEvkUIFcCl
zr2{R~i`Se@IC07wk4)k@*<m8N2(Kt=o$uT-Y0v;^7bq51F>(e+d2E~358*n~yuUxt
z!51h_S4pjwMpr99L@%P``wH_tEul?<qs>dE6KQTo{PRDK<_{4bvw4P3lIF&B_<DAB
zo;HjW)0{I<d;1n@CfO<)x}`w~-^)%km2(birUq{%t?1bUXb<JcADoQ|Y=J5sBCD2<
zUE2?4wSLqkFuid$ESL7=T~rr^3`%8{T{$qh9enu#NBu0FXVZ9yKH7B0CD^zeR&51Q
z#kGzgwS<>sZ85D`69x8C_qM5P-D;fMLuL;&z)8v%tsdI4Uc*mRv>bXdj#<3T4Nm28
zIIQPl^R&u)*kKB;?*Ag)UOt$;6)h_%r@G!)nA+O8lp#OtJCJn_L|gN6g@5<?_mkd{
zWlfpwVY69M(NehW!(HAO3!l!4%*gZ^#r%y+(xUDY=lGU)^z}6RDi3cTz)qqy5cp_W
z>78n~@_U$gP?iJO<VxZ}*^H0<PYE7O60~l?J_@;wT$B@a5U&%jTz^h%m=+$yddsA$
zAlho+%ZE!3y4!8oV0r^qsm`uXB7z8hxGyFvG-DoPQVd@&{FV*X-q6{2&4Y{QY|;HE
zF>P5|2t|-q<__0z3HP2eGKmr-WXGRx6q1*-O+24rhorCq-Vi6&LRBjYXw-v0rD5^l
zf?>Tm2kfD^pq=xu?Og6YDnm7PuxlFw85FjuCTnJSYBSFoRC1QeS02Tj`DtN@RwcSz
zjX2w9l{?fdvcz8Pd6^5_?Ip<B@_8s{Nl8!p8-aL#?`L~nezAg7SEuJG!A6`~?BOtp
zO7bZ3)*>&RWc%s@*L(Z<CqnkTQSW<1gDbbwz8pB3wON|WS^J6$1%-=N4Q3@m_yqpw
zKfR%Mw@5s8NlwYbwv%-}yU)HxU`}JRyJpoP<q07tNvtQvJ5b%V^}spge&~lZ;sKJU
z;z*=()*$w3x+jaAb5mcFN5e)vI*sWiebtCwL}i~P{^fXPAQC+Vo7a<m01z1_qN@iF
zR_^6kT4N3mB;CI<Ss1lQ3S6l$Sdw&~ZMj@MN;KWK67k!JKMPhJX>@5Tnb8@N{_4Ry
z&?=F&ULDY(*10`ZYN(!JmbK1W>kbckl3NIpYY&ai)}m^ESSGrc8Sw$A7RAs}bH+Nl
zKakBg@;%{Ae0IY;sH*9}wRrpx^kOiN;a6u2<m-i3uOn-*rJr9!KKr`Lwbj6e_QmsJ
zy{f;#o{D$M`!rP-Pvaq~n1|sdnXRm<VCH2sF?R%=%K4?L^@78tkbs-XA7nXo9e$56
zayPE-wC41a8Rbc0=81}q!QJE#lkR<!#Vwl@KHZxomVwe0_!wgjc-`oOL9XK&O@`_x
zi<9yvY3b0q?<eCs{=(V=G(Jd{`q_JMwmz$+X=ZnAI}FZGXlX_QVQSDRmcN~}VwQBD
zIl7@;2FU-q071D6kWu<}izz23hmuWmfkLAPXt7sS^Xf5!AK2c3JZrx2K0VlrFtnu-
z>wVhxtzS{A(zKIgRHp&@=`qEr9i7?gK6XQ^ZK%a(zwE&XcU31NdiD8eX5Oru-S<|~
zgj)YzNm{W+otow#O~DIqtHukajnkGgQTqqB<0&6-AY)DFj?mcayAH<n<t!w-E2f+#
zi{ChF8DXB+t&)%6*;Ump!ZOwws>$!<qzbn4Q+E#F!E@4Y_?*Yr9&t1jLE2T;7dHEI
z^L<Jh-AXW9cT|-+WoAoRg9G3Ve;oci&-YC1R6JbNS;a9&S3(fH3R7MwzhND3-Z1+A
z=z6CAD&{>m#|s@lw(gIIvG-0wl%1N+ZM};uuGTyGaX1h9Y-)pG&}x}#)So0)H8tqg
zVI+t4#Cr%roiukaKA(1q*?3S=)8hFs5lOqZ-VR{HRiH{xy<I@wMEv#d>7Fx-blgw#
zx7WrNbf#h?dd9&IL#o6=os1{Q(c-HIg<}i37}$}cFafCb^{rt)*EX4u{(ZTLUAeFM
zMxRNs8OHkS&dBq0uZgz$2XlQ^6Vq}<#B`y|G_Sy5op*;42Awsx{BsMnXc2GUq<b9g
ztrzism8XWEfDKiXk5dbw`B#V%trAZ@yv=dwq~dg!5$v=!uF(KJD}aLSbl3h^PAB#}
zYy$77JrF)P7hcUPF4=J*E$!C9O!Jaol4=nfU+VdcEc~9l*VW7Z8tB#I_VOzAfz~yf
zS$)10R}=7Wd$)geTP!tZFR65h3fw+8fw5)2d(Z@x5z;N!ZSJ2XB8(HI*Rx+RTWm%a
z_p>_hqB*KsEFprLxm(>;?)CM~mJL_xrJWy($KKn#AM8CQH8$S!w6_myv~XO2SJ2xZ
zHAzJYjvad3B`+l`&nID|tGqB*%Ge(RyuY)JDLhr<DKxE@_sGBeRJ`v5kZ{7}D`E-<
z28CM;FXp~4!rHE5BK>B(e#y2mS;P~mXss|i&w_1($hMyQRRM1=myFu;_dV+=yT(==
zaiF5!T=KoMVRd)}Z@6cWfp@jpIPZS7lFi>$Y4^=<*|pyL*`ugU(K$Tg+ai9Ldov?|
zoqC_cPF@6T>JeODclNwhV{RZK_h0%efdw?{OBP#8#Gd>#2~E%VR&iNVi0xN$a`np7
z%2tT7qL}V#T`4i5KTXun`z;m^)ya>==Vba9iy9PN+Rd#g4_u(mMtZjaXFbn0lHl=k
z+>CANoioz@+W3O8n(G8FzraX~$e>6DT(6?tXh_ju#ys2XJPL?uq=tZ$ix0qW<6yYJ
zT|{FUiHuzS)ya~ZIE4ALSEFbAx^@4ynb15)(2h6iF>*&+aH)PC9{Bm;5Yn-;zb-fr
zwcDP$nzOY0<j!2xl+|<^;&b!Tu)u8R&<Gw9KMqHuQ%xl}pXq)~Y5JkMZvP3rx}fun
z$zIIid7Sd5|7eT0w(wvAz59=ihir<M-n4B!534S`YM|cp+wp^*GQL5>-m1q&+(&-N
zE=a%GwKqqSvyPo<egNju)b^?`(RX>(alBI0rguexy8pUW-;NEp1B6YlIk{{mL;~lf
zg5x&cP*QRF)poVjva|k8f8cEX`hpToT|;ZD$H{W?Nx5_kgh!FbQgXIE<bJQXr^!{?
zDz#`A-3_{^leih0&*YbW15cXGu$n)xyUELi!Eb&oiMRQ5?RL8v;%A8$Q{<xeCL{qp
z8QE@%NVPnOgv$EOy=qJGn{`<t^15O99kI$nei|?W5_%8KRVneu7f+{dAeOc6TRcOP
z)@J=K{nj<FrjL10p=*R)l*RtJ$&Ll_NNn@c$>GAt+8oVJ)}^M~0}3q77l$F9{u-Je
z{=vKYMx;BpT5?5PV6xfMF%uth?C^sHjcBy5suQOGHa7aMtkzZX$UsQzsF7%>0a%^E
z;VX(OnZEx&3Pk{VZc%tYL|-69%tu`WkeKSXcCe@u;<M{$fXy;A+ZG(g%HBafIZ7-r
zF1a^P5N_Ch(&;(qFSCmVl#queWIl~6mobl;RWf(T)*hJUA{7K#eBw2P{Q!3@fOPRr
zHsFaIk@_QBCq*Q>j%#h&hp~omrD);!4l!M{fHcX<6q<D1U_>_6<!E~E6B)mZ><yH6
zCsu`K`wZh}WIED|<C+oiI|p_PPdf{z@1cJK%g11f^YD|Su%zE~AQ{|-W!u*Uwd3D|
z44@S$9#$1S3QIQX4500yXF$;GR71|~0qw1xeWIx@fY$^&hPXW&4-XNDZ3!e;Zs43o
zsYPp_xjp;Lw?RR3HK`4CZ!Z(xUi!NE5|bioh6QKlxPZ9*fZ`^vXaxQWut2|;xzE}w
z2A+pYtbAj47=6?@1THC!8c77W!9ZT=F5|5P)>9GD<quaU+&!qjBqzi+0^DcHF&llu
z>FoiQzOn)A9>t;}T_(5WB1$UZOC0@K?=oYmbilg#B~bVxaB@8L;lfqmt(0g#q?&uv
zS!zTm8rg=-vj&4<eeL+{@XR_yqHexVFyS|5Pd#46#}F%ulQ-lj7R`lwnzeoA2si5u
z0z2NOT2@r#nE<-7f?n>geLh~6@PrF-D(<9)!ok-$oKBf9t&Ckn+rhh#)Oo~rEJ?<6
zjP8Qg^@nP3fa-jQ(e3r=BWY;}h`~P3RGB?5&jM}<2R0RS#us?X4${<*uNrN<wer91
z;VHE;&{95V(}?aT$iB3+22o$dIrYEa01n*E&jx)s<x;2A`XR-{^Gnyv<3nt81kTrP
zyO9LMYb=j{8{KkrF7p#GNewXqTY{EVdwX<5Pr;<tp1`fQKgy>T<U=6cMOg`0QL6D`
z;K-m~)HZIGhL0Jb!1MjpQhdp8@Bq7SXVZ^$I&Qni2v)TTw1bV<laO0L0ZsOV*che%
zG+2D}!zd@jP82S7Q;g%9v5ttlMPR?g5lr!MSgwV*DCmq{Zx1K8U|pBOSzpTWYMt<h
zJA+hHB`oPLjb#KmZiNqwpg4Ap-4)r}lY9epZc5u!pRr*JP<LG;5Wj@EKcnHh<*f#{
zZT7y);l?*Y>ElBKu!*VQqZmQ)R@MilZr8_Y`__P>jgQ_4&eCyg(sgw?s)_yit4iCA
zYsdva|G!d#9x;HAjgiOtUrMOHx0^Y8@N~UT*{T7S=;5g;&NS(TQyD|l$=j3_;GE=N
z7iSHjv>>Z@+OsPXw9H=?7K#rJu_(x&ZGa#I^g$w@Xd=J_%DyL(`?Bmqn(NoEF_$T$
zFF#=4I3TSMXN9!17M+DR*h$=OYHdmgss6UELdE9;6oPqSz5VLve}+%kzjP(;hU0EA
z&ShC<R?DsDr}~uFRhCf-Rf`pRbLk7-ab(S~;7zW+zzwP=<zL=9Prix+iBPkjzuqMx
z`O6~m{^PLu=Z8$iLV7B7#$#`0#b;hcKDX9Yw^`T&pJA(b5cMLF{rtatA0%_X9MW&L
zSNg+8-GY$D8~0o@(Epg+S|91llJ&Gb_^H0x?HRGP^0B{e7URk=A$TojkW>ROnr%~k
z4S|xSAjdua>r?pw_-_|PZ`3M`gbdRb0rb&Jy#+Yi^VqQv+<sdX^jC*{@`cjiCr{k|
zoqLW)7cgWn$#7{NjwZ9Zz$y8O%#NRm|LCVQpir9bTFe&rT`$$F5<bcMlp4WR-7heD
z=qUv?&*7Ce3v{YCd+AK@gOVt@^J4AHj-)>R1dAv@3MkuzLPdVv+`p#ux+JVE5o^_Z
zg-LsC;MKlmY0KX4oO8mH^1VUKP~s=Y(9smG7Nt|G$+Xo9MYW;z+ZAUjzK5N$R^?&B
zj7hGR6p+?jg?@@FD=Sy<Xhu8|`MGwy$xnZeVrNI1zGke+Vsi3<N#DB5W*0Nr^$<o@
zB`Me={YrpAa3W7%-y(pX0n*rAYbCHs+E){FSMrzEyL1NUjlL{il{pKFQWk0KuHeCX
z-9Bd>fUUN#gtR}os~&#%?V%m@snFG03tgaz=mZ%3KQ}8YD>MAm?#8fOwS45YHC1Gg
z{1TP%H2~GHCB|t?3*@aFsr0OOkLJk{E%p;za5&r?I8k9gc@$r>yo1){^%lJDr568J
zWF;m>s*yN%Dq*SlTF7hpNKEqY#qUBoQCO|D*{N~IpNWLn&%c;XWoyRTn()OyN={x2
zNf`r%JLm#+Yb!8FN`JRIbn914oVCmiiYzs%<X;PGtLj&3>2YNg<$+k*a&#c+Fp#NM
z_jD!b8oT?f@gW)mv;<I^Wd7Ry_G|jQ&7;3oD`s1Kp_6R!p9Lw|9#A^i-0`y_Q(en{
zzTFnIKJ^$XO&M>XDC4WJn%y3-$>}$L+<T>Aedr`EblT=)_vP5e%<61P8`f%oI>C(i
zGnSVV&C$!$QS%=^?{@bxef$obHT{SV)Blgd0oG~+v0u1=9nI0lWMR$t;Bycog*Qv7
zLb&%){o1Lkql^tS;h#@MUQr^znmr^SMn$S&{VU)R+IK!irwZSGVQtKR=wy$IAj#bR
z$QCbkOPzAhj(#Y3^Su6iu|YCV)<xD?^7u4@&FTHA?;LeHAe-7G913P0M{{8<a&;X~
zbUlpMV~5iLQv;N#Ls!d_dA>#I^uwU**{6D;sKQfU{I@QDJSQHJdO}sDnNpD+bbyH;
zrqJ$~qR{Et`T2Qd@lG9>JPB_mh7w9L&Jmk3mKIxZnTdyec@2?QB6E}CNc$>#n(#>Y
z_-0kE)6*WPtt7*k|1_bMXYu~2*tbY;xfU}Sgdt3mBFI16B_R&bw&ELk%#d{}$$#Lu
z-u6#~X(FqIo@W(wV_b8?O0uUix`C{HxI@}KQCn;1ZI-Sil&n_VBtNmc!a~{QrFu_J
zPArcaBT&50hV)7PJ8vx>=sjlnh_NJeHs4Dd*Czo4-24aR^7hws<q`ENm5eWED<U<s
ziE2&x)0T7-8)!o4P{v<pLM~}e;GgD=cW<cbz+j@saU~(dAXPH5_M4PWWki^})1kj+
z2P$i?Acq+~yc*hf!q{T{x0j5Lj*g-uH0x4e9d;7?p#vW$Y81__e%#;WI`UE&k+!S0
z-fYVm@kiDAK=j$uZYpvi3~2o&?Gd6WNbZmKARDZGrGf#zC*v;36%&)!-p4sd*bcvj
z$@Ml)20w?~3m(gCYCU{VvULTEpEBLKjGfQh@%MyC_BLZ$$&;ZgS?!|)vGjma=rr0{
z*y`yxqDpZjHSEPA@=CzdOA}+(3Y^$kW4xO8y6P4ZW9^`df926_n15tjb}I8K{kF05
z4ibNvZ$I>P%0k=Ro%K#*5xFmjMGaF%o|($|c-*;_#-a(0wnYC=$RY-8Xy~T5io^os
z{`wtU#FXYp{rHn`*~D;h?&gfWut}Ktz=!dUfFY%jq_bsf!6^}Y63biM4ZYZippXsN
z?%IZ261Uu(=bizV+(>=F(nh&_#?duc=L2%$L?G0=SyjV<DX)#O;UXt)`jKY6$p5~}
z<~Klz8$Lco>14;BmPLLpqA~iT!7K0YHom+0CZf{S9C6n$^~fl2@23&|)sLUv=3XT@
z+;Qx+q`2^8Til=%IH9BCjMNCSU=HXAWDa#x%U%$jmS5wYwg;~2-2PJD{5X>Na8m>$
zLp33ErPI=O+|t*9p;F)3Iy53onbrgCiwzk=`tcFL<5qRpQ3S#1NLF?c85`aQM*CM0
zZF2q~Gqg^FE0gOwQTl<#FSObcyZChAvq_77!*@QcHyTw}3%WpO4Exp;k~Gb5oGfS8
z0}>=-eQmj+{qwAoPt|o2r&l`0<&yqbb{>^jteX^Z)0Z4+!b<5U^mos3eV6spRm$4m
z%)`x84&z4|rOb#k^9q0Gz!bO$efR!x!Esxn)b-eNKD#kSq`I?JT6{Xu<$m99r)h*S
z?Y_(IEziGikF~zNk1-y%@aka1e>XN3@h8I)<s3+N)e%M+)CG3m6<~<TV*CKUU%e3q
zW3f(pdzfzFZq_{Vc!Rc)-z_}z2CVh@ctyd{bn)rn(f8a_el6bpg4WHu5mxf@=f})m
zY^B9Ddc(ds7=(D`^=e6vC8`9o;2b^Aol0FYSz591+E>ro7X_VW4|bgKfqiMs+7OhK
zgpU>M+-rQpxw&co=^rn<&G*F6U4bJ5=yBV4CC@`lu4cMrZ%7m7DLpLd@@fLKV0otE
zhA3<y3DX%{;rCbwP4c>Py1qaYtbdKCqw;*bbYG=q?8&3Kj%K~hNuOAUM;&ZgmGswS
z*P!o4eC;~u9D+()J}XH)FSo^K7X1lARmtVg#EZ=Pyb!>3R}g!ZBy_694kZ?he_AAj
zRgRzY%+{(6$<N!v3t5<(hUP<X{(+_bim-(T5wU}i`wUfW^`RSVhNlA{*P(hTq{vS&
zh7k!~y2yAUcf+N7Nr277xSRjSmyZ@FmOZv*@@769%?a>uNzc@LxmnEPM@6B~5-fBi
zsqIj87<^4k%{%6W^vjR*y(wt_x!0A%3H<61J_)TuSCIt69@Us0&lvMjHp8f$c&Ufx
z*7e^fU9Wd4dz-L-qi;<bJMnozzcP*I|Mp5SQIX(P0(Hj~LmBp`pgt$ciC05!%yKc_
z>hLXC*`ExK{Dj=c9JTF4Xt{Up5L=(a_WmfqM%8P2E#j+!?83r^S`@&M8x}qhhF#`(
zvjRkQEwAa(jIq;s3NXsO57x=xa^)@UU1QXu=gP5?%yHY4?|w#my$KVcZ2m=CU$)^D
zU2b`AT*}pmWWm?Sd!n(|_c39nz9Sum*%f6kf2z8h4A(MnW%Y$s$gGryT70g5Q=Qev
z1HEFIC106Y2rj=%4470Z{Vot5Y;G}{`NK8X1XWuN-SMYY<xaCax026eiRgTW$mpH2
z`0#EYRe<N4y*V_S*BfGq3FonzB{d{rcDUsB&>z2B5)MoQHke;|m4!3Ftmch4_EG*X
z@sKlrXV5>1&QXl|GZhev(MR%!mljJR74K)JRC+y#zx=ClF>)nWRmA*N_=I1e37A^Z
zE$^C7ZSL>KV~b8APu-Kl+1pFRB?H^j_Eg>M70*dDtBi2(M>L1BEH4h!DlV1wEWPr2
zd*rdfi=8swnPy3!HQhv%93_){EUNT3xsQD0mTo*MIRJYm_y?O5R2<uU`S>Gmm)<-0
zg#lBZDosiASjhGtm>kv?qp^Pvo|~Kdr<oqqB|-_g5CmS7NBeFLng>pv8hT7s(1AVa
zhD2^y4$)~uzi4<N)s(YtRJjW=|EWtZiqM88X$iv8liGSO7L}h4p3lrIvU!7NxW-jI
z1urUDoLlU)X2|KtW-ZB5^7$LNuwp#q3;UnIy6D<UE~<!g%ostFZ`4M9!zCJ_j(9|h
z+<sA57V#pA#H1g>iiDBG4rs-kx1niEj-L;rp;*ca!W~ka@HZ@?VNNpvcKtRV8WTyp
z4_$j6idgeI?3MIJNOtbuDD(nsOFX9L+wN(Y_ulO^{sO%g`kzaH*Ykhp4J%V1{C`KN
zKSvOCp^6$bJ6)JSdVeGLJ94M-@PF^Jp|X^+>~PYbEtt?eX`739q+spnFflC|)-m_b
zeX2XGlnIq<OoxcDJ&&+{y2Wwgb!hU>oy(^$TbV;FD5@D40gJE#BJd=RtY>}6yjHjK
z)ub7HHf5{mF1+WXgj7oPA02-?rQJZhu&O6+v~6CxsXa$G{sI(3QM5}jbyt1|0`PrU
zS{e%zRac2HFhYI|g?7wgU7V64ZBTwCt-iRIaiFe9rc*zN-k5$6A_TH?p^T{Oxe?YN
zyCBNH0Fl6n>T%X7Qe`~(Rn5x^$~Ztp0}lvdji!9c^3;!FNz1Xs<Aa^m&+%;js0mEj
z?MmU>`Sg+GAJGh@DtkbQ@*ZjZ&1&ltr9?nT>hednyA>$xZTi&CPO_ToSN7pcDlrC%
z$Hg*fT~7|sk(R>3!v4yUXS9Jz6a_F8nY20I!RquC5Z#!Qew@=}4|{axmP0skJou{l
ztIMl^im2?YjYA}f_`8)c*O@W*b8T77-N=)jf=U!=-3LJvrg{96Ar^Ypaf|XGBTIPH
zpWPo=<4~ZK(b~tu&85I?S_n`*BuGS4uJ+7tK#-)lAL6G8xAT(ojE#*&(A>HD`~!t`
z_vfhmvgqEy@eX>v{8GHu4G0-1mtpYI+P9;{8%u};xObHWC%a|WZo+91C)*jQ_N~xM
z4U|$9Lqw#+7U}}%HRX4Hlyb->({+cl?PgcB_06a3^m!xxI8or!(1IP3*AnteQIzp@
zV^3vic?u_sBZ-KJ<VH3~Ly}WOU=^(aG<UuOdNx(~+4$G6>K*+%@<tloQ_czZ57QzA
zsfRLzfGlCn`$FCc_>o#3tAxUlNuyritP<{dt?y=HnCAWzC%(a#>W;>#w`<D9z&1A0
zj36<23PcmyQQbF+bD3ojO;=8`9Z}q{r71#TTZ~}7^AFiK^A;zMy`pij8kf=FHD=V7
z;h9WCT1dD*09Z469HrP#VzvPweWH8h`AeffY7tQ3%MxN)!UyzY3`Z}A+cE7^Iw8;L
z-V2j5dEaD0P+Zi8nCZ;T1S0S^tRufpA?i6LPo$LL{*Ty_aQ8>dp|&ai2;=Zn5mhMb
zPk=iZE+^AIQ26g!C89G_97MsiH6cgtiQkIImUfDrjZ*Ogl}dXJ5C_Hwi$2^#g&|=H
z2VwvKcBV{-#}d?VzhmJ3cwSo9AF4*2F+{>VXSPuiNaSIQU~JLCZ_!R?>28FfJl7Du
zB*qoM(bwa7fO%RYK=DU+kvny9sr${!Qum%ZG3v^Co(oz($%(Q+N~1=t5N&BLLDeNg
zvD5W71khlk8=qbR8Bu<$DN2yp_>ZM!gD<tCGUe$UImm^Piv!5RJ5*YC$@ZrW<W@sE
zV8FyO)~2LLjKvO}^ipU*@g~4kmx&q$C^H*rih)@30O%UEb0~9y?@txhf$Qi!DdC;i
zEpP`7d`M@fyyM(K+5;xwIFRNTIy<<Xb@n}<C@_&+s6bKv9RJ5^bT@=J2tn+3nS<Wx
zQH+ALMo&`(AZFA52ba~EK-^_Cwz+Rb@al;2y)rS~&p&*B1$s8BzLkQQTWCoUkwquI
zWpkm#Ca{kIQK7uKibNt6^;R<wysG9jA@f<kXJUO#I><&&`)XIL`fQ^E$m?MRz29~M
zUT*dIPXYLPcV>HXf7PqGbEEdQ0*FnUvVQwxH}^MBLGjHLT221PaeM;L-}EqhJ2Ng{
zDJvNEe<b-haMaB6f-jnZ5C&GoDXZe$U!ujjD@m))QGqk;VeOrH`P13A75`UzEFbR^
z>$W|bLv4HmW}Zk=r_eTE+V%wSzjIFXVSba!lHl_X>j7kvY_9*@4l|BW;yMBUJ!SL^
z*Q*Tc13BKHETK!K^P2{sf3?3jMn;mok4Vf>CY+z(5||m?>*na&kb5?TiE1NBwFWG+
z`L~roY?S`!Qd<<lwWacW-Ed8Vg>NX%p$BP`SHr!{RNsI5qc-xr5)xx@mx?t_KRSt2
zWVB|cA{3GQ)vJZxPhb7LC0eG_{V1Zus0F+6p;88ZbuW&`mP@22J0QXzQQwk`>zzyn
zLzDT|T)+^{K6r0Ov1Z>^FhO%OD3{E;@_jygT%H7_yQ4u#ykwTqvcRhO9?&sP>9X9p
zbj?q)v;v)VBfk)V2~}~(b(JKAXcEIc;z`%ml*%DQ#K0ig<>zuPE@z>$8I!qV*NYx*
zNbr4k1w5<jj9LnOfTHEXf}xR<@_UDkM=PYC+hY@fSOYcGc&|o%s}LxLk^upp-G@u9
z-dr#BNW!Ab{9;~E^(?LY)Zi~pQaL}LyJVK9)s4^Azqmk~-!vIYE6hCXWvkgf49+R{
zDaI*Dr2Ec!=lXluF;vQ>LsWuP6R%q3a|h0#^*M16f(j$^df9&V;4R!-5qQ<I{%zF>
z>Ai-~2x?9memwP23~^rTz?`ys-p*sWxxz)0GrgpD(M|Vu+3{3pUzq(fo4Lrs6ASKr
zE-LHlSFK_BTc$f=*(`>sa*nsd2l?4mZlPtm;eYl%9&wMG9^?o#gYoRexV9yaZ!$yC
za&w6j1YdG=@4W#V2vgMa3d)A;<#x_81UVC9I5=9!UzQPJnOFeT8@C95ddx{RFu}30
zuQa>)MQTwEN4SiA?NJ<Cq2eAqc3D{Q(d~{d1&lgFnEN<_$c5*4X)HZwjvSxh^4*Y-
z?w!GSNDdnupG<9k<Zu8?QT9BbC)ws`?Xwf>xlF%H>VjK?%cMIe`K6GW2u}shF$2(!
z)NsGH)hoH=tr8!#gcK=By@V61HjG%G35#to0rx9&=1d2&SbC#MF+L=L4tA*GJ3suo
z-p(uV>k}^*?3wqciO3}po#gT)o8&otpD?LJpO$I&SjCD$kFlLy&V9vNTKFpT+V41D
z-IM@N9vqkNx}9Moq=T;35+n1`ee-JX#HAYkgs}B#Dzr#%+w7mUh75)gTsDZ=h=DST
zL?p4T_rE;h58%ixV|=;|mfdnM_IWroIH!P@>-5EH-g<@}ZNa}yr#FMn-0Q6W;@|d0
zry0vRhhCvHL77xD3$TJ!XIftb>Ezwj{<|tm?M|OP`jnas)@Qs0@~e42-Zv+&<@?e%
zW43a*hrgC_&I|BgC$x+N`%l$I&OmnuTNQt`Txplz)FhwuN?#lCopKeHELgKZgxWOz
z1J43_)z1c~8PwJO`QJub*haBYb~#+x3}Je||6Rr#J!?i3VtsRS-g`qzX!*OTdhXts
z5(S#s_^2nAi4MhKH_IYSLdc1`{sj2E3mepM_?sdoU9`HC+rf5?X?T2dvE-RZ)U+9X
z*uOwDJE%8T*vieT7`IKtP13$QJM3d(lDHl`M*5`4vLRpK-;O0-j4zush9-w7xkdW_
z%B?=H_3U(PTQP1I3wkOS$K4U2j-}P+XGf|V@|H5|eo9AO^r<QuaPj|?F8bsFJtdh%
zXoH4c*JJmq4`o^Uq;Ly5r;KlZRI=k;>bNO}^Blytr&dniW0|Rv+elosAby)DFL|Bl
z8l<XT1c6HUKMD5yq&{ng9YBYO&thy~<9?sV!SehIxjph!*S`+*_s3CmgrN7<{{vzG
iH~jyC;r7VX^q_U8$*_8UGEgN11Txe!)2-HVeEwg6rbo2^

literal 0
HcmV?d00001

diff --git a/doc/administration/img/high_availability/active-passive-diagram.png b/doc/administration/img/high_availability/active-passive-diagram.png
new file mode 100644
index 0000000000000000000000000000000000000000..f69ff1d0357d3141eee27f22770c6958a2469ea2
GIT binary patch
literal 24246
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
DRoJv#

literal 0
HcmV?d00001


From c6e7d826b271a0fc51ed7eb7772c1820c720f1ff Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 5 May 2016 16:06:34 -0700
Subject: [PATCH 0783/1431] Add a gitlab:db:configure rake task to handle
 conditionally seeding or migrating the database.

---
 lib/tasks/gitlab/db.rake | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index e473b756023..a414e480575 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -36,5 +36,16 @@ namespace :gitlab do
       # Add `IF EXISTS` because cascade could have already deleted a table.
       tables.each { |t| connection.execute("DROP TABLE IF EXISTS #{t} CASCADE") }
     end
+
+    desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'
+    task :configure => :environment do
+      # Runs migrate if the schema has already been loaded, otherwise loads the schema and seeds
+      if ActiveRecord::Base.connection.table_exists? 'schema_migrations'
+        Rake::Task['db:migrate'].invoke
+      else
+        Rake::Task['db:schema:load'].invoke
+        Rake::Task['db:seed_fu'].invoke
+      end
+    end
   end
 end

From 24632d215029f8a03cf6742363d42dbf63fa92f2 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 6 May 2016 10:08:05 -0700
Subject: [PATCH 0784/1431] Update hash syntax and add changelog for the
 gitlab:db:configure rake task

---
 CHANGELOG                | 1 +
 lib/tasks/gitlab/db.rake | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c59a66874c3..56e6ea1686c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,6 +46,7 @@ v 8.8.0
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
+  - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Support e-mail notifications for comments on project snippets
   - Fix API leak of notes of unauthorized issues, snippets and merge requests
   - Use ActionDispatch Remote IP for Akismet checking
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index a414e480575..5ae47c15d7d 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -38,8 +38,7 @@ namespace :gitlab do
     end
 
     desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'
-    task :configure => :environment do
-      # Runs migrate if the schema has already been loaded, otherwise loads the schema and seeds
+    task configure: :environment do
       if ActiveRecord::Base.connection.table_exists? 'schema_migrations'
         Rake::Task['db:migrate'].invoke
       else

From 40d4d8a4e7d3934731448a76c6d65db7943852c2 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 11 May 2016 14:50:55 -0700
Subject: [PATCH 0785/1431] Add tests for the gitlab:db:configure rake task

---
 spec/tasks/gitlab/db_rake_spec.rb | 62 +++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 spec/tasks/gitlab/db_rake_spec.rb

diff --git a/spec/tasks/gitlab/db_rake_spec.rb b/spec/tasks/gitlab/db_rake_spec.rb
new file mode 100644
index 00000000000..fe70d5bcbf4
--- /dev/null
+++ b/spec/tasks/gitlab/db_rake_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'rake'
+
+describe 'gitlab:db namespace rake task' do
+  before :all do
+    Rake.application.rake_require 'active_record/railties/databases'
+    Rake.application.rake_require 'tasks/seed_fu'
+    Rake.application.rake_require 'tasks/gitlab/db'
+
+    # empty task as env is already loaded
+    Rake::Task.define_task :environment
+  end
+
+  before do
+    # Stub out db tasks
+    allow(Rake::Task['db:migrate']).to receive(:invoke).and_return(true)
+    allow(Rake::Task['db:schema:load']).to receive(:invoke).and_return(true)
+    allow(Rake::Task['db:seed_fu']).to receive(:invoke).and_return(true)
+  end
+
+  describe 'configure' do
+    it 'should invoke db:migrate when schema has already been loaded' do
+      allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_return(true)
+      expect(Rake::Task['db:migrate']).to receive(:invoke)
+      expect(Rake::Task['db:schema:load']).not_to receive(:invoke)
+      expect(Rake::Task['db:seed_fu']).not_to receive(:invoke)
+      expect { run_rake_task('gitlab:db:configure') }.not_to raise_error
+    end
+
+    it 'should invoke db:shema:load and db:seed_fu when schema is not loaded' do
+      allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_return(false)
+      expect(Rake::Task['db:schema:load']).to receive(:invoke)
+      expect(Rake::Task['db:seed_fu']).to receive(:invoke)
+      expect(Rake::Task['db:migrate']).not_to receive(:invoke)
+      expect { run_rake_task('gitlab:db:configure') }.not_to raise_error
+    end
+
+    it 'should not invoke any other rake tasks during an error' do
+      allow(ActiveRecord::Base).to receive(:connection).and_raise(RuntimeError, 'error')
+      expect(Rake::Task['db:migrate']).not_to receive(:invoke)
+      expect(Rake::Task['db:schema:load']).not_to receive(:invoke)
+      expect(Rake::Task['db:seed_fu']).not_to receive(:invoke)
+      expect { run_rake_task('gitlab:db:configure') }.to raise_error(RuntimeError, 'error')
+      # unstub connection so that the database cleaner still works
+      allow(ActiveRecord::Base).to receive(:connection).and_call_original
+    end
+
+    it 'should not invoke seed after a failed schema_load' do
+      allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_return(false)
+      allow(Rake::Task['db:schema:load']).to receive(:invoke).and_raise(RuntimeError, 'error')
+      expect(Rake::Task['db:schema:load']).to receive(:invoke)
+      expect(Rake::Task['db:seed_fu']).not_to receive(:invoke)
+      expect(Rake::Task['db:migrate']).not_to receive(:invoke)
+      expect { run_rake_task('gitlab:db:configure') }.to raise_error(RuntimeError, 'error')
+    end
+  end
+
+  def run_rake_task(task_name)
+    Rake::Task[task_name].reenable
+    Rake.application.invoke_task task_name
+  end
+end

From 1a7326ba9ae4c7db0d03df0c114b84a22ab83ced Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Sun, 15 May 2016 07:59:49 -0700
Subject: [PATCH 0786/1431] Switch the gitlab:db:configure task to use
 tables.any? instead of looking specifically for the schema_migrations table

---
 CHANGELOG                         | 2 +-
 lib/tasks/gitlab/db.rake          | 2 +-
 spec/tasks/gitlab/db_rake_spec.rb | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 56e6ea1686c..7aa12018bb3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Redesign navigation for project pages
   - Use gitlab-shell v3.0.0
+  - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
@@ -46,7 +47,6 @@ v 8.8.0
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
-  - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Support e-mail notifications for comments on project snippets
   - Fix API leak of notes of unauthorized issues, snippets and merge requests
   - Use ActionDispatch Remote IP for Akismet checking
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 5ae47c15d7d..86f5d65f128 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -39,7 +39,7 @@ namespace :gitlab do
 
     desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'
     task configure: :environment do
-      if ActiveRecord::Base.connection.table_exists? 'schema_migrations'
+      if ActiveRecord::Base.connection.tables.any?
         Rake::Task['db:migrate'].invoke
       else
         Rake::Task['db:schema:load'].invoke
diff --git a/spec/tasks/gitlab/db_rake_spec.rb b/spec/tasks/gitlab/db_rake_spec.rb
index fe70d5bcbf4..36d03a224e4 100644
--- a/spec/tasks/gitlab/db_rake_spec.rb
+++ b/spec/tasks/gitlab/db_rake_spec.rb
@@ -20,7 +20,7 @@ describe 'gitlab:db namespace rake task' do
 
   describe 'configure' do
     it 'should invoke db:migrate when schema has already been loaded' do
-      allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_return(true)
+      allow(ActiveRecord::Base.connection).to receive(:tables).and_return(['default'])
       expect(Rake::Task['db:migrate']).to receive(:invoke)
       expect(Rake::Task['db:schema:load']).not_to receive(:invoke)
       expect(Rake::Task['db:seed_fu']).not_to receive(:invoke)
@@ -28,7 +28,7 @@ describe 'gitlab:db namespace rake task' do
     end
 
     it 'should invoke db:shema:load and db:seed_fu when schema is not loaded' do
-      allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_return(false)
+      allow(ActiveRecord::Base.connection).to receive(:tables).and_return([])
       expect(Rake::Task['db:schema:load']).to receive(:invoke)
       expect(Rake::Task['db:seed_fu']).to receive(:invoke)
       expect(Rake::Task['db:migrate']).not_to receive(:invoke)
@@ -46,7 +46,7 @@ describe 'gitlab:db namespace rake task' do
     end
 
     it 'should not invoke seed after a failed schema_load' do
-      allow(ActiveRecord::Base.connection).to receive(:table_exists?).and_return(false)
+      allow(ActiveRecord::Base.connection).to receive(:tables).and_return([])
       allow(Rake::Task['db:schema:load']).to receive(:invoke).and_raise(RuntimeError, 'error')
       expect(Rake::Task['db:schema:load']).to receive(:invoke)
       expect(Rake::Task['db:seed_fu']).not_to receive(:invoke)

From f7da994cfdfa3bf7b9c96b2f84066c5bd77b8b43 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 25 May 2016 20:44:02 +0200
Subject: [PATCH 0787/1431] Write some thoughts to the UI guide

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 doc/development/ui_guide.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/doc/development/ui_guide.md b/doc/development/ui_guide.md
index a3e260a5f89..3aef364f0ec 100644
--- a/doc/development/ui_guide.md
+++ b/doc/development/ui_guide.md
@@ -6,3 +6,36 @@ We created a page inside GitLab where you can check commonly used html and css e
 
 When you run GitLab instance locally - just visit http://localhost:3000/help/ui page to see UI examples 
 you can use during GitLab development.
+
+## Design repository
+
+All design files are stored in the [gitlab-design](https://gitlab.com/gitlab-org/gitlab-design) 
+repository and maintained by GitLab UX designers. 
+
+## Navigation
+
+GitLab layout contains of 2 sections: left sidebar and content. Left sidebar 
+contains static navigation menu no matter what page you visit. It also has GitLab logo 
+and current user profile picture. Content section contains of header and content itself.  
+Header describes what area of GitLab user see right now and what navigation is 
+available to user in this area. Depends on area (project, group, profile setting) 
+header name and navigation will change. For example when user visits one of the 
+project pages the header will contain a project name and navigation for project 
+pages. When visit group page it will contain a group name and navigation related 
+to this group.
+
+### Adding new tab to header navigation
+
+We try to keep amount of tabs in header navigation between 5 and 10 so it fits on 
+a laptop screens and doest not confure user with too many options. Ideally each 
+tab should represent some separate functionality. So everything related to issue 
+tracker should be under 'Issues' tab while everything related to wiki should 
+be under 'Wiki' tab etc.
+
+## Mobile screen size 
+
+We want GitLab work on small mobile screens too. Because of size limitations 
+its impossible to fit everything on phone screen. Its ok in this case to hide 
+part of the UI on smaller resolutions in favor of better user experience. 
+However core functionality like browsing file, creating issue, comment, etc should
+be available on all resolutions.

From 16817cc49f9dbe333b560b59f05235d8e9add0b6 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Wed, 25 May 2016 14:57:15 -0400
Subject: [PATCH 0788/1431] Fix the english.

---
 doc/development/ui_guide.md | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/doc/development/ui_guide.md b/doc/development/ui_guide.md
index 3aef364f0ec..b4dcb748351 100644
--- a/doc/development/ui_guide.md
+++ b/doc/development/ui_guide.md
@@ -14,28 +14,23 @@ repository and maintained by GitLab UX designers.
 
 ## Navigation
 
-GitLab layout contains of 2 sections: left sidebar and content. Left sidebar 
-contains static navigation menu no matter what page you visit. It also has GitLab logo 
-and current user profile picture. Content section contains of header and content itself.  
-Header describes what area of GitLab user see right now and what navigation is 
-available to user in this area. Depends on area (project, group, profile setting) 
-header name and navigation will change. For example when user visits one of the 
-project pages the header will contain a project name and navigation for project 
-pages. When visit group page it will contain a group name and navigation related 
-to this group.
+GitLab's layout contains 2 sections: the left sidebar and the content. The left sidebar contains a static navigation menu. 
+This menu will be visible regardless of what page you visit. The left sidebar also contains the GitLab logo 
+and the current user's profile picture. The content section contains a header and the content itself.  
+The header describes the current GitLab page and what navigation is 
+available to user in this area. Depending on the area (project, group, profile setting) the header name and navigation may change. For example when user visits one of the 
+project pages the header will contain a project name and navigation for that project. When the user visits a group page it will contain a group name and navigation related to this group.
 
 ### Adding new tab to header navigation
 
-We try to keep amount of tabs in header navigation between 5 and 10 so it fits on 
-a laptop screens and doest not confure user with too many options. Ideally each 
-tab should represent some separate functionality. So everything related to issue 
-tracker should be under 'Issues' tab while everything related to wiki should 
-be under 'Wiki' tab etc.
+We try to keep the amount of tabs in the header navigation between 5 and 10 so that it fits on a typical laptop screen. We also try not to confuse the user with too many options. Ideally each 
+tab should represent separate functionality. Everything related to the issue 
+tracker should be under the 'Issues' tab while everything related to the wiki should 
+be under 'Wiki' tab and so on and so forth.
 
 ## Mobile screen size 
 
-We want GitLab work on small mobile screens too. Because of size limitations 
-its impossible to fit everything on phone screen. Its ok in this case to hide 
-part of the UI on smaller resolutions in favor of better user experience. 
-However core functionality like browsing file, creating issue, comment, etc should
-be available on all resolutions.
+We want GitLab to work well on small mobile screens as well. Size limitations make it is impossible to fit everything on a mobile screen. In this case it is OK to hide 
+part of the UI for smaller resolutions in favor of a better user experience. 
+However core functionality like browsing files, creating issues, writing comments, should
+be available on all resolutions.
\ No newline at end of file

From 501a2d12e7b836a320fcb9b8e444a3e003117ecb Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 25 May 2016 15:27:20 -0400
Subject: [PATCH 0789/1431] Remove unneeded indentation from RuboCop config

[ci skip]
---
 .rubocop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 25596762e58..5a623f708bd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -237,7 +237,7 @@ Style/FileName:
   Enabled: true
 
 # Checks for a line break before the first parameter in a multi-line method
-#   parameter definition.
+# parameter definition.
 Style/FirstMethodParameterLineBreak:
   Enabled: true
 

From 19cb7241eac3830ff6feeab4de7b282ae13cac73 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 25 May 2016 16:05:57 -0400
Subject: [PATCH 0790/1431] Update CHANGELOG for 8.8.2

[ci skip]
---
 CHANGELOG | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7aa12018bb3..b79e6bb3ec2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,14 +8,20 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
-v 8.8.2 (unreleased)
-  - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
-  - Fix Error 500 in CI charts by gracefully handling commits with no durations
-  - Fix concurrent request when updating build log in browser
+v 8.8.2
+  - Added remove due date button. !4209
+  - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources. !4242
+  - Fix Error 500 in CI charts by gracefully handling commits with no durations. !4245
+  - Fix table UI on CI builds page. !4249
+  - Fix backups if registry is disabled. !4263
+  - Fixed issue with merge button color. !4211
+  - Fixed issue with enter key selecting wrong option in dropdown. !4210
+  - When creating a .gitignore file a dropdown with templates will be provided. !4075
+  - Fix concurrent request when updating build log in browser. !4183
 
 v 8.8.1
   - Add documentation for the "Health Check" feature
-  - Allow anonymous users to access a public project's pipelines
+  - Allow anonymous users to access a public project's pipelines !4233
   - Fix MySQL compatibility in zero downtime migrations helpers
   - Fix the CI login to Container Registry (the gitlab-ci-token user)
 

From 2682c5884777f1bfd5cb0b5c85b1f3c188906460 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 22 Mar 2016 20:27:36 -0400
Subject: [PATCH 0791/1431] Customize ActionMailer preview path

---
 config/environments/development.rb             |  1 +
 spec/mailers/previews/devise_mailer_preview.rb | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 spec/mailers/previews/devise_mailer_preview.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4f39016bfa4..8cca0039b4a 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,6 +39,7 @@ Rails.application.configure do
   config.action_mailer.delivery_method = :letter_opener_web
   # Don't make a mess when bootstrapping a development environment
   config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1')
+  config.action_mailer.preview_path = 'spec/mailers/previews'
 
   config.eager_load = false
 end
diff --git a/spec/mailers/previews/devise_mailer_preview.rb b/spec/mailers/previews/devise_mailer_preview.rb
new file mode 100644
index 00000000000..8a4d6e7250e
--- /dev/null
+++ b/spec/mailers/previews/devise_mailer_preview.rb
@@ -0,0 +1,11 @@
+class DeviseMailerPreview < ActionMailer::Preview
+  def confirmation_instructions_for_signup
+    user = User.new(email: 'signup@example.com')
+    DeviseMailer.confirmation_instructions(user, 'faketoken', {})
+  end
+
+  def confirmation_instructions_for_new_email
+    user = User.last
+    DeviseMailer.confirmation_instructions(user, 'faketoken', {})
+  end
+end

From 66ae3897e2a170133f389f1713129e5b49d88ecc Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 22 Mar 2016 20:28:05 -0400
Subject: [PATCH 0792/1431] Make the standard Devise confirmation email our new
 plaintext version

---
 .../devise/mailer/confirmation_instructions.html.erb     | 9 ---------
 .../devise/mailer/confirmation_instructions.text.erb     | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb
 create mode 100644 app/views/devise/mailer/confirmation_instructions.text.erb

diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
deleted file mode 100644
index c6fa8f0ee36..00000000000
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>Welcome <%= @resource.name %>!</p>
-
-<% if @resource.unconfirmed_email.present? %>
-  <p>You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:</p>
-<% else %>
-  <p>You can confirm your account through the link below:</p>
-<% end %>
-
-<p><%= link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/devise/mailer/confirmation_instructions.text.erb b/app/views/devise/mailer/confirmation_instructions.text.erb
new file mode 100644
index 00000000000..9f76edb76a4
--- /dev/null
+++ b/app/views/devise/mailer/confirmation_instructions.text.erb
@@ -0,0 +1,9 @@
+Welcome, <%= @resource.name %>!
+
+<% if @resource.unconfirmed_email.present? %>
+You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:
+<% else %>
+You can confirm your account through the link below:
+<% end %>
+
+<%= confirmation_url(@resource, confirmation_token: @token) %>

From 3e3463218de17011bd4b29a7a27452d4f7652f35 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 22 Mar 2016 22:20:47 -0400
Subject: [PATCH 0793/1431] New confirmation email :fire:

---
 .../images/mailers/gitlab_header_logo.png     | Bin 0 -> 7096 bytes
 .../images/mailers/gitlab_tanuki_2x.png       | Bin 0 -> 2545 bytes
 app/assets/stylesheets/mailers/devise.scss    | 134 ++++++++++++++++++
 app/mailers/devise_mailer.rb                  |   2 +
 .../confirmation_instructions.html.haml       |  16 +++
 app/views/layouts/devise_mailer.html.haml     |  34 +++++
 config/application.rb                         |   2 +-
 .../mailers/previews/devise_mailer_preview.rb |   2 +-
 8 files changed, 188 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/images/mailers/gitlab_header_logo.png
 create mode 100644 app/assets/images/mailers/gitlab_tanuki_2x.png
 create mode 100644 app/assets/stylesheets/mailers/devise.scss
 create mode 100644 app/views/devise/mailer/confirmation_instructions.html.haml
 create mode 100644 app/views/layouts/devise_mailer.html.haml

diff --git a/app/assets/images/mailers/gitlab_header_logo.png b/app/assets/images/mailers/gitlab_header_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..35ca1860887f36346d7646ad9b51c79d8c811b60
GIT binary patch
literal 7096
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
KBx=NrL;eR$x=EA(

literal 0
HcmV?d00001

diff --git a/app/assets/images/mailers/gitlab_tanuki_2x.png b/app/assets/images/mailers/gitlab_tanuki_2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..551dd6ce2ce88915a21ebad72f8d5cafc4e6fd3c
GIT binary patch
literal 2545
zcmV<N2@dv&P)<h;3K|Lk000e1NJLTq002q=002k`1^@s6Q5a)-000TNNkl<Zc%1E=
zZHQb~8OMKT=FH5#C)rK1d9g{`q%$|QF9`JowQ32p)(=urn_W{;q!nAMeaR-f5i3P1
zm^P`EqNU&$KMDOPh*U}`6@-F?hEm(~VuTj7&Cc%3Zj#N+&b@c8AMQ@}&di;A&$)MI
z)(`nZU~|rMp68tZp65L0JkL$wDz0L~F@KM7=A(lL+~OhQm5rW@DvF1US3Wv;z@5Lx
zI1^{Q&>c{oG71+L#9085!X4dK-?aIUA6$%MykA&4QW(8hOf9>0Z@nX1-NN|GXH6X)
zDP5zE&56d(ZXMxR;xSzv{f1+S#~UO8)O~AEg*H)kjk}vBQR9AH9sPz=<B0$7c8zc7
z>d+#pG-XU$6*1{=t5rn4JZ(r_!~MdA?-Vk%ipcxhtcsW{O&OD&#soo&sJg?P>$bI}
z>JC5D(bG@ZHSvSG)4WdCg}TG6jvg(doEnD$+bzDYqo<#+YdjFt?$o$fM~^a5OGgT$
zwTjpi)Mr)2tvW{g39Bk@32LuZ#GcY&V^md-GEt5t9`i?z=00TUuyLQNu7063WgK=a
z0?$vkj&NO+BeptGEs>+G-{Qxry7~pD#v@_<cEp<eP$H^4ZOB?x6vAYzs`#9$(S9Ln
zPF6(}R3o+$QEr_F>vp)TU1Okh*tkPQUq4WqGVZWz41~$7MeGMv^eGY5DRQ*Ju{o+D
z*AF-rGm3KEBT6-@*{gh2MXn#PSNV#HT&Jkmib$eLhmAvyMMlx+XlcsW@T)?3x^Syi
z6-uGsvB)gmXM8J4E|MtSXjZqG(~<8597|~3y6bj$bOZ&WtX1&^9i#Rtck0OZ0`@9*
z>Bw8v=rx8CRhlwxw^td|F<PsNiPDr2c!Tc;%G1Ukt12dR#;ir`(DOBvDAmZ(1UFv3
zr(3AooM?TxtH80t*BX8|S|!%K$gc6tIODp3xVEDrc1NO0Q^t)}RgA?kYE{MV^0YA?
zXKWHIeY>!wRuQ}7jJ2v_taRA8sZ)PPqLM@}w;sKfdjZE1Gj2Wp_^>s1B&s##s|%;b
zRFd&=U|Y#-+BLr3sV|VI^0cwbs)%h#j9OK3{ldLQ=v%9sSiZlIvnpa=5*=1mY%Nb2
z*97$i66M(KDPLXG9fU~rFZE*A#3OY_zx?Kh>w;qkr-*}zs&P*egFZdq?S>vDTNdBz
zh90}a+S`5u_R0L1eSwl&6zRlPh3l3+OgoA7C}4cAlg1T^b`*fv<~nkWae2bL;BRkF
zT4k7#2S|ep$?Lx&Gw90d#l-Uu#lVP5CI^u4ych!v(wt`oc*@_^?s_?<0oV^}IfHNv
zk0+eGij9db*vJ5lP%yB@fe%eY*(dW^hS}dVFyUs%4)&g?#5M%pS{oZ<nEm$2eAX}0
zyrU!!A$@IQK&*SNZw@KQ4kgnOhU}ncBN2Avt+fG3iZl=TMVd|I0t%VCfKAEfF*1?h
zy4-8soAB1yiWV-Ki5lYOKxO-YY+#QPa>KoIziblSS=P^`Rt$5q{geEagXaoS_Nn~+
zWC^|!NW8;6=6NMjAan7?hCyZ_755S&@Yd9+Sd}Hsp7k$v)^}8{*(cjD0t8;})iAQP
z`|g)W=QVh13PX1N<CArwhWKox@*P0T<jFt}+;3ncrp|G^wM4<kNeaL|mA{i5YR+*T
zgqIbAk&=+^;#X8@>FLzQ0NxtZWOMej`MaU9qcS|9Y$%QA+c83NH{EYIPP9wm&0XhQ
z%X%Mjc*`B+%UTA9fW2BH02mnUp8E}s#n81EZ|+)#_!6uW6?Lq&V;itlZ%8`Rh07tH
zj<oLcYAfEHb+N{cH*K4EK5;GR6|=f?`5YP7)G>%R*Em??#v^K(mt!eO0XLxK^Mjj`
zyPuYhG~OKJ?&LLYQULM^^9V&=inXr>(E4r3EF{Sq388s;jTxn><5J{B`Gk1{d_2pe
z=EKZ$CsiuiN+*Er>f%FN;=A9_W{t7iiFfa-QsF#z$)o0#ZxWg|q&#lE$|Ad1<~?oY
zdx2p!(V@-p-EU}%;@DwgMP`<Hk41LLS@TtYb4Mqzf1Upg<2*`Q<At{h{1dPv<Xrgg
z`|%!WyAC+fZ%zq(8WgY49voasJTH%$f%V9aN1QxrKF&M`sc>1@SPr#YuZVXK8XR-g
z9_H7fM^c5$%yY04Ne~eW<gEERC3dpJJIY4406U|_;-rX`#_U|1gDRFd!xB5>toeGF
zn6g{h&*e`t!K{)iy1@Iur4SJpKGt-<od=xoh&c)vsIAJuWszs)jH&eHjq>e6&X^~d
z=WA40i4=~?_27m1oW|=vH|&O!ltDdbc9~1ebGs@@pm`0Gv*zC@v7It+MGA*y57(gM
zexb6h#ep!Cd5bcWa@PF2vT+jBSnTKWPcy;KB3<!6YkvaZ*5Tu`YVNnwa5}#ecN1L%
zv2iK!w45=YijWLM>?f+6F@MfHU*s|uLIqnZ96pE?WE5`AnSqeU^d_Q7y37TNd_FEo
zkbo!vIcvU2nMumL87jD+j>QR;9974Mw1Rt6=FK%%`$wdq5Ol59Z9kWPl5u{~R2TH)
zB5;<rs(0OiPd*5Dza0gqy@()y19Z-N+tgX)NqNltRrKtm(S_`g2RUQ@k|MXU!g8R%
zDDbI(38Wz%QVL6FI#gQ1iUTVwQRKF6kpx{N3P8@9Z?nX9N(4ugoxtYy=CB-9VBZ!x
z7Y9nb!4i{l)_gm1!W!t=XD0UP{4pkYrp*-{;9b0TVWY{0^JcL7P2S)%XESraO|<90
zEb5e)lgG@{$!Fh=uI?y5<T3L!^L&OC%1s@O;)L&4l$OEnl}fjyd>a?pR@oI6ndjDC
zkpw*?3P8@8@36!UO1#$8F$}c)+lC+)YikQi<&=1hC3eUY=DUd}9D?3{;pKyUI{zr+
zJWs~=%Q*)uuJzYo{$I^oW&3^y**NGYXub+qI4ttGJZ}EBm-B9*r#s3IdCYu)A~&<b
z!j;Brxss-BO%V&hI!S{xr*AH?K#?2!MH2LpC;&NUzQ+=iEb>=e+7kc6zUs=ApBqKX
z6y6<dk-xCaq?|Lg{u7#{=$q@c!akM%5fi*XhBOPnzrk9C;yKU#wq5Ud&zpUCZdb#h
z#KZEq`TLESZ(nzmAM&{QB1H;Z;(Vhxnek;MGXq{56Tn42VS&O%kpvq^6o8yF&#}xd
z7Wp%KfFZBSGPv3GO5b~c1^&bZcFQ^Q+(yoI!(6Ww_Nn{>4Dq|#J0b^=y~SPSG7rh)
z<{vhAYQX;yQ2_Qc`RnQ{;thb*pnJRgsrlhX&*>_zqBr;-bOqORgM9~q00000NkvXX
Hu0mjflsE?Y

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/mailers/devise.scss b/app/assets/stylesheets/mailers/devise.scss
new file mode 100644
index 00000000000..28611a5ec81
--- /dev/null
+++ b/app/assets/stylesheets/mailers/devise.scss
@@ -0,0 +1,134 @@
+// NOTE: This stylesheet is for the exclusive use of the `devise_mailer` layout
+// used for Devise email templates, and _should not_ be included in any
+// application stylesheets.
+//
+// Styles defined here are embedded directly into the resulting email HTML via
+// the `premailer` gem.
+
+$body-background-color:    #363636;
+$message-background-color: #fafafa;
+
+$header-color:             #6b4fbb;
+$body-color:               #444;
+$cta-color:                #e14329;
+$footer-link-color:        #7e7e7e;
+
+$font-family: Helvetica, Arial, sans-serif;
+
+body {
+  background-color: $body-background-color;
+  font-family: $font-family;
+  margin: 0;
+  padding: 0;
+}
+
+table {
+  -premailer-cellpadding: 0;
+  -premailer-cellspacing: 0;
+
+  border: 0;
+  border-collapse: separate;
+
+  &#wrapper {
+    background-color: $body-background-color;
+    width: 100%;
+  }
+
+  &#header {
+    margin: 0 auto;
+    text-align: left;
+    width: 600px;
+  }
+
+  &#body {
+    background-color: $message-background-color;
+    border: 1px solid #000;
+    border-radius: 4px;
+    margin: 0 auto;
+    width: 600px;
+  }
+
+  &#footer {
+    color: $footer-link-color;
+    font-size: 14px;
+    text-align: center;
+    width: 100%;
+  }
+
+  td {
+    &#body-container {
+      padding: 20px 40px;
+    }
+  }
+}
+
+.center {
+  text-align: center;
+}
+
+#logo {
+  border: none;
+  outline: none;
+  min-height: 88px;
+  width: 134px;
+}
+
+#content {
+  h2 {
+    color: $header-color;
+    font-size: 30px;
+    font-weight: 400;
+    line-height: 34px;
+    margin-top: 0;
+  }
+
+  p {
+    color: $body-color;
+    font-size: 17px;
+    line-height: 24px;
+    margin-bottom: 0;
+  }
+}
+
+#cta {
+  border: 1px solid $cta-color;
+  border-radius: 3px;
+  display: inline-block;
+  margin: 20px 0;
+  padding: 12px 24px;
+
+  a {
+    background-color: $message-background-color;
+    color: $cta-color;
+    display: inline-block;
+    text-decoration: none;
+  }
+}
+
+#tanuki {
+  padding: 40px 0 0;
+
+  img {
+    border: none;
+    outline: none;
+    width: 37px;
+    min-height: 36px;
+  }
+}
+
+#tagline {
+  font-size: 22px;
+  font-weight: 100;
+  padding: 4px 0 40px;
+}
+
+#social {
+  padding: 0 10px 20px;
+  width: 600px;
+  word-spacing: 20px;
+
+  a {
+    color: $footer-link-color;
+    text-decoration: none;
+  }
+}
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index b616add283a..415f6e12885 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -1,4 +1,6 @@
 class DeviseMailer < Devise::Mailer
   default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>"
   default reply_to: Gitlab.config.gitlab.email_reply_to
+
+  layout 'devise_mailer'
 end
diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
new file mode 100644
index 00000000000..086bb8e083d
--- /dev/null
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -0,0 +1,16 @@
+.center
+  - if @resource.unconfirmed_email.present?
+    #content
+      %h2= @resource.unconfirmed_email
+      %p Click the link below to confirm your email address.
+    #cta
+      = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)
+  - else
+    #content
+      - if Gitlab.com?
+        %h2 Thanks for signing up to GitLab!
+      - else
+        %h2 Welcome, #{@resource.name}!
+      %p To get started, click the link below to confirm your account.
+    #cta
+      = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token)
diff --git a/app/views/layouts/devise_mailer.html.haml b/app/views/layouts/devise_mailer.html.haml
new file mode 100644
index 00000000000..c258eafdd51
--- /dev/null
+++ b/app/views/layouts/devise_mailer.html.haml
@@ -0,0 +1,34 @@
+!!! 5
+%html
+  %head
+    %meta(content='text/html; charset=UTF-8' http-equiv='Content-Type')
+    = stylesheet_link_tag 'mailers/devise'
+
+  %body
+    %table#wrapper
+      %tr
+        %td
+          %table#header
+            %td{valign: "top"}
+              = image_tag('mailers/gitlab_header_logo.png', id: 'logo', alt: 'GitLab Wordmark')
+
+          %table#body
+            %tr
+              %td#body-container
+                = yield
+
+          - if Gitlab.com?
+            %table#footer
+              %tr
+                %td#tanuki
+                  = image_tag('mailers/gitlab_tanuki_2x.png', alt: 'GitLab Logo')
+              %tr
+                %td#tagline
+                  Everyone can contribute
+              %tr
+                %td#social
+                  = link_to 'Blog',     'https://about.gitlab.com/blog/'
+                  = link_to 'Twitter',  'https://twitter.com/gitlab'
+                  = link_to 'Facebook', 'https://www.facebook.com/gitlab/'
+                  = link_to 'YouTube',  'https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg'
+                  = link_to 'LinkedIn', 'https://www.linkedin.com/company/gitlab-com'
diff --git a/config/application.rb b/config/application.rb
index 0e5a77285e5..de2bb08c978 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -80,7 +80,7 @@ module Gitlab
     config.assets.precompile << "*.png"
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
-    config.assets.precompile << "mailers/repository_push_email.css"
+    config.assets.precompile << "mailers/*.css"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
diff --git a/spec/mailers/previews/devise_mailer_preview.rb b/spec/mailers/previews/devise_mailer_preview.rb
index 8a4d6e7250e..dc3062a4332 100644
--- a/spec/mailers/previews/devise_mailer_preview.rb
+++ b/spec/mailers/previews/devise_mailer_preview.rb
@@ -1,6 +1,6 @@
 class DeviseMailerPreview < ActionMailer::Preview
   def confirmation_instructions_for_signup
-    user = User.new(email: 'signup@example.com')
+    user = User.new(name: 'Jane Doe', email: 'signup@example.com')
     DeviseMailer.confirmation_instructions(user, 'faketoken', {})
   end
 

From 8083bc234a8ca9ef4eee2a4f0cb44e2f73cf33bc Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 14 Apr 2016 16:02:22 -0400
Subject: [PATCH 0794/1431] Don't remove IDs via premailer

This makes it easier to debug style rules.
---
 config/initializers/premailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/premailer.rb b/config/initializers/premailer.rb
index b9176688bc4..cb00d3cfe95 100644
--- a/config/initializers/premailer.rb
+++ b/config/initializers/premailer.rb
@@ -3,6 +3,6 @@ Premailer::Rails.config.merge!(
   generate_text_part: false,
   preserve_styles: true,
   remove_comments: true,
-  remove_ids: true,
+  remove_ids: false,
   remove_scripts: false
 )

From 91483bfeb718c7cede4dcc2372053195ea9a0c65 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 25 May 2016 16:56:44 -0400
Subject: [PATCH 0795/1431] Add CHANGELOG entry for redesigned confirmation
 emails

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

diff --git a/CHANGELOG b/CHANGELOG
index 4a38505eeea..1ad98fbc9f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Allow forking projects with restricted visibility level
   - Redesign navigation for project pages
+  - Redesign account and email confirmation emails
   - Use gitlab-shell v3.0.0
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)

From ce727ab6e6e75a760f72cfd9ce36092aeb41c7da Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 25 May 2016 17:13:20 -0400
Subject: [PATCH 0796/1431] Fix RuboCop

---
 spec/features/issues/filter_issues_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index bfbd06a29e2..1f0594e6b02 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -186,7 +186,7 @@ describe 'Filter issues', feature: true do
         fill_in 'issue_search', with: 'testing'
 
         page.within '.issues-list' do
-          expect(page).to_not have_selector('.issue')
+          expect(page).not_to have_selector('.issue')
         end
       end
     end

From 6d2a0a6b9b97570b07c3b3aec74c6420b1919403 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 25 May 2016 16:57:20 -0400
Subject: [PATCH 0797/1431] Remove main_language and tests

---
 app/models/repository.rb                      |  6 ---
 app/services/git_push_service.rb              | 17 --------
 app/views/shared/projects/_project.html.haml  |  3 --
 ...5328_remove_main_language_from_projects.rb | 21 +++++++++
 db/schema.rb                                  |  3 +-
 spec/features/issues/filter_issues_spec.rb    |  2 +-
 spec/models/repository_spec.rb                | 12 ------
 spec/services/git_push_service_spec.rb        | 43 -------------------
 8 files changed, 23 insertions(+), 84 deletions(-)
 create mode 100644 db/migrate/20160525205328_remove_main_language_from_projects.rb

diff --git a/app/models/repository.rb b/app/models/repository.rb
index ecc8795c954..1ab163510bf 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -972,12 +972,6 @@ class Repository
     end
   end
 
-  def main_language
-    return unless head_exists?
-
-    Linguist::Repository.new(rugged, rugged.head.target_id).language
-  end
-
   def avatar
     return nil unless exists?
 
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 66136b62617..a886f35981f 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -53,10 +53,6 @@ class GitPushService < BaseService
     # could cause the last commit of a merge request to change.
     update_merge_requests
 
-    # Checks if the main language has changed in the project and if so
-    # it updates it accordingly
-    update_main_language
-
     perform_housekeeping
   end
 
@@ -64,19 +60,6 @@ class GitPushService < BaseService
     @project.repository.copy_gitattributes(params[:ref])
   end
 
-  def update_main_language
-    # Performance can be bad so for now only check main_language once
-    # See https://gitlab.com/gitlab-org/gitlab-ce/issues/14937
-    return if @project.main_language.present?
-
-    return unless is_default_branch?
-    return unless push_to_new_branch? || push_to_existing_branch?
-
-    current_language = @project.repository.main_language
-    @project.update_attributes(main_language: current_language)
-    true
-  end
-
   protected
 
   def update_merge_requests
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 9ef021747a5..b8b66d08db8 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -12,9 +12,6 @@
 %li.project-row{ class: css_class }
   = cache(cache_key) do
     .controls
-      - if project.main_language
-        %span
-          = project.main_language
       - if project.commit.try(:status)
         %span
           = render_commit_status(project.commit)
diff --git a/db/migrate/20160525205328_remove_main_language_from_projects.rb b/db/migrate/20160525205328_remove_main_language_from_projects.rb
new file mode 100644
index 00000000000..0f9d60c385f
--- /dev/null
+++ b/db/migrate/20160525205328_remove_main_language_from_projects.rb
@@ -0,0 +1,21 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class RemoveMainLanguageFromProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # When using the methods "add_concurrent_index" or "add_column_with_default"
+  # you must disable the use of transactions as these methods can not run in an
+  # existing transaction. When using "add_concurrent_index" make sure that this
+  # method is the _only_ method called in the migration, any other changes
+  # should go in a separate migration. This ensures that upon failure _only_ the
+  # index creation fails and can be retried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+  def change
+    remove_column :projects, :main_language
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index aee5fb90937..b42eef08a00 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: 20160516174813) do
+ActiveRecord::Schema.define(version: 20160525205328) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -760,7 +760,6 @@ ActiveRecord::Schema.define(version: 20160516174813) do
     t.integer  "build_timeout",                default: 3600,     null: false
     t.boolean  "pending_delete",               default: false
     t.boolean  "public_builds",                default: true,     null: false
-    t.string   "main_language"
     t.integer  "pushes_since_gc",              default: 0
     t.boolean  "last_repository_check_failed"
     t.datetime "last_repository_check_at"
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index bfbd06a29e2..1f0594e6b02 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -186,7 +186,7 @@ describe 'Filter issues', feature: true do
         fill_in 'issue_search', with: 'testing'
 
         page.within '.issues-list' do
-          expect(page).to_not have_selector('.issue')
+          expect(page).not_to have_selector('.issue')
         end
       end
     end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 92ec51eabd4..8c2347992f1 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -829,18 +829,6 @@ describe Repository, models: true do
     end
   end
 
-  describe "#main_language" do
-    it 'shows the main language of the project' do
-      expect(repository.main_language).to eq("Ruby")
-    end
-
-    it 'returns nil when the repository is empty' do
-      allow(repository).to receive(:empty?).and_return(true)
-
-      expect(repository.main_language).to be_nil
-    end
-  end
-
   describe '#before_remove_tag' do
     it 'flushes the tag cache' do
       expect(repository).to receive(:expire_tag_count_cache)
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index eeab540c2fd..18692f1279a 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -158,49 +158,6 @@ describe GitPushService, services: true do
     end
   end
 
-  describe "Updates main language" do
-    context "before push" do
-      it { expect(project.main_language).to eq(nil) }
-    end
-
-    context "after push" do
-      def execute
-        execute_service(project, user, @oldrev, @newrev, ref)
-      end
-
-      context "to master" do
-        let(:ref) { @ref }
-
-        context 'when main_language is nil' do
-          it 'obtains the language from the repository' do
-            expect(project.repository).to receive(:main_language)
-            execute
-          end
-
-          it 'sets the project main language' do
-            execute
-            expect(project.main_language).to eq("Ruby")
-          end
-        end
-
-        context 'when main_language is already set' do
-          it 'does not check the repository' do
-            execute # do an initial run to simulate lang being preset
-            expect(project.repository).not_to receive(:main_language)
-            execute
-          end
-        end
-      end
-
-      context "to other branch" do
-        let(:ref) { 'refs/heads/feature/branch' }
-
-        it { expect(project.main_language).to eq(nil) }
-      end
-    end
-  end
-
-
   describe "Updates git attributes" do
     context "for default branch" do
       it "calls the copy attributes method for the first push to the default branch" do

From ee0d3abcb8b3c8572be9dac1926c3f77f2636a9e Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 25 May 2016 15:04:21 -0600
Subject: [PATCH 0798/1431] Update state_machines-activerecord from 0.3.0 to
 0.4.0.

No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master

Includes Rails 5 support.
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index e854a31b425..c236f37e14a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -121,7 +121,7 @@ group :unicorn do
 end
 
 # State machine
-gem "state_machines-activerecord", '~> 0.3.0'
+gem "state_machines-activerecord", '~> 0.4.0'
 # Run events after state machine commits
 gem 'after_commit_queue'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4533aa31d5f..dbc0fd15ef4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -790,11 +790,11 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     state_machines (0.4.0)
-    state_machines-activemodel (0.3.0)
-      activemodel (~> 4.1)
+    state_machines-activemodel (0.4.0)
+      activemodel (>= 4.1, < 5.1)
       state_machines (>= 0.4.0)
-    state_machines-activerecord (0.3.0)
-      activerecord (~> 4.1)
+    state_machines-activerecord (0.4.0)
+      activerecord (>= 4.1, < 5.1)
       state_machines-activemodel (>= 0.3.0)
     stringex (2.5.2)
     systemu (2.6.5)
@@ -1043,7 +1043,7 @@ DEPENDENCIES
   spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
-  state_machines-activerecord (~> 0.3.0)
+  state_machines-activerecord (~> 0.4.0)
   task_list (~> 1.0.2)
   teaspoon (~> 1.1.0)
   teaspoon-jasmine (~> 2.2.0)

From 84fee47a763b6f1dda8b58e66c893cd8cf6dda8e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 12 May 2016 08:23:31 -0500
Subject: [PATCH 0799/1431] Start scrolling tabs design

---
 app/assets/javascripts/layout_nav.js.coffee | 19 ++++++++++++++
 app/assets/stylesheets/framework/nav.scss   | 29 +++++++++++++++++++++
 app/views/layouts/nav/_group.html.haml      |  3 ++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/layout_nav.js.coffee

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
new file mode 100644
index 00000000000..2f2f5aa85c5
--- /dev/null
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -0,0 +1,19 @@
+class @LayoutNav
+  $(document).ready ->
+    $('#scrolling-tabs').on 'scroll', ->
+      cur = $(this).scrollLeft()
+      if cur == 0
+        return
+      else
+        max = 289
+        console.log "MAX:" + max
+        console.log "CUR:" + cur
+        if cur == max
+          $('.fa-arrow-right').addClass('end-scroll')
+          $('.nav-links').addClass('end-scroll')
+        else
+          $('.fa-arrow-right').removeClass('end-scroll')
+          $('.nav-links').removeClass('end-scroll')
+      return
+    $('#scrolling-tabs').trigger 'scroll'
+    return
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index ee4f573f91b..83c27eada3d 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -256,6 +256,30 @@
       display: none;
     }
 
+    .fa-arrow-right {
+      display: none;
+      position: absolute;
+      color: #7e7c7c;
+      bottom: 11px;
+      right: 0;
+      padding: 10px 10px 10px 25px;
+      background: -webkit-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
+
+      &.end-scroll {
+        opacity: 0;
+        transition-duration: .3s;
+      }
+    }
+
+    @media (max-width: 790px) {
+      margin-right: 19px;
+
+      .fa-arrow-right {
+        display: block;
+        transition-duration: .3s;
+      }
+    }
+
     li {
 
       a {
@@ -276,6 +300,11 @@
         color: $gl-icon-color;
       }
     }
+
+    &.end-scroll {
+      margin-right: 0;
+      transition-duration: .3s;
+    }
   }
 
 }
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 3438005863a..781c0651253 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,6 +1,6 @@
 = render 'layouts/nav/group_settings'
 
-%ul.nav-links
+%ul.nav-links#scrolling-tabs
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: 'Home' do
       = icon('group fw')
@@ -35,3 +35,4 @@
       = icon('users fw')
       %span
         Members
+  = icon('arrow-right')

From 65a175bbd9d5e5a8f6937bcbee9505c67f168b38 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 16 May 2016 14:58:15 -0500
Subject: [PATCH 0800/1431] Remove arrows from mobile scroll fade out

---
 app/assets/javascripts/layout_nav.js.coffee   | 24 ++----
 app/assets/stylesheets/framework/nav.scss     | 36 +++++----
 app/assets/stylesheets/framework/sidebar.scss |  2 +-
 app/helpers/nav_helper.rb                     |  4 +
 app/views/layouts/nav/_group.html.haml        | 75 ++++++++++---------
 app/views/layouts/nav/_profile.html.haml      |  3 +-
 6 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index 2f2f5aa85c5..4586702bc2c 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -1,19 +1,11 @@
 class @LayoutNav
-  $(document).ready ->
+  $ ->
     $('#scrolling-tabs').on 'scroll', ->
-      cur = $(this).scrollLeft()
-      if cur == 0
-        return
+      currentPosition = $(this).scrollLeft()
+      return if currentPosition == 0
+      if $('.nav-control').length
+        maxPosition = $(this)[0].scrollWidth - $(this).parent().width() + 59
       else
-        max = 289
-        console.log "MAX:" + max
-        console.log "CUR:" + cur
-        if cur == max
-          $('.fa-arrow-right').addClass('end-scroll')
-          $('.nav-links').addClass('end-scroll')
-        else
-          $('.fa-arrow-right').removeClass('end-scroll')
-          $('.nav-links').removeClass('end-scroll')
-      return
-    $('#scrolling-tabs').trigger 'scroll'
-    return
+        maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
+
+      $('.fade-out').toggleClass('end-scroll', currentPosition is maxPosition)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 83c27eada3d..fe3a2aa26be 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -256,14 +256,18 @@
       display: none;
     }
 
-    .fa-arrow-right {
-      display: none;
+    .fade-out {
+      opacity: 1;
       position: absolute;
-      color: #7e7c7c;
-      bottom: 11px;
+      bottom: 10px;
       right: 0;
-      padding: 10px 10px 10px 25px;
+      width: 43px;
+      height: 35px;
+      -webkit-transform: translateZ(0);
       background: -webkit-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
+      background: -o-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
+      background: -moz-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
+      background: linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
 
       &.end-scroll {
         opacity: 0;
@@ -272,10 +276,7 @@
     }
 
     @media (max-width: 790px) {
-      margin-right: 19px;
-
-      .fa-arrow-right {
-        display: block;
+      .fade-out {
         transition-duration: .3s;
       }
     }
@@ -300,13 +301,20 @@
         color: $gl-icon-color;
       }
     }
-
-    &.end-scroll {
-      margin-right: 0;
-      transition-duration: .3s;
-    }
   }
 
+  .nav-control {
+    .fade-out {
+      right: 58px;
+
+      @media (min-width: $screen-xs-max) {
+        right: 67px;
+      }
+      @media (max-width: $screen-xs-min) {
+        right: 0;
+      }
+    }
+  }
 }
 
 .page-with-layout-nav {
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f90d7a806d3..67f491b6d9c 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -324,7 +324,7 @@
 
   .layout-nav {
     @media (max-width: $screen-xs-min) {
-      padding-right: 0;;
+      padding-right: 0;
     }
 
     @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index fbb799eecd3..597a12cd53b 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -51,4 +51,8 @@ module NavHelper
   def layout_dropdown_class
     "controls-dropdown-visible" if current_user
   end
+
+  def nav_control_class
+    "nav-control" if current_user
+  end
 end
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 781c0651253..ba4a7092655 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,38 +1,39 @@
-= render 'layouts/nav/group_settings'
+%div{ class: nav_control_class }
+  = render 'layouts/nav/group_settings'
 
-%ul.nav-links#scrolling-tabs
-  = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
-    = link_to group_path(@group), title: 'Home' do
-      = icon('group fw')
-      %span
-        Group
-  = nav_link(path: 'groups#activity') do
-    = link_to activity_group_path(@group), title: 'Activity' do
-      = icon('dashboard fw')
-      %span
-        Activity
-  = nav_link(controller: [:group, :milestones]) do
-    = link_to group_milestones_path(@group), title: 'Milestones' do
-      = icon('clock-o fw')
-      %span
-        Milestones
-  = nav_link(path: 'groups#issues') do
-    = link_to issues_group_path(@group), title: 'Issues' do
-      = icon('exclamation-circle fw')
-      %span
-        Issues
-        - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.badge.count= number_with_delimiter(issues.count)
-  = nav_link(path: 'groups#merge_requests') do
-    = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
-      = icon('tasks fw')
-      %span
-        Merge Requests
-        - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.badge.count= number_with_delimiter(merge_requests.count)
-  = nav_link(controller: [:group_members]) do
-    = link_to group_group_members_path(@group), title: 'Members' do
-      = icon('users fw')
-      %span
-        Members
-  = icon('arrow-right')
+  %ul.nav-links#scrolling-tabs
+    = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
+      = link_to group_path(@group), title: 'Home' do
+        = icon('group fw')
+        %span
+          Group
+    = nav_link(path: 'groups#activity') do
+      = link_to activity_group_path(@group), title: 'Activity' do
+        = icon('dashboard fw')
+        %span
+          Activity
+    = nav_link(controller: [:group, :milestones]) do
+      = link_to group_milestones_path(@group), title: 'Milestones' do
+        = icon('clock-o fw')
+        %span
+          Milestones
+    = nav_link(path: 'groups#issues') do
+      = link_to issues_group_path(@group), title: 'Issues' do
+        = icon('exclamation-circle fw')
+        %span
+          Issues
+          - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
+          %span.badge.count= number_with_delimiter(issues.count)
+    = nav_link(path: 'groups#merge_requests') do
+      = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
+        = icon('tasks fw')
+        %span
+          Merge Requests
+          - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
+          %span.badge.count= number_with_delimiter(merge_requests.count)
+    = nav_link(controller: [:group_members]) do
+      = link_to group_group_members_path(@group), title: 'Members' do
+        = icon('users fw')
+        %span
+          Members
+    .fade-out
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index d730840d63a..d3d733d5999 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,4 +1,4 @@
-%ul.nav-links
+%ul.nav-links#scrolling-tabs
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: 'Profile Settings' do
       = icon('user fw')
@@ -47,3 +47,4 @@
       = icon('history fw')
       %span
         Audit Log
+  .fade-out

From e8fcd4641a2ef67df2e94b7f161c1a061cd5eb77 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 18 May 2016 09:47:54 -0500
Subject: [PATCH 0801/1431] Check screen width before increasing max position

---
 app/assets/javascripts/layout_nav.js.coffee | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index 4586702bc2c..613243427cc 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -3,9 +3,7 @@ class @LayoutNav
     $('#scrolling-tabs').on 'scroll', ->
       currentPosition = $(this).scrollLeft()
       return if currentPosition == 0
-      if $('.nav-control').length
-        maxPosition = $(this)[0].scrollWidth - $(this).parent().width() + 59
-      else
-        maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
+      maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
+      maxPosition += 59 if $('.nav-control').length and window.innerWidth > 480
 
       $('.fade-out').toggleClass('end-scroll', currentPosition is maxPosition)

From 7876d27db8b330f3c5e306f1c2e657a8b0df8819 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 18 May 2016 10:48:10 -0500
Subject: [PATCH 0802/1431] Move fade out div

---
 app/assets/stylesheets/framework/nav.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index fe3a2aa26be..9f5f2f81b8c 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -259,10 +259,10 @@
     .fade-out {
       opacity: 1;
       position: absolute;
-      bottom: 10px;
+      bottom: 16px;
       right: 0;
       width: 43px;
-      height: 35px;
+      height: 30px;
       -webkit-transform: translateZ(0);
       background: -webkit-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
       background: -o-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);

From 77c7fb1469446c76c84ce5883d99e0e3debaf515 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 18 May 2016 11:38:12 -0500
Subject: [PATCH 0803/1431] Fix coffeescript; remove fade out div so area is
 clickable; remove scrollbar on chrome

---
 app/assets/javascripts/layout_nav.js.coffee | 6 ++++--
 app/assets/stylesheets/framework/nav.scss   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index 613243427cc..2f14e3f35ac 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -2,8 +2,10 @@ class @LayoutNav
   $ ->
     $('#scrolling-tabs').on 'scroll', ->
       currentPosition = $(this).scrollLeft()
-      return if currentPosition == 0
+      return if currentPosition is 0
+      mobileScreenWidth = 480
+      controlBtnWidth = $('.controls').width()
       maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
-      maxPosition += 59 if $('.nav-control').length and window.innerWidth > 480
+      maxPosition += controlBtnWidth if $('.nav-control').length and $(window).width() > mobileScreenWidth
 
       $('.fade-out').toggleClass('end-scroll', currentPosition is maxPosition)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 9f5f2f81b8c..bf5981bef8b 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -257,6 +257,7 @@
     }
 
     .fade-out {
+      visibility: visible;
       opacity: 1;
       position: absolute;
       bottom: 16px;
@@ -270,6 +271,7 @@
       background: linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
 
       &.end-scroll {
+        visibility: hidden;
         opacity: 0;
         transition-duration: .3s;
       }

From 3c3402b0ae4c2f70cc421d97ad9605a9abeb9398 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 11:30:53 -0500
Subject: [PATCH 0804/1431] Add fade out to left side of layout nav; remove
 dropdown nav helper; remove controls button from mobile

---
 app/assets/javascripts/layout_nav.js.coffee |  6 +-
 app/assets/stylesheets/framework/nav.scss   | 64 ++++++++++-----------
 app/helpers/nav_helper.rb                   |  4 --
 app/views/layouts/_page.html.haml           |  2 +-
 app/views/layouts/nav/_group.html.haml      |  3 +-
 app/views/layouts/nav/_profile.html.haml    |  3 +-
 6 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index 2f14e3f35ac..43dc941a82f 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -1,11 +1,13 @@
 class @LayoutNav
   $ ->
+    $('.fade-left').addClass('end-scroll')
     $('#scrolling-tabs').on 'scroll', ->
       currentPosition = $(this).scrollLeft()
-      return if currentPosition is 0
+      $('.fade-left').toggleClass('end-scroll', currentPosition is 0)
+
       mobileScreenWidth = 480
       controlBtnWidth = $('.controls').width()
       maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
       maxPosition += controlBtnWidth if $('.nav-control').length and $(window).width() > mobileScreenWidth
 
-      $('.fade-out').toggleClass('end-scroll', currentPosition is maxPosition)
+      $('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index bf5981bef8b..260127e3111 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,3 +1,24 @@
+@mixin fade($gradient-direction) {
+  visibility: visible;
+  opacity: 1;
+  position: absolute;
+  bottom: 16px;
+  width: 43px;
+  height: 30px;
+  transition-duration: .3s;
+  -webkit-transform: translateZ(0);
+  background: -webkit-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+  background: -o-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+  background: -moz-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+  background: linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+
+  &.end-scroll {
+    visibility: hidden;
+    opacity: 0;
+    transition-duration: .3s;
+  }
+}
+
 .nav-links {
   padding: 0;
   margin: 0;
@@ -210,12 +231,7 @@
     padding: 7px 0 0;
 
     @media (max-width: $screen-xs-min) {
-      float: none;
-      padding: 0 9px;
-
-      .dropdown-new {
-        width: 100%;
-      }
+      display: none;
     }
 
     i {
@@ -256,31 +272,14 @@
       display: none;
     }
 
-    .fade-out {
-      visibility: visible;
-      opacity: 1;
-      position: absolute;
-      bottom: 16px;
+    .fade-right {
+      @include fade(left);
       right: 0;
-      width: 43px;
-      height: 30px;
-      -webkit-transform: translateZ(0);
-      background: -webkit-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
-      background: -o-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
-      background: -moz-linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
-      background: linear-gradient(left, rgba(250, 250, 250, 0.4), $background-color 45%);
-
-      &.end-scroll {
-        visibility: hidden;
-        opacity: 0;
-        transition-duration: .3s;
-      }
     }
 
-    @media (max-width: 790px) {
-      .fade-out {
-        transition-duration: .3s;
-      }
+    .fade-left {
+      @include fade(right);
+      left: 0;
     }
 
     li {
@@ -306,7 +305,8 @@
   }
 
   .nav-control {
-    .fade-out {
+
+    .fade-right {
       right: 58px;
 
       @media (min-width: $screen-xs-max) {
@@ -322,12 +322,6 @@
 .page-with-layout-nav {
   margin-top: $header-height + 2;
 
-  &.controls-dropdown-visible {
-    @media (max-width: $screen-xs-min) {
-      margin-top: 96px;
-    }
-  }
-
   .right-sidebar {
     top: ($header-height * 2) + 2;
   }
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 597a12cd53b..f685e547537 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -48,10 +48,6 @@ module NavHelper
     "page-with-layout-nav" if defined?(nav) && nav
   end
 
-  def layout_dropdown_class
-    "controls-dropdown-visible" if current_user
-  end
-
   def nav_control_class
     "nav-control" if current_user
   end
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 5be0b546a62..1e961853c70 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -25,7 +25,7 @@
     .layout-nav
       .container-fluid
         = render "layouts/nav/#{nav}"
-  .content-wrapper{ class: "#{layout_nav_class} #{layout_dropdown_class}" }
+  .content-wrapper{ class: "#{layout_nav_class}" }
     = render "layouts/broadcast"
     = render "layouts/flash"
     = yield :flash_message
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index ba4a7092655..9b8319c51ca 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -2,6 +2,7 @@
   = render 'layouts/nav/group_settings'
 
   %ul.nav-links#scrolling-tabs
+    .fade-left
     = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
       = link_to group_path(@group), title: 'Home' do
         = icon('group fw')
@@ -36,4 +37,4 @@
         = icon('users fw')
         %span
           Members
-    .fade-out
+    .fade-right
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index d3d733d5999..a31584c7f81 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,4 +1,5 @@
 %ul.nav-links#scrolling-tabs
+  .fade-left
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: 'Profile Settings' do
       = icon('user fw')
@@ -47,4 +48,4 @@
       = icon('history fw')
       %span
         Audit Log
-  .fade-out
+  .fade-right

From 1a1eaf481a19cbeedaf5b6137eef73031f33e3d2 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 16:06:40 -0500
Subject: [PATCH 0805/1431] Refactor nav links css

---
 app/assets/stylesheets/framework/nav.scss | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 260127e3111..182dd05225f 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -274,7 +274,14 @@
 
     .fade-right {
       @include fade(left);
-      right: 0;
+      right: 58px;
+
+      @media (min-width: $screen-xs-max) {
+        right: 67px;
+      }
+      @media (max-width: $screen-xs-min) {
+        right: 0;
+      }
     }
 
     .fade-left {
@@ -303,20 +310,6 @@
       }
     }
   }
-
-  .nav-control {
-
-    .fade-right {
-      right: 58px;
-
-      @media (min-width: $screen-xs-max) {
-        right: 67px;
-      }
-      @media (max-width: $screen-xs-min) {
-        right: 0;
-      }
-    }
-  }
 }
 
 .page-with-layout-nav {

From 1965ec6324d7a67aec485b98030794657624d3ec Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 24 May 2016 17:14:14 -0500
Subject: [PATCH 0806/1431] Add fade to project nav; fix bug with controls

---
 app/assets/stylesheets/framework/nav.scss |  22 ++-
 app/views/layouts/nav/_project.html.haml  | 194 +++++++++++-----------
 2 files changed, 113 insertions(+), 103 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 182dd05225f..59e9a036f71 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -274,14 +274,7 @@
 
     .fade-right {
       @include fade(left);
-      right: 58px;
-
-      @media (min-width: $screen-xs-max) {
-        right: 67px;
-      }
-      @media (max-width: $screen-xs-min) {
-        right: 0;
-      }
+      right: 0;
     }
 
     .fade-left {
@@ -310,6 +303,19 @@
       }
     }
   }
+
+  .nav-control {
+    .fade-right {
+      right: 58px;
+
+      @media (min-width: $screen-xs-max) {
+        right: 67px;
+      }
+      @media (max-width: $screen-xs-min) {
+        right: 0;
+      }
+    }
+  }
 }
 
 .page-with-layout-nav {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 33ba654bbee..bffa583fda3 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -19,113 +19,117 @@
               data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
               Leave Project
 
-%ul.nav-links
-  = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
-    = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
-      = icon('bookmark fw')
-      %span
-        Project
-  = nav_link(path: 'projects#activity') do
-    = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-      = icon('dashboard fw')
-      %span
-        Activity
-  - if project_nav_tab? :files
-    = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
-      = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
-        = icon('files-o fw')
+%div{ class: nav_control_class }
+  %ul.nav-links#scrolling-tabs
+    .fade-left
+    = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
+      = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
+        = icon('bookmark fw')
         %span
-          Files
-
-  - if project_nav_tab? :commits
-    = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
-      = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
-        = icon('history fw')
+          Project
+    = nav_link(path: 'projects#activity') do
+      = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
+        = icon('dashboard fw')
         %span
-          Commits
+          Activity
+    - if project_nav_tab? :files
+      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+        = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
+          = icon('files-o fw')
+          %span
+            Files
 
-  - if project_nav_tab? :pipelines
-    = nav_link(controller: :pipelines) do
-      = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
-        = icon('ship fw')
-        %span
-          Pipelines
-          %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
+    - if project_nav_tab? :commits
+      = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
+        = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
+          = icon('history fw')
+          %span
+            Commits
 
-  - if project_nav_tab? :builds
-    = nav_link(controller: %w(builds)) do
-      = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
-        = icon('cubes fw')
-        %span
-          Builds
-          %span.badge.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
+    - if project_nav_tab? :pipelines
+      = nav_link(controller: :pipelines) do
+        = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
+          = icon('ship fw')
+          %span
+            Pipelines
+            %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
 
-  - if project_nav_tab? :container_registry
-    = nav_link(controller: %w(container_registry)) do
-      = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
-        = icon('hdd-o fw')
-        %span
-          Container Registry
+    - if project_nav_tab? :builds
+      = nav_link(controller: %w(builds)) do
+        = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+          = icon('cubes fw')
+          %span
+            Builds
+            %span.badge.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
-  - if project_nav_tab? :graphs
-    = nav_link(controller: %w(graphs)) do
-      = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
-        = icon('area-chart fw')
-        %span
-          Graphs
+    - if project_nav_tab? :container_registry
+      = nav_link(controller: %w(container_registry)) do
+        = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
+          = icon('hdd-o fw')
+          %span
+            Container Registry
 
-  - if project_nav_tab? :milestones
-    = nav_link(controller: :milestones) do
-      = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-        = icon('clock-o fw')
-        %span
-          Milestones
+    - if project_nav_tab? :graphs
+      = nav_link(controller: %w(graphs)) do
+        = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
+          = icon('area-chart fw')
+          %span
+            Graphs
 
-  - if project_nav_tab? :issues
-    = nav_link(controller: :issues) do
-      = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
-        = icon('exclamation-circle fw')
-        %span
-          Issues
-          - if @project.default_issues_tracker?
-            %span.badge.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
+    - if project_nav_tab? :milestones
+      = nav_link(controller: :milestones) do
+        = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+          = icon('clock-o fw')
+          %span
+            Milestones
 
-  - if project_nav_tab? :merge_requests
-    = nav_link(controller: :merge_requests) do
-      = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
-        = icon('tasks fw')
-        %span
-          Merge Requests
-          %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
+    - if project_nav_tab? :issues
+      = nav_link(controller: :issues) do
+        = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
+          = icon('exclamation-circle fw')
+          %span
+            Issues
+            - if @project.default_issues_tracker?
+              %span.badge.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
 
-  - if project_nav_tab? :labels
-    = nav_link(controller: :labels) do
-      = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
-        = icon('tags fw')
-        %span
-          Labels
+    - if project_nav_tab? :merge_requests
+      = nav_link(controller: :merge_requests) do
+        = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+          = icon('tasks fw')
+          %span
+            Merge Requests
+            %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
 
-  - if project_nav_tab? :wiki
-    = nav_link(controller: :wikis) do
-      = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
-        = icon('book fw')
-        %span
-          Wiki
+    - if project_nav_tab? :labels
+      = nav_link(controller: :labels) do
+        = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+          = icon('tags fw')
+          %span
+            Labels
 
-  - if project_nav_tab? :snippets
-    = nav_link(controller: :snippets) do
-      = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
-        = icon('clipboard fw')
-        %span
-          Snippets
+    - if project_nav_tab? :wiki
+      = nav_link(controller: :wikis) do
+        = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
+          = icon('book fw')
+          %span
+            Wiki
 
-  -# Global shortcut to network page for compatibility
-  - if project_nav_tab? :network
+    - if project_nav_tab? :snippets
+      = nav_link(controller: :snippets) do
+        = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
+          = icon('clipboard fw')
+          %span
+            Snippets
+
+    -# Global shortcut to network page for compatibility
+    - if project_nav_tab? :network
+      %li.hidden
+        = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
+          Network
+
+    -# Shortcut to create a new issue
     %li.hidden
-      = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
-        Network
+      = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'shortcuts-new-issue' do
+        Create a new issue
 
-  -# Shortcut to create a new issue
-  %li.hidden
-    = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'shortcuts-new-issue' do
-      Create a new issue
+    .fade-right

From 79f890ca8549132699bc8169eff73b5c7ff25699 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 25 May 2016 11:42:43 -0500
Subject: [PATCH 0807/1431] Add fade out to sub nav

---
 app/assets/javascripts/layout_nav.js.coffee |  8 ++--
 app/assets/stylesheets/framework/nav.scss   | 50 +++++++++++++++------
 app/views/layouts/nav/_group.html.haml      |  2 +-
 app/views/layouts/nav/_profile.html.haml    |  2 +-
 app/views/layouts/nav/_project.html.haml    |  2 +-
 app/views/shared/_event_filter.html.haml    |  4 +-
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index 43dc941a82f..3c39ec32f26 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -1,13 +1,13 @@
 class @LayoutNav
   $ ->
     $('.fade-left').addClass('end-scroll')
-    $('#scrolling-tabs').on 'scroll', ->
+    $('.scrolling-tabs').scroll (event) ->
+      el = $(event.target)
       currentPosition = $(this).scrollLeft()
-      $('.fade-left').toggleClass('end-scroll', currentPosition is 0)
-
       mobileScreenWidth = 480
       controlBtnWidth = $('.controls').width()
       maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
       maxPosition += controlBtnWidth if $('.nav-control').length and $(window).width() > mobileScreenWidth
 
-      $('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
+      el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
+      el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 59e9a036f71..fdd60d85db8 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,4 +1,4 @@
-@mixin fade($gradient-direction) {
+@mixin fade($gradient-direction, $rgba, $gradient-color) {
   visibility: visible;
   opacity: 1;
   position: absolute;
@@ -7,10 +7,10 @@
   height: 30px;
   transition-duration: .3s;
   -webkit-transform: translateZ(0);
-  background: -webkit-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
-  background: -o-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
-  background: -moz-linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
-  background: linear-gradient($gradient-direction, rgba(250, 250, 250, 0.4), $background-color 45%);
+  background: -webkit-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
+  background: -o-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
+  background: -moz-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
+  background: linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
 
   &.end-scroll {
     visibility: hidden;
@@ -19,6 +19,16 @@
   }
 }
 
+@mixin scrolling-links() {
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+
 .nav-links {
   padding: 0;
   margin: 0;
@@ -262,23 +272,17 @@
   }
 
   .nav-links {
+    @include scrolling-links();
     border-bottom: none;
     height: 51px;
-    white-space: nowrap;
-    overflow-x: auto;
-    overflow-y: hidden;
-    -webkit-overflow-scrolling: touch;
-    &::-webkit-scrollbar {
-      display: none;
-    }
 
     .fade-right {
-      @include fade(left);
+      @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
       right: 0;
     }
 
     .fade-left {
-      @include fade(right);
+      @include fade(right, rgba(250, 250, 250, 0.4), $background-color);
       left: 0;
     }
 
@@ -318,6 +322,24 @@
   }
 }
 
+.nav-block {
+  position: relative;
+
+  .nav-links {
+    @include scrolling-links();
+
+    .fade-right {
+      @include fade(left, rgba(255, 255, 255, 0.4), $white-light);
+      right: 0;
+    }
+
+    .fade-left {
+      @include fade(right, rgba(255, 255, 255, 0.4), $white-light);
+      left: 0;
+    }
+  }
+}
+
 .page-with-layout-nav {
   margin-top: $header-height + 2;
 
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 9b8319c51ca..de15add3617 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,7 +1,7 @@
 %div{ class: nav_control_class }
   = render 'layouts/nav/group_settings'
 
-  %ul.nav-links#scrolling-tabs
+  %ul.nav-links.scrolling-tabs
     .fade-left
     = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
       = link_to group_path(@group), title: 'Home' do
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index a31584c7f81..2efc6c48a48 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,4 +1,4 @@
-%ul.nav-links#scrolling-tabs
+%ul.nav-links.scrolling-tabs
   .fade-left
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: 'Profile Settings' do
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index bffa583fda3..087b7472701 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -20,7 +20,7 @@
               Leave Project
 
 %div{ class: nav_control_class }
-  %ul.nav-links#scrolling-tabs
+  %ul.nav-links.scrolling-tabs
     .fade-left
     = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
       = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index c38d9313dba..30055002213 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -1,5 +1,7 @@
-%ul.nav-links.event-filter
+%ul.nav-links.event-filter.scrolling-tabs
+  .fade-left
   = event_filter_link EventFilter.push, 'Push events'
   = event_filter_link EventFilter.merged, 'Merge events'
   = event_filter_link EventFilter.comments, 'Comments'
   = event_filter_link EventFilter.team, 'Team'
+  .fade-right

From ec6d456b5023b4a0700a4c9ad8a17ed64b0470e6 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 25 May 2016 17:12:39 -0500
Subject: [PATCH 0808/1431] Change to xs breakpoint, layout_nav updates

---
 app/assets/javascripts/layout_nav.js.coffee | 17 +++++++++--------
 app/assets/stylesheets/framework/nav.scss   |  5 ++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index 3c39ec32f26..6adac6dac97 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -1,13 +1,14 @@
 class @LayoutNav
   $ ->
     $('.fade-left').addClass('end-scroll')
-    $('.scrolling-tabs').scroll (event) ->
-      el = $(event.target)
-      currentPosition = $(this).scrollLeft()
-      mobileScreenWidth = 480
+    $('.scrolling-tabs').on 'scroll', (event) ->
+      $this = $(this)
+      $el = $(event.target)
+      currentPosition = $this.scrollLeft()
+      size = bp.getBreakpointSize()
       controlBtnWidth = $('.controls').width()
-      maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
-      maxPosition += controlBtnWidth if $('.nav-control').length and $(window).width() > mobileScreenWidth
+      maxPosition = $this.get(0).scrollWidth - $this.parent().width()
+      maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
 
-      el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
-      el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
+      $el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
+      $el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index fdd60d85db8..adfe5540704 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -2,7 +2,7 @@
   visibility: visible;
   opacity: 1;
   position: absolute;
-  bottom: 16px;
+  bottom: 12px;
   width: 43px;
   height: 30px;
   transition-duration: .3s;
@@ -240,7 +240,7 @@
     float: right;
     padding: 7px 0 0;
 
-    @media (max-width: $screen-xs-min) {
+    @media (max-width: $screen-xs-max) {
       display: none;
     }
 
@@ -310,7 +310,6 @@
 
   .nav-control {
     .fade-right {
-      right: 58px;
 
       @media (min-width: $screen-xs-max) {
         right: 67px;

From 42879936a84f29252aa100bae0648f87f50ba89c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 09:15:56 +0100
Subject: [PATCH 0809/1431] Hide description on mobile

---
 app/views/projects/services/index.html.haml | 49 ++++++++++-----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index 7b241136f69..4a33a5bc6f6 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -6,28 +6,27 @@
       Project services
     %p Project services allow you to integrate GitLab with other applications
   .col-lg-9
-    .table-responsive
-      %table.table
-        %colgroup
-          %col
-          %col
-          %col
-          %col{ width: "120" }
-        %thead
-          %tr
-            %th
-            %th Service
-            %th Description
-            %th Last edit
-        - @services.sort_by(&:title).each do |service|
-          %tr
-            %td
-              = boolean_to_icon service.activated?
-            %td
-              = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
-                %strong= service.title
-            %td
-              = service.description
-            %td.light
-              = time_ago_in_words service.updated_at
-              ago
+    %table.table
+      %colgroup
+        %col
+        %col
+        %col.hidden-xs
+        %col{ width: "120" }
+      %thead
+        %tr
+          %th
+          %th Service
+          %th.hidden-xs Description
+          %th Last edit
+      - @services.sort_by(&:title).each do |service|
+        %tr
+          %td
+            = boolean_to_icon service.activated?
+          %td
+            = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
+              %strong= service.title
+          %td.hidden-xs
+            = service.description
+          %td.light
+            = time_ago_in_words service.updated_at
+            ago

From bc0666b3c906c990c1a10efc4b0acc73281ea533 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 19 Apr 2016 15:58:20 +0100
Subject: [PATCH 0810/1431] Filter issuables by any user

Closes #2836
---
 app/assets/javascripts/users_select.js.coffee | 12 ++++---
 app/helpers/issuables_helper.rb               |  8 ++---
 app/views/shared/issuable/_filter.html.haml   |  2 +-
 spec/features/issues/filter_issues_spec.rb    | 36 +++++++++++++++++++
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index b80b1b861cc..49d0320701e 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -93,7 +93,9 @@ class @UsersSelect
 
       $dropdown.glDropdown(
         data: (term, callback) =>
-          @users term, (users) =>
+          isAuthorFilter = $('.js-author-search')
+
+          @users term, term is '' and isAuthorFilter, (users) =>
             if term.length is 0
               showDivider = 0
 
@@ -138,7 +140,7 @@ class @UsersSelect
 
         toggleLabel: (selected) ->
           if selected && 'id' of selected
-            selected.name
+            if selected.text then selected.text else selected.name
           else
             defaultLabel
 
@@ -219,7 +221,7 @@ class @UsersSelect
         multiple: $(select).hasClass('multiselect')
         minimumInputLength: 0
         query: (query) =>
-          @users query.term, (users) =>
+          @users query.term, false, (users) =>
             data = { results: users }
 
             if query.term.length == 0
@@ -302,7 +304,7 @@ class @UsersSelect
 
   # Return users list. Filtered by query
   # Only active users retrieved
-  users: (query, callback) =>
+  users: (query, fromProject, callback) =>
     url = @buildUrl(@usersPath)
 
     $.ajax(
@@ -311,7 +313,7 @@ class @UsersSelect
         search: query
         per_page: 20
         active: true
-        project_id: @projectId
+        project_id: @projectId if fromProject
         group_id: @groupId
         current_user: @showCurrentUser
         author_id: @authorId
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 39474217286..a7a6657b948 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -50,14 +50,10 @@ module IssuablesHelper
   end
 
   def user_dropdown_label(user_id, default_label)
+    return default_label if user_id.nil?
     return "Unassigned" if user_id == "0"
 
-    if @project
-      member = @project.team.find_member(user_id)
-      user = member.user if member
-    else
-      user = User.find_by(id: user_id)
-    end
+    user = User.find_by(id: user_id)
 
     if user
       user.name
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 323d563cd4a..cedff4af2e0 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -12,7 +12,7 @@
           - if params[:author_id].present?
             = hidden_field_tag(:author_id, params[:author_id])
           = dropdown_tag(user_dropdown_label(params[:author_id], "Author"), options: { toggle_class: "js-user-search js-filter-submit js-author-search", title: "Filter by author", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit",
-            placeholder: "Search authors", data: { any_user: "Any Author", first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), selected: params[:author_id], field_name: "author_id", default_label: "Author" } })
+            placeholder: "Search authors", data: { any_user: "Any Author", first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), selected: params[:author], field_name: "author_id", default_label: "Author" } })
 
         .filter-item.inline
           - if params[:assignee_id].present?
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 1f0594e6b02..7efbaaa048c 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -294,4 +294,40 @@ describe 'Filter issues', feature: true do
       end
     end
   end
+
+  describe 'filter by any author', js: true do
+    before do
+      user2 = create(:user, name: "tester")
+      create(:issue, project: project, author: user)
+      create(:issue, project: project, author: user2)
+
+      visit namespace_project_issues_path(project.namespace, project)
+    end
+
+    it 'should show filter by any author link' do
+      click_button "Author"
+      fill_in "Search authors", with: "tester"
+
+      page.within ".dropdown-menu-author" do
+        expect(page).to have_content "tester"
+      end
+    end
+
+    it 'should show filter issues by any author' do
+      page.within '.issues-list' do
+        expect(page).to have_selector ".issue", count: 2
+      end
+
+      click_button "Author"
+      fill_in "Search authors", with: "tester"
+
+      page.within ".dropdown-menu-author" do
+        click_link "tester"
+      end
+
+      page.within '.issues-list' do
+        expect(page).to have_selector ".issue", count: 1
+      end
+    end
+  end
 end

From bf484ffee458023ba890e64fbd314ad45ece9ba8 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 26 May 2016 11:25:35 +0200
Subject: [PATCH 0811/1431] fix bad refactoring of import data credentials

---
 lib/gitlab/gitlab_import/importer.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index 3e51c06877e..e32ef8a44c2 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,9 +5,9 @@ module Gitlab
 
       def initialize(project)
         @project = project
-        credentials = project.import_data
-        if credentials && credentials[:password]
-          @client = Client.new(credentials[:password])
+        import_data = project.import_data
+        if import_data && import_data.credentials && import_data.credentials[:password]
+          @client = Client.new(import_data.credentials[:password])
           @formatter = Gitlab::ImportFormatter.new
         else
           raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}"

From 5bf191c60ee1cbf730252dc1a4cab3446a6a3dde Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 26 May 2016 11:29:02 +0200
Subject: [PATCH 0812/1431] added changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 24c691b4718..20f1c26d9cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,9 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
 
+v 8.8.3
+  - Fix gitlab importer failing to import new projects due to missing credentials
+
 v 8.8.2
   - Added remove due date button. !4209
   - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources. !4242

From dddcab7e3f2a9dd83c6ed75b7efb622dc374b486 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 10:38:53 +0100
Subject: [PATCH 0813/1431] Fixed user select failing tests on merge request

---
 app/assets/javascripts/users_select.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index 49d0320701e..519618aa617 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -221,7 +221,7 @@ class @UsersSelect
         multiple: $(select).hasClass('multiselect')
         minimumInputLength: 0
         query: (query) =>
-          @users query.term, false, (users) =>
+          @users query.term, @projectId?, (users) =>
             data = { results: users }
 
             if query.term.length == 0

From 2830b46cbcbf754b81da6771471a95a8bf65f915 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 11:19:11 +0100
Subject: [PATCH 0814/1431] Reduced number of buttons in commit header Closes
 #17576

---
 .../stylesheets/framework/dropdowns.scss      |  2 +-
 app/assets/stylesheets/pages/commit.scss      |  4 ---
 app/helpers/commits_helper.rb                 | 19 +++++++-----
 .../projects/commit/_commit_box.html.haml     | 29 ++++++++++---------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 79a37d87e82..93c63c69843 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -154,7 +154,7 @@
     color: $dropdown-header-color;
     font-size: 13px;
     line-height: 22px;
-    padding: 0 10px 10px;
+    padding: 0 10px;
   }
 
   .separator + .dropdown-header {
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index c2cd227571f..b01d4feb6e5 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -35,10 +35,6 @@
     font-weight: bold;
   }
 
-  .time_ago {
-    margin-left: 8px;
-  }
-
   .fa-clipboard {
     color: $dropdown-title-btn-color;
   }
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index b59c3982edd..d328f56c80c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -123,13 +123,14 @@ module CommitsHelper
     )
   end
 
-  def revert_commit_link(commit, continue_to_path, btn_class: nil)
+  def revert_commit_link(commit, continue_to_path, btn_class: nil, has_tooltip: true)
     return unless current_user
 
-    tooltip = "Revert this #{commit.change_type_title} in a new merge request"
+    tooltip = "Revert this #{commit.change_type_title} in a new merge request" if has_tooltip
 
     if can_collaborate_with_project?
-      link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class} has-tooltip"
+      btn_class = "btn btn-grouped btn-close btn-#{btn_class}" unless btn_class.nil?
+      link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
     elsif can?(current_user, :fork_project, @project)
       continue_params = {
         to: continue_to_path,
@@ -140,17 +141,20 @@ module CommitsHelper
         namespace_key: current_user.namespace.id,
         continue: continue_params)
 
-      link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip
+      btn_class = "btn btn-grouped btn-close" unless btn_class.nil?
+
+      link_to 'Revert', fork_path, class: btn_class, method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
     end
   end
 
-  def cherry_pick_commit_link(commit, continue_to_path, btn_class: nil)
+  def cherry_pick_commit_link(commit, continue_to_path, btn_class: nil, has_tooltip: true)
     return unless current_user
 
     tooltip = "Cherry-pick this #{commit.change_type_title} in a new merge request"
 
     if can_collaborate_with_project?
-      link_to 'Cherry-pick', '#modal-cherry-pick-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class} has-tooltip"
+      btn_class = "btn btn-default btn-grouped btn-#{btn_class}" unless btn_class.nil?
+      link_to 'Cherry-pick', '#modal-cherry-pick-commit', 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}"
     elsif can?(current_user, :fork_project, @project)
       continue_params = {
         to: continue_to_path,
@@ -161,7 +165,8 @@ module CommitsHelper
         namespace_key: current_user.namespace.id,
         continue: continue_params)
 
-      link_to 'Cherry-pick', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip
+      btn_class = "btn btn-grouped btn-close" unless btn_class.nil?
+      link_to 'Cherry-pick', fork_path, class: "#{btn_class}", method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: (tooltip if has_tooltip)
     end
   end
 
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 028564c9305..d9dea067705 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -2,26 +2,27 @@
   %div
     - if defined?(@notes_count) && @notes_count > 0
       %span.btn.disabled.btn-grouped
-        %i.fa.fa-comment
+        = icon('comment')
         = @notes_count
-    .pull-left.btn-group
-      %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
-        %i.fa.fa-download
-        Download as
+    = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped" do
+      Browse Files
+    .dropdown.inline
+      %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
+        Options
         %span.caret
-      %ul.dropdown-menu
+      %ul.dropdown-menu.dropdown-menu-align-right
+        - unless @commit.has_been_reverted?(current_user)
+          %li.clearfix
+            = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
+        %li.clearfix
+          = cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
+        %li.divider
+        %li.dropdown-header
+          Download
         - unless @commit.parents.length > 1
           %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
         %li= link_to "Plain Diff",    namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
-    = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped" do
-      = icon('files-o')
-      Browse Files
-    - unless @commit.has_been_reverted?(current_user)
-      = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id))
-    = cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id))
-  %div
 
-%p
 .commit-info-row
   %span.light Authored by
   %strong

From f99b38c9d5dab11677b2680a671c1a66fb69283b Mon Sep 17 00:00:00 2001
From: ZJ van de Weg <zegerjan@gitlab.com>
Date: Wed, 25 May 2016 21:27:36 +0200
Subject: [PATCH 0815/1431] Remove tests specific for awards on notes

---
 spec/features/issues/award_spec.rb         | 67 ----------------------
 spec/features/merge_requests/award_spec.rb | 67 ----------------------
 2 files changed, 134 deletions(-)

diff --git a/spec/features/issues/award_spec.rb b/spec/features/issues/award_spec.rb
index 209d1cca176..eafd517c840 100644
--- a/spec/features/issues/award_spec.rb
+++ b/spec/features/issues/award_spec.rb
@@ -24,79 +24,12 @@ feature 'Issue awards', js: true, feature: true do
       expect(first('.js-emoji-btn')).to have_content '0'
     end
 
-    it 'should show award menu button in notes' do
-      page.within('.note') do
-        expect(page).to have_selector('.js-award-action-btn')
-      end
-    end
-
-    it 'should not show award bar on note if no awards given' do
-      page.within('.note') do
-        expect(find('.js-awards-block', visible: false)).not_to be_visible
-      end
-    end
-
-    it 'should be able to show award menu when clicking add award button in note' do
-      show_note_award_menu
-    end
-
     it 'should only have one menu on the page' do
       first('.js-add-award').click
       expect(page).to have_selector('.emoji-menu')
 
-      page.within('.note') do
-        find('.js-add-award').click
-      end
-
       expect(page).to have_selector('.emoji-menu', count: 1)
     end
-
-    it 'should add award to note' do
-      show_note_award_menu
-      award_on_note
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-        expect(find('.js-awards-block')).to have_selector('.active')
-      end
-    end
-
-    it 'should remove award from note' do
-      show_note_award_menu
-      award_on_note
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-        expect(find('.js-awards-block')).to have_selector('.active')
-      end
-
-      remove_award_on_note
-      sleep 0.5
-
-      page.within('.note') do
-        expect(find('.js-awards-block', visible: false)).not_to be_visible
-        expect(find('.js-awards-block', visible: false)).not_to have_selector('.active')
-      end
-    end
-
-    it 'should not hide award bar on notes with more than 1 award' do
-      show_note_award_menu
-      award_on_note
-
-      show_note_award_menu
-      award_on_note(2)
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-        expect(find('.js-awards-block')).to have_selector('.active')
-      end
-
-      remove_award_on_note
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-      end
-    end
   end
 
   describe 'logged out' do
diff --git a/spec/features/merge_requests/award_spec.rb b/spec/features/merge_requests/award_spec.rb
index 0f268bab5da..4d3e8173ebe 100644
--- a/spec/features/merge_requests/award_spec.rb
+++ b/spec/features/merge_requests/award_spec.rb
@@ -24,79 +24,12 @@ feature 'Merge request awards', js: true, feature: true do
       expect(first('.js-emoji-btn')).to have_content '0'
     end
 
-    it 'should show award menu button in notes' do
-      page.within('.note') do
-        expect(page).to have_selector('.js-award-action-btn')
-      end
-    end
-
-    it 'should not show award bar on note if no awards given' do
-      page.within('.note') do
-        expect(find('.js-awards-block', visible: false)).not_to be_visible
-      end
-    end
-
-    it 'should be able to show award menu when clicking add award button in note' do
-      show_note_award_menu
-    end
-
     it 'should only have one menu on the page' do
       first('.js-add-award').click
       expect(page).to have_selector('.emoji-menu')
 
-      page.within('.note') do
-        find('.js-add-award').click
-      end
-
       expect(page).to have_selector('.emoji-menu', count: 1)
     end
-
-    it 'should add award to note' do
-      show_note_award_menu
-      award_on_note
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-        expect(find('.js-awards-block')).to have_selector('.active')
-      end
-    end
-
-    it 'should remove award from note' do
-      show_note_award_menu
-      award_on_note
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-        expect(find('.js-awards-block')).to have_selector('.active')
-      end
-
-      remove_award_on_note
-      sleep 0.5
-
-      page.within('.note') do
-        expect(find('.js-awards-block', visible: false)).not_to be_visible
-        expect(find('.js-awards-block', visible: false)).not_to have_selector('.active')
-      end
-    end
-
-    it 'should not hide award bar on notes with more than 1 award' do
-      show_note_award_menu
-      award_on_note
-
-      show_note_award_menu
-      award_on_note(2)
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-        expect(find('.js-awards-block')).to have_selector('.active')
-      end
-
-      remove_award_on_note
-
-      page.within('.note') do
-        expect(find('.js-awards-block')).to be_visible
-      end
-    end
   end
 
   describe 'logged out' do

From 309ca405fa30e1eeaeaeddc0c8918e65c98ebbf7 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 2 May 2016 18:15:25 +0200
Subject: [PATCH 0816/1431] Don't modify arguments in CommitRange#initialize

This method used to call strip! on input strings which will mess with
the strings if they're re-used or frozen.
---
 app/models/commit_range.rb       |  2 +-
 spec/models/commit_range_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/commit_range.rb b/app/models/commit_range.rb
index 51673897d98..4066958f67c 100644
--- a/app/models/commit_range.rb
+++ b/app/models/commit_range.rb
@@ -62,7 +62,7 @@ class CommitRange
   def initialize(range_string, project)
     @project = project
 
-    range_string.strip!
+    range_string = range_string.strip
 
     unless range_string =~ /\A#{PATTERN}\z/
       raise ArgumentError, "invalid CommitRange string format: #{range_string}"
diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb
index 9307d97e214..1cf51d8bab3 100644
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
@@ -24,6 +24,16 @@ describe CommitRange, models: true do
     expect { described_class.new("Foo", project) }.to raise_error(ArgumentError)
   end
 
+  describe '#initialize' do
+    it 'does not modify strings in-place' do
+      input = "#{sha_from}...#{sha_to}   "
+
+      described_class.new(input, project)
+
+      expect(input).to eq("#{sha_from}...#{sha_to}   ")
+    end
+  end
+
   describe '#to_s' do
     it 'is correct for three-dot syntax' do
       expect(range.to_s).to eq "#{full_sha_from}...#{full_sha_to}"

From 94d5416db6415b06706204fb4a4df0100bcab7be Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 26 May 2016 13:13:57 +0200
Subject: [PATCH 0817/1431] Added Gitlab::Lazy

This class can be used to lazy-evaluate blocks of code the first time
they're called. This can be useful when a method performs a certain
heavy operation (e.g. a SQL query) that you only want to perform
whenever the result is used for the first time.
---
 lib/gitlab/lazy.rb           | 34 +++++++++++++++++++++++++++++++++
 spec/lib/gitlab/lazy_spec.rb | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 lib/gitlab/lazy.rb
 create mode 100644 spec/lib/gitlab/lazy_spec.rb

diff --git a/lib/gitlab/lazy.rb b/lib/gitlab/lazy.rb
new file mode 100644
index 00000000000..2a659ae4c74
--- /dev/null
+++ b/lib/gitlab/lazy.rb
@@ -0,0 +1,34 @@
+module Gitlab
+  # A class that can be wrapped around an expensive method call so it's only
+  # executed when actually needed.
+  #
+  # Usage:
+  #
+  #     object = Gitlab::Lazy.new { some_expensive_work_here }
+  #
+  #     object['foo']
+  #     object.bar
+  class Lazy < BasicObject
+    def initialize(&block)
+      @block = block
+    end
+
+    def method_missing(name, *args, &block)
+      __evaluate__
+
+      @result.__send__(name, *args, &block)
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      __evaluate__
+
+      @result.respond_to?(name, include_private) || super
+    end
+
+    private
+
+    def __evaluate__
+      @result = @block.call unless defined?(@result)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/lazy_spec.rb b/spec/lib/gitlab/lazy_spec.rb
new file mode 100644
index 00000000000..b5ca89dd242
--- /dev/null
+++ b/spec/lib/gitlab/lazy_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Gitlab::Lazy, lib: true do
+  let(:dummy) { double(:dummy) }
+
+  context 'when not calling any methods' do
+    it 'does not call the supplied block' do
+      expect(dummy).not_to receive(:foo)
+
+      described_class.new { dummy.foo }
+    end
+  end
+
+  context 'when calling a method on the object' do
+    it 'lazy loads the value returned by the block' do
+      expect(dummy).to receive(:foo).and_return('foo')
+
+      lazy = described_class.new { dummy.foo }
+
+      expect(lazy.to_s).to eq('foo')
+    end
+  end
+
+  describe '#respond_to?' do
+    it 'returns true for a method defined on the wrapped object' do
+      lazy = described_class.new { 'foo' }
+
+      expect(lazy).to respond_to(:downcase)
+    end
+
+    it 'returns false for a method not defined on the wrapped object' do
+      lazy = described_class.new { 'foo' }
+
+      expect(lazy).not_to respond_to(:quack)
+    end
+  end
+end

From d5e93deb012423697158576cfd1c22ed582cb23c Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 26 May 2016 09:32:58 -0400
Subject: [PATCH 0818/1431] Update changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index b79e6bb3ec2..a91fc3d5267 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.9.0 (unreleased)
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
+  - Remove 'main language' feature
 
 v 8.8.2
   - Added remove due date button. !4209

From d7bd7a3e7ef2e64f50d5404fe3d90f0c1ff57705 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 14:57:00 +0100
Subject: [PATCH 0819/1431] Fixed JS error when trying to remove discussion
 form

Closes #17778
---
 app/assets/javascripts/notes.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 6d9d6528f45..8131d923677 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -329,7 +329,7 @@ class @Notes
     @renderDiscussionNote(note)
 
     # cleanup after successfully creating a diff/discussion note
-    @removeDiscussionNoteForm($("#new-discussion-note-form-#{note.discussion_id}"))
+    @removeDiscussionNoteForm($(xhr.target))
 
   ###
   Called in response to the edit note form being submitted

From 9a7951f7dd980438d9f92152deb1040c4dc16cbe Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 22 Apr 2016 10:50:04 +0100
Subject: [PATCH 0820/1431] Fixed potential issue with 2 ci status polling
 events happening

---
 app/assets/javascripts/merge_request_widget.js.coffee  | 10 +++++++++-
 .../projects/merge_requests/widget/_show.html.haml     |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index d16f44d52f8..779f536d9f0 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -10,6 +10,7 @@ class @MergeRequestWidget
     $('#modal_merge_info').modal(show: false)
     @firstCICheck = true
     @readyForCICheck = false
+    @cancel = false
     clearInterval @fetchBuildStatusInterval
 
     @clearEventListeners()
@@ -21,10 +22,16 @@ class @MergeRequestWidget
   clearEventListeners: ->
     $(document).off 'page:change.merge_request'
 
+  cancelPolling: ->
+    @cancel = true
+
   addEventListeners: ->
+    allowedPages = ['show', 'commits', 'builds', 'changes']
     $(document).on 'page:change.merge_request', =>
-      if $('body').data('page') isnt 'projects:merge_requests:show'
+      page = $('body').data('page').split(':').last()
+      if allowedPages.indexOf(page) < 0
         clearInterval @fetchBuildStatusInterval
+        @cancelPolling()
         @clearEventListeners()
 
   mergeInProgress: (deleteSourceBranch = false)->
@@ -67,6 +74,7 @@ class @MergeRequestWidget
     $('.ci-widget-fetching').show()
 
     $.getJSON @opts.ci_status_url, (data) =>
+      return if @cancel
       @readyForCICheck = true
 
       if data.status is ''
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index 3c68d61c4b5..b79508bdc34 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -13,7 +13,7 @@
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
     ci_status_url: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     gitlab_icon: "#{asset_path 'gitlab_logo.png'}",
-    ci_status: "",
+    ci_status: "#{@merge_request.ci_commit ? @merge_request.ci_commit.status : ''}",
     ci_message: {
       normal: "Build {{status}} for \"{{title}}\"",
       preparing: "{{status}} build for \"{{title}}\""
@@ -26,4 +26,10 @@
     builds_path: "#{builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}"
   };
 
+  if (typeof merge_request_widget !== 'undefined') {
+    clearInterval(merge_request_widget.fetchBuildStatusInterval);
+    merge_request_widget.cancelPolling();
+    merge_request_widget.clearEventListeners();
+  }
+
   merge_request_widget = new MergeRequestWidget(opts);

From 86166d28029d5fcc729f7b7f5a41635c2e783a9e Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 26 May 2016 13:16:43 +0200
Subject: [PATCH 0821/1431] Split Markdown rendering & reference gathering

This splits the Markdown rendering and reference extraction phases into
two distinct code bases. The reference extraction phase no longer relies
on the html-pipeline Gem (and any related code) and allows for
extracting of references from multiple HTML nodes in a single pass. This
means that if you want to extract user references from 200 comments you
no longer need to run 200 times N number of queries, instead only a
handful of queries may be needed.
---
 app/controllers/projects/wikis_controller.rb  |   4 +-
 app/controllers/projects_controller.rb        |   4 +-
 .../filter/abstract_reference_filter.rb       |   8 -
 .../filter/commit_range_reference_filter.rb   |  20 +-
 lib/banzai/filter/commit_reference_filter.rb  |  20 +-
 .../filter/external_issue_reference_filter.rb |  14 +-
 lib/banzai/filter/issue_reference_filter.rb   |  10 +-
 lib/banzai/filter/label_reference_filter.rb   |   2 +
 .../filter/merge_request_reference_filter.rb  |   2 +
 .../filter/milestone_reference_filter.rb      |   2 +
 lib/banzai/filter/redactor_filter.rb          |  31 ++-
 lib/banzai/filter/reference_filter.rb         |  24 +-
 .../filter/reference_gatherer_filter.rb       |  65 -----
 lib/banzai/filter/snippet_reference_filter.rb |   2 +
 lib/banzai/filter/user_reference_filter.rb    |  44 +---
 lib/banzai/lazy_reference.rb                  |  25 --
 .../pipeline/reference_extraction_pipeline.rb |  11 -
 lib/banzai/reference_extractor.rb             |  48 +---
 lib/banzai/reference_parser.rb                |  14 ++
 lib/banzai/reference_parser/base_parser.rb    | 204 +++++++++++++++
 lib/banzai/reference_parser/commit_parser.rb  |  34 +++
 .../reference_parser/commit_range_parser.rb   |  38 +++
 .../reference_parser/external_issue_parser.rb |  25 ++
 lib/banzai/reference_parser/issue_parser.rb   |  40 +++
 lib/banzai/reference_parser/label_parser.rb   |  11 +
 .../reference_parser/merge_request_parser.rb  |  11 +
 .../reference_parser/milestone_parser.rb      |  11 +
 lib/banzai/reference_parser/snippet_parser.rb |  11 +
 lib/banzai/reference_parser/user_parser.rb    |  92 +++++++
 lib/gitlab/reference_extractor.rb             |  19 +-
 .../commit_range_reference_filter_spec.rb     |  15 --
 .../filter/commit_reference_filter_spec.rb    |  15 --
 .../filter/issue_reference_filter_spec.rb     |  25 --
 .../filter/label_reference_filter_spec.rb     |  10 -
 .../merge_request_reference_filter_spec.rb    |  15 --
 .../filter/milestone_reference_filter_spec.rb |  10 -
 .../lib/banzai/filter/redactor_filter_spec.rb |  38 ++-
 .../filter/reference_gatherer_filter_spec.rb  |  87 -------
 .../filter/snippet_reference_filter_spec.rb   |  15 --
 .../filter/user_reference_filter_spec.rb      |  35 +--
 .../reference_parser/base_parser_spec.rb      | 237 ++++++++++++++++++
 .../reference_parser/commit_parser_spec.rb    | 113 +++++++++
 .../commit_range_parser_spec.rb               | 120 +++++++++
 .../external_issue_parser_spec.rb             |  62 +++++
 .../reference_parser/issue_parser_spec.rb     |  79 ++++++
 .../reference_parser/label_parser_spec.rb     |  31 +++
 .../merge_request_parser_spec.rb              |  30 +++
 .../reference_parser/milestone_parser_spec.rb |  31 +++
 .../reference_parser/snippet_parser_spec.rb   |  31 +++
 .../reference_parser/user_parser_spec.rb      | 189 ++++++++++++++
 spec/support/filter_spec_helper.rb            |   3 +-
 spec/support/reference_parser_helpers.rb      |   5 +
 52 files changed, 1527 insertions(+), 515 deletions(-)
 delete mode 100644 lib/banzai/filter/reference_gatherer_filter.rb
 delete mode 100644 lib/banzai/lazy_reference.rb
 delete mode 100644 lib/banzai/pipeline/reference_extraction_pipeline.rb
 create mode 100644 lib/banzai/reference_parser.rb
 create mode 100644 lib/banzai/reference_parser/base_parser.rb
 create mode 100644 lib/banzai/reference_parser/commit_parser.rb
 create mode 100644 lib/banzai/reference_parser/commit_range_parser.rb
 create mode 100644 lib/banzai/reference_parser/external_issue_parser.rb
 create mode 100644 lib/banzai/reference_parser/issue_parser.rb
 create mode 100644 lib/banzai/reference_parser/label_parser.rb
 create mode 100644 lib/banzai/reference_parser/merge_request_parser.rb
 create mode 100644 lib/banzai/reference_parser/milestone_parser.rb
 create mode 100644 lib/banzai/reference_parser/snippet_parser.rb
 create mode 100644 lib/banzai/reference_parser/user_parser.rb
 delete mode 100644 spec/lib/banzai/filter/reference_gatherer_filter_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/base_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/commit_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/external_issue_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/issue_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/label_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/merge_request_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/milestone_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/snippet_parser_spec.rb
 create mode 100644 spec/lib/banzai/reference_parser/user_parser_spec.rb
 create mode 100644 spec/support/reference_parser_helpers.rb

diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 0d6c32fabd2..4b404eb03fa 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -91,8 +91,8 @@ class Projects::WikisController < Projects::ApplicationController
   def markdown_preview
     text = params[:text]
 
-    ext = Gitlab::ReferenceExtractor.new(@project, current_user, current_user)
-    ext.analyze(text)
+    ext = Gitlab::ReferenceExtractor.new(@project, current_user)
+    ext.analyze(text, author: current_user)
 
     render json: {
       body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki),
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 9697b88c032..f94e2a84fa2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -197,8 +197,8 @@ class ProjectsController < Projects::ApplicationController
   def markdown_preview
     text = params[:text]
 
-    ext = Gitlab::ReferenceExtractor.new(@project, current_user, current_user)
-    ext.analyze(text)
+    ext = Gitlab::ReferenceExtractor.new(@project, current_user)
+    ext.analyze(text, author: current_user)
 
     render json: {
       body:       view_context.markdown(text),
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
index b8962379cb5..298a88ba08a 100644
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -18,10 +18,6 @@ module Banzai
         @object_sym ||= object_name.to_sym
       end
 
-      def self.data_reference
-        @data_reference ||= "data-#{object_name.dasherize}"
-      end
-
       def self.object_class_title
         @object_title ||= object_class.name.titleize
       end
@@ -45,10 +41,6 @@ module Banzai
         end
       end
 
-      def self.referenced_by(node)
-        { object_sym => LazyReference.new(object_class, node.attr(data_reference)) }
-      end
-
       def object_class
         self.class.object_class
       end
diff --git a/lib/banzai/filter/commit_range_reference_filter.rb b/lib/banzai/filter/commit_range_reference_filter.rb
index b469ea0f626..bbb88c979cc 100644
--- a/lib/banzai/filter/commit_range_reference_filter.rb
+++ b/lib/banzai/filter/commit_range_reference_filter.rb
@@ -4,6 +4,8 @@ module Banzai
     #
     # This filter supports cross-project references.
     class CommitRangeReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :commit_range
+
       def self.object_class
         CommitRange
       end
@@ -14,34 +16,18 @@ module Banzai
         end
       end
 
-      def self.referenced_by(node)
-        project = Project.find(node.attr("data-project")) rescue nil
-        return unless project
-
-        id = node.attr("data-commit-range")
-        range = find_object(project, id)
-
-        return unless range
-
-        { commit_range: range }
-      end
-
       def initialize(*args)
         super
 
         @commit_map = {}
       end
 
-      def self.find_object(project, id)
+      def find_object(project, id)
         range = CommitRange.new(id, project)
 
         range.valid_commits? ? range : nil
       end
 
-      def find_object(*args)
-        self.class.find_object(*args)
-      end
-
       def url_for_object(range, project)
         h = Gitlab::Routing.url_helpers
         h.namespace_project_compare_url(project.namespace, project,
diff --git a/lib/banzai/filter/commit_reference_filter.rb b/lib/banzai/filter/commit_reference_filter.rb
index bd88207326c..2ce1816672b 100644
--- a/lib/banzai/filter/commit_reference_filter.rb
+++ b/lib/banzai/filter/commit_reference_filter.rb
@@ -4,6 +4,8 @@ module Banzai
     #
     # This filter supports cross-project references.
     class CommitReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :commit
+
       def self.object_class
         Commit
       end
@@ -14,28 +16,12 @@ module Banzai
         end
       end
 
-      def self.referenced_by(node)
-        project = Project.find(node.attr("data-project")) rescue nil
-        return unless project
-
-        id = node.attr("data-commit")
-        commit = find_object(project, id)
-
-        return unless commit
-
-        { commit: commit }
-      end
-
-      def self.find_object(project, id)
+      def find_object(project, id)
         if project && project.valid_repo?
           project.commit(id)
         end
       end
 
-      def find_object(*args)
-        self.class.find_object(*args)
-      end
-
       def url_for_object(commit, project)
         h = Gitlab::Routing.url_helpers
         h.namespace_project_commit_url(project.namespace, project, commit,
diff --git a/lib/banzai/filter/external_issue_reference_filter.rb b/lib/banzai/filter/external_issue_reference_filter.rb
index 37344b90576..eaa702952cc 100644
--- a/lib/banzai/filter/external_issue_reference_filter.rb
+++ b/lib/banzai/filter/external_issue_reference_filter.rb
@@ -4,6 +4,8 @@ module Banzai
     # References are ignored if the project doesn't use an external issue
     # tracker.
     class ExternalIssueReferenceFilter < ReferenceFilter
+      self.reference_type = :external_issue
+
       # Public: Find `JIRA-123` issue references in text
       #
       #   ExternalIssueReferenceFilter.references_in(text) do |match, issue|
@@ -21,18 +23,6 @@ module Banzai
         end
       end
 
-      def self.referenced_by(node)
-        project = Project.find(node.attr("data-project")) rescue nil
-        return unless project
-
-        id = node.attr("data-external-issue")
-        external_issue = ExternalIssue.new(id, project)
-
-        return unless external_issue
-
-        { external_issue: external_issue }
-      end
-
       def call
         # Early return if the project isn't using an external tracker
         return doc if project.nil? || default_issues_tracker?
diff --git a/lib/banzai/filter/issue_reference_filter.rb b/lib/banzai/filter/issue_reference_filter.rb
index 59c5e89c546..2496e704002 100644
--- a/lib/banzai/filter/issue_reference_filter.rb
+++ b/lib/banzai/filter/issue_reference_filter.rb
@@ -5,18 +5,12 @@ module Banzai
     #
     # This filter supports cross-project references.
     class IssueReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :issue
+
       def self.object_class
         Issue
       end
 
-      def self.user_can_see_reference?(user, node, context)
-        # It is not possible to check access rights for external issue trackers
-        return true if context[:project].try(:external_issue_tracker)
- 
-        issue = Issue.find(node.attr('data-issue')) rescue nil
-        Ability.abilities.allowed?(user, :read_issue, issue)
-      end
-
       def find_object(project, id)
         project.get_issue(id)
       end
diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb
index 8488a493b55..e4d3f87d0aa 100644
--- a/lib/banzai/filter/label_reference_filter.rb
+++ b/lib/banzai/filter/label_reference_filter.rb
@@ -2,6 +2,8 @@ module Banzai
   module Filter
     # HTML filter that replaces label references with links.
     class LabelReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :label
+
       def self.object_class
         Label
       end
diff --git a/lib/banzai/filter/merge_request_reference_filter.rb b/lib/banzai/filter/merge_request_reference_filter.rb
index cad38a51851..ac5216d9cfb 100644
--- a/lib/banzai/filter/merge_request_reference_filter.rb
+++ b/lib/banzai/filter/merge_request_reference_filter.rb
@@ -5,6 +5,8 @@ module Banzai
     #
     # This filter supports cross-project references.
     class MergeRequestReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :merge_request
+
       def self.object_class
         MergeRequest
       end
diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index dad0768f51b..ca686c87d97 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -2,6 +2,8 @@ module Banzai
   module Filter
     # HTML filter that replaces milestone references with links.
     class MilestoneReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :milestone
+
       def self.object_class
         Milestone
       end
diff --git a/lib/banzai/filter/redactor_filter.rb b/lib/banzai/filter/redactor_filter.rb
index e589b5df6ec..c753a84a20d 100644
--- a/lib/banzai/filter/redactor_filter.rb
+++ b/lib/banzai/filter/redactor_filter.rb
@@ -7,8 +7,11 @@ module Banzai
     #
     class RedactorFilter < HTML::Pipeline::Filter
       def call
-        Querying.css(doc, 'a.gfm').each do |node|
-          unless user_can_see_reference?(node)
+        nodes = Querying.css(doc, 'a.gfm[data-reference-type]')
+        visible = nodes_visible_to_user(nodes)
+
+        nodes.each do |node|
+          unless visible.include?(node)
             # The reference should be replaced by the original text,
             # which is not always the same as the rendered text.
             text = node.attr('data-original') || node.text
@@ -21,20 +24,30 @@ module Banzai
 
       private
 
-      def user_can_see_reference?(node)
-        if node.has_attribute?('data-reference-filter')
-          reference_type = node.attr('data-reference-filter')
-          reference_filter = Banzai::Filter.const_get(reference_type)
+      def nodes_visible_to_user(nodes)
+        per_type = Hash.new { |h, k| h[k] = [] }
+        visible = Set.new
 
-          reference_filter.user_can_see_reference?(current_user, node, context)
-        else
-          true
+        nodes.each do |node|
+          per_type[node.attr('data-reference-type')] << node
         end
+
+        per_type.each do |type, nodes|
+          parser = Banzai::ReferenceParser[type].new(project, current_user)
+
+          visible.merge(parser.nodes_visible_to_user(current_user, nodes))
+        end
+
+        visible
       end
 
       def current_user
         context[:current_user]
       end
+
+      def project
+        context[:project]
+      end
     end
   end
 end
diff --git a/lib/banzai/filter/reference_filter.rb b/lib/banzai/filter/reference_filter.rb
index 31386cf851c..41ae0e1f9cc 100644
--- a/lib/banzai/filter/reference_filter.rb
+++ b/lib/banzai/filter/reference_filter.rb
@@ -8,24 +8,8 @@ module Banzai
     #   :project (required) - Current project, ignored if reference is cross-project.
     #   :only_path          - Generate path-only links.
     class ReferenceFilter < HTML::Pipeline::Filter
-      def self.user_can_see_reference?(user, node, context)
-        if node.has_attribute?('data-project')
-          project_id = node.attr('data-project').to_i
-          return true if project_id == context[:project].try(:id)
-
-          project = Project.find(project_id) rescue nil
-          Ability.abilities.allowed?(user, :read_project, project)
-        else
-          true
-        end
-      end
-
-      def self.user_can_reference?(user, node, context)
-        true
-      end
-
-      def self.referenced_by(node)
-        raise NotImplementedError, "#{self} does not implement #{__method__}"
+      class << self
+        attr_accessor :reference_type
       end
 
       # Returns a data attribute String to attach to a reference link
@@ -43,7 +27,9 @@ module Banzai
       #
       # Returns a String
       def data_attribute(attributes = {})
-        attributes[:reference_filter] = self.class.name.demodulize
+        attributes = attributes.reject { |_, v| v.nil? }
+
+        attributes[:reference_type] = self.class.reference_type
         attributes.delete(:original) if context[:no_original_data]
         attributes.map { |key, value| %Q(data-#{key.to_s.dasherize}="#{escape_once(value)}") }.join(" ")
       end
diff --git a/lib/banzai/filter/reference_gatherer_filter.rb b/lib/banzai/filter/reference_gatherer_filter.rb
deleted file mode 100644
index 96fdb06304e..00000000000
--- a/lib/banzai/filter/reference_gatherer_filter.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-module Banzai
-  module Filter
-    # HTML filter that gathers all referenced records that the current user has
-    # permission to view.
-    #
-    # Expected to be run in its own post-processing pipeline.
-    #
-    class ReferenceGathererFilter < HTML::Pipeline::Filter
-      def initialize(*)
-        super
-
-        result[:references] ||= Hash.new { |hash, type| hash[type] = [] }
-      end
-
-      def call
-        Querying.css(doc, 'a.gfm').each do |node|
-          gather_references(node)
-        end
-
-        load_lazy_references unless ReferenceExtractor.lazy?
-
-        doc
-      end
-
-      private
-
-      def gather_references(node)
-        return unless node.has_attribute?('data-reference-filter')
-
-        reference_type = node.attr('data-reference-filter')
-        reference_filter = Banzai::Filter.const_get(reference_type)
-
-        return if context[:reference_filter] && reference_filter != context[:reference_filter]
-
-        return if author && !reference_filter.user_can_reference?(author, node, context)
-
-        return unless reference_filter.user_can_see_reference?(current_user, node, context)
-
-        references = reference_filter.referenced_by(node)
-        return unless references
-
-        references.each do |type, values|
-          Array.wrap(values).each do |value|
-            result[:references][type] << value
-          end
-        end
-      end
-
-      def load_lazy_references
-        refs = result[:references]
-        refs.each do |type, values|
-          refs[type] = ReferenceExtractor.lazily(values)
-        end
-      end
-
-      def current_user
-        context[:current_user]
-      end
-
-      def author
-        context[:author]
-      end
-    end
-  end
-end
diff --git a/lib/banzai/filter/snippet_reference_filter.rb b/lib/banzai/filter/snippet_reference_filter.rb
index d507eb5ebe1..212a0bbf2a0 100644
--- a/lib/banzai/filter/snippet_reference_filter.rb
+++ b/lib/banzai/filter/snippet_reference_filter.rb
@@ -5,6 +5,8 @@ module Banzai
     #
     # This filter supports cross-project references.
     class SnippetReferenceFilter < AbstractReferenceFilter
+      self.reference_type = :snippet
+
       def self.object_class
         Snippet
       end
diff --git a/lib/banzai/filter/user_reference_filter.rb b/lib/banzai/filter/user_reference_filter.rb
index eea3af842b6..331d8007257 100644
--- a/lib/banzai/filter/user_reference_filter.rb
+++ b/lib/banzai/filter/user_reference_filter.rb
@@ -4,6 +4,8 @@ module Banzai
     #
     # A special `@all` reference is also supported.
     class UserReferenceFilter < ReferenceFilter
+      self.reference_type = :user
+
       # Public: Find `@user` user references in text
       #
       #   UserReferenceFilter.references_in(text) do |match, username|
@@ -21,43 +23,6 @@ module Banzai
         end
       end
 
-      def self.referenced_by(node)
-        if node.has_attribute?('data-group')
-          group = Group.find(node.attr('data-group')) rescue nil
-          return unless group
-
-          { user: group.users }
-        elsif node.has_attribute?('data-user')
-          { user: LazyReference.new(User, node.attr('data-user')) }
-        elsif node.has_attribute?('data-project')
-          project = Project.find(node.attr('data-project')) rescue nil
-          return unless project
-
-          { user: project.team.members.flatten }
-        end
-      end
-
-      def self.user_can_see_reference?(user, node, context)
-        if node.has_attribute?('data-group')
-          group = Group.find(node.attr('data-group')) rescue nil
-          Ability.abilities.allowed?(user, :read_group, group)
-        else
-          super
-        end
-      end
-
-      def self.user_can_reference?(user, node, context)
-        # Only team members can reference `@all`
-        if node.has_attribute?('data-project')
-          project = Project.find(node.attr('data-project')) rescue nil
-          return false unless project
-
-          user && project.team.member?(user)
-        else
-          super
-        end
-      end
-
       def call
         return doc if project.nil?
 
@@ -114,9 +79,12 @@ module Banzai
 
       def link_to_all(link_text: nil)
         project = context[:project]
+        author = context[:author]
+
         url = urls.namespace_project_url(project.namespace, project,
                                          only_path: context[:only_path])
-        data = data_attribute(project: project.id)
+
+        data = data_attribute(project: project.id, author: author.try(:id))
         text = link_text || User.reference_prefix + 'all'
 
         link_tag(url, data, text)
diff --git a/lib/banzai/lazy_reference.rb b/lib/banzai/lazy_reference.rb
deleted file mode 100644
index 1095b4debc7..00000000000
--- a/lib/banzai/lazy_reference.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Banzai
-  class LazyReference
-    def self.load(refs)
-      lazy_references, values = refs.partition { |ref| ref.is_a?(self) }
-
-      lazy_values = lazy_references.group_by(&:klass).flat_map do |klass, refs|
-        ids = refs.flat_map(&:ids)
-        klass.where(id: ids)
-      end
-
-      values + lazy_values
-    end
-
-    attr_reader :klass, :ids
-
-    def initialize(klass, ids)
-      @klass = klass
-      @ids = Array.wrap(ids).map(&:to_i)
-    end
-
-    def load
-      self.klass.where(id: self.ids)
-    end
-  end
-end
diff --git a/lib/banzai/pipeline/reference_extraction_pipeline.rb b/lib/banzai/pipeline/reference_extraction_pipeline.rb
deleted file mode 100644
index 919998380e4..00000000000
--- a/lib/banzai/pipeline/reference_extraction_pipeline.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Banzai
-  module Pipeline
-    class ReferenceExtractionPipeline < BasePipeline
-      def self.filters
-        FilterArray[
-          Filter::ReferenceGathererFilter
-        ]
-      end
-    end
-  end
-end
diff --git a/lib/banzai/reference_extractor.rb b/lib/banzai/reference_extractor.rb
index f4079538ec5..bf366962aef 100644
--- a/lib/banzai/reference_extractor.rb
+++ b/lib/banzai/reference_extractor.rb
@@ -1,28 +1,6 @@
 module Banzai
   # Extract possible GFM references from an arbitrary String for further processing.
   class ReferenceExtractor
-    class << self
-      LAZY_KEY = :banzai_reference_extractor_lazy
-
-      def lazy?
-        Thread.current[LAZY_KEY]
-      end
-
-      def lazily(values = nil, &block)
-        return (values || block.call).uniq if lazy?
-
-        begin
-          Thread.current[LAZY_KEY] = true
-
-          values ||= block.call
-
-          Banzai::LazyReference.load(values.uniq).uniq
-        ensure
-          Thread.current[LAZY_KEY] = false
-        end
-      end
-    end
-
     def initialize
       @texts = []
     end
@@ -31,23 +9,21 @@ module Banzai
       @texts << Renderer.render(text, context)
     end
 
-    def references(type, context = {})
-      filter = Banzai::Filter["#{type}_reference"]
+    def references(type, project, current_user = nil)
+      processor = Banzai::ReferenceParser[type].
+        new(project, current_user)
 
-      context.merge!(
-        pipeline: :reference_extraction,
+      processor.process(html_documents)
+    end
 
-        # ReferenceGathererFilter
-        reference_filter: filter
-      )
+    private
 
-      self.class.lazily do
-        @texts.flat_map do |html|
-          text_context = context.dup
-          result = Renderer.render_result(html, text_context)
-          result[:references][type]
-        end.uniq
-      end
+    def html_documents
+      # This ensures that we don't memoize anything until we have a number of
+      # text blobs to parse.
+      return [] if @texts.empty?
+
+      @html_documents ||= @texts.map { |html| Nokogiri::HTML.fragment(html) }
     end
   end
 end
diff --git a/lib/banzai/reference_parser.rb b/lib/banzai/reference_parser.rb
new file mode 100644
index 00000000000..557bec4316e
--- /dev/null
+++ b/lib/banzai/reference_parser.rb
@@ -0,0 +1,14 @@
+module Banzai
+  module ReferenceParser
+    # Returns the reference parser class for the given type
+    #
+    # Example:
+    #
+    #     Banzai::ReferenceParser['issue']
+    #
+    # This would return the `Banzai::ReferenceParser::IssueParser` class.
+    def self.[](name)
+      const_get("#{name.to_s.camelize}Parser")
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb
new file mode 100644
index 00000000000..3d7b9c4a024
--- /dev/null
+++ b/lib/banzai/reference_parser/base_parser.rb
@@ -0,0 +1,204 @@
+module Banzai
+  module ReferenceParser
+    # Base class for reference parsing classes.
+    #
+    # Each parser should also specify its reference type by calling
+    # `self.reference_type = ...` in the body of the class. The value of this
+    # method should be a symbol such as `:issue` or `:merge_request`. For
+    # example:
+    #
+    #     class IssueParser < BaseParser
+    #       self.reference_type = :issue
+    #     end
+    #
+    # The reference type is used to determine what nodes to pass to the
+    # `referenced_by` method.
+    #
+    # Parser classes should either implement the instance method
+    # `references_relation` or overwrite `referenced_by`. The
+    # `references_relation` method is supposed to return an
+    # ActiveRecord::Relation used as a base relation for retrieving the objects
+    # referenced in a set of HTML nodes.
+    #
+    # Each class can implement two additional methods:
+    #
+    # * `nodes_user_can_reference`: returns an Array of nodes the given user can
+    #   refer to.
+    # * `nodes_visible_to_user`: returns an Array of nodes that are visible to
+    #   the given user.
+    #
+    # You only need to overwrite these methods if you want to tweak who can see
+    # which references. For example, the IssueParser class defines its own
+    # `nodes_visible_to_user` method so it can ensure users can only see issues
+    # they have access to.
+    class BaseParser
+      class << self
+        attr_accessor :reference_type
+      end
+
+      # Returns the attribute name containing the value for every object to be
+      # parsed by the current parser.
+      #
+      # For example, for a parser class that returns "Animal" objects this
+      # attribute would be "data-animal".
+      def self.data_attribute
+        @data_attribute ||= "data-#{reference_type.to_s.dasherize}"
+      end
+
+      def initialize(project = nil, current_user = nil)
+        @project = project
+        @current_user = current_user
+      end
+
+      # Returns all the nodes containing references that the user can refer to.
+      def nodes_user_can_reference(user, nodes)
+        nodes
+      end
+
+      # Returns all the nodes that are visible to the given user.
+      def nodes_visible_to_user(user, nodes)
+        projects = lazy { projects_for_nodes(nodes) }
+        project_attr = 'data-project'
+
+        nodes.select do |node|
+          if node.has_attribute?(project_attr)
+            node_id = node.attr(project_attr).to_i
+
+            if project && project.id == node_id
+              true
+            else
+              can?(user, :read_project, projects[node_id])
+            end
+          else
+            true
+          end
+        end
+      end
+
+      # Returns an Array of objects referenced by any of the given HTML nodes.
+      def referenced_by(nodes)
+        ids = unique_attribute_values(nodes, self.class.data_attribute)
+
+        references_relation.where(id: ids)
+      end
+
+      # Returns the ActiveRecord::Relation to use for querying references in the
+      # DB.
+      def references_relation
+        raise NotImplementedError,
+          "#{self.class} does not implement #{__method__}"
+      end
+
+      # Returns a Hash containing attribute values per project ID.
+      #
+      # The returned Hash uses the following format:
+      #
+      #     { project id => [value1, value2, ...] }
+      #
+      # nodes - An Array of HTML nodes to process.
+      # attribute - The name of the attribute (as a String) for which to gather
+      #             values.
+      #
+      # Returns a Hash.
+      def gather_attributes_per_project(nodes, attribute)
+        per_project = Hash.new { |hash, key| hash[key] = Set.new }
+
+        nodes.each do |node|
+          project_id = node.attr('data-project').to_i
+          id = node.attr(attribute)
+
+          per_project[project_id] << id if id
+        end
+
+        per_project
+      end
+
+      # Returns a Hash containing objects for an attribute grouped per their
+      # IDs.
+      #
+      # The returned Hash uses the following format:
+      #
+      #     { id value => row }
+      #
+      # nodes - An Array of HTML nodes to process.
+      #
+      # collection - The model or ActiveRecord relation to use for retrieving
+      #              rows from the database.
+      #
+      # attribute - The name of the attribute containing the primary key values
+      #             for every row.
+      #
+      # Returns a Hash.
+      def grouped_objects_for_nodes(nodes, collection, attribute)
+        return {} if nodes.empty?
+
+        ids = unique_attribute_values(nodes, attribute)
+
+        collection.where(id: ids).each_with_object({}) do |row, hash|
+          hash[row.id] = row
+        end
+      end
+
+      # Returns an Array containing all unique values of an attribute of the
+      # given nodes.
+      def unique_attribute_values(nodes, attribute)
+        values = Set.new
+
+        nodes.each do |node|
+          if node.has_attribute?(attribute)
+            values << node.attr(attribute)
+          end
+        end
+
+        values.to_a
+      end
+
+      # Processes the list of HTML documents and returns an Array containing all
+      # the references.
+      def process(documents)
+        type = self.class.reference_type
+
+        nodes = documents.flat_map do |document|
+          Querying.css(document, "a[data-reference-type='#{type}'].gfm").to_a
+        end
+
+        gather_references(nodes)
+      end
+
+      # Gathers the references for the given HTML nodes.
+      def gather_references(nodes)
+        nodes = nodes_user_can_reference(current_user, nodes)
+        nodes = nodes_visible_to_user(current_user, nodes)
+
+        referenced_by(nodes)
+      end
+
+      # Returns a Hash containing the projects for a given list of HTML nodes.
+      #
+      # The returned Hash uses the following format:
+      #
+      #     { project ID => project }
+      #
+      def projects_for_nodes(nodes)
+        @projects_for_nodes ||=
+          grouped_objects_for_nodes(nodes, Project, 'data-project')
+      end
+
+      def can?(user, permission, subject)
+        Ability.abilities.allowed?(user, permission, subject)
+      end
+
+      def find_projects_for_hash_keys(hash)
+        Project.where(id: hash.keys)
+      end
+
+      private
+
+      attr_reader :current_user, :project
+
+      def lazy(&block)
+        Gitlab::Lazy.new(&block)
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/commit_parser.rb b/lib/banzai/reference_parser/commit_parser.rb
new file mode 100644
index 00000000000..0fee9d267de
--- /dev/null
+++ b/lib/banzai/reference_parser/commit_parser.rb
@@ -0,0 +1,34 @@
+module Banzai
+  module ReferenceParser
+    class CommitParser < BaseParser
+      self.reference_type = :commit
+
+      def referenced_by(nodes)
+        commit_ids = commit_ids_per_project(nodes)
+        projects = find_projects_for_hash_keys(commit_ids)
+
+        projects.flat_map do |project|
+          find_commits(project, commit_ids[project.id])
+        end
+      end
+
+      def commit_ids_per_project(nodes)
+        gather_attributes_per_project(nodes, self.class.data_attribute)
+      end
+
+      def find_commits(project, ids)
+        commits = []
+
+        return commits unless project.valid_repo?
+
+        ids.each do |id|
+          commit = project.commit(id)
+
+          commits << commit if commit
+        end
+
+        commits
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/commit_range_parser.rb b/lib/banzai/reference_parser/commit_range_parser.rb
new file mode 100644
index 00000000000..69d01f8db15
--- /dev/null
+++ b/lib/banzai/reference_parser/commit_range_parser.rb
@@ -0,0 +1,38 @@
+module Banzai
+  module ReferenceParser
+    class CommitRangeParser < BaseParser
+      self.reference_type = :commit_range
+
+      def referenced_by(nodes)
+        range_ids = commit_range_ids_per_project(nodes)
+        projects = find_projects_for_hash_keys(range_ids)
+
+        projects.flat_map do |project|
+          find_ranges(project, range_ids[project.id])
+        end
+      end
+
+      def commit_range_ids_per_project(nodes)
+        gather_attributes_per_project(nodes, self.class.data_attribute)
+      end
+
+      def find_ranges(project, range_ids)
+        ranges = []
+
+        range_ids.each do |id|
+          range = find_object(project, id)
+
+          ranges << range if range
+        end
+
+        ranges
+      end
+
+      def find_object(project, id)
+        range = CommitRange.new(id, project)
+
+        range.valid_commits? ? range : nil
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/external_issue_parser.rb b/lib/banzai/reference_parser/external_issue_parser.rb
new file mode 100644
index 00000000000..a1264db2111
--- /dev/null
+++ b/lib/banzai/reference_parser/external_issue_parser.rb
@@ -0,0 +1,25 @@
+module Banzai
+  module ReferenceParser
+    class ExternalIssueParser < BaseParser
+      self.reference_type = :external_issue
+
+      def referenced_by(nodes)
+        issue_ids = issue_ids_per_project(nodes)
+        projects = find_projects_for_hash_keys(issue_ids)
+        issues = []
+
+        projects.each do |project|
+          issue_ids[project.id].each do |id|
+            issues << ExternalIssue.new(id, project)
+          end
+        end
+
+        issues
+      end
+
+      def issue_ids_per_project(nodes)
+        gather_attributes_per_project(nodes, self.class.data_attribute)
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/issue_parser.rb b/lib/banzai/reference_parser/issue_parser.rb
new file mode 100644
index 00000000000..24076e3d9ec
--- /dev/null
+++ b/lib/banzai/reference_parser/issue_parser.rb
@@ -0,0 +1,40 @@
+module Banzai
+  module ReferenceParser
+    class IssueParser < BaseParser
+      self.reference_type = :issue
+
+      def nodes_visible_to_user(user, nodes)
+        # It is not possible to check access rights for external issue trackers
+        return nodes if project && project.external_issue_tracker
+
+        issues = issues_for_nodes(nodes)
+
+        nodes.select do |node|
+          issue = issue_for_node(issues, node)
+
+          issue ? can?(user, :read_issue, issue) : false
+        end
+      end
+
+      def referenced_by(nodes)
+        issues = issues_for_nodes(nodes)
+
+        nodes.map { |node| issue_for_node(issues, node) }.uniq
+      end
+
+      def issues_for_nodes(nodes)
+        @issues_for_nodes ||= grouped_objects_for_nodes(
+          nodes,
+          Issue.all.includes(:author, :assignee, :project),
+          self.class.data_attribute
+        )
+      end
+
+      private
+
+      def issue_for_node(issues, node)
+        issues[node.attr(self.class.data_attribute).to_i]
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/label_parser.rb b/lib/banzai/reference_parser/label_parser.rb
new file mode 100644
index 00000000000..e5d1eb11d7f
--- /dev/null
+++ b/lib/banzai/reference_parser/label_parser.rb
@@ -0,0 +1,11 @@
+module Banzai
+  module ReferenceParser
+    class LabelParser < BaseParser
+      self.reference_type = :label
+
+      def references_relation
+        Label
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb
new file mode 100644
index 00000000000..c9a9ca79c09
--- /dev/null
+++ b/lib/banzai/reference_parser/merge_request_parser.rb
@@ -0,0 +1,11 @@
+module Banzai
+  module ReferenceParser
+    class MergeRequestParser < BaseParser
+      self.reference_type = :merge_request
+
+      def references_relation
+        MergeRequest.includes(:author, :assignee, :target_project)
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/milestone_parser.rb b/lib/banzai/reference_parser/milestone_parser.rb
new file mode 100644
index 00000000000..a000ac61e5c
--- /dev/null
+++ b/lib/banzai/reference_parser/milestone_parser.rb
@@ -0,0 +1,11 @@
+module Banzai
+  module ReferenceParser
+    class MilestoneParser < BaseParser
+      self.reference_type = :milestone
+
+      def references_relation
+        Milestone
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/snippet_parser.rb b/lib/banzai/reference_parser/snippet_parser.rb
new file mode 100644
index 00000000000..fa71b3c952a
--- /dev/null
+++ b/lib/banzai/reference_parser/snippet_parser.rb
@@ -0,0 +1,11 @@
+module Banzai
+  module ReferenceParser
+    class SnippetParser < BaseParser
+      self.reference_type = :snippet
+
+      def references_relation
+        Snippet
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_parser/user_parser.rb b/lib/banzai/reference_parser/user_parser.rb
new file mode 100644
index 00000000000..a12b0d19560
--- /dev/null
+++ b/lib/banzai/reference_parser/user_parser.rb
@@ -0,0 +1,92 @@
+module Banzai
+  module ReferenceParser
+    class UserParser < BaseParser
+      self.reference_type = :user
+
+      def referenced_by(nodes)
+        group_ids = []
+        user_ids = []
+        project_ids = []
+
+        nodes.each do |node|
+          if node.has_attribute?('data-group')
+            group_ids << node.attr('data-group').to_i
+          elsif node.has_attribute?(self.class.data_attribute)
+            user_ids << node.attr(self.class.data_attribute).to_i
+          elsif node.has_attribute?('data-project')
+            project_ids << node.attr('data-project').to_i
+          end
+        end
+
+        find_users_for_groups(group_ids) | find_users(user_ids) |
+          find_users_for_projects(project_ids)
+      end
+
+      def nodes_visible_to_user(user, nodes)
+        group_attr = 'data-group'
+        groups = lazy { grouped_objects_for_nodes(nodes, Group, group_attr) }
+        visible = []
+        remaining = []
+
+        nodes.each do |node|
+          if node.has_attribute?(group_attr)
+            node_group = groups[node.attr(group_attr).to_i]
+
+            if node_group &&
+              can?(user, :read_group, node_group)
+              visible << node
+            end
+          # Remaining nodes will be processed by the parent class'
+          # implementation of this method.
+          else
+            remaining << node
+          end
+        end
+
+        visible + super(current_user, remaining)
+      end
+
+      def nodes_user_can_reference(current_user, nodes)
+        project_attr = 'data-project'
+        author_attr = 'data-author'
+
+        projects = lazy { projects_for_nodes(nodes) }
+        users = lazy { grouped_objects_for_nodes(nodes, User, author_attr) }
+
+        nodes.select do |node|
+          project_id = node.attr(project_attr)
+          user_id = node.attr(author_attr)
+
+          if project && project_id && project.id == project_id.to_i
+            true
+          elsif project_id && user_id
+            project = projects[project_id.to_i]
+            user = users[user_id.to_i]
+
+            project && user ? project.team.member?(user) : false
+          else
+            true
+          end
+        end
+      end
+
+      def find_users(ids)
+        return [] if ids.empty?
+
+        User.where(id: ids).to_a
+      end
+
+      def find_users_for_groups(ids)
+        return [] if ids.empty?
+
+        User.joins(:group_members).where(members: { source_id: ids }).to_a
+      end
+
+      def find_users_for_projects(ids)
+        return [] if ids.empty?
+
+        Project.where(id: ids).flat_map { |p| p.team.members.to_a }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 13c4d64c99b..11c0b01f0dc 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -4,10 +4,9 @@ module Gitlab
     REFERABLES = %i(user issue label milestone merge_request snippet commit commit_range)
     attr_accessor :project, :current_user, :author
 
-    def initialize(project, current_user = nil, author = nil)
+    def initialize(project, current_user = nil)
       @project = project
       @current_user = current_user
-      @author = author
 
       @references = {}
 
@@ -18,17 +17,21 @@ module Gitlab
       super(text, context.merge(project: project))
     end
 
+    def references(type)
+      super(type, project, current_user)
+    end
+
     REFERABLES.each do |type|
       define_method("#{type}s") do
-        @references[type] ||= references(type, reference_context)
+        @references[type] ||= references(type)
       end
     end
 
     def issues
       if project && project.jira_tracker?
-        @references[:external_issue] ||= references(:external_issue, reference_context)
+        @references[:external_issue] ||= references(:external_issue)
       else
-        @references[:issue] ||= references(:issue, reference_context)
+        @references[:issue] ||= references(:issue)
       end
     end
 
@@ -46,11 +49,5 @@ module Gitlab
 
       @pattern = Regexp.union(patterns.compact)
     end
-
-    private
-
-    def reference_context
-      { project: project, current_user: current_user, author: author }
-    end
   end
 end
diff --git a/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb b/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
index c2a8ad36c30..593bd6d5cac 100644
--- a/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
@@ -98,11 +98,6 @@ describe Banzai::Filter::CommitRangeReferenceFilter, lib: true do
       expect(link).not_to match %r(https?://)
       expect(link).to eq urls.namespace_project_compare_url(project.namespace, project, from: commit1.id, to: commit2.id, only_path: true)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("See #{reference}")
-      expect(result[:references][:commit_range]).not_to be_empty
-    end
   end
 
   context 'cross-project reference' do
@@ -135,11 +130,6 @@ describe Banzai::Filter::CommitRangeReferenceFilter, lib: true do
       exp = act = "Fixed #{project2.to_reference}@#{commit1.id}...#{commit2.id.reverse}"
       expect(reference_filter(act).to_html).to eq exp
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("See #{reference}")
-      expect(result[:references][:commit_range]).not_to be_empty
-    end
   end
 
   context 'cross-project URL reference' do
@@ -173,10 +163,5 @@ describe Banzai::Filter::CommitRangeReferenceFilter, lib: true do
       exp = act = "Fixed #{project2.to_reference}@#{commit1.id}...#{commit2.id.reverse}"
       expect(reference_filter(act).to_html).to eq exp
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("See #{reference}")
-      expect(result[:references][:commit_range]).not_to be_empty
-    end
   end
 end
diff --git a/spec/lib/banzai/filter/commit_reference_filter_spec.rb b/spec/lib/banzai/filter/commit_reference_filter_spec.rb
index 63a32d9d455..d46d3f1489e 100644
--- a/spec/lib/banzai/filter/commit_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/commit_reference_filter_spec.rb
@@ -93,11 +93,6 @@ describe Banzai::Filter::CommitReferenceFilter, lib: true do
       expect(link).not_to match %r(https?://)
       expect(link).to eq urls.namespace_project_commit_url(project.namespace, project, reference, only_path: true)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("See #{reference}")
-      expect(result[:references][:commit]).not_to be_empty
-    end
   end
 
   context 'cross-project reference' do
@@ -124,11 +119,6 @@ describe Banzai::Filter::CommitReferenceFilter, lib: true do
       exp = act = "Committed #{invalidate_reference(reference)}"
       expect(reference_filter(act).to_html).to eq exp
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("See #{reference}")
-      expect(result[:references][:commit]).not_to be_empty
-    end
   end
 
   context 'cross-project URL reference' do
@@ -154,10 +144,5 @@ describe Banzai::Filter::CommitReferenceFilter, lib: true do
       act = "Committed #{invalidate_reference(reference)}"
       expect(reference_filter(act).to_html).to match(/<a.+>#{Regexp.escape(invalidate_reference(reference))}<\/a>/)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("See #{reference}")
-      expect(result[:references][:commit]).not_to be_empty
-    end
   end
 end
diff --git a/spec/lib/banzai/filter/issue_reference_filter_spec.rb b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
index 266ebef33d6..8e6a264970d 100644
--- a/spec/lib/banzai/filter/issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
@@ -91,11 +91,6 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do
       expect(link).to eq helper.url_for_issue(issue.iid, project, only_path: true)
     end
 
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Fixed #{reference}")
-      expect(result[:references][:issue]).to eq [issue]
-    end
-
     it 'does not process links containing issue numbers followed by text' do
       href = "#{reference}st"
       doc = reference_filter("<a href='#{href}'></a>")
@@ -136,11 +131,6 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do
 
       expect(reference_filter(act).to_html).to eq exp
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Fixed #{reference}")
-      expect(result[:references][:issue]).to eq [issue]
-    end
   end
 
   context 'cross-project URL reference' do
@@ -160,11 +150,6 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do
       doc = reference_filter("Fixed (#{reference}.)")
       expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(issue.to_reference(project))} \(comment 123\)<\/a>\.\)/)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Fixed #{reference}")
-      expect(result[:references][:issue]).to eq [issue]
-    end
   end
 
   context 'cross-project reference in link href' do
@@ -184,11 +169,6 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do
       doc = reference_filter("Fixed (#{reference}.)")
       expect(doc.to_html).to match(/\(<a.+>Reference<\/a>\.\)/)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Fixed #{reference}")
-      expect(result[:references][:issue]).to eq [issue]
-    end
   end
 
   context 'cross-project URL in link href' do
@@ -208,10 +188,5 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do
       doc = reference_filter("Fixed (#{reference}.)")
       expect(doc.to_html).to match(/\(<a.+>Reference<\/a>\.\)/)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Fixed #{reference}")
-      expect(result[:references][:issue]).to eq [issue]
-    end
   end
 end
diff --git a/spec/lib/banzai/filter/label_reference_filter_spec.rb b/spec/lib/banzai/filter/label_reference_filter_spec.rb
index b0a38e7c251..f1064a701d8 100644
--- a/spec/lib/banzai/filter/label_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/label_reference_filter_spec.rb
@@ -48,11 +48,6 @@ describe Banzai::Filter::LabelReferenceFilter, lib: true do
     expect(link).to eq urls.namespace_project_issues_path(project.namespace, project, label_name: label.name)
   end
 
-  it 'adds to the results hash' do
-    result = reference_pipeline_result("Label #{reference}")
-    expect(result[:references][:label]).to eq [label]
-  end
-
   describe 'label span element' do
     it 'includes default classes' do
       doc = reference_filter("Label #{reference}")
@@ -170,11 +165,6 @@ describe Banzai::Filter::LabelReferenceFilter, lib: true do
       expect(link).to have_attribute('data-label')
       expect(link.attr('data-label')).to eq label.id.to_s
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Label #{reference}")
-      expect(result[:references][:label]).to eq [label]
-    end
   end
 
   describe 'cross project label references' do
diff --git a/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb b/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb
index 352710df307..3185e41fe5c 100644
--- a/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb
@@ -78,11 +78,6 @@ describe Banzai::Filter::MergeRequestReferenceFilter, lib: true do
       expect(link).not_to match %r(https?://)
       expect(link).to eq urls.namespace_project_merge_request_url(project.namespace, project, merge, only_path: true)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Merge #{reference}")
-      expect(result[:references][:merge_request]).to eq [merge]
-    end
   end
 
   context 'cross-project reference' do
@@ -109,11 +104,6 @@ describe Banzai::Filter::MergeRequestReferenceFilter, lib: true do
 
       expect(reference_filter(act).to_html).to eq exp
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Merge #{reference}")
-      expect(result[:references][:merge_request]).to eq [merge]
-    end
   end
 
   context 'cross-project URL reference' do
@@ -133,10 +123,5 @@ describe Banzai::Filter::MergeRequestReferenceFilter, lib: true do
       doc = reference_filter("Merge (#{reference}.)")
       expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(merge.to_reference(project))} \(diffs, comment 123\)<\/a>\.\)/)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Merge #{reference}")
-      expect(result[:references][:merge_request]).to eq [merge]
-    end
   end
 end
diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
index bdf48eabb0e..9424f2363e1 100644
--- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
@@ -48,11 +48,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
       namespace_project_milestone_path(project.namespace, project, milestone)
   end
 
-  it 'adds to the results hash' do
-    result = reference_pipeline_result("Milestone #{reference}")
-    expect(result[:references][:milestone]).to eq [milestone]
-  end
-
   context 'Integer-based references' do
     it 'links to a valid reference' do
       doc = reference_filter("See #{reference}")
@@ -151,11 +146,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
       expect(link).to have_attribute('data-milestone')
       expect(link.attr('data-milestone')).to eq milestone.id.to_s
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Milestone #{reference}")
-      expect(result[:references][:milestone]).to eq [milestone]
-    end
   end
 
   describe 'cross project milestone references' do
diff --git a/spec/lib/banzai/filter/redactor_filter_spec.rb b/spec/lib/banzai/filter/redactor_filter_spec.rb
index c2c2fd0eb6a..697d10bbf70 100644
--- a/spec/lib/banzai/filter/redactor_filter_spec.rb
+++ b/spec/lib/banzai/filter/redactor_filter_spec.rb
@@ -16,11 +16,23 @@ describe Banzai::Filter::RedactorFilter, lib: true do
   end
 
   context 'with data-project' do
+    let(:parser_class) do
+      Class.new(Banzai::ReferenceParser::BaseParser) do
+        self.reference_type = :test
+      end
+    end
+
+    before do
+      allow(Banzai::ReferenceParser).to receive(:[]).
+        with('test').
+        and_return(parser_class)
+    end
+
     it 'removes unpermitted Project references' do
       user = create(:user)
       project = create(:empty_project)
 
-      link = reference_link(project: project.id, reference_filter: 'ReferenceFilter')
+      link = reference_link(project: project.id, reference_type: 'test')
       doc = filter(link, current_user: user)
 
       expect(doc.css('a').length).to eq 0
@@ -31,14 +43,14 @@ describe Banzai::Filter::RedactorFilter, lib: true do
       project = create(:empty_project)
       project.team << [user, :master]
 
-      link = reference_link(project: project.id, reference_filter: 'ReferenceFilter')
+      link = reference_link(project: project.id, reference_type: 'test')
       doc = filter(link, current_user: user)
 
       expect(doc.css('a').length).to eq 1
     end
 
     it 'handles invalid Project references' do
-      link = reference_link(project: 12345, reference_filter: 'ReferenceFilter')
+      link = reference_link(project: 12345, reference_type: 'test')
 
       expect { filter(link) }.not_to raise_error
     end
@@ -51,7 +63,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         project = create(:empty_project, :public)
         issue = create(:issue, :confidential, project: project)
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
+        link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
         doc = filter(link, current_user: non_member)
 
         expect(doc.css('a').length).to eq 0
@@ -62,7 +74,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         project = create(:empty_project, :public)
         issue = create(:issue, :confidential, project: project, author: author)
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
+        link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
         doc = filter(link, current_user: author)
 
         expect(doc.css('a').length).to eq 1
@@ -73,7 +85,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         project = create(:empty_project, :public)
         issue = create(:issue, :confidential, project: project, assignee: assignee)
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
+        link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
         doc = filter(link, current_user: assignee)
 
         expect(doc.css('a').length).to eq 1
@@ -85,7 +97,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         project.team << [member, :developer]
         issue = create(:issue, :confidential, project: project)
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
+        link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
         doc = filter(link, current_user: member)
 
         expect(doc.css('a').length).to eq 1
@@ -96,7 +108,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         project = create(:empty_project, :public)
         issue = create(:issue, :confidential, project: project)
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
+        link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
         doc = filter(link, current_user: admin)
 
         expect(doc.css('a').length).to eq 1
@@ -108,7 +120,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
       project = create(:empty_project, :public)
       issue = create(:issue, project: project)
 
-      link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
+      link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
       doc = filter(link, current_user: user)
 
       expect(doc.css('a').length).to eq 1
@@ -121,7 +133,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         user = create(:user)
         group = create(:group, :private)
 
-        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
+        link = reference_link(group: group.id, reference_type: 'user')
         doc = filter(link, current_user: user)
 
         expect(doc.css('a').length).to eq 0
@@ -132,14 +144,14 @@ describe Banzai::Filter::RedactorFilter, lib: true do
         group = create(:group, :private)
         group.add_developer(user)
 
-        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
+        link = reference_link(group: group.id, reference_type: 'user')
         doc = filter(link, current_user: user)
 
         expect(doc.css('a').length).to eq 1
       end
 
       it 'handles invalid Group references' do
-        link = reference_link(group: 12345, reference_filter: 'UserReferenceFilter')
+        link = reference_link(group: 12345, reference_type: 'user')
 
         expect { filter(link) }.not_to raise_error
       end
@@ -149,7 +161,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
       it 'allows any User reference' do
         user = create(:user)
 
-        link = reference_link(user: user.id, reference_filter: 'UserReferenceFilter')
+        link = reference_link(user: user.id, reference_type: 'user')
         doc = filter(link)
 
         expect(doc.css('a').length).to eq 1
diff --git a/spec/lib/banzai/filter/reference_gatherer_filter_spec.rb b/spec/lib/banzai/filter/reference_gatherer_filter_spec.rb
deleted file mode 100644
index c8b1dfdf944..00000000000
--- a/spec/lib/banzai/filter/reference_gatherer_filter_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'spec_helper'
-
-describe Banzai::Filter::ReferenceGathererFilter, lib: true do
-  include ActionView::Helpers::UrlHelper
-  include FilterSpecHelper
-
-  def reference_link(data)
-    link_to('text', '', class: 'gfm', data: data)
-  end
-
-  context "for issue references" do
-
-    context 'with data-project' do
-      it 'removes unpermitted Project references' do
-        user = create(:user)
-        project = create(:empty_project)
-        issue = create(:issue, project: project)
-
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
-        result = pipeline_result(link, current_user: user)
-
-        expect(result[:references][:issue]).to be_empty
-      end
-
-      it 'allows permitted Project references' do
-        user = create(:user)
-        project = create(:empty_project)
-        issue = create(:issue, project: project)
-        project.team << [user, :master]
-
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
-        result = pipeline_result(link, current_user: user)
-
-        expect(result[:references][:issue]).to eq([issue])
-      end
-
-      it 'handles invalid Project references' do
-        link = reference_link(project: 12345, issue: 12345, reference_filter: 'IssueReferenceFilter')
-
-        expect { pipeline_result(link) }.not_to raise_error
-      end
-    end
-  end
-
-  context "for user references" do
-
-    context 'with data-group' do
-      it 'removes unpermitted Group references' do
-        user = create(:user)
-        group = create(:group)
-
-        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
-        result = pipeline_result(link, current_user: user)
-
-        expect(result[:references][:user]).to be_empty
-      end
-
-      it 'allows permitted Group references' do
-        user = create(:user)
-        group = create(:group)
-        group.add_developer(user)
-
-        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
-        result = pipeline_result(link, current_user: user)
-
-        expect(result[:references][:user]).to eq([user])
-      end
-
-      it 'handles invalid Group references' do
-        link = reference_link(group: 12345, reference_filter: 'UserReferenceFilter')
-
-        expect { pipeline_result(link) }.not_to raise_error
-      end
-    end
-
-    context 'with data-user' do
-      it 'allows any User reference' do
-        user = create(:user)
-
-        link = reference_link(user: user.id, reference_filter: 'UserReferenceFilter')
-        result = pipeline_result(link)
-
-        expect(result[:references][:user]).to eq([user])
-      end
-    end
-  end
-end
diff --git a/spec/lib/banzai/filter/snippet_reference_filter_spec.rb b/spec/lib/banzai/filter/snippet_reference_filter_spec.rb
index 26466fbb180..5068ddd7faa 100644
--- a/spec/lib/banzai/filter/snippet_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/snippet_reference_filter_spec.rb
@@ -77,11 +77,6 @@ describe Banzai::Filter::SnippetReferenceFilter, lib: true do
       expect(link).not_to match %r(https?://)
       expect(link).to eq urls.namespace_project_snippet_url(project.namespace, project, snippet, only_path: true)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Snippet #{reference}")
-      expect(result[:references][:snippet]).to eq [snippet]
-    end
   end
 
   context 'cross-project reference' do
@@ -107,11 +102,6 @@ describe Banzai::Filter::SnippetReferenceFilter, lib: true do
 
       expect(reference_filter(act).to_html).to eq exp
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Snippet #{reference}")
-      expect(result[:references][:snippet]).to eq [snippet]
-    end
   end
 
   context 'cross-project URL reference' do
@@ -137,10 +127,5 @@ describe Banzai::Filter::SnippetReferenceFilter, lib: true do
 
       expect(reference_filter(act).to_html).to match(/<a.+>#{Regexp.escape(invalidate_reference(reference))}<\/a>/)
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Snippet #{reference}")
-      expect(result[:references][:snippet]).to eq [snippet]
-    end
   end
 end
diff --git a/spec/lib/banzai/filter/user_reference_filter_spec.rb b/spec/lib/banzai/filter/user_reference_filter_spec.rb
index 8bdebae1841..d7dfd6699ef 100644
--- a/spec/lib/banzai/filter/user_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/user_reference_filter_spec.rb
@@ -31,28 +31,22 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
     end
 
     it 'supports a special @all mention' do
-      doc = reference_filter("Hey #{reference}")
+      doc = reference_filter("Hey #{reference}", author: user)
       expect(doc.css('a').length).to eq 1
       expect(doc.css('a').first.attr('href'))
         .to eq urls.namespace_project_url(project.namespace, project)
     end
 
-    context "when the author is a member of the project" do
+    it 'includes a data-author attribute when there is an author' do
+      doc = reference_filter(reference, author: user)
 
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Hey #{reference}", author: project.creator)
-        expect(result[:references][:user]).to eq [project.creator]
-      end
+      expect(doc.css('a').first.attr('data-author')).to eq(user.id.to_s)
     end
 
-    context "when the author is not a member of the project" do
+    it 'does not include a data-author attribute when there is no author' do
+      doc = reference_filter(reference)
 
-      let(:other_user) { create(:user) }
-
-      it "doesn't add to the results hash" do
-        result = reference_pipeline_result("Hey #{reference}", author: other_user)
-        expect(result[:references][:user]).to eq []
-      end
+      expect(doc.css('a').first.has_attribute?('data-author')).to eq(false)
     end
   end
 
@@ -83,11 +77,6 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
       expect(link).to have_attribute('data-user')
       expect(link.attr('data-user')).to eq user.namespace.owner_id.to_s
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Hey #{reference}")
-      expect(result[:references][:user]).to eq [user]
-    end
   end
 
   context 'mentioning a group' do
@@ -106,11 +95,6 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
       expect(link).to have_attribute('data-group')
       expect(link.attr('data-group')).to eq group.id.to_s
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Hey #{reference}")
-      expect(result[:references][:user]).to eq group.users
-    end
   end
 
   it 'links with adjacent text' do
@@ -151,10 +135,5 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
       expect(link).to have_attribute('data-user')
       expect(link.attr('data-user')).to eq user.namespace.owner_id.to_s
     end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Hey #{reference}")
-      expect(result[:references][:user]).to eq [user]
-    end
   end
 end
diff --git a/spec/lib/banzai/reference_parser/base_parser_spec.rb b/spec/lib/banzai/reference_parser/base_parser_spec.rb
new file mode 100644
index 00000000000..543b4786d84
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/base_parser_spec.rb
@@ -0,0 +1,237 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::BaseParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project, :public) }
+
+  subject do
+    klass = Class.new(described_class) do
+      self.reference_type = :foo
+    end
+
+    klass.new(project, user)
+  end
+
+  describe '.reference_type=' do
+    it 'sets the reference type' do
+      dummy = Class.new(described_class)
+      dummy.reference_type = :foo
+
+      expect(dummy.reference_type).to eq(:foo)
+    end
+  end
+
+  describe '#nodes_visible_to_user' do
+    let(:link) { empty_html_link }
+
+    context 'when the link has a data-project attribute' do
+      it 'returns the nodes if the attribute value equals the current project ID' do
+        link['data-project'] = project.id.to_s
+
+        expect(Ability.abilities).not_to receive(:allowed?)
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+      end
+
+      it 'returns the nodes if the user can read the project' do
+        other_project = create(:empty_project, :public)
+
+        link['data-project'] = other_project.id.to_s
+
+        expect(Ability.abilities).to receive(:allowed?).
+          with(user, :read_project, other_project).
+          and_return(true)
+
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+      end
+
+      it 'returns an empty Array when the attribute value is empty' do
+        link['data-project'] = ''
+
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+      end
+
+      it 'returns an empty Array when the user can not read the project' do
+        other_project = create(:empty_project, :public)
+
+        link['data-project'] = other_project.id.to_s
+
+        expect(Ability.abilities).to receive(:allowed?).
+          with(user, :read_project, other_project).
+          and_return(false)
+
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+      end
+    end
+
+    context 'when the link does not have a data-project attribute' do
+      it 'returns the nodes' do
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+      end
+    end
+  end
+
+  describe '#nodes_user_can_reference' do
+    it 'returns the nodes' do
+      link = double(:link)
+
+      expect(subject.nodes_user_can_reference(user, [link])).to eq([link])
+    end
+  end
+
+  describe '#referenced_by' do
+    context 'when references_relation is implemented' do
+      it 'returns a collection of objects' do
+        links = Nokogiri::HTML.fragment("<a data-foo='#{user.id}'></a>").
+          children
+
+        expect(subject).to receive(:references_relation).and_return(User)
+        expect(subject.referenced_by(links)).to eq([user])
+      end
+    end
+
+    context 'when references_relation is not implemented' do
+      it 'raises NotImplementedError' do
+        links = Nokogiri::HTML.fragment('<a data-foo="1"></a>').children
+
+        expect { subject.referenced_by(links) }.
+          to raise_error(NotImplementedError)
+      end
+    end
+  end
+
+  describe '#references_relation' do
+    it 'raises NotImplementedError' do
+      expect { subject.references_relation }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#gather_attributes_per_project' do
+    it 'returns a Hash containing attribute values per project' do
+      link = Nokogiri::HTML.fragment('<a data-project="1" data-foo="2"></a>').
+        children[0]
+
+      hash = subject.gather_attributes_per_project([link], 'data-foo')
+
+      expect(hash).to be_an_instance_of(Hash)
+
+      expect(hash[1].to_a).to eq(['2'])
+    end
+  end
+
+  describe '#grouped_objects_for_nodes' do
+    it 'returns a Hash grouping objects per ID' do
+      nodes = [double(:node)]
+
+      expect(subject).to receive(:unique_attribute_values).
+        with(nodes, 'data-user').
+        and_return([user.id])
+
+      hash = subject.grouped_objects_for_nodes(nodes, User, 'data-user')
+
+      expect(hash).to eq({ user.id => user })
+    end
+
+    it 'returns an empty Hash when the list of nodes is empty' do
+      expect(subject.grouped_objects_for_nodes([], User, 'data-user')).to eq({})
+    end
+  end
+
+  describe '#unique_attribute_values' do
+    it 'returns an Array of unique values' do
+      link = double(:link)
+
+      expect(link).to receive(:has_attribute?).
+        with('data-foo').
+        twice.
+        and_return(true)
+
+      expect(link).to receive(:attr).
+        with('data-foo').
+        twice.
+        and_return('1')
+
+      nodes = [link, link]
+
+      expect(subject.unique_attribute_values(nodes, 'data-foo')).to eq(['1'])
+    end
+  end
+
+  describe '#process' do
+    it 'gathers the references for every node matching the reference type' do
+      dummy = Class.new(described_class) do
+        self.reference_type = :test
+      end
+
+      instance = dummy.new(project, user)
+      document = Nokogiri::HTML.fragment('<a class="gfm"></a><a class="gfm" data-reference-type="test"></a>')
+
+      expect(instance).to receive(:gather_references).
+        with([document.children[1]]).
+        and_return([user])
+
+      expect(instance.process([document])).to eq([user])
+    end
+  end
+
+  describe '#gather_references' do
+    let(:link) { double(:link) }
+
+    it 'does not process links a user can not reference' do
+      expect(subject).to receive(:nodes_user_can_reference).
+        with(user, [link]).
+        and_return([])
+
+      expect(subject).to receive(:referenced_by).with([])
+
+      subject.gather_references([link])
+    end
+
+    it 'does not process links a user can not see' do
+      expect(subject).to receive(:nodes_user_can_reference).
+        with(user, [link]).
+        and_return([link])
+
+      expect(subject).to receive(:nodes_visible_to_user).
+        with(user, [link]).
+        and_return([])
+
+      expect(subject).to receive(:referenced_by).with([])
+
+      subject.gather_references([link])
+    end
+
+    it 'returns the references if a user can reference and see a link' do
+      expect(subject).to receive(:nodes_user_can_reference).
+        with(user, [link]).
+        and_return([link])
+
+      expect(subject).to receive(:nodes_visible_to_user).
+        with(user, [link]).
+        and_return([link])
+
+      expect(subject).to receive(:referenced_by).with([link])
+
+      subject.gather_references([link])
+    end
+  end
+
+  describe '#can?' do
+    it 'delegates the permissions check to the Ability class' do
+      user = double(:user)
+
+      expect(Ability.abilities).to receive(:allowed?).
+        with(user, :read_project, project)
+
+      subject.can?(user, :read_project, project)
+    end
+  end
+
+  describe '#find_projects_for_hash_keys' do
+    it 'returns a list of Projects' do
+      expect(subject.find_projects_for_hash_keys(project.id => project)).
+        to eq([project])
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/commit_parser_spec.rb b/spec/lib/banzai/reference_parser/commit_parser_spec.rb
new file mode 100644
index 00000000000..0b76d29fce0
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/commit_parser_spec.rb
@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::CommitParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    context 'when the link has a data-project attribute' do
+      before do
+        link['data-project'] = project.id.to_s
+      end
+
+      context 'when the link has a data-commit attribute' do
+        before do
+          link['data-commit'] = '123'
+        end
+
+        it 'returns an Array of commits' do
+          commit = double(:commit)
+
+          allow_any_instance_of(Project).to receive(:valid_repo?).
+            and_return(true)
+
+          expect(subject).to receive(:find_commits).
+            with(project, ['123']).
+            and_return([commit])
+
+          expect(subject.referenced_by([link])).to eq([commit])
+        end
+
+        it 'returns an empty Array when the commit could not be found' do
+          allow_any_instance_of(Project).to receive(:valid_repo?).
+            and_return(true)
+
+          expect(subject).to receive(:find_commits).
+            with(project, ['123']).
+            and_return([])
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+
+        it 'skips projects without valid repositories' do
+          allow_any_instance_of(Project).to receive(:valid_repo?).
+            and_return(false)
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+
+      context 'when the link does not have a data-commit attribute' do
+        it 'returns an empty Array' do
+          allow_any_instance_of(Project).to receive(:valid_repo?).
+            and_return(true)
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+
+    context 'when the link does not have a data-project attribute' do
+      it 'returns an empty Array' do
+        allow_any_instance_of(Project).to receive(:valid_repo?).
+          and_return(true)
+
+        expect(subject.referenced_by([link])).to eq([])
+      end
+    end
+  end
+
+  describe '#commit_ids_per_project' do
+    before do
+      link['data-project'] = project.id.to_s
+    end
+
+    it 'returns a Hash containing commit IDs per project' do
+      link['data-commit'] = '123'
+
+      hash = subject.commit_ids_per_project([link])
+
+      expect(hash).to be_an_instance_of(Hash)
+
+      expect(hash[project.id].to_a).to eq(['123'])
+    end
+
+    it 'does not add a project when the data-commit attribute is empty' do
+      hash = subject.commit_ids_per_project([link])
+
+      expect(hash).to be_empty
+    end
+  end
+
+  describe '#find_commits' do
+    it 'returns an Array of commit objects' do
+      commit = double(:commit)
+
+      expect(project).to receive(:commit).with('123').and_return(commit)
+      expect(project).to receive(:valid_repo?).and_return(true)
+
+      expect(subject.find_commits(project, %w{123})).to eq([commit])
+    end
+
+    it 'skips commit IDs for which no commit could be found' do
+      expect(project).to receive(:commit).with('123').and_return(nil)
+      expect(project).to receive(:valid_repo?).and_return(true)
+
+      expect(subject.find_commits(project, %w{123})).to eq([])
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb b/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
new file mode 100644
index 00000000000..ba982f38542
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::CommitRangeParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    context 'when the link has a data-project attribute' do
+      before do
+        link['data-project'] = project.id.to_s
+      end
+
+      context 'when the link as a data-commit-range attribute' do
+        before do
+          link['data-commit-range'] = '123..456'
+        end
+
+        it 'returns an Array of commit ranges' do
+          range = double(:range)
+
+          expect(subject).to receive(:find_object).
+            with(project, '123..456').
+            and_return(range)
+
+          expect(subject.referenced_by([link])).to eq([range])
+        end
+
+        it 'returns an empty Array when the commit range could not be found' do
+          expect(subject).to receive(:find_object).
+            with(project, '123..456').
+            and_return(nil)
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+
+      context 'when the link does not have a data-commit-range attribute' do
+        it 'returns an empty Array' do
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+
+    context 'when the link does not have a data-project attribute' do
+      it 'returns an empty Array' do
+        expect(subject.referenced_by([link])).to eq([])
+      end
+    end
+  end
+
+  describe '#commit_range_ids_per_project' do
+    before do
+      link['data-project'] = project.id.to_s
+    end
+
+    it 'returns a Hash containing range IDs per project' do
+      link['data-commit-range'] = '123..456'
+
+      hash = subject.commit_range_ids_per_project([link])
+
+      expect(hash).to be_an_instance_of(Hash)
+
+      expect(hash[project.id].to_a).to eq(['123..456'])
+    end
+
+    it 'does not add a project when the data-commit-range attribute is empty' do
+      hash = subject.commit_range_ids_per_project([link])
+
+      expect(hash).to be_empty
+    end
+  end
+
+  describe '#find_ranges' do
+    it 'returns an Array of range objects' do
+      range = double(:commit)
+
+      expect(subject).to receive(:find_object).
+        with(project, '123..456').
+        and_return(range)
+
+      expect(subject.find_ranges(project, ['123..456'])).to eq([range])
+    end
+
+    it 'skips ranges that could not be found' do
+      expect(subject).to receive(:find_object).
+        with(project, '123..456').
+        and_return(nil)
+
+      expect(subject.find_ranges(project, ['123..456'])).to eq([])
+    end
+  end
+
+  describe '#find_object' do
+    let(:range) { double(:range) }
+
+    before do
+      expect(CommitRange).to receive(:new).and_return(range)
+    end
+
+    context 'when the range has valid commits' do
+      it 'returns the commit range' do
+        expect(range).to receive(:valid_commits?).and_return(true)
+
+        expect(subject.find_object(project, '123..456')).to eq(range)
+      end
+    end
+
+    context 'when the range does not have any valid commits' do
+      it 'returns nil' do
+        expect(range).to receive(:valid_commits?).and_return(false)
+
+        expect(subject.find_object(project, '123..456')).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb b/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb
new file mode 100644
index 00000000000..a6ef8394fe7
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::ExternalIssueParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    context 'when the link has a data-project attribute' do
+      before do
+        link['data-project'] = project.id.to_s
+      end
+
+      context 'when the link has a data-external-issue attribute' do
+        it 'returns an Array of ExternalIssue instances' do
+          link['data-external-issue'] = '123'
+
+          refs = subject.referenced_by([link])
+
+          expect(refs).to eq([ExternalIssue.new('123', project)])
+        end
+      end
+
+      context 'when the link does not have a data-external-issue attribute' do
+        it 'returns an empty Array' do
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+
+    context 'when the link does not have a data-project attribute' do
+      it 'returns an empty Array' do
+        expect(subject.referenced_by([link])).to eq([])
+      end
+    end
+  end
+
+  describe '#issue_ids_per_project' do
+    before do
+      link['data-project'] = project.id.to_s
+    end
+
+    it 'returns a Hash containing range IDs per project' do
+      link['data-external-issue'] = '123'
+
+      hash = subject.issue_ids_per_project([link])
+
+      expect(hash).to be_an_instance_of(Hash)
+
+      expect(hash[project.id].to_a).to eq(['123'])
+    end
+
+    it 'does not add a project when the data-external-issue attribute is empty' do
+      hash = subject.issue_ids_per_project([link])
+
+      expect(hash).to be_empty
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/issue_parser_spec.rb b/spec/lib/banzai/reference_parser/issue_parser_spec.rb
new file mode 100644
index 00000000000..514c752546d
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/issue_parser_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::IssueParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  let(:issue) { create(:issue, project: project) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#nodes_visible_to_user' do
+    context 'when the link has a data-issue attribute' do
+      before do
+        link['data-issue'] = issue.id.to_s
+      end
+
+      it 'returns the nodes when the user can read the issue' do
+        expect(Ability.abilities).to receive(:allowed?).
+          with(user, :read_issue, issue).
+          and_return(true)
+
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+      end
+
+      it 'returns an empty Array when the user can not read the issue' do
+        expect(Ability.abilities).to receive(:allowed?).
+          with(user, :read_issue, issue).
+          and_return(false)
+
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+      end
+    end
+
+    context 'when the link does not have a data-issue attribute' do
+      it 'returns an empty Array' do
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+      end
+    end
+
+    context 'when the project uses an external issue tracker' do
+      it 'returns all nodes' do
+        link = double(:link)
+
+        expect(project).to receive(:external_issue_tracker).and_return(true)
+
+        expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+      end
+    end
+  end
+
+  describe '#referenced_by' do
+    context 'when the link has a data-issue attribute' do
+      context 'using an existing issue ID' do
+        before do
+          link['data-issue'] = issue.id.to_s
+        end
+
+        it 'returns an Array of issues' do
+          expect(subject.referenced_by([link])).to eq([issue])
+        end
+
+        it 'returns an empty Array when the list of nodes is empty' do
+          expect(subject.referenced_by([link])).to eq([issue])
+          expect(subject.referenced_by([])).to eq([])
+        end
+      end
+    end
+  end
+
+  describe '#issues_for_nodes' do
+    it 'returns a Hash containing the issues for a list of nodes' do
+      link['data-issue'] = issue.id.to_s
+      nodes = [link]
+
+      expect(subject.issues_for_nodes(nodes)).to eq({ issue.id => issue })
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/label_parser_spec.rb b/spec/lib/banzai/reference_parser/label_parser_spec.rb
new file mode 100644
index 00000000000..77fda47f0e7
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/label_parser_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::LabelParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  let(:label) { create(:label, project: project) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    describe 'when the link has a data-label attribute' do
+      context 'using an existing label ID' do
+        it 'returns an Array of labels' do
+          link['data-label'] = label.id.to_s
+
+          expect(subject.referenced_by([link])).to eq([label])
+        end
+      end
+
+      context 'using a non-existing label ID' do
+        it 'returns an empty Array' do
+          link['data-label'] = ''
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb b/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb
new file mode 100644
index 00000000000..cf89ad598ea
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/merge_request_parser_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::MergeRequestParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:user) { create(:user) }
+  let(:merge_request) { create(:merge_request) }
+  subject { described_class.new(merge_request.target_project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    describe 'when the link has a data-merge-request attribute' do
+      context 'using an existing merge request ID' do
+        it 'returns an Array of merge requests' do
+          link['data-merge-request'] = merge_request.id.to_s
+
+          expect(subject.referenced_by([link])).to eq([merge_request])
+        end
+      end
+
+      context 'using a non-existing merge request ID' do
+        it 'returns an empty Array' do
+          link['data-merge-request'] = ''
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/milestone_parser_spec.rb b/spec/lib/banzai/reference_parser/milestone_parser_spec.rb
new file mode 100644
index 00000000000..6aa45a22cc4
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/milestone_parser_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::MilestoneParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  let(:milestone) { create(:milestone, project: project) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    describe 'when the link has a data-milestone attribute' do
+      context 'using an existing milestone ID' do
+        it 'returns an Array of milestones' do
+          link['data-milestone'] = milestone.id.to_s
+
+          expect(subject.referenced_by([link])).to eq([milestone])
+        end
+      end
+
+      context 'using a non-existing milestone ID' do
+        it 'returns an empty Array' do
+          link['data-milestone'] = ''
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/snippet_parser_spec.rb b/spec/lib/banzai/reference_parser/snippet_parser_spec.rb
new file mode 100644
index 00000000000..59127b7c5d1
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/snippet_parser_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::SnippetParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:project) { create(:empty_project, :public) }
+  let(:user) { create(:user) }
+  let(:snippet) { create(:snippet, project: project) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    describe 'when the link has a data-snippet attribute' do
+      context 'using an existing snippet ID' do
+        it 'returns an Array of snippets' do
+          link['data-snippet'] = snippet.id.to_s
+
+          expect(subject.referenced_by([link])).to eq([snippet])
+        end
+      end
+
+      context 'using a non-existing snippet ID' do
+        it 'returns an empty Array' do
+          link['data-snippet'] = ''
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_parser/user_parser_spec.rb b/spec/lib/banzai/reference_parser/user_parser_spec.rb
new file mode 100644
index 00000000000..9a82891297d
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/user_parser_spec.rb
@@ -0,0 +1,189 @@
+require 'spec_helper'
+
+describe Banzai::ReferenceParser::UserParser, lib: true do
+  include ReferenceParserHelpers
+
+  let(:group) { create(:group) }
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project, :public, group: group, creator: user) }
+  subject { described_class.new(project, user) }
+  let(:link) { empty_html_link }
+
+  describe '#referenced_by' do
+    context 'when the link has a data-group attribute' do
+      context 'using an existing group ID' do
+        before do
+          link['data-group'] = project.group.id.to_s
+        end
+
+        it 'returns the users of the group' do
+          create(:group_member, group: group, user: user)
+
+          expect(subject.referenced_by([link])).to eq([user])
+        end
+
+        it 'returns an empty Array when the group has no users' do
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+
+      context 'using a non-existing group ID' do
+        it 'returns an empty Array' do
+          link['data-group'] = ''
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+
+    context 'when the link has a data-user attribute' do
+      it 'returns an Array of users' do
+        link['data-user'] = user.id.to_s
+
+        expect(subject.referenced_by([link])).to eq([user])
+      end
+    end
+
+    context 'when the link has a data-project attribute' do
+      context 'using an existing project ID' do
+        let(:contributor) { create(:user) }
+
+        before do
+          project.team << [user, :developer]
+          project.team << [contributor, :developer]
+        end
+
+        it 'returns the members of a project' do
+          link['data-project'] = project.id.to_s
+
+          # This uses an explicit sort to make sure this spec doesn't randomly
+          # fail when objects are returned in a different order.
+          refs = subject.referenced_by([link]).sort_by(&:id)
+
+          expect(refs).to eq([user, contributor])
+        end
+      end
+
+      context 'using a non-existing project ID' do
+        it 'returns an empty Array' do
+          link['data-project'] = ''
+
+          expect(subject.referenced_by([link])).to eq([])
+        end
+      end
+    end
+  end
+
+  describe '#nodes_visible_to_use?' do
+    context 'when the link has a data-group attribute' do
+      context 'using an existing group ID' do
+        before do
+          link['data-group'] = group.id.to_s
+        end
+
+        it 'returns the nodes if the user can read the group' do
+          expect(Ability.abilities).to receive(:allowed?).
+            with(user, :read_group, group).
+            and_return(true)
+
+          expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+        end
+
+        it 'returns an empty Array if the user can not read the group' do
+          expect(Ability.abilities).to receive(:allowed?).
+            with(user, :read_group, group).
+            and_return(false)
+
+          expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+        end
+      end
+
+      context 'when the link does not have a data-group attribute' do
+        context 'with a data-project attribute' do
+          it 'returns the nodes if the attribute value equals the current project ID' do
+            link['data-project'] = project.id.to_s
+
+            expect(Ability.abilities).not_to receive(:allowed?)
+
+            expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+          end
+
+          it 'returns the nodes if the user can read the project' do
+            other_project = create(:empty_project, :public)
+
+            link['data-project'] = other_project.id.to_s
+
+            expect(Ability.abilities).to receive(:allowed?).
+              with(user, :read_project, other_project).
+              and_return(true)
+
+            expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+          end
+
+          it 'returns an empty Array if the user can not read the project' do
+            other_project = create(:empty_project, :public)
+
+            link['data-project'] = other_project.id.to_s
+
+            expect(Ability.abilities).to receive(:allowed?).
+              with(user, :read_project, other_project).
+              and_return(false)
+
+            expect(subject.nodes_visible_to_user(user, [link])).to eq([])
+          end
+        end
+
+        context 'without a data-project attribute' do
+          it 'returns the nodes' do
+            expect(subject.nodes_visible_to_user(user, [link])).to eq([link])
+          end
+        end
+      end
+    end
+  end
+
+  describe '#nodes_user_can_reference' do
+    context 'when the link has a data-author attribute' do
+      it 'returns the nodes when the user is a member of the project' do
+        other_project = create(:project)
+        other_project.team << [user, :developer]
+
+        link['data-project'] = other_project.id.to_s
+        link['data-author'] = user.id.to_s
+
+        expect(subject.nodes_user_can_reference(user, [link])).to eq([link])
+      end
+
+      it 'returns an empty Array when the project could not be found' do
+        link['data-project'] = ''
+        link['data-author'] = user.id.to_s
+
+        expect(subject.nodes_user_can_reference(user, [link])).to eq([])
+      end
+
+      it 'returns an empty Array when the user could not be found' do
+        other_project = create(:project)
+
+        link['data-project'] = other_project.id.to_s
+        link['data-author'] = ''
+
+        expect(subject.nodes_user_can_reference(user, [link])).to eq([])
+      end
+
+      it 'returns an empty Array when the user is not a team member' do
+        other_project = create(:project)
+
+        link['data-project'] = other_project.id.to_s
+        link['data-author'] = user.id.to_s
+
+        expect(subject.nodes_user_can_reference(user, [link])).to eq([])
+      end
+    end
+
+    context 'when the link does not have a data-author attribute' do
+      it 'returns the nodes' do
+        expect(subject.nodes_user_can_reference(user, [link])).to eq([link])
+      end
+    end
+  end
+end
diff --git a/spec/support/filter_spec_helper.rb b/spec/support/filter_spec_helper.rb
index e849a9633b9..a8e454eb09e 100644
--- a/spec/support/filter_spec_helper.rb
+++ b/spec/support/filter_spec_helper.rb
@@ -40,8 +40,7 @@ module FilterSpecHelper
 
     filters = [
       Banzai::Filter::AutolinkFilter,
-      described_class,
-      Banzai::Filter::ReferenceGathererFilter
+      described_class
     ]
 
     HTML::Pipeline.new(filters, context)
diff --git a/spec/support/reference_parser_helpers.rb b/spec/support/reference_parser_helpers.rb
new file mode 100644
index 00000000000..01689194eac
--- /dev/null
+++ b/spec/support/reference_parser_helpers.rb
@@ -0,0 +1,5 @@
+module ReferenceParserHelpers
+  def empty_html_link
+    Nokogiri::HTML.fragment('<a></a>').children[0]
+  end
+end

From 25c08d11bbf3a889501ebe295a1ab66a12a52d49 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 26 May 2016 13:18:44 +0200
Subject: [PATCH 0822/1431] Added author to various Markdown calls in views

This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
---
 app/views/admin/abuse_reports/_abuse_report.html.haml    | 2 +-
 app/views/events/_commit.html.haml                       | 2 +-
 app/views/events/_event_issue.atom.haml                  | 2 +-
 app/views/events/_event_merge_request.atom.haml          | 2 +-
 app/views/events/_event_note.atom.haml                   | 2 +-
 app/views/events/_event_push.atom.haml                   | 2 +-
 app/views/events/event/_push.html.haml                   | 2 +-
 app/views/notify/_note_message.html.haml                 | 2 +-
 app/views/notify/new_issue_email.html.haml               | 2 +-
 app/views/notify/new_merge_request_email.html.haml       | 2 +-
 app/views/projects/commit/_commit_box.html.haml          | 4 ++--
 app/views/projects/commits/_commit.html.haml             | 2 +-
 app/views/projects/issues/show.html.haml                 | 4 ++--
 app/views/projects/merge_requests/show/_mr_box.html.haml | 4 ++--
 app/views/projects/merge_requests/widget/_open.html.haml | 2 +-
 app/views/projects/notes/_note.html.haml                 | 2 +-
 app/views/projects/repositories/_feed.html.haml          | 2 +-
 app/views/search/results/_issue.html.haml                | 2 +-
 app/views/search/results/_merge_request.html.haml        | 2 +-
 app/views/search/results/_note.html.haml                 | 2 +-
 app/views/shared/snippets/_header.html.haml              | 2 +-
 21 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index 2ab01704b77..862b86d9d4a 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -16,7 +16,7 @@
     .light.small
       = time_ago_with_tooltip(abuse_report.created_at)
   %td
-    = markdown(abuse_report.message.squish!, pipeline: :single_line)
+    = markdown(abuse_report.message.squish!, pipeline: :single_line, author: reporter)
   %td
     - if user
       = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml
index dce4081288c..1bc9f604438 100644
--- a/app/views/events/_commit.html.haml
+++ b/app/views/events/_commit.html.haml
@@ -2,4 +2,4 @@
   .commit-row-title
     = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '', title: truncate_sha(commit[:id])
     &middot;
-    = markdown event_commit_title(commit[:message]), project: project, pipeline: :single_line
+    = markdown event_commit_title(commit[:message]), project: project, pipeline: :single_line, author: event.author
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml
index fad65310021..083c3936212 100644
--- a/app/views/events/_event_issue.atom.haml
+++ b/app/views/events/_event_issue.atom.haml
@@ -1,2 +1,2 @@
 %div{xmlns: "http://www.w3.org/1999/xhtml"}
-  = markdown(issue.description, pipeline: :atom, project: issue.project)
+  = markdown(issue.description, pipeline: :atom, project: issue.project, author: issue.author)
diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml
index 19bdc7b9ca5..d7e05600627 100644
--- a/app/views/events/_event_merge_request.atom.haml
+++ b/app/views/events/_event_merge_request.atom.haml
@@ -1,2 +1,2 @@
 %div{xmlns: "http://www.w3.org/1999/xhtml"}
-  = markdown(merge_request.description, pipeline: :atom, project: merge_request.project)
+  = markdown(merge_request.description, pipeline: :atom, project: merge_request.project, author: merge_request.author)
diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml
index b730ebbd5f9..1154f982821 100644
--- a/app/views/events/_event_note.atom.haml
+++ b/app/views/events/_event_note.atom.haml
@@ -1,2 +1,2 @@
 %div{xmlns: "http://www.w3.org/1999/xhtml"}
-  = markdown(note.note, pipeline: :atom, project: note.project)
+  = markdown(note.note, pipeline: :atom, project: note.project, author: note.author)
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml
index b271b9daff1..28bee1d0a33 100644
--- a/app/views/events/_event_push.atom.haml
+++ b/app/views/events/_event_push.atom.haml
@@ -6,7 +6,7 @@
       %i
         at
         = commit[:timestamp].to_time.to_s(:short)
-    %blockquote= markdown(escape_once(commit[:message]), pipeline: :atom, project: event.project)
+    %blockquote= markdown(escape_once(commit[:message]), pipeline: :atom, project: event.project, author: event.author)
   - if event.commits_count > 15
     %p
       %i
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 235bd46107e..dc4ff17e31a 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -15,7 +15,7 @@
     %ul.well-list.event_commits
       - few_commits = event.commits[0...2]
       - few_commits.each do |commit|
-        = render "events/commit", commit: commit, project: project
+        = render "events/commit", commit: commit, project: project, event: event
 
       - create_mr = event.new_ref? && create_mr_button?(event.project.default_branch, event.ref_name, event.project)
       - if event.commits_count > 1
diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml
index 12ded41fbf2..e9c66170877 100644
--- a/app/views/notify/_note_message.html.haml
+++ b/app/views/notify/_note_message.html.haml
@@ -2,4 +2,4 @@
   %div
     #{link_to @note.author_name, user_url(@note.author)} wrote:
 %div
-  = markdown(@note.note, pipeline: :email)
+  = markdown(@note.note, pipeline: :email, author: @note.author)
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index ad3ab2525bb..f42b150c0d6 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -2,7 +2,7 @@
   %div
     #{link_to @issue.author_name, user_url(@issue.author)} wrote:
 -if @issue.description
-  = markdown(@issue.description, pipeline: :email)
+  = markdown(@issue.description, pipeline: :email, author: @issue.author)
 
 - if @issue.assignee_id.present?
   %p
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 23423e7d981..158404de396 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -9,4 +9,4 @@
     Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
 
 -if @merge_request.description
-  = markdown(@merge_request.description, pipeline: :email)
+  = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author)
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 028564c9305..be00383a3d7 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -59,10 +59,10 @@
 
 .commit-box.content-block
   %h3.commit-title
-    = markdown escape_once(@commit.title), pipeline: :single_line
+    = markdown escape_once(@commit.title), pipeline: :single_line, author: @commit.author
   - if @commit.description.present?
     %pre.commit-description
-      = preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
+      = preserve(markdown(escape_once(@commit.description), pipeline: :single_line, author: @commit.author))
 
 :javascript
   $(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 655cb0ac3cb..367027182b6 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -24,7 +24,7 @@
     - if commit.description?
       .commit-row-description.js-toggle-content
         %pre
-          = preserve(markdown(escape_once(commit.description), pipeline: :single_line))
+          = preserve(markdown(escape_once(commit.description), pipeline: :single_line, author: commit.author))
 
     .commit-row-info
       by
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index bde80bbb54b..4634702dea8 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -53,12 +53,12 @@
 .issue-details.issuable-details
   .detail-page-description.content-block
     %h2.title
-      = markdown escape_once(@issue.title), pipeline: :single_line
+      = markdown escape_once(@issue.title), pipeline: :single_line, author: @issue.author
     - if @issue.description.present?
       .description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' }
         .wiki
           = preserve do
-            = markdown(@issue.description, cache_key: [@issue, "description"])
+            = markdown(@issue.description, cache_key: [@issue, "description"], author: @issue.author)
         %textarea.hidden.js-task-list-field
           = @issue.description
     = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago')
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index a23bd8d18d0..ebf18f6ac85 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -1,13 +1,13 @@
 .detail-page-description.content-block
   %h2.title
-    = markdown escape_once(@merge_request.title), pipeline: :single_line
+    = markdown escape_once(@merge_request.title), pipeline: :single_line, author: @merge_request.author
 
   %div
     - if @merge_request.description.present?
       .description{class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''}
         .wiki
           = preserve do
-            = markdown(@merge_request.description, cache_key: [@merge_request, "description"])
+            = markdown(@merge_request.description, cache_key: [@merge_request, "description"], author: @merge_request.author)
         %textarea.hidden.js-task-list-field
           = @merge_request.description
 
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 55dbae598d3..13359abede7 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -26,4 +26,4 @@
         %i.fa.fa-check
         Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
         = succeed '.' do
-          != markdown issues_sentence(@closes_issues), pipeline: :gfm
+          != markdown issues_sentence(@closes_issues), pipeline: :gfm, author: @merge_request.author
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 9fbc9a45549..f1045bbd8c3 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -29,7 +29,7 @@
       .note-body{class: note_editable ? 'js-task-list-container' : ''}
         .note-text
           = preserve do
-            = markdown(note.note, pipeline: :note, cache_key: [note, "note"])
+            = markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author)
         - if note_editable
           = render 'projects/notes/edit_form', note: note
       = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
diff --git a/app/views/projects/repositories/_feed.html.haml b/app/views/projects/repositories/_feed.html.haml
index 6ca919f7f80..43a6fdfd103 100644
--- a/app/views/projects/repositories/_feed.html.haml
+++ b/app/views/projects/repositories/_feed.html.haml
@@ -12,7 +12,7 @@
       = link_to namespace_project_commits_path(@project.namespace, @project, commit.id) do
         %code= commit.short_id
       = image_tag avatar_icon(commit.author_email), class: "", width: 16, alt: ''
-      = markdown escape_once(truncate(commit.title, length: 40)), pipeline: :single_line
+      = markdown escape_once(truncate(commit.title, length: 40)), pipeline: :single_line, author: commit.author
   %td
     %span.pull-right.cgray
       = time_ago_with_tooltip(commit.committed_date)
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml
index 640890fbe92..8f68d6d1b87 100644
--- a/app/views/search/results/_issue.html.haml
+++ b/app/views/search/results/_issue.html.haml
@@ -7,7 +7,7 @@
   - if issue.description.present?
     .description.term
       = preserve do
-        = search_md_sanitize(markdown(truncate(issue.description, length: 200, separator: " "), { project: issue.project }))
+        = search_md_sanitize(markdown(truncate(issue.description, length: 200, separator: " "), { project: issue.project, author: issue.author }))
   %span.light
     #{issue.project.name_with_namespace}
   - if issue.closed?
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index 333f6533213..6331c2bd6b0 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -6,7 +6,7 @@
   - if merge_request.description.present?
     .description.term
       = preserve do
-        = search_md_sanitize(markdown(merge_request.description, { project: merge_request.project }))
+        = search_md_sanitize(markdown(merge_request.description, { project: merge_request.project, author: merge_request.author }))
   %span.light
     #{merge_request.project.name_with_namespace}
   .pull-right
diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml
index d9400b1d9fa..8163aff43b6 100644
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@@ -19,4 +19,4 @@
   .note-search-result
     .term
       = preserve do
-        = search_md_sanitize(markdown(note.note, {no_header_anchors: true}))
+        = search_md_sanitize(markdown(note.note, {no_header_anchors: true, author: note.author}))
diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 897aa5b4462..eef8340b216 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -21,4 +21,4 @@
 
 .content-block.second-block
   %h2.snippet-title.prepend-top-0.append-bottom-0
-    = markdown escape_once(@snippet.title), pipeline: :single_line
+    = markdown escape_once(@snippet.title), pipeline: :single_line, author: @snippet.author

From 35e977d69b622e5a82be58c632ddc427d771cc09 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 26 May 2016 13:34:06 +0200
Subject: [PATCH 0823/1431] Refactor Mentionable

Caching is now always enabled when rendering attributes as there's no
reason to not cache them. The method Mentionable#all_references has also
been modified to take an optional Gitlab::ReferenceExtractor instance to
allow other code to create one and re-use it between multiple calls.
---
 app/models/concerns/mentionable.rb | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index b381d225485..f00b5b8497c 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -23,7 +23,7 @@ module Mentionable
 
   included do
     if self < Participable
-      participant ->(current_user) { mentioned_users(current_user) }
+      participant -> (user, ext) { all_references(user, extractor: ext) }
     end
   end
 
@@ -43,23 +43,22 @@ module Mentionable
     self
   end
 
-  def all_references(current_user = nil, text = nil)
-    ext = Gitlab::ReferenceExtractor.new(self.project, current_user || self.author, self.author)
+  def all_references(current_user = nil, text = nil, extractor: nil)
+    extractor ||= Gitlab::ReferenceExtractor.
+      new(project, current_user || author)
 
     if text
-      ext.analyze(text)
+      extractor.analyze(text, author: author)
     else
       self.class.mentionable_attrs.each do |attr, options|
-        text = send(attr)
+        text = __send__(attr)
+        options = options.merge(cache_key: [self, attr], author: author)
 
-        context = options.dup
-        context[:cache_key] = [self, attr] if context.delete(:cache) && self.persisted?
-
-        ext.analyze(text, context)
+        extractor.analyze(text, options)
       end
     end
 
-    ext
+    extractor
   end
 
   def mentioned_users(current_user = nil)

From 5771114f9b5dba9c17b273a5dec0ef6900f6da9d Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 26 May 2016 17:53:21 +0200
Subject: [PATCH 0824/1431] Rename metric to 'rails queue duration'

---
 config/initializers/metrics.rb                                | 2 +-
 .../{proxy_flight_time.rb => rails_queue_duration.rb}         | 4 ++--
 ...proxy_flight_time_spec.rb => rails_queue_duration_spec.rb} | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/gitlab/middleware/{proxy_flight_time.rb => rails_queue_duration.rb} (82%)
 rename spec/lib/gitlab/middleware/{proxy_flight_time_spec.rb => rails_queue_duration_spec.rb} (86%)

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 540e10c1ec1..0c788714714 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -12,7 +12,7 @@ if Gitlab::Metrics.enabled?
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Metrics::RackMiddleware)
-    config.middleware.use(Gitlab::Middleware::ProxyFlightTime)
+    config.middleware.use(Gitlab::Middleware::RailsQueueDuration)
   end
 
   Sidekiq.configure_server do |config|
diff --git a/lib/gitlab/middleware/proxy_flight_time.rb b/lib/gitlab/middleware/rails_queue_duration.rb
similarity index 82%
rename from lib/gitlab/middleware/proxy_flight_time.rb
rename to lib/gitlab/middleware/rails_queue_duration.rb
index 042bcdacf8b..56608b1b276 100644
--- a/lib/gitlab/middleware/proxy_flight_time.rb
+++ b/lib/gitlab/middleware/rails_queue_duration.rb
@@ -4,7 +4,7 @@
 
 module Gitlab
   module Middleware
-    class ProxyFlightTime
+    class RailsQueueDuration
       def initialize(app)
         @app = app
       end
@@ -14,7 +14,7 @@ module Gitlab
         proxy_start = env['HTTP_GITLAB_WORHORSE_PROXY_START'].presence
         if trans && proxy_start
           # Time in milliseconds since gitlab-workhorse started the request
-          trans.set(:proxy_flight_time, Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000)
+          trans.set(:rails_queue_duration, Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000)
         end
 
         @app.call(env)
diff --git a/spec/lib/gitlab/middleware/proxy_flight_time_spec.rb b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
similarity index 86%
rename from spec/lib/gitlab/middleware/proxy_flight_time_spec.rb
rename to spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
index f59166d5c29..fd6f684db0c 100644
--- a/spec/lib/gitlab/middleware/proxy_flight_time_spec.rb
+++ b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Middleware::ProxyFlightTime do
+describe Gitlab::Middleware::RailsQueueDuration do
   let(:app) { double(:app) }
   let(:middleware) { described_class.new(app) }
   let(:env) { {} }
@@ -23,7 +23,7 @@ describe Gitlab::Middleware::ProxyFlightTime do
 
       it 'sets proxy_flight_time and calls the app when the header is present' do
         env['HTTP_GITLAB_WORHORSE_PROXY_START'] = '123'
-        expect(transaction).to receive(:set).with(:proxy_flight_time, an_instance_of(Float))
+        expect(transaction).to receive(:set).with(:rails_queue_duration, an_instance_of(Float))
         expect(middleware.call(env)).to eq('yay')
       end
     end

From cdcb354f1764a3483d6220f301ff983692554c4d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 26 May 2016 17:58:44 +0200
Subject: [PATCH 0825/1431] Remove header title from project pages

With new navigation design it makes no sense to duplicate title in the
header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/activity.html.haml                         | 1 -
 app/views/projects/artifacts/browse.html.haml                 | 1 -
 app/views/projects/badges/index.html.haml                     | 1 -
 app/views/projects/blame/show.html.haml                       | 1 -
 app/views/projects/blob/_header_title.html.haml               | 1 -
 app/views/projects/blob/edit.html.haml                        | 1 -
 app/views/projects/blob/new.html.haml                         | 1 -
 app/views/projects/blob/show.html.haml                        | 1 -
 app/views/projects/branches/index.html.haml                   | 1 -
 app/views/projects/branches/new.html.haml                     | 1 -
 app/views/projects/builds/_header_title.html.haml             | 1 -
 app/views/projects/builds/index.html.haml                     | 1 -
 app/views/projects/builds/show.html.haml                      | 1 -
 app/views/projects/commit/builds.html.haml                    | 4 ++--
 app/views/projects/commit/show.html.haml                      | 2 --
 app/views/projects/commits/_header_title.html.haml            | 1 -
 app/views/projects/commits/show.html.haml                     | 1 -
 app/views/projects/compare/index.html.haml                    | 1 -
 app/views/projects/compare/show.html.haml                     | 1 -
 app/views/projects/container_registry/_header_title.html.haml | 1 -
 app/views/projects/container_registry/index.html.haml         | 3 +--
 app/views/projects/find_file/show.html.haml                   | 1 -
 app/views/projects/graphs/_header_title.html.haml             | 1 -
 app/views/projects/graphs/ci.html.haml                        | 1 -
 app/views/projects/graphs/commits.html.haml                   | 1 -
 app/views/projects/graphs/languages.html.haml                 | 1 -
 app/views/projects/graphs/show.html.haml                      | 1 -
 app/views/projects/issues/_header_title.html.haml             | 1 -
 app/views/projects/issues/edit.html.haml                      | 1 -
 app/views/projects/issues/index.html.haml                     | 1 -
 app/views/projects/issues/new.html.haml                       | 1 -
 app/views/projects/issues/show.html.haml                      | 1 -
 app/views/projects/labels/_header_title.html.haml             | 1 -
 app/views/projects/labels/edit.html.haml                      | 1 -
 app/views/projects/labels/index.html.haml                     | 1 -
 app/views/projects/labels/new.html.haml                       | 1 -
 app/views/projects/merge_requests/_header_title.html.haml     | 1 -
 app/views/projects/merge_requests/_show.html.haml             | 1 -
 app/views/projects/merge_requests/edit.html.haml              | 1 -
 app/views/projects/merge_requests/index.html.haml             | 1 -
 app/views/projects/merge_requests/invalid.html.haml           | 1 -
 app/views/projects/merge_requests/new.html.haml               | 1 -
 app/views/projects/milestones/_header_title.html.haml         | 1 -
 app/views/projects/milestones/edit.html.haml                  | 1 -
 app/views/projects/milestones/index.html.haml                 | 2 --
 app/views/projects/milestones/new.html.haml                   | 1 -
 app/views/projects/milestones/show.html.haml                  | 2 --
 app/views/projects/network/show.html.haml                     | 1 -
 app/views/projects/new.html.haml                              | 1 -
 app/views/projects/pipelines/_header_title.html.haml          | 1 -
 app/views/projects/pipelines/index.html.haml                  | 1 -
 app/views/projects/pipelines/new.html.haml                    | 1 -
 app/views/projects/pipelines/show.html.haml                   | 1 -
 app/views/projects/project_members/_header_title.html.haml    | 1 -
 app/views/projects/project_members/import.html.haml           | 1 -
 app/views/projects/project_members/index.html.haml            | 1 -
 app/views/projects/releases/edit.html.haml                    | 1 -
 app/views/projects/snippets/_header_title.html.haml           | 1 -
 app/views/projects/snippets/edit.html.haml                    | 1 -
 app/views/projects/snippets/index.html.haml                   | 1 -
 app/views/projects/snippets/new.html.haml                     | 1 -
 app/views/projects/snippets/show.html.haml                    | 1 -
 app/views/projects/tags/index.html.haml                       | 1 -
 app/views/projects/tags/new.html.haml                         | 1 -
 app/views/projects/tags/show.html.haml                        | 1 -
 app/views/projects/tree/show.html.haml                        | 1 -
 app/views/projects/wikis/_header_title.html.haml              | 1 -
 app/views/projects/wikis/edit.html.haml                       | 1 -
 app/views/projects/wikis/empty.html.haml                      | 1 -
 app/views/projects/wikis/git_access.html.haml                 | 1 -
 app/views/projects/wikis/history.html.haml                    | 1 -
 app/views/projects/wikis/pages.html.haml                      | 1 -
 app/views/projects/wikis/show.html.haml                       | 1 -
 73 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 app/views/projects/blob/_header_title.html.haml
 delete mode 100644 app/views/projects/builds/_header_title.html.haml
 delete mode 100644 app/views/projects/commits/_header_title.html.haml
 delete mode 100644 app/views/projects/container_registry/_header_title.html.haml
 delete mode 100644 app/views/projects/graphs/_header_title.html.haml
 delete mode 100644 app/views/projects/issues/_header_title.html.haml
 delete mode 100644 app/views/projects/labels/_header_title.html.haml
 delete mode 100644 app/views/projects/merge_requests/_header_title.html.haml
 delete mode 100644 app/views/projects/milestones/_header_title.html.haml
 delete mode 100644 app/views/projects/pipelines/_header_title.html.haml
 delete mode 100644 app/views/projects/project_members/_header_title.html.haml
 delete mode 100644 app/views/projects/snippets/_header_title.html.haml
 delete mode 100644 app/views/projects/wikis/_header_title.html.haml

diff --git a/app/views/projects/activity.html.haml b/app/views/projects/activity.html.haml
index 69fa4ad37c4..3c0f01cbf6f 100644
--- a/app/views/projects/activity.html.haml
+++ b/app/views/projects/activity.html.haml
@@ -1,5 +1,4 @@
 - page_title "Activity"
-- header_title project_title(@project, "Activity", activity_project_path(@project))
 
 = render 'projects/last_push'
 
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml
index 49f95ff37db..ede01dcc1aa 100644
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@@ -1,5 +1,4 @@
 - page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
-= render 'projects/builds/header_title'
 
 .top-block.row-content-block.clearfix
   .pull-right
diff --git a/app/views/projects/badges/index.html.haml b/app/views/projects/badges/index.html.haml
index c22384ddf46..ee63bc55a30 100644
--- a/app/views/projects/badges/index.html.haml
+++ b/app/views/projects/badges/index.html.haml
@@ -1,6 +1,5 @@
 - page_title 'Badges'
 - badges_path = namespace_project_badges_path(@project.namespace, @project)
-- header_title project_title(@project, 'Badges', badges_path)
 
 .prepend-top-10
   .panel.panel-default
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 5f9a92ff93f..377665b096f 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "Blame", @blob.path, @ref
-- header_title project_title(@project, "Files", project_files_path(@project))
 
 %h3.page-title Blame view
 
diff --git a/app/views/projects/blob/_header_title.html.haml b/app/views/projects/blob/_header_title.html.haml
deleted file mode 100644
index 78c5ef20a5f..00000000000
--- a/app/views/projects/blob/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Files", project_files_path(@project))
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml
index effcce5a1c4..e4f04ca7764 100644
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", @blob.path, @ref
-= render "header_title"
 
 .file-editor
   %ul.nav-links.no-bottom.js-edit-mode
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 0459699432e..c952bc7e5db 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New File", @path.presence, @ref
-= render "header_title"
 
 %h3.page-title
   New File
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml
index 6988039b6c7..ed670dae88d 100644
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@@ -1,5 +1,4 @@
 - page_title @blob.path, @ref
-= render "header_title"
 
 = render 'projects/last_push'
 
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index ac7790421a4..08148b1a18b 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Branches"
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 .row-content-block
   .pull-right
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index c659af6338c..5a6c8c243fa 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Branch"
-= render "projects/commits/header_title"
 
 - if @error
   .alert.alert-danger
diff --git a/app/views/projects/builds/_header_title.html.haml b/app/views/projects/builds/_header_title.html.haml
deleted file mode 100644
index 082dab1f5b0..00000000000
--- a/app/views/projects/builds/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Builds", project_builds_path(@project))
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 7c0bec264ab..8fb9ebc1b8b 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Builds"
-= render "header_title"
 
 .top-area
   %ul.nav-links
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index c7b9c36a3ab..16017c994ba 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "#{@build.name} (##{@build.id})", "Builds"
-= render "header_title"
 - trace_with_state = @build.trace_with_state
 
 .build-page
diff --git a/app/views/projects/commit/builds.html.haml b/app/views/projects/commit/builds.html.haml
index 7118a4846c6..2f051fb90e0 100644
--- a/app/views/projects/commit/builds.html.haml
+++ b/app/views/projects/commit/builds.html.haml
@@ -1,7 +1,7 @@
 - page_title "Builds", "#{@commit.title} (#{@commit.short_id})", "Commits"
-= render "projects/commits/header_title"
+
 .prepend-top-default
   = render "commit_box"
-= render "ci_menu"
 
+= render "ci_menu"
 = render "builds"
diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml
index e5e3d696035..401cb4f7e30 100644
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@@ -1,8 +1,6 @@
 - page_title        "#{@commit.title} (#{@commit.short_id})", "Commits"
 - page_description  @commit.description
 
-= render "projects/commits/header_title"
-
 .prepend-top-default
   = render "commit_box"
 - if @commit.status
diff --git a/app/views/projects/commits/_header_title.html.haml b/app/views/projects/commits/_header_title.html.haml
deleted file mode 100644
index e4385893dd9..00000000000
--- a/app/views/projects/commits/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Commits", project_commits_path(@project))
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 088eaa28013..2c21923ed4f 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "Commits", @ref
-= render "header_title"
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 5e188dd0f3c..0b8ed23b305 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Compare"
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 
 .row-content-block
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 62525168239..cdc34f51d6d 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "#{params[:from]}...#{params[:to]}"
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 
 
diff --git a/app/views/projects/container_registry/_header_title.html.haml b/app/views/projects/container_registry/_header_title.html.haml
deleted file mode 100644
index f1863c52a3e..00000000000
--- a/app/views/projects/container_registry/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Container Registry", project_container_registry_path(@project))
diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml
index e1e762410f2..993da27310f 100644
--- a/app/views/projects/container_registry/index.html.haml
+++ b/app/views/projects/container_registry/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Container Registry"
-= render "header_title"
 
 %hr
 
@@ -37,4 +36,4 @@
               %th
 
         - @tags.each do |tag|
-          = render 'tag', tag: tag
\ No newline at end of file
+          = render 'tag', tag: tag
diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml
index 1fe1d98bf13..9322c82904f 100644
--- a/app/views/projects/find_file/show.html.haml
+++ b/app/views/projects/find_file/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "Find File", @ref
-- header_title project_title(@project, "Files", project_files_path(@project))
 
 .file-finder-holder.tree-holder.clearfix
   .nav-block
diff --git a/app/views/projects/graphs/_header_title.html.haml b/app/views/projects/graphs/_header_title.html.haml
deleted file mode 100644
index 1e2f61cd22b..00000000000
--- a/app/views/projects/graphs/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Graphs", namespace_project_graph_path(@project.namespace, @project, current_ref))
diff --git a/app/views/projects/graphs/ci.html.haml b/app/views/projects/graphs/ci.html.haml
index 9f05be9982b..19ccc125ea8 100644
--- a/app/views/projects/graphs/ci.html.haml
+++ b/app/views/projects/graphs/ci.html.haml
@@ -1,5 +1,4 @@
 - page_title "Continuous Integration", "Graphs"
-= render "header_title"
 = render 'head'
 .row-content-block.append-bottom-default
   .oneline
diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml
index da9f648cc9c..d9b2fb6c065 100644
--- a/app/views/projects/graphs/commits.html.haml
+++ b/app/views/projects/graphs/commits.html.haml
@@ -1,5 +1,4 @@
 - page_title "Commits", "Graphs"
-= render "header_title"
 = render 'head'
 
 .row-content-block.append-bottom-default
diff --git a/app/views/projects/graphs/languages.html.haml b/app/views/projects/graphs/languages.html.haml
index ebecab1dbfc..249c16f4709 100644
--- a/app/views/projects/graphs/languages.html.haml
+++ b/app/views/projects/graphs/languages.html.haml
@@ -1,5 +1,4 @@
 - page_title "Languages", "Graphs"
-= render "header_title"
 = render 'head'
 
 .row-content-block.append-bottom-default
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index f82c47301f4..33970e7b909 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "Contributors", "Graphs"
-= render "header_title"
 = render 'head'
 
 .row-content-block.append-bottom-default
diff --git a/app/views/projects/issues/_header_title.html.haml b/app/views/projects/issues/_header_title.html.haml
deleted file mode 100644
index 99f03549c44..00000000000
--- a/app/views/projects/issues/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Issues", namespace_project_issues_path(@project.namespace, @project))
diff --git a/app/views/projects/issues/edit.html.haml b/app/views/projects/issues/edit.html.haml
index 20216297d25..7cf1923456e 100644
--- a/app/views/projects/issues/edit.html.haml
+++ b/app/views/projects/issues/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", "#{@issue.title} (##{@issue.iid})", "Issues"
-= render "header_title"
 
 %h3.page-title
   Edit Issue ##{@issue.iid}
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index efa7642b2dc..19a6f4a91f6 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Issues"
-= render "header_title"
 
 = content_for :meta_tags do
   - if current_user
diff --git a/app/views/projects/issues/new.html.haml b/app/views/projects/issues/new.html.haml
index b317a0c1cf4..e8aae0f47e2 100644
--- a/app/views/projects/issues/new.html.haml
+++ b/app/views/projects/issues/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Issue"
-= render "header_title"
 
 %h3.page-title
   New Issue
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index bde80bbb54b..e95f42064ac 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -1,7 +1,6 @@
 - page_title           "#{@issue.title} (##{@issue.iid})", "Issues"
 - page_description     @issue.description
 - page_card_attributes @issue.card_attributes
-- header_title         project_title(@project, "Issues", namespace_project_issues_path(@project.namespace, @project))
 
 .clearfix.detail-page-header
   .issuable-header
diff --git a/app/views/projects/labels/_header_title.html.haml b/app/views/projects/labels/_header_title.html.haml
deleted file mode 100644
index abe28da483b..00000000000
--- a/app/views/projects/labels/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Labels", namespace_project_labels_path(@project.namespace, @project))
diff --git a/app/views/projects/labels/edit.html.haml b/app/views/projects/labels/edit.html.haml
index 675a805e12f..6901ba13ab7 100644
--- a/app/views/projects/labels/edit.html.haml
+++ b/app/views/projects/labels/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", @label.name, "Labels"
-= render "header_title"
 
 %h3.page-title
   Edit Label
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 05382b9cee7..2557d1a4d5b 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Labels"
-= render "header_title"
 
 .top-area
   .nav-text
diff --git a/app/views/projects/labels/new.html.haml b/app/views/projects/labels/new.html.haml
index e20fd7d6891..49ddf901619 100644
--- a/app/views/projects/labels/new.html.haml
+++ b/app/views/projects/labels/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Label"
-= render "header_title"
 
 %h3.page-title
   New Label
diff --git a/app/views/projects/merge_requests/_header_title.html.haml b/app/views/projects/merge_requests/_header_title.html.haml
deleted file mode 100644
index 669a9b06bdf..00000000000
--- a/app/views/projects/merge_requests/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Merge Requests", namespace_project_merge_requests_path(@project.namespace, @project))
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 290753d57c6..7af227129ec 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -1,7 +1,6 @@
 - page_title           "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
 - page_description     @merge_request.description
 - page_card_attributes @merge_request.card_attributes
-- header_title project_title(@project, "Merge Requests", namespace_project_merge_requests_path(@project.namespace, @project))
 
 - if diff_view == 'parallel'
   - fluid_layout true
diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index b31ea5e5321..03159f123f3 100644
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
-= render "header_title"
 
 %h3.page-title
   Edit Merge Request #{@merge_request.to_reference}
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index e56a44e0a79..b517e874b0f 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Merge Requests"
-= render "header_title"
 
 = render 'projects/last_push'
 
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index f5bf16ef3ad..a00d3128ffe 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -1,5 +1,4 @@
 - page_title "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
-= render "header_title"
 
 .merge-request
   = render "projects/merge_requests/show/mr_title"
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml
index d259968030e..2e798ce780a 100644
--- a/app/views/projects/merge_requests/new.html.haml
+++ b/app/views/projects/merge_requests/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Merge Request"
-= render "header_title"
 
 - if @merge_request.can_be_created && !params[:change_branches]
   = render 'new_submit'
diff --git a/app/views/projects/milestones/_header_title.html.haml b/app/views/projects/milestones/_header_title.html.haml
deleted file mode 100644
index 5f4b6982a6d..00000000000
--- a/app/views/projects/milestones/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Milestones", namespace_project_milestones_path(@project.namespace, @project))
diff --git a/app/views/projects/milestones/edit.html.haml b/app/views/projects/milestones/edit.html.haml
index 43f8863163d..be682226ab6 100644
--- a/app/views/projects/milestones/edit.html.haml
+++ b/app/views/projects/milestones/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", @milestone.title, "Milestones"
-= render "header_title"
 
 %h3.page-title
   Edit Milestone ##{@milestone.iid}
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index abe567af1dd..e6133b22f96 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,6 +1,4 @@
 - page_title "Milestones"
-= render "header_title"
-
 
 .top-area
   = render 'shared/milestones_filter'
diff --git a/app/views/projects/milestones/new.html.haml b/app/views/projects/milestones/new.html.haml
index 0d016f78313..7f372b41698 100644
--- a/app/views/projects/milestones/new.html.haml
+++ b/app/views/projects/milestones/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Milestone"
-= render "header_title"
 
 %h3.page-title
   New Milestone
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 6ec84660157..19944e3e023 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -1,8 +1,6 @@
 - page_title       @milestone.title, "Milestones"
 - page_description @milestone.description
 
-= render "header_title"
-
 .detail-page-header
   .status-box{ class: status_box_class(@milestone) }
     - if @milestone.closed?
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 8065663ca2a..326180ebe4e 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,5 +1,4 @@
 - page_title "Network", @ref
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 = render "head"
 .project-network
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index a4c6094c69a..e46e5828e3f 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -1,5 +1,4 @@
 - page_title    'New Project'
-- header_title  "Projects", root_path
 
 %h3.page-title
   New Project
diff --git a/app/views/projects/pipelines/_header_title.html.haml b/app/views/projects/pipelines/_header_title.html.haml
deleted file mode 100644
index faf63d64a79..00000000000
--- a/app/views/projects/pipelines/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Pipelines", project_pipelines_path(@project))
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index a6c12814adf..8788db09dbe 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Pipelines"
-= render "header_title"
 
 .top-area
   %ul.nav-links
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index b97c9f5f3b6..5f4ec2e40c8 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Pipeline"
-= render "header_title"
 
 %h3.page-title
   New Pipeline
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
index b082d4d5da8..2aad5602414 100644
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@@ -1,6 +1,5 @@
 - page_title "Pipeline"
 
-= render "header_title"
 .prepend-top-default
   - if @commit
     = render "projects/pipelines/info"
diff --git a/app/views/projects/project_members/_header_title.html.haml b/app/views/projects/project_members/_header_title.html.haml
deleted file mode 100644
index a31f0a37fa2..00000000000
--- a/app/views/projects/project_members/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Members", namespace_project_project_members_path(@project.namespace, @project))
diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml
index 189906498cb..eef97107d77 100644
--- a/app/views/projects/project_members/import.html.haml
+++ b/app/views/projects/project_members/import.html.haml
@@ -1,5 +1,4 @@
 - page_title "Import members"
-= render "header_title"
 
 %h3.page-title
   Import members from another project
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index ebcfc907ebb..15dc064e7ea 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Members"
-= render "header_title"
 
 .project-members-page.prepend-top-default
   - if can?(current_user, :admin_project_member, @project)
diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml
index 0d59cec322c..835398b6f98 100644
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", @tag.name, "Tags"
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 
 .row-content-block
diff --git a/app/views/projects/snippets/_header_title.html.haml b/app/views/projects/snippets/_header_title.html.haml
deleted file mode 100644
index 04f0bbe9853..00000000000
--- a/app/views/projects/snippets/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, "Snippets", namespace_project_snippets_path(@project.namespace, @project))
diff --git a/app/views/projects/snippets/edit.html.haml b/app/views/projects/snippets/edit.html.haml
index dc3ea1fcf12..216f70f5605 100644
--- a/app/views/projects/snippets/edit.html.haml
+++ b/app/views/projects/snippets/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", @snippet.title, "Snippets"
-= render "header_title"
 
 %h3.page-title
   Edit Snippet
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index 103ff447464..96fee3b17b2 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Snippets"
-= render "header_title"
 
 .row-content-block.top-block
   .pull-right
diff --git a/app/views/projects/snippets/new.html.haml b/app/views/projects/snippets/new.html.haml
index e57237991b4..772a594269c 100644
--- a/app/views/projects/snippets/new.html.haml
+++ b/app/views/projects/snippets/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Snippets"
-= render "header_title"
 
 %h3.page-title
   New Snippet
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 6f7bdcb29e8..bae4d8f349f 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -1,5 +1,4 @@
 - page_title @snippet.title, "Snippets"
-= render "header_title"
 
 .snippet-holder
   = render 'shared/snippets/header'
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index dc6ece30dd2..8f381663e6e 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Tags"
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 
 .row-content-block
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index f9306453297..3a097750d6e 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -1,5 +1,4 @@
 - page_title "New Tag"
-= render "projects/commits/header_title"
 
 - if @error
   .alert.alert-danger
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 9f1424aecc7..b7d7d5c5382 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -1,5 +1,4 @@
 - page_title @tag.name, "Tags"
-= render "projects/commits/header_title"
 = render "projects/commits/head"
 
 .row-content-block
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 91fb2a44594..7e9ba09c720 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,5 +1,4 @@
 - page_title @path.presence || "Files", @ref
-- header_title project_title(@project, "Files", project_files_path(@project))
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
diff --git a/app/views/projects/wikis/_header_title.html.haml b/app/views/projects/wikis/_header_title.html.haml
deleted file mode 100644
index 408adc36ca6..00000000000
--- a/app/views/projects/wikis/_header_title.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-- header_title project_title(@project, 'Wiki', get_project_wiki_path(@project))
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 4dd818c7f67..aaa15dd3bbe 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -1,5 +1,4 @@
 - page_title "Edit", @page.title.capitalize, "Wiki"
-= render "header_title"
 = render 'nav'
 
 .top-area
diff --git a/app/views/projects/wikis/empty.html.haml b/app/views/projects/wikis/empty.html.haml
index c7e490c3cd1..7dfa405d063 100644
--- a/app/views/projects/wikis/empty.html.haml
+++ b/app/views/projects/wikis/empty.html.haml
@@ -1,5 +1,4 @@
 - page_title "Wiki"
-= render "header_title"
 
 %h3.page-title Empty page
 %hr
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index ba3f2cadc48..ccceab6155e 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -1,5 +1,4 @@
 - page_title "Git Access", "Wiki"
-= render "header_title"
 
 = render 'nav'
 .row-content-block
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index dcaddae2b04..45460ed9f41 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -1,5 +1,4 @@
 - page_title "History", @page.title.capitalize, "Wiki"
-= render "header_title"
 = render 'nav'
 
 .top-area
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 92b494a513c..2f6162fa3c5 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -1,5 +1,4 @@
 - page_title "Pages", "Wiki"
-= render "header_title"
 
 = render 'nav'
 
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index 067fb7f8f54..1cb48a1e85d 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -1,5 +1,4 @@
 - page_title @page.title.capitalize, "Wiki"
-= render "header_title"
 = render 'nav'
 
 .top-area

From 40a9e39dc766c429ed9fe3c6b2308c1b15f72990 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 26 May 2016 18:06:11 +0200
Subject: [PATCH 0826/1431] Return header title for new project page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/new.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index e46e5828e3f..f9ac16b32f3 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -1,4 +1,5 @@
 - page_title    'New Project'
+- header_title  "Projects", dashboard_projects_path
 
 %h3.page-title
   New Project

From 6b5c3f09fdc3f5194bd776c2fe76b2e709619126 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 17:15:22 +0100
Subject: [PATCH 0827/1431] Improved mobile styling

---
 app/assets/stylesheets/pages/commit.scss      | 20 ++++++++++++
 .../projects/commit/_commit_box.html.haml     | 31 ++++++++++---------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index b01d4feb6e5..fc3f214aba5 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -26,8 +26,28 @@
 
 .commit-info-row {
   margin-bottom: 10px;
+
+  &.commit-info-row-header {
+    line-height: 34px;
+
+    @media (min-width: $screen-sm-min) {
+      margin-bottom: 0;
+    }
+
+    .commit-options-dropdown-caret {
+      @media (max-width: $screen-sm) {
+        margin-left: 0;
+      }
+    }
+  }
+
   .avatar {
     @extend .avatar-inline;
+    margin-left: 0;
+
+    @media (min-width: $screen-sm-min) {
+      margin-left: 4px;
+    }
   }
   .commit-committer-link,
   .commit-author-link {
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index d9dea067705..429bf041248 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -1,16 +1,24 @@
-.pull-right.commit-action-buttons
-  %div
+.commit-info-row.commit-info-row-header
+  %span.hidden-xs Authored by
+  %strong
+    = commit_author_link(@commit, avatar: true, size: 24)
+  #{time_ago_with_tooltip(@commit.authored_date)}
+
+  .pull-right.commit-action-buttons
     - if defined?(@notes_count) && @notes_count > 0
-      %span.btn.disabled.btn-grouped
+      %span.btn.disabled.btn-grouped.hidden-xs
         = icon('comment')
         = @notes_count
-    = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped" do
+    = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped hidden-xs hidden-sm" do
       Browse Files
     .dropdown.inline
       %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
-        Options
-        %span.caret
+        %span.hidden-xs Options
+        %span.caret.commit-options-dropdown-caret
       %ul.dropdown-menu.dropdown-menu-align-right
+        %li.visible-xs-block.visible-sm-block
+          = link_to namespace_project_tree_path(@project.namespace, @project, @commit) do
+            Browse Files
         - unless @commit.has_been_reverted?(current_user)
           %li.clearfix
             = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
@@ -23,12 +31,6 @@
           %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
         %li= link_to "Plain Diff",    namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
 
-.commit-info-row
-  %span.light Authored by
-  %strong
-    = commit_author_link(@commit, avatar: true, size: 24)
-  #{time_ago_with_tooltip(@commit.authored_date)}
-
 - if @commit.different_committer?
   .commit-info-row
     %span.light Committed by
@@ -37,8 +39,9 @@
     #{time_ago_with_tooltip(@commit.committed_date)}
 
 .commit-info-row
-  %span.light Commit
-  = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
+  %span.hidden-xs.hidden-sm Commit
+  = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace hidden-xs hidden-sm"
+  = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace visible-xs-inline visible-sm-inline"
   = clipboard_button(clipboard_text: @commit.id)
   %span.cgray= pluralize(@commit.parents.count, "parent")
   - @commit.parents.each do |parent|

From 7903e44efc9af625b8d28cc93ad0a88b585e751e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 26 May 2016 14:21:34 -0500
Subject: [PATCH 0828/1431] Fix bug where fade div covers up controls button

---
 app/assets/stylesheets/framework/nav.scss | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index adfe5540704..7eb7a8e4544 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -336,6 +336,16 @@
       @include fade(right, rgba(255, 255, 255, 0.4), $white-light);
       left: 0;
     }
+
+    &.event-filter {
+      .fade-right {
+        visibility: hidden;
+
+        @media (max-width: $screen-xs-max) {
+          visibility: visible;
+        }
+      }
+    }
   }
 }
 
@@ -346,3 +356,14 @@
     top: ($header-height * 2) + 2;
   }
 }
+
+.activities {
+
+  .nav-block {
+    border-bottom: 1px solid $border-color;
+
+    .nav-links {
+      border-bottom: none;
+    }
+  }
+}

From bb3111c11694d0fe4aa46b113d195ec15f8ed147 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 26 May 2016 16:11:58 -0500
Subject: [PATCH 0829/1431] Ensure project name is present on page

---
 spec/features/project/shortcuts_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/project/shortcuts_spec.rb b/spec/features/project/shortcuts_spec.rb
index 2595c4181e5..54aa9c66a08 100644
--- a/spec/features/project/shortcuts_spec.rb
+++ b/spec/features/project/shortcuts_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Project shortcuts', feature: true do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, name: 'Victorialand') }
   let(:user) { create(:user) }
 
   describe 'On a project', js: true do
@@ -14,7 +14,7 @@ feature 'Project shortcuts', feature: true do
     describe 'pressing "i"' do
       it 'redirects to new issue page' do
         find('body').native.send_key('i')
-        expect(page).to have_content('New Issue')
+        expect(page).to have_content('Victorialand')
       end
     end
   end

From 1087b26bf2b74df8b84a5751813c8e8d85d47e57 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 26 May 2016 17:52:43 -0400
Subject: [PATCH 0830/1431] Remove boilerplate spec file for Ci::RunnerProject

[ci skip]
---
 spec/models/ci/runner_project_spec.rb | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 spec/models/ci/runner_project_spec.rb

diff --git a/spec/models/ci/runner_project_spec.rb b/spec/models/ci/runner_project_spec.rb
deleted file mode 100644
index 95fc160b238..00000000000
--- a/spec/models/ci/runner_project_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Ci::RunnerProject, models: true do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

From d84992375c1b30c647212633874b1abff9d32e95 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 27 May 2016 11:44:28 +0100
Subject: [PATCH 0831/1431] Fixed issue with spacing in issuable header

The Ruby was returning the HTML without a spacing next to the word 'by'

Closes #17864
---
 app/helpers/issuables_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index a7a6657b948..fe84ee3de44 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -72,7 +72,7 @@ module IssuablesHelper
 
   def issuable_meta(issuable, project, text)
     output = content_tag :strong, "#{text} #{issuable.to_reference}", class: "identifier"
-    output << " opened #{time_ago_with_tooltip(issuable.created_at)} by".html_safe
+    output << " opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
     output << content_tag(:strong) do
       author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs")
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg")

From 1e450ae2a7d94530c1442cdf74b116f4b4a5518b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 27 May 2016 12:59:40 +0200
Subject: [PATCH 0832/1431] Changelog entry for queue duration

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

diff --git a/CHANGELOG b/CHANGELOG
index 098d558f062..ed454903a8d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Remove 'main language' feature
+  - Measure queue duration between gitlab-workhorse and Rails
 
 v 8.8.3
   - Fix gitlab importer failing to import new projects due to missing credentials

From 1adaeb7d6771122702c45e33e03767389a3348c9 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 27 May 2016 13:06:02 +0200
Subject: [PATCH 0833/1431] Use gitlab-workhorse 0.7.4

This enables
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
---
 GITLAB_WORKHORSE_VERSION    | 2 +-
 doc/install/installation.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index f38fc5393ff..0a1ffad4b4d 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.7.3
+0.7.4
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 108ceb593d0..1318b3d1fa5 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -394,7 +394,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 v0.7.3
+    sudo -u git -H git checkout v0.7.4
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features

From 97aecdeadeb85383a793135f92677daf99c6183e Mon Sep 17 00:00:00 2001
From: Daniel Beyer <ymc-dabe@vcs.ymc.ch>
Date: Fri, 27 May 2016 13:35:12 +0200
Subject: [PATCH 0834/1431] Fix bug with SQL syntax error during backup
 restoration

closes #15259
---
 lib/tasks/gitlab/db.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 86f5d65f128..60234c872ed 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -34,7 +34,7 @@ namespace :gitlab do
       # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html
       # MySQL: http://dev.mysql.com/doc/refman/5.7/en/drop-table.html
       # Add `IF EXISTS` because cascade could have already deleted a table.
-      tables.each { |t| connection.execute("DROP TABLE IF EXISTS #{t} CASCADE") }
+      tables.each { |t| connection.execute("DROP TABLE IF EXISTS `#{t}` CASCADE") }
     end
 
     desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'

From e60d5f91884cad68690282dd97b492d665f41b81 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 27 May 2016 17:20:15 +0200
Subject: [PATCH 0835/1431] fix rescue block on migration

---
 CHANGELOG                                                       | 1 +
 .../20160302152808_remove_wrong_import_url_from_projects.rb     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed454903a8d..c10051d89a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.9.0 (unreleased)
 
 v 8.8.3
   - Fix gitlab importer failing to import new projects due to missing credentials
+  - Fix import URL migration not rescuing with the correct Error
 
 v 8.8.2
   - Added remove due date button. !4209
diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
index 561c18a5776..6aed0fe03d2 100644
--- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
+++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
@@ -28,7 +28,7 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
 
         update_import_url(import_url, project)
         update_import_data(import_url, project)
-      rescue URI::InvalidURIError
+      rescue Addressable::URI::InvalidURIError
         nullify_import_url(project)
       end
     end

From a9785a4adb76afcafe9a4c750b3d2703d62b58b8 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 27 May 2016 16:35:20 +0100
Subject: [PATCH 0836/1431] Fixed issue with calendar activity button not
 sending request correctly

---
 app/assets/javascripts/calendar.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index f9c7bffdadb..26a26061539 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -175,7 +175,7 @@ class @Calendar
       .range(['#acd5f2', '#254e77'])
       .domain([0, 3])
 
-  clickDay: (stamp) ->
+  clickDay: (stamp) =>
     if @currentSelectedDate isnt stamp.date
       @currentSelectedDate = stamp.date
       formatted_date = @currentSelectedDate.getFullYear() + "-" + (@currentSelectedDate.getMonth()+1) + "-" + @currentSelectedDate.getDate()

From 31e5f081e4750008ce731b2ab40c565cd64a477d Mon Sep 17 00:00:00 2001
From: Ben Yorke <bendyorke@gmail.com>
Date: Thu, 12 May 2016 09:11:36 -0500
Subject: [PATCH 0837/1431] Update notes immediately after closing/reopening

---
 CHANGELOG                              | 1 +
 app/assets/javascripts/notes.js.coffee | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed454903a8d..cf00bd9a5af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -115,6 +115,7 @@ v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
+  - Fix notification delay when changing status of an issue
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 8131d923677..f8151963fa7 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -114,9 +114,9 @@ class @Notes
       @refresh()
     , @pollingInterval
 
-  refresh: ->
+  refresh: =>
     return if @refreshing is true
-    refreshing = true
+    @refreshing = true
     if not document.hidden and document.URL.indexOf(@noteable_url) is 0
       @getContent()
 
@@ -134,8 +134,8 @@ class @Notes
             @renderDiscussionNote(note)
           else
             @renderNote(note)
-      always: =>
-        @refreshing = false
+    .always () =>
+      @refreshing = false
 
   ###
   Increase @pollingInterval up to 120 seconds on every function call,

From 78d8458773f9538ae75f3c0074c6903ff1b5ec06 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 27 May 2016 14:28:04 -0700
Subject: [PATCH 0838/1431] Only use RequestStore for
 current_application_settings during a request

This fixes an issue where the RequestStore was being populated with the settings in the unicorn master
during the rails initializers. Each forked worker would then start their first request with an uncleaned RequestStore.
---
 lib/gitlab/current_settings.rb | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index f44d1b3a44e..59e86707d3e 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -1,20 +1,24 @@
 module Gitlab
   module CurrentSettings
     def current_application_settings
-      key = :current_application_settings
-
-      RequestStore.store[key] ||= begin
-        settings = nil
-
-        if connect_to_db?
-          settings = ::ApplicationSetting.current
-          settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
-        end
-
-        settings || fake_application_settings
+      if RequestStore.active?
+        RequestStore.fetch(:current_application_settings) { ensure_application_settings! }
+      else
+        ensure_application_settings!
       end
     end
 
+    def ensure_application_settings!
+      settings = nil
+
+      if connect_to_db?
+        settings = ::ApplicationSetting.current
+        settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
+      end
+
+      settings || fake_application_settings
+    end
+
     def fake_application_settings
       OpenStruct.new(
         default_projects_limit: Settings.gitlab['default_projects_limit'],

From d7e714e4fd5bc45f4d68281b068068a0aa9bb6e1 Mon Sep 17 00:00:00 2001
From: Aurelio Jargas <verde@aurelio.net>
Date: Fri, 27 May 2016 21:28:45 +0000
Subject: [PATCH 0839/1431] Fix typo

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

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 63866d8c71c..a3481f58c6c 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -348,7 +348,7 @@ job_name:
 | allow_failure | no | Allow build to fail. Failed build doesn't contribute to commit status |
 | when          | no | Define when to run build. Can be `on_success`, `on_failure` or `always` |
 | dependencies  | no | Define other builds that a build depends on so that you can pass artifacts between them|
-| artifacts     | no | Define list build artifacts |
+| artifacts     | no | Define list of build artifacts |
 | cache         | no | Define list of files that should be cached between subsequent runs |
 | before_script | no | Override a set of commands that are executed before build |
 | after_script  | no | Override a set of commands that are executed after build |

From 14b0fb516ce857b80ef447109c9dfc9692869148 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 27 May 2016 14:47:46 -0700
Subject: [PATCH 0840/1431] Add Changelog entry for the fix for the
 health_check access token changing

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

diff --git a/CHANGELOG b/CHANGELOG
index a0194a1ba25..b67b7645f72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
 v 8.8.3
   - Fix gitlab importer failing to import new projects due to missing credentials
   - Fix import URL migration not rescuing with the correct Error
+  - Fix health check access token changing due to old application settings being used
 
 v 8.8.2
   - Added remove due date button. !4209

From 7d57b110934f50225142789a93a0d4f54cf446f7 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 27 May 2016 19:05:52 -0700
Subject: [PATCH 0841/1431] Update tests for the current_application_settings
 request store changes

---
 spec/controllers/registrations_controller_spec.rb | 4 ++--
 spec/lib/gitlab/akismet_helper_spec.rb            | 4 ++--
 spec/mailers/notify_spec.rb                       | 6 +++---
 spec/models/user_spec.rb                          | 8 ++++----
 spec/services/groups/create_service_spec.rb       | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index fbe50d10ec5..209fa37d97d 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -11,7 +11,7 @@ describe RegistrationsController do
     let(:user_params) { { user: { name: "new_user", username: "new_username", email: "new@user.com", password: "Any_password" } } }
 
     context 'when sending email confirmation' do
-      before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(false) }
+      before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(false) }
 
       it 'logs user in directly' do
         post(:create, user_params)
@@ -21,7 +21,7 @@ describe RegistrationsController do
     end
 
     context 'when not sending email confirmation' do
-      before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) }
+      before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
 
       it 'does not authenticate user and sends confirmation email' do
         post(:create, user_params)
diff --git a/spec/lib/gitlab/akismet_helper_spec.rb b/spec/lib/gitlab/akismet_helper_spec.rb
index 53f5d6c5c80..88a71528867 100644
--- a/spec/lib/gitlab/akismet_helper_spec.rb
+++ b/spec/lib/gitlab/akismet_helper_spec.rb
@@ -6,8 +6,8 @@ describe Gitlab::AkismetHelper, type: :helper do
 
   before do
     allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
-    current_application_settings.akismet_enabled = true
-    current_application_settings.akismet_api_key = '12345'
+    allow_any_instance_of(ApplicationSetting).to receive(:akismet_enabled).and_return(true)
+    allow_any_instance_of(ApplicationSetting).to receive(:akismet_api_key).and_return('12345')
   end
 
   describe '#check_for_spam?' do
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index b963a3e0324..818825b1477 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -51,7 +51,7 @@ describe Notify do
 
           context 'when enabled email_author_in_body' do
             before do
-              allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+              allow_any_instance_of(ApplicationSetting).to receive(:email_author_in_body).and_return(true)
             end
 
             it 'contains a link to note author' do
@@ -230,7 +230,7 @@ describe Notify do
 
           context 'when enabled email_author_in_body' do
             before do
-              allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+              allow_any_instance_of(ApplicationSetting).to receive(:email_author_in_body).and_return(true)
             end
 
             it 'contains a link to note author' do
@@ -454,7 +454,7 @@ describe Notify do
 
         context 'when enabled email_author_in_body' do
           before do
-            allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+            allow_any_instance_of(ApplicationSetting).to receive(:email_author_in_body).and_return(true)
           end
 
           it 'contains a link to note author' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9581990666b..548bec364f8 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -67,7 +67,7 @@ describe User, models: true do
 
     describe 'email' do
       context 'when no signup domains listed' do
-        before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return([]) }
+        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return([]) }
         it 'accepts any email' do
           user = build(:user, email: "info@example.com")
           expect(user).to be_valid
@@ -75,7 +75,7 @@ describe User, models: true do
       end
 
       context 'when a signup domain is listed and subdomains are allowed' do
-        before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com']) }
+        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com']) }
         it 'accepts info@example.com' do
           user = build(:user, email: "info@example.com")
           expect(user).to be_valid
@@ -93,7 +93,7 @@ describe User, models: true do
       end
 
       context 'when a signup domain is listed and subdomains are not allowed' do
-        before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return(['example.com']) }
+        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com']) }
 
         it 'accepts info@example.com' do
           user = build(:user, email: "info@example.com")
@@ -141,7 +141,7 @@ describe User, models: true do
   end
 
   describe '#confirm' do
-    before { allow(current_application_settings).to receive(:send_user_confirmation_email).and_return(true) }
+    before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
     let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') }
 
     it 'returns unconfirmed' do
diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb
index a97ac3ead45..71a0b8e2a12 100644
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -13,7 +13,7 @@ describe Groups::CreateService, services: true do
     end
 
     context "cannot create group with restricted visibility level" do
-      before { allow(current_application_settings).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC]) }
+      before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC]) }
       it { is_expected.not_to be_persisted }
     end
   end

From be613de2cfa96c7a17f734e532ba6ada0d81c7fe Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Sat, 14 May 2016 11:33:14 +0200
Subject: [PATCH 0842/1431] Project#show on projects pending deletion will 404

fixes #17508
---
 CHANGELOG                                          |  1 +
 app/controllers/projects/application_controller.rb |  2 +-
 spec/controllers/projects_controller_spec.rb       | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a0194a1ba25..5dc56d18c3a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Remove 'main language' feature
+  - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
 
 v 8.8.3
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index be872a93fee..776ba92c9ab 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -26,7 +26,7 @@ class Projects::ApplicationController < ApplicationController
       project_path = "#{namespace}/#{id}"
       @project = Project.find_with_namespace(project_path)
 
-      if @project && can?(current_user, :read_project, @project)
+      if can?(current_user, :read_project, @project) && !@project.pending_delete?
         if @project.path_with_namespace != project_path
           redirect_to request.original_url.gsub(project_path, @project.path_with_namespace)
         end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 91b46c4d65c..fba545560c7 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -115,6 +115,17 @@ describe ProjectsController do
         expect(public_project_with_dot_atom).not_to be_valid
       end
     end
+
+    context 'when the project is pending deletions' do
+      it 'renders a 404 error' do
+        project = create(:project, pending_delete: true)
+        sign_in(user)
+
+        get :show, namespace_id: project.namespace.path, id: project.path
+
+        expect(response.status).to eq 404
+      end
+    end
   end
 
   describe "#update" do

From 908ea1b00a60197973bab6dd31f5aa35e101e9ab Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Sat, 28 May 2016 22:03:30 +0800
Subject: [PATCH 0843/1431] Use $ as the snippet prefix so it's consistent

---
 app/views/shared/snippets/_header.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 897aa5b4462..e0d0d967da6 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -4,7 +4,7 @@
       = visibility_level_label(@snippet.visibility_level)
     = visibility_level_icon(@snippet.visibility_level, fw: false)
   %strong.item-title
-    Snippet ##{@snippet.id}
+    Snippet $#{@snippet.id}
   %span.creator
     created by #{link_to_member(@project, @snippet.author, size: 24, author_class: "author item-title")}
     = time_ago_with_tooltip(@snippet.created_at, placement: 'bottom', html_class: 'snippet_updated_ago')

From 390ea8e0d41589d46dec9c0c89dd3cbb959ec20f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 28 May 2016 19:26:08 +0200
Subject: [PATCH 0844/1431] Merge Builds and Pipelines tab into one

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_project.html.haml     | 15 ++++++---------
 app/views/projects/builds/index.html.haml    |  1 +
 app/views/projects/pipelines/_head.html.haml | 14 ++++++++++++++
 app/views/projects/pipelines/index.html.haml |  1 +
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 app/views/projects/pipelines/_head.html.haml

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 087b7472701..2c9b9006668 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -52,15 +52,6 @@
           = icon('ship fw')
           %span
             Pipelines
-            %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
-
-    - if project_nav_tab? :builds
-      = nav_link(controller: %w(builds)) do
-        = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
-          = icon('cubes fw')
-          %span
-            Builds
-            %span.badge.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
     - if project_nav_tab? :container_registry
       = nav_link(controller: %w(container_registry)) do
@@ -132,4 +123,10 @@
       = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'shortcuts-new-issue' do
         Create a new issue
 
+    -# Shortcut to builds page
+    - if project_nav_tab? :builds
+      %li.hidden
+        = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+          Builds
+
     .fade-right
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 8fb9ebc1b8b..818d5d28f04 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Builds"
+= render "projects/pipelines/head"
 
 .top-area
   %ul.nav-links
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
new file mode 100644
index 00000000000..2c8ae625e67
--- /dev/null
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -0,0 +1,14 @@
+%ul.nav-links
+  - if project_nav_tab? :pipelines
+    = nav_link(controller: :pipelines) do
+      = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
+        %span
+          Pipelines
+          %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
+
+  - if project_nav_tab? :builds
+    = nav_link(controller: %w(builds)) do
+      = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+        %span
+          Builds
+          %span.badge.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 8788db09dbe..453767920b5 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Pipelines"
+= render "projects/pipelines/head"
 
 .top-area
   %ul.nav-links

From 1bcb1ef85e63478c8b48524c8a761f9819673f50 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 25 Apr 2016 13:19:57 +0200
Subject: [PATCH 0845/1431] Update specs for creating new note without access

---
 spec/requests/api/notes_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index ed1ed5aeb95..beb29a68692 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -258,8 +258,8 @@ describe API::API, api: true  do
              body: 'Hi!'
       end
 
-      it 'responds with 500' do
-        expect(response.status).to eq 500
+      it 'responds with resource not found error' do
+        expect(response.status).to eq 404
       end
 
       it 'does not create new note' do

From f739a4e8718289f5a16d216e93021cf773c547bd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 27 Apr 2016 10:00:19 +0200
Subject: [PATCH 0846/1431] Remove reduntant note validation from create
 service

---
 app/services/notes/create_service.rb | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 01586994813..2bb312bb252 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -5,8 +5,6 @@ module Notes
       note.author = current_user
       note.system = false
 
-      return unless valid_project?(note)
-
       if note.save
         # Finish the harder work in the background
         NewNoteWorker.perform_in(2.seconds, note.id, params)
@@ -15,14 +13,5 @@ module Notes
 
       note
     end
-
-    private
-
-    def valid_project?(note)
-      return false unless project
-      return true if note.for_commit?
-
-      note.noteable.try(:project) == project
-    end
   end
 end

From c31a296c94c48d865ce3171ccea9c48aa691466c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 25 Apr 2016 14:28:23 +0200
Subject: [PATCH 0847/1431] Make note invalid if noteable project is different

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
---
 app/models/note.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/note.rb b/app/models/note.rb
index 55b98557244..8743b5eb472 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -33,6 +33,12 @@ class Note < ActiveRecord::Base
   validates :commit_id, presence: true, if: ->(n) { n.noteable_type == 'Commit' }
   validates :author, presence: true
 
+  validate do |note|
+    unless note.noteable.project == project
+      errors.add(:invalid_project, 'Note and noteable project mismatch')
+    end
+  end
+
   mount_uploader :attachment, AttachmentUploader
 
   # Scopes

From 87c44b0e91959439014fb8c923f3febc039d1cd0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Apr 2016 09:35:03 +0200
Subject: [PATCH 0848/1431] Improve note validation for project mismatch

---
 app/models/note.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/models/note.rb b/app/models/note.rb
index 8743b5eb472..02a98a37117 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -29,13 +29,15 @@ class Note < ActiveRecord::Base
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
 
-  validates :noteable_id, presence: true, if: ->(n) { n.noteable_type.present? && n.noteable_type != 'Commit' }
-  validates :commit_id, presence: true, if: ->(n) { n.noteable_type == 'Commit' }
+  validates :noteable_id, presence: true, unless: :for_commit?
+  validates :commit_id, presence: true, if: :for_commit?
   validates :author, presence: true
 
-  validate do |note|
-    unless note.noteable.project == project
-      errors.add(:invalid_project, 'Note and noteable project mismatch')
+  with_options unless: :for_commit? do
+    validate do |note|
+      unless note.noteable.try(:project) == project
+        errors.add(:invalid_project, 'Note and noteable project mismatch')
+      end
     end
   end
 

From bf0b51d252e049404a49787c18e5c88071006e15 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Apr 2016 11:11:58 +0200
Subject: [PATCH 0849/1431] Update note factory to include noteable association

---
 spec/factories/notes.rb  | 18 ++++++------------
 spec/models/note_spec.rb |  6 +++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 26719f2652c..7e9378ab625 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -4,13 +4,14 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   factory :note do
-    project
     note "Note"
     author
+    noteable { create(:issue) }
+    project { noteable.project }
 
+    factory :note_on_issue,              aliases: [:votable_note]
     factory :note_on_commit,             traits: [:on_commit]
     factory :note_on_commit_diff,        traits: [:on_commit, :on_diff], class: LegacyDiffNote
-    factory :note_on_issue,              traits: [:on_issue], aliases: [:votable_note]
     factory :note_on_merge_request,      traits: [:on_merge_request]
     factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote
     factory :note_on_project_snippet,    traits: [:on_project_snippet]
@@ -20,6 +21,7 @@ FactoryGirl.define do
 
     trait :on_commit do
       project
+      noteable nil
       commit_id RepoHelpers.sample_commit.id
       noteable_type "Commit"
     end
@@ -29,19 +31,11 @@ FactoryGirl.define do
     end
 
     trait :on_merge_request do
-      project
-      noteable_id 1
-      noteable_type "MergeRequest"
-    end
-
-    trait :on_issue do
-      noteable_id 1
-      noteable_type "Issue"
+      noteable { create(:merge_request) }
     end
 
     trait :on_project_snippet do
-      noteable_id 1
-      noteable_type "Snippet"
+      noteable { create(:snippet) }
     end
 
     trait :system do
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 5d916f0e6a6..fe13c06b1e0 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -89,8 +89,8 @@ describe Note, models: true do
   end
 
   describe "#all_references" do
-    let!(:note1) { create(:note) }
-    let!(:note2) { create(:note) }
+    let!(:note1) { create(:note_on_issue) }
+    let!(:note2) { create(:note_on_issue) }
 
     it "reads the rendered note body from the cache" do
       expect(Banzai::Renderer).to receive(:render).with(note1.note, pipeline: :note, cache_key: [note1, "note"], project: note1.project)
@@ -102,7 +102,7 @@ describe Note, models: true do
   end
 
   describe '.search' do
-    let(:note) { create(:note, note: 'WoW') }
+    let(:note) { create(:note_on_issue, note: 'WoW') }
 
     it 'returns notes with matching content' do
       expect(described_class.search(note.note)).to eq([note])

From 57b551a19f18d8da78175b4de6098d5517cde49f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Apr 2016 11:36:50 +0200
Subject: [PATCH 0850/1431] Remove redundant `with_options` from note
 validators

---
 app/models/note.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/models/note.rb b/app/models/note.rb
index 02a98a37117..f10446ca45f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -33,11 +33,9 @@ class Note < ActiveRecord::Base
   validates :commit_id, presence: true, if: :for_commit?
   validates :author, presence: true
 
-  with_options unless: :for_commit? do
-    validate do |note|
-      unless note.noteable.try(:project) == project
-        errors.add(:invalid_project, 'Note and noteable project mismatch')
-      end
+  validate unless: :for_commit? do |note|
+    unless note.noteable.try(:project) == project
+      errors.add(:invalid_project, 'Note and noteable project mismatch')
     end
   end
 

From 0e613db76d8d6e8521a3b4d546f552c8d184ffa1 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Apr 2016 11:59:41 +0200
Subject: [PATCH 0851/1431] Add more validation tests for note model

---
 spec/models/note_spec.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index fe13c06b1e0..d90b54464cd 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -12,6 +12,33 @@ describe Note, models: true do
   describe 'validation' do
     it { is_expected.to validate_presence_of(:note) }
     it { is_expected.to validate_presence_of(:project) }
+
+    context 'when note is comment on commit' do
+      before { allow(subject).to receive(:for_commit?).and_return(true) }
+
+      it { is_expected.to validate_presence_of(:commit_id) }
+      it { is_expected.to_not validate_presence_of(:noteable_id) }
+    end
+
+    context 'when note is not comment on commit' do
+      before { allow(subject).to receive(:for_commit?).and_return(false) }
+
+      it { is_expected.to_not validate_presence_of(:commit_id) }
+      it { is_expected.to validate_presence_of(:noteable_id) }
+    end
+
+    context 'when noteable and note project is different' do
+      subject do
+        build(:note, noteable: create(:issue), project: create(:project))
+      end
+
+      it { is_expected.to be_invalid }
+    end
+
+    context 'when noteable and note project is the same one' do
+      subject { create(:note) }
+      it { is_expected.to be_valid }
+    end
   end
 
   describe "Commit notes" do

From 21d0cddd456c03e776a8b30e4695ede94c400792 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Apr 2016 13:50:48 +0200
Subject: [PATCH 0852/1431] Do not override foreign attributes in note factory

---
 app/models/note.rb      | 2 +-
 spec/factories/notes.rb | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/models/note.rb b/app/models/note.rb
index f10446ca45f..e3e522a8d0f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -34,7 +34,7 @@ class Note < ActiveRecord::Base
   validates :author, presence: true
 
   validate unless: :for_commit? do |note|
-    unless note.noteable.try(:project) == project
+    unless note.noteable.try(:project) == note.project
       errors.add(:invalid_project, 'Note and noteable project mismatch')
     end
   end
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 7e9378ab625..cabab0c2207 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -4,10 +4,10 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   factory :note do
+    project
     note "Note"
     author
-    noteable { create(:issue) }
-    project { noteable.project }
+    noteable { create(:issue, project: project) }
 
     factory :note_on_issue,              aliases: [:votable_note]
     factory :note_on_commit,             traits: [:on_commit]
@@ -20,7 +20,6 @@ FactoryGirl.define do
     factory :upvote_note,                traits: [:award, :upvote]
 
     trait :on_commit do
-      project
       noteable nil
       commit_id RepoHelpers.sample_commit.id
       noteable_type "Commit"
@@ -31,11 +30,11 @@ FactoryGirl.define do
     end
 
     trait :on_merge_request do
-      noteable { create(:merge_request) }
+      noteable { create(:merge_request, project: project) }
     end
 
     trait :on_project_snippet do
-      noteable { create(:snippet) }
+      noteable { create(:snippet, project: project) }
     end
 
     trait :system do

From e558edd1ce47c3c056dd95c0eba8fd811ee749c7 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Apr 2016 13:52:18 +0200
Subject: [PATCH 0853/1431] Update specs to carry out changes in note factory

---
 features/steps/dashboard/todos.rb             |   2 +-
 features/steps/project/issues/issues.rb       |   2 +-
 spec/factories/notes.rb                       |  21 ++-
 spec/features/issues/note_polling_spec.rb     |   6 +-
 spec/features/issues_spec.rb                  |   2 +-
 spec/features/notes_on_merge_requests_spec.rb |  10 +-
 .../participants_autocomplete_spec.rb         |   6 +-
 spec/features/task_lists_spec.rb              |   5 +-
 spec/lib/gitlab/note_data_builder_spec.rb     |  71 +++++++--
 spec/models/concerns/issuable_spec.rb         |   7 +-
 spec/models/merge_request_spec.rb             |   9 +-
 spec/models/note_spec.rb                      |  10 +-
 .../project_services/hipchat_service_spec.rb  | 147 +++++++++++-------
 .../project_services/slack_service_spec.rb    |  68 +++++---
 .../merge_when_build_succeeds_service_spec.rb |  10 +-
 spec/services/system_note_service_spec.rb     |  12 +-
 16 files changed, 258 insertions(+), 130 deletions(-)

diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index d3b6c7f6a15..bd8a270202e 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -20,7 +20,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
   step 'I have todos' do
     create(:todo, user: current_user, project: project, author: mary_jane, target: issue, action: Todo::MENTIONED)
     create(:todo, user: current_user, project: project, author: john_doe, target: issue, action: Todo::ASSIGNED)
-    note = create(:note, author: john_doe, noteable: issue, note: "#{current_user.to_reference} Wdyt?")
+    note = create(:note, author: john_doe, noteable: issue, note: "#{current_user.to_reference} Wdyt?", project: project)
     create(:todo, user: current_user, project: project, author: john_doe, target: issue, action: Todo::MENTIONED, note: note)
     create(:todo, user: current_user, project: project, author: john_doe, target: merge_request, action: Todo::ASSIGNED)
   end
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index f2c68f007ef..5cd431e05d5 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -348,7 +348,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
   step 'another user adds a comment with text "Yay!" to issue "Release 0.4"' do
     issue = Issue.find_by!(title: 'Release 0.4')
-    create(:note_on_issue, noteable: issue,  note: 'Yay!')
+    create(:note_on_issue, noteable: issue, project: project, note: 'Yay!')
   end
 
   step 'I should see a new comment with text "Yay!"' do
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index cabab0c2207..2940ac342a2 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -9,7 +9,7 @@ FactoryGirl.define do
     author
     noteable { create(:issue, project: project) }
 
-    factory :note_on_issue,              aliases: [:votable_note]
+    factory :note_on_issue,              traits: [:on_issue], aliases: [:votable_note]
     factory :note_on_commit,             traits: [:on_commit]
     factory :note_on_commit_diff,        traits: [:on_commit, :on_diff], class: LegacyDiffNote
     factory :note_on_merge_request,      traits: [:on_merge_request]
@@ -19,24 +19,33 @@ FactoryGirl.define do
     factory :downvote_note,              traits: [:award, :downvote]
     factory :upvote_note,                traits: [:award, :upvote]
 
+    trait :on_issue do
+      noteable_type 'Issue'
+    end
+
     trait :on_commit do
       noteable nil
       commit_id RepoHelpers.sample_commit.id
       noteable_type "Commit"
     end
 
-    trait :on_diff do
-      line_code "0_184_184"
-    end
-
     trait :on_merge_request do
-      noteable { create(:merge_request, project: project) }
+      noteable_type 'MergeRequest'
+      noteable do
+        create(:merge_request, source_project: project,
+                               target_project: project)
+      end
     end
 
     trait :on_project_snippet do
+      noteable_type 'Snippet'
       noteable { create(:snippet, project: project) }
     end
 
+    trait :on_diff do
+      line_code "0_184_184"
+    end
+
     trait :system do
       system true
     end
diff --git a/spec/features/issues/note_polling_spec.rb b/spec/features/issues/note_polling_spec.rb
index e4efdbe2421..9f521263e4c 100644
--- a/spec/features/issues/note_polling_spec.rb
+++ b/spec/features/issues/note_polling_spec.rb
@@ -9,8 +9,12 @@ feature 'Issue notes polling' do
   end
 
   scenario 'Another user adds a comment to an issue', js: true do
-    note = create(:note_on_issue, noteable: issue, note: 'Looks good!')
+    note = create(:note_on_issue, noteable: issue,
+                                  project: project,
+                                  note: 'Looks good!')
+
     page.execute_script('notes.refresh();')
+
     expect(page).to have_selector("#note_#{note.id}", text: 'Looks good!')
   end
 end
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 749ee01890c..9271964166a 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -125,7 +125,7 @@ describe 'Issues', feature: true do
   describe 'Issue info' do
     it 'excludes award_emoji from comment count' do
       issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
-      create(:upvote_note, noteable: issue)
+      create(:upvote_note, noteable: issue, project: project)
 
       visit namespace_project_issues_path(project.namespace, project, assignee_id: @user.id)
 
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 9e9fec01943..2835cf44494 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -19,10 +19,14 @@ describe 'Comments', feature: true do
   end
 
   describe 'On a merge request', js: true, feature: true do
-    let!(:merge_request) { create(:merge_request) }
-    let!(:project) { merge_request.source_project }
+    let!(:project) { create(:project) }
+    let!(:merge_request) do
+      create(:merge_request, source_project: project, target_project: project)
+    end
+
     let!(:note) do
-      create(:note_on_merge_request, :with_attachment, project: project)
+      create(:note_on_merge_request, :with_attachment, noteable: merge_request,
+                                                       project: project)
     end
 
     before do
diff --git a/spec/features/participants_autocomplete_spec.rb b/spec/features/participants_autocomplete_spec.rb
index 1adab7e9c6c..c7c00a3266a 100644
--- a/spec/features/participants_autocomplete_spec.rb
+++ b/spec/features/participants_autocomplete_spec.rb
@@ -32,7 +32,8 @@ feature 'Member autocomplete', feature: true do
   context 'adding a new note on a Issue', js: true do
     before do
       issue = create(:issue, author: author, project: project)
-      create(:note, note: 'Ultralight Beam', noteable: issue, author: participant)
+      create(:note, note: 'Ultralight Beam', noteable: issue,
+                    project: project, author: participant)
       visit_issue(project, issue)
     end
 
@@ -47,7 +48,8 @@ feature 'Member autocomplete', feature: true do
   context 'adding a new note on a Merge Request ', js: true do
     before do
       merge = create(:merge_request, source_project: project, target_project: project, author: author)
-      create(:note, note: 'Ultralight Beam', noteable: merge, author: participant)
+      create(:note, note: 'Ultralight Beam', noteable: merge,
+                    project: project, author: participant)
       visit_merge_request(project, merge)
     end
 
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index b7368cca29d..6ed279ef9be 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -75,7 +75,10 @@ feature 'Task Lists', feature: true do
 
   describe 'for Notes' do
     let!(:issue) { create(:issue, author: user, project: project) }
-    let!(:note)  { create(:note, note: markdown, noteable: issue, author: user) }
+    let!(:note) do
+      create(:note, note: markdown, noteable: issue,
+                    project: project, author: user)
+    end
 
     it 'renders for note body' do
       visit_issue(project, issue)
diff --git a/spec/lib/gitlab/note_data_builder_spec.rb b/spec/lib/gitlab/note_data_builder_spec.rb
index f093d0a0d8b..82823e7f790 100644
--- a/spec/lib/gitlab/note_data_builder_spec.rb
+++ b/spec/lib/gitlab/note_data_builder_spec.rb
@@ -9,7 +9,8 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   before(:each) do
     expect(data).to have_key(:object_attributes)
     expect(data[:object_attributes]).to have_key(:url)
-    expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
+    expect(data[:object_attributes][:url])
+      .to eq(Gitlab::UrlBuilder.build(note))
     expect(data[:object_kind]).to eq('note')
     expect(data[:user]).to eq(user.hook_attrs)
   end
@@ -37,13 +38,21 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   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, project: project) }
+    let(:issue) do
+      create(:issue, created_at: fixed_time, updated_at: fixed_time,
+                     project: project)
+    end
+
+    let(:note) do
+      create(:note_on_issue, noteable_id: issue.id, project: project)
+    end
 
     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']
+      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'
@@ -51,13 +60,23 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   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, project: project) }
+    let(:merge_request) do
+      create(:merge_request, created_at: fixed_time,
+                             updated_at: fixed_time,
+                             source_project: project)
+    end
+
+    let(:note) do
+      create(:note_on_merge_request, noteable_id: merge_request.id,
+                                     project: project)
+    end
 
     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']
+      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'
@@ -65,13 +84,22 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   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, project: project) }
+    let(:merge_request) do
+      create(:merge_request, created_at: fixed_time, updated_at: fixed_time,
+                             source_project: project)
+    end
+
+    let(:note) do
+      create(:note_on_merge_request_diff, noteable_id: merge_request.id,
+                                          project: project)
+    end
 
     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']
+      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'
@@ -79,13 +107,22 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   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, project: project) }
+    let!(:snippet) do
+      create(:project_snippet, created_at: fixed_time, updated_at: fixed_time,
+                               project: project)
+    end
+
+    let!(:note) do
+      create(:note_on_project_snippet, noteable_id: snippet.id,
+                                       project: project)
+    end
 
     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']
+      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'
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 583827cdf42..331ebaf4ac4 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -189,7 +189,6 @@ describe Issue, "Issuable" do
     let(:data) { issue.to_hook_data(user) }
     let(:project) { issue.project }
 
-
     it "returns correct hook data" do
       expect(data[:object_kind]).to eq("issue")
       expect(data[:user]).to eq(user.hook_attrs)
@@ -230,10 +229,8 @@ describe Issue, "Issuable" do
 
   describe "votes" do
     before do
-      author = create :user
-      project = create :empty_project
-      issue.notes.awards.create!(note: "thumbsup", author: author, project: project)
-      issue.notes.awards.create!(note: "thumbsdown", author: author, project: project)
+      issue.notes.awards.create!(note: "thumbsup", author: user, project: issue.project)
+      issue.notes.awards.create!(note: "thumbsdown", author: user, project: issue.project)
     end
 
     it "returns correct values" do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index e269ff26a04..20e383e03b4 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -119,7 +119,9 @@ describe MergeRequest, models: true do
 
     before do
       allow(merge_request).to receive(:commits) { [merge_request.source_project.repository.commit] }
-      create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit', project: merge_request.project)
+      create(:note_on_commit, commit_id: merge_request.commits.first.id,
+                              noteable_type: 'Commit',
+                              project: merge_request.project)
       create(:note, noteable: merge_request, project: merge_request.project)
     end
 
@@ -129,7 +131,10 @@ describe MergeRequest, models: true do
     end
 
     it "should include notes for commits from target project as well" do
-      create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit', project: merge_request.target_project)
+      create(:note_on_commit, commit_id: merge_request.commits.first.id,
+                              noteable_type: 'Commit',
+                              project: merge_request.target_project)
+
       expect(merge_request.commits).not_to be_empty
       expect(merge_request.mr_and_commit_notes.count).to eq(3)
     end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index d90b54464cd..20d40c47aa6 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -202,12 +202,18 @@ describe Note, models: true do
     let(:merge_request) { create :merge_request }
 
     it "converts aliases to actual name" do
-      note = create(:note, note: ":+1:", noteable: merge_request)
+      note = create(:note, note: ":+1:",
+                           noteable: merge_request,
+                           project: merge_request.project)
+
       expect(note.reload.note).to eq("thumbsup")
     end
 
     it "is not an award emoji when comment is on a diff" do
-      note = create(:note_on_merge_request_diff, note: ":blowfish:", noteable: merge_request, line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2")
+      note = create(:note_on_merge_request_diff, note: ":blowfish:",
+                                                 noteable: merge_request,
+                                                 project: merge_request.project,
+                                                 line_code: "11d5d2e667e9da4f7f610f81d86c974b146b13bd_0_2")
       note = note.reload
 
       expect(note.note).to eq(":blowfish:")
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index f887ed4bafc..7013ffbf3e1 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -176,86 +176,117 @@ describe HipchatService, models: true do
     context "Note events" do
       let(:user) { create(:user) }
       let(:project) { create(:project, creator_id: user.id) }
-      let(:issue)         { create(:issue, project: project) }
-      let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
-      let(:snippet)       { create(:project_snippet, project: project) }
-      let(:commit_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
-      let(:merge_request_note) { create(:note_on_merge_request, noteable_id: merge_request.id, note: "merge request note") }
-      let(:issue_note) { create(:note_on_issue, noteable_id: issue.id, note: "issue note")}
-      let(:snippet_note) { create(:note_on_project_snippet, noteable_id: snippet.id, note: "snippet note") }
 
-      it "should call Hipchat API for commit comment events" do
-        data = Gitlab::NoteDataBuilder.build(commit_note, user)
-        hipchat.execute(data)
+      context 'when commit comment event triggered' do
+        let(:commit_note) do
+          create(:note_on_commit, author: user, project: project,
+                                  commit_id: project.repository.commit.id,
+                                  note: 'a comment on a commit')
+        end
 
-        expect(WebMock).to have_requested(:post, api_url).once
+        it "should call Hipchat API for commit comment events" do
+          data = Gitlab::NoteDataBuilder.build(commit_note, user)
+          hipchat.execute(data)
 
-        message = hipchat.send(:create_message, data)
+          expect(WebMock).to have_requested(:post, api_url).once
 
-        obj_attr = data[:object_attributes]
-        commit_id = Commit.truncate_sha(data[:commit][:id])
-        title = hipchat.send(:format_title, data[:commit][:message])
+          message = hipchat.send(:create_message, data)
 
-        expect(message).to eq("#{user.name} commented on " \
-            "<a href=\"#{obj_attr[:url]}\">commit #{commit_id}</a> in " \
-            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
-            "#{title}" \
-            "<pre>a comment on a commit</pre>")
+          obj_attr = data[:object_attributes]
+          commit_id = Commit.truncate_sha(data[:commit][:id])
+          title = hipchat.send(:format_title, data[:commit][:message])
+
+          expect(message).to eq("#{user.name} commented on " \
+              "<a href=\"#{obj_attr[:url]}\">commit #{commit_id}</a> in " \
+              "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+              "#{title}" \
+              "<pre>a comment on a commit</pre>")
+        end
       end
 
-      it "should call Hipchat API for merge request comment events" do
-        data = Gitlab::NoteDataBuilder.build(merge_request_note, user)
-        hipchat.execute(data)
+      context 'when merge request comment event triggered' do
+        let(:merge_request) do
+          create(:merge_request, source_project: project,
+                                 target_project: project)
+        end
 
-        expect(WebMock).to have_requested(:post, api_url).once
+        let(:merge_request_note) do
+          create(:note_on_merge_request, noteable_id: merge_request.id,
+                                         project: project,
+                                         note: "merge request note")
+        end
 
-        message = hipchat.send(:create_message, data)
+        it "should call Hipchat API for merge request comment events" do
+          data = Gitlab::NoteDataBuilder.build(merge_request_note, user)
+          hipchat.execute(data)
 
-        obj_attr = data[:object_attributes]
-        merge_id = data[:merge_request]['iid']
-        title = data[:merge_request]['title']
+          expect(WebMock).to have_requested(:post, api_url).once
 
-        expect(message).to eq("#{user.name} commented on " \
-            "<a href=\"#{obj_attr[:url]}\">merge request !#{merge_id}</a> in " \
-            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
-            "<b>#{title}</b>" \
-            "<pre>merge request note</pre>")
+          message = hipchat.send(:create_message, data)
+
+          obj_attr = data[:object_attributes]
+          merge_id = data[:merge_request]['iid']
+          title = data[:merge_request]['title']
+
+          expect(message).to eq("#{user.name} commented on " \
+              "<a href=\"#{obj_attr[:url]}\">merge request !#{merge_id}</a> in " \
+              "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+              "<b>#{title}</b>" \
+              "<pre>merge request note</pre>")
+        end
       end
 
-      it "should call Hipchat API for issue comment events" do
-        data = Gitlab::NoteDataBuilder.build(issue_note, user)
-        hipchat.execute(data)
+      context 'when issue comment event triggered' do
+        let(:issue) { create(:issue, project: project) }
+        let(:issue_note) do
+          create(:note_on_issue, noteable_id: issue.id, project: project,
+                                 note: "issue note")
+        end
 
-        message = hipchat.send(:create_message, data)
+        it "should call Hipchat API for issue comment events" do
+          data = Gitlab::NoteDataBuilder.build(issue_note, user)
+          hipchat.execute(data)
 
-        obj_attr = data[:object_attributes]
-        issue_id = data[:issue]['iid']
-        title = data[:issue]['title']
+          message = hipchat.send(:create_message, data)
 
-        expect(message).to eq("#{user.name} commented on " \
-            "<a href=\"#{obj_attr[:url]}\">issue ##{issue_id}</a> in " \
-            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
-            "<b>#{title}</b>" \
-            "<pre>issue note</pre>")
+          obj_attr = data[:object_attributes]
+          issue_id = data[:issue]['iid']
+          title = data[:issue]['title']
+
+          expect(message).to eq("#{user.name} commented on " \
+              "<a href=\"#{obj_attr[:url]}\">issue ##{issue_id}</a> in " \
+              "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+              "<b>#{title}</b>" \
+              "<pre>issue note</pre>")
+        end
       end
 
-      it "should call Hipchat API for snippet comment events" do
-        data = Gitlab::NoteDataBuilder.build(snippet_note, user)
-        hipchat.execute(data)
+      context 'when snippet comment event triggered' do
+        let(:snippet) { create(:project_snippet, project: project) }
+        let(:snippet_note) do
+          create(:note_on_project_snippet, noteable_id: snippet.id,
+                                           project: project,
+                                           note: "snippet note")
+        end
 
-        expect(WebMock).to have_requested(:post, api_url).once
+        it "should call Hipchat API for snippet comment events" do
+          data = Gitlab::NoteDataBuilder.build(snippet_note, user)
+          hipchat.execute(data)
 
-        message = hipchat.send(:create_message, data)
+          expect(WebMock).to have_requested(:post, api_url).once
 
-        obj_attr = data[:object_attributes]
-        snippet_id = data[:snippet]['id']
-        title = data[:snippet]['title']
+          message = hipchat.send(:create_message, data)
 
-        expect(message).to eq("#{user.name} commented on " \
-            "<a href=\"#{obj_attr[:url]}\">snippet ##{snippet_id}</a> in " \
-            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
-            "<b>#{title}</b>" \
-            "<pre>snippet note</pre>")
+          obj_attr = data[:object_attributes]
+          snippet_id = data[:snippet]['id']
+          title = data[:snippet]['title']
+
+          expect(message).to eq("#{user.name} commented on " \
+              "<a href=\"#{obj_attr[:url]}\">snippet ##{snippet_id}</a> in " \
+              "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+              "<b>#{title}</b>" \
+              "<pre>snippet note</pre>")
+        end
       end
     end
 
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index a97b7560137..155f3e74e0d 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -142,13 +142,6 @@ describe SlackService, models: true do
     let(:slack)   { SlackService.new }
     let(:user) { create(:user) }
     let(:project) { create(:project, creator_id: user.id) }
-    let(:issue)         { create(:issue, project: project) }
-    let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
-    let(:snippet)       { create(:project_snippet, project: project) }
-    let(:commit_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
-    let(:merge_request_note) { create(:note_on_merge_request, noteable_id: merge_request.id, note: "merge request note") }
-    let(:issue_note) { create(:note_on_issue, noteable_id: issue.id, note: "issue note")}
-    let(:snippet_note) { create(:note_on_project_snippet, noteable_id: snippet.id, note: "snippet note") }
     let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' }
 
     before do
@@ -162,32 +155,61 @@ describe SlackService, models: true do
       WebMock.stub_request(:post, webhook_url)
     end
 
-    it "should call Slack API for commit comment events" do
-      data = Gitlab::NoteDataBuilder.build(commit_note, user)
-      slack.execute(data)
+    context 'when commit comment event executed' do
+      let(:commit_note) do
+        create(:note_on_commit, author: user,
+                                project: project,
+                                commit_id: project.repository.commit.id,
+                                note: 'a comment on a commit')
+      end
 
-      expect(WebMock).to have_requested(:post, webhook_url).once
+      it "should call Slack API for commit comment events" do
+        data = Gitlab::NoteDataBuilder.build(commit_note, user)
+        slack.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
     end
 
-    it "should call Slack API for merge request comment events" do
-      data = Gitlab::NoteDataBuilder.build(merge_request_note, user)
-      slack.execute(data)
+    context 'when merge request comment event executed' do
+      let(:merge_request_note) do
+        create(:note_on_merge_request, project: project,
+                                       note: "merge request note")
+      end
 
-      expect(WebMock).to have_requested(:post, webhook_url).once
+      it "should call Slack API for merge request comment events" do
+        data = Gitlab::NoteDataBuilder.build(merge_request_note, user)
+        slack.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
     end
 
-    it "should call Slack API for issue comment events" do
-      data = Gitlab::NoteDataBuilder.build(issue_note, user)
-      slack.execute(data)
+    context 'when issue comment event executed' do
+      let(:issue_note) do
+        create(:note_on_issue, project: project, note: "issue note")
+      end
 
-      expect(WebMock).to have_requested(:post, webhook_url).once
+      it "should call Slack API for issue comment events" do
+        data = Gitlab::NoteDataBuilder.build(issue_note, user)
+        slack.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
     end
 
-    it "should call Slack API for snippet comment events" do
-      data = Gitlab::NoteDataBuilder.build(snippet_note, user)
-      slack.execute(data)
+    context 'when snippet comment event executed' do
+      let(:snippet_note) do
+        create(:note_on_project_snippet, project: project,
+                                         note: "snippet note")
+      end
 
-      expect(WebMock).to have_requested(:post, webhook_url).once
+      it "should call Slack API for snippet comment events" do
+        data = Gitlab::NoteDataBuilder.build(snippet_note, user)
+        slack.execute(data)
+
+        expect(WebMock).to have_requested(:post, webhook_url).once
+      end
     end
   end
 end
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index 82247849814..0861d74aede 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe MergeRequests::MergeWhenBuildSucceedsService do
-  let(:user)          { create(:user) }
-  let(:merge_request) { create(:merge_request) }
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
 
   let(:mr_merge_if_green_enabled) do
     create(:merge_request, merge_when_build_succeeds: true, merge_user: user,
@@ -10,11 +10,15 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
                            source_project: project, target_project: project, state: "opened")
   end
 
-  let(:project) { create(:project) }
   let(:ci_commit) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) }
   let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, commit_message: 'Awesome message') }
 
   describe "#execute" do
+    let(:merge_request) do
+      create(:merge_request, target_project: project, source_project: project,
+                             source_branch: "feature", target_branch: 'master')
+    end
+
     context 'first time enabling' do
       before do
         allow(merge_request).to receive(:ci_commit).and_return(ci_commit)
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index ee976eb2926..29e0a63d8ce 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -208,8 +208,10 @@ describe SystemNoteService, services: true do
   end
 
   describe '.merge_when_build_succeeds' do
-    let(:ci_commit) { build :ci_commit_without_jobs }
-    let(:noteable) { create :merge_request }
+    let(:ci_commit) { build(:ci_commit_without_jobs )}
+    let(:noteable) do
+      create(:merge_request, source_project: project, target_project: project)
+    end
 
     subject { described_class.merge_when_build_succeeds(noteable, project, author, noteable.last_commit) }
 
@@ -221,8 +223,10 @@ describe SystemNoteService, services: true do
   end
 
   describe '.cancel_merge_when_build_succeeds' do
-    let(:ci_commit) { build :ci_commit_without_jobs }
-    let(:noteable) { create :merge_request }
+    let(:ci_commit) { build(:ci_commit_without_jobs) }
+    let(:noteable) do
+      create(:merge_request, source_project: project, target_project: project)
+    end
 
     subject { described_class.cancel_merge_when_build_succeeds(noteable, project, author) }
 

From 99ef3a84b558e7b51bce7cbb11a6e235a6cc310b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 29 Apr 2016 12:16:18 +0200
Subject: [PATCH 0854/1431] Validate presence of noteable_type in note model

---
 app/models/note.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/note.rb b/app/models/note.rb
index e3e522a8d0f..5f669c02e8b 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -29,6 +29,7 @@ class Note < ActiveRecord::Base
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
 
+  validates :noteable_type, presence: true
   validates :noteable_id, presence: true, unless: :for_commit?
   validates :commit_id, presence: true, if: :for_commit?
   validates :author, presence: true

From fc57d36018a23c15da013bebf42d51f7a8e9a955 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 4 May 2016 11:17:16 +0200
Subject: [PATCH 0855/1431] Minor changes in note validation specs

---
 spec/factories/notes.rb               | 22 ++++++++++++----------
 spec/models/concerns/issuable_spec.rb |  6 ++++--
 spec/models/merge_request_spec.rb     |  2 --
 spec/models/note_spec.rb              | 11 ++++++-----
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 2940ac342a2..6801438165d 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -9,9 +9,9 @@ FactoryGirl.define do
     author
     noteable { create(:issue, project: project) }
 
-    factory :note_on_issue,              traits: [:on_issue], aliases: [:votable_note]
     factory :note_on_commit,             traits: [:on_commit]
     factory :note_on_commit_diff,        traits: [:on_commit, :on_diff], class: LegacyDiffNote
+    factory :note_on_issue,              traits: [:on_issue], aliases: [:votable_note]
     factory :note_on_merge_request,      traits: [:on_merge_request]
     factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote
     factory :note_on_project_snippet,    traits: [:on_project_snippet]
@@ -19,14 +19,20 @@ FactoryGirl.define do
     factory :downvote_note,              traits: [:award, :downvote]
     factory :upvote_note,                traits: [:award, :upvote]
 
-    trait :on_issue do
-      noteable_type 'Issue'
-    end
-
     trait :on_commit do
       noteable nil
+      noteable_type 'Commit'
+      noteable_id nil
       commit_id RepoHelpers.sample_commit.id
-      noteable_type "Commit"
+    end
+
+    trait :on_diff do
+      line_code "0_184_184"
+    end
+
+    trait :on_issue do
+      noteable_type 'Issue'
+      noteable { create(:issue, project: project) }
     end
 
     trait :on_merge_request do
@@ -42,10 +48,6 @@ FactoryGirl.define do
       noteable { create(:snippet, project: project) }
     end
 
-    trait :on_diff do
-      line_code "0_184_184"
-    end
-
     trait :system do
       system true
     end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 331ebaf4ac4..70bbe633269 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -228,9 +228,11 @@ describe Issue, "Issuable" do
   end
 
   describe "votes" do
+    let(:project) { issue.project }
+
     before do
-      issue.notes.awards.create!(note: "thumbsup", author: user, project: issue.project)
-      issue.notes.awards.create!(note: "thumbsdown", author: user, project: issue.project)
+      issue.notes.awards.create!(note: "thumbsup", author: user, project: project)
+      issue.notes.awards.create!(note: "thumbsdown", author: user, project: project)
     end
 
     it "returns correct values" do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 20e383e03b4..4b67c2facf3 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -120,7 +120,6 @@ describe MergeRequest, models: true do
     before do
       allow(merge_request).to receive(:commits) { [merge_request.source_project.repository.commit] }
       create(:note_on_commit, commit_id: merge_request.commits.first.id,
-                              noteable_type: 'Commit',
                               project: merge_request.project)
       create(:note, noteable: merge_request, project: merge_request.project)
     end
@@ -132,7 +131,6 @@ describe MergeRequest, models: true do
 
     it "should include notes for commits from target project as well" do
       create(:note_on_commit, commit_id: merge_request.commits.first.id,
-                              noteable_type: 'Commit',
                               project: merge_request.target_project)
 
       expect(merge_request.commits).not_to be_empty
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 20d40c47aa6..e1b81b23d4b 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -13,29 +13,30 @@ describe Note, models: true do
     it { is_expected.to validate_presence_of(:note) }
     it { is_expected.to validate_presence_of(:project) }
 
-    context 'when note is comment on commit' do
+    context 'when note is on commit' do
       before { allow(subject).to receive(:for_commit?).and_return(true) }
 
       it { is_expected.to validate_presence_of(:commit_id) }
       it { is_expected.to_not validate_presence_of(:noteable_id) }
     end
 
-    context 'when note is not comment on commit' do
+    context 'when note is not on commit' do
       before { allow(subject).to receive(:for_commit?).and_return(false) }
 
       it { is_expected.to_not validate_presence_of(:commit_id) }
       it { is_expected.to validate_presence_of(:noteable_id) }
     end
 
-    context 'when noteable and note project is different' do
+    context 'when noteable and note project differ' do
       subject do
-        build(:note, noteable: create(:issue), project: create(:project))
+        build(:note, noteable: build_stubbed(:issue),
+                     project: build_stubbed(:project))
       end
 
       it { is_expected.to be_invalid }
     end
 
-    context 'when noteable and note project is the same one' do
+    context 'when noteable and note project are the same' do
       subject { create(:note) }
       it { is_expected.to be_valid }
     end

From 77648aac86bdea2cd023604552b73679baf755b2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 6 May 2016 10:12:08 +0200
Subject: [PATCH 0856/1431] Add Changelog entry for note validation
 improvements

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

diff --git a/CHANGELOG b/CHANGELOG
index 5dc56d18c3a..82be2542954 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,6 +63,7 @@ v 8.8.0
   - Make 'upcoming' filter for milestones work better across projects
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
+  - Improve note validation to prevent errors when creating invalid note via API
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
   - Fix API leak of notes of unauthorized issues, snippets and merge requests

From cc2efcf1a681223d5c74eef6fca73cde71dce7c2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 18 May 2016 18:21:14 +0200
Subject: [PATCH 0857/1431] Improve notes factory

---
 spec/factories/notes.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 6801438165d..6f9b3568e70 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -37,10 +37,7 @@ FactoryGirl.define do
 
     trait :on_merge_request do
       noteable_type 'MergeRequest'
-      noteable do
-        create(:merge_request, source_project: project,
-                               target_project: project)
-      end
+      noteable { create(:merge_request, source_project: project) }
     end
 
     trait :on_project_snippet do

From dbba60029c84fa091350d3a7d8b2e73cfec25f7e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 18 May 2016 19:38:52 +0200
Subject: [PATCH 0858/1431] Improve note factory

---
 features/steps/project/merge_requests.rb         |  2 +-
 spec/factories/notes.rb                          |  7 ++-----
 spec/features/issues/note_polling_spec.rb        |  5 ++---
 spec/lib/gitlab/note_data_builder_spec.rb        | 16 ++++++++--------
 spec/models/legacy_diff_note_spec.rb             |  4 +++-
 .../project_services/hipchat_service_spec.rb     |  6 +++---
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index cfa586f859f..b2fa8750234 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -273,7 +273,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'user "John Doe" leaves a comment like "Line is wrong" on diff' do
     mr = MergeRequest.find_by(title: "Bug NS-05")
     create(:note_on_merge_request_diff, project: project,
-                                        noteable_id: mr.id,
+                                        noteable: mr,
                                         author: user_exists("John Doe"),
                                         line_code: sample_commit.line_code,
                                         note: 'Line is wrong')
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 6f9b3568e70..c32e205ee69 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -7,7 +7,7 @@ FactoryGirl.define do
     project
     note "Note"
     author
-    noteable { create(:issue, project: project) }
+    on_issue
 
     factory :note_on_commit,             traits: [:on_commit]
     factory :note_on_commit_diff,        traits: [:on_commit, :on_diff], class: LegacyDiffNote
@@ -21,8 +21,8 @@ FactoryGirl.define do
 
     trait :on_commit do
       noteable nil
-      noteable_type 'Commit'
       noteable_id nil
+      noteable_type 'Commit'
       commit_id RepoHelpers.sample_commit.id
     end
 
@@ -31,17 +31,14 @@ FactoryGirl.define do
     end
 
     trait :on_issue do
-      noteable_type 'Issue'
       noteable { create(:issue, project: project) }
     end
 
     trait :on_merge_request do
-      noteable_type 'MergeRequest'
       noteable { create(:merge_request, source_project: project) }
     end
 
     trait :on_project_snippet do
-      noteable_type 'Snippet'
       noteable { create(:snippet, project: project) }
     end
 
diff --git a/spec/features/issues/note_polling_spec.rb b/spec/features/issues/note_polling_spec.rb
index 9f521263e4c..f5cfe2d666e 100644
--- a/spec/features/issues/note_polling_spec.rb
+++ b/spec/features/issues/note_polling_spec.rb
@@ -9,9 +9,8 @@ feature 'Issue notes polling' do
   end
 
   scenario 'Another user adds a comment to an issue', js: true do
-    note = create(:note_on_issue, noteable: issue,
-                                  project: project,
-                                  note: 'Looks good!')
+    note = create(:note, noteable: issue, project: project,
+                         note: 'Looks good!')
 
     page.execute_script('notes.refresh();')
 
diff --git a/spec/lib/gitlab/note_data_builder_spec.rb b/spec/lib/gitlab/note_data_builder_spec.rb
index 82823e7f790..e848d88182f 100644
--- a/spec/lib/gitlab/note_data_builder_spec.rb
+++ b/spec/lib/gitlab/note_data_builder_spec.rb
@@ -44,13 +44,13 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
     end
 
     let(:note) do
-      create(:note_on_issue, noteable_id: issue.id, project: project)
+      create(:note_on_issue, noteable: issue, project: project)
     end
 
     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'))
+        .to eq(issue.reload.hook_attrs.except('updated_at'))
       expect(data[:issue]['updated_at'])
         .to be > issue.hook_attrs['updated_at']
     end
@@ -67,14 +67,14 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
     end
 
     let(:note) do
-      create(:note_on_merge_request, noteable_id: merge_request.id,
+      create(:note_on_merge_request, noteable: merge_request,
                                      project: project)
     end
 
     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'))
+        .to eq(merge_request.reload.hook_attrs.except('updated_at'))
       expect(data[:merge_request]['updated_at'])
         .to be > merge_request.hook_attrs['updated_at']
     end
@@ -90,14 +90,14 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
     end
 
     let(:note) do
-      create(:note_on_merge_request_diff, noteable_id: merge_request.id,
+      create(:note_on_merge_request_diff, noteable: merge_request,
                                           project: project)
     end
 
     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'))
+        .to eq(merge_request.reload.hook_attrs.except('updated_at'))
       expect(data[:merge_request]['updated_at'])
         .to be > merge_request.hook_attrs['updated_at']
     end
@@ -113,14 +113,14 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
     end
 
     let!(:note) do
-      create(:note_on_project_snippet, noteable_id: snippet.id,
+      create(:note_on_project_snippet, noteable: snippet,
                                        project: project)
     end
 
     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'))
+        .to eq(snippet.reload.hook_attrs.except('updated_at'))
       expect(data[:snippet]['updated_at'])
         .to be > snippet.hook_attrs['updated_at']
     end
diff --git a/spec/models/legacy_diff_note_spec.rb b/spec/models/legacy_diff_note_spec.rb
index 7c29bef54e4..b2d06853886 100644
--- a/spec/models/legacy_diff_note_spec.rb
+++ b/spec/models/legacy_diff_note_spec.rb
@@ -63,7 +63,9 @@ describe LegacyDiffNote, models: true do
         code = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
 
         # We're persisting in order to trigger the set_diff callback
-        note = create(:note_on_merge_request_diff, noteable: merge, line_code: code)
+        note = create(:note_on_merge_request_diff, noteable: merge,
+                                                   line_code: code,
+                                                   project: merge.source_project)
 
         # Make sure we don't get a false positive from a guard clause
         expect(note).to receive(:find_noteable_diff).and_call_original
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 7013ffbf3e1..5f618322aab 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -211,7 +211,7 @@ describe HipchatService, models: true do
         end
 
         let(:merge_request_note) do
-          create(:note_on_merge_request, noteable_id: merge_request.id,
+          create(:note_on_merge_request, noteable: merge_request,
                                          project: project,
                                          note: "merge request note")
         end
@@ -239,7 +239,7 @@ describe HipchatService, models: true do
       context 'when issue comment event triggered' do
         let(:issue) { create(:issue, project: project) }
         let(:issue_note) do
-          create(:note_on_issue, noteable_id: issue.id, project: project,
+          create(:note_on_issue, noteable: issue, project: project,
                                  note: "issue note")
         end
 
@@ -264,7 +264,7 @@ describe HipchatService, models: true do
       context 'when snippet comment event triggered' do
         let(:snippet) { create(:project_snippet, project: project) }
         let(:snippet_note) do
-          create(:note_on_project_snippet, noteable_id: snippet.id,
+          create(:note_on_project_snippet, noteable: snippet,
                                            project: project,
                                            note: "snippet note")
         end

From 1286b9c3b5bc2435406e94127f8036d032623f7e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 24 May 2016 02:34:44 +0200
Subject: [PATCH 0859/1431] Move Changelog entry for note validation to 8.9

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

diff --git a/CHANGELOG b/CHANGELOG
index 82be2542954..160543d8bae 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.9.0 (unreleased)
   - Allow forking projects with restricted visibility level
+  - Improve note validation to prevent errors when creating invalid note via API
   - Redesign navigation for project pages
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
@@ -63,7 +64,6 @@ v 8.8.0
   - Make 'upcoming' filter for milestones work better across projects
   - Sanitize repo paths in new project error message
   - Bump mail_room to 0.7.0 to fix stuck IDLE connections
-  - Improve note validation to prevent errors when creating invalid note via API
   - Remove future dates from contribution calendar graph.
   - Support e-mail notifications for comments on project snippets
   - Fix API leak of notes of unauthorized issues, snippets and merge requests

From c8eb1dccabe5cd961895127dbbbf46d3eee4aebd Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Sun, 29 May 2016 12:53:30 -0700
Subject: [PATCH 0860/1431] Try and use cache for application settings even
 when the db is not connected

---
 app/models/application_setting.rb | 4 ++++
 lib/gitlab/current_settings.rb    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9a14954b4a7..33069d66d78 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -98,6 +98,10 @@ class ApplicationSetting < ActiveRecord::Base
     Rails.cache.delete(CACHE_KEY)
   end
 
+  def self.cached
+    Rails.cache.fetch(CACHE_KEY)
+  end
+
   def self.create_from_defaults
     create(
       default_projects_limit: Settings.gitlab['default_projects_limit'],
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 59e86707d3e..1a4ddd38513 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -9,9 +9,9 @@ module Gitlab
     end
 
     def ensure_application_settings!
-      settings = nil
+      settings = ::ApplicationSetting.cached
 
-      if connect_to_db?
+      if !settings && connect_to_db?
         settings = ::ApplicationSetting.current
         settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
       end

From 1c09c21a97f9b48a26047be71486087e5879d797 Mon Sep 17 00:00:00 2001
From: Ruben Davila <rdavila84@gmail.com>
Date: Fri, 27 May 2016 20:29:38 -0500
Subject: [PATCH 0861/1431] Ignore files under "/shared" directory and not
 other subdirectories that contains that name

It's working fine now but by making it more explicit we can make tools
like 'The Silver Searcher' to parse properly the .gitignore file
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8f861d76a37..65eca9e2004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,4 @@ rails_best_practices_output.html
 tmp/
 vendor/bundle/*
 builds/*
-shared/*
+/shared/*

From f0930feac9329a047e5b95f7d6e2d338d9b786c4 Mon Sep 17 00:00:00 2001
From: Ruben Davila <rdavila84@gmail.com>
Date: Sun, 29 May 2016 16:51:48 -0500
Subject: [PATCH 0862/1431] Use absolute paths wherever is possible for
 .gitignore entries.

---
 .gitignore | 76 +++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 65eca9e2004..ce6a363fe35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,46 +4,46 @@
 .bundle
 .chef
 .directory
-.envrc
-.gitlab_shell_secret
+/.envrc
+/.gitlab_shell_secret
 .idea
-.rbenv-version
+/.rbenv-version
 .rbx/
-.ruby-gemset
-.ruby-version
-.rvmrc
+/.ruby-gemset
+/.ruby-version
+/.rvmrc
 .sass-cache/
-.secret
-.vagrant
-.byebug_history
-Vagrantfile
-backups/*
-config/aws.yml
-config/database.yml
-config/gitlab.yml
-config/gitlab_ci.yml
-config/initializers/rack_attack.rb
-config/initializers/smtp_settings.rb
-config/initializers/relative_url.rb
-config/resque.yml
-config/unicorn.rb
-config/secrets.yml
-config/sidekiq.yml
-coverage/*
-db/*.sqlite3
-db/*.sqlite3-journal
-db/data.yml
-doc/code/*
-dump.rdb
-log/*.log*
-nohup.out
-public/assets/
-public/uploads.*
-public/uploads/
-shared/artifacts/
-rails_best_practices_output.html
+/.secret
+/.vagrant
+/.byebug_history
+/Vagrantfile
+/backups/*
+/config/aws.yml
+/config/database.yml
+/config/gitlab.yml
+/config/gitlab_ci.yml
+/config/initializers/rack_attack.rb
+/config/initializers/smtp_settings.rb
+/config/initializers/relative_url.rb
+/config/resque.yml
+/config/unicorn.rb
+/config/secrets.yml
+/config/sidekiq.yml
+/coverage/*
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/db/data.yml
+/doc/code/*
+/dump.rdb
+/log/*.log*
+/nohup.out
+/public/assets/
+/public/uploads.*
+/public/uploads/
+/shared/artifacts/
+/rails_best_practices_output.html
 /tags
-tmp/
-vendor/bundle/*
-builds/*
+/tmp/*
+/vendor/bundle/*
+/builds/*
 /shared/*

From f36e7ff2f9c8eef4c5ca60fac0aa32361bc5374f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 29 May 2016 23:12:19 -0400
Subject: [PATCH 0863/1431] Shut up, RuboCop

:heart:
---
 spec/models/note_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index e1b81b23d4b..8aad1b73add 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -17,13 +17,13 @@ describe Note, models: true do
       before { allow(subject).to receive(:for_commit?).and_return(true) }
 
       it { is_expected.to validate_presence_of(:commit_id) }
-      it { is_expected.to_not validate_presence_of(:noteable_id) }
+      it { is_expected.not_to validate_presence_of(:noteable_id) }
     end
 
     context 'when note is not on commit' do
       before { allow(subject).to receive(:for_commit?).and_return(false) }
 
-      it { is_expected.to_not validate_presence_of(:commit_id) }
+      it { is_expected.not_to validate_presence_of(:commit_id) }
       it { is_expected.to validate_presence_of(:noteable_id) }
     end
 

From 8e31da9445255f43ee230b8cfaecafbcf7f1ade6 Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:30:16 -0700
Subject: [PATCH 0864/1431] commited -> committed

---
 doc/administration/repository_checks.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/administration/repository_checks.md b/doc/administration/repository_checks.md
index 3411e4af6a7..4172b604cec 100644
--- a/doc/administration/repository_checks.md
+++ b/doc/administration/repository_checks.md
@@ -5,7 +5,7 @@ This feature was [introduced][ce-3232] in GitLab 8.7. It is OFF by
 default because it still causes too many false alarms.
 
 Git has a built-in mechanism, [git fsck][git-fsck], to verify the
-integrity of all data commited to a repository. GitLab administrators
+integrity of all data committed to a repository. GitLab administrators
 can trigger such a check for a project via the project page under the
 admin panel. The checks run asynchronously so it may take a few minutes
 before the check result is visible on the project admin page. If the
@@ -41,4 +41,4 @@ alarms you can choose to clear ALL repository check states from the
 
 ---
 [ce-3232]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 "Auto git fsck"
-[git-fsck]: https://www.kernel.org/pub/software/scm/git/docs/git-fsck.html "git fsck documentation"
\ No newline at end of file
+[git-fsck]: https://www.kernel.org/pub/software/scm/git/docs/git-fsck.html "git fsck documentation"

From 1b0367a422aeb7394a4fc412f3688fbe974e166c Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:30:47 -0700
Subject: [PATCH 0865/1431] Add space between 'Criticalissue'

---
 doc/api/labels.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/labels.md b/doc/api/labels.md
index b857d81768e..a181c0f57a2 100644
--- a/doc/api/labels.md
+++ b/doc/api/labels.md
@@ -39,7 +39,7 @@ Example response:
    {
       "name" : "critical",
       "color" : "#d9534f",
-      "description": "Criticalissue. Need fix ASAP",
+      "description": "Critical issue. Need fix ASAP",
       "open_issues_count": 1,
       "closed_issues_count": 3,
       "open_merge_requests_count": 1

From 556a41660ea84506283d58af753c1747b75bf432 Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:31:22 -0700
Subject: [PATCH 0866/1431] Add space after comma, add space between
 'beautomatically'

---
 doc/api/services.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/services.md b/doc/api/services.md
index 83ac7845156..b5000eff653 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -16,8 +16,8 @@ PUT /projects/:id/services/asana
 
 Parameters:
 
-- `api_key` (**required**) - User API token. User must have access to task,all comments will be attributed to this user.
-- `restrict_to_branch` (optional) - Comma-separated list of branches which will beautomatically inspected. Leave blank to include all branches.
+- `api_key` (**required**) - User API token. User must have access to task, all comments will be attributed to this user.
+- `restrict_to_branch` (optional) - Comma-separated list of branches which will be automatically inspected. Leave blank to include all branches.
 
 ### Delete Asana service
 

From 348d16f524440a5e4cb6f3dc671138e8786c47c7 Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:31:39 -0700
Subject: [PATCH 0867/1431] updtae -> update

---
 doc/development/migration_style_guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 1c13b094582..02e024ca15a 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -116,7 +116,7 @@ Example with Arel:
 users = Arel::Table.new(:users)
 users.group(users[:user_id]).having(users[:id].count.gt(5))
 
-#updtae other tables with this results
+#update other tables with these results
 ```
 
 Example with plain SQL and `quote_string` helper:

From 03901e542922fa246f94003d3d006fa6032b764e Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:32:09 -0700
Subject: [PATCH 0868/1431] occuring -> occurring

---
 doc/install/requirements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index df8e8bdc476..8cbd53cc27a 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -81,7 +81,7 @@ errors during usage.
 - More users? Run it on [multiple application servers](https://about.gitlab.com/high-availability/)
 
 We recommend having at least 1GB of swap on your server, even if you currently have
-enough available RAM. Having swap will help reduce the chance of errors occuring
+enough available RAM. Having swap will help reduce the chance of errors occurring
 if your available memory changes.
 
 Notice: The 25 workers of Sidekiq will show up as separate processes in your process overview (such as top or htop) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about many you need of those.

From eda55662f387ca79f91b4f49dfd9dad12dfc9d6d Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:34:40 -0700
Subject: [PATCH 0869/1431] Grammar fixes, simlink -> symlink

---
 doc/logs/logs.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/logs/logs.md b/doc/logs/logs.md
index ef5affa2ebd..f84060b8d07 100644
--- a/doc/logs/logs.md
+++ b/doc/logs/logs.md
@@ -1,5 +1,5 @@
 ## Log system
-GitLab has advanced log system so everything is logging and you can analize your instance using various system log files.
+GitLab has an advanced log system where everything is logged so that you can analyze your instance using various system log files.
 In addition to system log files, GitLab Enterprise Edition comes with Audit Events. Find more about them [in Audit Events documentation](http://docs.gitlab.com/ee/administration/audit_events.html)
 
 System log files are typically plain text in a standard log file format. This guide talks about how to read and use these system log files.
@@ -67,13 +67,13 @@ gitlab-shell is using by Gitlab for executing git commands and provide ssh acces
 
 ```
 I, [2015-02-13T06:17:00.671315 #9291]  INFO -- : Adding project root/example.git at </var/opt/gitlab/git-data/repositories/root/dcdcdcdcd.git>.
-I, [2015-02-13T06:17:00.679433 #9291]  INFO -- : Moving existing hooks directory and simlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git.
+I, [2015-02-13T06:17:00.679433 #9291]  INFO -- : Moving existing hooks directory and symlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git.
 ```
 
 #### unicorn_stderr.log
 This file lives in `/var/log/gitlab/unicorn/unicorn_stderr.log` for omnibus package or in `/home/git/gitlab/log/unicorn_stderr.log` for installations from the source.
 
-Unicorn is a high-performance forking Web server which is used for serving GitLab application. You can look at this log, for example, if your application does not respond. This log cantains all information about state of unicorn processes at any given time.
+Unicorn is a high-performance forking Web server which is used for serving the GitLab application. You can look at this log if, for example, your application does not respond. This log contains all information about the state of unicorn processes at any given time.
 
 ```
 I, [2015-02-13T06:14:46.680381 #9047]  INFO -- : Refreshing Gem list

From 403eea7b7a100fd28e26a8d8e5888cfd8ff6214b Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:34:58 -0700
Subject: [PATCH 0870/1431] errros -> errors

---
 doc/migrate_ci_to_ce/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md
index 5ec0a2069b5..8f9ef054949 100644
--- a/doc/migrate_ci_to_ce/README.md
+++ b/doc/migrate_ci_to_ce/README.md
@@ -355,7 +355,7 @@ sudo chown git:git /var/opt/gitlab/gitlab-ci/builds
 ```
 
 #### Problems when importing CI database to GitLab
-If you were migrating CI database from MySQL to PostgreSQL manually you can see errros during import about missing sequences:
+If you were migrating CI database from MySQL to PostgreSQL manually you can see errors during import about missing sequences:
 ```
 ALTER SEQUENCE
 ERROR:  relation "ci_builds_id_seq" does not exist

From 9948a8fb8ddaf00fe2be75e7eccd27491fc9bd50 Mon Sep 17 00:00:00 2001
From: Chris Spicer <git@cspicer.net>
Date: Sun, 29 May 2016 22:35:23 -0700
Subject: [PATCH 0871/1431] succes -> success

---
 doc/operations/moving_repositories.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/operations/moving_repositories.md b/doc/operations/moving_repositories.md
index 39086b7a251..54adb99386a 100644
--- a/doc/operations/moving_repositories.md
+++ b/doc/operations/moving_repositories.md
@@ -134,7 +134,7 @@ sudo -u git sh -c '
 cat /var/opt/gitlab/transfer-logs/* | sort | uniq -u |\
   /usr/bin/env JOBS=10 \
   /opt/gitlab/embedded/service/gitlab-rails/bin/parallel-rsync-repos \
-    /var/opt/gitlab/transfer-logs/succes-$(date +%s).log \
+    /var/opt/gitlab/transfer-logs/success-$(date +%s).log \
     /var/opt/gitlab/git-data/repositories \
     /mnt/gitlab/repositories
 '
@@ -145,7 +145,7 @@ sudo -u git -H sh -c '
 cat /home/git/transfer-logs/* | sort | uniq -u |\
   /usr/bin/env JOBS=10 \
   bin/parallel-rsync-repos \
-    /home/git/transfer-logs/succes-$(date +%s).log \
+    /home/git/transfer-logs/success-$(date +%s).log \
     /home/git/repositories \
     /mnt/gitlab/repositories
 `
@@ -164,7 +164,7 @@ sudo gitlab-rake gitlab:list_repos SINCE='2015-10-1 12:00 UTC' |\
   sudo -u git \
   /usr/bin/env JOBS=10 \
   /opt/gitlab/embedded/service/gitlab-rails/bin/parallel-rsync-repos \
-    succes-$(date +%s).log \
+    success-$(date +%s).log \
     /var/opt/gitlab/git-data/repositories \
     /mnt/gitlab/repositories
 
@@ -174,7 +174,7 @@ sudo -u git -H bundle exec rake gitlab:list_repos SINCE='2015-10-1 12:00 UTC' |\
   sudo -u git -H \
   /usr/bin/env JOBS=10 \
   bin/parallel-rsync-repos \
-    succes-$(date +%s).log \
+    success-$(date +%s).log \
     /home/git/repositories \
     /mnt/gitlab/repositories
 ```

From 9485b65abb4efaec1f8369d66e289ad882341330 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 28 May 2016 03:05:34 -0700
Subject: [PATCH 0872/1431] Add DB index on users.state

Closes #17920
---
 CHANGELOG                                          | 1 +
 db/migrate/20160528043124_add_users_state_index.rb | 9 +++++++++
 db/schema.rb                                       | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160528043124_add_users_state_index.rb

diff --git a/CHANGELOG b/CHANGELOG
index 160543d8bae..3e8b0a2af01 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.9.0 (unreleased)
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
   - Use gitlab-shell v3.0.0
+  - Add DB index on users.state
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Fix issues filter when ordering by milestone
diff --git a/db/migrate/20160528043124_add_users_state_index.rb b/db/migrate/20160528043124_add_users_state_index.rb
new file mode 100644
index 00000000000..e77a5460737
--- /dev/null
+++ b/db/migrate/20160528043124_add_users_state_index.rb
@@ -0,0 +1,9 @@
+class AddUsersStateIndex < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    add_concurrent_index :users, :state
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b42eef08a00..c7eeaadb131 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: 20160525205328) do
+ActiveRecord::Schema.define(version: 20160528043124) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1000,6 +1000,7 @@ ActiveRecord::Schema.define(version: 20160525205328) do
   add_index "users", ["name"], name: "index_users_on_name", using: :btree
   add_index "users", ["name"], name: "index_users_on_name_trigram", using: :gin, opclasses: {"name"=>"gin_trgm_ops"}
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+  add_index "users", ["state"], name: "index_users_on_state", using: :btree
   add_index "users", ["username"], name: "index_users_on_username", using: :btree
   add_index "users", ["username"], name: "index_users_on_username_trigram", using: :gin, opclasses: {"username"=>"gin_trgm_ops"}
 

From 21620943b030ce8e59fff2fd994ae83446de3889 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 10:24:02 +0200
Subject: [PATCH 0873/1431] Enable Lint/BlockAlignment Rubocop cop

See #17478
---
 .rubocop.yml                 | 2 +-
 app/helpers/issues_helper.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..35f603c896f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -785,7 +785,7 @@ Lint/AssignmentInCondition:
 
 # Align block ends correctly.
 Lint/BlockAlignment:
-  Enabled: false
+  Enabled: true
 
 # Default values in optional keyword arguments and optional ordinal arguments
 # should not refer back to the name of the argument.
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 551409e8855..173bdbb8654 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -147,8 +147,8 @@ module IssuesHelper
 
   def emoji_author_list(notes, current_user)
     list = notes.map do |note|
-             note.author == current_user ? "me" : note.author.name
-           end
+      note.author == current_user ? "me" : note.author.name
+    end
 
     list.join(", ")
   end

From 1707e89c2969a5bf85836fb9f55079f5c29f3b0f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 10:35:37 +0200
Subject: [PATCH 0874/1431] Enable Style/EndOfLine Rubocop style cop

Use Unix-style line endings. See #17478.
---
 .rubocop.yml                                  |  2 +-
 .../projects/find_file_controller.rb          | 52 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..7cf985383b6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -222,7 +222,7 @@ Style/EndBlock:
 
 # Use Unix-style line endings.
 Style/EndOfLine:
-  Enabled: false
+  Enabled: true
 
 # Favor the use of Fixnum#even? && Fixnum#odd?
 Style/EvenOdd:
diff --git a/app/controllers/projects/find_file_controller.rb b/app/controllers/projects/find_file_controller.rb
index 54a0c447aee..cf53ad0a670 100644
--- a/app/controllers/projects/find_file_controller.rb
+++ b/app/controllers/projects/find_file_controller.rb
@@ -1,26 +1,26 @@
-# Controller for viewing a repository's file structure
-class Projects::FindFileController < Projects::ApplicationController
-  include ExtractsPath
-  include ActionView::Helpers::SanitizeHelper
-  include TreeHelper
-
-  before_action :require_non_empty_project
-  before_action :assign_ref_vars
-  before_action :authorize_download_code!
-
-  def show
-    return render_404 unless @repository.commit(@ref)
-
-    respond_to do |format|
-      format.html
-    end
-  end
-
-  def list
-    file_paths = @repo.ls_files(@ref)
-
-    respond_to do |format|
-      format.json { render json: file_paths }
-    end
-  end
-end
+# Controller for viewing a repository's file structure
+class Projects::FindFileController < Projects::ApplicationController
+  include ExtractsPath
+  include ActionView::Helpers::SanitizeHelper
+  include TreeHelper
+
+  before_action :require_non_empty_project
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
+
+  def show
+    return render_404 unless @repository.commit(@ref)
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def list
+    file_paths = @repo.ls_files(@ref)
+
+    respond_to do |format|
+      format.json { render json: file_paths }
+    end
+  end
+end

From f0375f8226a28e95dbac54156fa55926b8c5def4 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 10:45:10 +0200
Subject: [PATCH 0875/1431] Enable Style/IndentAssignment Rubocop style cop

See #17478
---
 .rubocop.yml        |  2 +-
 lib/api/licenses.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..8dd37259d9f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -286,7 +286,7 @@ Style/IdenticalConditionalBranches:
 # Checks the indentation of the first line of the right-hand-side of a
 # multi-line assignment.
 Style/IndentAssignment:
-  Enabled: false
+  Enabled: true
 
 # Keep indentation straight.
 Style/IndentationConsistency:
diff --git a/lib/api/licenses.rb b/lib/api/licenses.rb
index 187d2c04703..be0e113fbcb 100644
--- a/lib/api/licenses.rb
+++ b/lib/api/licenses.rb
@@ -2,15 +2,15 @@ module API
   # Licenses API
   class Licenses < Grape::API
     PROJECT_TEMPLATE_REGEX =
-    /[\<\{\[]
-      (project|description|
-      one\sline\s.+\swhat\sit\sdoes\.) # matching the start and end is enough here
-    [\>\}\]]/xi.freeze
+      /[\<\{\[]
+        (project|description|
+        one\sline\s.+\swhat\sit\sdoes\.) # matching the start and end is enough here
+      [\>\}\]]/xi.freeze
     YEAR_TEMPLATE_REGEX = /[<{\[](year|yyyy)[>}\]]/i.freeze
     FULLNAME_TEMPLATE_REGEX =
-    /[\<\{\[]
-      (fullname|name\sof\s(author|copyright\sowner))
-    [\>\}\]]/xi.freeze
+      /[\<\{\[]
+        (fullname|name\sof\s(author|copyright\sowner))
+      [\>\}\]]/xi.freeze
 
     # Get the list of the available license templates
     #

From 0ea017d99744ee3a7574535fad69cfc0686fd292 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 11:37:14 +0200
Subject: [PATCH 0876/1431] Enable Style/WhileUntilDo rubocop style cop

See #17478
---
 .rubocop.yml                              | 2 +-
 app/models/network/graph.rb               | 2 +-
 lib/gitlab/ci/build/artifacts/metadata.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..0edb07189d4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -705,7 +705,7 @@ Style/WhenThen:
 
 # Checks for redundant do after while or until.
 Style/WhileUntilDo:
-  Enabled: false
+  Enabled: true
 
 # Favor modifier while/until usage when you have a single-line body.
 Style/WhileUntilModifier:
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 9259cb1a0fa..ec32b509ee0 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -231,7 +231,7 @@ module Network
       reserved.uniq!
 
       space = space_default
-      while reserved.include?(space) do
+      while reserved.include?(space)
         space += space_step
         if space < space_base then
           space_step *= -1
diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb
index f2020c82d40..cd2e83b4c27 100644
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
@@ -56,7 +56,7 @@ module Gitlab
             child_pattern = '[^/]*/?$' unless @opts[:recursive]
             match_pattern = /^#{Regexp.escape(@path)}#{child_pattern}/
 
-            until gz.eof? do
+            until gz.eof?
               begin
                 path = read_string(gz).force_encoding('UTF-8')
                 meta = read_string(gz).force_encoding('UTF-8')

From 9d5f80e00b08fa75469fc8be1bb151308580de9a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 12:08:53 +0200
Subject: [PATCH 0877/1431] Enable Style/MethodDefParentheses rubocop cop

Use def with parentheses when there are parameters.

See #17478
---
 .rubocop.yml                                     | 2 +-
 app/controllers/omniauth_callbacks_controller.rb | 2 +-
 app/models/ci/build.rb                           | 2 +-
 app/models/project.rb                            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..19a47804964 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -330,7 +330,7 @@ Style/MethodCallParentheses:
 
 # Checks if the method definitions have or don't have parentheses.
 Style/MethodDefParentheses:
-  Enabled: false
+  Enabled: true
 
 # Use the configured style when naming methods.
 Style/MethodName:
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index df98f56a1cd..f35d631df0c 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -97,7 +97,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     handle_signup_error
   end
 
-  def handle_service_ticket provider, ticket
+  def handle_service_ticket(provider, ticket)
     Gitlab::OAuth::Session.create provider, ticket
     session[:service_tickets] ||= {}
     session[:service_tickets][provider] = ticket
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index ff7dd44c526..5e77fda70b9 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -286,7 +286,7 @@ module Ci
       project.runners_token
     end
 
-    def valid_token? token
+    def valid_token?(token)
       project.valid_runners_token? token
     end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index f3a56b86d5a..c1d9bae44c9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -946,13 +946,13 @@ class Project < ActiveRecord::Base
     shared_runners_enabled? && Ci::Runner.shared.active.any?(&block)
   end
 
-  def valid_runners_token? token
+  def valid_runners_token?(token)
     self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token)
   end
 
   # TODO (ayufan): For now we use runners_token (backward compatibility)
   # In 8.4 every build will have its own individual token valid for time of build
-  def valid_build_token? token
+  def valid_build_token?(token)
     self.builds_enabled? && self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token)
   end
 

From 7ee9b8e758cb4557afb083b78e56b39f16c0dc57 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 12:18:27 +0200
Subject: [PATCH 0878/1431] Enable Style/MultilineIfThen rubocop cop

Do not use then for multi-line if.

See #7478.
---
 .rubocop.yml                |  2 +-
 app/models/network/graph.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..5cbed9a4d3d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -362,7 +362,7 @@ Style/MultilineHashBraceLayout:
 
 # Do not use then for multi-line if/unless.
 Style/MultilineIfThen:
-  Enabled: false
+  Enabled: true
 
 # Checks that the closing brace in a method call is either on the same line as
 # the last method argument, or a new line.
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 9259cb1a0fa..c71c444a669 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -89,7 +89,7 @@ module Network
         end
       end
 
-      if self.class.max_count / 2 < offset then
+      if self.class.max_count / 2 < offset
         # get max index that commit is displayed in the center.
         offset - self.class.max_count / 2
       else
@@ -130,7 +130,7 @@ module Network
       commit.parents(@map).each do |parent|
         range = commit.time..parent.time
 
-        space = if commit.space >= parent.space then
+        space = if commit.space >= parent.space
                   find_free_parent_space(range, parent.space, -1, commit.space)
                 else
                   find_free_parent_space(range, commit.space, -1, parent.space)
@@ -144,7 +144,7 @@ module Network
     end
 
     def find_free_parent_space(range, space_base, space_step, space_default)
-      if is_overlap?(range, space_default) then
+      if is_overlap?(range, space_default)
         find_free_space(range, space_step, space_base, space_default)
       else
         space_default
@@ -155,7 +155,7 @@ module Network
       range.each do |i|
         if i != range.first &&
           i != range.last &&
-          @commits[i].spaces.include?(overlap_space) then
+          @commits[i].spaces.include?(overlap_space)
 
           return true;
         end
@@ -233,7 +233,7 @@ module Network
       space = space_default
       while reserved.include?(space) do
         space += space_step
-        if space < space_base then
+        if space < space_base
           space_step *= -1
           space = space_base + space_step
         end

From 86cf9dd2535adac3d739edbb845f7388e42f447d Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 12:34:25 +0200
Subject: [PATCH 0879/1431] Enable Lint/LiteralInCondition rubocop cop

Checks of literals used in conditions.

See #17478
---
 .rubocop.yml                                       |  2 +-
 app/models/ability.rb                              | 13 ++++++-------
 app/models/project_services/irker_service.rb       |  2 +-
 lib/gitlab/github_import/pull_request_formatter.rb |  5 ++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..6391b8336aa 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -878,7 +878,7 @@ Lint/InvalidCharacterLiteral:
 
 # Checks of literals used in conditions.
 Lint/LiteralInCondition:
-  Enabled: false
+  Enabled: true
 
 # Checks for literals used in interpolation.
 Lint/LiteralInInterpolation:
diff --git a/app/models/ability.rb b/app/models/ability.rb
index b354b1990c7..8c5b255223d 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -25,18 +25,17 @@ class Ability
 
     # List of possible abilities for anonymous user
     def anonymous_abilities(user, subject)
-      case true
-      when subject.is_a?(PersonalSnippet)
+      if subject.is_a?(PersonalSnippet)
         anonymous_personal_snippet_abilities(subject)
-      when subject.is_a?(ProjectSnippet)
+      elsif subject.is_a?(ProjectSnippet)
         anonymous_project_snippet_abilities(subject)
-      when subject.is_a?(CommitStatus)
+      elsif subject.is_a?(CommitStatus)
         anonymous_commit_status_abilities(subject)
-      when subject.is_a?(Project) || subject.respond_to?(:project)
+      elsif subject.is_a?(Project) || subject.respond_to?(:project)
         anonymous_project_abilities(subject)
-      when subject.is_a?(Group) || subject.respond_to?(:group)
+      elsif subject.is_a?(Group) || subject.respond_to?(:group)
         anonymous_group_abilities(subject)
-      when subject.is_a?(User)
+      elsif subject.is_a?(User)
         anonymous_user_abilities
       else
         []
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index 91015e6c9b1..2e5e854fc5e 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -70,7 +70,7 @@ class IrkerService < Service
   private
 
   def get_channels
-    return true unless :activated?
+    return true unless activated?
     return true if recipients.nil? || recipients.empty?
 
     map_recipients
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 574737b31c1..a2947b56ad9 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -79,10 +79,9 @@ module Gitlab
       end
 
       def state
-        @state ||= case true
-                   when raw_data.state == 'closed' && raw_data.merged_at.present?
+        @state ||= if raw_data.state == 'closed' && raw_data.merged_at.present?
                      'merged'
-                   when raw_data.state == 'closed'
+                   elsif raw_data.state == 'closed'
                      'closed'
                    else
                      'opened'

From a55e8f109fbaec1bb2db19a37a6537d8833c995c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 13:46:47 +0200
Subject: [PATCH 0880/1431] Enable Style/NegatedIf Rubocop cop

Favor `unless` over `if` for negative conditions
(or control flow ||).

See #17478
---
 .rubocop.yml                                  | 2 +-
 app/models/ci/runner.rb                       | 2 +-
 app/services/git_tag_push_service.rb          | 2 +-
 app/services/projects/housekeeping_service.rb | 2 +-
 config/initializers/1_settings.rb             | 2 +-
 lib/ci/gitlab_ci_yaml_processor.rb            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..10b6a07230e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -394,7 +394,7 @@ Style/MutableConstant:
 
 # Favor unless over if for negative conditions (or control flow or).
 Style/NegatedIf:
-  Enabled: false
+  Enabled: true
 
 # Favor until over while for negative conditions.
 Style/NegatedWhile:
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 6829dc91cb9..adb65292208 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -60,7 +60,7 @@ module Ci
     end
 
     def display_name
-      return short_sha unless !description.blank?
+      return short_sha if description.blank?
 
       description
     end
diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb
index 7410442609d..299a0a967b0 100644
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
@@ -23,7 +23,7 @@ class GitTagPushService < BaseService
     commits = []
     message = nil
 
-    if !Gitlab::Git.blank_ref?(params[:newrev])
+    unless Gitlab::Git.blank_ref?(params[:newrev])
       tag_name = Gitlab::Git.ref_name(params[:ref])
       tag = project.repository.find_tag(tag_name)
       if tag && tag.target == params[:newrev]
diff --git a/app/services/projects/housekeeping_service.rb b/app/services/projects/housekeeping_service.rb
index 3b7c36f0908..43db29315a1 100644
--- a/app/services/projects/housekeeping_service.rb
+++ b/app/services/projects/housekeeping_service.rb
@@ -22,7 +22,7 @@ module Projects
     end
 
     def execute
-      raise LeaseTaken if !try_obtain_lease
+      raise LeaseTaken unless try_obtain_lease
 
       GitlabShellOneShotWorker.perform_async(:gc, @project.path_with_namespace)
     ensure
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 124d63ce3ac..436751b9d16 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -52,7 +52,7 @@ class Settings < Settingslogic
     # check that values in `current` (string or integer) is a contant in `modul`.
     def verify_constant_array(modul, current, default)
       values = default || []
-      if !current.nil?
+      unless current.nil?
         values = []
         current.each do |constant|
           values.push(verify_constant(modul, constant, nil))
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index e4b4760c53b..026a5ac97ca 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -265,7 +265,7 @@ module Ci
     end
 
     def validate_job_dependencies!(name, job)
-      if !validate_array_of_strings(job[:dependencies])
+      unless validate_array_of_strings(job[:dependencies])
         raise ValidationError, "#{name} job: dependencies parameter should be an array of strings"
       end
 

From 0c6f04427b550a600cdd78a20ffe5c3b6602ff72 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 14:21:26 +0200
Subject: [PATCH 0881/1431] Enable Performance/TimesMap Rubocop cop

Use Array.new with a block instead of `.times.collect` / `.times.map`.

See #17478
---
 .rubocop.yml                                     | 3 +--
 spec/services/issues/bulk_update_service_spec.rb | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..d89112e7eb7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1027,10 +1027,9 @@ Performance/StartWith:
 Performance/StringReplacement:
   Enabled: true
 
-# TODO: Enable TimesMap Cop.
 # Checks for `.times.map` calls.
 Performance/TimesMap:
-  Enabled: false
+  Enabled: true
 
 
 ##################### Rails ##################################
diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index e91906d0d49..96f050bbd9b 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -15,9 +15,7 @@ describe Issues::BulkUpdateService, services: true do
   describe :close_issue do
 
     before do
-      @issues = 5.times.collect do
-        create(:issue, project: @project)
-      end
+      @issues = create_list(:issue, 5, project: @project)
       @params = {
         state_event: 'close',
         issues_ids: @issues.map(&:id)
@@ -36,11 +34,8 @@ describe Issues::BulkUpdateService, services: true do
   end
 
   describe :reopen_issues do
-
     before do
-      @issues = 5.times.collect do
-        create(:closed_issue, project: @project)
-      end
+      @issues = create_list(:closed_issue, 5, project: @project)
       @params = {
         state_event: 'reopen',
         issues_ids: @issues.map(&:id)

From 53bf080f676a70cfa18851727c42883fe3a83c55 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 14:36:28 +0200
Subject: [PATCH 0882/1431] Enable Style/SpaceBeforeComment rubocop cop

See #17478
---
 .rubocop.yml                      | 2 +-
 config/initializers/doorkeeper.rb | 2 +-
 lib/event_filter.rb               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..7c0f7d87cbd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -574,7 +574,7 @@ Style/SpaceBeforeComma:
 
 # Checks for missing space between code and a comment on the same line.
 Style/SpaceBeforeComment:
-  Enabled: false
+  Enabled: true
 
 # Checks that exactly one space is used between a method name and the first
 # argument for method calls without parentheses.
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 66ac88e9f4a..393ad909b45 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -71,7 +71,7 @@ Doorkeeper.configure do
   # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
   # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
   #
-  native_redirect_uri nil#'urn:ietf:wg:oauth:2.0:oob'
+  native_redirect_uri nil # 'urn:ietf:wg:oauth:2.0:oob'
 
   # Specify what grant flows are enabled in array of Strings. The valid
   # strings and the flows they enable are:
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index f15b2cfd231..668d2fa41b3 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -27,7 +27,7 @@ class EventFilter
     @params = if params
                 params.dup
               else
-                []#EventFilter.default_filter
+                [] # EventFilter.default_filter
               end
   end
 

From 2bb0eecb206c4c3345dcf4771c5ce8d60d91bc7f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 14:41:34 +0200
Subject: [PATCH 0883/1431] Enable Style/SpaceAfterMethodName rubocop cop

See #17478
---
 .rubocop.yml                             | 2 +-
 features/steps/project/merge_requests.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..b5a704f5334 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -541,7 +541,7 @@ Style/SpaceAfterComma:
 # Do not put a space between a method name and the opening parenthesis in a
 # method definition.
 Style/SpaceAfterMethodName:
-  Enabled: false
+  Enabled: true
 
 # Tracks redundant space after the ! operator.
 Style/SpaceAfterNot:
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index b2fa8750234..b30346790eb 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -567,7 +567,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     click_diff_line(sample_compare.changes[1][:line_code])
   end
 
-  def have_visible_content (text)
+  def have_visible_content(text)
     have_css("*", text: text, visible: true)
   end
 

From fdcb7e36859ed6cf2ce5cb1117391d791213e80e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 14:51:42 +0200
Subject: [PATCH 0884/1431] Enable Style/SpaceBeforeComma rubocop cop

No spaces before commas.

See #17478
---
 .rubocop.yml                |  2 +-
 app/models/network/graph.rb | 13 ++++++++++---
 config/routes.rb            |  8 ++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..27c69ffab2b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -570,7 +570,7 @@ Style/SpaceBeforeBlockBraces:
 
 # No spaces before commas.
 Style/SpaceBeforeComma:
-  Enabled: false
+  Enabled: true
 
 # Checks for missing space between code and a comment on the same line.
 Style/SpaceBeforeComment:
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 9259cb1a0fa..dd66d681c09 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -22,9 +22,16 @@ module Network
 
     def collect_notes
       h = Hash.new(0)
-      @project.notes.where('noteable_type = ?' ,"Commit").group('notes.commit_id').select('notes.commit_id, count(notes.id) as note_count').each do |item|
-        h[item.commit_id] = item.note_count.to_i
-      end
+
+      @project
+        .notes
+        .where('noteable_type = ?', 'Commit')
+        .group('notes.commit_id')
+        .select('notes.commit_id, count(notes.id) as note_count')
+        .each do |item|
+          h[item.commit_id] = item.note_count.to_i
+        end
+
       h
     end
 
diff --git a/config/routes.rb b/config/routes.rb
index 9a5d0074a0a..428302d0fd7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -421,7 +421,11 @@ Rails.application.routes.draw do
 
   resources :projects, constraints: { id: /[^\/]+/ }, only: [:index, :new, :create]
 
-  devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations , passwords: :passwords, sessions: :sessions, confirmations: :confirmations }
+  devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks,
+                                    registrations: :registrations,
+                                    passwords: :passwords,
+                                    sessions: :sessions,
+                                    confirmations: :confirmations }
 
   devise_scope :user do
     get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
@@ -789,7 +793,7 @@ Rails.application.routes.draw do
   end
 
   # Get all keys of user
-  get ':username.keys' => 'profiles/keys#get_keys' , constraints: { username: /.*/ }
+  get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: /.*/ }
 
   get ':id' => 'namespaces#show', constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
 end

From c370dce01c95ff3d2cf102f4bdcf8347e3764893 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 15:07:18 +0200
Subject: [PATCH 0885/1431] Enable Style/RedundantParentheses rubocop cop

See #17478
---
 .rubocop.yml                                                | 3 +--
 app/helpers/diff_helper.rb                                  | 4 ++--
 config/initializers/session_store.rb                        | 2 +-
 lib/api/users.rb                                            | 2 +-
 spec/controllers/projects/merge_requests_controller_spec.rb | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..59c6cf7b507 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -486,10 +486,9 @@ Style/RedundantException:
 Style/RedundantFreeze:
   Enabled: false
 
-# TODO: Enable RedundantParentheses Cop.
 # Checks for parentheses that seem not to serve any purpose.
 Style/RedundantParentheses:
-  Enabled: false
+  Enabled: true
 
 # Don't use return where it's not required.
 Style/RedundantReturn:
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index ea383f9b0f6..cbe47176831 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -39,11 +39,11 @@ module DiffHelper
   end
 
   def unfold_bottom_class(bottom)
-    (bottom) ? 'js-unfold-bottom' : ''
+    bottom ? 'js-unfold-bottom' : ''
   end
 
   def unfold_class(unfold)
-    (unfold) ? 'unfold js-unfold' : ''
+    unfold ? 'unfold js-unfold' : ''
   end
 
   def diff_line_content(line, line_type = nil)
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 599dabb9e50..0d9d87bac00 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -23,6 +23,6 @@ else
     secure: Gitlab.config.gitlab.https,
     httponly: true,
     expires_in: Settings.gitlab['session_expire_delay'] * 60,
-    path: (Rails.application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
+    path: Rails.application.config.relative_url_root.nil? ? '/' : Gitlab::Application.config.relative_url_root
   )
 end
diff --git a/lib/api/users.rb b/lib/api/users.rb
index ea6fa2dc8a8..8a376d3c2a3 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -76,7 +76,7 @@ module API
         required_attributes! [:email, :password, :name, :username]
         attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :projects_limit, :username, :bio, :location, :can_create_group, :admin, :confirm, :external]
         admin = attrs.delete(:admin)
-        confirm = !(attrs.delete(:confirm) =~ (/(false|f|no|0)$/i))
+        confirm = !(attrs.delete(:confirm) =~ /(false|f|no|0)$/i)
         user = User.build_user(attrs)
         user.admin = admin unless admin.nil?
         user.skip_confirmation! unless confirm
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index c0a1f45195f..4f621a43d7e 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -63,7 +63,7 @@ describe Projects::MergeRequestsController do
             id: merge_request.iid,
             format: format)
 
-        expect(response.body).to eq((merge_request.send(:"to_#{format}")).to_s)
+        expect(response.body).to eq(merge_request.send(:"to_#{format}").to_s)
       end
 
       it "should not escape Html" do

From 7ec1fa212d23911792674e947863f3e71f91834f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 30 May 2016 16:57:39 +0200
Subject: [PATCH 0886/1431] Make authentication service for Container Registry
 to be compatible with < Docker 1.11

---
 CHANGELOG                                     |  1 +
 app/controllers/jwt_controller.rb             |  2 +-
 ...ntainer_registry_authentication_service.rb |  4 +-
 ...er_registry_authentication_service_spec.rb | 46 +++++++------------
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e8b0a2af01..a32fa90453e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.9.0 (unreleased)
   - Remove 'main language' feature
   - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
+  - Make authentication service for Container Registry to be compatible with < Docker 1.11
 
 v 8.8.3
   - Fix gitlab importer failing to import new projects due to missing credentials
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 156ab2811d6..cee3b6c43e7 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -32,7 +32,7 @@ class JwtController < ApplicationController
   end
 
   def auth_params
-    params.permit(:service, :scope, :offline_token, :account, :client_id)
+    params.permit(:service, :scope, :account, :client_id)
   end
 
   def authenticate_project(login, password)
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 2bbab643e69..5090bd8f6e6 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -5,9 +5,7 @@ module Auth
     def execute
       return error('not found', 404) unless registry.enabled
 
-      if params[:offline_token]
-        return error('unauthorized', 401) unless current_user || project
-      else
+      unless current_user || project
         return error('forbidden', 403) unless scope
       end
 
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 98ef9d21035..2d114f59ca4 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -14,7 +14,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     allow_any_instance_of(JSONWebToken::RSAToken).to receive(:key).and_return(rsa_key)
   end
 
-  shared_examples 'an authenticated' do
+  shared_examples 'a valid token' do
     it { is_expected.to include(:token) }
     it { expect(payload).to include('access') }
   end
@@ -28,10 +28,15 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
        }]
     end
 
-    it_behaves_like 'an authenticated'
+    it_behaves_like 'a valid token'
     it { expect(payload).to include('access' => access) }
   end
 
+  shared_examples 'an inaccessible' do
+    it_behaves_like 'a valid token'
+    it { expect(payload).to include('access' => []) }
+  end
+
   shared_examples 'a pullable' do
     it_behaves_like 'a accessible' do
       let(:actions) { ['pull'] }
@@ -50,11 +55,6 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     end
   end
 
-  shared_examples 'an unauthorized' do
-    it { is_expected.to include(http_status: 401) }
-    it { is_expected.not_to include(:token) }
-  end
-
   shared_examples 'a forbidden' do
     it { is_expected.to include(http_status: 403) }
     it { is_expected.not_to include(:token) }
@@ -75,12 +75,8 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     let(:project) { create(:project) }
     let(:current_user) { create(:user) }
 
-    context 'allow to use offline_token' do
-      let(:current_params) do
-        { offline_token: true }
-      end
-
-      it_behaves_like 'an authenticated'
+    context 'allow to use scope-less authentication' do
+      it_behaves_like 'a valid token'
     end
 
     context 'allow developer to push images' do
@@ -120,19 +116,15 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
         { scope: "repository:#{project.path_with_namespace}:pull,push" }
       end
 
-      it_behaves_like 'a forbidden'
+      it_behaves_like 'an inaccessible'
     end
   end
 
   context 'project authorization' do
     let(:current_project) { create(:empty_project) }
 
-    context 'allow to use offline_token' do
-      let(:current_params) do
-        { offline_token: true }
-      end
-
-      it_behaves_like 'an authenticated'
+    context 'allow to use scope-less authentication' do
+      it_behaves_like 'a valid token'
     end
 
     context 'allow to pull and push images' do
@@ -158,7 +150,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for private' do
           let(:project) { create(:empty_project, :private) }
-          it_behaves_like 'a forbidden'
+          it_behaves_like 'an inaccessible'
         end
       end
 
@@ -169,7 +161,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
 
         context 'disallow for all' do
           let(:project) { create(:empty_project, :public) }
-          it_behaves_like 'a forbidden'
+          it_behaves_like 'an inaccessible'
         end
       end
     end
@@ -184,18 +176,14 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
           { scope: "repository:#{project.path_with_namespace}:pull" }
         end
 
-        it_behaves_like 'a forbidden'
+        it_behaves_like 'an inaccessible'
       end
     end
   end
 
   context 'unauthorized' do
-    context 'disallow to use offline_token' do
-      let(:current_params) do
-        { offline_token: true }
-      end
-
-      it_behaves_like 'an unauthorized'
+    context 'disallow to use scope-less authentication' do
+      it_behaves_like 'a forbidden'
     end
 
     context 'for invalid scope' do

From aeb5262d427e1b61ded71cc4a20e8e2a7a0089ef Mon Sep 17 00:00:00 2001
From: Long Nguyen <long.polyglot@gmail.com>
Date: Mon, 30 May 2016 22:32:07 +0700
Subject: [PATCH 0887/1431] Add changelog and code refactor

---
 CHANGELOG                            | 1 +
 app/models/members/project_member.rb | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e8b0a2af01..91038532e99 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.9.0 (unreleased)
+  - Fix issue todo not remove when leave project !4150 (Long Nguyen)
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
   - Redesign navigation for project pages
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 5c167db76b1..46955b430f3 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -14,7 +14,7 @@ class ProjectMember < Member
   scope :in_projects, ->(projects) { where(source_id: projects.pluck(:id)) }
   scope :with_user, ->(user) { where(user_id: user.id) }
 
-  before_destroy { user.todos.where(project_id: source_id).each(&:destroy) if user }
+  before_destroy :delete_member_todos
 
   class << self
 
@@ -103,6 +103,10 @@ class ProjectMember < Member
 
   private
 
+  def delete_member_todos
+    user.todos.where(project_id: source_id).destroy_all if user
+  end
+
   def send_invite
     notification_service.invite_project_member(self, @raw_invite_token)
 

From b0a2bf08498c5be0f8da9251d5cfff48b801f297 Mon Sep 17 00:00:00 2001
From: Arian Sameni <arian.sameni@encifra.net>
Date: Mon, 30 May 2016 17:46:54 +0200
Subject: [PATCH 0888/1431] Fix 18009: add missing steps in update docs

---
 doc/update/8.6-to-8.7.md |  8 ++++++++
 doc/update/8.7-to-8.8.md | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/update/8.6-to-8.7.md b/doc/update/8.6-to-8.7.md
index 4a2c6ea91d2..bb463d43a7c 100644
--- a/doc/update/8.6-to-8.7.md
+++ b/doc/update/8.6-to-8.7.md
@@ -86,6 +86,14 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
 
 ### 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-6-stable:config/gitlab.yml.example origin/8-7-stable:config/gitlab.yml.example
+```
+
 #### Git configuration
 
 Disable `git gc --auto` because GitLab runs `git gc` for us already.
diff --git a/doc/update/8.7-to-8.8.md b/doc/update/8.7-to-8.8.md
index b4d9212289c..32906650f6f 100644
--- a/doc/update/8.7-to-8.8.md
+++ b/doc/update/8.7-to-8.8.md
@@ -86,6 +86,14 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
 
 ### 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-7-stable:config/gitlab.yml.example origin/8-8-stable:config/gitlab.yml.example
+```
+
 #### Git configuration
 
 Disable `git gc --auto` because GitLab runs `git gc` for us already.
@@ -137,7 +145,7 @@ To make sure you didn't miss anything run a more thorough check:
 
 If all items are green, then congratulations, the upgrade is complete!
 
-## Things went south? Revert to previous version (8.6)
+## Things went south? Revert to previous version (8.7)
 
 ### 1. Revert the code to the previous version
 

From e3311178a3ea877740f842b4145372623d553d4b Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Fri, 13 May 2016 00:25:33 -0300
Subject: [PATCH 0889/1431] Add Admin UI to enable Wiki Page events webhook in
 projects

---
 app/controllers/projects/hooks_controller.rb     | 3 ++-
 app/views/projects/hooks/_project_hook.html.haml | 2 +-
 app/views/projects/hooks/index.html.haml         | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 47524b1cf0b..a60027ff477 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -63,7 +63,8 @@ class Projects::HooksController < Projects::ApplicationController
       :push_events,
       :tag_push_events,
       :token,
-      :url
+      :url,
+      :wiki_page_events
     )
   end
 end
diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/hooks/_project_hook.html.haml
index 62eba5888a4..8151187d499 100644
--- a/app/views/projects/hooks/_project_hook.html.haml
+++ b/app/views/projects/hooks/_project_hook.html.haml
@@ -3,7 +3,7 @@
     .col-md-8.col-lg-7
       %strong.light-header= hook.url
       %div
-        - %w(push_events tag_push_events issues_events note_events merge_requests_events build_events).each do |trigger|
+        - %w(push_events tag_push_events issues_events note_events merge_requests_events build_events wiki_page_events).each do |trigger|
           - if hook.send(trigger)
             %span.label.label-gray.deploy-project-label= trigger.titleize
     .col-md-4.col-lg-5.text-right-lg.prepend-top-5
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index cffe9a01a96..e4092f761d8 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -64,6 +64,13 @@
               Build events
             %p.light
               This url will be triggered when the build status changes
+        %div
+          = f.check_box :wiki_page_events, class: 'pull-left'
+          .prepend-left-20
+            = f.label :wiki_page_events, class: 'label-light append-bottom-0' do
+              %strong Wiki Page events
+            %p.light
+              This url will be triggered when a wiki page is created/updated
       .form-group
         = f.label :enable_ssl_verification, "SSL verification", class: "label-light"
         %div

From 6506a9dd4433a261531613b344c3307159cd7d72 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Fri, 13 May 2016 00:40:43 -0300
Subject: [PATCH 0890/1431] Added documentation to current Wiki Page event
 webhook

---
 doc/web_hooks/web_hooks.md | 54 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 45506ac1d7c..0777463def5 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -695,6 +695,60 @@ X-Gitlab-Event: Merge Request Hook
 }
 ```
 
+## Wiki Page events
+
+Triggered when a wiki page is created or edited.
+
+**Request Header**:
+
+```
+X-Gitlab-Event: Wiki Page Hook
+```
+
+**Request Body**:
+
+```json
+{
+  "object_kind": "wiki_page",
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon"
+  },
+  "project": {
+    "name": "awesome-project",
+    "description": "This is awesome",
+    "web_url": "http://example.com/root/awesome-project",
+    "avatar_url": null,
+    "git_ssh_url": "git@example.com:root/test-project.git",
+    "git_http_url": "http://example.com/root/awesome-project.git",
+    "namespace": "root",
+    "visibility_level": 0,
+    "path_with_namespace": "root/awesome-project",
+    "default_branch": "master",
+    "homepage": "http://example.com/root/awesome-project",
+    "url": "git@example.com:root/awesome-project.git",
+    "ssh_url": "git@example.com:root/awesome-project.git",
+    "http_url": "http://example.com/root/awesome-project.git"
+  },
+  "object_attributes": {
+    "title": "Awesome",
+    "content": "awesome content goes here",
+    "format": "markdown",
+    "message": "adding an awesome page to the wiki",
+    "slug": "awesome",
+    "url": "http://example.com/root/awesome-project/wikis/awesome",
+    "action": "create"
+  },
+  "repository": {
+    "name": "awesome-project",
+    "url": "git@example.com:root/awesome-project.git",
+    "description": "test",
+    "homepage": "http://example.com/root/awesome-project"
+  }
+}
+```
+
 #### Example webhook receiver
 
 If you want to see GitLab's webhooks in action for testing purposes you can use

From d47b2b92c9b5e80eb3430e2b4950e17646b8efd8 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 19 May 2016 13:52:08 -0500
Subject: [PATCH 0891/1431] Upgrade devise and devise-two-factor, remove
 devise-async

Devise (3.5.4 => 4.1.1) Changelog:
https://github.com/plataformatec/devise/blob/master/CHANGELOG.md

devise-two-factor (2.0.1 => 3.0.0) Changelog:
https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md

These are reliant on each other, so they have to be upgraded together.

devise-async is no longer necessary as Devise 4.1 fixes a bug with the
ActiveJob integration.
---
 Gemfile                                   |  5 ++---
 Gemfile.lock                              | 26 ++++++++++-------------
 app/controllers/application_controller.rb |  2 +-
 app/models/user.rb                        |  2 +-
 config/initializers/devise_async.rb       |  1 -
 5 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 config/initializers/devise_async.rb

diff --git a/Gemfile b/Gemfile
index b897dc0a741..98a594be1c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,9 +18,8 @@ gem "mysql2", '~> 0.3.16', group: :mysql
 gem "pg", '~> 0.18.2', group: :postgres
 
 # Authentication libraries
-gem 'devise',                 '~> 3.5.4'
+gem 'devise',                 '~> 4.0'
 gem 'doorkeeper',             '~> 3.1'
-gem 'devise-async',           '~> 0.9.0'
 gem 'omniauth',               '~> 1.3.1'
 gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
@@ -43,7 +42,7 @@ gem 'recaptcha', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
 
 # Two-factor authentication
-gem 'devise-two-factor', '~> 2.0.0'
+gem 'devise-two-factor', '~> 3.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
 gem 'attr_encrypted', '~> 1.3.4'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fa2b72b2524..30a0a2fd183 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,7 +73,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
     base32 (0.3.2)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     benchmark-ips (2.3.0)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
@@ -155,21 +155,18 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.4)
+    devise (4.1.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-async (0.9.0)
-      devise (~> 3.2)
-    devise-two-factor (2.0.1)
+    devise-two-factor (3.0.0)
       activesupport
-      attr_encrypted (~> 1.3.2)
-      devise (~> 3.5.0)
+      attr_encrypted (>= 1.3, < 4, != 2)
+      devise (~> 4.0)
       railties
-      rotp (~> 2)
+      rotp (~> 2.0)
     diff-lcs (1.2.5)
     diffy (3.0.7)
     docile (1.1.5)
@@ -656,7 +653,7 @@ GEM
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)
     rinku (1.7.3)
-    rotp (2.1.1)
+    rotp (2.1.2)
     rouge (1.10.1)
     rqrcode (0.7.0)
       chunky_png
@@ -859,7 +856,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.4)
+    warden (1.2.6)
       rack (>= 1.0)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -919,9 +916,8 @@ DEPENDENCIES
   d3_rails (~> 3.5.0)
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
-  devise (~> 3.5.4)
-  devise-async (~> 0.9.0)
-  devise-two-factor (~> 2.0.0)
+  devise (~> 4.0)
+  devise-two-factor (~> 3.0.0)
   diffy (~> 3.0.3)
   doorkeeper (~> 3.1)
   dropzonejs-rails (~> 0.7.1)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1429ee40bb7..144febcea12 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -232,7 +232,7 @@ class ApplicationController < ActionController::Base
   end
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password, :login, :remember_me, :otp_attempt) }
+    devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :email, :password, :login, :remember_me, :otp_attempt])
   end
 
   def hexdigest(string)
diff --git a/app/models/user.rb b/app/models/user.rb
index 6a09b78455b..b5f478b3865 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -27,7 +27,7 @@ class User < ActiveRecord::Base
   devise :two_factor_backupable, otp_number_of_backup_codes: 10
   serialize :otp_backup_codes, JSON
 
-  devise :lockable, :async, :recoverable, :rememberable, :trackable,
+  devise :lockable, :recoverable, :rememberable, :trackable,
     :validatable, :omniauthable, :confirmable, :registerable
 
   attr_accessor :force_random_password
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
deleted file mode 100644
index 05a1852cdbd..00000000000
--- a/config/initializers/devise_async.rb
+++ /dev/null
@@ -1 +0,0 @@
-Devise::Async.backend = :sidekiq

From d287315dbf1a1493e3f2c2511e559204cc914ff8 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 19 May 2016 13:55:25 -0500
Subject: [PATCH 0892/1431] Upgrade attr_encrypted and encryptor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

attr_encrypted (1.3.4 => 3.0.1) Changelog:
https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m
d

attr_encrypted 2.x included a vulnerability, so that major version is
skipped. 3.x requires that the algorithm and mode used by each
encrypted attribute is specified explicitly.

`nil` is no longer a valid value for the encrypted_value_iv field, so
it’s changed to a randomly generated string.
---
 Gemfile                           | 2 +-
 Gemfile.lock                      | 8 ++++----
 app/models/ci/variable.rb         | 5 ++++-
 app/models/project_import_data.rb | 3 ++-
 app/models/user.rb                | 5 +++++
 spec/features/login_spec.rb       | 2 +-
 spec/models/ci/variable_spec.rb   | 2 +-
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 98a594be1c7..268cba1d6d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,7 @@ gem 'akismet', '~> 2.0'
 # Two-factor authentication
 gem 'devise-two-factor', '~> 3.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 1.3.4'
+gem 'attr_encrypted', '~> 3.0.0'
 
 # Browser detection
 gem "browser", '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 30a0a2fd183..7c873845cc3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,8 +60,8 @@ GEM
       oauth2 (~> 1.0)
     asciidoctor (1.5.3)
     ast (2.2.0)
-    attr_encrypted (1.3.4)
-      encryptor (>= 1.3.0)
+    attr_encrypted (3.0.1)
+      encryptor (~> 3.0.0)
     attr_required (1.0.0)
     autoprefixer-rails (6.2.3)
       execjs
@@ -178,7 +178,7 @@ GEM
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
-    encryptor (1.3.0)
+    encryptor (3.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
     escape_utils (1.1.1)
@@ -891,7 +891,7 @@ DEPENDENCIES
   allocations (~> 1.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
-  attr_encrypted (~> 1.3.4)
+  attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 10802f64813..f8d5d4486fd 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -11,6 +11,9 @@ module Ci
       format: { with: /\A[a-zA-Z0-9_]+\z/,
                 message: "can contain only letters, digits and '_'." }
 
-    attr_encrypted :value, mode: :per_attribute_iv_and_salt, key: Gitlab::Application.secrets.db_key_base
+    attr_encrypted :value, 
+       mode: :per_attribute_iv_and_salt,
+       key: Gitlab::Application.secrets.db_key_base,
+       algorithm: 'aes-256-cbc'
   end
 end
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index e2f9ffb69ac..ca8a9b4217b 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -6,7 +6,8 @@ class ProjectImportData < ActiveRecord::Base
                  key: Gitlab::Application.secrets.db_key_base,
                  marshal: true,
                  encode: true,
-                 mode: :per_attribute_iv_and_salt
+                 mode: :per_attribute_iv_and_salt,
+                 algorithm: 'aes-256-cbc'
 
   serialize :data, JSON
 
diff --git a/app/models/user.rb b/app/models/user.rb
index b5f478b3865..15b6cbc2255 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -20,6 +20,11 @@ class User < ActiveRecord::Base
   default_value_for :hide_no_password, false
   default_value_for :theme_id, gitlab_config.default_theme
 
+  attr_encrypted :otp_secret,
+    key:       Gitlab::Application.config.secret_key_base,
+    mode:      :per_attribute_iv_and_salt,
+    algorithm: 'aes-256-cbc'
+
   devise :two_factor_authenticatable,
          otp_secret_encryption_key: Gitlab::Application.config.secret_key_base
   alias_attribute :two_factor_enabled, :otp_required_for_login
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 8c38dd5b122..54dcc50f4a2 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -121,7 +121,7 @@ feature 'Login', feature: true do
       user = create(:user, password: 'not-the-default')
 
       login_with(user)
-      expect(page).to have_content('Invalid login or password.')
+      expect(page).to have_content('Invalid Login or password.')
     end
   end
 
diff --git a/spec/models/ci/variable_spec.rb b/spec/models/ci/variable_spec.rb
index c712d211b0f..98f60087cf5 100644
--- a/spec/models/ci/variable_spec.rb
+++ b/spec/models/ci/variable_spec.rb
@@ -23,7 +23,7 @@ describe Ci::Variable, models: true do
     end
 
     it 'fails to decrypt if iv is incorrect' do
-      subject.encrypted_value_iv = nil
+      subject.encrypted_value_iv = SecureRandom.hex
       subject.instance_variable_set(:@value, nil)
       expect { subject.value }.
         to raise_error(OpenSSL::Cipher::CipherError, 'bad decrypt')

From 5647fb14b6d638bb168014e997ecd2d29175249f Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 19 May 2016 17:36:50 -0500
Subject: [PATCH 0893/1431] Fix a broken spec

Temporary fix until Devise 4 fixes this grammar issue:
https://github.com/plataformatec/devise/issues/4095
---
 spec/controllers/sessions_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index ab57c52c7cd..2b2dbeec41d 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -12,7 +12,7 @@ describe SessionsController do
           post(:create, user: { login: 'invalid', password: 'invalid' })
 
           expect(response)
-            .to set_flash.now[:alert].to /Invalid login or password/
+            .to set_flash.now[:alert].to /Invalid Login or password/
         end
       end
 

From ab17e4b74f0c607c4ddd4c160e2848819170551c Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Mon, 30 May 2016 17:41:27 -0300
Subject: [PATCH 0894/1431] Small fixes and added to the changelog

---
 CHANGELOG                                | 1 +
 app/views/projects/hooks/index.html.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e8b0a2af01..2dadbf7d502 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.9.0 (unreleased)
+  - Allow enabling wiki page events from Webhook management UI
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
   - Redesign navigation for project pages
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index e4092f761d8..917a0b805b1 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -68,7 +68,7 @@
           = f.check_box :wiki_page_events, class: 'pull-left'
           .prepend-left-20
             = f.label :wiki_page_events, class: 'label-light append-bottom-0' do
-              %strong Wiki Page events
+              Wiki Page events
             %p.light
               This url will be triggered when a wiki page is created/updated
       .form-group

From ccb20c1622b30eeec5951bbe6431a3df53dfe7ed Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 30 May 2016 18:53:07 -0600
Subject: [PATCH 0895/1431] Remove unnecessary vendor prefixes for browsers we
 no longer support.

---
 app/assets/stylesheets/framework/mixins.scss | 8 --------
 app/assets/stylesheets/pages/builds.scss     | 7 +------
 app/assets/stylesheets/pages/search.scss     | 2 --
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 250d6309291..828e7224231 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -2,18 +2,10 @@
  * Generic mixins
  */
 @mixin box-shadow($shadow) {
-  -webkit-box-shadow: $shadow;
-  -moz-box-shadow: $shadow;
-  -ms-box-shadow: $shadow;
-  -o-box-shadow: $shadow;
   box-shadow: $shadow;
 }
 
 @mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  -ms-border-radius: $radius;
-  -o-border-radius: $radius;
   border-radius: $radius;
 }
 
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index aa41565f812..44222e8e8a4 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -3,12 +3,7 @@
     background: #111;
     color: #fff;
     font-family: $monospace_font;
-    white-space: pre;
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    white-space: pre-wrap;
     overflow: auto;
     overflow-y: hidden;
     font-size: 12px;
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 2bff70c8c64..ed8fcf84f54 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -156,13 +156,11 @@
 .search-holder {
   @media (min-width: $screen-sm-min) {
     display: -webkit-flex;
-    display: -ms-flexbox;
     display: flex;
   }
 
   .search-field-holder {
     -webkit-flex: 1 0 auto;
-    -ms-flex: 1 0 auto;
     flex: 1 0 auto;
     position: relative;
     margin-right: 0;

From a602df303175aaaf1d5b60a2c009f5e259d187db Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 30 May 2016 22:17:26 -0400
Subject: [PATCH 0896/1431] Pass the "Remember me" value to the 2FA token form

Prior, if a user had 2FA enabled and checked the "Remember me" field,
the setting was ignored because the OTP input was on a new form and the
value was never passed.

Closes #18000
---
 app/controllers/sessions_controller.rb        |  2 ++
 .../devise/sessions/two_factor.html.haml      |  1 +
 spec/controllers/sessions_controller_spec.rb  | 21 +++++++++++++++++++
 spec/features/login_spec.rb                   |  8 ++++++-
 spec/support/login_helpers.rb                 |  6 ++++--
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index c29f4609e93..d68c2a708e3 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,5 +1,6 @@
 class SessionsController < Devise::SessionsController
   include AuthenticatesWithTwoFactor
+  include Devise::Controllers::Rememberable
   include Recaptcha::ClientHelper
 
   skip_before_action :check_2fa_requirement, only: [:destroy]
@@ -96,6 +97,7 @@ class SessionsController < Devise::SessionsController
         # Remove any lingering user data from login
         session.delete(:otp_user_id)
 
+        remember_me(user) if user_params[:remember_me] == '1'
         sign_in(user) and return
       else
         flash.now[:alert] = 'Invalid two-factor code.'
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index c9d1e454a5e..8c6a1552a53 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -4,6 +4,7 @@
       %h3 Two-factor Authentication
     .login-body
       = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
+        = f.hidden_field :remember_me, value: params[resource_name][:remember_me]
         = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor Authentication code', required: true, autofocus: true
         %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
         .prepend-top-20
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index ab57c52c7cd..b39d8c8cd5b 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -35,6 +35,27 @@ describe SessionsController do
         post(:create, { user: user_params }, { otp_user_id: user.id })
       end
 
+      context 'remember_me field' do
+        it 'sets a remember_user_token cookie when enabled' do
+          allow(controller).to receive(:find_user).and_return(user)
+          expect(controller).
+            to receive(:remember_me).with(user).and_call_original
+
+          authenticate_2fa(remember_me: '1', otp_attempt: user.current_otp)
+
+          expect(response.cookies['remember_user_token']).to be_present
+        end
+
+        it 'does nothing when disabled' do
+          allow(controller).to receive(:find_user).and_return(user)
+          expect(controller).not_to receive(:remember_me)
+
+          authenticate_2fa(remember_me: '0', otp_attempt: user.current_otp)
+
+          expect(response.cookies['remember_user_token']).to be_nil
+        end
+      end
+
       ##
       # See #14900 issue
       #
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 8c38dd5b122..a7dc3b2701b 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -32,7 +32,7 @@ feature 'Login', feature: true do
       let(:user) { create(:user, :two_factor) }
 
       before do
-        login_with(user)
+        login_with(user, remember: true)
         expect(page).to have_content('Two-factor Authentication')
       end
 
@@ -52,6 +52,12 @@ feature 'Login', feature: true do
           expect(current_path).to eq root_path
         end
 
+        it 'persists remember_me value via hidden field' do
+          field = first('input#user_remember_me', visible: false)
+
+          expect(field.value).to eq '1'
+        end
+
         it 'blocks login with invalid code' do
           enter_code('foo')
           expect(page).to have_content('Invalid two-factor code')
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index cd9fdc6f18e..7a0f078c72b 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -26,11 +26,13 @@ module LoginHelpers
 
   # Internal: Login as the specified user
   #
-  # user - User instance to login with
-  def login_with(user)
+  # user     - User instance to login with
+  # remember - Whether or not to check "Remember me" (default: false)
+  def login_with(user, remember: false)
     visit new_user_session_path
     fill_in "user_login", with: user.email
     fill_in "user_password", with: "12345678"
+    check 'user_remember_me' if remember
     click_button "Sign in"
     Thread.current[:current_user] = user
   end

From 7edbce65b0cd8c420707904a6733c84fadf5d224 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 30 May 2016 23:05:02 -0400
Subject: [PATCH 0897/1431] Add tooltips to todo target links

---
 app/helpers/todos_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index b9d7edb4185..b4923fbb138 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -17,7 +17,9 @@ module TodosHelper
 
   def todo_target_link(todo)
     target = todo.target_type.titleize.downcase
-    link_to "#{target} #{todo.target_reference}", todo_target_path(todo), { title: todo.target.title }
+    link_to "#{target} #{todo.target_reference}", todo_target_path(todo),
+      class: 'has-tooltip',
+      title: todo.target.title
   end
 
   def todo_target_path(todo)

From 7c4acf0068b742a4838c1f515ff74ba3c99ddd70 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 30 May 2016 23:10:30 -0400
Subject: [PATCH 0898/1431] Add tooltips for common Event feed entries

This adds tooltips to the event target for events like "opened merge
request !XYZ"
---
 app/views/events/event/_common.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index f9f623cc031..c7f29f2fc0e 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -4,7 +4,7 @@
     = event_action_name(event)
 
   - if event.target
-    %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target], title: event.target_title
+    %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title
 
   = event_preposition(event)
 

From 2f1a229d15539c616820483abe37f21e25942f36 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 12:00:42 +0200
Subject: [PATCH 0899/1431] Remove redundant factory namespace in build specs

Conflicts:
	spec/models/build_spec.rb
---
 spec/models/build_spec.rb | 42 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 55b7af441d6..5c6c30c20ea 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -1,18 +1,17 @@
 require 'spec_helper'
 
 describe Ci::Build, models: true do
-  let(:project) { FactoryGirl.create :project }
-  let(:commit) { FactoryGirl.create :ci_commit, project: project }
-  let(:build) { FactoryGirl.create :ci_build, commit: commit }
+  let(:project) { create(:project) }
+  let(:commit) { create(:ci_commit, project: project) }
+  let(:build) { create(:ci_build, commit: commit) }
 
   it { is_expected.to validate_presence_of :ref }
 
   it { is_expected.to respond_to :trace_html }
 
   describe '#first_pending' do
-    let(:first) { FactoryGirl.create :ci_build, commit: commit, status: 'pending', created_at: Date.yesterday }
-    let(:second) { FactoryGirl.create :ci_build, commit: commit, status: 'pending' }
-    before { first; second }
+    let!(:first) { create(:ci_build, commit: commit, status: 'pending', created_at: Date.yesterday) }
+    let!(:second) { create(:ci_build, commit: commit, status: 'pending') }
     subject { Ci::Build.first_pending }
 
     it { is_expected.to be_a(Ci::Build) }
@@ -219,8 +218,8 @@ describe Ci::Build, models: true do
         it { is_expected.to eq(predefined_variables + yaml_variables + secure_variables) }
 
         context 'and trigger variables' do
-          let(:trigger) { FactoryGirl.create :ci_trigger, project: project }
-          let(:trigger_request) { FactoryGirl.create :ci_trigger_request_with_variables, commit: commit, trigger: trigger }
+          let(:trigger) { create(:ci_trigger, project: project) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
@@ -329,7 +328,7 @@ describe Ci::Build, models: true do
     end
 
     context 'if there are runner' do
-      let(:runner) { FactoryGirl.create :ci_runner }
+      let(:runner) { create(:ci_runner) }
 
       before do
         build.project.runners << runner
@@ -366,7 +365,7 @@ describe Ci::Build, models: true do
         it { is_expected.to be_truthy }
 
         context "and there are specific runner" do
-          let(:runner) { FactoryGirl.create :ci_runner, contacted_at: 1.second.ago }
+          let(:runner) { create(:ci_runner, contacted_at: 1.second.ago) }
 
           before do
             build.project.runners << runner
@@ -415,7 +414,7 @@ describe Ci::Build, models: true do
   end
 
   describe '#repo_url' do
-    let(:build) { FactoryGirl.create :ci_build }
+    let(:build) { create(:ci_build) }
     let(:project) { build.project }
 
     subject { build.repo_url }
@@ -429,10 +428,10 @@ describe Ci::Build, models: true do
   end
 
   describe '#depends_on_builds' do
-    let!(:build) { FactoryGirl.create :ci_build, commit: commit, name: 'build', stage_idx: 0, stage: 'build' }
-    let!(:rspec_test) { FactoryGirl.create :ci_build, commit: commit, name: 'rspec', stage_idx: 1, stage: 'test' }
-    let!(:rubocop_test) { FactoryGirl.create :ci_build, commit: commit, name: 'rubocop', stage_idx: 1, stage: 'test' }
-    let!(:staging) { FactoryGirl.create :ci_build, commit: commit, name: 'staging', stage_idx: 2, stage: 'deploy' }
+    let!(:build) { create(:ci_build, commit: commit, name: 'build', stage_idx: 0, stage: 'build') }
+    let!(:rspec_test) { create(:ci_build, commit: commit, name: 'rspec', stage_idx: 1, stage: 'test') }
+    let!(:rubocop_test) { create(:ci_build, commit: commit, name: 'rubocop', stage_idx: 1, stage: 'test') }
+    let!(:staging) { create(:ci_build, commit: commit, name: 'staging', stage_idx: 2, stage: 'deploy') }
 
     it 'to have no dependents if this is first build' do
       expect(build.depends_on_builds).to be_empty
@@ -453,11 +452,10 @@ describe Ci::Build, models: true do
   end
 
   def create_mr(build, commit, factory: :merge_request, created_at: Time.now)
-    FactoryGirl.create(factory,
-                       source_project_id: commit.gl_project_id,
-                       target_project_id: commit.gl_project_id,
-                       source_branch: build.ref,
-                       created_at: created_at)
+    create(factory, source_project_id: commit.gl_project_id,
+                    target_project_id: commit.gl_project_id,
+                    source_branch: build.ref,
+                    created_at: created_at)
   end
 
   describe '#merge_request' do
@@ -501,8 +499,8 @@ describe Ci::Build, models: true do
     context 'when a Build is created after the MR' do
       before do
         @merge_request = create_mr(build, commit, factory: :merge_request_with_diffs)
-        commit2 = FactoryGirl.create :ci_commit, project: project
-        @build2 = FactoryGirl.create :ci_build, commit: commit2
+        commit2 = create(:ci_commit, project: project)
+        @build2 = create(:ci_build, commit: commit2)
 
         commits = [double(id: commit.sha), double(id: commit2.sha)]
         allow(@merge_request).to receive(:commits).and_return(commits)

From 846d111f1d07e62e295ea778b85ada9088be2f31 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 30 May 2016 17:12:50 +0200
Subject: [PATCH 0900/1431] Add Application Setting to configure Container
 Registry token expire delay (default 5min)

---
 CHANGELOG                                     |  1 +
 .../admin/application_settings_controller.rb  |  1 +
 app/models/application_setting.rb             |  7 +++++-
 ...ntainer_registry_authentication_service.rb |  3 +++
 .../application_settings/_form.html.haml      |  8 +++++++
 ...en_expire_delay_to_application_settings.rb | 24 +++++++++++++++++++
 doc/api/settings.md                           |  7 ++++--
 lib/api/entities.rb                           |  1 +
 lib/gitlab/current_settings.rb                |  1 +
 9 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb

diff --git a/CHANGELOG b/CHANGELOG
index 98e24dc63b1..acd42353f46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.9.0 (unreleased)
   - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
+  - Add Application Setting to configure Container Registry token expire delay (default 5min)
 
 v 8.8.3
   - Fix gitlab importer failing to import new projects due to missing credentials
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index ff7a5cad2fb..0a34a12e2a7 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -107,6 +107,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :repository_checks_enabled,
       :metrics_packet_size,
       :send_user_confirmation_email,
+      :container_registry_token_expire_delay,
       restricted_visibility_levels: [],
       import_sources: [],
       disabled_oauth_sign_in_sources: []
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9a14954b4a7..fc48307b75d 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -51,6 +51,10 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
 
+  validates :container_registry_token_expire_delay,
+            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|
@@ -121,7 +125,8 @@ class ApplicationSetting < ActiveRecord::Base
       akismet_enabled: false,
       repository_checks_enabled: true,
       disabled_oauth_sign_in_sources: [],
-      send_user_confirmation_email: false
+      send_user_confirmation_email: false,
+      container_registry_token_expire_delay: 5,
     )
   end
 
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 5090bd8f6e6..56e567c9eed 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -1,5 +1,7 @@
 module Auth
   class ContainerRegistryAuthenticationService < BaseService
+    include CurrentSettings
+
     AUDIENCE = 'container_registry'
 
     def execute
@@ -17,6 +19,7 @@ module Auth
       token = JSONWebToken::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = AUDIENCE
+      token.expire_time = token.issued_at + current_application_settings.container_registry_token_expire_delay.minutes
       token[:access] = names.map do |name|
         { type: 'repository', name: name, actions: %w(*) }
       end
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index df286852b97..f149f9eb431 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -178,6 +178,14 @@
       .col-sm-10
         = f.number_field :max_artifacts_size, class: 'form-control'
 
+  - if Gitlab.config.registry.enabled
+    %fieldset
+      %legend Container Registry
+      .form-group
+        = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'control-label col-sm-2'
+        .col-sm-10
+          = f.number_field :container_registry_token_expire_delay, class: 'form-control'
+
   %fieldset
     %legend Metrics
     %p
diff --git a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
new file mode 100644
index 00000000000..c92bd7b6e34
--- /dev/null
+++ b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
@@ -0,0 +1,24 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddContainerRegistryTokenExpireDelayToApplicationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # When using the methods "add_concurrent_index" or "add_column_with_default"
+  # you must disable the use of transactions as these methods can not run in an
+  # existing transaction. When using "add_concurrent_index" make sure that this
+  # method is the _only_ method called in the migration, any other changes
+  # should go in a separate migration. This ensures that upon failure _only_ the
+  # index creation fails and can be retried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+  def change
+    add_column :application_settings, :container_registry_token_expire_delay, :integer
+
+    # Set default expire delay to 5 minutes
+    execute("update application_settings set container_registry_token_expire_delay = 5")
+  end
+end
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 1e745115dc8..43a0fe35e42 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -37,7 +37,8 @@ Example response:
    "created_at" : "2016-01-04T15:44:55.176Z",
    "default_project_visibility" : 0,
    "gravatar_enabled" : true,
-   "sign_in_text" : null
+   "sign_in_text" : null,
+   "container_registry_token_expire_delay": 5
 }
 ```
 
@@ -64,6 +65,7 @@ PUT /application/settings
 | `restricted_signup_domains` | array of strings | no | Force people to use only corporate emails for sign-up. Default is null, meaning there is no restriction. |
 | `user_oauth_applications` | boolean | no | Allow users to register any application to use GitLab as an OAuth provider |
 | `after_sign_out_path` | string | no | Where to redirect users after logout |
+| `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes |
 
 ```bash
 curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/application/settings?signup_enabled=false&default_project_visibility=1
@@ -90,6 +92,7 @@ Example response:
   "default_snippet_visibility": 0,
   "restricted_signup_domains": [],
   "user_oauth_applications": true,
-  "after_sign_out_path": ""
+  "after_sign_out_path": "",
+  "container_registry_token_expire_delay": 5
 }
 ```
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 31491cf31dd..790a1869f73 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -362,6 +362,7 @@ module API
       expose :restricted_signup_domains
       expose :user_oauth_applications
       expose :after_sign_out_path
+      expose :container_registry_token_expire_delay
     end
 
     class Release < Grape::Entity
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index f44d1b3a44e..29c4e221dd4 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -36,6 +36,7 @@ module Gitlab
         two_factor_grace_period: 48,
         akismet_enabled: false,
         repository_checks_enabled: true,
+        container_registry_token_expire_delay: 5,
       )
     end
 

From 041b0215071b4211400dfebb38fe24bc2718dda3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 13:27:09 +0200
Subject: [PATCH 0901/1431] Update db/schema.rb

---
 db/schema.rb | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index c7eeaadb131..45db86d0802 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: 20160528043124) do
+ActiveRecord::Schema.define(version: 20160530150109) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -43,46 +43,47 @@ ActiveRecord::Schema.define(version: 20160528043124) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "home_page_url"
-    t.integer  "default_branch_protection",         default: 2
+    t.integer  "default_branch_protection",             default: 2
     t.text     "restricted_visibility_levels"
-    t.boolean  "version_check_enabled",             default: true
-    t.integer  "max_attachment_size",               default: 10,          null: false
+    t.boolean  "version_check_enabled",                 default: true
+    t.integer  "max_attachment_size",                   default: 10,          null: false
     t.integer  "default_project_visibility"
     t.integer  "default_snippet_visibility"
     t.text     "restricted_signup_domains"
-    t.boolean  "user_oauth_applications",           default: true
+    t.boolean  "user_oauth_applications",               default: true
     t.string   "after_sign_out_path"
-    t.integer  "session_expire_delay",              default: 10080,       null: false
+    t.integer  "session_expire_delay",                  default: 10080,       null: false
     t.text     "import_sources"
     t.text     "help_page_text"
     t.string   "admin_notification_email"
-    t.boolean  "shared_runners_enabled",            default: true,        null: false
-    t.integer  "max_artifacts_size",                default: 100,         null: false
+    t.boolean  "shared_runners_enabled",                default: true,        null: false
+    t.integer  "max_artifacts_size",                    default: 100,         null: false
     t.string   "runners_registration_token"
-    t.boolean  "require_two_factor_authentication", default: false
-    t.integer  "two_factor_grace_period",           default: 48
-    t.boolean  "metrics_enabled",                   default: false
-    t.string   "metrics_host",                      default: "localhost"
-    t.integer  "metrics_pool_size",                 default: 16
-    t.integer  "metrics_timeout",                   default: 10
-    t.integer  "metrics_method_call_threshold",     default: 10
-    t.boolean  "recaptcha_enabled",                 default: false
+    t.boolean  "require_two_factor_authentication",     default: false
+    t.integer  "two_factor_grace_period",               default: 48
+    t.boolean  "metrics_enabled",                       default: false
+    t.string   "metrics_host",                          default: "localhost"
+    t.integer  "metrics_pool_size",                     default: 16
+    t.integer  "metrics_timeout",                       default: 10
+    t.integer  "metrics_method_call_threshold",         default: 10
+    t.boolean  "recaptcha_enabled",                     default: false
     t.string   "recaptcha_site_key"
     t.string   "recaptcha_private_key"
-    t.integer  "metrics_port",                      default: 8089
-    t.boolean  "akismet_enabled",                   default: false
+    t.integer  "metrics_port",                          default: 8089
+    t.boolean  "akismet_enabled",                       default: false
     t.string   "akismet_api_key"
-    t.integer  "metrics_sample_interval",           default: 15
-    t.boolean  "sentry_enabled",                    default: false
+    t.integer  "metrics_sample_interval",               default: 15
+    t.boolean  "sentry_enabled",                        default: false
     t.string   "sentry_dsn"
-    t.boolean  "email_author_in_body",              default: false
+    t.boolean  "email_author_in_body",                  default: false
     t.integer  "default_group_visibility"
-    t.boolean  "repository_checks_enabled",         default: false
+    t.boolean  "repository_checks_enabled",             default: false
     t.text     "shared_runners_text"
-    t.integer  "metrics_packet_size",               default: 1
+    t.integer  "metrics_packet_size",                   default: 1
     t.text     "disabled_oauth_sign_in_sources"
     t.string   "health_check_access_token"
-    t.boolean  "send_user_confirmation_email",      default: false
+    t.boolean  "send_user_confirmation_email",          default: false
+    t.integer  "container_registry_token_expire_delay"
   end
 
   create_table "audit_events", force: :cascade do |t|

From 7b0e2bbc803f1dff96941875a541e80675931828 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 13:48:05 +0200
Subject: [PATCH 0902/1431] Fix the use of CurrentSettings in
 ContainerRegistryAuthenticationService

---
 .../auth/container_registry_authentication_service.rb    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 56e567c9eed..e57b95f21ec 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -1,6 +1,6 @@
 module Auth
   class ContainerRegistryAuthenticationService < BaseService
-    include CurrentSettings
+    include Gitlab::CurrentSettings
 
     AUDIENCE = 'container_registry'
 
@@ -19,7 +19,7 @@ module Auth
       token = JSONWebToken::RSAToken.new(registry.key)
       token.issuer = registry.issuer
       token.audience = AUDIENCE
-      token.expire_time = token.issued_at + current_application_settings.container_registry_token_expire_delay.minutes
+      token.expire_time = token_expire_at
       token[:access] = names.map do |name|
         { type: 'repository', name: name, actions: %w(*) }
       end
@@ -33,6 +33,7 @@ module Auth
       token.issuer = registry.issuer
       token.audience = params[:service]
       token.subject = current_user.try(:username)
+      token.expire_time = ContainerRegistryAuthenticationService.token_expire_at
       token[:access] = accesses.compact
       token
     end
@@ -78,5 +79,9 @@ module Auth
     def registry
       Gitlab.config.registry
     end
+
+    def self.token_expire_at
+      Time.now + current_application_settings.container_registry_token_expire_delay.minutes
+    end
   end
 end

From 7a6ba30d9a2a9646ef73834fc1543ea0d6b65269 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 13:48:21 +0200
Subject: [PATCH 0903/1431] Test token expirability

---
 ...tainer_registry_authentication_service_spec.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 2d114f59ca4..647731addc4 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -17,6 +17,21 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
   shared_examples 'a valid token' do
     it { is_expected.to include(:token) }
     it { expect(payload).to include('access') }
+
+    context 'a expirable' do
+      let(:expires_at) { Time.at(payload['exp']) }
+      let(:expire_delay) { 10 }
+
+      context 'for default configuration' do
+        it { expect(expires_at).to_not be_within(2.seconds).of(Time.now + expire_delay.minutes) }
+      end
+
+      context 'for changed configuration' do
+        before { stub_application_setting(container_registry_token_expire_delay: expire_delay) }
+
+        it { expect(expires_at).to be_within(2.seconds).of(Time.now + expire_delay.minutes) }
+      end
+    end
   end
 
   shared_examples 'a accessible' do

From f517aa49e16e4bfc26cb9cb89eb7df3e4b82255d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 13:49:48 +0200
Subject: [PATCH 0904/1431] Fix migration information

---
 ...y_token_expire_delay_to_application_settings.rb | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
index c92bd7b6e34..43a53afa8df 100644
--- a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
+++ b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
@@ -1,20 +1,8 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
+# This is ONLINE migration
 
 class AddContainerRegistryTokenExpireDelayToApplicationSettings < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
-  # When using the methods "add_concurrent_index" or "add_column_with_default"
-  # you must disable the use of transactions as these methods can not run in an
-  # existing transaction. When using "add_concurrent_index" make sure that this
-  # method is the _only_ method called in the migration, any other changes
-  # should go in a separate migration. This ensures that upon failure _only_ the
-  # index creation fails and can be retried or reverted easily.
-  #
-  # To disable transactions uncomment the following line and remove these
-  # comments:
-  # disable_ddl_transaction!
-
   def change
     add_column :application_settings, :container_registry_token_expire_delay, :integer
 

From 538b2d687ea903845e993d77740d95fc946ca3a7 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 31 May 2016 13:03:30 +0000
Subject: [PATCH 0905/1431] Use `Snippet#to_reference` directly

---
 app/views/shared/snippets/_header.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index e0d0d967da6..8d391d85642 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -4,7 +4,7 @@
       = visibility_level_label(@snippet.visibility_level)
     = visibility_level_icon(@snippet.visibility_level, fw: false)
   %strong.item-title
-    Snippet $#{@snippet.id}
+    Snippet #{@snippet.to_reference}
   %span.creator
     created by #{link_to_member(@project, @snippet.author, size: 24, author_class: "author item-title")}
     = time_ago_with_tooltip(@snippet.created_at, placement: 'bottom', html_class: 'snippet_updated_ago')

From b1a21a9986b096b993f0937d6b8d6803accffced Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 15:20:46 +0200
Subject: [PATCH 0906/1431] Set container_registry_token_expire_delay default
 to 5

---
 ...ner_registry_token_expire_delay_to_application_settings.rb | 4 ++--
 db/schema.rb                                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
index 43a53afa8df..2465c03050c 100644
--- a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
+++ b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
@@ -4,9 +4,9 @@ class AddContainerRegistryTokenExpireDelayToApplicationSettings < ActiveRecord::
   include Gitlab::Database::MigrationHelpers
 
   def change
-    add_column :application_settings, :container_registry_token_expire_delay, :integer
+    add_column :application_settings, :container_registry_token_expire_delay, :integer, default: 5
 
-    # Set default expire delay to 5 minutes
+    # Set expire delay to 5 minutes for existing settings
     execute("update application_settings set container_registry_token_expire_delay = 5")
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 45db86d0802..b2af810f600 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -83,7 +83,7 @@ ActiveRecord::Schema.define(version: 20160530150109) do
     t.text     "disabled_oauth_sign_in_sources"
     t.string   "health_check_access_token"
     t.boolean  "send_user_confirmation_email",          default: false
-    t.integer  "container_registry_token_expire_delay"
+    t.integer  "container_registry_token_expire_delay", default: 5
   end
 
   create_table "audit_events", force: :cascade do |t|

From bc621eef541139502201884e49a03f9467ab08fc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 15:26:00 +0200
Subject: [PATCH 0907/1431] Pipelines can be canceled only when there are
 running builds

---
 CHANGELOG                                       | 1 +
 app/models/ci/commit.rb                         | 4 ++++
 app/views/projects/ci/commits/_commit.html.haml | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 98e24dc63b1..1c09393f14e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Remove 'main language' feature
+  - Pipelines can be canceled only when there are running builds
   - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 6675a3f5d53..f22b573a94c 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -66,6 +66,10 @@ module Ci
       end
     end
 
+    def cancelable?
+      builds.running_or_pending.any?
+    end
+
     def cancel_running
       builds.running_or_pending.each(&:cancel)
     end
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 5b6b940a0c4..5e3a4123a8e 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -63,9 +63,9 @@
                   %span #{build.name}
 
       - if can?(current_user, :update_pipeline, @project)
-        - if commit.retryable? && commit.builds.failed.any?
+        - if commit.retryable?
           = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
-        - if commit.active?
+        - if commit.cancelable?
           = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
             = icon("remove")

From 99708dcede3305098b2a6f73d70804932d39012e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 15:31:06 +0200
Subject: [PATCH 0908/1431] Test cancelability and retriablity of pipeline for
 generic statuses

---
 spec/features/pipelines_spec.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index bef0578a9bb..55754008d8a 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -62,6 +62,36 @@ describe "Pipelines" do
       end
     end
 
+    context 'for generic statuses' do
+      context 'when running' do
+        let!(:running) { create(:generic_commit_status, status: 'running', commit: pipeline, stage: 'test') }
+
+        before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+        it 'not be cancelable' do
+          expect(page).to_not have_link('Cancel')
+        end
+
+        it 'pipeline is running' do
+          expect(page).to have_selector('.ci-running')
+        end
+      end
+
+      context 'when failed' do
+        let!(:running) { create(:generic_commit_status, status: 'failed', commit: pipeline, stage: 'test') }
+
+        before { visit namespace_project_pipelines_path(project.namespace, project) }
+
+        it 'not be retryable' do
+          expect(page).to_not have_link('Retry')
+        end
+
+        it 'pipeline is failed' do
+          expect(page).to have_selector('.ci-failed')
+        end
+      end
+    end
+
     context 'downloadable pipelines' do
       context 'with artifacts' do
         let!(:with_artifacts) { create(:ci_build, :artifacts, :success, commit: pipeline, name: 'rspec tests', stage: 'test') }

From 30e61ed79c89de4c31a4d2057f710ad2b0704389 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 27 May 2016 16:53:20 -0300
Subject: [PATCH 0909/1431] Fix error 500 when sorting issues by milestone due
 date and filtering by labels

---
 CHANGELOG                                     |  1 +
 app/finders/issuable_finder.rb                |  2 +-
 app/models/concerns/issuable.rb               | 21 +++++++++++++++++--
 .../user_lists_merge_requests_spec.rb         |  9 ++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a0194a1ba25..a885e44f38b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.9.0 (unreleased)
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
+  - Fix bug when sorting issues by milestone due date and filtering by two or more labels
   - Remove 'main language' feature
   - Measure queue duration between gitlab-workhorse and Rails
 
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 8ed3ccf1c02..7d8c56f4c22 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -271,7 +271,7 @@ class IssuableFinder
       if filter_by_no_label?
         items = items.without_label
       else
-        items = items.with_label(label_names)
+        items = items.with_label(label_names, params[:sort])
         if projects
           items = items.where(labels: { project_id: projects })
         end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 91315b3459f..117d66131ae 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -126,13 +126,30 @@ module Issuable
       joins(join_clause).group(issuable_table[:id]).reorder("COUNT(notes.id) DESC")
     end
 
-    def with_label(title)
+    def with_label(title, sort = nil)
       if title.is_a?(Array) && title.size > 1
-        joins(:labels).where(labels: { title: title }).group(arel_table[:id]).having("COUNT(DISTINCT labels.title) = #{title.size}")
+        joins(:labels).where(labels: { title: title }).group(*get_grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}")
       else
         joins(:labels).where(labels: { title: title })
       end
     end
+
+    # Includes table keys in group by clause when sorting
+    # preventing errors in postgres
+    #
+    # Returns an array of arel columns
+
+    def get_grouping_columns(sort)
+      default_columns = [arel_table[:id]]
+
+      if ["milestone_due_desc", "milestone_due_asc"].include?(sort)
+        milestone_table = Milestone.arel_table
+        default_columns << milestone_table[:id]
+        default_columns << milestone_table[:due_date]
+      end
+
+      default_columns
+    end
   end
 
   def today?
diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
index 2c7e1c748ad..1c130057c56 100644
--- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -131,6 +131,15 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
         expect(first_merge_request).to include('fix')
         expect(count_merge_requests).to eq(1)
       end
+
+      it 'sorts by recently due milestone' do
+        visit namespace_project_merge_requests_path(project.namespace, project,
+          label_name: [label.name, label2.name],
+          assignee_id: user.id,
+          sort: sort_value_milestone_soon)
+
+        expect(first_merge_request).to include('fix')
+      end
     end
   end
 

From f27daddfc67b0c5f4510a59f1180f22e2d16d324 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 15:38:42 +0200
Subject: [PATCH 0910/1431] Fix rubocop offenses

---
 .../auth/container_registry_authentication_service_spec.rb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index 647731addc4..67777ad48bc 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -23,7 +23,7 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
       let(:expire_delay) { 10 }
 
       context 'for default configuration' do
-        it { expect(expires_at).to_not be_within(2.seconds).of(Time.now + expire_delay.minutes) }
+        it { expect(expires_at).not_to be_within(2.seconds).of(Time.now + expire_delay.minutes) }
       end
 
       context 'for changed configuration' do

From 000585be1b3cc77889ae7ea6b38aff9e12fb6541 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 31 May 2016 15:51:45 +0200
Subject: [PATCH 0911/1431] Remove update of
 container_registry_token_expire_delay

This is not needed when we specify a default.
---
 ...iner_registry_token_expire_delay_to_application_settings.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
index 2465c03050c..e21376bd571 100644
--- a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
+++ b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
@@ -5,8 +5,5 @@ class AddContainerRegistryTokenExpireDelayToApplicationSettings < ActiveRecord::
 
   def change
     add_column :application_settings, :container_registry_token_expire_delay, :integer, default: 5
-
-    # Set expire delay to 5 minutes for existing settings
-    execute("update application_settings set container_registry_token_expire_delay = 5")
   end
 end

From aaaed331ba06d14f0e071e0933a250c61caabf94 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Fri, 13 May 2016 04:21:01 -0300
Subject: [PATCH 0912/1431] Fix hook data for Wiki Page event

Added "wiki" section and removed "repository"
---
 app/models/project_wiki.rb              | 14 ++++++++++++++
 app/services/wiki_pages/base_service.rb |  5 ++---
 doc/web_hooks/web_hooks.md              | 15 ++++++++-------
 spec/models/project_wiki_spec.rb        | 13 +++++++++++++
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 339fb0b9f9d..415393d7368 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -27,6 +27,10 @@ class ProjectWiki
     @project.path_with_namespace + ".wiki"
   end
 
+  def web_url
+    Gitlab::Routing.url_helpers.namespace_project_wiki_url(@project.namespace, @project, :home)
+  end
+
   def url_to_repo
     gitlab_shell.url_to_repo(path_with_namespace)
   end
@@ -141,6 +145,16 @@ class ProjectWiki
 
     wiki
   end
+  
+  def hook_attrs
+    {
+      web_url: web_url,
+      git_ssh_url: ssh_url_to_repo,
+      git_http_url: http_url_to_repo,
+      path_with_namespace: path_with_namespace,
+      default_branch: default_branch,
+    }
+  end
 
   private
 
diff --git a/app/services/wiki_pages/base_service.rb b/app/services/wiki_pages/base_service.rb
index 9162f128602..4c0a2c6b4d8 100644
--- a/app/services/wiki_pages/base_service.rb
+++ b/app/services/wiki_pages/base_service.rb
@@ -6,9 +6,8 @@ module WikiPages
         object_kind: page.class.name.underscore,
         user: current_user.hook_attrs,
         project: @project.hook_attrs,
-        object_attributes: page.hook_attrs,
-        # DEPRECATED
-        repository: @project.hook_attrs.slice(:name, :url, :description, :homepage)
+        wiki: @project.wiki.hook_attrs,
+        object_attributes: page.hook_attrs
       }
 
       page_url = Gitlab::UrlBuilder.build(page)
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 0777463def5..8559b67af04 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -720,7 +720,7 @@ X-Gitlab-Event: Wiki Page Hook
     "description": "This is awesome",
     "web_url": "http://example.com/root/awesome-project",
     "avatar_url": null,
-    "git_ssh_url": "git@example.com:root/test-project.git",
+    "git_ssh_url": "git@example.com:root/awesome-project.git",
     "git_http_url": "http://example.com/root/awesome-project.git",
     "namespace": "root",
     "visibility_level": 0,
@@ -731,6 +731,13 @@ X-Gitlab-Event: Wiki Page Hook
     "ssh_url": "git@example.com:root/awesome-project.git",
     "http_url": "http://example.com/root/awesome-project.git"
   },
+  "wiki": {
+    "web_url": "http://example.com/root/awesome-project/wikis/home",
+    "git_ssh_url": "git@example.com:root/awesome-project.wiki.git", 
+    "git_http_url": "http://example.com/root/awesome-project.wiki.git", 
+    "path_with_namespace": "root/awesome-project.wiki", 
+    "default_branch": "master"
+  },
   "object_attributes": {
     "title": "Awesome",
     "content": "awesome content goes here",
@@ -739,12 +746,6 @@ X-Gitlab-Event: Wiki Page Hook
     "slug": "awesome",
     "url": "http://example.com/root/awesome-project/wikis/awesome",
     "action": "create"
-  },
-  "repository": {
-    "name": "awesome-project",
-    "url": "git@example.com:root/awesome-project.git",
-    "description": "test",
-    "homepage": "http://example.com/root/awesome-project"
   }
 }
 ```
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 91ebb612baa..58b57bd4fef 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -16,6 +16,12 @@ describe ProjectWiki, models: true do
     end
   end
 
+  describe '#web_url' do
+    it 'returns the full web URL to the wiki' do
+      expect(subject.web_url).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/wikis/home")
+    end
+  end
+
   describe "#url_to_repo" do
     it "returns the correct ssh url to the repo" do
       expect(subject.url_to_repo).to eq(gitlab_shell.url_to_repo(subject.path_with_namespace))
@@ -257,6 +263,13 @@ describe ProjectWiki, models: true do
     end
   end
 
+  describe '#hook_attrs' do
+    it 'returns a hash with values' do
+      expect(subject.hook_attrs).to be_a Hash
+      expect(subject.hook_attrs.keys).to contain_exactly(:web_url, :git_ssh_url, :git_http_url, :path_with_namespace, :default_branch)
+    end
+  end
+
   private
 
   def create_temp_repo(path)

From 04084996e5f18b67abaf0d9aa54d9d51a31ecd7c Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Fri, 27 May 2016 20:31:03 -0300
Subject: [PATCH 0913/1431] Codestyle changes

---
 app/models/project_wiki.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 415393d7368..25d82929c0b 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -145,14 +145,14 @@ class ProjectWiki
 
     wiki
   end
-  
+
   def hook_attrs
     {
       web_url: web_url,
       git_ssh_url: ssh_url_to_repo,
       git_http_url: http_url_to_repo,
       path_with_namespace: path_with_namespace,
-      default_branch: default_branch,
+      default_branch: default_branch
     }
   end
 

From 6d16feef053cc453552803885add0a2755e58399 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Tue, 31 May 2016 12:07:01 -0300
Subject: [PATCH 0914/1431] Add wiki page events fix to the Changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index 98e24dc63b1..3dc7214cad9 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.9.0 (unreleased)
   - Allow enabling wiki page events from Webhook management UI
+  - Fix wiki page events' webhook to point to the wiki repository
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
   - Redesign navigation for project pages

From 2ab70cdc8c7efceb6bc72e40df4baacc08940ab0 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 27 May 2016 17:07:05 -0600
Subject: [PATCH 0915/1431] Remove Coveralls and Semaphore badges. [ci skip]

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 418d06a45a5..fee93d5f9c3 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
 # GitLab
 
 [![build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
-[![Build Status](https://semaphoreci.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/400484/shields_badge.svg)](https://semaphoreci.com/gitlabhq/gitlabhq)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
-[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.svg?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
 
 ## Canonical source
 

From 4da07781573d830244c001f606fa30260e38c472 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 26 May 2016 19:19:11 -0700
Subject: [PATCH 0916/1431] Remove project notification settings associated
 with deleted projects

On GitLab.com, there are 1560 project notification settings with no valid project
all created on 2016-04-15 10:38:53 for some reason. This migration should purge
those entries.

b8f38437 should prevent this issue from occurring in the first place.

Closes gitlab-com/support-forum#678
---
 CHANGELOG                                           |  1 +
 ...ve_notification_settings_for_deleted_projects.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb

diff --git a/CHANGELOG b/CHANGELOG
index 98e24dc63b1..8b3b60b5f59 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.9.0 (unreleased)
   - Allow enabling wiki page events from Webhook management UI
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
+  - Remove project notification settings associated with deleted projects
   - Redesign navigation for project pages
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
diff --git a/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb b/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb
new file mode 100644
index 00000000000..7910120b4e0
--- /dev/null
+++ b/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb
@@ -0,0 +1,13 @@
+class RemoveNotificationSettingsForDeletedProjects < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      DELETE FROM notification_settings
+      WHERE notification_settings.source_type = 'Project'
+        AND NOT EXISTS (
+              SELECT *
+              FROM projects
+              WHERE projects.id = notification_settings.source_id
+            )
+    SQL
+  end
+end

From 024227bdbf76e608e70b871a5b7c1b77229028c9 Mon Sep 17 00:00:00 2001
From: Richard Grainger <richard.grainger@nttcomsecurity.com>
Date: Fri, 27 May 2016 15:55:35 +0100
Subject: [PATCH 0917/1431] Amend jira service api docs [ci skip]

---
 doc/api/services.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/api/services.md b/doc/api/services.md
index 83ac7845156..8aa0ad8c8b2 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -503,6 +503,8 @@ Parameters:
 - `project_url` (**required**) - Project url
 - `issues_url` (**required**) - Issue url
 - `description` (optional) - Jira issue tracker
+- `username` (optional) - Jira username
+- `password` (optional) - Jira password
 
 ### Delete JIRA service
 

From b826c9ff17b701344028832d523522a3cb925a23 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 31 May 2016 13:29:37 -0400
Subject: [PATCH 0918/1431] Create the specified remote directory during backup

This is idempotent, so there's no harm calling it if the directory
already exists.

Closes #12710
---
 lib/backup/manager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 3e07096e6cc..660ca8c2923 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -48,7 +48,7 @@ module Backup
       end
 
       connection = ::Fog::Storage.new(connection_settings)
-      directory = connection.directories.get(remote_directory)
+      directory = connection.directories.create(key: remote_directory)
 
       if directory.files.create(key: tar_file, body: File.open(tar_file), public: false,
           multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size,

From 9154586ce5c46dfac83a1ed1e4beac1940913f16 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Thu, 26 May 2016 14:12:43 +0300
Subject: [PATCH 0919/1431] Confidential notes data leak

---
 CHANGELOG                            |  1 +
 app/models/note.rb                   | 22 +++++++++++++++++++---
 lib/gitlab/project_search_results.rb |  2 +-
 spec/models/note_spec.rb             | 19 +++++++++++++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5dc56d18c3a..c6226aee049 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.9.0 (unreleased)
 v 8.8.3
   - Fix gitlab importer failing to import new projects due to missing credentials
   - Fix import URL migration not rescuing with the correct Error
+  - In search results, only show notes on confidential issues that the user has access to
 
 v 8.8.2
   - Added remove due date button. !4209
diff --git a/app/models/note.rb b/app/models/note.rb
index 55b98557244..29f38539116 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -77,14 +77,30 @@ class Note < ActiveRecord::Base
     #
     # This method uses ILIKE on PostgreSQL and LIKE on MySQL.
     #
-    # query - The search query as a String.
+    # query   - The search query as a String.
+    # as_user - Limit results to those viewable by a specific user
     #
     # Returns an ActiveRecord::Relation.
-    def search(query)
+    def search(query, as_user: nil)
       table   = arel_table
       pattern = "%#{query}%"
 
-      where(table[:note].matches(pattern))
+      found_notes = joins('LEFT JOIN issues ON issues.id = noteable_id').
+        where(table[:note].matches(pattern))
+
+      if as_user
+        found_notes.where('
+          issues.confidential IS NULL
+          OR issues.confidential IS FALSE
+          OR (issues.confidential IS TRUE
+            AND (issues.author_id = :user_id
+            OR issues.assignee_id = :user_id
+            OR issues.project_id IN(:project_ids)))',
+          user_id: as_user.id,
+          project_ids: as_user.authorized_projects.select(:id))
+      else
+        found_notes.where('issues.confidential IS NULL OR issues.confidential IS FALSE')
+      end
     end
 
     def grouped_awards
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 71c5b6801fb..183bd10d6a3 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -74,7 +74,7 @@ module Gitlab
     end
 
     def notes
-      project.notes.user.search(query).order('updated_at DESC')
+      project.notes.user.search(query, as_user: @current_user).order('updated_at DESC')
     end
 
     def commits
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 5d916f0e6a6..64a5bab7cb1 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -111,6 +111,25 @@ describe Note, models: true do
     it 'returns notes with matching content regardless of the casing' do
       expect(described_class.search('WOW')).to eq([note])
     end
+
+    context "confidential issues" do
+      let(:user) { create :user }
+      let(:confidential_issue) { create(:issue, :confidential, author: user) }
+      let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue }
+
+      it "returns notes with matching content if user can see the issue" do
+        expect(described_class.search(confidential_note.note, as_user: user)).to eq([confidential_note])
+      end
+
+      it "does not return notes with matching content if user can not see the issue" do
+        user = create :user
+        expect(described_class.search(confidential_note.note, as_user: user)).to be_empty
+      end
+
+      it "does not return notes with matching content for unauthenticated users" do
+        expect(described_class.search(confidential_note.note)).to be_empty
+      end
+    end
   end
 
   describe '.grouped_awards' do

From 7f4f959e9bed5ca0781b97e781662c6fda69844d Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 14:14:16 -0600
Subject: [PATCH 0920/1431] Upgrade Kaminari from 0.16.3 to 0.17.0.

Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170

Deprecates num_pages in favor of total_pages and includes Rails 5 support.
---
 Gemfile                                         | 2 +-
 Gemfile.lock                                    | 4 ++--
 app/views/kaminari/gitlab/_first_page.html.haml | 2 +-
 app/views/kaminari/gitlab/_gap.html.haml        | 2 +-
 app/views/kaminari/gitlab/_last_page.html.haml  | 2 +-
 app/views/kaminari/gitlab/_next_page.html.haml  | 2 +-
 app/views/kaminari/gitlab/_page.html.haml       | 2 +-
 app/views/kaminari/gitlab/_paginator.html.haml  | 6 +++---
 app/views/kaminari/gitlab/_prev_page.html.haml  | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index b897dc0a741..540710712fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'grape-entity', '~> 0.4.2'
 gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
-gem "kaminari", "~> 0.16.3"
+gem "kaminari", "~> 0.17.0"
 
 # HAML
 gem "haml-rails", '~> 0.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index fa2b72b2524..146e95167b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -442,7 +442,7 @@ GEM
       railties (>= 3.2.16)
     json (1.8.3)
     jwt (1.5.2)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
@@ -959,7 +959,7 @@ DEPENDENCIES
   jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
   jwt
-  kaminari (~> 0.16.3)
+  kaminari (~> 0.17.0)
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
diff --git a/app/views/kaminari/gitlab/_first_page.html.haml b/app/views/kaminari/gitlab/_first_page.html.haml
index ada7306d98d..e7a70e3bb28 100644
--- a/app/views/kaminari/gitlab/_first_page.html.haml
+++ b/app/views/kaminari/gitlab/_first_page.html.haml
@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the first page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %li.first
diff --git a/app/views/kaminari/gitlab/_gap.html.haml b/app/views/kaminari/gitlab/_gap.html.haml
index 3ffd12f8587..80ca30f36e6 100644
--- a/app/views/kaminari/gitlab/_gap.html.haml
+++ b/app/views/kaminari/gitlab/_gap.html.haml
@@ -1,7 +1,7 @@
 -#  Non-link tag that stands for skipped pages...
 -#  available local variables
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %li{class: "page"}
diff --git a/app/views/kaminari/gitlab/_last_page.html.haml b/app/views/kaminari/gitlab/_last_page.html.haml
index 3431d029bcc..53f780d1d1b 100644
--- a/app/views/kaminari/gitlab/_last_page.html.haml
+++ b/app/views/kaminari/gitlab/_last_page.html.haml
@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the last page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %li.last
diff --git a/app/views/kaminari/gitlab/_next_page.html.haml b/app/views/kaminari/gitlab/_next_page.html.haml
index c805914fc3f..125f09777ba 100644
--- a/app/views/kaminari/gitlab/_next_page.html.haml
+++ b/app/views/kaminari/gitlab/_next_page.html.haml
@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the next page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 - if current_page.last?
diff --git a/app/views/kaminari/gitlab/_page.html.haml b/app/views/kaminari/gitlab/_page.html.haml
index a52d883b9a8..522e4d1d05f 100644
--- a/app/views/kaminari/gitlab/_page.html.haml
+++ b/app/views/kaminari/gitlab/_page.html.haml
@@ -3,7 +3,7 @@
 -#    page:          a page object for "this" page
 -#    url:           url to this page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %li{class: "page#{' active' if page.current?}"}
diff --git a/app/views/kaminari/gitlab/_paginator.html.haml b/app/views/kaminari/gitlab/_paginator.html.haml
index a12c53bcfe7..f5e0d2ed3f3 100644
--- a/app/views/kaminari/gitlab/_paginator.html.haml
+++ b/app/views/kaminari/gitlab/_paginator.html.haml
@@ -1,7 +1,7 @@
 -#  The container tag
 -#  available local variables
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 -#    paginator:     the paginator that renders the pagination tags inside
@@ -9,7 +9,7 @@
   %div.gl-pagination
     %ul.pagination.clearfix
       - unless current_page.first?
-        = first_page_tag unless num_pages < 5 # As kaminari will always show the first 5 pages
+        = first_page_tag unless total_pages < 5 # As kaminari will always show the first 5 pages
       = prev_page_tag
       - each_page do |page|
         - if page.left_outer? || page.right_outer? || page.inside_window?
@@ -18,5 +18,5 @@
           = gap_tag
       = next_page_tag
       - unless current_page.last?
-        = last_page_tag unless num_pages < 5
+        = last_page_tag unless total_pages < 5
 
diff --git a/app/views/kaminari/gitlab/_prev_page.html.haml b/app/views/kaminari/gitlab/_prev_page.html.haml
index afb20455e0a..7edf10498a8 100644
--- a/app/views/kaminari/gitlab/_prev_page.html.haml
+++ b/app/views/kaminari/gitlab/_prev_page.html.haml
@@ -2,7 +2,7 @@
 -#  available local variables
 -#    url:           url to the previous page
 -#    current_page:  a page object for the currently displayed page
--#    num_pages:     total number of pages
+-#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 - if current_page.first?

From 1648316eff2a3ec0058e48af05a4f51343112743 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 31 May 2016 11:14:55 -0600
Subject: [PATCH 0921/1431] New style for close buttons

---
 app/assets/stylesheets/framework/buttons.scss  | 18 +++++++++++++++++-
 .../stylesheets/framework/variables.scss       |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index eaf85bb17ca..467f3b35d74 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -16,6 +16,19 @@
   @include btn-default;
 }
 
+@mixin btn-outline($background, $text, $border, $hover-background, $hover-text, $hover-border) {
+  background-color: $background;
+  color: $text;
+  border-color: $border;
+
+  &:hover,
+  &:focus {
+    background-color: $hover-background;
+    color: $hover-text;
+    border-color: $hover-border;;
+  }
+}
+
 @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
   background-color: $light;
   border-color: $border-light;
@@ -106,11 +119,14 @@
     @include btn-blue;
   }
 
-  &.btn-close,
   &.btn-warning {
     @include btn-orange;
   }
 
+  &.btn-close {
+    @include btn-outline($white-light, $orange-normal, $orange-normal, $orange-light, $white-light, $orange-light);
+  }
+
   &.btn-danger,
   &.btn-remove,
   &.btn-red {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index c7784e15844..8c54d935b6c 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -104,7 +104,7 @@ $blue-medium-light: #3498cb;
 $blue-medium: #2f8ebf;
 $blue-medium-dark: #2d86b4;
 
-$orange-light: rgba(252, 109, 38, 0.80);
+$orange-light: #fc8a51;
 $orange-normal: #e75e40;
 $orange-dark: #ce5237;
 

From 47b60b6cfe681967a3dcf23d398ddef4d77a635c Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 31 May 2016 15:06:08 -0700
Subject: [PATCH 0922/1431] Make EmailsOnPushWorker use Sidekiq mailers queue

EmailsOnPushWorker was using the default queue, which made it impossible
to prioritize MergeWorker and other key workers with a separate Sidekiq
process.
---
 CHANGELOG                            | 1 +
 app/workers/emails_on_push_worker.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index fcaf022b416..83bb12665a3 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.9.0 (unreleased)
   - Allow enabling wiki page events from Webhook management UI
+  - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index fa959fc56e3..971f969e25e 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -1,6 +1,7 @@
 class EmailsOnPushWorker
   include Sidekiq::Worker
 
+  sidekiq_options queue: :mailers
   attr_reader :email, :skip_premailer
 
   def perform(project_id, recipients, push_data, options = {})

From 56f3b243ce08d105758a9b6edf96792627fa423c Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 31 May 2016 19:33:46 -0300
Subject: [PATCH 0923/1431] Add leading comment space cop

---
 .rubocop.yml                                  |  2 +-
 app/controllers/application_controller.rb     |  2 +-
 .../projects/merge_requests_controller.rb     |  2 +-
 app/models/concerns/issuable.rb               | 13 +++--
 app/models/key.rb                             |  2 +-
 config/initializers/doorkeeper.rb             |  4 +-
 config/initializers/omniauth.rb               |  2 +-
 lib/event_filter.rb                           |  2 +-
 lib/gitlab/diff/parser.rb                     | 14 +++---
 lib/gitlab/gitlab_import/importer.rb          |  2 +-
 spec/models/concerns/issuable_spec.rb         |  8 +--
 spec/requests/api/users_spec.rb               |  2 +-
 spec/teaspoon_env.rb                          | 50 +++++++++----------
 13 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..ebd78e21ef9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -318,7 +318,7 @@ Style/LambdaCall:
 
 # Comments should start with a space.
 Style/LeadingCommentSpace:
-  Enabled: false
+  Enabled: true
 
 # Use \ instead of + or << to concatenate two string literals at line end.
 Style/LineEndConcatenation:
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1429ee40bb7..9b2a9d298b3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -263,7 +263,7 @@ class ApplicationController < ActionController::Base
       # internal repos where you are not a member. Enable this filter
       # or improve current implementation to filter only issues you
       # created or assigned or mentioned
-      #@filter_params[:authorized_only] = true
+      # @filter_params[:authorized_only] = true
     end
 
     @filter_params
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 17ce8e2ad20..d54284d7b20 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -205,7 +205,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def branch_from
-    #This is always source
+    # This is always source
     @source_project = @merge_request.nil? ? @project : @merge_request.source_project
     @commit = @repository.commit(params[:ref]) if params[:ref].present?
     render layout: false
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 117d66131ae..9aaaf787372 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -128,7 +128,7 @@ module Issuable
 
     def with_label(title, sort = nil)
       if title.is_a?(Array) && title.size > 1
-        joins(:labels).where(labels: { title: title }).group(*get_grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}")
+        joins(:labels).where(labels: { title: title }).group(*grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}")
       else
         joins(:labels).where(labels: { title: title })
       end
@@ -138,17 +138,16 @@ module Issuable
     # preventing errors in postgres
     #
     # Returns an array of arel columns
-
-    def get_grouping_columns(sort)
-      default_columns = [arel_table[:id]]
+    def grouping_columns(sort)
+      grouping_columns = [arel_table[:id]]
 
       if ["milestone_due_desc", "milestone_due_asc"].include?(sort)
         milestone_table = Milestone.arel_table
-        default_columns << milestone_table[:id]
-        default_columns << milestone_table[:due_date]
+        grouping_columns << milestone_table[:id]
+        grouping_columns << milestone_table[:due_date]
       end
 
-      default_columns
+      grouping_columns
     end
   end
 
diff --git a/app/models/key.rb b/app/models/key.rb
index d52afda67d1..0532e84f47d 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -26,7 +26,7 @@ class Key < ActiveRecord::Base
   end
 
   def publishable_key
-    #Removes anything beyond the keytype and key itself
+    # Removes anything beyond the keytype and key itself
     self.key.split[0..1].join(' ')
   end
 
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 66ac88e9f4a..7bd13105045 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -52,7 +52,7 @@ Doorkeeper.configure do
   # For more information go to
   # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
   default_scopes  :api
-  #optional_scopes :write, :update
+  # optional_scopes :write, :update
 
   # Change the way client credentials are retrieved from the request object.
   # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
@@ -71,7 +71,7 @@ Doorkeeper.configure do
   # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
   # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
   #
-  native_redirect_uri nil#'urn:ietf:wg:oauth:2.0:oob'
+  native_redirect_uri nil # 'urn:ietf:wg:oauth:2.0:oob'
 
   # Specify what grant flows are enabled in array of Strings. The valid
   # strings and the flows they enable are:
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 4c164119fff..26c30e523a7 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -13,7 +13,7 @@ end
 
 OmniAuth.config.full_host = Settings.gitlab['base_url']
 OmniAuth.config.allowed_request_methods = [:post]
-#In case of auto sign-in, the GET method is used (users don't get to click on a button)
+# In case of auto sign-in, the GET method is used (users don't get to click on a button)
 OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?
 OmniAuth.config.before_request_phase do |env|
   OmniAuth::RequestForgeryProtection.call(env)
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index f15b2cfd231..668d2fa41b3 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -27,7 +27,7 @@ class EventFilter
     @params = if params
                 params.dup
               else
-                []#EventFilter.default_filter
+                [] # EventFilter.default_filter
               end
   end
 
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb
index 6fe7faa547a..522dd2b9428 100644
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
@@ -17,16 +17,16 @@ module Gitlab
         Enumerator.new do |yielder|
           @lines.each do |line|
             next if filename?(line)
-  
+
             full_line = line.delete("\n")
-  
+
             if line.match(/^@@ -/)
               type = "match"
-  
+
               line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
               line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
-  
-              next if line_old <= 1 && line_new <= 1 #top of file
+
+              next if line_old <= 1 && line_new <= 1 # top of file
               yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new)
               line_obj_index += 1
               next
@@ -39,8 +39,8 @@ module Gitlab
               yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new)
               line_obj_index += 1
             end
-  
-  
+
+
             case line[0]
             when "+"
               line_new += 1
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index e32ef8a44c2..3f76ec97977 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -17,7 +17,7 @@ module Gitlab
       def execute
         project_identifier = CGI.escape(project.import_source)
 
-        #Issues && Comments
+        # Issues && Comments
         issues = client.issues(project_identifier)
 
         issues.each do |issue|
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 583827cdf42..00b878e8773 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -118,10 +118,10 @@ describe Issue, "Issuable" do
     let(:project) { build_stubbed(:empty_project) }
 
     context "by milestone due date" do
-      #Correct order is:
-      #Issues/MRs with milestones ordered by date
-      #Issues/MRs with milestones without dates
-      #Issues/MRs without milestones
+      # Correct order is:
+      # Issues/MRs with milestones ordered by date
+      # Issues/MRs with milestones without dates
+      # Issues/MRs without milestones
 
       let!(:issue) { create(:issue, project: project) }
       let!(:early_milestone) { create(:milestone, project: project, due_date: 10.days.from_now) }
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 40b24c125b5..a7690f430c4 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -20,7 +20,7 @@ describe API::API, api: true  do
     end
 
     context "when authenticated" do
-      #These specs are written just in case API authentication is not required anymore
+      # These specs are written just in case API authentication is not required anymore
       context "when public level is restricted" do
         before do
           stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC])
diff --git a/spec/teaspoon_env.rb b/spec/teaspoon_env.rb
index 58f45ff8610..69b2b9b6d5b 100644
--- a/spec/teaspoon_env.rb
+++ b/spec/teaspoon_env.rb
@@ -41,11 +41,11 @@ Teaspoon.configure do |config|
     suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
 
     # Load additional JS files, but requiring them in your spec helper is the preferred way to do this.
-    #suite.javascripts = []
+    # suite.javascripts = []
 
     # You can include your own stylesheets if you want to change how Teaspoon looks.
     # Note: Spec related CSS can and should be loaded using fixtures.
-    #suite.stylesheets = ["teaspoon"]
+    # suite.stylesheets = ["teaspoon"]
 
     # This suites spec helper, which can require additional support files. This file is loaded before any of your test
     # files are loaded.
@@ -62,19 +62,19 @@ Teaspoon.configure do |config|
 
     # Hooks allow you to use `Teaspoon.hook("fixtures")` before, after, or during your spec run. This will make a
     # synchronous Ajax request to the server that will call all of the blocks you've defined for that hook name.
-    #suite.hook :fixtures, &proc{}
+    # suite.hook :fixtures, &proc{}
 
     # Determine whether specs loaded into the test harness should be embedded as individual script tags or concatenated
-    # into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default, 
+    # into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default,
     # Teaspoon expands all assets to provide more valuable stack traces that reference individual source files.
-    #suite.expand_assets = true
+    # suite.expand_assets = true
   end
 
   # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
   # be run in the default suite -- but can be focused into a more specific suite.
-  #config.suite :targeted do |suite|
+  # config.suite :targeted do |suite|
   #  suite.matcher = "spec/javascripts/targeted/*_spec.{js,js.coffee,coffee}"
-  #end
+  # end
 
   # CONSOLE RUNNER SPECIFIC
   #
@@ -94,45 +94,45 @@ Teaspoon.configure do |config|
   # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
   # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
   # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
-  #config.driver = :phantomjs
+  # config.driver = :phantomjs
 
   # Specify additional options for the driver.
   #
   # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
   # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
   # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
-  #config.driver_options = nil
+  # config.driver_options = nil
 
   # Specify the timeout for the driver. Specs are expected to complete within this time frame or the run will be
   # considered a failure. This is to avoid issues that can arise where tests stall.
-  #config.driver_timeout = 180
+  # config.driver_timeout = 180
 
   # Specify a server to use with Rack (e.g. thin, mongrel). If nil is provided Rack::Server is used.
-  #config.server = nil
+  # config.server = nil
 
   # Specify a port to run on a specific port, otherwise Teaspoon will use a random available port.
-  #config.server_port = nil
+  # config.server_port = nil
 
   # Timeout for starting the server in seconds. If your server is slow to start you may have to bump this, or you may
   # want to lower this if you know it shouldn't take long to start.
-  #config.server_timeout = 20
+  # config.server_timeout = 20
 
   # Force Teaspoon to fail immediately after a failing suite. Can be useful to make Teaspoon fail early if you have
   # several suites, but in environments like CI this may not be desirable.
-  #config.fail_fast = true
+  # config.fail_fast = true
 
   # Specify the formatters to use when outputting the results.
   # Note: Output files can be specified by using `"junit>/path/to/output.xml"`.
   #
   # Available: :dot, :clean, :documentation, :json, :junit, :pride, :rspec_html, :snowday, :swayze_or_oprah, :tap, :tap_y, :teamcity
-  #config.formatters = [:dot]
+  # config.formatters = [:dot]
 
   # Specify if you want color output from the formatters.
-  #config.color = true
+  # config.color = true
 
   # Teaspoon pipes all console[log/debug/error] to $stdout. This is useful to catch places where you've forgotten to
   # remove them, but in verbose applications this may not be desirable.
-  #config.suppress_log = false
+  # config.suppress_log = false
 
   # COVERAGE REPORTS / THRESHOLD ASSERTIONS
   #
@@ -149,7 +149,7 @@ Teaspoon.configure do |config|
   # Specify that you always want a coverage configuration to be used. Otherwise, specify that you want coverage
   # on the CLI.
   # Set this to "true" or the name of your coverage config.
-  #config.use_coverage = nil
+  # config.use_coverage = nil
 
   # You can have multiple coverage configs by passing a name to config.coverage.
   # e.g. config.coverage :ci do |coverage|
@@ -158,21 +158,21 @@ Teaspoon.configure do |config|
     # Which coverage reports Istanbul should generate. Correlates directly to what Istanbul supports.
     #
     # Available: text-summary, text, html, lcov, lcovonly, cobertura, teamcity
-    #coverage.reports = ["text-summary", "html"]
+    # coverage.reports = ["text-summary", "html"]
 
     # The path that the coverage should be written to - when there's an artifact to write to disk.
     # Note: Relative to `config.root`.
-    #coverage.output_path = "coverage"
+    # coverage.output_path = "coverage"
 
     # Assets to be ignored when generating coverage reports. Accepts an array of filenames or regular expressions. The
     # default excludes assets from vendor, gems and support libraries.
-    #coverage.ignore = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
+    # coverage.ignore = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
 
     # Various thresholds requirements can be defined, and those thresholds will be checked at the end of a run. If any
     # aren't met the run will fail with a message. Thresholds can be defined as a percentage (0-100), or nil.
-    #coverage.statements = nil
-    #coverage.functions = nil
-    #coverage.branches = nil
-    #coverage.lines = nil
+    # coverage.statements = nil
+    # coverage.functions = nil
+    # coverage.branches = nil
+    # coverage.lines = nil
   end
 end

From 05e62ba3e43bc9a3983fee8be578da8a12c5de74 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lukeeeebennettplus@gmail.com>
Date: Tue, 31 May 2016 20:08:40 +0100
Subject: [PATCH 0924/1431] Fix MR widget mobile styling

---
 .../stylesheets/pages/merge_requests.scss     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4f8a8748d3f..8046e203a99 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -41,7 +41,7 @@
       margin: 0;
       margin-left: 20px;
       padding: 5px;
-      padding-top: 12px;
+      padding-top: 8px;
       line-height: 20px;
 
       &.right {
@@ -110,6 +110,29 @@
     p:last-child {
       margin-bottom: 0;
     }
+
+    @media (max-width: $screen-sm-max) {
+      h4 {
+        font-size: 15px;
+      }
+
+      p {
+        font-size: 13px;
+      }
+
+      .btn,
+      .btn-group,
+      .accept-action {
+        width: 100%;
+        margin-bottom: 4px;
+      }
+
+      .accept-control {
+        width: 100%;
+        text-align: center;
+        margin: 0;
+      }
+    }
   }
 
   .mr-widget-footer {

From f8a3344d1297e2a66d1ec60372258c651c74baf5 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 26 May 2016 20:37:41 -0700
Subject: [PATCH 0925/1431] Fix 404 page when viewing TODOs that contain
 milestones or labels in different projects

A user viewing the TODOs page will see a 404 if there are mentioned labels
in multiple different projects. This is likely a caching bug and only occurs
when Markdown rendering occurs across multiple projects, which is why it's so
tricky to reproduce. This is what I think is happening:

1. LabelReferenceFilter#references_in encounters label ~X for ProjectA and finds the label in the DB as id = 1.
2. LabelReferenceFilter.references_in yields [1, 'X', nil, ...]
3. Since project_ref is nil, AbstractReferenceFilter#project_from_ref_cache caches nil => ProjectA.
4. LabelReferenceFilter#references_in encounters label ~Y for ProjectB and finds the label in the DB as id = 2.
5. LabelReferenceFilter.references_in yields [2, 'Y', nil, ...]
6. AbstractReferenceFilter#project_from_ref_cache lookups nil and returns ProjectA. It was supposed to be ProjectB.
7. A is the wrong project, so the label lookup fails.

This MR caches Markdown references if the key is present.

Closes #17898
---
 CHANGELOG                                     |  1 +
 .../filter/abstract_reference_filter.rb       |  4 +++-
 spec/features/todos/todos_spec.rb             | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fcaf022b416..c00284b9de6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.9.0 (unreleased)
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
   - Remove project notification settings associated with deleted projects
+  - Fix 404 page when viewing TODOs that contain milestones or labels in different projects
   - Redesign navigation for project pages
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
index b8962379cb5..65283fe96a4 100644
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -236,7 +236,9 @@ module Banzai
         if cache.key?(key)
           cache[key]
         else
-          cache[key] = yield
+          value = yield
+          cache[key] = value if key.present?
+          value
         end
       end
     end
diff --git a/spec/features/todos/todos_spec.rb b/spec/features/todos/todos_spec.rb
index 3354f529295..4e627753cc7 100644
--- a/spec/features/todos/todos_spec.rb
+++ b/spec/features/todos/todos_spec.rb
@@ -43,6 +43,27 @@ describe 'Dashboard Todos', feature: true do
       end
     end
 
+    context 'User has Todos with labels spanning multiple projects' do
+      before do
+        label1 = create(:label, project: project)
+        note1 = create(:note_on_issue, note: "Hello #{label1.to_reference(format: :name)}", noteable_id: issue.id, noteable_type: 'Issue', project: issue.project)
+        create(:todo, :mentioned, project: project, target: issue, user: user, note_id: note1.id)
+
+        project2 = create(:project)
+        label2 = create(:label, project: project2)
+        issue2 = create(:issue, project: project2)
+        note2 = create(:note_on_issue, note: "Test #{label2.to_reference(format: :name)}", noteable_id: issue2.id, noteable_type: 'Issue', project: project2)
+        create(:todo, :mentioned, project: project2, target: issue2, user: user, note_id: note2.id)
+
+        login_as(user)
+        visit dashboard_todos_path
+      end
+
+      it 'shows page with two Todos' do
+        expect(page).to have_selector('.todos-list .todo', count: 2)
+      end
+    end
+
     context 'User has multiple pages of Todos' do
       before do
         allow(Todo).to receive(:default_per_page).and_return(1)

From 80cf7d3b9761ccb5e0b13409bb4b91c5e1899b23 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 22:33:08 -0600
Subject: [PATCH 0926/1431] Add a title attribute to each branch in the
 branches dropdown on the New MR page.

---
 app/views/projects/merge_requests/dropdowns/_branch.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/merge_requests/dropdowns/_branch.html.haml b/app/views/projects/merge_requests/dropdowns/_branch.html.haml
index ba8d9a5835c..a60c445aa51 100644
--- a/app/views/projects/merge_requests/dropdowns/_branch.html.haml
+++ b/app/views/projects/merge_requests/dropdowns/_branch.html.haml
@@ -1,5 +1,5 @@
 %ul
   - branches.each do |branch|
     %li
-      %a{ href: '#', class: "#{('is-active' if selected == branch)}", data: { id: branch } }
+      %a{ href: '#', class: "#{('is-active' if selected == branch)}", title: branch, data: { id: branch } }
         = branch

From face87b7bb3af2188fd42f47fa0d43d46dafbc78 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 11:55:00 +0200
Subject: [PATCH 0927/1431] Enable Style/Semicolon rubocop style cop

See #17478
---
 .rubocop.yml                | 2 +-
 app/models/network/graph.rb | 2 +-
 lib/gitlab/middleware/go.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index eece9ec69d8..784697aaaa8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -514,7 +514,7 @@ Style/SelfAssignment:
 
 # Don't use semicolons to terminate expressions.
 Style/Semicolon:
-  Enabled: false
+  Enabled: true
 
 # Checks for proper usage of fail and raise.
 Style/SignalException:
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 1ac37e0307f..39ffb2d8f8b 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -164,7 +164,7 @@ module Network
           i != range.last &&
           @commits[i].spaces.include?(overlap_space)
 
-          return true;
+          return true
         end
       end
 
diff --git a/lib/gitlab/middleware/go.rb b/lib/gitlab/middleware/go.rb
index 50b0dd32380..5764ab15652 100644
--- a/lib/gitlab/middleware/go.rb
+++ b/lib/gitlab/middleware/go.rb
@@ -39,7 +39,7 @@ module Gitlab
         request_url = URI.join(base_url, project_path)
         domain_path = strip_url(request_url.to_s)
 
-        "<!DOCTYPE html><html><head><meta content='#{domain_path} git #{request_url}.git' name='go-import'></head></html>\n";
+        "<!DOCTYPE html><html><head><meta content='#{domain_path} git #{request_url}.git' name='go-import'></head></html>\n"
       end
 
       def strip_url(url)

From 0319d5b63233e132672b836409b8a073cab05d10 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 1 Jun 2016 11:18:11 +0200
Subject: [PATCH 0928/1431] Enable Style/For rubocop cop

Do not use for, unless you know exactly why.

See #17478
---
 .rubocop.yml                | 2 +-
 app/models/network/graph.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index eece9ec69d8..21ac2749437 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -247,7 +247,7 @@ Style/FlipFlop:
 
 # Checks use of for or each in multiline loops.
 Style/For:
-  Enabled: false
+  Enabled: true
 
 # Enforce the use of Kernel#sprintf, Kernel#format or String#%.
 Style/FormatString:
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 1ac37e0307f..7f3387f87e2 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -205,7 +205,7 @@ module Network
       # Visit branching chains
       leaves.each do |l|
         parents = l.parents(@map).select{|p| p.space.zero?}
-        for p in parents
+        parents.each do |p|
           place_chain(p, l.time)
         end
       end
@@ -223,7 +223,7 @@ module Network
     end
 
     def mark_reserved(time_range, space)
-      for day in time_range
+      time_range.each do |day|
         @reserved[day].push(space)
       end
     end
@@ -232,7 +232,7 @@ module Network
       space_default ||= space_base
 
       reserved = []
-      for day in time_range
+      time_range.each do |day|
         reserved.push(*@reserved[day])
       end
       reserved.uniq!

From 24c0f0d67198c98998514ff657562a599859d2c7 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 1 Jun 2016 09:18:04 +0200
Subject: [PATCH 0929/1431] Add feature test for accessing MR created from fork

---
 .../merge_requests/created_from_fork_spec.rb  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 spec/features/merge_requests/created_from_fork_spec.rb

diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
new file mode 100644
index 00000000000..c1fdec3a550
--- /dev/null
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+feature 'Merge request created from fork' do
+  given(:user) { create(:user) }
+  given(:project) { create(:project, :public) }
+  given(:fork_project) { create(:project, :public) }
+
+  given!(:merge_request) do
+    create(:forked_project_link, forked_to_project: fork_project,
+                                 forked_from_project: project)
+
+    create(:merge_request, source_project: fork_project,
+                           target_project: project,
+                           description: 'Test merge request')
+  end
+
+  before do
+    project.team << [user, :master]
+
+    login_as user
+    visit namespace_project_merge_request_path(project.namespace,
+                                               project, merge_request)
+  end
+
+  scenario 'user can access merge request' do
+    expect(page).to have_content 'Test merge request'
+  end
+end

From 02cddaea6f51c05b7c86b2dc541350e63301b2e4 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 1 Jun 2016 10:26:33 +0200
Subject: [PATCH 0930/1431] Add feature specs for pipeline in MR from fork

---
 .../merge_requests/created_from_fork_spec.rb  | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index c1fdec3a550..edc0bdec3db 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -9,20 +9,50 @@ feature 'Merge request created from fork' do
     create(:forked_project_link, forked_to_project: fork_project,
                                  forked_from_project: project)
 
-    create(:merge_request, source_project: fork_project,
-                           target_project: project,
-                           description: 'Test merge request')
+    create(:merge_request_with_diffs, source_project: fork_project,
+                                      target_project: project,
+                                      description: 'Test merge request')
   end
 
-  before do
-    project.team << [user, :master]
-
+  background do
+    fork_project.team << [user, :master]
     login_as user
-    visit namespace_project_merge_request_path(project.namespace,
-                                               project, merge_request)
   end
 
   scenario 'user can access merge request' do
+    visit_merge_request(merge_request)
+
     expect(page).to have_content 'Test merge request'
   end
+
+  context 'pipeline present in source project' do
+    include WaitForAjax
+
+    given(:pipeline) do
+      create(:ci_commit_with_two_jobs, project: fork_project,
+                                       sha: merge_request.last_commit.id,
+                                       ref: merge_request.source_branch)
+    end
+
+    background { pipeline.create_builds(user) }
+
+    scenario 'user visits a pipelines page', js: true do
+      visit_merge_request(merge_request)
+      page.within('.merge-request-tabs') { click_link 'Builds' }
+      wait_for_ajax
+
+      page.within('table.builds') do
+        expect(page).to have_content 'rspec'
+        expect(page).to have_content 'spinach'
+      end
+
+      expect(find_link('Cancel running')[:href])
+        .to include fork_project.path_with_namespace
+    end
+  end
+
+  def visit_merge_request(mr)
+    visit namespace_project_merge_request_path(project.namespace,
+                                               project, mr)
+  end
 end

From d133175b39e7588608d928ca655a2cc0341295f2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 1 Jun 2016 10:27:53 +0200
Subject: [PATCH 0931/1431] User internal pipeline to access project in views

---
 app/views/projects/commit/_ci_commit.html.haml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index ce5c550b441..32ff4d30977 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -1,24 +1,24 @@
 .row-content-block.build-content.middle-block
   .pull-right
-    - if can?(current_user, :update_pipeline, @project)
+    - if can?(current_user, :update_pipeline, ci_commit.project)
       - if ci_commit.builds.latest.failed.any?(&:retryable?)
-        = link_to "Retry failed", retry_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post
+        = link_to "Retry failed", retry_namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post
 
       - if ci_commit.builds.running_or_pending.any?
-        = link_to "Cancel running", cancel_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
+        = link_to "Cancel running", cancel_namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
 
   .oneline.clearfix
     - if defined?(pipeline_details) && pipeline_details
       Pipeline
-      = link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace"
+      = link_to "##{ci_commit.id}", namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), class: "monospace"
       with
       = pluralize ci_commit.statuses.count(:id), "build"
       - if ci_commit.ref
         for
-        = link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace"
+        = link_to ci_commit.ref, namespace_project_commits_path(ci_commit.project.namespace, ci_commit.project, ci_commit.ref), class: "monospace"
       - if defined?(link_to_commit) && link_to_commit
         for commit
-        = link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
+        = link_to ci_commit.short_sha, namespace_project_commit_path(ci_commit.project.namespace, ci_commit.project, ci_commit.sha), class: "monospace"
       - if ci_commit.duration
         in
         = time_interval_in_words ci_commit.duration
@@ -31,7 +31,7 @@
         %li= error
     You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
 
-- if @project.builds_enabled? && !ci_commit.ci_yaml_file
+- if ci_commit.project.builds_enabled? && !ci_commit.ci_yaml_file
   .bs-callout.bs-callout-warning
     \.gitlab-ci.yml not found in this commit
 
@@ -45,7 +45,7 @@
         %th Tags
         %th Duration
         %th Finished at
-        - if @project.build_coverage_enabled?
+        - if ci_commit.project.build_coverage_enabled?
           %th Coverage
         %th
     - ci_commit.statuses.stages.each do |stage|

From 888e6fad3e78537de2884d738248f2daa1c5958f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 1 Jun 2016 10:37:01 +0200
Subject: [PATCH 0932/1431] Add Changelog entry for links fix on pipeline page

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

diff --git a/CHANGELOG b/CHANGELOG
index fcaf022b416..f9d580e715c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ v 8.9.0 (unreleased)
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
 
 v 8.8.3
+  - Fix incorrect links on pipeline page when merge request created from fork
   - Fix gitlab importer failing to import new projects due to missing credentials
   - Fix import URL migration not rescuing with the correct Error
 

From 91a7b9333b660abc866e52e1a614151cb529413d Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Wed, 1 Jun 2016 11:23:09 +0200
Subject: [PATCH 0933/1431] Incorportate feedback

---
 app/models/concerns/issuable.rb               |  4 ++
 app/models/legacy_diff_note.rb                |  4 ++
 app/models/note.rb                            | 16 +-------
 app/services/notes/post_process_service.rb    |  2 +-
 app/services/notification_service.rb          |  2 +-
 app/views/award_emoji/_awards_block.html.haml |  8 ++--
 .../emoji_awards/_awards_block.html.haml      | 18 ---------
 config/routes.rb                              |  1 -
 db/migrate/20160416180807_add_award_emoji.rb  |  3 +-
 ...82152_convert_award_note_to_emoji_award.rb |  2 +
 db/schema.rb                                  |  3 +-
 features/steps/project/merge_requests.rb      |  2 +-
 lib/api/entities.rb                           |  2 +
 lib/gitlab/award_emoji.rb                     | 18 +++++----
 spec/controllers/groups_controller_spec.rb    |  4 +-
 .../projects/issues_controller_spec.rb        |  6 +--
 spec/factories/award_emoji.rb                 |  6 ---
 spec/features/issues/award_spec.rb            | 35 +++---------------
 spec/features/merge_requests/award_spec.rb    | 37 ++++---------------
 spec/features/notes_on_merge_requests_spec.rb | 25 -------------
 spec/models/award_emoji_spec.rb               |  3 +-
 21 files changed, 52 insertions(+), 149 deletions(-)
 delete mode 100644 app/views/emoji_awards/_awards_block.html.haml

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 57ded0f91ad..1fc0e002f47 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -133,6 +133,10 @@ module Issuable
     opened? || reopened?
   end
 
+  def user_notes_count
+    notes.user.count
+  end
+
   def subscribed_without_subscriptions?(user)
     participants(user).include?(user)
   end
diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb
index bbefc911b29..95fd510eb3a 100644
--- a/app/models/legacy_diff_note.rb
+++ b/app/models/legacy_diff_note.rb
@@ -110,6 +110,10 @@ class LegacyDiffNote < Note
     @active
   end
 
+  def award_emoji_supported?
+    false
+  end
+
   private
 
   def find_diff
diff --git a/app/models/note.rb b/app/models/note.rb
index bbe5545dc80..f99d327a5b8 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -21,10 +21,8 @@ class Note < ActiveRecord::Base
   delegate :name, :email, to: :author, prefix: true
   delegate :title, to: :noteable, allow_nil: true
 
-  before_validation :clear_blank_line_code!
-
   validates :note, :project, presence: true
-  validates :line_code, line_code: true, allow_blank: true
+
   # Attachments are deprecated and are handled by Markdown uploader
   validates :attachment, file_size: { maximum: :max_attachment_size }
 
@@ -173,10 +171,6 @@ class Note < ActiveRecord::Base
     Event.reset_event_cache_for(self)
   end
 
-  def system?
-    read_attribute(:system)
-  end
-
   def editable?
     !system?
   end
@@ -193,14 +187,8 @@ class Note < ActiveRecord::Base
     self.line_code = nil if self.line_code.blank?
   end
 
-  # Find the diff on noteable that matches our own
-  def find_noteable_diff
-    diffs = noteable.diffs(Commit.max_diff_options)
-    diffs.find { |d| d.new_path == self.diff.new_path }
-  end
-
   def award_emoji_supported?
-    noteable.is_a?(Awardable) && !line_code.present?
+    noteable.is_a?(Awardable)
   end
 
   def contains_emoji_only?
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index c1bf46bdfb3..534c48aefff 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -8,7 +8,7 @@ module Notes
 
     def execute
       # Skip system notes, like status changes and cross-references and awards
-      unless @note.system
+      unless @note.system?
         EventCreateService.new.leave_note(@note, @note.author)
         @note.create_cross_references!
         execute_note_hooks
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 703636658b7..91ca82ed3b7 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -130,7 +130,7 @@ class NotificationService
 
     # ignore gitlab service messages
     return true if note.note.start_with?('Status changed to closed')
-    return true if note.cross_reference? && note.system == true
+    return true if note.cross_reference? && note.system?
 
     target = note.noteable
 
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index 19d1275a926..f1f93c1375b 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -1,7 +1,7 @@
 - grouped_emojis = awardable.grouped_awards(with_thumbs: inline)
-.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
+.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
   - awards_sort(grouped_emojis).each do |emoji, awards|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)),data: { placement: "bottom", title:  award_user_list(awards, current_user) } }
+    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } }
       = emoji_icon(emoji)
       %span.award-control-text.js-counter
         = awards.count
@@ -12,7 +12,7 @@
 
     .award-menu-holder.js-award-holder
       %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
-        = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
-        = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
+        = icon('smile-o', class: "award-control-icon award-control-icon-normal")
+        = icon('spinner spin', class: "award-control-icon award-control-icon-loading")
         %span.award-control-text
           Add
diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml
deleted file mode 100644
index e9b286b7c3f..00000000000
--- a/app/views/emoji_awards/_awards_block.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
-- grouped_emojis = awardable.grouped_awards(inline)
-.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
-  - awards_sort(grouped_emojis).each do |emoji, awards|
-    %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user), data: { placement: "bottom" } }
-      = emoji_icon(emoji)
-      %span.award-control-text.js-counter
-        = awards.count
-
-  - if current_user
-    :javascript
-      gl.awardMenuUrl = emojis_path
-
-    .award-menu-holder.js-award-holder
-      %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
-        = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})
-        = icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
-        %span.award-control-text
-          Add
diff --git a/config/routes.rb b/config/routes.rb
index 85760409c1f..cd28c421fe2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -754,7 +754,6 @@ Rails.application.routes.draw do
         resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
           member do
             delete :delete_attachment
-            post :toggle_award_emoji
           end
         end
 
diff --git a/db/migrate/20160416180807_add_award_emoji.rb b/db/migrate/20160416180807_add_award_emoji.rb
index 3177b86a133..2ead181921b 100644
--- a/db/migrate/20160416180807_add_award_emoji.rb
+++ b/db/migrate/20160416180807_add_award_emoji.rb
@@ -9,7 +9,6 @@ class AddAwardEmoji < ActiveRecord::Migration
     end
 
     add_index :award_emoji, :user_id
-    add_index :award_emoji, :awardable_type
-    add_index :award_emoji, :awardable_id
+    add_index :award_emoji, [:awardable_type, :awardable_id]
   end
 end
diff --git a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
index d2efbd0abea..073bbc0fc2a 100644
--- a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
+++ b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
@@ -2,6 +2,8 @@ class ConvertAwardNoteToEmojiAward < ActiveRecord::Migration
   def change
     def up
       execute "INSERT INTO award_emoji (awardable_type, awardable_id, user_id, name, created_at, updated_at) (SELECT noteable_type, noteable_id, author_id, note, created_at, updated_at FROM notes WHERE is_award = true)"
+
+      execute "DELETE FROM notes WHERE is_award = true"
     end
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 9ef68efc4e5..e784f24bb8e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -108,8 +108,7 @@ ActiveRecord::Schema.define(version: 20160528043124) do
     t.datetime "updated_at"
   end
 
-  add_index "award_emoji", ["awardable_id"], name: "index_award_emoji_on_awardable_id", using: :btree
-  add_index "award_emoji", ["awardable_type"], name: "index_award_emoji_on_awardable_type", using: :btree
+  add_index "award_emoji", ["awardable_type", "awardable_id"], name: "index_award_emoji_on_awardable_type_and_awardable_id", using: :btree
   add_index "award_emoji", ["user_id"], name: "index_award_emoji_on_user_id", using: :btree
 
   create_table "broadcast_messages", force: :cascade do |t|
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index f6fafe81194..11978aa65a1 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -186,7 +186,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'merge request "Bug NS-06" have 1 upvote and 2 downvotes' do
     awardable = MergeRequest.find_by(title: 'Bug NS-06')
     create(:award_emoji, awardable: awardable)
-    create_list(:award_emoji, 2, awardable: awardable, name: "thumbsdown")
+    create_list(:award_emoji, 2, :downvote, awardable: awardable)
   end
 
   step 'The list should be sorted by "Least popular"' do
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 43e0ba388d0..a5582490a3a 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -175,6 +175,7 @@ module API
       expose :subscribed do |issue, options|
         issue.subscribed?(options[:current_user])
       end
+      expose :user_notes_count
       expose :upvotes, :downvotes
     end
 
@@ -192,6 +193,7 @@ module API
       expose :subscribed do |merge_request, options|
         merge_request.subscribed?(options[:current_user])
       end
+      expose :user_notes_count
     end
 
     class MergeRequestChanges < MergeRequest
diff --git a/lib/gitlab/award_emoji.rb b/lib/gitlab/award_emoji.rb
index 0ae220a86bc..51b1df9ecbd 100644
--- a/lib/gitlab/award_emoji.rb
+++ b/lib/gitlab/award_emoji.rb
@@ -47,17 +47,19 @@ module Gitlab
     end
 
     def self.emojis
-      @emojis ||= begin
-                    json_path = File.join(Rails.root, 'fixtures', 'emojis', 'index.json' )
-                    JSON.parse(File.read(json_path))
-                  end
+      @emojis ||=
+        begin
+          json_path = File.join(Rails.root, 'fixtures', 'emojis', 'index.json' )
+          JSON.parse(File.read(json_path))
+        end
     end
 
     def self.aliases
-      @aliases ||= begin
-                     json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
-                     JSON.parse(File.read(json_path))
-                   end
+      @aliases ||=
+        begin
+         json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
+         JSON.parse(File.read(json_path))
+       end
     end
 
     # Returns an Array of Emoji names and their asset URLs.
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 82b25702172..cd98fecd0c7 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -33,7 +33,7 @@ describe GroupsController do
     before do
       create_list(:award_emoji, 3, awardable: issue_2)
       create_list(:award_emoji, 2, awardable: issue_1)
-      create_list(:award_emoji, 2, awardable: issue_2, name: "thumbsdown")
+      create_list(:award_emoji, 2, :downvote, awardable: issue_2,)
 
       sign_in(user)
     end
@@ -58,7 +58,7 @@ describe GroupsController do
     before do
       create_list(:award_emoji, 3, awardable: merge_request_2)
       create_list(:award_emoji, 2, awardable: merge_request_1)
-      create_list(:award_emoji, 2, awardable: merge_request_2, name: "thumbsdown")
+      create_list(:award_emoji, 2, :downvote, awardable: merge_request_2)
 
       sign_in(user)
     end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 849816b9caf..78be7e3dc35 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -258,10 +258,10 @@ describe Projects::IssuesController do
     end
 
     it "toggles the award emoji" do
-      expect do 
+      expect do
         post(:toggle_award_emoji, namespace_id: project.namespace.path,
-                                  project_id: project.path, id: issue.iid, name: "thumbsup") 
-      end.to change { AwardEmoji.count }.by(1)
+                                  project_id: project.path, id: issue.iid, name: "thumbsup")
+      end.to change { issue.award_emoji.count }.by(1)
 
       expect(response.status).to eq(200)
     end
diff --git a/spec/factories/award_emoji.rb b/spec/factories/award_emoji.rb
index b09f8b0bc74..4b858df52c9 100644
--- a/spec/factories/award_emoji.rb
+++ b/spec/factories/award_emoji.rb
@@ -4,13 +4,7 @@ FactoryGirl.define do
     user
     awardable factory: :issue
 
-    trait :thumbs_up
     trait :upvote
-
-    trait :thumbs_down do
-      name "thumbsdown"
-    end
-
     trait :downvote do
       name "thumbsdown"
     end
diff --git a/spec/features/issues/award_spec.rb b/spec/features/issues/award_spec.rb
index eafd517c840..63efecf8780 100644
--- a/spec/features/issues/award_spec.rb
+++ b/spec/features/issues/award_spec.rb
@@ -4,7 +4,6 @@ feature 'Issue awards', js: true, feature: true do
   let(:user)      { create(:user) }
   let(:project)   { create(:project, :public) }
   let(:issue)     { create(:issue, project: project) }
-  let!(:note)     { create(:note_on_issue, project: project, noteable: issue, note: 'Looks good!') }
 
   describe 'logged in' do
     before do
@@ -16,12 +15,18 @@ feature 'Issue awards', js: true, feature: true do
       first('.js-emoji-btn').click
       expect(page).to have_selector('.js-emoji-btn.active')
       expect(first('.js-emoji-btn')).to have_content '1'
+
+      visit namespace_project_issue_path(project.namespace, project, issue)
+      expect(first('.js-emoji-btn')).to have_content '1'
     end
 
     it 'should remove award from issue' do
       first('.js-emoji-btn').click
       find('.js-emoji-btn.active').click
       expect(first('.js-emoji-btn')).to have_content '0'
+
+      visit namespace_project_issue_path(project.namespace, project, issue)
+      expect(first('.js-emoji-btn')).to have_content '0'
     end
 
     it 'should only have one menu on the page' do
@@ -40,33 +45,5 @@ feature 'Issue awards', js: true, feature: true do
     it 'should not see award menu button' do
       expect(page).not_to have_selector('.js-award-holder')
     end
-
-    it 'should not see award menu button in note' do
-      page.within('.note') do
-        expect(page).not_to have_selector('.js-award-action-btn')
-      end
-    end
-  end
-
-  def show_note_award_menu
-    page.within('.note') do
-      find('.js-add-award').click
-    end
-    expect(page).to have_selector('.emoji-menu')
-  end
-
-  def award_on_note(index = 1)
-    page.within('.emoji-menu') do
-      buttons = all('.js-emoji-btn')
-      buttons[index].click
-    end
-  end
-
-  def remove_award_on_note
-    page.within('.note') do
-      page.within('.js-awards-block') do
-        first('.js-emoji-btn').click
-      end
-    end
   end
 end
diff --git a/spec/features/merge_requests/award_spec.rb b/spec/features/merge_requests/award_spec.rb
index 4d3e8173ebe..007f67d6080 100644
--- a/spec/features/merge_requests/award_spec.rb
+++ b/spec/features/merge_requests/award_spec.rb
@@ -3,8 +3,7 @@ require 'rails_helper'
 feature 'Merge request awards', js: true, feature: true do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
-  let(:merge_request) { create(:merge_request_with_diffs, source_project: project) }
-  let!(:note) { create(:note_on_merge_request, project: project, noteable: merge_request, note: 'Looks good!') }
+  let(:merge_request) { create(:merge_request, source_project: project) }
 
   describe 'logged in' do
     before do
@@ -16,12 +15,18 @@ feature 'Merge request awards', js: true, feature: true do
       first('.js-emoji-btn').click
       expect(page).to have_selector('.js-emoji-btn.active')
       expect(first('.js-emoji-btn')).to have_content '1'
+
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+      expect(first('.js-emoji-btn')).to have_content '1'
     end
 
     it 'should remove award from merge request' do
       first('.js-emoji-btn').click
       find('.js-emoji-btn.active').click
       expect(first('.js-emoji-btn')).to have_content '0'
+
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+      expect(first('.js-emoji-btn')).to have_content '0'
     end
 
     it 'should only have one menu on the page' do
@@ -40,33 +45,5 @@ feature 'Merge request awards', js: true, feature: true do
     it 'should not see award menu button' do
       expect(page).not_to have_selector('.js-award-holder')
     end
-
-    it 'should not see award menu button in note' do
-      page.within('.note') do
-        expect(page).not_to have_selector('.js-award-action-btn')
-      end
-    end
-  end
-
-  def show_note_award_menu
-    page.within('.note') do
-      find('.js-add-award').click
-    end
-    expect(page).to have_selector('.emoji-menu')
-  end
-
-  def award_on_note(index = 1)
-    page.within('.emoji-menu') do
-      buttons = all('.js-emoji-btn')
-      buttons[index].click
-    end
-  end
-
-  def remove_award_on_note
-    page.within('.note') do
-      page.within('.js-awards-block') do
-        first('.js-emoji-btn').click
-      end
-    end
   end
 end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index de52460f15f..737efcef45d 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -4,20 +4,6 @@ describe 'Comments', feature: true do
   include RepoHelpers
   include WaitForAjax
 
-  describe 'On merge requests page', feature: true do
-    it 'excludes award_emoji from comment count' do
-      merge_request = create(:merge_request)
-      project = merge_request.source_project
-      create(:award_emoji, awardable: merge_request)
-
-      login_as :admin
-      visit namespace_project_merge_requests_path(project.namespace, project)
-
-      expect(merge_request.mr_and_commit_notes.count).to eq 0
-      expect(page.all('.merge-request-no-comments').first.text).to eq "0"
-    end
-  end
-
   describe 'On a merge request', js: true, feature: true do
     let!(:project) { create(:project) }
     let!(:merge_request) do
@@ -147,17 +133,6 @@ describe 'Comments', feature: true do
         end
       end
     end
-
-    describe 'comment info' do
-      it 'excludes award_emoji from comment count' do
-        create(:award_emoji, awardable: merge_request)
-
-        visit namespace_project_merge_request_path(project.namespace, project, merge_request)
-
-        expect(merge_request.mr_and_commit_notes.count).to eq 1
-        expect(find('.notes-tab span.badge').text).to eq "1"
-      end
-    end
   end
 
   describe 'On a merge request diff', js: true, feature: true do
diff --git a/spec/models/award_emoji_spec.rb b/spec/models/award_emoji_spec.rb
index fd3712b7d43..cb3c592f8cd 100644
--- a/spec/models/award_emoji_spec.rb
+++ b/spec/models/award_emoji_spec.rb
@@ -14,7 +14,6 @@ describe AwardEmoji, models: true do
     it { is_expected.to validate_presence_of(:awardable) }
     it { is_expected.to validate_presence_of(:user) }
     it { is_expected.to validate_presence_of(:name) }
-    it { is_expected.to validate_presence_of(:awardable) }
 
     # To circumvent a bug in the shoulda matchers
     describe "scoped uniqueness validation" do
@@ -22,7 +21,7 @@ describe AwardEmoji, models: true do
         user  = create(:user)
         issue = create(:issue)
         create(:award_emoji, user: user, awardable: issue)
-        new_award = AwardEmoji.new(user: user, awardable: issue, name: "thumbsup")
+        new_award = build(:award_emoji, user: user, awardable: issue)
 
         expect(new_award).not_to be_valid
       end

From 57992f3d03115e391322f53839f5121e7a740120 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 1 Jun 2016 13:10:00 +0200
Subject: [PATCH 0934/1431] Fix rubocop offenses

---
 spec/features/pipelines_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 55754008d8a..acd6fb3538c 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -69,7 +69,7 @@ describe "Pipelines" do
         before { visit namespace_project_pipelines_path(project.namespace, project) }
 
         it 'not be cancelable' do
-          expect(page).to_not have_link('Cancel')
+          expect(page).not_to have_link('Cancel')
         end
 
         it 'pipeline is running' do
@@ -83,7 +83,7 @@ describe "Pipelines" do
         before { visit namespace_project_pipelines_path(project.namespace, project) }
 
         it 'not be retryable' do
-          expect(page).to_not have_link('Retry')
+          expect(page).not_to have_link('Retry')
         end
 
         it 'pipeline is failed' do

From ea80259b489a028513f096d50c99f31eaaaaf201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 1 Jun 2016 14:18:37 +0200
Subject: [PATCH 0935/1431] Don't advertise the use of "ci skip" in the
 CONTRIBUTING guide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that we autoscale runner, we don't need to optimize for their usage
anymore. Abusing of "ci skip", for instance for view changes can lead to
broken specs, so let's just not use it!

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CONTRIBUTING.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9fe4cf7b0f6..a15f8c4fec7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -311,13 +311,11 @@ request is as follows:
 1. Create a feature branch
 1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code
 1. Add your changes to the [CHANGELOG](CHANGELOG)
-1. If you are changing the README, some documentation or other things which
-   have no effect on the tests, add `[ci skip]` somewhere in the commit message
-   and make sure to read the [documentation styleguide][doc-styleguide]
+1. If you are writing documentation, make sure to read the [documentation styleguide][doc-styleguide]
 1. If you have multiple commits please combine them into one commit by
    [squashing them][git-squash]
 1. Push the commit(s) to your fork
-1. Submit a merge request (MR) to the master branch
+1. Submit a merge request (MR) to the `master` branch
 1. The MR title should describe the change you want to make
 1. The MR description should give a motive for your change and the method you
    used to achieve it, see the [merge request description format]

From 580d250166d97bd5c2b0526be737d02806e577c2 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 26 May 2016 13:38:28 +0200
Subject: [PATCH 0936/1431] Refactor Participable

There are several changes to this module:

1. The use of an explicit stack in Participable#participants
2. Proc behaviour has been changed
3. Batch permissions checking

== Explicit Stack

Participable#participants no longer uses recursion to process "self" and
all child objects, instead it uses an Array and processes objects in
breadth-first order. This allows us to for example create a single
Gitlab::ReferenceExtractor instance and pass this to any Procs. Re-using
a ReferenceExtractor removes the need for running potentially many SQL
queries every time a Proc is called on a new object.

== Proc Behaviour Changed

Previously a Proc in Participable was expected to return an Array of
User instances. This has been changed and instead it's now expected that
a Proc modifies the Gitlab::ReferenceExtractor passed to it. The return
value of the Proc is ignored.

== Permissions Checking

The method Participable#participants uses
Ability.users_that_can_read_project to check if the returned users have
access to the project of "self" _without_ running multiple SQL queries
for every user.
---
 app/models/ability.rb                     |  22 ++++
 app/models/commit.rb                      |  23 +++--
 app/models/concerns/issuable.rb           |   8 +-
 app/models/concerns/participable.rb       |  94 +++++++++--------
 app/models/issue.rb                       |  23 +++--
 app/models/note.rb                        |   2 +-
 app/models/project_snippet.rb             |   3 +-
 app/models/snippet.rb                     |   7 +-
 spec/models/ability_spec.rb               | 117 ++++++++++++++++++++++
 spec/models/commit_range_spec.rb          |  23 +++++
 spec/models/commit_spec.rb                |  38 ++++++-
 spec/models/concerns/participable_spec.rb |  83 +++++++++++++++
 spec/models/issue_spec.rb                 |  38 +++++++
 spec/models/merge_request_spec.rb         |  24 +++++
 spec/models/note_spec.rb                  |  25 ++++-
 spec/models/snippet_spec.rb               |  27 +++++
 16 files changed, 491 insertions(+), 66 deletions(-)
 create mode 100644 spec/models/ability_spec.rb
 create mode 100644 spec/models/concerns/participable_spec.rb

diff --git a/app/models/ability.rb b/app/models/ability.rb
index b354b1990c7..2a433afe3a6 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -23,6 +23,28 @@ class Ability
       end.concat(global_abilities(user))
     end
 
+    # Given a list of users and a project this method returns the users that can
+    # read the given project.
+    def users_that_can_read_project(users, project)
+      if project.public?
+        users
+      else
+        users.select do |user|
+          if user.admin?
+            true
+          elsif project.internal? && !user.external?
+            true
+          elsif project.owner == user
+            true
+          elsif project.team.members.include?(user)
+            true
+          else
+            false
+          end
+        end
+      end
+    end
+
     # List of possible abilities for anonymous user
     def anonymous_abilities(user, subject)
       case true
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 562c3ed15b2..f96c7cb34d0 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -8,7 +8,10 @@ class Commit
   include StaticModel
 
   attr_mentionable :safe_message, pipeline: :single_line
-  participant :author, :committer, :notes
+
+  participant :author
+  participant :committer
+  participant :notes_with_associations
 
   attr_accessor :project
 
@@ -194,6 +197,10 @@ class Commit
     project.notes.for_commit_id(self.id)
   end
 
+  def notes_with_associations
+    notes.includes(:author, :project)
+  end
+
   def method_missing(m, *args, &block)
     @raw.send(m, *args, &block)
   end
@@ -219,7 +226,7 @@ class Commit
   def revert_branch_name
     "revert-#{short_id}"
   end
-  
+
   def cherry_pick_branch_name
     project.repository.next_branch("cherry-pick-#{short_id}", mild: true)
   end
@@ -251,11 +258,13 @@ class Commit
   end
 
   def has_been_reverted?(current_user = nil, noteable = self)
-    Gitlab::ReferenceExtractor.lazily do
-      noteable.notes.system.flat_map do |note|
-        note.all_references(current_user).commits
-      end
-    end.any? { |commit_ref| commit_ref.reverts_commit?(self) }
+    ext = all_references(current_user)
+
+    noteable.notes_with_associations.system.each do |note|
+      note.all_references(current_user, extractor: ext)
+    end
+
+    ext.commits.any? { |commit_ref| commit_ref.reverts_commit?(self) }
   end
 
   def change_type_title
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 91315b3459f..0a26fb2df04 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -59,8 +59,12 @@ module Issuable
              prefix: true
 
     attr_mentionable :title, pipeline: :single_line
-    attr_mentionable :description, cache: true
-    participant :author, :assignee, :notes_with_associations
+    attr_mentionable :description
+
+    participant :author
+    participant :assignee
+    participant :notes_with_associations
+
     strip_attributes :title
 
     acts_as_paranoid
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index fc6f83b918b..9056722f45e 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -3,8 +3,6 @@
 # Contains functionality related to objects that can have participants, such as
 # an author, an assignee and people mentioned in its description or comments.
 #
-# Used by Issue, Note, MergeRequest, Snippet and Commit.
-#
 # Usage:
 #
 #     class Issue < ActiveRecord::Base
@@ -12,22 +10,36 @@
 #
 #       # ...
 #
-#       participant :author, :assignee, :notes, ->(current_user) { mentioned_users(current_user) }
+#       participant :author
+#       participant :assignee
+#       participant :notes
+#
+#       participant -> (current_user, ext) do
+#         ext.analyze('...')
+#       end
 #     end
 #
 #     issue = Issue.last
 #     users = issue.participants
-#     # `users` will contain the issue's author, its assignee,
-#     # all users returned by its #mentioned_users method,
-#     # as well as all participants to all of the issue's notes,
-#     # since Note implements Participable as well.
-#
 module Participable
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def participant(*attrs)
-      participant_attrs.concat(attrs)
+    # Adds a list of participant attributes. Attributes can either be symbols or
+    # Procs.
+    #
+    # When using a Proc instead of a Symbol the Proc will be given two
+    # arguments:
+    #
+    # 1. The current user (as an instance of User)
+    # 2. An instance of `Gitlab::ReferenceExtractor`
+    #
+    # It is expected that a Proc populates the given reference extractor
+    # instance with data. The return value of the Proc is ignored.
+    #
+    # attr - The name of the attribute or a Proc
+    def participant(attr)
+      participant_attrs << attr
     end
 
     def participant_attrs
@@ -35,42 +47,42 @@ module Participable
     end
   end
 
-  # Be aware that this method makes a lot of sql queries.
-  # Save result into variable if you are going to reuse it inside same request
-  def participants(current_user = self.author)
-    participants =
-      Gitlab::ReferenceExtractor.lazily do
-        self.class.participant_attrs.flat_map do |attr|
-          value =
-            if attr.respond_to?(:call)
-              instance_exec(current_user, &attr)
-            else
-              send(attr)
-            end
+  # Returns the users participating in a discussion.
+  #
+  # This method processes attributes of objects in breadth-first order.
+  #
+  # Returns an Array of User instances.
+  def participants(current_user = nil)
+    current_user ||= author
+    ext = Gitlab::ReferenceExtractor.new(project, current_user)
+    participants = Set.new
+    process = [self]
 
-          participants_for(value, current_user)
-        end.compact.uniq
-      end
+    until process.empty?
+      source = process.pop
 
-    unless Gitlab::ReferenceExtractor.lazy?
-      participants.select! do |user|
-        user.can?(:read_project, project)
+      case source
+      when User
+        participants << source
+      when Participable
+        source.class.participant_attrs.each do |attr|
+          if attr.respond_to?(:call)
+            source.instance_exec(current_user, ext, &attr)
+          else
+            process << source.__send__(attr)
+          end
+        end
+      when Enumerable, ActiveRecord::Relation
+        # This uses reverse_each so we can use "pop" to get the next value to
+        # process (in order). Using unshift instead of pop would require
+        # moving all Array values one index to the left (which can be
+        # expensive).
+        source.reverse_each { |obj| process << obj }
       end
     end
 
-    participants
-  end
+    participants.merge(ext.users)
 
-  private
-
-  def participants_for(value, current_user = nil)
-    case value
-    when User, Banzai::LazyReference
-      [value]
-    when Enumerable, ActiveRecord::Relation
-      value.flat_map { |v| participants_for(v, current_user) }
-    when Participable
-      value.participants(current_user)
-    end
+    Ability.users_that_can_read_project(participants.to_a, project)
   end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 2d4a9b9f19a..bd0fbc96d18 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -95,14 +95,13 @@ class Issue < ActiveRecord::Base
   end
 
   def referenced_merge_requests(current_user = nil)
-    @referenced_merge_requests ||= {}
-    @referenced_merge_requests[current_user] ||= begin
-      Gitlab::ReferenceExtractor.lazily do
-        [self, *notes].flat_map do |note|
-          note.all_references(current_user).merge_requests
-        end
-      end.sort_by(&:iid).uniq
+    ext = all_references(current_user)
+
+    notes_with_associations.each do |object|
+      object.all_references(current_user, extractor: ext)
     end
+
+    ext.merge_requests.sort_by(&:iid)
   end
 
   # All branches containing the current issue's ID, except for
@@ -139,9 +138,13 @@ class Issue < ActiveRecord::Base
   def closed_by_merge_requests(current_user = nil)
     return [] unless open?
 
-    notes.system.flat_map do |note|
-      note.all_references(current_user).merge_requests
-    end.uniq.select { |mr| mr.open? && mr.closes_issue?(self) }
+    ext = all_references(current_user)
+
+    notes.system.each do |note|
+      note.all_references(current_user, extractor: ext)
+    end
+
+    ext.merge_requests.select { |mr| mr.open? && mr.closes_issue?(self) }
   end
 
   def moved?
diff --git a/app/models/note.rb b/app/models/note.rb
index 55b98557244..35e5258fe3f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -6,7 +6,7 @@ class Note < ActiveRecord::Base
 
   default_value_for :system, false
 
-  attr_mentionable :note, cache: true, pipeline: :note
+  attr_mentionable :note, pipeline: :note
   participant :author
 
   belongs_to :project
diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb
index 5fba6baa204..25b5d777641 100644
--- a/app/models/project_snippet.rb
+++ b/app/models/project_snippet.rb
@@ -7,5 +7,6 @@ class ProjectSnippet < Snippet
   # Scopes
   scope :fresh, -> { order("created_at DESC") }
 
-  participant :author, :notes
+  participant :author
+  participant :notes_with_associations
 end
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 0a3c3b57669..407697b745c 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -30,7 +30,8 @@ class Snippet < ActiveRecord::Base
   scope :public_and_internal, -> { where(visibility_level: [Snippet::PUBLIC, Snippet::INTERNAL]) }
   scope :fresh,   -> { order("created_at DESC") }
 
-  participant :author, :notes
+  participant :author
+  participant :notes_with_associations
 
   def self.reference_prefix
     '$'
@@ -100,6 +101,10 @@ class Snippet < ActiveRecord::Base
     content.lines.count > 1000
   end
 
+  def notes_with_associations
+    notes.includes(:author, :project)
+  end
+
   class << self
     # Searches for snippets with a matching title or file name.
     #
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
new file mode 100644
index 00000000000..1acb5846fcf
--- /dev/null
+++ b/spec/models/ability_spec.rb
@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe Ability, lib: true do
+  describe '.users_that_can_read_project' do
+    context 'using a public project' do
+      it 'returns all the users' do
+        project = create(:project, :public)
+        user = build(:user)
+
+        expect(described_class.users_that_can_read_project([user], project)).
+          to eq([user])
+      end
+    end
+
+    context 'using an internal project' do
+      let(:project) { create(:project, :internal) }
+
+      it 'returns users that are administrators' do
+        user = build(:user, admin: true)
+
+        expect(described_class.users_that_can_read_project([user], project)).
+          to eq([user])
+      end
+
+      it 'returns internal users while skipping external users' do
+        user1 = build(:user)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([user1])
+      end
+
+      it 'returns external users if they are the project owner' do
+        user1 = build(:user, external: true)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(project).to receive(:owner).twice.and_return(user1)
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([user1])
+      end
+
+      it 'returns external users if they are project members' do
+        user1 = build(:user, external: true)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(project.team).to receive(:members).twice.and_return([user1])
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([user1])
+      end
+
+      it 'returns an empty Array if all users are external users without access' do
+        user1 = build(:user, external: true)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([])
+      end
+    end
+
+    context 'using a private project' do
+      let(:project) { create(:project, :private) }
+
+      it 'returns users that are administrators' do
+        user = build(:user, admin: true)
+
+        expect(described_class.users_that_can_read_project([user], project)).
+          to eq([user])
+      end
+
+      it 'returns external users if they are the project owner' do
+        user1 = build(:user, external: true)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(project).to receive(:owner).twice.and_return(user1)
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([user1])
+      end
+
+      it 'returns external users if they are project members' do
+        user1 = build(:user, external: true)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(project.team).to receive(:members).twice.and_return([user1])
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([user1])
+      end
+
+      it 'returns an empty Array if all users are internal users without access' do
+        user1 = build(:user)
+        user2 = build(:user)
+        users = [user1, user2]
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([])
+      end
+
+      it 'returns an empty Array if all users are external users without access' do
+        user1 = build(:user, external: true)
+        user2 = build(:user, external: true)
+        users = [user1, user2]
+
+        expect(described_class.users_that_can_read_project(users, project)).
+          to eq([])
+      end
+    end
+  end
+end
diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb
index 1cf51d8bab3..6bc496414a3 100644
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
@@ -145,4 +145,27 @@ describe CommitRange, models: true do
       end
     end
   end
+
+  describe '#has_been_reverted?' do
+    it 'returns true if the commit has been reverted' do
+      issue = create(:issue)
+
+      create(:note_on_issue,
+             noteable_id: issue.id,
+             system: true,
+             note: commit1.revert_description)
+
+      expect_any_instance_of(Commit).to receive(:reverts_commit?).
+        with(commit1).
+        and_return(true)
+
+      expect(commit1.has_been_reverted?(nil, issue)).to eq(true)
+    end
+
+    it 'returns false a commit has not been reverted' do
+      issue = create(:issue)
+
+      expect(commit1.has_been_reverted?(nil, issue)).to eq(false)
+    end
+  end
 end
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index ccb100cd96f..beca8708c9d 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Commit, models: true do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :public) }
   let(:commit)  { project.commit }
 
   describe 'modules' do
@@ -171,4 +171,40 @@ eos
   describe '#status' do
     # TODO: kamil
   end
+
+  describe '#participants' do
+    let(:user1) { build(:user) }
+    let(:user2) { build(:user) }
+
+    let!(:note1) do
+      create(:note_on_commit,
+             commit_id: commit.id,
+             project: project,
+             note: 'foo')
+    end
+
+    let!(:note2) do
+      create(:note_on_commit,
+             commit_id: commit.id,
+             project: project,
+             note: 'bar')
+    end
+
+    before do
+      allow(commit).to receive(:author).and_return(user1)
+      allow(commit).to receive(:committer).and_return(user2)
+    end
+
+    it 'includes the commit author' do
+      expect(commit.participants).to include(commit.author)
+    end
+
+    it 'includes the committer' do
+      expect(commit.participants).to include(commit.committer)
+    end
+
+    it 'includes the authors of the commit notes' do
+      expect(commit.participants).to include(note1.author, note2.author)
+    end
+  end
 end
diff --git a/spec/models/concerns/participable_spec.rb b/spec/models/concerns/participable_spec.rb
new file mode 100644
index 00000000000..7e4ea0f2d66
--- /dev/null
+++ b/spec/models/concerns/participable_spec.rb
@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe Participable, models: true do
+  let(:model) do
+    Class.new do
+      include Participable
+    end
+  end
+
+  describe '.participant' do
+    it 'adds the participant attributes to the existing list' do
+      model.participant(:foo)
+      model.participant(:bar)
+
+      expect(model.participant_attrs).to eq([:foo, :bar])
+    end
+  end
+
+  describe '#participants' do
+    it 'returns the list of participants' do
+      model.participant(:foo)
+      model.participant(:bar)
+
+      user1 = build(:user)
+      user2 = build(:user)
+      user3 = build(:user)
+      project = build(:project, :public)
+      instance = model.new
+
+      expect(instance).to receive(:foo).and_return(user2)
+      expect(instance).to receive(:bar).and_return(user3)
+      expect(instance).to receive(:project).twice.and_return(project)
+
+      participants = instance.participants(user1)
+
+      expect(participants).to include(user2)
+      expect(participants).to include(user3)
+    end
+
+    it 'supports attributes returning another Participable' do
+      other_model = Class.new { include Participable }
+
+      other_model.participant(:bar)
+      model.participant(:foo)
+
+      instance = model.new
+      other = other_model.new
+      user1 = build(:user)
+      user2 = build(:user)
+      project = build(:project, :public)
+
+      expect(instance).to receive(:foo).and_return(other)
+      expect(other).to receive(:bar).and_return(user2)
+      expect(instance).to receive(:project).twice.and_return(project)
+
+      expect(instance.participants(user1)).to eq([user2])
+    end
+
+    context 'when using a Proc as an attribute' do
+      it 'calls the supplied Proc' do
+        user1 = build(:user)
+        project = build(:project, :public)
+
+        user_arg = nil
+        ext_arg = nil
+
+        model.participant -> (user, ext) do
+          user_arg = user
+          ext_arg = ext
+        end
+
+        instance = model.new
+
+        expect(instance).to receive(:project).twice.and_return(project)
+
+        instance.participants(user1)
+
+        expect(user_arg).to eq(user1)
+        expect(ext_arg).to be_an_instance_of(Gitlab::ReferenceExtractor)
+      end
+    end
+  end
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 6540d77fbc0..87b3d8d650a 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -231,4 +231,42 @@ describe Issue, models: true do
       expect(issue.to_branch_name).to match /confidential-issue\z/
     end
   end
+
+  describe '#participants' do
+    context 'using a public project' do
+      let(:project) { create(:project, :public) }
+      let(:issue) { create(:issue, project: project) }
+
+      let!(:note1) do
+        create(:note_on_issue, noteable: issue, project: project, note: 'a')
+      end
+
+      let!(:note2) do
+        create(:note_on_issue, noteable: issue, project: project, note: 'b')
+      end
+
+      it 'includes the issue author' do
+        expect(issue.participants).to include(issue.author)
+      end
+
+      it 'includes the authors of the notes' do
+        expect(issue.participants).to include(note1.author, note2.author)
+      end
+    end
+
+    context 'using a private project' do
+      it 'does not include mentioned users that do not have access to the project' do
+        project = create(:project)
+        user = create(:user)
+        issue = create(:issue, project: project)
+
+        create(:note_on_issue,
+               noteable: issue,
+               project: project,
+               note: user.to_reference)
+
+        expect(issue.participants).not_to include(user)
+      end
+    end
+  end
 end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index e269ff26a04..30a8e3ec059 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -411,4 +411,28 @@ describe MergeRequest, models: true do
       end
     end
   end
+
+  describe '#participants' do
+    let(:project) { create(:project, :public) }
+
+    let(:mr) do
+      create(:merge_request, source_project: project, target_project: project)
+    end
+
+    let!(:note1) do
+      create(:note_on_merge_request, noteable: mr, project: project, note: 'a')
+    end
+
+    let!(:note2) do
+      create(:note_on_merge_request, noteable: mr, project: project, note: 'b')
+    end
+
+    it 'includes the merge request author' do
+      expect(mr.participants).to include(mr.author)
+    end
+
+    it 'includes the authors of the notes' do
+      expect(mr.participants).to include(note1.author, note2.author)
+    end
+  end
 end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 5d916f0e6a6..d158de6b967 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -93,8 +93,19 @@ describe Note, models: true do
     let!(:note2) { create(:note) }
 
     it "reads the rendered note body from the cache" do
-      expect(Banzai::Renderer).to receive(:render).with(note1.note, pipeline: :note, cache_key: [note1, "note"], project: note1.project)
-      expect(Banzai::Renderer).to receive(:render).with(note2.note, pipeline: :note, cache_key: [note2, "note"], project: note2.project)
+      expect(Banzai::Renderer).to receive(:render).
+        with(note1.note,
+             pipeline: :note,
+             cache_key: [note1, "note"],
+             project: note1.project,
+             author: note1.author)
+
+      expect(Banzai::Renderer).to receive(:render).
+        with(note2.note,
+             pipeline: :note,
+             cache_key: [note2, "note"],
+             project: note2.project,
+             author: note2.author)
 
       note1.all_references
       note2.all_references
@@ -195,4 +206,14 @@ describe Note, models: true do
       expect { note.valid? }.to change(note, :line_code).to(nil)
     end
   end
+
+  describe '#participants' do
+    it 'includes the note author' do
+      project = create(:project, :public)
+      issue = create(:issue, project: project)
+      note = create(:note_on_issue, noteable: issue, project: project)
+
+      expect(note.participants).to include(note.author)
+    end
+  end
 end
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index 7a613e360d4..789816bf2c7 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -87,4 +87,31 @@ describe Snippet, models: true do
       expect(described_class.search_code('FOO')).to eq([snippet])
     end
   end
+
+  describe '#participants' do
+    let(:project) { create(:project, :public) }
+    let(:snippet) { create(:snippet, content: 'foo', project: project) }
+
+    let!(:note1) do
+      create(:note_on_project_snippet,
+             noteable: snippet,
+             project: project,
+             note: 'a')
+    end
+
+    let!(:note2) do
+      create(:note_on_project_snippet,
+             noteable: snippet,
+             project: project,
+             note: 'b')
+    end
+
+    it 'includes the snippet author' do
+      expect(snippet.participants).to include(snippet.author)
+    end
+
+    it 'includes the note authors' do
+      expect(snippet.participants).to include(note1.author, note2.author)
+    end
+  end
 end

From fab695461afbc4d03fbbf8cfbf9c5d90760ce752 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Wed, 1 Jun 2016 18:33:49 +0200
Subject: [PATCH 0937/1431] Move awardables too when issue is moved

---
 app/services/issues/move_service.rb       | 9 +++++++++
 spec/services/issues/move_service_spec.rb | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index e61628086f0..138730ca355 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -24,6 +24,7 @@ module Issues
         @new_issue = create_new_issue
 
         rewrite_notes
+        rewrite_award_emoji
         add_note_moved_from
 
         # Old issue tasks
@@ -72,6 +73,14 @@ module Issues
       end
     end
 
+    def rewrite_award_emoji
+       @old_issue.award_emoji.each do |award|
+         new_award = award.dup
+         new_award.awardable = @new_issue
+         new_award.save
+       end
+     end
+
     def rewrite_content(content)
       return unless content
 
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 95fe6c2400a..93bf0f64963 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -39,6 +39,7 @@ describe Issues::MoveService, services: true do
       let!(:milestone2) do
         create(:milestone, project_id: new_project.id, title: 'v9.0')
       end
+      let!(:award_emoji) { create(:award_emoji, awardable: old_issue) }
 
       let!(:new_issue) { move_service.execute(old_issue, new_project) }
     end
@@ -115,6 +116,10 @@ describe Issues::MoveService, services: true do
         it 'preserves create time' do
           expect(old_issue.created_at).to eq new_issue.created_at
         end
+
+        it 'moves the award emoji' do
+          expect(old_issue.award_emoji.first.name).to eq new_issue.reload.award_emoji.first.name
+        end
       end
 
       context 'issue with notes' do

From 30aa64202b073e33834241589595a58a14080107 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 1 Jun 2016 09:56:06 -0700
Subject: [PATCH 0938/1431] Fix note validation spec failures

---
 spec/models/commit_range_spec.rb | 5 +++--
 spec/models/note_spec.rb         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb
index 6bc496414a3..384a38ebc69 100644
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
@@ -151,9 +151,10 @@ describe CommitRange, models: true do
       issue = create(:issue)
 
       create(:note_on_issue,
-             noteable_id: issue.id,
+             noteable: issue,
              system: true,
-             note: commit1.revert_description)
+             note: commit1.revert_description,
+             project: issue.project)
 
       expect_any_instance_of(Commit).to receive(:reverts_commit?).
         with(commit1).
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index b25150f7055..e9d89c9a847 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -154,7 +154,7 @@ describe Note, models: true do
     context "confidential issues" do
       let(:user) { create :user }
       let(:confidential_issue) { create(:issue, :confidential, author: user) }
-      let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue }
+      let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue, project: confidential_issue.project }
 
       it "returns notes with matching content if user can see the issue" do
         expect(described_class.search(confidential_note.note, as_user: user)).to eq([confidential_note])

From 22e7aab8fb5d6bf360311e0786060e4a7fb1c62f Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 1 Jun 2016 11:55:12 -0600
Subject: [PATCH 0939/1431] Add Edge to supported browsers list. [ci skip]

---
 doc/install/requirements.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 8cbd53cc27a..09c6211b3ab 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -150,3 +150,4 @@ On a very active server (10,000 active users) the Sidekiq process can use 1GB+ o
 - Safari 7+ (known problem: required fields in html5 do not work)
 - Opera (Latest released version)
 - Internet Explorer (IE) 11+ but please make sure that you have the `Compatibility View` mode disabled.
+- Edge (Latest stable version)

From 5b43eeee97f8e06a4ada4b173cb972c20d58d8ed Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 1 Jun 2016 21:13:29 +0300
Subject: [PATCH 0940/1431] Blur button tags when clicked. Fixes #17748.

http://stackoverflow.com/questions/23443579/how-to-stop-buttons-from-staying-depressed-with-bootstrap-3
---
 app/assets/javascripts/application.js.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 7c547ac843b..8f275510bad 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -219,6 +219,10 @@ $ ->
     form = btn.closest("form")
     new ConfirmDangerModal(form, text)
 
+
+  $(document).on 'click', 'button', ->
+    $(this).blur()
+
   $('input[type="search"]').each ->
     $this = $(this)
     $this.attr 'value', $this.val()

From 6e58e7ff7ce151fb7a8329faef69cd3a42194216 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 1 Jun 2016 20:43:33 +0200
Subject: [PATCH 0941/1431] Use downcased path to container repository as this
 is expected path by Docker

---
 CHANGELOG                   |  1 +
 app/models/project.rb       |  6 +++---
 spec/models/project_spec.rb | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 848aaa8506e..d1cde40c1c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ v 8.9.0 (unreleased)
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels
   - Remove 'main language' feature
   - Pipelines can be canceled only when there are running builds
+  - Use downcased path to container repository as this is expected path by Docker
   - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
diff --git a/app/models/project.rb b/app/models/project.rb
index c1d9bae44c9..13376da9948 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -313,17 +313,17 @@ class Project < ActiveRecord::Base
     return unless Gitlab.config.registry.enabled
 
     @container_registry_repository ||= begin
-      token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
+      token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace.downcase)
       url = Gitlab.config.registry.api_url
       host_port = Gitlab.config.registry.host_port
       registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
-      registry.repository(path_with_namespace)
+      registry.repository(path_with_namespace.downcase)
     end
   end
 
   def container_registry_repository_url
     if Gitlab.config.registry.enabled
-      "#{Gitlab.config.registry.host_port}/#{path_with_namespace}"
+      "#{Gitlab.config.registry.host_port}/#{path_with_namespace.downcase}"
     end
   end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6c1b0393682..65f06b51794 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -792,6 +792,13 @@ describe Project, models: true do
     subject { project.container_registry_repository }
 
     it { is_expected.not_to be_nil }
+
+    context 'for uppercase project path' do
+      let(:project) { create(:empty_project, path: 'PROJECT') }
+
+      it { expect(subject.path).not_to end_with(project.path) }
+      it { expect(subject.path).to end_with(project.path.downcase) }
+    end
   end
 
   describe '#container_registry_repository_url' do
@@ -810,6 +817,13 @@ describe Project, models: true do
       end
 
       it { is_expected.not_to be_nil }
+
+      context 'for uppercase project path' do
+        let(:project) { create(:empty_project, path: 'PROJECT') }
+
+        it { is_expected.not_to end_with(project.path) }
+        it { is_expected.to end_with(project.path.downcase) }
+      end
     end
 
     context 'for disabled registry' do

From ec1191a110166bb95e7aea1020ad7f3fb5ccf3d8 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 11:57:34 -0600
Subject: [PATCH 0942/1431] Disable 2FA field autocomplete, resolves #18021.

---
 app/views/devise/sessions/two_factor.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index 8c6a1552a53..fd5937a45ce 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -5,7 +5,7 @@
     .login-body
       = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
         = f.hidden_field :remember_me, value: params[resource_name][:remember_me]
-        = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor Authentication code', required: true, autofocus: true
+        = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor Authentication code', required: true, autofocus: true, autocomplete: 'off'
         %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
         .prepend-top-20
           = f.submit "Verify code", class: "btn btn-save"

From e5bb417cdef7d78d128a03295a34b9752ee73d35 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 31 May 2016 23:58:27 -0700
Subject: [PATCH 0943/1431] Reduce number of fog gem dependencies

Closes #15352
---
 CHANGELOG    |   1 +
 Gemfile      |   8 +++-
 Gemfile.lock | 114 ++++++++-------------------------------------------
 3 files changed, 24 insertions(+), 99 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 848aaa8506e..cd499ad187e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.9.0 (unreleased)
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
+  - Reduce number of fog gem dependencies
   - Remove project notification settings associated with deleted projects
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects
   - Redesign navigation for project pages
diff --git a/Gemfile b/Gemfile
index 540710712fc..0e8c42452d1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,8 +84,14 @@ gem "carrierwave", '~> 0.10.0'
 # Drag and Drop UI
 gem 'dropzonejs-rails', '~> 0.7.1'
 
+# for backups
+gem 'fog-aws', '~> 0.9'
+gem 'fog-core', '~> 1.40'
+gem 'fog-local', '~> 0.3'
+gem 'fog-google', '~> 0.3'
+gem 'fog-openstack', '~> 0.1'
+
 # for aws storage
-gem "fog", "~> 1.36.0"
 gem "unf", '~> 0.1.4'
 
 # Authorization
diff --git a/Gemfile.lock b/Gemfile.lock
index 146e95167b2..bdb42c61801 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
     RedCloth (4.2.9)
     ace-rails-ap (4.0.2)
     actionmailer (4.2.6)
@@ -186,7 +185,7 @@ GEM
     erubis (2.7.0)
     escape_utils (1.1.1)
     eventmachine (1.0.8)
-    excon (0.45.4)
+    excon (0.49.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
     factory_girl (4.5.0)
@@ -203,8 +202,6 @@ GEM
       multi_json
     ffaker (2.0.0)
     ffi (1.9.10)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
     flay (2.6.1)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
@@ -214,109 +211,28 @@ GEM
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
-    fog (1.36.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-aliyun (0.1.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.8.1)
+    fog-aws (0.9.2)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.35.0)
+    fog-core (1.40.0)
       builder
-      excon (~> 0.45)
+      excon (~> 0.49)
       formatador (~> 0.2)
-    fog-dynect (0.0.2)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
+    fog-google (0.3.2)
       fog-core
       fog-json
       fog-xml
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.2.1)
+    fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.0.3)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xenserver (0.2.2)
-      fog-core
-      fog-xml
+    fog-openstack (0.1.6)
+      fog-core (>= 1.39)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
@@ -425,11 +341,10 @@ GEM
     httpclient (2.7.0.1)
     i18n (0.7.0)
     ice_nine (0.11.1)
-    inflecto (0.0.2)
     influxdb (0.2.3)
       cause
       json
-    ipaddress (0.8.2)
+    ipaddress (0.8.3)
     jquery-atwho-rails (1.3.2)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
@@ -876,7 +791,6 @@ GEM
       builder
       expression_parser
       rinku
-    xml-simple (1.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -931,7 +845,11 @@ DEPENDENCIES
   ffaker (~> 2.0.0)
   flay
   flog
-  fog (~> 1.36.0)
+  fog-aws (~> 0.9)
+  fog-core (~> 1.40)
+  fog-google (~> 0.3)
+  fog-local (~> 0.3)
+  fog-openstack (~> 0.1)
   font-awesome-rails (~> 4.2)
   foreman
   fuubar (~> 2.0.0)

From 6e96035e265dd9072e32865c2973d77b4b72343f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 1 Jun 2016 10:29:44 -0600
Subject: [PATCH 0944/1431] Change color of canceled ci text to gray

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

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4f8a8748d3f..c0ae60add6a 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -79,11 +79,14 @@
     }
 
     &.ci-failed,
-    &.ci-canceled,
     &.ci-error {
       color: $gl-danger;
     }
 
+    &.ci-canceled {
+      color: $gl-gray;
+    }
+
     a.monospace {
       color: inherit;
     }

From d863d86aeb1993c2032da0610b3662e61960eb38 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 1 Jun 2016 10:21:22 +0100
Subject: [PATCH 0945/1431] Add `sha` parameter to MR accept API

The `sha` parameter is optional, and when present, must match the
current HEAD SHA of the source branch. Otherwise, the API call fails
with a 409 Conflict and a message containing the current HEAD for the
source branch.

Also tidy up some doc wording.
---
 CHANGELOG                                |  1 +
 doc/api/merge_requests.md                | 11 +++++++----
 lib/api/merge_requests.rb                |  5 +++++
 spec/requests/api/merge_requests_spec.rb | 13 +++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 848aaa8506e..eb037e1ab8b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.9.0 (unreleased)
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
   - Use gitlab-shell v3.0.0
+  - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
   - Add DB index on users.state
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 8217e30fe25..16b892dc3b7 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -413,11 +413,13 @@ curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.c
 
 Merge changes submitted with MR using this API.
 
-If merge success you get `200 OK`.
+If the merge succeeds you'll get a `200 OK`.
 
-If it has some conflicts and can not be merged - you get 405 and error message 'Branch cannot be merged'
+If it has some conflicts and can not be merged - you'll get a 405 and the error message 'Branch cannot be merged'
 
-If merge request is already merged or closed - you get 405 and error message 'Method Not Allowed'
+If merge request is already merged or closed - you'll get a 406 and the error message 'Method Not Allowed'
+
+If the `sha` parameter is passed and does not match the HEAD of the source - you'll get a 409 and the error message 'SHA does not match HEAD of source branch'
 
 If you don't have permissions to accept this merge request - you'll get a 401
 
@@ -431,7 +433,8 @@ Parameters:
 - `merge_request_id` (required)             - ID of MR
 - `merge_commit_message` (optional)         - Custom merge commit message
 - `should_remove_source_branch` (optional)  - if `true` removes the source branch
-- `merged_when_build_succeeds` (optional)    - if `true` the MR is merge when the build succeeds
+- `merged_when_build_succeeds` (optional)   - if `true` the MR is merged when the build succeeds
+- `sha` (optional)                          - if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail
 
 ```json
 {
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 4e7de8867b4..50baf4c09ad 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -218,6 +218,7 @@ module API
         #   merge_commit_message (optional)         - Custom merge commit message
         #   should_remove_source_branch (optional)  - When true, the source branch will be deleted if possible
         #   merge_when_build_succeeds (optional)    - When true, this MR will be merged when the build succeeds
+        #   sha (optional)                          - When present, must have the HEAD SHA of the source branch
         # Example:
         #   PUT /projects/:id/merge_requests/:merge_request_id/merge
         #
@@ -233,6 +234,10 @@ module API
 
           render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged?
 
+          if params[:sha] && merge_request.source_sha != params[:sha]
+            render_api_error!("SHA does not match HEAD of source branch: #{merge_request.target_sha}", 409)
+          end
+
           merge_params = {
             commit_message: params[:merge_commit_message],
             should_remove_source_branch: params[:should_remove_source_branch]
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 4b0111df149..5aa98ec4014 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -428,6 +428,19 @@ describe API::API, api: true  do
       expect(json_response['message']).to eq('401 Unauthorized')
     end
 
+    it "returns 409 if the SHA parameter doesn't match" do
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), sha: merge_request.source_sha.succ
+
+      expect(response.status).to eq(409)
+      expect(json_response['message']).to start_with('SHA does not match HEAD of source branch')
+    end
+
+    it "succeeds if the SHA parameter matches" do
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), sha: merge_request.source_sha
+
+      expect(response.status).to eq(200)
+    end
+
     it "enables merge when build succeeds if the ci is active" do
       allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
       allow(ci_commit).to receive(:active?).and_return(true)

From f680eca912f854373fc538ae1e9d0dcb60fcd310 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 1 Jun 2016 13:25:44 +0100
Subject: [PATCH 0946/1431] Don't allow merges with new commits

Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
the source branch when the form is submitted, show a warning (like with
a merge conflict) and don't merge the branch.
---
 CHANGELOG                                     |  1 +
 .../projects/merge_requests_controller.rb     |  5 ++
 .../projects/merge_requests/merge.js.haml     |  3 +
 .../widget/open/_accept.html.haml             |  1 +
 .../open/_merge_when_build_succeeds.html.haml |  2 +-
 .../widget/open/_sha_mismatch.html.haml       |  6 ++
 .../merge_requests_controller_spec.rb         | 86 +++++++++++++++++++
 7 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml

diff --git a/CHANGELOG b/CHANGELOG
index eb037e1ab8b..b998713e2f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.9.0 (unreleased)
   - Redesign account and email confirmation emails
   - Use gitlab-shell v3.0.0
   - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
+  - Don't allow MRs to be merged when commits were added since the last review / page load
   - Add DB index on users.state
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d54284d7b20..3142fe5c767 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -190,6 +190,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       return
     end
 
+    if params[:sha] != @merge_request.source_sha
+      @status = :sha_mismatch
+      return
+    end
+
     TodoService.new.merge_merge_request(merge_request, current_user)
 
     @merge_request.update(merge_error: nil)
diff --git a/app/views/projects/merge_requests/merge.js.haml b/app/views/projects/merge_requests/merge.js.haml
index 92ce479d463..84b6c9ebc5c 100644
--- a/app/views/projects/merge_requests/merge.js.haml
+++ b/app/views/projects/merge_requests/merge.js.haml
@@ -5,6 +5,9 @@
 - when :merge_when_build_succeeds
   :plain
     $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/merge_when_build_succeeds'))}");
+- when :sha_mismatch
+  :plain
+    $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/sha_mismatch'))}");
 - else
   :plain
     $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}");
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index cfdf4edac37..0d49b6471a9 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -2,6 +2,7 @@
 
 = form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-quick-submit js-requires-input' } do |f|
   = hidden_field_tag :authenticity_token, form_authenticity_token
+  = hidden_field_tag :sha, @merge_request.source_sha
   .accept-merge-holder.clearfix.js-toggle-container
     .clearfix
       .accept-action
diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
index b83ddcab3a4..ad898ff153b 100644
--- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
@@ -16,7 +16,7 @@
   - if remove_source_branch_button || user_can_cancel_automatic_merge
     .clearfix.prepend-top-10
       - if remove_source_branch_button
-        = link_to merge_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, merge_when_build_succeeds: true, should_remove_source_branch: true), remote: true, method: :post, class: "btn btn-grouped btn-primary btn-sm remove_source_branch" do
+        = link_to merge_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, merge_when_build_succeeds: true, should_remove_source_branch: true, sha: @merge_request.source_sha), remote: true, method: :post, class: "btn btn-grouped btn-primary btn-sm remove_source_branch" do
           = icon('times')
           Remove Source Branch When Merged
 
diff --git a/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
new file mode 100644
index 00000000000..a78583b7c61
--- /dev/null
+++ b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
@@ -0,0 +1,6 @@
+%h4
+  = icon("exclamation-triangle")
+  This merge request has new commits since the page was loaded.
+
+%p
+  Please review the new commits before merging.
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 4f621a43d7e..8499bf07e9f 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -185,6 +185,92 @@ describe Projects::MergeRequestsController do
     end
   end
 
+  describe 'POST #merge' do
+    let(:base_params) do
+      {
+        namespace_id: project.namespace.path,
+        project_id: project.path,
+        id: merge_request.iid,
+        format: 'raw'
+      }
+    end
+
+    context 'when the user does not have access' do
+      before do
+        project.team.truncate
+        project.team << [user, :reporter]
+        post :merge, base_params
+      end
+
+      it 'returns not found' do
+        expect(response).to be_not_found
+      end
+    end
+
+    context 'when the merge request is not mergeable' do
+      before do
+        merge_request.update_attributes(title: "WIP: #{merge_request.title}")
+
+        post :merge, base_params
+      end
+
+      it 'returns :failed' do
+        expect(assigns(:status)).to eq(:failed)
+      end
+    end
+
+    context 'when the sha parameter does not match the source SHA' do
+      before { post :merge, base_params.merge(sha: 'foo') }
+
+      it 'returns :sha_mismatch' do
+        expect(assigns(:status)).to eq(:sha_mismatch)
+      end
+    end
+
+    context 'when the sha parameter matches the source SHA' do
+      def merge_with_sha
+        post :merge, base_params.merge(sha: merge_request.source_sha)
+      end
+
+      it 'returns :success' do
+        merge_with_sha
+
+        expect(assigns(:status)).to eq(:success)
+      end
+
+      it 'starts the merge immediately' do
+        expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, anything)
+
+        merge_with_sha
+      end
+
+      context 'when merge_when_build_succeeds is passed' do
+        def merge_when_build_succeeds
+          post :merge, base_params.merge(sha: merge_request.source_sha, merge_when_build_succeeds: '1')
+        end
+
+        before do
+          create(:ci_empty_commit, project: project, sha: merge_request.source_sha, ref: merge_request.source_branch)
+        end
+
+        it 'returns :merge_when_build_succeeds' do
+          merge_when_build_succeeds
+
+          expect(assigns(:status)).to eq(:merge_when_build_succeeds)
+        end
+
+        it 'sets the MR to merge when the build succeeds' do
+          service = double(:merge_when_build_succeeds_service)
+
+          expect(MergeRequests::MergeWhenBuildSucceedsService).to receive(:new).with(project, anything, anything).and_return(service)
+          expect(service).to receive(:execute).with(merge_request)
+
+          merge_when_build_succeeds
+        end
+      end
+    end
+  end
+
   describe "DELETE #destroy" do
     it "denies access to users unless they're admin or project owner" do
       delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid

From 91496a09656948e713910a05f1c49417b628c26c Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Wed, 1 Jun 2016 14:44:29 -0500
Subject: [PATCH 0947/1431] Add gdb detach instructions

---
 doc/administration/troubleshooting/sidekiq.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/administration/troubleshooting/sidekiq.md b/doc/administration/troubleshooting/sidekiq.md
index 134a7583762..a776cd3f05e 100644
--- a/doc/administration/troubleshooting/sidekiq.md
+++ b/doc/administration/troubleshooting/sidekiq.md
@@ -150,6 +150,14 @@ To output a backtrace from all threads at once:
 apply all thread bt
 ```
 
+Once you're done debugging with `gdb`, be sure to detach from the process and
+exit:
+
+```
+detach
+exit
+```
+
 ## Check for blocking queries
 
 Sometimes the speed at which Sidekiq processes jobs can be so fast that it can

From c1923aef04d63050376e14033a6a04a1e3ae0904 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Wed, 1 Jun 2016 14:46:07 -0500
Subject: [PATCH 0948/1431] Explicitly mention advisory file locking

---
 doc/administration/high_availability/nfs.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index 49ff5d536a1..537f4f3501d 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -2,8 +2,8 @@
 
 ## Required NFS Server features
 
-**File locking**: GitLab **requires** file locking which is only supported
-natively in NFS version 4. NFSv3 also supports locking as long as
+**File locking**: GitLab **requires** advisory file locking, which is only
+supported natively in NFS version 4. NFSv3 also supports locking as long as
 Linux Kernel 2.6.5+ is used. We recommend using version 4 and do not
 specifically test NFSv3.
 

From d7c76d09993e2be529f3bb023aaea579e1c32f95 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 1 Jun 2016 13:46:30 -0600
Subject: [PATCH 0949/1431] Implement new row hover style

---
 app/assets/stylesheets/framework/variables.scss |  3 ++-
 app/assets/stylesheets/pages/tree.scss          | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 8c54d935b6c..f253da814bc 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -63,7 +63,8 @@ $gl-padding-top: 10px;
 /*
  * Misc
  */
-$row-hover: #f4f8fe;
+$row-hover: #f7faff;
+$row-hover-border: #b2d7ff;
 $progress-color: #c0392b;
 $avatar_radius: 50%;
 $header-height: 50px;
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index a84fc2e0318..f16fc7f388f 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -15,16 +15,23 @@
     margin-bottom: 0;
 
     tr {
-      > td, > th {
+      border-bottom: 1px solid $table-border-gray;
+      border-top: 1px solid $table-border-gray;
+
+      td, th {
         line-height: 23px;
       }
 
       &:hover {
-        td {
-          background: $row-hover;
-        }
         cursor: pointer;
+
+        td {
+          background-color: $row-hover;
+          border-top: 1px solid $row-hover-border;
+          border-bottom: 1px solid $row-hover-border;
+        }
       }
+
       &.selected {
         td {
           background: $gray-dark;

From 77cb8ec4d14e3a8b03164423176b3b95977ee809 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 1 Jun 2016 22:57:50 +0200
Subject: [PATCH 0950/1431] Introduce container_registry_path_with_namespace

---
 app/models/project.rb       | 10 +++++++---
 spec/models/project_spec.rb | 23 +++++++++--------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 13376da9948..525a82c7534 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -309,21 +309,25 @@ class Project < ActiveRecord::Base
     @repository ||= Repository.new(path_with_namespace, self)
   end
 
+  def container_registry_path_with_namespace
+    path_with_namespace.downcase
+  end
+
   def container_registry_repository
     return unless Gitlab.config.registry.enabled
 
     @container_registry_repository ||= begin
-      token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace.downcase)
+      token = Auth::ContainerRegistryAuthenticationService.full_access_token(container_registry_path_with_namespace)
       url = Gitlab.config.registry.api_url
       host_port = Gitlab.config.registry.host_port
       registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)
-      registry.repository(path_with_namespace.downcase)
+      registry.repository(container_registry_path_with_namespace)
     end
   end
 
   def container_registry_repository_url
     if Gitlab.config.registry.enabled
-      "#{Gitlab.config.registry.host_port}/#{path_with_namespace.downcase}"
+      "#{Gitlab.config.registry.host_port}/#{container_registry_path_with_namespace}"
     end
   end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 65f06b51794..338a4c3d3f0 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -784,6 +784,15 @@ describe Project, models: true do
     end
   end
 
+  describe '#container_registry_path_with_namespace' do
+    let(:project) { create(:empty_project, path: 'PROJECT') }
+
+    subject { project.container_registry_path_with_namespace }
+
+    it { is_expected.not_to eq(project.path_with_namespace) }
+    it { is_expected.to eq(project.path_with_namespace.downcase) }
+  end
+
   describe '#container_registry_repository' do
     let(:project) { create(:empty_project) }
 
@@ -792,13 +801,6 @@ describe Project, models: true do
     subject { project.container_registry_repository }
 
     it { is_expected.not_to be_nil }
-
-    context 'for uppercase project path' do
-      let(:project) { create(:empty_project, path: 'PROJECT') }
-
-      it { expect(subject.path).not_to end_with(project.path) }
-      it { expect(subject.path).to end_with(project.path.downcase) }
-    end
   end
 
   describe '#container_registry_repository_url' do
@@ -817,13 +819,6 @@ describe Project, models: true do
       end
 
       it { is_expected.not_to be_nil }
-
-      context 'for uppercase project path' do
-        let(:project) { create(:empty_project, path: 'PROJECT') }
-
-        it { is_expected.not_to end_with(project.path) }
-        it { is_expected.to end_with(project.path.downcase) }
-      end
     end
 
     context 'for disabled registry' do

From 0256e68399674e832204ba0d66626e994ef1cf3a Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 18:07:44 -0600
Subject: [PATCH 0951/1431] Remove d3 except for on pages where it's necessary.

---
 app/assets/javascripts/application.js.coffee             | 9 +++++++--
 app/assets/javascripts/stat_graph/application.js.coffee  | 7 +++++++
 .../javascripts/{ => stat_graph}/stat_graph.js.coffee    | 0
 .../{ => stat_graph}/stat_graph_contributors.js.coffee   | 1 -
 .../stat_graph_contributors_graph.js.coffee              | 2 --
 .../stat_graph_contributors_util.js.coffee               | 0
 app/helpers/javascript_helper.rb                         | 7 +++++++
 app/views/layouts/_head.html.haml                        | 3 +++
 app/views/projects/graphs/_head.html.haml                | 1 +
 config/application.rb                                    | 1 +
 10 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/stat_graph/application.js.coffee
 rename app/assets/javascripts/{ => stat_graph}/stat_graph.js.coffee (100%)
 rename app/assets/javascripts/{ => stat_graph}/stat_graph_contributors.js.coffee (98%)
 rename app/assets/javascripts/{ => stat_graph}/stat_graph_contributors_graph.js.coffee (99%)
 rename app/assets/javascripts/{ => stat_graph}/stat_graph_contributors_util.js.coffee (100%)
 create mode 100644 app/helpers/javascript_helper.rb

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 7c547ac843b..18c1aa0d4e2 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -18,7 +18,6 @@
 #= require jquery.atwho
 #= require jquery.scrollTo
 #= require jquery.turbolinks
-#= require d3
 #= require turbolinks
 #= require autosave
 #= require bootstrap/affix
@@ -51,7 +50,13 @@
 #= require shortcuts_network
 #= require jquery.nicescroll
 #= require date.format
-#= require_tree .
+#= require_directory ./behaviors
+#= require_directory ./blob
+#= require_directory ./ci
+#= require_directory ./commit
+#= require_directory ./extensions
+#= require_directory ./lib
+#= require_directory .
 #= require fuzzaldrin-plus
 #= require cropper
 
diff --git a/app/assets/javascripts/stat_graph/application.js.coffee b/app/assets/javascripts/stat_graph/application.js.coffee
new file mode 100644
index 00000000000..e0f681acf0b
--- /dev/null
+++ b/app/assets/javascripts/stat_graph/application.js.coffee
@@ -0,0 +1,7 @@
+# This is a manifest file that'll be compiled into including all the files listed below.
+# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+# be included in the compiled file accessible from http://example.com/assets/application.js
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+#= require_tree .
diff --git a/app/assets/javascripts/stat_graph.js.coffee b/app/assets/javascripts/stat_graph/stat_graph.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph.js.coffee
rename to app/assets/javascripts/stat_graph/stat_graph.js.coffee
diff --git a/app/assets/javascripts/stat_graph_contributors.js.coffee b/app/assets/javascripts/stat_graph/stat_graph_contributors.js.coffee
similarity index 98%
rename from app/assets/javascripts/stat_graph_contributors.js.coffee
rename to app/assets/javascripts/stat_graph/stat_graph_contributors.js.coffee
index 3be14cb43dd..1d9fae7cf79 100644
--- a/app/assets/javascripts/stat_graph_contributors.js.coffee
+++ b/app/assets/javascripts/stat_graph/stat_graph_contributors.js.coffee
@@ -1,5 +1,4 @@
 #= require d3
-#= require stat_graph_contributors_util
 
 class @ContributorsStatGraph
   init: (log) ->
diff --git a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/stat_graph/stat_graph_contributors_graph.js.coffee
similarity index 99%
rename from app/assets/javascripts/stat_graph_contributors_graph.js.coffee
rename to app/assets/javascripts/stat_graph/stat_graph_contributors_graph.js.coffee
index b7a0e073766..584d281a510 100644
--- a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
+++ b/app/assets/javascripts/stat_graph/stat_graph_contributors_graph.js.coffee
@@ -1,6 +1,4 @@
 #= require d3
-#= require jquery
-#= require underscore
 
 class @ContributorsGraph
   MARGIN:
diff --git a/app/assets/javascripts/stat_graph_contributors_util.js.coffee b/app/assets/javascripts/stat_graph/stat_graph_contributors_util.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph_contributors_util.js.coffee
rename to app/assets/javascripts/stat_graph/stat_graph_contributors_util.js.coffee
diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
new file mode 100644
index 00000000000..95b12db842a
--- /dev/null
+++ b/app/helpers/javascript_helper.rb
@@ -0,0 +1,7 @@
+module JavascriptHelper
+   def page_specific_javascripts(js = nil)
+     @page_specific_javascripts = js unless js.nil?
+ 
+     @page_specific_javascripts
+   end
+ end
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 79cdbac1f37..b30fb0a5da9 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -30,6 +30,9 @@
 
   = javascript_include_tag "application"
 
+  - if page_specific_javascripts
+    = javascript_include_tag page_specific_javascripts, {"data-turbolinks-track" => true}
+
   = csrf_meta_tags
 
   = include_gon
diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml
index 79a56647c53..49b101a26a1 100644
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
@@ -1,3 +1,4 @@
+- page_specific_javascripts asset_path("stat_graph/application.js")
 %ul.nav-links
   = nav_link(action: :show) do
     = link_to 'Contributors', namespace_project_graph_path
diff --git a/config/application.rb b/config/application.rb
index de2bb08c978..c37542e8851 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -81,6 +81,7 @@ module Gitlab
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
     config.assets.precompile << "mailers/*.css"
+    config.assets.precompile << "stat_graph/application.js"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

From 026b7abc5afc33847f9dcf8bdfc29167da4e9c02 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 18:25:33 -0600
Subject: [PATCH 0952/1431] Attempt to fix the user page.

---
 .../{stat_graph => graphs}/application.js.coffee          | 0
 .../{stat_graph => graphs}/stat_graph.js.coffee           | 0
 .../stat_graph_contributors.js.coffee                     | 0
 .../stat_graph_contributors_graph.js.coffee               | 0
 .../stat_graph_contributors_util.js.coffee                | 0
 app/assets/javascripts/users/application.js.coffee        | 8 ++++++++
 app/assets/javascripts/{ => users}/calendar.js.coffee     | 0
 app/views/projects/graphs/_head.html.haml                 | 2 +-
 app/views/users/show.html.haml                            | 1 +
 config/application.rb                                     | 3 ++-
 10 files changed, 12 insertions(+), 2 deletions(-)
 rename app/assets/javascripts/{stat_graph => graphs}/application.js.coffee (100%)
 rename app/assets/javascripts/{stat_graph => graphs}/stat_graph.js.coffee (100%)
 rename app/assets/javascripts/{stat_graph => graphs}/stat_graph_contributors.js.coffee (100%)
 rename app/assets/javascripts/{stat_graph => graphs}/stat_graph_contributors_graph.js.coffee (100%)
 rename app/assets/javascripts/{stat_graph => graphs}/stat_graph_contributors_util.js.coffee (100%)
 create mode 100644 app/assets/javascripts/users/application.js.coffee
 rename app/assets/javascripts/{ => users}/calendar.js.coffee (100%)

diff --git a/app/assets/javascripts/stat_graph/application.js.coffee b/app/assets/javascripts/graphs/application.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph/application.js.coffee
rename to app/assets/javascripts/graphs/application.js.coffee
diff --git a/app/assets/javascripts/stat_graph/stat_graph.js.coffee b/app/assets/javascripts/graphs/stat_graph.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph/stat_graph.js.coffee
rename to app/assets/javascripts/graphs/stat_graph.js.coffee
diff --git a/app/assets/javascripts/stat_graph/stat_graph_contributors.js.coffee b/app/assets/javascripts/graphs/stat_graph_contributors.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph/stat_graph_contributors.js.coffee
rename to app/assets/javascripts/graphs/stat_graph_contributors.js.coffee
diff --git a/app/assets/javascripts/stat_graph/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph/stat_graph_contributors_graph.js.coffee
rename to app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee
diff --git a/app/assets/javascripts/stat_graph/stat_graph_contributors_util.js.coffee b/app/assets/javascripts/graphs/stat_graph_contributors_util.js.coffee
similarity index 100%
rename from app/assets/javascripts/stat_graph/stat_graph_contributors_util.js.coffee
rename to app/assets/javascripts/graphs/stat_graph_contributors_util.js.coffee
diff --git a/app/assets/javascripts/users/application.js.coffee b/app/assets/javascripts/users/application.js.coffee
new file mode 100644
index 00000000000..647ffbf5f45
--- /dev/null
+++ b/app/assets/javascripts/users/application.js.coffee
@@ -0,0 +1,8 @@
+# This is a manifest file that'll be compiled into including all the files listed below.
+# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+# be included in the compiled file accessible from http://example.com/assets/application.js
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+#= require d3
+#= require_tree .
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/users/calendar.js.coffee
similarity index 100%
rename from app/assets/javascripts/calendar.js.coffee
rename to app/assets/javascripts/users/calendar.js.coffee
diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml
index 49b101a26a1..8becaea246f 100644
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
@@ -1,4 +1,4 @@
-- page_specific_javascripts asset_path("stat_graph/application.js")
+- page_specific_javascripts asset_path("graphs/application.js")
 %ul.nav-links
   = nav_link(action: :show) do
     = link_to 'Contributors', namespace_project_graph_path
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 0c513308308..8268380dafc 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,5 +1,6 @@
 - page_title       @user.name
 - page_description @user.bio
+- page_specific_javascripts asset_path("users/application.js")
 - header_title     @user.name, user_path(@user)
 - @no_container = true
 
diff --git a/config/application.rb b/config/application.rb
index c37542e8851..49d4d3ba555 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -81,7 +81,8 @@ module Gitlab
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
     config.assets.precompile << "mailers/*.css"
-    config.assets.precompile << "stat_graph/application.js"
+    config.assets.precompile << "graphs/application.js"
+    config.assets.precompile << "users/application.js"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

From 3eb683b651fab11b2315e12feb57e6384f2c285e Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 18:34:30 -0600
Subject: [PATCH 0953/1431] Fix indentation

---
 app/helpers/javascript_helper.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
index 95b12db842a..91dd91718dc 100644
--- a/app/helpers/javascript_helper.rb
+++ b/app/helpers/javascript_helper.rb
@@ -1,7 +1,7 @@
 module JavascriptHelper
-   def page_specific_javascripts(js = nil)
-     @page_specific_javascripts = js unless js.nil?
- 
-     @page_specific_javascripts
-   end
- end
+  def page_specific_javascripts(js = nil)
+    @page_specific_javascripts = js unless js.nil?
+
+    @page_specific_javascripts
+  end
+end

From 81f46054483bfb7284d5d1d85ac1204542854923 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 31 May 2016 18:44:42 -0600
Subject: [PATCH 0954/1431] Fix teaspoon

---
 spec/javascripts/stat_graph_contributors_graph_spec.js | 2 +-
 spec/javascripts/stat_graph_contributors_util_spec.js  | 2 +-
 spec/javascripts/stat_graph_spec.js                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/javascripts/stat_graph_contributors_graph_spec.js b/spec/javascripts/stat_graph_contributors_graph_spec.js
index 78d39f1b428..82ee1954a59 100644
--- a/spec/javascripts/stat_graph_contributors_graph_spec.js
+++ b/spec/javascripts/stat_graph_contributors_graph_spec.js
@@ -1,4 +1,4 @@
-//= require stat_graph_contributors_graph
+//= require graphs/stat_graph_contributors_graph
 
 describe("ContributorsGraph", function () {
   describe("#set_x_domain", function () {
diff --git a/spec/javascripts/stat_graph_contributors_util_spec.js b/spec/javascripts/stat_graph_contributors_util_spec.js
index dbafe782b77..5b992447473 100644
--- a/spec/javascripts/stat_graph_contributors_util_spec.js
+++ b/spec/javascripts/stat_graph_contributors_util_spec.js
@@ -1,4 +1,4 @@
-//= require stat_graph_contributors_util
+//= require graphs/stat_graph_contributors_util
 
 describe("ContributorsStatGraphUtil", function () {
 
diff --git a/spec/javascripts/stat_graph_spec.js b/spec/javascripts/stat_graph_spec.js
index 4c652910cd6..4b05d401a42 100644
--- a/spec/javascripts/stat_graph_spec.js
+++ b/spec/javascripts/stat_graph_spec.js
@@ -1,4 +1,4 @@
-//= require stat_graph
+//= require graphs/stat_graph
 
 describe("StatGraph", function () {
 

From 586d1a9b241268a92840e7e6ba5034e399657d01 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 1 Jun 2016 19:48:01 -0600
Subject: [PATCH 0955/1431] Move JS graph specs to match assets tree.

---
 .../{ => graphs}/stat_graph_contributors_graph_spec.js            | 0
 .../javascripts/{ => graphs}/stat_graph_contributors_util_spec.js | 0
 spec/javascripts/{ => graphs}/stat_graph_spec.js                  | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename spec/javascripts/{ => graphs}/stat_graph_contributors_graph_spec.js (100%)
 rename spec/javascripts/{ => graphs}/stat_graph_contributors_util_spec.js (100%)
 rename spec/javascripts/{ => graphs}/stat_graph_spec.js (100%)

diff --git a/spec/javascripts/stat_graph_contributors_graph_spec.js b/spec/javascripts/graphs/stat_graph_contributors_graph_spec.js
similarity index 100%
rename from spec/javascripts/stat_graph_contributors_graph_spec.js
rename to spec/javascripts/graphs/stat_graph_contributors_graph_spec.js
diff --git a/spec/javascripts/stat_graph_contributors_util_spec.js b/spec/javascripts/graphs/stat_graph_contributors_util_spec.js
similarity index 100%
rename from spec/javascripts/stat_graph_contributors_util_spec.js
rename to spec/javascripts/graphs/stat_graph_contributors_util_spec.js
diff --git a/spec/javascripts/stat_graph_spec.js b/spec/javascripts/graphs/stat_graph_spec.js
similarity index 100%
rename from spec/javascripts/stat_graph_spec.js
rename to spec/javascripts/graphs/stat_graph_spec.js

From 30856b1eeaf2990297e4eb2323e5bdf9ee975a5c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 1 Jun 2016 11:59:45 -0600
Subject: [PATCH 0956/1431] Add flexbox to project header

---
 app/assets/stylesheets/pages/projects.scss | 10 +++++++++-
 app/views/projects/_home_panel.html.haml   |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index edef336481d..b9cb0f81e3a 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -32,6 +32,15 @@
 
   .container-fluid {
     position: relative;
+
+    @media (min-width: $screen-md-max) {
+      .row {
+        display: flex;
+        -ms-flex-align: center;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+      }
+    }
   }
 
   .cover-controls {
@@ -57,7 +66,6 @@
     max-width: 86px;
     min-width: 86px;
     padding-right: 0;
-    margin: 11px 0;
 
     @media (max-width: $screen-md-max) {
       padding-left: 0;
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 57c3d1b0a65..f0e04a0235d 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -29,10 +29,10 @@
           .project-clone-holder
             = render "shared/clone_panel"
 
-    .project-repo-buttons.btn-group.project-right-buttons
-      = render "projects/buttons/download"
-      = render 'projects/buttons/dropdown'
-      = render 'projects/buttons/notifications'
+      .project-repo-buttons.btn-group.project-right-buttons
+        = render "projects/buttons/download"
+        = render 'projects/buttons/dropdown'
+        = render 'projects/buttons/notifications'
 
 :javascript
   new Star();

From ad3d0585aa2d36e57b53781a5bd6e3dbe96cb71d Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 31 May 2016 19:35:33 -0400
Subject: [PATCH 0957/1431] Fix serious performance bug with rendering Markdown
 with InlineDiffFilter

Nokogiri's `node.replace` was being unnecessarily called for every text node in
the document due to a comparison bug. The code previously was comparing the
HTML representation of the full document against the text node, which would
always fail. Fix the comparison to just compare the modified text.

Closes #18011
---
 CHANGELOG                               |  1 +
 lib/banzai/filter/inline_diff_filter.rb | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..9a5d1341126 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.9.0 (unreleased)
 v 8.8.3
   - Fix incorrect links on pipeline page when merge request created from fork
   - Fix gitlab importer failing to import new projects due to missing credentials
+  - Fix serious performance bug with rendering Markdown with InlineDiffFilter
   - Fix import URL migration not rescuing with the correct Error
   - In search results, only show notes on confidential issues that the user has access to
   - Fix health check access token changing due to old application settings being used
diff --git a/lib/banzai/filter/inline_diff_filter.rb b/lib/banzai/filter/inline_diff_filter.rb
index 9e75edd4d4c..beb21b19ab3 100644
--- a/lib/banzai/filter/inline_diff_filter.rb
+++ b/lib/banzai/filter/inline_diff_filter.rb
@@ -8,15 +8,19 @@ module Banzai
           next if has_ancestor?(node, IGNORED_ANCESTOR_TAGS)
 
           content = node.to_html
-          content = content.gsub(/(?:\[\-(.*?)\-\]|\{\-(.*?)\-\})/, '<span class="idiff left right deletion">\1\2</span>')
-          content = content.gsub(/(?:\[\+(.*?)\+\]|\{\+(.*?)\+\})/, '<span class="idiff left right addition">\1\2</span>')
+          html_content = inline_diff_filter(content)
 
-          next if html == content
+          next if content == html_content
 
-          node.replace(content)
+          node.replace(html_content)
         end
         doc
       end
+
+      def inline_diff_filter(text)
+        html_content = text.gsub(/(?:\[\-(.*?)\-\]|\{\-(.*?)\-\})/, '<span class="idiff left right deletion">\1\2</span>')
+        html_content.gsub(/(?:\[\+(.*?)\+\]|\{\+(.*?)\+\})/, '<span class="idiff left right addition">\1\2</span>')
+      end
     end
   end
 end

From c102b03e768fab984958a6d7e48ffbe4ef946576 Mon Sep 17 00:00:00 2001
From: chujinjin <10746161@qq.com>
Date: Wed, 1 Jun 2016 14:11:20 +0000
Subject: [PATCH 0958/1431] Fix wiki project clone address error

---
 CHANGELOG                    | 1 +
 app/helpers/button_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..a0df8396662 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,7 @@ v 8.8.3
   - Fix import URL migration not rescuing with the correct Error
   - In search results, only show notes on confidential issues that the user has access to
   - Fix health check access token changing due to old application settings being used
+  - Fix wiki project clone address error (chujinjin)
 
 v 8.8.2
   - Added remove due date button. !4209
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index a9047ede8c5..f742922d926 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -30,7 +30,7 @@ module ButtonHelper
 
     content_tag :a, protocol,
       class: klass,
-      href: @project.http_url_to_repo,
+      href: project.http_url_to_repo,
       data: {
         html: true,
         placement: 'right',

From b856bd640695b615e765ea09057fc1bc2e4a9870 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 10:53:39 +0300
Subject: [PATCH 0959/1431] Shorter name for Container Registry tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_project.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 2c9b9006668..c5d064ed484 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -58,7 +58,7 @@
         = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
           = icon('hdd-o fw')
           %span
-            Container Registry
+            Registry
 
     - if project_nav_tab? :graphs
       = nav_link(controller: %w(graphs)) do

From 855ff6423b78bafa06ce62a2bb724e58f1a0042b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 1 Jun 2016 12:33:32 +0100
Subject: [PATCH 0960/1431] Shows the edit comment button on mobile

Closes #17214
---
 app/assets/stylesheets/framework/mobile.scss |  4 ---
 app/assets/stylesheets/pages/notes.scss      | 26 ++++++++++++++++++--
 app/views/projects/notes/_note.html.haml     |  5 ++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss
index bd531f8376b..d4e5cc819a4 100644
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -66,10 +66,6 @@
     display: none;
   }
 
-  %ul.notes .note-role, .note-actions {
-    display: none;
-  }
-
   .nav-links, .nav-links {
     li a {
       font-size: 14px;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index a3e1ac13a43..0e82c457232 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -118,6 +118,11 @@ ul.notes {
 
     .note-header {
       padding-bottom: 3px;
+      padding-right: 20px;
+
+      @media (min-width: $screen-sm-min) {
+        padding-right: 0;
+      }
     }
 
   }
@@ -179,6 +184,8 @@ ul.notes {
 
 .discussion-header,
 .note-header {
+  position: relative;
+
   a {
     color: inherit;
 
@@ -215,6 +222,16 @@ ul.notes {
   color: $notes-action-color;
 }
 
+.note-actions {
+  position: absolute;
+  right: 0;
+  top: 0;
+  
+  @media (min-width: $screen-sm-min) {
+    position: relative;
+  }
+}
+
 .discussion-actions {
   @media (max-width: $screen-md-max) {
     float: none;
@@ -228,8 +245,13 @@ ul.notes {
 
 .note-action-button {
   display: inline-block;
-  margin-left: 10px;
-  line-height: 24px;
+  margin-left: 0;
+  line-height: 20px;
+
+  @media (min-width: $screen-sm-min) {
+    margin-left: 10px;
+    line-height: 24px;
+  }
 
   .fa {
     color: $notes-action-color;
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index f1045bbd8c3..f6b7463ff07 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -19,12 +19,11 @@
         .note-actions
           - access = note.project.team.human_max_access(note.author.id)
           - if access
-            %span.note-role
-              = access
+            %span.note-role.hidden-xs= access
           - if note_editable
             = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
               = icon('pencil')
-            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
+            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do
               = icon('trash-o')
       .note-body{class: note_editable ? 'js-task-list-container' : ''}
         .note-text

From 6aa9ea7d02aeec500107ea06c774bae5a8efbd50 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 1 Jun 2016 12:11:16 +0100
Subject: [PATCH 0961/1431] Fixed issue with activity links not being
 consistent

Closes #17621
---
 app/views/events/event/_common.html.haml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index c7f29f2fc0e..2e2403347c1 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -1,10 +1,14 @@
 .event-title
   %span.author_name= link_to_author event
   %span.event_label{class: event.action_name}
-    = event_action_name(event)
-
   - if event.target
-    %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title
+    = event.action_name
+    %strong
+      = link_to [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title do
+        = event.target_type.titleize.downcase
+        = event.target.reference_link_text
+  - else
+    = event_action_name(event)
 
   = event_preposition(event)
 

From 1abb0ed97d48b603f7488fe2543aeef110067908 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 2 Jun 2016 11:05:54 +0200
Subject: [PATCH 0962/1431] Move feature specs for shortcuts to valid directory

---
 spec/features/{project => projects}/shortcuts_spec.rb | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/features/{project => projects}/shortcuts_spec.rb (100%)

diff --git a/spec/features/project/shortcuts_spec.rb b/spec/features/projects/shortcuts_spec.rb
similarity index 100%
rename from spec/features/project/shortcuts_spec.rb
rename to spec/features/projects/shortcuts_spec.rb

From 1521dc51e9f0c37434c8290d67d775bc9fde188d Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 31 May 2016 13:02:12 +0100
Subject: [PATCH 0963/1431] Fix link to blank group icon

When the group is the default blank icon, this needs to use the
`image_path` helper; otherwise, the link won't work if assets are
precompiled. This still works fine for uploaded icons in either case.
---
 CHANGELOG                    | 1 +
 app/helpers/groups_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..74ea27a2e05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels
+  - Link to blank group icon doesn't throw a 404 anymore
   - Remove 'main language' feature
   - Pipelines can be canceled only when there are running builds
   - Use downcased path to container repository as this is expected path by Docker
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index b1f0a765bb9..4cac69c6795 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -31,7 +31,7 @@ module GroupsHelper
     if group && group.avatar.present?
       group.avatar.url
     else
-      'no_group_avatar.png'
+      image_path('no_group_avatar.png')
     end
   end
 

From 31112fd0cb0ce930cc8fbc068536310424d6dd06 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 2 Jun 2016 11:24:53 +0100
Subject: [PATCH 0964/1431] Edit form background color on highlighted note

Added a white background to the edit form on highlighted notes

Closes #18101
---
 app/assets/stylesheets/pages/note_form.scss | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 7fa13e66b43..d714257f176 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -96,17 +96,8 @@
   display: none;
   font-size: 15px;
 
-  .form-actions {
-    padding-left: 20px;
-
-    .btn-save {
-      float: left;
-    }
-
-    .note-form-option {
-      float: left;
-      padding: 2px 0 0 25px;
-    }
+  .md-area {
+    background-color: #fff;
   }
 }
 

From 2fbfb85492401b2a8ac81f22b319b304afecf6c3 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 30 May 2016 15:55:11 +0200
Subject: [PATCH 0965/1431] Returning enums in ReferenceFilter#each_node

This changes ReferenceFilter#each_node so that when it's called without
a block an Enumerator is returned.
---
 lib/banzai/filter/reference_filter.rb         |  2 ++
 .../banzai/filter/reference_filter_spec.rb    | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 spec/lib/banzai/filter/reference_filter_spec.rb

diff --git a/lib/banzai/filter/reference_filter.rb b/lib/banzai/filter/reference_filter.rb
index 41ae0e1f9cc..5eace574ab4 100644
--- a/lib/banzai/filter/reference_filter.rb
+++ b/lib/banzai/filter/reference_filter.rb
@@ -68,6 +68,8 @@ module Banzai
       # by `ignore_ancestor_query`. Link tags are not processed if they have a
       # "gfm" class or the "href" attribute is empty.
       def each_node
+        return to_enum(__method__) unless block_given?
+
         query = %Q{descendant-or-self::text()[not(#{ignore_ancestor_query})]
         | descendant-or-self::a[
           not(contains(concat(" ", @class, " "), " gfm ")) and not(@href = "")
diff --git a/spec/lib/banzai/filter/reference_filter_spec.rb b/spec/lib/banzai/filter/reference_filter_spec.rb
new file mode 100644
index 00000000000..d3e7af0671c
--- /dev/null
+++ b/spec/lib/banzai/filter/reference_filter_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Banzai::Filter::ReferenceFilter, lib: true do
+  let(:project) { build(:project) }
+
+  describe '#each_node' do
+    it 'iterates over the nodes in a document' do
+      document = Nokogiri::HTML.fragment('<a href="foo">foo</a>')
+      filter = described_class.new(document, project: project)
+
+      expect { |b| filter.each_node(&b) }.
+        to yield_with_args(an_instance_of(Nokogiri::XML::Element))
+    end
+
+    it 'returns an Enumerator when no block is given' do
+      document = Nokogiri::HTML.fragment('<a href="foo">foo</a>')
+      filter = described_class.new(document, project: project)
+
+      expect(filter.each_node).to be_an_instance_of(Enumerator)
+    end
+
+    it 'skips links with a "gfm" class' do
+      document = Nokogiri::HTML.fragment('<a href="foo" class="gfm">foo</a>')
+      filter = described_class.new(document, project: project)
+
+      expect { |b| filter.each_node(&b) }.not_to yield_control
+    end
+
+    it 'skips text nodes in pre elements' do
+      document = Nokogiri::HTML.fragment('<pre>foo</pre>')
+      filter = described_class.new(document, project: project)
+
+      expect { |b| filter.each_node(&b) }.not_to yield_control
+    end
+  end
+end

From 8a6c3f27e9dfea2c151657045e17fe66ad81b5e5 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 30 May 2016 15:56:05 +0200
Subject: [PATCH 0966/1431] Added ReferenceFilter#nodes

This method returns an Array of the HTML nodes as yielded by
ReferenceFilter#each_node. The method's return value is memoized to
allow multiple calls without having to re-query the input document.
---
 lib/banzai/filter/reference_filter.rb           | 5 +++++
 spec/lib/banzai/filter/reference_filter_spec.rb | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/banzai/filter/reference_filter.rb b/lib/banzai/filter/reference_filter.rb
index 5eace574ab4..2d6f34c9cd8 100644
--- a/lib/banzai/filter/reference_filter.rb
+++ b/lib/banzai/filter/reference_filter.rb
@@ -80,6 +80,11 @@ module Banzai
         end
       end
 
+      # Returns an Array containing all HTML nodes.
+      def nodes
+        @nodes ||= each_node.to_a
+      end
+
       # Yields the link's URL and text whenever the node is a valid <a> tag.
       def yield_valid_link(node)
         link = CGI.unescape(node.attr('href').to_s)
diff --git a/spec/lib/banzai/filter/reference_filter_spec.rb b/spec/lib/banzai/filter/reference_filter_spec.rb
index d3e7af0671c..55e681f6faf 100644
--- a/spec/lib/banzai/filter/reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/reference_filter_spec.rb
@@ -33,4 +33,13 @@ describe Banzai::Filter::ReferenceFilter, lib: true do
       expect { |b| filter.each_node(&b) }.not_to yield_control
     end
   end
+
+  describe '#nodes' do
+    it 'returns an Array of the HTML nodes' do
+      document = Nokogiri::HTML.fragment('<a href="foo">foo</a>')
+      filter = described_class.new(document, project: project)
+
+      expect(filter.nodes).to eq([document.children[0]])
+    end
+  end
 end

From fea591e5c5796235d28eeec4d27759f87fa9d8e2 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 2 Jun 2016 13:42:18 +0200
Subject: [PATCH 0967/1431] Rename finder to find_in_gitlab_or_ldap

---
 config/initializers/doorkeeper.rb |  2 +-
 lib/api/session.rb                |  2 +-
 lib/gitlab/auth.rb                |  4 ++--
 lib/gitlab/backend/grack_auth.rb  |  2 +-
 spec/lib/gitlab/auth_spec.rb      | 16 ++++++++--------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index aae2ee3193d..8dc8e270afc 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -12,7 +12,7 @@ Doorkeeper.configure do
   end
 
   resource_owner_from_credentials do |routes|
-    Gitlab::Auth.find_by_master_or_ldap(params[:username], params[:password])
+    Gitlab::Auth.find_in_gitlab_or_ldap(params[:username], params[:password])
   end
 
   # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
diff --git a/lib/api/session.rb b/lib/api/session.rb
index 1156aab8cc2..56e69b2366f 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,7 +11,7 @@ module API
     # Example Request:
     #  POST /session
     post "/session" do
-      user = Gitlab::Auth.find_by_master_or_ldap(params[:email] || params[:login], params[:password])
+      user = Gitlab::Auth.find_in_gitlab_or_ldap(params[:email] || params[:login], params[:password])
 
       return unauthorized! unless user
       present user, with: Entities::UserLogin
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 0479006f993..d156fa2978d 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -9,7 +9,7 @@ module Gitlab
 
         if valid_ci_request?(login, password, project)
           type = :ci
-        elsif user = find_by_master_or_ldap(login, password)
+        elsif user = find_in_gitlab_or_ldap(login, password)
           type = :master_or_ldap
         elsif user = oauth_access_token_check(login, password)
           type = :oauth
@@ -19,7 +19,7 @@ module Gitlab
         [user, type]
       end
 
-      def find_by_master_or_ldap(login, password)
+      def find_in_gitlab_or_ldap(login, password)
         user = User.by_login(login)
 
         # If no user is found, or it's an LDAP server, try LDAP.
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index 3462c2dcfbc..492ffb138a3 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -95,7 +95,7 @@ module Grack
     end
 
     def authenticate_user(login, password)
-      user = Gitlab::Auth.new.find_by_master_or_ldap(login, password)
+      user = Gitlab::Auth.new.find_in_gitlab_or_ldap(login, password)
 
       unless user
         user = oauth_access_token_check(login, password)
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 16083f90bb4..3c41c4b0681 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -41,7 +41,7 @@ describe Gitlab::Auth, lib: true do
     end
   end
 
-  describe 'find_by_master_or_ldap' do
+  describe 'find_in_gitlab_or_ldap' do
     let!(:user) do
       create(:user,
         username: username,
@@ -52,25 +52,25 @@ describe Gitlab::Auth, lib: true do
     let(:password) { 'my-secret' }
 
     it "should find user by valid login/password" do
-      expect( gl_auth.find_by_master_or_ldap(username, password) ).to eql user
+      expect( gl_auth.find_in_gitlab_or_ldap(username, password) ).to eql user
     end
 
     it 'should find user by valid email/password with case-insensitive email' do
-      expect(gl_auth.find_by_master_or_ldap(user.email.upcase, password)).to eql user
+      expect(gl_auth.find_in_gitlab_or_ldap(user.email.upcase, password)).to eql user
     end
 
     it 'should find user by valid username/password with case-insensitive username' do
-      expect(gl_auth.find_by_master_or_ldap(username.upcase, password)).to eql user
+      expect(gl_auth.find_in_gitlab_or_ldap(username.upcase, password)).to eql user
     end
 
     it "should not find user with invalid password" do
       password = 'wrong'
-      expect( gl_auth.find_by_master_or_ldap(username, password) ).not_to eql user
+      expect( gl_auth.find_in_gitlab_or_ldap(username, password) ).not_to eql user
     end
 
     it "should not find user with invalid login" do
       user = 'wrong'
-      expect( gl_auth.find_by_master_or_ldap(username, password) ).not_to eql user
+      expect( gl_auth.find_in_gitlab_or_ldap(username, password) ).not_to eql user
     end
 
     context "with ldap enabled" do
@@ -81,13 +81,13 @@ describe Gitlab::Auth, lib: true do
       it "tries to autheticate with db before ldap" do
         expect(Gitlab::LDAP::Authentication).not_to receive(:login)
 
-        gl_auth.find_by_master_or_ldap(username, password)
+        gl_auth.find_in_gitlab_or_ldap(username, password)
       end
 
       it "uses ldap as fallback to for authentication" do
         expect(Gitlab::LDAP::Authentication).to receive(:login)
 
-        gl_auth.find_by_master_or_ldap('ldap_user', 'password')
+        gl_auth.find_in_gitlab_or_ldap('ldap_user', 'password')
       end
     end
   end

From 01575e9966805fa4c12a7a56361f511b3b61e309 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 30 May 2016 15:56:50 +0200
Subject: [PATCH 0968/1431] Reduce Namespace queries in UserReferenceFilter

This changes UserReferenceFilter so it operates using the following
steps:

1. Grab all username references from the input document.
2. Query the corresponding Namespace objects using a single query.
3. Iterate over all nodes to build links while re-using the objects
   queried in step 2.

The impact of these changes is that a comment mentioning 5 different
usernames no longer runs 5 different queries (1 for every username),
instead it only runs a single query.
---
 CHANGELOG                                     |  1 +
 lib/banzai/filter/user_reference_filter.rb    | 29 +++++++++++++++++--
 .../filter/user_reference_filter_spec.rb      | 19 ++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..7e224060227 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@ v 8.9.0 (unreleased)
   - Measure queue duration between gitlab-workhorse and Rails
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
+  - Reduce number of SQL queries when rendering user references
 
 v 8.8.3
   - Fix incorrect links on pipeline page when merge request created from fork
diff --git a/lib/banzai/filter/user_reference_filter.rb b/lib/banzai/filter/user_reference_filter.rb
index 331d8007257..5b0a6d8541b 100644
--- a/lib/banzai/filter/user_reference_filter.rb
+++ b/lib/banzai/filter/user_reference_filter.rb
@@ -29,7 +29,7 @@ module Banzai
         ref_pattern = User.reference_pattern
         ref_pattern_start = /\A#{ref_pattern}\z/
 
-        each_node do |node|
+        nodes.each do |node|
           if text_node?(node)
             replace_text_when_pattern_matches(node, ref_pattern) do |content|
               user_link_filter(content)
@@ -59,7 +59,7 @@ module Banzai
         self.class.references_in(text) do |match, username|
           if username == 'all'
             link_to_all(link_text: link_text)
-          elsif namespace = Namespace.find_by(path: username)
+          elsif namespace = namespaces[username]
             link_to_namespace(namespace, link_text: link_text) || match
           else
             match
@@ -67,6 +67,31 @@ module Banzai
         end
       end
 
+      # Returns a Hash containing all Namespace objects for the username
+      # references in the current document.
+      #
+      # The keys of this Hash are the namespace paths, the values the
+      # corresponding Namespace objects.
+      def namespaces
+        @namespaces ||=
+          Namespace.where(path: usernames).each_with_object({}) do |row, hash|
+            hash[row.path] = row
+          end
+      end
+
+      # Returns all usernames referenced in the current document.
+      def usernames
+        refs = Set.new
+
+        nodes.each do |node|
+          node.to_html.scan(User.reference_pattern) do
+            refs << $~[:user]
+          end
+        end
+
+        refs.to_a
+      end
+
       private
 
       def urls
diff --git a/spec/lib/banzai/filter/user_reference_filter_spec.rb b/spec/lib/banzai/filter/user_reference_filter_spec.rb
index d7dfd6699ef..108b36a97cc 100644
--- a/spec/lib/banzai/filter/user_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/user_reference_filter_spec.rb
@@ -136,4 +136,23 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
       expect(link.attr('data-user')).to eq user.namespace.owner_id.to_s
     end
   end
+
+  describe '#namespaces' do
+    it 'returns a Hash containing all Namespaces' do
+      document = Nokogiri::HTML.fragment("<p>#{user.to_reference}</p>")
+      filter = described_class.new(document, project: project)
+      ns = user.namespace
+
+      expect(filter.namespaces).to eq({ ns.path => ns })
+    end
+  end
+
+  describe '#usernames' do
+    it 'returns the usernames mentioned in a document' do
+      document = Nokogiri::HTML.fragment("<p>#{user.to_reference}</p>")
+      filter = described_class.new(document, project: project)
+
+      expect(filter.usernames).to eq([user.username])
+    end
+  end
 end

From bffe0d6325710e89e405390f4da297fb12fdc314 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Tue, 31 May 2016 08:58:11 -0400
Subject: [PATCH 0969/1431] Cache assigned merge request count. Closes #18036

---
 app/models/user.rb                         | 6 ++++++
 app/views/layouts/nav/_dashboard.html.haml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 15b6cbc2255..8dde01bf355 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -776,6 +776,12 @@ class User < ActiveRecord::Base
     notification_settings.find_or_initialize_by(source: source)
   end
 
+  def assigned_open_merge_request_count
+    Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], expires_in: 60) do
+       assigned_merge_requests.opened.count
+     end
+  end
+
   private
 
   def projects_union
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 43532b0c155..e14ae850fcc 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -36,7 +36,7 @@
       = icon('tasks fw')
       %span
         Merge Requests
-        %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count)
+        %span.count= number_with_delimiter(current_user.assigned_open_merge_request_count)
   = nav_link(controller: :snippets) do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')

From bfccea370310d6f7e5fe16c846ccd073d487a97f Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Tue, 31 May 2016 09:02:47 -0400
Subject: [PATCH 0970/1431] Cache assigned open issue count. Closes #18035

---
 app/models/user.rb                         | 10 ++++++++--
 app/views/layouts/nav/_dashboard.html.haml |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 8dde01bf355..55f8e149629 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -778,8 +778,14 @@ class User < ActiveRecord::Base
 
   def assigned_open_merge_request_count
     Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], expires_in: 60) do
-       assigned_merge_requests.opened.count
-     end
+      assigned_merge_requests.opened.count
+    end
+  end
+
+  def assigned_open_issues_count
+    Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], expires_in: 60) do
+      assigned_issues.opened.count
+    end
   end
 
   private
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index e14ae850fcc..306ebd5fcf7 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -30,7 +30,7 @@
       = icon('exclamation-circle fw')
       %span
         Issues
-        %span.count= number_with_delimiter(current_user.assigned_issues.opened.count)
+        %span.count= number_with_delimiter(current_user.assigned_open_issues_count)
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = icon('tasks fw')

From 8835b7889a6265aba3c6d7ee241abf80a1cf07f3 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 1 Jun 2016 19:27:21 -0400
Subject: [PATCH 0971/1431] Flush cache in callback. Add tests

---
 app/models/concerns/issuable.rb |  8 ++++++++
 app/models/user.rb              | 13 +++++++++----
 spec/features/issues_spec.rb    | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 2326a395cb8..46cde460952 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -68,6 +68,14 @@ module Issuable
     strip_attributes :title
 
     acts_as_paranoid
+
+    after_save :update_assignee_cache_counts, if: :assignee_id_changed?
+
+    def update_assignee_cache_counts
+      # make sure we flush the cache for both the old *and* new assignee
+      User.find(assignee_id_was).update_cache_counts if assignee_id_was
+      assignee.update_cache_counts if assignee_id
+    end
   end
 
   module ClassMethods
diff --git a/app/models/user.rb b/app/models/user.rb
index 55f8e149629..172845c9d25 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -776,18 +776,23 @@ class User < ActiveRecord::Base
     notification_settings.find_or_initialize_by(source: source)
   end
 
-  def assigned_open_merge_request_count
-    Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], expires_in: 60) do
+  def assigned_open_merge_request_count(force: false)
+    Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], force: force) do
       assigned_merge_requests.opened.count
     end
   end
 
-  def assigned_open_issues_count
-    Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], expires_in: 60) do
+  def assigned_open_issues_count(force: false)
+    Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], force: force) do
       assigned_issues.opened.count
     end
   end
 
+  def update_cache_counts
+    assigned_open_merge_request_count(force: true)
+    assigned_open_issues_count(force: true)
+  end
+
   private
 
   def projects_union
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 9271964166a..fa0d8e1a0cd 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -62,6 +62,21 @@ describe 'Issues', feature: true do
 
       expect(issue.reload.assignee).to be_nil
     end
+
+    it 'updates assigned cache count on change', js: true do
+      visit edit_namespace_project_issue_path(project.namespace, project, issue)
+
+      expect(page).to have_content "Assignee #{@user.name}"
+      expect(@user.assigned_open_issues_count).to eq @user.assigned_issues.opened.count
+
+      first('#s2id_issue_assignee_id').click
+      sleep 2 # wait for ajax stuff to complete
+      first('.user-result').click
+
+      click_button 'Save changes'
+
+      expect(@user.assigned_open_issues_count).to eq @user.assigned_issues.opened.count
+    end
   end
 
   describe 'due date', js: true do

From 0f3df62e1a42982ffb635dc5a9b201ed2520b0f4 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 2 Jun 2016 09:25:40 -0400
Subject: [PATCH 0972/1431] Update specs. Add CHANGELOG entry

---
 CHANGELOG                         |  1 +
 app/models/concerns/issuable.rb   |  2 +-
 spec/features/issues_spec.rb      | 15 ---------------
 spec/models/issue_spec.rb         | 17 +++++++++++++++++
 spec/models/merge_request_spec.rb | 17 +++++++++++++++++
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6f91dfcfb68..de77625dce3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ v 8.9.0 (unreleased)
   - Measure queue duration between gitlab-workhorse and Rails
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
+  - Cache assigned issue and merge request counts in sidebar nav
 
 v 8.8.3
   - Fix incorrect links on pipeline page when merge request created from fork
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 46cde460952..50f5b749e38 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -74,7 +74,7 @@ module Issuable
     def update_assignee_cache_counts
       # make sure we flush the cache for both the old *and* new assignee
       User.find(assignee_id_was).update_cache_counts if assignee_id_was
-      assignee.update_cache_counts if assignee_id
+      assignee.update_cache_counts if assignee
     end
   end
 
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index fa0d8e1a0cd..9271964166a 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -62,21 +62,6 @@ describe 'Issues', feature: true do
 
       expect(issue.reload.assignee).to be_nil
     end
-
-    it 'updates assigned cache count on change', js: true do
-      visit edit_namespace_project_issue_path(project.namespace, project, issue)
-
-      expect(page).to have_content "Assignee #{@user.name}"
-      expect(@user.assigned_open_issues_count).to eq @user.assigned_issues.opened.count
-
-      first('#s2id_issue_assignee_id').click
-      sleep 2 # wait for ajax stuff to complete
-      first('.user-result').click
-
-      click_button 'Save changes'
-
-      expect(@user.assigned_open_issues_count).to eq @user.assigned_issues.opened.count
-    end
   end
 
   describe 'due date', js: true do
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 87b3d8d650a..b87d68283e6 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -269,4 +269,21 @@ describe Issue, models: true do
       end
     end
   end
+
+  describe 'cached counts' do
+    it 'updates when assignees change' do
+      user1 = create(:user)
+      user2 = create(:user)
+      issue = create(:issue, assignee: user1)
+
+      expect(user1.assigned_open_issues_count).to eq(1)
+      expect(user2.assigned_open_issues_count).to eq(0)
+
+      issue.assignee = user2
+      issue.save
+
+      expect(user1.assigned_open_issues_count).to eq(0)
+      expect(user2.assigned_open_issues_count).to eq(1)
+    end
+  end
 end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 118e1e22a78..a4c55cc2fd0 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -438,4 +438,21 @@ describe MergeRequest, models: true do
       expect(mr.participants).to include(note1.author, note2.author)
     end
   end
+
+  describe 'cached counts' do
+    it 'updates when assignees change' do
+      user1 = create(:user)
+      user2 = create(:user)
+      mr = create(:merge_request, assignee: user1)
+
+      expect(user1.assigned_open_merge_request_count).to eq(1)
+      expect(user2.assigned_open_merge_request_count).to eq(0)
+
+      mr.assignee = user2
+      mr.save
+
+      expect(user1.assigned_open_merge_request_count).to eq(0)
+      expect(user2.assigned_open_merge_request_count).to eq(1)
+    end
+  end
 end

From c966d55e6a293b153b329612b0f78d282a83abe6 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 09:36:09 -0500
Subject: [PATCH 0973/1431] Fixes missing number on generated ordered list

---
 app/assets/stylesheets/pages/detail_page.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 5e61e61d85c..1b389d83525 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -29,8 +29,6 @@
     margin-top: 6px;
 
     p {
-      overflow-x: auto;
-
       &:last-child {
         margin-bottom: 0;
       }

From 021d3810c300d1e0514f21ccb6f1439f59e20565 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 2 Jun 2016 16:19:18 +0200
Subject: [PATCH 0974/1431] Rename Ci::Commit to Ci::Pipeline and rename some
 of the ci_commit to pipeline

---
 app/controllers/projects/builds_controller.rb |  4 ++--
 app/controllers/projects/commit_controller.rb |  2 +-
 .../projects/merge_requests_controller.rb     | 22 +++++++++----------
 .../projects/pipelines_controller.rb          |  6 ++---
 app/models/ci/build.rb                        | 12 +++++-----
 app/models/ci/{commit.rb => pipeline.rb}      |  4 ++--
 app/models/ci/trigger_request.rb              |  2 +-
 app/models/commit.rb                          |  6 ++---
 app/models/commit_status.rb                   |  8 +++----
 app/models/merge_request.rb                   |  4 ++--
 app/models/project.rb                         | 10 ++++-----
 app/services/ci/create_pipeline_service.rb    |  4 ++--
 .../ci/create_trigger_request_service.rb      |  2 +-
 app/services/ci/image_for_build_service.rb    |  2 +-
 app/services/create_commit_builds_service.rb  |  2 +-
 app/services/merge_requests/base_service.rb   |  8 +++----
 features/steps/project/commits/commits.rb     |  2 +-
 lib/api/commit_statuses.rb                    |  2 +-
 lib/api/merge_requests.rb                     |  2 +-
 lib/ci/charts.rb                              |  2 +-
 spec/factories/ci/commits.rb                  |  2 +-
 spec/features/pipelines_spec.rb               |  2 +-
 spec/helpers/ci_status_helper_spec.rb         |  4 ++--
 spec/helpers/merge_requests_helper_spec.rb    |  2 +-
 spec/models/ci/commit_spec.rb                 |  2 +-
 spec/models/merge_request_spec.rb             |  4 ++--
 spec/models/project_spec.rb                   |  2 +-
 spec/requests/api/commit_statuses_spec.rb     |  4 ++--
 spec/requests/api/merge_requests_spec.rb      |  4 ++--
 spec/requests/api/triggers_spec.rb            |  2 +-
 spec/requests/ci/api/triggers_spec.rb         |  2 +-
 .../create_commit_builds_service_spec.rb      | 14 ++++++------
 .../merge_when_build_succeeds_service_spec.rb |  2 +-
 spec/support/stub_gitlab_calls.rb             |  2 +-
 spec/workers/post_receive_spec.rb             |  8 +++----
 35 files changed, 81 insertions(+), 81 deletions(-)
 rename app/models/ci/{commit.rb => pipeline.rb} (98%)

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index bb1f6c5e980..de8abf86394 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -26,9 +26,9 @@ class Projects::BuildsController < Projects::ApplicationController
   end
 
   def show
-    @builds = @project.ci_commits.find_by_sha(@build.sha).builds.order('id DESC')
+    @builds = @project.pipelines.find_by_sha(@build.sha).builds.order('id DESC')
     @builds = @builds.where("id not in (?)", @build.id)
-    @commit = @build.commit
+    @pipeline = @build.pipeline
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 10b5932affa..287388652e6 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -100,7 +100,7 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def ci_commits
-    @ci_commits ||= project.ci_commits.where(sha: commit.sha)
+    @ci_commits ||= project.pipelines.where(sha: commit.sha)
   end
 
   def ci_builds
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d54284d7b20..21a70fd69a3 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -119,8 +119,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
     @diff_notes_disabled = true
 
-    @ci_commit = @merge_request.ci_commit
-    @statuses = @ci_commit.statuses if @ci_commit
+    @pipeline = @merge_request.pipeline
+    @statuses = @pipeline.statuses if @pipeline
 
     @note_counts = Note.where(commit_id: @commits.map(&:id)).
       group(:commit_id).count
@@ -194,7 +194,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @merge_request.update(merge_error: nil)
 
-    if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit && @merge_request.ci_commit.active?
+    if params[:merge_when_build_succeeds].present? && @merge_request.pipeline && @merge_request.pipeline.active?
       MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                       .execute(@merge_request)
       @status = :merge_when_build_succeeds
@@ -225,10 +225,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def ci_status
-    ci_commit = @merge_request.ci_commit
-    if ci_commit
-      status = ci_commit.status
-      coverage = ci_commit.try(:coverage)
+    pipeline = @merge_request.pipeline
+    if pipeline
+      status = pipeline.status
+      coverage = pipeline.try(:coverage)
 
       status ||= "preparing"
     else
@@ -310,8 +310,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @merge_request_diff = @merge_request.merge_request_diff
 
-    @ci_commit = @merge_request.ci_commit
-    @statuses = @ci_commit.statuses if @ci_commit
+    @pipeline = @merge_request.pipeline
+    @statuses = @ci_commit.statuses if @pipeline
 
     if @merge_request.locked_long_ago?
       @merge_request.unlock_mr
@@ -320,8 +320,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def define_widget_vars
-    @ci_commit = @merge_request.ci_commit
-    @ci_commits = [@ci_commit].compact
+    @pipeline = @merge_request.pipeline
+    @pipelines = [@pipeline].compact
     closes_issues
   end
 
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index b36081205d8..cac440ae53e 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -7,7 +7,7 @@ class Projects::PipelinesController < Projects::ApplicationController
 
   def index
     @scope = params[:scope]
-    all_pipelines = project.ci_commits
+    all_pipelines = project.pipelines
     @pipelines_count = all_pipelines.count
     @running_or_pending_count = all_pipelines.running_or_pending.count
     @pipelines = PipelinesFinder.new(project).execute(all_pipelines, @scope)
@@ -15,7 +15,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def new
-    @pipeline = project.ci_commits.new(ref: @project.default_branch)
+    @pipeline = project.pipelines.new(ref: @project.default_branch)
   end
 
   def create
@@ -50,7 +50,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def pipeline
-    @pipeline ||= project.ci_commits.find_by!(id: params[:id])
+    @pipeline ||= project.pipelines.find_by!(id: params[:id])
   end
 
   def commit
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 5e77fda70b9..74441eb97dc 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -45,8 +45,8 @@ module Ci
         new_build.options = build.options
         new_build.commands = build.commands
         new_build.tag_list = build.tag_list
-        new_build.gl_project_id = build.gl_project_id
-        new_build.commit_id = build.commit_id
+        new_build.project = build.project
+        new_build.pipeline = build.pipeline
         new_build.name = build.name
         new_build.allow_failure = build.allow_failure
         new_build.stage = build.stage
@@ -66,7 +66,7 @@ module Ci
       # We use around_transition to create builds for next stage as soon as possible, before the `after_*` is executed
       around_transition any => [:success, :failed, :canceled] do |build, block|
         block.call
-        build.commit.create_next_builds(build) if build.commit
+        build.pipeline.create_next_builds(build) if build.pipeline
       end
 
       after_transition any => [:success, :failed, :canceled] do |build|
@@ -80,7 +80,7 @@ module Ci
     end
 
     def retried?
-      !self.commit.statuses.latest.include?(self)
+      !self.pipeline.statuses.latest.include?(self)
     end
 
     def retry
@@ -89,7 +89,7 @@ module Ci
 
     def depends_on_builds
       # Get builds of the same type
-      latest_builds = self.commit.builds.latest
+      latest_builds = self.pipeline.builds.latest
 
       # Return builds from previous stages
       latest_builds.where('stage_idx < ?', stage_idx)
@@ -114,7 +114,7 @@ module Ci
 
     def merge_request
       merge_requests = MergeRequest.includes(:merge_request_diff)
-                                   .where(source_branch: ref, source_project_id: commit.gl_project_id)
+                                   .where(source_branch: ref, source_project_id: pipeline.gl_project_id)
                                    .reorder(iid: :asc)
 
       merge_requests.find do |merge_request|
diff --git a/app/models/ci/commit.rb b/app/models/ci/pipeline.rb
similarity index 98%
rename from app/models/ci/commit.rb
rename to app/models/ci/pipeline.rb
index f22b573a94c..74347cf142f 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/pipeline.rb
@@ -1,5 +1,5 @@
 module Ci
-  class Commit < ActiveRecord::Base
+  class Pipeline < ActiveRecord::Base
     extend Ci::Model
     include Statuseable
 
@@ -47,7 +47,7 @@ module Ci
     end
 
     def short_sha
-      Ci::Commit.truncate_sha(sha)
+      Ci::Pipeline.truncate_sha(sha)
     end
 
     def commit_data
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index 872d5fb31de..47632c4b40a 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -3,7 +3,7 @@ module Ci
     extend Ci::Model
     
     belongs_to :trigger, class_name: 'Ci::Trigger'
-    belongs_to :commit, class_name: 'Ci::Commit'
+    belongs_to :commit, class_name: 'Ci::Pipeline'
     has_many :builds, class_name: 'Ci::Build'
 
     serialize :variables
diff --git a/app/models/commit.rb b/app/models/commit.rb
index f96c7cb34d0..b5637bc4fbc 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -214,13 +214,13 @@ class Commit
     @raw.short_id(7)
   end
 
-  def ci_commits
-    @ci_commits ||= project.ci_commits.where(sha: sha)
+  def pipelines
+    @pipeline ||= project.pipelines.where(sha: sha)
   end
 
   def status
     return @status if defined?(@status)
-    @status ||= ci_commits.status
+    @status ||= pipelines.status
   end
 
   def revert_branch_name
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index f774b6e0efb..3752bf09f16 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -4,10 +4,10 @@ class CommitStatus < ActiveRecord::Base
   self.table_name = 'ci_builds'
 
   belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
-  belongs_to :commit, class_name: 'Ci::Commit', touch: true
+  belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id, touch: true
   belongs_to :user
 
-  validates :commit, presence: true
+  validates :pipeline, presence: true
 
   validates_presence_of :name
 
@@ -44,11 +44,11 @@ class CommitStatus < ActiveRecord::Base
     end
 
     after_transition [:pending, :running] => :success do |commit_status|
-      MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.commit.project, nil).trigger(commit_status)
+      MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.pipeline.project, nil).trigger(commit_status)
     end
 
     after_transition any => :failed do |commit_status|
-      MergeRequests::AddTodoWhenBuildFailsService.new(commit_status.commit.project, nil).execute(commit_status)
+      MergeRequests::AddTodoWhenBuildFailsService.new(commit_status.pipeline.project, nil).execute(commit_status)
     end
   end
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 722c258244c..6c7668778ba 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -579,8 +579,8 @@ class MergeRequest < ActiveRecord::Base
     diverged_commits_count > 0
   end
 
-  def ci_commit
-    @ci_commit ||= source_project.ci_commit(last_commit.id, source_branch) if last_commit && source_project
+  def pipeline
+    @pipeline ||= source_project.pipeline(last_commit.id, source_branch) if last_commit && source_project
   end
 
   def diff_refs
diff --git a/app/models/project.rb b/app/models/project.rb
index 525a82c7534..e0ea1026b9c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -119,7 +119,7 @@ class Project < ActiveRecord::Base
   has_one :import_data, dependent: :destroy, class_name: "ProjectImportData"
 
   has_many :commit_statuses, dependent: :destroy, class_name: 'CommitStatus', foreign_key: :gl_project_id
-  has_many :ci_commits, dependent: :destroy, class_name: 'Ci::Commit', foreign_key: :gl_project_id
+  has_many :pipelines, dependent: :destroy, class_name: 'Ci::Pipeline', foreign_key: :gl_project_id
   has_many :builds, class_name: 'Ci::Build', foreign_key: :gl_project_id # the builds are created from the commit_statuses
   has_many :runner_projects, dependent: :destroy, class_name: 'Ci::RunnerProject', foreign_key: :gl_project_id
   has_many :runners, through: :runner_projects, source: :runner, class_name: 'Ci::Runner'
@@ -930,12 +930,12 @@ class Project < ActiveRecord::Base
     !namespace.share_with_group_lock
   end
 
-  def ci_commit(sha, ref)
-    ci_commits.order(id: :desc).find_by(sha: sha, ref: ref)
+  def pipeline(sha, ref)
+    pipelines.order(id: :desc).find_by(sha: sha, ref: ref)
   end
 
-  def ensure_ci_commit(sha, ref)
-    ci_commit(sha, ref) || ci_commits.create(sha: sha, ref: ref)
+  def ensure_pipeline(sha, ref)
+    pipeline(sha, ref) || pipelines.create(sha: sha, ref: ref)
   end
 
   def enable_ci
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 5bc0c31cb42..a7751b8effc 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -1,7 +1,7 @@
 module Ci
   class CreatePipelineService < BaseService
     def execute
-      pipeline = project.ci_commits.new(params)
+      pipeline = project.pipelines.new(params)
 
       unless ref_names.include?(params[:ref])
         pipeline.errors.add(:base, 'Reference not found')
@@ -19,7 +19,7 @@ module Ci
       end
 
       begin
-        Ci::Commit.transaction do
+        Ci::Pipeline.transaction do
           pipeline.sha = commit.id
 
           unless pipeline.config_processor
diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb
index 993acf11db9..cd8a2b25100 100644
--- a/app/services/ci/create_trigger_request_service.rb
+++ b/app/services/ci/create_trigger_request_service.rb
@@ -7,7 +7,7 @@ module Ci
       # check if ref is tag
       tag = project.repository.find_tag(ref).present?
 
-      ci_commit = project.ci_commits.create(sha: commit.sha, ref: ref, tag: tag)
+      ci_commit = project.pipelines.create(sha: commit.sha, ref: ref, tag: tag)
 
       trigger_request = trigger.trigger_requests.create!(
         variables: variables,
diff --git a/app/services/ci/image_for_build_service.rb b/app/services/ci/image_for_build_service.rb
index 3018f27ec05..90eb3e365f8 100644
--- a/app/services/ci/image_for_build_service.rb
+++ b/app/services/ci/image_for_build_service.rb
@@ -3,7 +3,7 @@ module Ci
     def execute(project, opts)
       sha = opts[:sha] || ref_sha(project, opts[:ref])
 
-      ci_commits = project.ci_commits.where(sha: sha)
+      ci_commits = project.pipelines.where(sha: sha)
       ci_commits = ci_commits.where(ref: opts[:ref]) if opts[:ref]
       image_name = image_for_status(ci_commits.status)
 
diff --git a/app/services/create_commit_builds_service.rb b/app/services/create_commit_builds_service.rb
index 5b6fefe669e..70a7d4bef4d 100644
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
@@ -18,7 +18,7 @@ class CreateCommitBuildsService
       return false
     end
 
-    commit = Ci::Commit.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
+    commit = Ci::Pipeline.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
 
     # Skip creating ci_commit when no gitlab-ci.yml is found
     unless commit.ci_yaml_file
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index 9d7fca6882d..bc93ba2552d 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -55,12 +55,12 @@ module MergeRequests
 
     def each_merge_request(commit_status)
       merge_request_from(commit_status).each do |merge_request|
-        ci_commit = merge_request.ci_commit
+        pipeline = merge_request.pipeline
 
-        next unless ci_commit
-        next unless ci_commit.sha == commit_status.sha
+        next unless pipeline
+        next unless pipeline.sha == commit_status.sha
 
-        yield merge_request, ci_commit
+        yield merge_request, pipeline
       end
     end
   end
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index e1b29f1e57a..bf01a78cb33 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -169,7 +169,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'repository contains ".gitlab-ci.yml" file' do
-    allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file).and_return(String.new)
+    allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file).and_return(String.new)
   end
 
   step 'I see commit ci info' do
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 9bcd33ff19e..0c02b5fd574 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -50,7 +50,7 @@ module API
         commit = @project.commit(params[:sha])
         not_found! 'Commit' unless commit
 
-        # Since the CommitStatus is attached to Ci::Commit (in the future Pipeline)
+        # Since the CommitStatus is attached to Ci::Pipeline (in the future Pipeline)
         # We need to always have the pipeline object
         # To have a valid pipeline object that can be attached to specific MR
         # Other CI service needs to send `ref`
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 4e7de8867b4..d129c510d63 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -238,7 +238,7 @@ module API
             should_remove_source_branch: params[:should_remove_source_branch]
           }
 
-          if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.ci_commit && merge_request.ci_commit.active?
+          if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.pipeline && merge_request.pipeline.active?
             ::MergeRequests::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user, merge_params).
               execute(merge_request)
           else
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
index e1636636934..5270108ef0f 100644
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
@@ -60,7 +60,7 @@ module Ci
 
     class BuildTime < Chart
       def collect
-        commits = project.ci_commits.last(30)
+        commits = project.pipelines.last(30)
 
         commits.each do |commit|
           @labels << commit.short_sha
diff --git a/spec/factories/ci/commits.rb b/spec/factories/ci/commits.rb
index 645cd7ae766..d1082f01326 100644
--- a/spec/factories/ci/commits.rb
+++ b/spec/factories/ci/commits.rb
@@ -17,7 +17,7 @@
 #
 
 FactoryGirl.define do
-  factory :ci_empty_commit, class: Ci::Commit do
+  factory :ci_empty_commit, class: Ci::Pipeline do
     sha '97de212e80737a608d939f648d959671fb0a0142'
 
     project factory: :empty_project
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index acd6fb3538c..093f92ffc6d 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -167,7 +167,7 @@ describe "Pipelines" do
       context 'with gitlab-ci.yml' do
         before { stub_ci_commit_to_return_yaml_file }
 
-        it { expect{ click_on 'Create pipeline' }.to change{ Ci::Commit.count }.by(1) }
+        it { expect{ click_on 'Create pipeline' }.to change{ Ci::Pipeline.count }.by(1) }
       end
 
       context 'without gitlab-ci.yml' do
diff --git a/spec/helpers/ci_status_helper_spec.rb b/spec/helpers/ci_status_helper_spec.rb
index f942695b6f0..45199d0f09d 100644
--- a/spec/helpers/ci_status_helper_spec.rb
+++ b/spec/helpers/ci_status_helper_spec.rb
@@ -3,8 +3,8 @@ require 'spec_helper'
 describe CiStatusHelper do
   include IconsHelper
 
-  let(:success_commit) { double("Ci::Commit", status: 'success') }
-  let(:failed_commit) { double("Ci::Commit", status: 'failed') }
+  let(:success_commit) { double("Ci::Pipeline", status: 'success') }
+  let(:failed_commit) { double("Ci::Pipeline", status: 'failed') }
 
   describe 'ci_icon_for_status' do
     it { expect(helper.ci_icon_for_status(success_commit.status)).to include('fa-check') }
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index 8e7ed42e883..a3336c87173 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -5,7 +5,7 @@ describe MergeRequestsHelper do
     let(:project) { create :project }
     let(:merge_request) { MergeRequest.new }
     let(:ci_service) { CiService.new }
-    let(:last_commit) { Ci::Commit.new({}) }
+    let(:last_commit) { Ci::Pipeline.new({}) }
 
     before do
       allow(merge_request).to receive(:source_project).and_return(project)
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 22f8639e5ab..2c6e6db682f 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Ci::Commit, models: true do
+describe Ci::Pipeline, models: true do
   let(:project) { FactoryGirl.create :empty_project }
   let(:commit) { FactoryGirl.create :ci_commit, project: project }
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 118e1e22a78..23d09331e5a 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -402,7 +402,7 @@ describe MergeRequest, models: true do
           with('123abc', 'master').
           and_return(ci_commit)
 
-        expect(subject.ci_commit).to eq(ci_commit)
+        expect(subject.pipeline).to eq(ci_commit)
       end
     end
 
@@ -410,7 +410,7 @@ describe MergeRequest, models: true do
       it 'returns nil' do
         allow(subject).to receive(:source_project).and_return(nil)
 
-        expect(subject.ci_commit).to be_nil
+        expect(subject.pipeline).to be_nil
       end
     end
   end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 338a4c3d3f0..44debdbdc1c 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -403,7 +403,7 @@ describe Project, models: true do
     let(:project) { create :project }
     let(:commit) { create :ci_commit, project: project, ref: 'master' }
 
-    subject { project.ci_commit(commit.sha, 'master') }
+    subject { project.pipeline(commit.sha, 'master') }
 
     it { is_expected.to eq(commit) }
 
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index 633927c8c3e..00d426e9792 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -16,8 +16,8 @@ describe API::CommitStatuses, api: true do
     let(:get_url) { "/projects/#{project.id}/repository/commits/#{sha}/statuses" }
 
     context 'ci commit exists' do
-      let!(:master) { project.ci_commits.create(sha: commit.id, ref: 'master') }
-      let!(:develop) { project.ci_commits.create(sha: commit.id, ref: 'develop') }
+      let!(:master) { project.pipelines.create(sha: commit.id, ref: 'master') }
+      let!(:develop) { project.pipelines.create(sha: commit.id, ref: 'develop') }
 
       it_behaves_like 'a paginated resources' do
         let(:request) { get api(get_url, reporter) }
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 4b0111df149..d8569d88ef0 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -388,7 +388,7 @@ describe API::API, api: true  do
   end
 
   describe "PUT /projects/:id/merge_requests/:merge_request_id/merge" do
-    let(:ci_commit) { create(:ci_commit_without_jobs) }
+    let(:pipeline) { create(:ci_commit_without_jobs) }
 
     it "should return merge_request in case of success" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
@@ -429,7 +429,7 @@ describe API::API, api: true  do
     end
 
     it "enables merge when build succeeds if the ci is active" do
-      allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
+      allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
       allow(ci_commit).to receive(:active?).and_return(true)
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
diff --git a/spec/requests/api/triggers_spec.rb b/spec/requests/api/triggers_spec.rb
index 0510b77a39b..1a0da8d6baa 100644
--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
@@ -44,7 +44,7 @@ describe API::API do
     end
 
     context 'Have a commit' do
-      let(:commit) { project.ci_commits.last }
+      let(:commit) { project.pipelines.last }
 
       it 'should create builds' do
         post api("/projects/#{project.id}/trigger/builds"), options.merge(ref: 'master')
diff --git a/spec/requests/ci/api/triggers_spec.rb b/spec/requests/ci/api/triggers_spec.rb
index 0ef03f9371b..441f8d613e2 100644
--- a/spec/requests/ci/api/triggers_spec.rb
+++ b/spec/requests/ci/api/triggers_spec.rb
@@ -36,7 +36,7 @@ describe Ci::API::API do
     end
 
     context 'Have a commit' do
-      let(:commit) { project.ci_commits.last }
+      let(:commit) { project.pipelines.last }
 
       it 'should create builds' do
         post ci_api("/projects/#{project.ci_id}/refs/master/trigger"), options
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 9ae8f31b372..3785723a031 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -20,10 +20,10 @@ describe CreateCommitBuildsService, services: true do
                        )
       end
 
-      it { expect(commit).to be_kind_of(Ci::Commit) }
+      it { expect(commit).to be_kind_of(Ci::Pipeline) }
       it { expect(commit).to be_valid }
       it { expect(commit).to be_persisted }
-      it { expect(commit).to eq(project.ci_commits.last) }
+      it { expect(commit).to eq(project.pipelines.last) }
       it { expect(commit.builds.first).to be_kind_of(Ci::Build) }
     end
 
@@ -61,12 +61,12 @@ describe CreateCommitBuildsService, services: true do
                                commits: [{ message: 'Message' }]
                               )
       expect(result).to be_falsey
-      expect(Ci::Commit.count).to eq(0)
+      expect(Ci::Pipeline.count).to eq(0)
     end
 
     it 'fails commits if yaml is invalid' do
       message = 'message'
-      allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { message }
+      allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { message }
       stub_ci_commit_yaml_file('invalid: file: file')
       commits = [{ message: message }]
       commit = service.execute(project, user,
@@ -85,7 +85,7 @@ describe CreateCommitBuildsService, services: true do
       let(:message) { "some message[ci skip]" }
 
       before do
-        allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { message }
+        allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { message }
       end
 
       it "skips builds creation if there is [ci skip] tag in commit message" do
@@ -102,7 +102,7 @@ describe CreateCommitBuildsService, services: true do
       end
 
       it "does not skips builds creation if there is no [ci skip] tag in commit message" do
-        allow_any_instance_of(Ci::Commit).to receive(:git_commit_message) { "some message" }
+        allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { "some message" }
 
         commits = [{ message: "some message" }]
         commit = service.execute(project, user,
@@ -133,7 +133,7 @@ describe CreateCommitBuildsService, services: true do
     end
 
     it "skips build creation if there are already builds" do
-      allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file) { gitlab_ci_yaml }
+      allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file) { gitlab_ci_yaml }
 
       commits = [{ message: "message" }]
       commit = service.execute(project, user,
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index 0861d74aede..7f8ea8d7c25 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -116,7 +116,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       before do
         # This behavior of MergeRequest: we instantiate a new object
         allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_wrap_original do
-          Ci::Commit.find(ci_commit.id)
+          Ci::Pipeline.find(ci_commit.id)
         end
 
         # We create test after the build
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index f73416a3d0f..49660a48a86 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -18,7 +18,7 @@ module StubGitlabCalls
   end
 
   def stub_ci_commit_yaml_file(ci_yaml)
-    allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file) { ci_yaml }
+    allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file) { ci_yaml }
   end
 
   def stub_ci_builds_disabled
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 20d3dfb42b3..7d0cfed3627 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -52,16 +52,16 @@ describe PostReceive do
     context "gitlab-ci.yml" do
       subject { PostReceive.new.perform(pwd(project), key_id, base64_changes) }
 
-      context "creates a Ci::Commit for every change" do
+      context "creates a Ci::Pipeline for every change" do
         before { stub_ci_commit_to_return_yaml_file }
 
-        it { expect{ subject }.to change{ Ci::Commit.count }.by(2) }
+        it { expect{ subject }.to change{ Ci::Pipeline.count }.by(2) }
       end
 
-      context "does not create a Ci::Commit" do
+      context "does not create a Ci::Pipeline" do
         before { stub_ci_commit_yaml_file(nil) }
 
-        it { expect{ subject }.not_to change{ Ci::Commit.count } }
+        it { expect{ subject }.not_to change{ Ci::Pipeline.count } }
       end
     end
   end

From 2d05de7af8de9a11f5bdfec0dd3f294a0148d023 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Tue, 31 May 2016 08:51:13 -0400
Subject: [PATCH 0975/1431] Cache project build count. Closes #18032

---
 .vagrant_enabled                         | 0
 app/models/project.rb                    | 6 ++++++
 app/views/layouts/nav/_project.html.haml | 9 +++++++++
 3 files changed, 15 insertions(+)
 create mode 100644 .vagrant_enabled

diff --git a/.vagrant_enabled b/.vagrant_enabled
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/app/models/project.rb b/app/models/project.rb
index 525a82c7534..1375dab8c34 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1011,4 +1011,10 @@ class Project < ActiveRecord::Base
 
     update_attribute(:pending_delete, true)
   end
+
+  def running_or_pending_build_count
+    Rails.cache.fetch(['projects', id, 'running_or_pending_build_count'], expires_in: 60) do
+      builds.running_or_pending.count(:all)
+    end
+  end
 end
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 2c9b9006668..86d2ba9ba26 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -52,6 +52,15 @@
           = icon('ship fw')
           %span
             Pipelines
+            %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
+
+    - if project_nav_tab? :builds
+      = nav_link(controller: %w(builds)) do
+        = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+          = icon('cubes fw')
+          %span
+            Builds
+            %span.badge.count.builds_counter= number_with_delimiter(@project.running_or_pending_build_count)
 
     - if project_nav_tab? :container_registry
       = nav_link(controller: %w(container_registry)) do

From 4d9622e7d3e927ad158d26c780fee64c6d8183bc Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Tue, 31 May 2016 16:01:16 -0400
Subject: [PATCH 0976/1431] Invalidate cache on build change

---
 app/models/ci/build.rb | 1 +
 app/models/project.rb  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 5e77fda70b9..f597f920a3b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -313,6 +313,7 @@ module Ci
       build_data = Gitlab::BuildDataBuilder.build(self)
       project.execute_hooks(build_data.dup, :build_hooks)
       project.execute_services(build_data.dup, :build_hooks)
+      project.expire_running_or_pending_build_count
     end
 
     def artifacts?
diff --git a/app/models/project.rb b/app/models/project.rb
index 1375dab8c34..3b5ca05dc3f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1013,8 +1013,12 @@ class Project < ActiveRecord::Base
   end
 
   def running_or_pending_build_count
-    Rails.cache.fetch(['projects', id, 'running_or_pending_build_count'], expires_in: 60) do
+    Rails.cache.fetch(['projects', id, 'running_or_pending_build_count']) do
       builds.running_or_pending.count(:all)
     end
   end
+
+  def expire_running_or_pending_build_count
+    Rails.cache.delete(['projects', id, 'running_or_pending_build_count'])
+  end
 end

From 2605a0a844f187daeeff1f16920db445f53e2793 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 1 Jun 2016 10:50:32 -0400
Subject: [PATCH 0977/1431] Refactor. Add tests.

---
 CHANGELOG                                    | 1 +
 app/models/ci/build.rb                       | 2 +-
 app/models/project.rb                        | 8 ++------
 app/views/layouts/nav/_project.html.haml     | 9 ---------
 app/views/projects/pipelines/_head.html.haml | 2 +-
 features/project/builds/summary.feature      | 1 +
 features/steps/project/builds/summary.rb     | 4 ++++
 7 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dedaf9090a2..daffb916065 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.9.0 (unreleased)
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
   - Cache assigned issue and merge request counts in sidebar nav
+  - Cache project build count in sidebar nav
 
 v 8.8.3
   - Fix incorrect links on pipeline page when merge request created from fork
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index f597f920a3b..64723ab6b4b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -313,7 +313,7 @@ module Ci
       build_data = Gitlab::BuildDataBuilder.build(self)
       project.execute_hooks(build_data.dup, :build_hooks)
       project.execute_services(build_data.dup, :build_hooks)
-      project.expire_running_or_pending_build_count
+      project.running_or_pending_build_count(force: true)
     end
 
     def artifacts?
diff --git a/app/models/project.rb b/app/models/project.rb
index 3b5ca05dc3f..9ccf6a97df6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1012,13 +1012,9 @@ class Project < ActiveRecord::Base
     update_attribute(:pending_delete, true)
   end
 
-  def running_or_pending_build_count
-    Rails.cache.fetch(['projects', id, 'running_or_pending_build_count']) do
+  def running_or_pending_build_count(force: false)
+    Rails.cache.fetch(['projects', id, 'running_or_pending_build_count'], force: force) do
       builds.running_or_pending.count(:all)
     end
   end
-
-  def expire_running_or_pending_build_count
-    Rails.cache.delete(['projects', id, 'running_or_pending_build_count'])
-  end
 end
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 86d2ba9ba26..2c9b9006668 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -52,15 +52,6 @@
           = icon('ship fw')
           %span
             Pipelines
-            %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
-
-    - if project_nav_tab? :builds
-      = nav_link(controller: %w(builds)) do
-        = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
-          = icon('cubes fw')
-          %span
-            Builds
-            %span.badge.count.builds_counter= number_with_delimiter(@project.running_or_pending_build_count)
 
     - if project_nav_tab? :container_registry
       = nav_link(controller: %w(container_registry)) do
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index 2c8ae625e67..6e757df5417 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -11,4 +11,4 @@
       = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
         %span
           Builds
-          %span.badge.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
+          %span.badge.count.builds_counter= number_with_delimiter(@project.running_or_pending_build_count)
diff --git a/features/project/builds/summary.feature b/features/project/builds/summary.feature
index 3c029a973df..550ebccf0d7 100644
--- a/features/project/builds/summary.feature
+++ b/features/project/builds/summary.feature
@@ -24,3 +24,4 @@ Feature: Project Builds Summary
     Then recent build has been erased
     And recent build summary does not have artifacts widget
     And recent build summary contains information saying that build has been erased
+    And the build count cache is updated
diff --git a/features/steps/project/builds/summary.rb b/features/steps/project/builds/summary.rb
index e9e2359146e..374eb0b0e07 100644
--- a/features/steps/project/builds/summary.rb
+++ b/features/steps/project/builds/summary.rb
@@ -36,4 +36,8 @@ class Spinach::Features::ProjectBuildsSummary < Spinach::FeatureSteps
       expect(page).to have_content 'Build has been erased'
     end
   end
+
+  step 'the build count cache is updated' do
+    expect(@build.project.running_or_pending_build_count).to eq @build.project.builds.running_or_pending.count(:all)
+  end
 end

From 04fdf4b9a926129d63d0483ad8cd7e748f3a4e07 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 2 Jun 2016 17:00:16 +0100
Subject: [PATCH 0978/1431] fixup! Add `sha` parameter to MR accept API

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

diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 50baf4c09ad..db304abe1c3 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -235,7 +235,7 @@ module API
           render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged?
 
           if params[:sha] && merge_request.source_sha != params[:sha]
-            render_api_error!("SHA does not match HEAD of source branch: #{merge_request.target_sha}", 409)
+            render_api_error!("SHA does not match HEAD of source branch: #{merge_request.source_sha}", 409)
           end
 
           merge_params = {

From 4f726683cb59da54f47302880d5c0c447638402a Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 2 Jun 2016 17:00:42 +0100
Subject: [PATCH 0979/1431] fixup! Don't allow merges with new commits

---
 .../merge_requests/widget/open/_sha_mismatch.html.haml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
index a78583b7c61..499624f8dd8 100644
--- a/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
@@ -1,6 +1,6 @@
 %h4
   = icon("exclamation-triangle")
-  This merge request has new commits since the page was loaded.
+  This merge request has received new commits since the page was loaded.
 
 %p
-  Please review the new commits before merging.
+  Please reload the page to review the new commits before merging.

From bc351d5ac6e782a078c9435abd92146a4f3eecab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 2 Jun 2016 18:10:16 +0200
Subject: [PATCH 0980/1431] Fix link to current design reference in the
 CONTRIBUTING guide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a15f8c4fec7..02d2b77f5fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,7 +96,7 @@ The designs are made using Antetype (`.atype` files). You can use the
 [free Antetype viewer (Mac OSX only)] or grab an exported PNG from the design
 (the PNG is 1:1).
 
-The current designs can be found in the [`gitlab1.atype` file].
+The current designs can be found in the [`gitlab8.atype` file].
 
 ### UI development kit
 
@@ -530,4 +530,4 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
 [scss-styleguide]: doc/development/scss_styleguide.md "SCSS styleguide"
 [gitlab-design]: https://gitlab.com/gitlab-org/gitlab-design
 [free Antetype viewer (Mac OSX only)]: https://itunes.apple.com/us/app/antetype-viewer/id824152298?mt=12
-[`gitlab1.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/gitlab1.atype/
+[`gitlab8.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/current/

From 905e8b6b545dfb6bc408824889b66d47aa02eda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 2 Jun 2016 18:14:33 +0200
Subject: [PATCH 0981/1431] Remove unused Issuable#is_assigned? method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/concerns/issuable.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 50f5b749e38..37124379c18 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -171,10 +171,6 @@ module Issuable
     today? && created_at == updated_at
   end
 
-  def is_assigned?
-    !!assignee_id
-  end
-
   def is_being_reassigned?
     assignee_id_changed?
   end

From 34007aa0dc61df80514cc0ff125eef8fcf57e35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 2 Jun 2016 18:25:44 +0200
Subject: [PATCH 0982/1431] Fix deprecation warnings in
 spec/services/issues/bulk_update_service_spec.rb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/services/issues/bulk_update_service_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index 96f050bbd9b..454d5849495 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -18,7 +18,7 @@ describe Issues::BulkUpdateService, services: true do
       @issues = create_list(:issue, 5, project: @project)
       @params = {
         state_event: 'close',
-        issues_ids: @issues.map(&:id)
+        issues_ids: @issues.map(&:id).join(",")
       }
     end
 
@@ -38,7 +38,7 @@ describe Issues::BulkUpdateService, services: true do
       @issues = create_list(:closed_issue, 5, project: @project)
       @params = {
         state_event: 'reopen',
-        issues_ids: @issues.map(&:id)
+        issues_ids: @issues.map(&:id).join(",")
       }
     end
 
@@ -58,7 +58,7 @@ describe Issues::BulkUpdateService, services: true do
     before do
       @new_assignee = create :user
       @params = {
-        issues_ids: [issue.id],
+        issues_ids: issue.id.to_s,
         assignee_id: @new_assignee.id
       }
     end
@@ -97,7 +97,7 @@ describe Issues::BulkUpdateService, services: true do
     before do
       @milestone = create(:milestone, project: @project)
       @params = {
-        issues_ids: [issue.id],
+        issues_ids: issue.id.to_s,
         milestone_id: @milestone.id
       }
     end

From ab75b21c83a80d144716e63aa8731092af3eb0cc Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 2 Jun 2016 13:59:34 -0400
Subject: [PATCH 0983/1431] Update CHANGELOG for 8.8.3

[ci skip]
---
 CHANGELOG | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6a87e091940..27f60c7de06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,13 +32,23 @@ v 8.9.0 (unreleased)
   - Cache project build count in sidebar nav
 
 v 8.8.3
-  - Fix incorrect links on pipeline page when merge request created from fork
-  - Fix gitlab importer failing to import new projects due to missing credentials
-  - Fix serious performance bug with rendering Markdown with InlineDiffFilter
-  - Fix import URL migration not rescuing with the correct Error
-  - In search results, only show notes on confidential issues that the user has access to
-  - Fix health check access token changing due to old application settings being used
-  - Fix wiki project clone address error (chujinjin)
+  - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
+  - Fixed JS error when trying to remove discussion form. !4303
+  - Fixed issue with button color when no CI enabled. !4287
+  - Fixed potential issue with 2 CI status polling events happening. !3869
+  - Improve design of Pipeline view. !4230
+  - Fix gitlab importer failing to import new projects due to missing credentials. !4301
+  - Fix import URL migration not rescuing with the correct Error. !4321
+  - Fix health check access token changing due to old application settings being used. !4332
+  - Make authentication service for Container Registry to be compatible with Docker versions before 1.11. !4363
+  - Add Application Setting to configure Container Registry token expire delay (default 5 min). !4364
+  - Pass the "Remember me" value to the 2FA token form. !4369
+  - Fix incorrect links on pipeline page when merge request created from fork.  !4376
+  - Use downcased path to container repository as this is expected path by Docker. !4420
+  - Fix wiki project clone address error (chujinjin). !4429
+  - Fix serious performance bug with rendering Markdown with InlineDiffFilter.  !4392
+  - Fix missing number on generated ordered list element. !4437
+  - Prevent disclosure of notes on confidential issues in search results.
 
 v 8.8.2
   - Added remove due date button. !4209

From c3e923c496b7d1c344a5fa68cef4a80ce23c90d0 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 25 May 2016 18:52:10 -0700
Subject: [PATCH 0984/1431] Ensure we don't show TODOS for projects pending
 delete

By joining the Todos on the project table.
---
 app/finders/todos_finder.rb       |  2 +-
 spec/features/todos/todos_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 4bd46a76087..f638b5bf91f 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -23,7 +23,7 @@ class TodosFinder
   end
 
   def execute
-    items = current_user.todos
+    items = current_user.todos.joins(:project).where(projects: { pending_delete: false })
     items = by_action_id(items)
     items = by_author(items)
     items = by_project(items)
diff --git a/spec/features/todos/todos_spec.rb b/spec/features/todos/todos_spec.rb
index 4e627753cc7..c8c86a3ff47 100644
--- a/spec/features/todos/todos_spec.rb
+++ b/spec/features/todos/todos_spec.rb
@@ -98,5 +98,18 @@ describe 'Dashboard Todos', feature: true do
         end
       end
     end
+
+    context 'User has a Todo in a project pending deletion' do
+      before do
+        deleted_project = create(:project, pending_delete: true)
+        create(:todo, :mentioned, user: user, project: deleted_project, target: issue, author: author)
+        login_as(user)
+        visit dashboard_todos_path
+      end
+
+      it 'shows "All done" message' do
+        expect(page).to have_content "You're all done!"
+      end
+    end
   end
 end

From 4ecc10fade61a1b45cd45ea4189e95a2acbea353 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 25 May 2016 21:31:36 -0700
Subject: [PATCH 0985/1431] Reduce the filters on the todos joins project query
 by being explicit about the join

---
 app/finders/todos_finder.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index f638b5bf91f..3243d62fc95 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -23,7 +23,13 @@ class TodosFinder
   end
 
   def execute
-    items = current_user.todos.joins(:project).where(projects: { pending_delete: false })
+    items = current_user.todos
+
+    # Filter out todos linked to project pending deletion
+    items = items.joins(
+      'INNER JOIN projects ON projects.id = todos.project_id AND projects.pending_delete = false'
+    )
+
     items = by_action_id(items)
     items = by_author(items)
     items = by_project(items)

From 4280575fc0888632196cf4483dcd777618c13390 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Mon, 30 May 2016 10:59:14 -0700
Subject: [PATCH 0986/1431] Move filtering todos by projects not pending
 deletion into a scope on the todo model

---
 app/finders/todos_finder.rb | 8 +-------
 app/models/todo.rb          | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 3243d62fc95..5d7d55180e1 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -23,13 +23,7 @@ class TodosFinder
   end
 
   def execute
-    items = current_user.todos
-
-    # Filter out todos linked to project pending deletion
-    items = items.joins(
-      'INNER JOIN projects ON projects.id = todos.project_id AND projects.pending_delete = false'
-    )
-
+    items = current_user.todos.not_pending_delete
     items = by_action_id(items)
     items = by_author(items)
     items = by_project(items)
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 3a091373329..f66755436ea 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -19,6 +19,7 @@ class Todo < ActiveRecord::Base
 
   scope :pending, -> { with_state(:pending) }
   scope :done, -> { with_state(:done) }
+  scope :not_pending_delete, -> { joins('INNER JOIN projects ON projects.id = todos.project_id AND projects.pending_delete = false') }
 
   state_machine :state, initial: :pending do
     event :done do

From b173ea2bd4bbc65529b827f9afa5999f6f04579e Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 1 Jun 2016 16:44:35 -0700
Subject: [PATCH 0987/1431] Use the project finder in the todos finder to limit
 todos to just ones within projects you have access to.

---
 app/finders/todos_finder.rb       | 14 +++++++++++++-
 app/models/todo.rb                |  1 -
 spec/features/todos/todos_spec.rb |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 5d7d55180e1..6fbe68a720d 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -23,7 +23,7 @@ class TodosFinder
   end
 
   def execute
-    items = current_user.todos.not_pending_delete
+    items = current_user.todos
     items = by_action_id(items)
     items = by_author(items)
     items = by_project(items)
@@ -78,6 +78,16 @@ class TodosFinder
     @project
   end
 
+  def projects
+    return @projects if defined?(@projects)
+
+    if project?
+      @projects = project
+    else
+      @projects = ProjectsFinder.new.execute(current_user).reorder(nil)
+    end
+  end
+
   def type?
     type.present? && ['Issue', 'MergeRequest'].include?(type)
   end
@@ -105,6 +115,8 @@ class TodosFinder
   def by_project(items)
     if project?
       items = items.where(project: project)
+    elsif projects
+      items = items.merge(projects).joins(:project)
     end
 
     items
diff --git a/app/models/todo.rb b/app/models/todo.rb
index f66755436ea..3a091373329 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -19,7 +19,6 @@ class Todo < ActiveRecord::Base
 
   scope :pending, -> { with_state(:pending) }
   scope :done, -> { with_state(:done) }
-  scope :not_pending_delete, -> { joins('INNER JOIN projects ON projects.id = todos.project_id AND projects.pending_delete = false') }
 
   state_machine :state, initial: :pending do
     event :done do
diff --git a/spec/features/todos/todos_spec.rb b/spec/features/todos/todos_spec.rb
index c8c86a3ff47..c0a1cd64f32 100644
--- a/spec/features/todos/todos_spec.rb
+++ b/spec/features/todos/todos_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Dashboard Todos', feature: true do
   let(:user)    { create(:user) }
   let(:author)  { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
   let(:issue)   { create(:issue) }
 
   describe 'GET /dashboard/todos' do

From 14a9b0d7dda78e88852644bd9a6c05922b5e367d Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 2 Jun 2016 12:06:24 -0700
Subject: [PATCH 0988/1431] Update target todo test to use a public project

---
 CHANGELOG                                | 3 +++
 spec/features/todos/target_state_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 27f60c7de06..ef5b4aa79cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,9 @@ v 8.9.0 (unreleased)
   - Cache assigned issue and merge request counts in sidebar nav
   - Cache project build count in sidebar nav
 
+v 8.8.4
+  - Fix todos page throwing errors when you have a project pending deletion
+
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
   - Fixed JS error when trying to remove discussion form. !4303
diff --git a/spec/features/todos/target_state_spec.rb b/spec/features/todos/target_state_spec.rb
index 72491ac7e61..32fa88a2b21 100644
--- a/spec/features/todos/target_state_spec.rb
+++ b/spec/features/todos/target_state_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 feature 'Todo target states', feature: true do
   let(:user)    { create(:user) }
   let(:author)  { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
 
   before do
     login_as user

From 078ba8c090dd30cb4cad7ef6dc5380e2036e2e6a Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Thu, 2 Jun 2016 13:17:54 +0200
Subject: [PATCH 0989/1431] issuable#labels_array explicitly load the labels

This will be useful when you want to ask for the
number of items and later iterate over them, without
needing to ask if the association is load or not.

So you avoid extra database queries
---
 CHANGELOG                                    |  1 +
 app/models/concerns/issuable.rb              |  4 ++++
 app/views/shared/issuable/_sidebar.html.haml | 10 +++++-----
 spec/models/concerns/issuable_spec.rb        | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6a87e091940..84e755e4ead 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.9.0 (unreleased)
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
   - Cache assigned issue and merge request counts in sidebar nav
   - Cache project build count in sidebar nav
+  - Reduce number of queries needed to render issue labels in the sidebar
 
 v 8.8.3
   - Fix incorrect links on pipeline page when merge request created from fork
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 50f5b749e38..e86d5236abb 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -213,6 +213,10 @@ module Issuable
     hook_data
   end
 
+  def labels_array
+    labels.to_a
+  end
+
   def label_names
     labels.order('title ASC').pluck(:title)
   end
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index c1eec450193..d6552ae7f18 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -114,20 +114,20 @@
           .sidebar-collapsed-icon
             = icon('tags')
             %span
-              = issuable.labels.count
+              = issuable.labels_array.size
           .title.hide-collapsed
             Labels
             = icon('spinner spin', class: 'block-loading')
             - if can_edit_issuable
               = link_to 'Edit', '#', class: 'edit-link pull-right'
-          .value.bold.issuable-show-labels.hide-collapsed{ class: ("has-labels" if issuable.labels.any?) }
-            - if issuable.labels.any?
-              - issuable.labels.each do |label|
+          .value.bold.issuable-show-labels.hide-collapsed{ class: ("has-labels" if issuable.labels_array.any?) }
+            - if issuable.labels_array.any?
+              - issuable.labels_array.each do |label|
                 = link_to_label(label, type: issuable.to_ability_name)
             - else
               .light None
           .selectbox.hide-collapsed
-            - issuable.labels.each do |label|
+            - issuable.labels_array.each do |label|
               = hidden_field_tag "#{issuable.to_ability_name}[label_names][]", label.id, id: nil
             .dropdown
               %button.dropdown-menu-toggle.js-label-select.js-multiselect{type: "button", data: {toggle: "dropdown", field_name: "#{issuable.to_ability_name}[label_names][]", ability_name: issuable.to_ability_name, show_no: "true", show_any: "true", project_id: (@project.id if @project), issue_update: issuable_json_path(issuable), labels: (namespace_project_labels_path(@project.namespace, @project, :json) if @project)}}
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index fb20578d8d3..e9f827e9f50 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -227,6 +227,20 @@ describe Issue, "Issuable" do
     end
   end
 
+  describe '#labels_array' do
+    let(:project) { create(:project) }
+    let(:bug) { create(:label, project: project, title: 'bug') }
+    let(:issue) { create(:issue, project: project) }
+
+    before(:each) do
+      issue.labels << bug
+    end
+
+    it 'loads the association and returns it as an array' do
+      expect(issue.reload.labels_array).to eq([bug])
+    end
+  end
+
   describe "votes" do
     let(:project) { issue.project }
 

From 33c499441a91c068c4b3e73748b50a2369450a5a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 22:43:02 +0300
Subject: [PATCH 0990/1431] Add icons and buttons to UI guide

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 doc/development/ui_guide.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/doc/development/ui_guide.md b/doc/development/ui_guide.md
index b4dcb748351..ecaa306756b 100644
--- a/doc/development/ui_guide.md
+++ b/doc/development/ui_guide.md
@@ -33,4 +33,24 @@ be under 'Wiki' tab and so on and so forth.
 We want GitLab to work well on small mobile screens as well. Size limitations make it is impossible to fit everything on a mobile screen. In this case it is OK to hide 
 part of the UI for smaller resolutions in favor of a better user experience. 
 However core functionality like browsing files, creating issues, writing comments, should
-be available on all resolutions.
\ No newline at end of file
+be available on all resolutions.
+
+## Icons
+
+* `trash` icon for button or link that does destructive action like removing 
+information from database or file system
+* `x` icon for closing/hiding UI element. For example close modal window
+* `pencil` icon for edit button or link
+* `eye` icon for subscribe action
+* `rss` for rss/atom feed
+* `plus` for link or dropdown that lead to page wher eyou create new object (For example new issue page)
+
+
+## Buttons
+
+* Button should contain icon or text. Exceptions should be approved by UX designer.
+* Use gray button on white background or white button on gray background.
+* Use red button for destructive actions (not revertable). For example removing issue.
+* Use green or blue button for primary action. Primary button should be only one. 
+Do not use both green and blue button in one form. 
+

From 814b26cfc3829a683ce565cbbfc8525dd768299d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 23:04:08 +0300
Subject: [PATCH 0991/1431] Fix typo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 doc/development/ui_guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/development/ui_guide.md b/doc/development/ui_guide.md
index ecaa306756b..23760a14b39 100644
--- a/doc/development/ui_guide.md
+++ b/doc/development/ui_guide.md
@@ -43,7 +43,7 @@ information from database or file system
 * `pencil` icon for edit button or link
 * `eye` icon for subscribe action
 * `rss` for rss/atom feed
-* `plus` for link or dropdown that lead to page wher eyou create new object (For example new issue page)
+* `plus` for link or dropdown that lead to page where you create new object (For example new issue page)
 
 
 ## Buttons

From 91937d5b312a37d2b602623f57dad3c0ae8af813 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 3 Jun 2016 00:00:48 +0300
Subject: [PATCH 0992/1431] Added a new common util called $.timefor.

It will use $.timeago behind the scene and it does the opposite of what $.timeago does.

$.timefor("Thu Jun 05 2016 23:40:39 GMT+0300 (EEST)") will return "3 days remaining".
---
 .../javascripts/lib/common_utils.js.coffee    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app/assets/javascripts/lib/common_utils.js.coffee

diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee
new file mode 100644
index 00000000000..a7cc07608ab
--- /dev/null
+++ b/app/assets/javascripts/lib/common_utils.js.coffee
@@ -0,0 +1,24 @@
+((w) ->
+
+  jQuery.timefor = (time, suffix, expiredLabel) ->
+
+    return '' unless time
+
+    suffix       or= 'remaining'
+    expiredLabel or= 'expired'
+
+    jQuery.timeago.settings.allowFuture = yes
+
+    { suffixFromNow } = jQuery.timeago.settings.strings
+    jQuery.timeago.settings.strings.suffixFromNow = suffix
+
+    timefor = $.timeago time
+
+    if timefor.indexOf('ago') > -1
+      timefor = expiredLabel
+
+    jQuery.timeago.settings.strings.suffixFromNow = suffixFromNow
+
+    return timefor
+
+) window

From 5cae36d16ca730c057badb0f41ee25a9830e5abd Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 3 Jun 2016 00:01:11 +0300
Subject: [PATCH 0993/1431] Show milestone remaining tooltip in right sidebar.

---
 app/assets/javascripts/milestone_select.js.coffee | 15 +++++++++++++--
 app/helpers/milestones_helper.rb                  | 15 ++++++++++-----
 app/views/shared/issuable/_sidebar.html.haml      |  6 ++++--
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index 345a0e447af..e8d489dce9e 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -24,11 +24,21 @@ class @MilestoneSelect
 
       if issueUpdateURL
         milestoneLinkTemplate = _.template(
-          '<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>"><%= _.escape(title) %></a>'
+          '<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
+            <span class="has-tooltip" data-container="body" data-original-title="<%= remaining %>">
+              <%= _.escape(title) %>
+            </span>
+          </a>'
         )
 
         milestoneLinkNoneTemplate = '<div class="light">None</div>'
 
+        collapsedSidebarLabelTemplate = _.template(
+          '<span class="has-tooltip" data-container="body" data-original-title="<%= remaining %>" data-placement="left">
+            <%= _.escape(title) %>
+          </span>'
+        )
+
       $dropdown.glDropdown(
         data: (term, callback) ->
           $.ajax(
@@ -122,8 +132,9 @@ class @MilestoneSelect
               if data.milestone?
                 data.milestone.namespace = _this.currentProject.namespace
                 data.milestone.path = _this.currentProject.path
+                data.milestone.remaining = $.timefor data.milestone.due_date
                 $value.html(milestoneLinkTemplate(data.milestone))
-                $sidebarCollapsedValue.find('span').text(data.milestone.title)
+                $sidebarCollapsedValue.find('span').html(collapsedSidebarLabelTemplate(data.milestone))
               else
                 $value.html(milestoneLinkNoneTemplate)
                 $sidebarCollapsedValue.find('span').text('No')
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 87fc2db6901..2abb0e9b179 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -54,13 +54,18 @@ module MilestonesHelper
     end
   end
 
-  def milestone_remaining_days(milestone)
+  def milestone_remaining_days(milestone, withContentTag = true)
     if milestone.expired?
-      content_tag(:strong, 'expired')
+      if withContentTag then content_tag(:strong, 'expired') else 'expired' end
     elsif milestone.due_date
-      days    = milestone.remaining_days
-      content = content_tag(:strong, days)
-      content << " #{'day'.pluralize(days)} remaining"
+      days = milestone.remaining_days
+
+      if withContentTag
+        content = content_tag(:strong, days)
+        content << " #{'day'.pluralize(days)} remaining"
+      else
+        "#{days} #{'day'.pluralize(days)} remaining"
+      end
     end
   end
 end
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index c1eec450193..be038cab94d 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -56,7 +56,8 @@
           = icon('clock-o')
           %span
             - if issuable.milestone
-              = issuable.milestone.title
+              %span.has-tooltip{"data-container" => "body", "data-placement" => "left", "data-original-title" => milestone_remaining_days(issuable.milestone, false)}
+                = issuable.milestone.title
             - else
               None
         .title.hide-collapsed
@@ -67,7 +68,8 @@
         .value.bold.hide-collapsed
           - if issuable.milestone
             = link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do
-              = issuable.milestone.title
+              %span.has-tooltip{"data-container" => "body", "data-original-title" => milestone_remaining_days(issuable.milestone, false)}
+                = issuable.milestone.title
           - else
             .light None
 

From f0ca487cd513d50c807e4226a1ee459586f16b08 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 2 Jun 2016 14:17:46 -0700
Subject: [PATCH 0994/1431] Reorder the todos because the use of the project
 finder attempts to order them differently

---
 app/finders/todos_finder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 6fbe68a720d..1d88116d7d2 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -30,7 +30,7 @@ class TodosFinder
     items = by_state(items)
     items = by_type(items)
 
-    items
+    items.reorder(id: :desc)
   end
 
   private
@@ -84,7 +84,7 @@ class TodosFinder
     if project?
       @projects = project
     else
-      @projects = ProjectsFinder.new.execute(current_user).reorder(nil)
+      @projects = ProjectsFinder.new.execute(current_user)
     end
   end
 

From 7cb9c7d8ea97a17029a7b24b5bcc870f1063e025 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 3 Jun 2016 00:23:18 +0300
Subject: [PATCH 0995/1431] Update CHANGELOG.

Add milestone expire date to the right sidebar.
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 27f60c7de06..d9beae0a066 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.9.0 (unreleased)
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
   - Cache assigned issue and merge request counts in sidebar nav
   - Cache project build count in sidebar nav
+  - Add milestone expire date to the right sidebar
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 86675194aa44236c3e9acc4aa7ede143f718685e Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 2 Jun 2016 15:30:13 -0700
Subject: [PATCH 0996/1431] Fix failing todo tests

---
 spec/features/todos/todos_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/todos/todos_spec.rb b/spec/features/todos/todos_spec.rb
index c0a1cd64f32..8e1833a069e 100644
--- a/spec/features/todos/todos_spec.rb
+++ b/spec/features/todos/todos_spec.rb
@@ -49,7 +49,7 @@ describe 'Dashboard Todos', feature: true do
         note1 = create(:note_on_issue, note: "Hello #{label1.to_reference(format: :name)}", noteable_id: issue.id, noteable_type: 'Issue', project: issue.project)
         create(:todo, :mentioned, project: project, target: issue, user: user, note_id: note1.id)
 
-        project2 = create(:project)
+        project2 = create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
         label2 = create(:label, project: project2)
         issue2 = create(:issue, project: project2)
         note2 = create(:note_on_issue, note: "Test #{label2.to_reference(format: :name)}", noteable_id: issue2.id, noteable_type: 'Issue', project: project2)
@@ -101,7 +101,7 @@ describe 'Dashboard Todos', feature: true do
 
     context 'User has a Todo in a project pending deletion' do
       before do
-        deleted_project = create(:project, pending_delete: true)
+        deleted_project = create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC, pending_delete: true)
         create(:todo, :mentioned, user: user, project: deleted_project, target: issue, author: author)
         login_as(user)
         visit dashboard_todos_path

From 3b4f03de8fb0de0b882d499c9259f053fa69d9e6 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 2 Jun 2016 19:48:11 -0300
Subject: [PATCH 0997/1431] Ensure branch cleanup regardless of whether the
 import process succeeds

---
 CHANGELOG                            | 3 +++
 lib/gitlab/github_import/importer.rb | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 68ea866968d..6ead604b724 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,9 @@ v 8.9.0 (unreleased)
   - Cache project build count in sidebar nav
   - Reduce number of queries needed to render issue labels in the sidebar
 
+v 8.8.4 (unreleased)
+  - Ensure branch cleanup regardless of whether the GitHub import process succeeds
+
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
   - Fixed JS error when trying to remove discussion form. !4303
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 408d9b79632..9d077e79c39 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -89,11 +89,11 @@ module Gitlab
           end
         end
 
-        delete_refs(branches_removed)
-
         true
       rescue ActiveRecord::RecordInvalid => e
         raise Projects::ImportService::Error, e.message
+      ensure
+        delete_refs(branches_removed)
       end
 
       def create_refs(branches)

From b2b2b2f9de1a7d96decbd1e54336ba805a059d9e Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 30 May 2016 18:02:54 +0200
Subject: [PATCH 0998/1431] fix create service error handling - missing setting
 import status to failed

---
 app/services/projects/create_service.rb | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 6728fabea1e..b73389f0489 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -56,14 +56,14 @@ module Projects
 
       after_create_actions if @project.persisted?
 
-      @project.add_import_job if @project.import?
-
+      if @project.errors.empty?
+        @project.add_import_job if @project.import?
+      else
+        fail(error: @project.errors.join(', '))
+      end
       @project
     rescue => e
-      message = "Unable to save project: #{e.message}"
-      Rails.logger.error(message)
-      @project.errors.add(:base, message) if @project
-      @project
+      fail(error: e.message)
     end
 
     protected
@@ -103,5 +103,19 @@ module Projects
         end
       end
     end
+
+    def fail(error:)
+      message = "Unable to save project. Error: #{error}"
+      message << "Project ID: #{@project.id}" if @project && @project.id
+
+      Rails.logger.error(message)
+
+      if @project && @project.import?
+        @project.errors.add(:base, message)
+        @project.mark_import_as_failed(message)
+      end
+
+      @project
+    end
   end
 end

From b2b3e0e6ee8e428322ae6aff172b59e040750ae0 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 May 2016 10:53:50 +0200
Subject: [PATCH 0999/1431] fix empty message on shell error

---
 app/services/projects/import_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index ef15ef6a473..c4838d31f2f 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -39,7 +39,7 @@ module Projects
       begin
         gitlab_shell.import_repository(project.path_with_namespace, project.import_url)
       rescue Gitlab::Shell::Error => e
-        raise Error, e.message
+        raise Error,  "Error importing repository #{project.import_url} into #{project.path_with_namespace} - #{e.message}"
       end
     end
 

From 64c3905523808942ac62b7ebfbce3634b6e9dc17 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 May 2016 11:00:59 +0200
Subject: [PATCH 1000/1431] some refactoring and fixing spec

---
 app/models/project.rb                   | 5 +++++
 app/workers/repository_fork_worker.rb   | 6 ++----
 app/workers/repository_import_worker.rb | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 9ccf6a97df6..03429fb7a46 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1017,4 +1017,9 @@ class Project < ActiveRecord::Base
       builds.running_or_pending.count(:all)
     end
   end
+
+  def mark_import_as_failed(error_message)
+    import_fail
+    update_column(:import_error, Gitlab::UrlSanitizer.sanitize(error_message))
+  end
 end
diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb
index f9e32337983..d947f105516 100644
--- a/app/workers/repository_fork_worker.rb
+++ b/app/workers/repository_fork_worker.rb
@@ -15,8 +15,7 @@ class RepositoryForkWorker
     result = gitlab_shell.fork_repository(source_path, target_path)
     unless result
       logger.error("Unable to fork project #{project_id} for repository #{source_path} -> #{target_path}")
-      project.update(import_error: "The project could not be forked.")
-      project.import_fail
+      project.mark_import_as_failed('The project could not be forked.')
       return
     end
 
@@ -24,8 +23,7 @@ class RepositoryForkWorker
 
     unless project.valid_repo?
       logger.error("Project #{project_id} had an invalid repository after fork")
-      project.update(import_error: "The forked repository is invalid.")
-      project.import_fail
+      project.mark_import_as_failed('The forked repository is invalid.')
       return
     end
 
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index fbc7ed63c6a..56411bca572 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -13,8 +13,7 @@ class RepositoryImportWorker
     result = Projects::ImportService.new(project, current_user).execute
 
     if result[:status] == :error
-      project.update(import_error: Gitlab::UrlSanitizer.sanitize(result[:message]))
-      project.import_fail
+      project.mark_import_as_failed(Gitlab::UrlSanitizer.sanitize(result[:message]))
       return
     end
 

From 097eafc8c74f97912a52399d422fb24be84e734d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 May 2016 14:53:33 +0200
Subject: [PATCH 1001/1431] fix some issues and improved error output for
 forking

---
 app/models/project.rb                   | 9 ++++++++-
 app/services/projects/create_service.rb | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 03429fb7a46..e4a9d17a20c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1019,7 +1019,14 @@ class Project < ActiveRecord::Base
   end
 
   def mark_import_as_failed(error_message)
+    original_errors = errors.dup
+    sanitized_message = Gitlab::UrlSanitizer.sanitize(error_message)
+
     import_fail
-    update_column(:import_error, Gitlab::UrlSanitizer.sanitize(error_message))
+    update_column(:import_error, sanitized_message)
+  rescue ActiveRecord::ActiveRecordError => e
+    Rails.logger.error("Error setting import status to failed: #{e.message}. Original error: #{sanitized_message}")
+  ensure
+    @errors = original_errors
   end
 end
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index b73389f0489..61cac5419ad 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -59,7 +59,7 @@ module Projects
       if @project.errors.empty?
         @project.add_import_job if @project.import?
       else
-        fail(error: @project.errors.join(', '))
+        fail(error: @project.errors.full_messages.join(', '))
       end
       @project
     rescue => e

From f2ec6341b35c3f0ec797d01420416893c780e15d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 May 2016 15:12:08 +0200
Subject: [PATCH 1002/1431] added changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index 68ea866968d..62870aee083 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 8.9.0 (unreleased)
   - Cache assigned issue and merge request counts in sidebar nav
   - Cache project build count in sidebar nav
   - Reduce number of queries needed to render issue labels in the sidebar
+  - Improve error handling importing projects
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From d9df05e14312f38ee3d8f97a068efd0c4890c9a4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 May 2016 15:47:51 +0200
Subject: [PATCH 1003/1431] fix import service spec

---
 spec/services/projects/import_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/projects/import_service_spec.rb b/spec/services/projects/import_service_spec.rb
index 7f2dcdab960..9d90bfceb73 100644
--- a/spec/services/projects/import_service_spec.rb
+++ b/spec/services/projects/import_service_spec.rb
@@ -49,7 +49,7 @@ describe Projects::ImportService, services: true do
         result = subject.execute
 
         expect(result[:status]).to eq :error
-        expect(result[:message]).to eq 'Failed to import the repository'
+        expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.path_with_namespace} - Failed to import the repository"
       end
     end
 

From c9e8acd05846e981e26f940bd8c529839fcfc4a1 Mon Sep 17 00:00:00 2001
From: James Lopez <james@gitlab.com>
Date: Wed, 1 Jun 2016 14:55:14 +0000
Subject: [PATCH 1004/1431] Update repository_import_worker.rb

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

diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 56411bca572..7d819fe78f8 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -13,7 +13,7 @@ class RepositoryImportWorker
     result = Projects::ImportService.new(project, current_user).execute
 
     if result[:status] == :error
-      project.mark_import_as_failed(Gitlab::UrlSanitizer.sanitize(result[:message]))
+      project.mark_import_as_failed(result[:message])
       return
     end
 

From 56a17a7701229a35af2cf710261cdeef15a6f8ad Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 11:15:45 +0300
Subject: [PATCH 1005/1431] Put project Files and Commits tabs under Code tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG                                     |  1 +
 .../projects/branches_controller.rb           |  2 +-
 app/views/layouts/nav/_project.html.haml      | 19 +++++++++----------
 app/views/projects/branches/destroy.js.haml   |  1 -
 app/views/projects/commits/_head.html.haml    |  8 ++++----
 app/views/projects/tags/destroy.js.haml       |  1 -
 app/views/projects/tree/show.html.haml        |  1 +
 7 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 app/views/projects/branches/destroy.js.haml

diff --git a/CHANGELOG b/CHANGELOG
index 62870aee083..ec026b8f398 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 8.9.0 (unreleased)
   - Cache project build count in sidebar nav
   - Reduce number of queries needed to render issue labels in the sidebar
   - Improve error handling importing projects
+  - Put project Files and Commits tabs under Code tab
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index d09e7375b67..8289f558496 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -50,7 +50,7 @@ class Projects::BranchesController < Projects::ApplicationController
         redirect_to namespace_project_branches_path(@project.namespace,
                                                     @project), status: 303
       end
-      format.js { render status: status[:return_code] }
+      format.js { head :ok }
     end
   end
 
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 2c9b9006668..9792c1c93b4 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -33,18 +33,11 @@
         %span
           Activity
     - if project_nav_tab? :files
-      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do
         = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
-          = icon('files-o fw')
+          = icon('code fw')
           %span
-            Files
-
-    - if project_nav_tab? :commits
-      = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
-        = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
-          = icon('history fw')
-          %span
-            Commits
+            Code
 
     - if project_nav_tab? :pipelines
       = nav_link(controller: :pipelines) do
@@ -129,4 +122,10 @@
         = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
           Builds
 
+    -# Shortcut to commits page
+    - if project_nav_tab? :commits
+      %li.hidden
+        = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
+          Commits
+
     .fade-right
diff --git a/app/views/projects/branches/destroy.js.haml b/app/views/projects/branches/destroy.js.haml
deleted file mode 100644
index a21ddaf4930..00000000000
--- a/app/views/projects/branches/destroy.js.haml
+++ /dev/null
@@ -1 +0,0 @@
-$('.js-totalbranch-count').html("#{@repository.branch_count}")
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index d1bd76ab529..1c136133ab0 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,9 +1,11 @@
 %ul.nav-links
+  = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+    = link_to project_files_path(@project) do
+      Files
+
   = nav_link(controller: [:commit, :commits]) do
     = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
       Commits
-      %span.badge
-        = number_with_delimiter(@repository.commit_count)
 
   = nav_link(controller: %w(network)) do
     = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
@@ -16,9 +18,7 @@
   = nav_link(html_options: {class: branches_tab_class}) do
     = link_to namespace_project_branches_path(@project.namespace, @project) do
       Branches
-      %span.badge.js-totalbranch-count= @repository.branch_count
 
   = nav_link(controller: [:tags, :releases]) do
     = link_to namespace_project_tags_path(@project.namespace, @project) do
       Tags
-      %span.badge.js-totaltags-count= @repository.tag_count
diff --git a/app/views/projects/tags/destroy.js.haml b/app/views/projects/tags/destroy.js.haml
index ffeacb5a004..e4a78fadbeb 100644
--- a/app/views/projects/tags/destroy.js.haml
+++ b/app/views/projects/tags/destroy.js.haml
@@ -1,3 +1,2 @@
-$('.js-totaltags-count').html("#{@repository.tags.size}");
 - if @repository.tags.empty?
   $('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000)
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 7e9ba09c720..59f60c4687c 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -3,6 +3,7 @@
   - if current_user
     = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
 = render 'projects/last_push'
+= render "projects/commits/head"
 
 .tree-controls
   = render 'projects/find_file_link'

From 7cfb445c15bdec0268f0a3800481e9cced973648 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 19:35:46 +0300
Subject: [PATCH 1006/1431] Update tests to match new Code tab logic

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 .../projects/branches_controller.rb           |  2 +-
 features/project/active_tab.feature           | 37 ++++++++++---------
 features/steps/project/active_tab.rb          |  4 ++
 features/steps/shared/project_tab.rb          |  8 +---
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 8289f558496..dd9508da049 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -50,7 +50,7 @@ class Projects::BranchesController < Projects::ApplicationController
         redirect_to namespace_project_branches_path(@project.namespace,
                                                     @project), status: 303
       end
-      format.js { head :ok }
+      format.js { render nothing: true, status: status[:return_code] }
     end
   end
 
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 5125a3e5773..26e67503021 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -10,14 +10,9 @@ Feature: Project Active Tab
     Then the active main tab should be Home
     And no other main tabs should be active
 
-  Scenario: On Project Files
+  Scenario: On Project Code
     Given I visit my project's files page
-    Then the active main tab should be Files
-    And no other main tabs should be active
-
-  Scenario: On Project Commits
-    Given I visit my project's commits page
-    Then the active main tab should be Commits
+    Then the active main tab should be Code
     And no other main tabs should be active
 
   Scenario: On Project Issues
@@ -64,40 +59,46 @@ Feature: Project Active Tab
     And no other sub navs should be active
     And the active main tab should be Settings
 
-  # Sub Tabs: Commits
+  # Sub Tabs: Code
 
-  Scenario: On Project Commits/Commits
+  Scenario: On Project Code/Files
+    Given I visit my project's files page
+    Then the active sub tab should be Files
+    And no other sub tabs should be active
+    And the active main tab should be Code
+
+  Scenario: On Project Code/Commits
     Given I visit my project's commits page
     Then the active sub tab should be Commits
     And no other sub tabs should be active
-    And the active main tab should be Commits
+    And the active main tab should be Code
 
-  Scenario: On Project Commits/Network
+  Scenario: On Project Code/Network
     Given I visit my project's network page
     Then the active sub tab should be Network
     And no other sub tabs should be active
-    And the active main tab should be Commits
+    And the active main tab should be Code
 
-  Scenario: On Project Commits/Compare
+  Scenario: On Project Code/Compare
     Given I visit my project's commits page
     And I click the "Compare" tab
     Then the active sub tab should be Compare
     And no other sub tabs should be active
-    And the active main tab should be Commits
+    And the active main tab should be Code
 
-  Scenario: On Project Commits/Branches
+  Scenario: On Project Code/Branches
     Given I visit my project's commits page
     And I click the "Branches" tab
     Then the active sub tab should be Branches
     And no other sub tabs should be active
-    And the active main tab should be Commits
+    And the active main tab should be Code
 
-  Scenario: On Project Commits/Tags
+  Scenario: On Project Code/Tags
     Given I visit my project's commits page
     And I click the "Tags" tab
     Then the active sub tab should be Tags
     And no other sub tabs should be active
-    And the active main tab should be Commits
+    And the active main tab should be Code
 
   Scenario: On Project Issues/Browse
     Given I visit my project's issues page
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 4a5a71e7e61..7db0d337192 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -63,6 +63,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     click_link('Tags')
   end
 
+  step 'the active sub tab should be Files' do
+    ensure_active_sub_tab('Files')
+  end
+
   step 'the active sub tab should be Commits' do
     ensure_active_sub_tab('Commits')
   end
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index b209020c5a9..988ce0d1102 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -8,12 +8,8 @@ module SharedProjectTab
     ensure_active_main_tab('Project')
   end
 
-  step 'the active main tab should be Files' do
-    ensure_active_main_tab('Files')
-  end
-
-  step 'the active main tab should be Commits' do
-    ensure_active_main_tab('Commits')
+  step 'the active main tab should be Code' do
+    ensure_active_main_tab('Code')
   end
 
   step 'the active main tab should be Graphs' do

From db2109b086340a5bf5e049aa16f22a76c0a5aec7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 22:32:22 +0300
Subject: [PATCH 1007/1431] Fix more tests with new Code tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/project/shortcuts.feature          | 8 +++++---
 features/steps/project/active_tab.rb        | 8 --------
 features/steps/project/project_find_file.rb | 4 ++--
 features/steps/shared/project_tab.rb        | 8 ++++++++
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature
index 10e7c234610..c73d0b32337 100644
--- a/features/project/shortcuts.feature
+++ b/features/project/shortcuts.feature
@@ -8,19 +8,21 @@ Feature: Project Shortcuts
   @javascript
   Scenario: Navigate to files tab
     Given I press "g" and "f"
-    Then the active main tab should be Files
+    Then the active main tab should be Code
+    Then the active sub tab should be Files
 
   @javascript
   Scenario: Navigate to commits tab
     Given I visit my project's files page
     Given I press "g" and "c"
-    Then the active main tab should be Commits
+    Then the active main tab should be Code
+    Then the active sub tab should be Commits
 
   @javascript
   Scenario: Navigate to network tab
     Given I press "g" and "n"
     Then the active sub tab should be Network
-    And the active main tab should be Commits
+    And the active main tab should be Code
 
   @javascript
   Scenario: Navigate to graphs tab
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 7db0d337192..745fd3471c4 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -63,14 +63,6 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     click_link('Tags')
   end
 
-  step 'the active sub tab should be Files' do
-    ensure_active_sub_tab('Files')
-  end
-
-  step 'the active sub tab should be Commits' do
-    ensure_active_sub_tab('Commits')
-  end
-
   step 'the active sub tab should be Compare' do
     ensure_active_sub_tab('Compare')
   end
diff --git a/features/steps/project/project_find_file.rb b/features/steps/project/project_find_file.rb
index 8c1d09d6cc6..47de4b91df1 100644
--- a/features/steps/project/project_find_file.rb
+++ b/features/steps/project/project_find_file.rb
@@ -13,12 +13,12 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
   end
 
   step 'I should see "find file" page' do
-    ensure_active_main_tab('Files')
+    ensure_active_main_tab('Code')
     expect(page).to have_selector('.file-finder-holder', count: 1)
   end
 
   step 'I fill in Find by path with "git"' do
-    ensure_active_main_tab('Files')
+    ensure_active_main_tab('Code')
     expect(page).to have_selector('.file-finder-holder', count: 1)
   end
 
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 988ce0d1102..bfee8793301 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -47,4 +47,12 @@ module SharedProjectTab
   step 'the active sub tab should be Network' do
     ensure_active_sub_tab('Network')
   end
+
+  step 'the active sub tab should be Files' do
+    ensure_active_sub_tab('Files')
+  end
+
+  step 'the active sub tab should be Commits' do
+    ensure_active_sub_tab('Commits')
+  end
 end

From 334cb868213bfc08e83c6d12fbda04ca15fd67f0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 2 Jun 2016 23:48:04 +0300
Subject: [PATCH 1008/1431] Update test since branch removal does not render
 template anymore

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 spec/controllers/projects/branches_controller_spec.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 8ad73472117..c4b4a888b4e 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -122,27 +122,23 @@ describe Projects::BranchesController do
       let(:branch) { "feature" }
 
       it { expect(response.status).to eq(200) }
-      it { expect(subject).to render_template('destroy') }
     end
 
     context "valid branch name with unencoded slashes" do
       let(:branch) { "improve/awesome" }
 
       it { expect(response.status).to eq(200) }
-      it { expect(subject).to render_template('destroy') }
     end
 
     context "valid branch name with encoded slashes" do
       let(:branch) { "improve%2Fawesome" }
 
       it { expect(response.status).to eq(200) }
-      it { expect(subject).to render_template('destroy') }
     end
     context "invalid branch name, valid ref" do
       let(:branch) { "no-branch" }
 
       it { expect(response.status).to eq(404) }
-      it { expect(subject).to render_template('destroy') }
     end
   end
 end

From a63ea487f7b949b43ab0c1790e9c640288a88649 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 1 Jun 2016 13:11:28 +0200
Subject: [PATCH 1009/1431] Extend specs for builds badge

Related to #17549
---
 spec/lib/gitlab/badge/build_spec.rb | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index b6f7a2e7ec4..6b2b335d4fc 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -42,9 +42,7 @@ describe Gitlab::Badge::Build do
   end
 
   context 'build exists' do
-    let(:ci_commit) { create(:ci_commit, project: project, sha: sha, ref: branch) }
-    let!(:build) { create(:ci_build, commit: ci_commit) }
-
+    let!(:build) { create_build(project, sha, branch) }
 
     context 'build success' do
       before { build.success! }
@@ -96,6 +94,28 @@ describe Gitlab::Badge::Build do
     end
   end
 
+  context 'when outdated pipeline for given ref exists' do
+    before do
+      build = create_build(project, sha, branch)
+      build.success!
+
+      old_build = create_build(project, '11eeffdd', branch)
+      old_build.drop!
+    end
+
+    it 'does not take outdated pipeline into account' do
+      expect(badge.to_s).to eq 'build-success'
+    end
+  end
+
+  def create_build(project, sha, branch)
+    ci_commit = create(:ci_commit, project: project,
+                                   sha: sha,
+                                   ref: branch)
+
+    create(:ci_build, commit: ci_commit)
+  end
+
   def status_node(data, status)
     xml = Nokogiri::XML.parse(data)
     xml.at(%Q{text:contains("#{status}")})

From e052daa08adecf74d6ac85c7a8bf6cb7743b8d93 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 3 Jun 2016 10:34:20 +0200
Subject: [PATCH 1010/1431] Enable Style/EmptyLinesAroundAccessModifier rubocop
 cop

See #17478
---
 .rubocop.yml                                           | 2 +-
 app/services/oauth2/access_token_validation_service.rb | 1 +
 lib/gitlab/ldap/config.rb                              | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 84a8015b410..3593ae29f24 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -194,7 +194,7 @@ Style/EmptyLines:
 
 # Keep blank lines around access modifiers.
 Style/EmptyLinesAroundAccessModifier:
-  Enabled: false
+  Enabled: true
 
 # Keeps track of empty lines around block bodies.
 Style/EmptyLinesAroundBlockBody:
diff --git a/app/services/oauth2/access_token_validation_service.rb b/app/services/oauth2/access_token_validation_service.rb
index 6194f6ce91e..264fdccde8f 100644
--- a/app/services/oauth2/access_token_validation_service.rb
+++ b/app/services/oauth2/access_token_validation_service.rb
@@ -22,6 +22,7 @@ module Oauth2::AccessTokenValidationService
     end
 
     protected
+
     # True if the token's scope is a superset of required scopes,
     # or the required scopes is empty.
     def sufficient_scope?(token, scopes)
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb
index aff7ccb157f..f9bb5775323 100644
--- a/lib/gitlab/ldap/config.rb
+++ b/lib/gitlab/ldap/config.rb
@@ -93,6 +93,7 @@ module Gitlab
       end
 
       protected
+
       def base_config
         Gitlab.config.ldap
       end

From 080997d87edcafd7afd3c3aa01da441e87493fdd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 3 Jun 2016 10:59:43 +0200
Subject: [PATCH 1011/1431] Enable Lint/AmbiguousOperator rubocop cop

See #17478
---
 .rubocop.yml                                 | 2 +-
 app/models/project_services/irker_service.rb | 2 +-
 lib/api/repositories.rb                      | 6 +++---
 lib/gitlab/key_fingerprint.rb                | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 84a8015b410..c7a9e697192 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -771,7 +771,7 @@ Metrics/PerceivedComplexity:
 # Checks for ambiguous operators in the first argument of a method invocation
 # without parentheses.
 Lint/AmbiguousOperator:
-  Enabled: false
+  Enabled: true
 
 # Checks for ambiguous regexp literals in the first argument of a method
 # invocation without parentheses.
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index 2e5e854fc5e..58cb720c3c1 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -83,7 +83,7 @@ class IrkerService < Service
     self.channels = recipients.split(/\s+/).map do |recipient|
       format_channel(recipient)
     end
-    channels.reject! &:nil?
+    channels.reject!(&:nil?)
   end
 
   def format_channel(recipient)
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 62161aadb9a..9cb14e95ebc 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -57,7 +57,7 @@ module API
         not_found! "File" unless blob
 
         content_type 'text/plain'
-        header *Gitlab::Workhorse.send_git_blob(repo, blob)
+        header(*Gitlab::Workhorse.send_git_blob(repo, blob))
       end
 
       # Get a raw blob contents by blob sha
@@ -83,7 +83,7 @@ module API
         env['api.format'] = :txt
 
         content_type blob.mime_type
-        header *Gitlab::Workhorse.send_git_blob(repo, blob)
+        header(*Gitlab::Workhorse.send_git_blob(repo, blob))
       end
 
       # Get a an archive of the repository
@@ -98,7 +98,7 @@ module API
         authorize! :download_code, user_project
 
         begin
-          header *Gitlab::Workhorse.send_git_archive(user_project, params[:sha], params[:format])
+          header(*Gitlab::Workhorse.send_git_archive(user_project, params[:sha], params[:format]))
         rescue
           not_found!('File')
         end
diff --git a/lib/gitlab/key_fingerprint.rb b/lib/gitlab/key_fingerprint.rb
index baf52ff750d..8684b4636ea 100644
--- a/lib/gitlab/key_fingerprint.rb
+++ b/lib/gitlab/key_fingerprint.rb
@@ -17,9 +17,9 @@ module Gitlab
         file.rewind
 
         cmd = []
-        cmd.push *%W(ssh-keygen)
-        cmd.push *%W(-E md5) if explicit_fingerprint_algorithm?
-        cmd.push *%W(-lf #{file.path})
+        cmd.push('ssh-keygen')
+        cmd.push('-E', 'md5') if explicit_fingerprint_algorithm?
+        cmd.push('-lf', file.path)
 
         cmd_output, cmd_status = popen(cmd, '/tmp')
       end

From 7cc897d74e72367ac782eb7cd469f4c26acc3ef0 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Fri, 3 Jun 2016 09:16:45 +0000
Subject: [PATCH 1012/1431] Let contributors know where to start

gitlab-org/gitlab-ce/issues/14905#note_12235996
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a15f8c4fec7..e952855fde1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -308,7 +308,7 @@ tests are least likely to receive timely feedback. The workflow to make a merge
 request is as follows:
 
 1. Fork the project into your personal space on GitLab.com
-1. Create a feature branch
+1. Create a feature branch, branch away from `master`.
 1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code
 1. Add your changes to the [CHANGELOG](CHANGELOG)
 1. If you are writing documentation, make sure to read the [documentation styleguide][doc-styleguide]

From b2acebb4efdf8023f685cfd14489c49e56d126a7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 12:00:16 +0200
Subject: [PATCH 1013/1431] Use ci_commits table

---
 app/models/ci/pipeline.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 74347cf142f..4d4f8951366 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -3,6 +3,8 @@ module Ci
     extend Ci::Model
     include Statuseable
 
+    self.table_name = 'ci_commits'
+
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
     has_many :statuses, class_name: 'CommitStatus'
     has_many :builds, class_name: 'Ci::Build'

From a51ccf36922f6b97a0d91756813cffd869dd214d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 3 Jun 2016 11:04:27 +0100
Subject: [PATCH 1014/1431] Backported from EE shared form for web hooks

---
 app/views/projects/hooks/index.html.haml   | 92 +---------------------
 app/views/shared/web_hooks/_form.html.haml | 91 +++++++++++++++++++++
 2 files changed, 92 insertions(+), 91 deletions(-)
 create mode 100644 app/views/shared/web_hooks/_form.html.haml

diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 917a0b805b1..8faad351463 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -1,91 +1 @@
-- page_title "Webhooks"
-.row.prepend-top-default
-  .col-lg-3.profile-settings-sidebar
-    %h4.prepend-top-0
-      = page_title
-    %p
-      #{link_to "Webhooks", help_page_path("web_hooks", "web_hooks")} can be
-      used for binding events when something is happening within the project.
-  .col-lg-9.append-bottom-default
-    %h5.prepend-top-0
-      Add new webhook
-    = form_for [@project.namespace.becomes(Namespace), @project, @hook], as: :hook, url: namespace_project_hooks_path(@project.namespace, @project) do |f|
-      = form_errors(@hook)
-
-      .form-group
-        = f.label :url, "URL", class: "label-light"
-        = f.text_field :url, class: "form-control", placeholder: "http://example.com/trigger-ci.json"
-      .form-group
-        = f.label :token, "Secret Token", class: 'label-light'
-        = f.text_field :token, class: "form-control", placeholder: ''
-        %p.help-block
-          Use this token to validate received payloads
-      .form-group
-        = f.label :url, "Trigger", class: "label-light"
-        %div
-          = f.check_box :push_events, class: "pull-left"
-          .prepend-left-20
-            = f.label :push_events, class: "label-light append-bottom-0" do
-              Push events
-            %p.light
-              This url will be triggered by a push to the repository
-        %div
-          = f.check_box :tag_push_events, class: "pull-left"
-          .prepend-left-20
-            = f.label :tag_push_events, class: "label-light append-bottom-0" do
-              Tag push events
-            %p.light
-              This url will be triggered when a new tag is pushed to the repository
-        %div
-          = f.check_box :note_events, class: "pull-left"
-          .prepend-left-20
-            = f.label :note_events, class: "label-light append-bottom-0" do
-              Comments
-            %p.light
-              This url will be triggered when someone adds a comment
-        %div
-          = f.check_box :issues_events, class: "pull-left"
-          .prepend-left-20
-            = f.label :issues_events, class: "label-light append-bottom-0" do
-              Issues events
-            %p.light
-              This url will be triggered when an issue is created/updated/merged
-        %div
-          = f.check_box :merge_requests_events, class: "pull-left"
-          .prepend-left-20
-            = f.label :merge_requests_events, class: "label-light append-bottom-0" do
-              Merge Request events
-            %p.light
-              This url will be triggered when a merge request is created/updated/merged
-        %div
-          = f.check_box :build_events, class: "pull-left"
-          .prepend-left-20
-            = f.label :build_events, class: "label-light append-bottom-0" do
-              Build events
-            %p.light
-              This url will be triggered when the build status changes
-        %div
-          = f.check_box :wiki_page_events, class: 'pull-left'
-          .prepend-left-20
-            = f.label :wiki_page_events, class: 'label-light append-bottom-0' do
-              Wiki Page events
-            %p.light
-              This url will be triggered when a wiki page is created/updated
-      .form-group
-        = f.label :enable_ssl_verification, "SSL verification", class: "label-light"
-        %div
-          = f.check_box :enable_ssl_verification, class: "pull-left"
-          .prepend-left-20
-            = f.label :enable_ssl_verification, class: "label-light append-bottom-0" do
-              Enable SSL verification
-      = f.submit "Add Webhook", class: "btn btn-create"
-    %hr
-    %h5.prepend-top-default
-      Webhooks (#{@hooks.count})
-    - if @hooks.any?
-      %ul.well-list
-        - @hooks.each do |hook|
-          = render "project_hook", hook: hook
-    - else
-      %p.settings-message.text-center.append-bottom-0
-        No webhooks found, add one in the form above.
+= render 'shared/web_hooks/form', hook: @hook, hooks: @hooks, url_components: [@project.namespace.becomes(Namespace), @project]
diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml
new file mode 100644
index 00000000000..d1e861ca80c
--- /dev/null
+++ b/app/views/shared/web_hooks/_form.html.haml
@@ -0,0 +1,91 @@
+- page_title "Webhooks"
+- context_title = @project ? 'project' : 'group'
+
+.row.prepend-top-default
+  .col-lg-3
+    %h4.prepend-top-0
+      = page_title
+    %p
+      #{link_to "Webhooks", help_page_path("web_hooks", "web_hooks")} can be
+      used for binding events when something is happening within the project.
+  .col-lg-9.append-bottom-default
+    = form_for hook, as: :hook, url: polymorphic_path(url_components + [:hooks]) do |f|
+      = form_errors(hook)
+
+      .form-group
+        = f.label :url, "URL", class: 'label-light'
+        = f.text_field :url, class: "form-control", placeholder: 'http://example.com/trigger-ci.json'
+      .form-group
+        = f.label :token, "Secret Token", class: 'label-light'
+        = f.text_field :token, class: "form-control", placeholder: ''
+        %p.help-block
+          Use this token to validate received payloads
+      .form-group
+        = f.label :url, "Trigger", class: 'label-light'
+        %ul.list-unstyled
+          %li
+            = f.check_box :push_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :push_events, class: 'list-label' do
+                %strong Push events
+              %p.light
+                This url will be triggered by a push to the repository
+          %li
+            = f.check_box :tag_push_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :tag_push_events, class: 'list-label' do
+                %strong Tag push events
+              %p.light
+                This url will be triggered when a new tag is pushed to the repository
+          %li
+            = f.check_box :note_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :note_events, class: 'list-label' do
+                %strong Comments
+              %p.light
+                This url will be triggered when someone adds a comment
+          %li
+            = f.check_box :issues_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :issues_events, class: 'list-label' do
+                %strong Issues events
+              %p.light
+                This url will be triggered when an issue is created/updated/merged
+          %li
+            = f.check_box :merge_requests_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :merge_requests_events, class: 'list-label' do
+                %strong Merge Request events
+              %p.light
+                This url will be triggered when a merge request is created/updated/merged
+          %li
+            = f.check_box :build_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :build_events, class: 'list-label' do
+                %strong Build events
+              %p.light
+                This url will be triggered when the build status changes
+          %li
+            = f.check_box :wiki_page_events, class: 'pull-left'
+            .prepend-left-20
+              = f.label :wiki_page_events, class: 'list-label' do
+                %strong Wiki Page events
+              %p.light
+                This url will be triggered when a wiki page is created/updated
+      .form-group
+        = f.label :enable_ssl_verification, "SSL verification", class: 'label-light checkbox'
+        .checkbox
+          = f.label :enable_ssl_verification do
+            = f.check_box :enable_ssl_verification
+            %strong Enable SSL verification
+      = f.submit "Add Webhook", class: "btn btn-create"
+    %hr
+    %h5.prepend-top-default
+      Webhooks (#{hooks.count})
+    - if hooks.any?
+      %ul.well-list
+        - hooks.each do |hook|
+          = render "project_hook", hook: hook
+    - else
+      %p.settings-message.text-center.append-bottom-0
+        No webhooks found, add one in the form above.

From 717fdd6d42f119dd1e0f457c40563cc35985fbae Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 12:29:00 +0200
Subject: [PATCH 1015/1431] Rename Ci::Build commit to pipeline

---
 features/steps/project/commits/commits.rb     |  2 +-
 features/steps/project/merge_requests.rb      |  2 +-
 features/steps/shared/builds.rb               |  2 +-
 spec/factories/ci/builds.rb                   |  2 +-
 spec/factories/commit_statuses.rb             |  2 +-
 spec/features/admin/admin_builds_spec.rb      | 24 +++++------
 spec/features/admin/admin_runners_spec.rb     |  2 +-
 spec/features/builds_spec.rb                  |  2 +-
 spec/features/commits_spec.rb                 |  4 +-
 .../merge_when_build_succeeds_spec.rb         |  4 +-
 spec/features/pipelines_spec.rb               | 20 ++++-----
 .../security/project/public_access_spec.rb    |  2 +-
 spec/lib/ci/charts_spec.rb                    |  2 +-
 spec/lib/gitlab/badge/build_spec.rb           |  2 +-
 spec/models/build_spec.rb                     | 18 ++++----
 spec/models/ci/commit_spec.rb                 | 42 +++++++++----------
 spec/models/commit_status_spec.rb             | 30 ++++++-------
 spec/models/generic_commit_status_spec.rb     |  2 +-
 spec/requests/api/builds_spec.rb              | 12 +++---
 spec/requests/api/commit_statuses_spec.rb     |  4 +-
 spec/requests/ci/api/builds_spec.rb           | 12 +++---
 .../ci/image_for_build_service_spec.rb        |  2 +-
 .../ci/register_build_service_spec.rb         |  2 +-
 .../add_todo_when_build_fails_service_spec.rb |  4 +-
 24 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index bf01a78cb33..33d3eeab0d2 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -165,7 +165,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   step 'commit has ci status' do
     @project.enable_ci
     ci_commit = create :ci_commit, project: @project, sha: sample_commit.id
-    create :ci_build, commit: ci_commit
+    create :ci_build, pipeline: ci_commit
   end
 
   step 'repository contains ".gitlab-ci.yml" file' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index b30346790eb..0ac7d3a250a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -520,7 +520,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     project = merge_request.source_project
     project.enable_ci
     ci_commit = create :ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch
-    create :ci_build, commit: ci_commit
+    create :ci_build, pipeline: ci_commit
   end
 
   step 'I should see merge request "Bug NS-05" with CI status' do
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index cf30e23b6bd..92d7bed0450 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -23,7 +23,7 @@ module SharedBuilds
   end
 
   step 'project has another build that is running' do
-    create(:ci_build, commit: @ci_commit, name: 'second build', status: 'running')
+    create(:ci_build, pipeline: @ci_commit, name: 'second build', status: 'running')
   end
 
   step 'I visit recent build details page' do
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index cd49e559b7d..e2cb08d2a8b 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -16,7 +16,7 @@ FactoryGirl.define do
       }
     end
 
-    commit factory: :ci_commit
+    pipeline factory: :ci_commit
 
     trait :success do
       status 'success'
diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index b7c2b32cb13..67301fbd9a9 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -3,7 +3,7 @@ FactoryGirl.define do
     name 'default'
     status 'success'
     description 'commit status'
-    commit factory: :ci_commit_with_one_job
+    pipeline factory: :ci_commit_with_one_job
     started_at 'Tue, 26 Jan 2016 08:21:42 +0100'
     finished_at 'Tue, 26 Jan 2016 08:23:42 +0100'
 
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index 7bbe20fec43..f5aedcb0545 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -11,10 +11,10 @@ describe 'Admin Builds' do
     context 'All tab' do
       context 'when have builds' do
         it 'shows all builds' do
-          create(:ci_build, commit: commit, status: :pending)
-          create(:ci_build, commit: commit, status: :running)
-          create(:ci_build, commit: commit, status: :success)
-          create(:ci_build, commit: commit, status: :failed)
+          create(:ci_build, pipeline: commit, status: :pending)
+          create(:ci_build, pipeline: commit, status: :running)
+          create(:ci_build, pipeline: commit, status: :success)
+          create(:ci_build, pipeline: commit, status: :failed)
 
           visit admin_builds_path
 
@@ -39,9 +39,9 @@ describe 'Admin Builds' do
     context 'Running tab' do
       context 'when have running builds' do
         it 'shows running builds' do
-          build1 = create(:ci_build, commit: commit, status: :pending)
-          build2 = create(:ci_build, commit: commit, status: :success)
-          build3 = create(:ci_build, commit: commit, status: :failed)
+          build1 = create(:ci_build, pipeline: commit, status: :pending)
+          build2 = create(:ci_build, pipeline: commit, status: :success)
+          build3 = create(:ci_build, pipeline: commit, status: :failed)
 
           visit admin_builds_path(scope: :running)
 
@@ -55,7 +55,7 @@ describe 'Admin Builds' do
 
       context 'when have no builds running' do
         it 'shows a message' do
-          create(:ci_build, commit: commit, status: :success)
+          create(:ci_build, pipeline: commit, status: :success)
 
           visit admin_builds_path(scope: :running)
 
@@ -69,9 +69,9 @@ describe 'Admin Builds' do
     context 'Finished tab' do
       context 'when have finished builds' do
         it 'shows finished builds' do
-          build1 = create(:ci_build, commit: commit, status: :pending)
-          build2 = create(:ci_build, commit: commit, status: :running)
-          build3 = create(:ci_build, commit: commit, status: :success)
+          build1 = create(:ci_build, pipeline: commit, status: :pending)
+          build2 = create(:ci_build, pipeline: commit, status: :running)
+          build3 = create(:ci_build, pipeline: commit, status: :success)
 
           visit admin_builds_path(scope: :finished)
 
@@ -85,7 +85,7 @@ describe 'Admin Builds' do
 
       context 'when have no builds finished' do
         it 'shows a message' do
-          create(:ci_build, commit: commit, status: :running)
+          create(:ci_build, pipeline: commit, status: :running)
 
           visit admin_builds_path(scope: :finished)
 
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 8ebd4a6808e..2c87a25913b 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -9,7 +9,7 @@ describe "Admin Runners" do
     before do
       runner = FactoryGirl.create(:ci_runner)
       commit = FactoryGirl.create(:ci_commit)
-      FactoryGirl.create(:ci_build, commit: commit, runner_id: runner.id)
+      FactoryGirl.create(:ci_build, pipeline: commit, runner_id: runner.id)
       visit admin_runners_path
     end
 
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 7a05d30e8b5..c1c21d4b786 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -6,7 +6,7 @@ describe "Builds" do
   before do
     login_as(:user)
     @commit = FactoryGirl.create :ci_commit
-    @build = FactoryGirl.create :ci_build, commit: @commit
+    @build = FactoryGirl.create :ci_build, pipeline: @commit
     @project = @commit.project
     @project.team << [@user, :developer]
   end
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 20f0b27bcc1..d8f5a2f804f 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -16,7 +16,7 @@ describe 'Commits' do
     end
 
     context 'commit status is Generic Commit Status' do
-      let!(:status) { FactoryGirl.create :generic_commit_status, commit: commit }
+      let!(:status) { FactoryGirl.create :generic_commit_status, pipeline: commit }
 
       before do
         project.team << [@user, :reporter]
@@ -39,7 +39,7 @@ describe 'Commits' do
     end
 
     context 'commit status is Ci Build' do
-      let!(:build) { FactoryGirl.create :ci_build, commit: commit }
+      let!(:build) { FactoryGirl.create :ci_build, pipeline: commit }
       let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
 
       context 'when logged as developer' do
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index 7aa7eb965e9..eaa3e6b1471 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -13,7 +13,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
 
   context "Active build for Merge Request" do
     let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
-    let!(:ci_build) { create(:ci_build, commit: ci_commit) }
+    let!(:ci_build) { create(:ci_build, pipeline: ci_commit) }
 
     before do
       login_as user
@@ -48,7 +48,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
     end
 
     let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
-    let!(:ci_build) { create(:ci_build, commit: ci_commit) }
+    let!(:ci_build) { create(:ci_build, pipeline: ci_commit) }
 
     before do
       login_as user
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 093f92ffc6d..2026cb7cf17 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -31,7 +31,7 @@ describe "Pipelines" do
     end
 
     context 'cancelable pipeline' do
-      let!(:running) { create(:ci_build, :running, commit: pipeline, stage: 'test', commands: 'test') }
+      let!(:running) { create(:ci_build, :running, pipeline: pipeline, stage: 'test', commands: 'test') }
 
       before { visit namespace_project_pipelines_path(project.namespace, project) }
 
@@ -47,7 +47,7 @@ describe "Pipelines" do
     end
 
     context 'retryable pipelines' do
-      let!(:failed) { create(:ci_build, :failed, commit: pipeline, stage: 'test', commands: 'test') }
+      let!(:failed) { create(:ci_build, :failed, pipeline: pipeline, stage: 'test', commands: 'test') }
 
       before { visit namespace_project_pipelines_path(project.namespace, project) }
 
@@ -64,7 +64,7 @@ describe "Pipelines" do
 
     context 'for generic statuses' do
       context 'when running' do
-        let!(:running) { create(:generic_commit_status, status: 'running', commit: pipeline, stage: 'test') }
+        let!(:running) { create(:generic_commit_status, status: 'running', pipeline: pipeline, stage: 'test') }
 
         before { visit namespace_project_pipelines_path(project.namespace, project) }
 
@@ -78,7 +78,7 @@ describe "Pipelines" do
       end
 
       context 'when failed' do
-        let!(:running) { create(:generic_commit_status, status: 'failed', commit: pipeline, stage: 'test') }
+        let!(:running) { create(:generic_commit_status, status: 'failed', pipeline: pipeline, stage: 'test') }
 
         before { visit namespace_project_pipelines_path(project.namespace, project) }
 
@@ -94,7 +94,7 @@ describe "Pipelines" do
 
     context 'downloadable pipelines' do
       context 'with artifacts' do
-        let!(:with_artifacts) { create(:ci_build, :artifacts, :success, commit: pipeline, name: 'rspec tests', stage: 'test') }
+        let!(:with_artifacts) { create(:ci_build, :artifacts, :success, pipeline: pipeline, name: 'rspec tests', stage: 'test') }
 
         before { visit namespace_project_pipelines_path(project.namespace, project) }
 
@@ -103,7 +103,7 @@ describe "Pipelines" do
       end
 
       context 'without artifacts' do
-        let!(:without_artifacts) { create(:ci_build, :success, commit: pipeline, name: 'rspec', stage: 'test') }
+        let!(:without_artifacts) { create(:ci_build, :success, pipeline: pipeline, name: 'rspec', stage: 'test') }
 
         it { expect(page).not_to have_selector('.build-artifacts') }
       end
@@ -114,10 +114,10 @@ describe "Pipelines" do
     let(:pipeline) { create(:ci_commit, project: project, ref: 'master') }
 
     before do
-      @success = create(:ci_build, :success, commit: pipeline, stage: 'build', name: 'build')
-      @failed = create(:ci_build, :failed, commit: pipeline, stage: 'test', name: 'test', commands: 'test')
-      @running = create(:ci_build, :running, commit: pipeline, stage: 'deploy', name: 'deploy')
-      @external = create(:generic_commit_status, status: 'success', commit: pipeline, name: 'jenkins', stage: 'external')
+      @success = create(:ci_build, :success, pipeline: pipeline, stage: 'build', name: 'build')
+      @failed = create(:ci_build, :failed, pipeline: pipeline, stage: 'test', name: 'test', commands: 'test')
+      @running = create(:ci_build, :running, pipeline: pipeline, stage: 'deploy', name: 'deploy')
+      @external = create(:generic_commit_status, status: 'success', pipeline: pipeline, name: 'jenkins', stage: 'external')
     end
 
     before { visit namespace_project_pipeline_path(project.namespace, project, pipeline) }
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 4def4f99bc0..4ce367c3c6d 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -143,7 +143,7 @@ describe "Public Project Access", feature: true  do
 
   describe "GET /:project_path/builds/:id" do
     let(:commit) { create(:ci_commit, project: project) }
-    let(:build) { create(:ci_build, commit: commit) }
+    let(:build) { create(:ci_build, pipeline: commit) }
     subject { namespace_project_build_path(project.namespace, project, build.id) }
 
     context "when allowed for public" do
diff --git a/spec/lib/ci/charts_spec.rb b/spec/lib/ci/charts_spec.rb
index 9d1215a5760..2be50edc347 100644
--- a/spec/lib/ci/charts_spec.rb
+++ b/spec/lib/ci/charts_spec.rb
@@ -5,7 +5,7 @@ describe Ci::Charts, lib: true do
   context "build_times" do
     before do
       @commit = FactoryGirl.create(:ci_commit)
-      FactoryGirl.create(:ci_build, commit: @commit)
+      FactoryGirl.create(:ci_build, pipeline: @commit)
     end
 
     it 'should return build times in minutes' do
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index b6f7a2e7ec4..e87bf41ea25 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -43,7 +43,7 @@ describe Gitlab::Badge::Build do
 
   context 'build exists' do
     let(:ci_commit) { create(:ci_commit, project: project, sha: sha, ref: branch) }
-    let!(:build) { create(:ci_build, commit: ci_commit) }
+    let!(:build) { create(:ci_build, pipeline: ci_commit) }
 
 
     context 'build success' do
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 5c6c30c20ea..86d581721b1 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -3,15 +3,15 @@ require 'spec_helper'
 describe Ci::Build, models: true do
   let(:project) { create(:project) }
   let(:commit) { create(:ci_commit, project: project) }
-  let(:build) { create(:ci_build, commit: commit) }
+  let(:build) { create(:ci_build, pipeline: commit) }
 
   it { is_expected.to validate_presence_of :ref }
 
   it { is_expected.to respond_to :trace_html }
 
   describe '#first_pending' do
-    let!(:first) { create(:ci_build, commit: commit, status: 'pending', created_at: Date.yesterday) }
-    let!(:second) { create(:ci_build, commit: commit, status: 'pending') }
+    let!(:first) { create(:ci_build, pipeline: commit, status: 'pending', created_at: Date.yesterday) }
+    let!(:second) { create(:ci_build, pipeline: commit, status: 'pending') }
     subject { Ci::Build.first_pending }
 
     it { is_expected.to be_a(Ci::Build) }
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
 
         context 'and trigger variables' do
           let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: commit, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
@@ -428,10 +428,10 @@ describe Ci::Build, models: true do
   end
 
   describe '#depends_on_builds' do
-    let!(:build) { create(:ci_build, commit: commit, name: 'build', stage_idx: 0, stage: 'build') }
-    let!(:rspec_test) { create(:ci_build, commit: commit, name: 'rspec', stage_idx: 1, stage: 'test') }
-    let!(:rubocop_test) { create(:ci_build, commit: commit, name: 'rubocop', stage_idx: 1, stage: 'test') }
-    let!(:staging) { create(:ci_build, commit: commit, name: 'staging', stage_idx: 2, stage: 'deploy') }
+    let!(:build) { create(:ci_build, pipeline: commit, name: 'build', stage_idx: 0, stage: 'build') }
+    let!(:rspec_test) { create(:ci_build, pipeline: commit, name: 'rspec', stage_idx: 1, stage: 'test') }
+    let!(:rubocop_test) { create(:ci_build, pipeline: commit, name: 'rubocop', stage_idx: 1, stage: 'test') }
+    let!(:staging) { create(:ci_build, pipeline: commit, name: 'staging', stage_idx: 2, stage: 'deploy') }
 
     it 'to have no dependents if this is first build' do
       expect(build.depends_on_builds).to be_empty
@@ -500,7 +500,7 @@ describe Ci::Build, models: true do
       before do
         @merge_request = create_mr(build, commit, factory: :merge_request_with_diffs)
         commit2 = create(:ci_commit, project: project)
-        @build2 = create(:ci_build, commit: commit2)
+        @build2 = create(:ci_build, pipeline: commit2)
 
         commits = [double(id: commit.sha), double(id: commit2.sha)]
         allow(@merge_request).to receive(:commits).and_return(commits)
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 2c6e6db682f..8426f28d445 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -42,8 +42,8 @@ describe Ci::Pipeline, models: true do
     subject { commit.retried }
 
     before do
-      @commit1 = FactoryGirl.create :ci_build, commit: commit, name: 'deploy'
-      @commit2 = FactoryGirl.create :ci_build, commit: commit, name: 'deploy'
+      @commit1 = FactoryGirl.create :ci_build, pipeline: commit, name: 'deploy'
+      @commit2 = FactoryGirl.create :ci_build, pipeline: commit, name: 'deploy'
     end
 
     it 'returns old builds' do
@@ -264,14 +264,14 @@ describe Ci::Pipeline, models: true do
     let(:commit) { FactoryGirl.create :ci_commit }
 
     it "returns finished_at of latest build" do
-      build = FactoryGirl.create :ci_build, commit: commit, finished_at: Time.now - 60
-      FactoryGirl.create :ci_build, commit: commit, finished_at: Time.now - 120
+      build = FactoryGirl.create :ci_build, pipeline: commit, finished_at: Time.now - 60
+      FactoryGirl.create :ci_build, pipeline: commit, finished_at: Time.now - 120
 
       expect(commit.finished_at.to_i).to eq(build.finished_at.to_i)
     end
 
     it "returns nil if there is no finished build" do
-      FactoryGirl.create :ci_not_started_build, commit: commit
+      FactoryGirl.create :ci_not_started_build, pipeline: commit
 
       expect(commit.finished_at).to be_nil
     end
@@ -282,27 +282,27 @@ describe Ci::Pipeline, models: true do
     let(:commit) { FactoryGirl.create :ci_commit, project: project }
 
     it "calculates average when there are two builds with coverage" do
-      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, commit: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, commit: commit
+      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: commit
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: commit
       expect(commit.coverage).to eq("35.00")
     end
 
     it "calculates average when there are two builds with coverage and one with nil" do
-      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, commit: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, commit: commit
-      FactoryGirl.create :ci_build, commit: commit
+      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: commit
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: commit
+      FactoryGirl.create :ci_build, pipeline: commit
       expect(commit.coverage).to eq("35.00")
     end
 
     it "calculates average when there are two builds with coverage and one is retried" do
-      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, commit: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 30, commit: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, commit: commit
+      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: commit
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 30, pipeline: commit
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: commit
       expect(commit.coverage).to eq("35.00")
     end
 
     it "calculates average when there is one build without coverage" do
-      FactoryGirl.create :ci_build, commit: commit
+      FactoryGirl.create :ci_build, pipeline: commit
       expect(commit.coverage).to be_nil
     end
   end
@@ -312,7 +312,7 @@ describe Ci::Pipeline, models: true do
 
     context 'no failed builds' do
       before do
-        FactoryGirl.create :ci_build, name: "rspec", commit: commit, status: 'success'
+        FactoryGirl.create :ci_build, name: "rspec", pipeline: commit, status: 'success'
       end
 
       it 'be not retryable' do
@@ -322,8 +322,8 @@ describe Ci::Pipeline, models: true do
 
     context 'with failed builds' do
       before do
-        FactoryGirl.create :ci_build, name: "rspec", commit: commit, status: 'running'
-        FactoryGirl.create :ci_build, name: "rubocop", commit: commit, status: 'failed'
+        FactoryGirl.create :ci_build, name: "rspec", pipeline: commit, status: 'running'
+        FactoryGirl.create :ci_build, name: "rubocop", pipeline: commit, status: 'failed'
       end
 
       it 'be retryable' do
@@ -337,8 +337,8 @@ describe Ci::Pipeline, models: true do
     subject { CommitStatus.where(commit: [commit, commit2]).stages }
 
     before do
-      FactoryGirl.create :ci_build, commit: commit2, stage: 'test', stage_idx: 1
-      FactoryGirl.create :ci_build, commit: commit, stage: 'build', stage_idx: 0
+      FactoryGirl.create :ci_build, pipeline: commit2, stage: 'test', stage_idx: 1
+      FactoryGirl.create :ci_build, pipeline: commit, stage: 'build', stage_idx: 0
     end
 
     it 'return all stages' do
@@ -353,7 +353,7 @@ describe Ci::Pipeline, models: true do
     end
 
     context 'dependent objects' do
-      let(:commit_status) { build :commit_status, commit: commit }
+      let(:commit_status) { build :commit_status, pipeline: commit }
 
       it 'execute update_state after saving dependent object' do
         expect(commit).to receive(:update_state).and_return(true)
@@ -363,7 +363,7 @@ describe Ci::Pipeline, models: true do
 
     context 'update state' do
       let(:current) { Time.now.change(usec: 0) }
-      let(:build) { FactoryGirl.create :ci_build, :success, commit: commit, started_at: current - 120, finished_at: current - 60 }
+      let(:build) { FactoryGirl.create :ci_build, :success, pipeline: commit, started_at: current - 120, finished_at: current - 60 }
 
       before do
         build
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 434e58cfd06..b435d835722 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe CommitStatus, models: true do
   let(:commit) { FactoryGirl.create :ci_commit }
-  let(:commit_status) { FactoryGirl.create :commit_status, commit: commit }
+  let(:commit_status) { FactoryGirl.create :commit_status, pipeline: commit }
 
   it { is_expected.to belong_to(:commit) }
   it { is_expected.to belong_to(:user) }
@@ -121,11 +121,11 @@ describe CommitStatus, models: true do
     subject { CommitStatus.latest.order(:id) }
 
     before do
-      @commit1 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: 'bb', status: 'running'
-      @commit2 = FactoryGirl.create :commit_status, commit: commit, name: 'cc', ref: 'cc', status: 'pending'
-      @commit3 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: 'cc', status: 'success'
-      @commit4 = FactoryGirl.create :commit_status, commit: commit, name: 'cc', ref: 'bb', status: 'success'
-      @commit5 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: 'bb', status: 'success'
+      @commit1 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'bb', status: 'running'
+      @commit2 = FactoryGirl.create :commit_status, pipeline: commit, name: 'cc', ref: 'cc', status: 'pending'
+      @commit3 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'cc', status: 'success'
+      @commit4 = FactoryGirl.create :commit_status, pipeline: commit, name: 'cc', ref: 'bb', status: 'success'
+      @commit5 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'bb', status: 'success'
     end
 
     it 'return unique statuses' do
@@ -137,11 +137,11 @@ describe CommitStatus, models: true do
     subject { CommitStatus.running_or_pending.order(:id) }
 
     before do
-      @commit1 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: 'bb', status: 'running'
-      @commit2 = FactoryGirl.create :commit_status, commit: commit, name: 'cc', ref: 'cc', status: 'pending'
-      @commit3 = FactoryGirl.create :commit_status, commit: commit, name: 'aa', ref: nil, status: 'success'
-      @commit4 = FactoryGirl.create :commit_status, commit: commit, name: 'dd', ref: nil, status: 'failed'
-      @commit5 = FactoryGirl.create :commit_status, commit: commit, name: 'ee', ref: nil, status: 'canceled'
+      @commit1 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'bb', status: 'running'
+      @commit2 = FactoryGirl.create :commit_status, pipeline: commit, name: 'cc', ref: 'cc', status: 'pending'
+      @commit3 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: nil, status: 'success'
+      @commit4 = FactoryGirl.create :commit_status, pipeline: commit, name: 'dd', ref: nil, status: 'failed'
+      @commit5 = FactoryGirl.create :commit_status, pipeline: commit, name: 'ee', ref: nil, status: 'canceled'
     end
 
     it 'return statuses that are running or pending' do
@@ -172,10 +172,10 @@ describe CommitStatus, models: true do
 
   describe '#stages' do
     before do
-      FactoryGirl.create :commit_status, commit: commit, stage: 'build', stage_idx: 0, status: 'success'
-      FactoryGirl.create :commit_status, commit: commit, stage: 'build', stage_idx: 0, status: 'failed'
-      FactoryGirl.create :commit_status, commit: commit, stage: 'deploy', stage_idx: 2, status: 'running'
-      FactoryGirl.create :commit_status, commit: commit, stage: 'test', stage_idx: 1, status: 'success'
+      FactoryGirl.create :commit_status, pipeline: commit, stage: 'build', stage_idx: 0, status: 'success'
+      FactoryGirl.create :commit_status, pipeline: commit, stage: 'build', stage_idx: 0, status: 'failed'
+      FactoryGirl.create :commit_status, pipeline: commit, stage: 'deploy', stage_idx: 2, status: 'running'
+      FactoryGirl.create :commit_status, pipeline: commit, stage: 'test', stage_idx: 1, status: 'success'
     end
 
     context 'stages list' do
diff --git a/spec/models/generic_commit_status_spec.rb b/spec/models/generic_commit_status_spec.rb
index d0e02618b6b..d2cd37c9b4f 100644
--- a/spec/models/generic_commit_status_spec.rb
+++ b/spec/models/generic_commit_status_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe GenericCommitStatus, models: true do
   let(:commit) { FactoryGirl.create :ci_commit }
-  let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, commit: commit }
+  let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, pipeline: commit }
 
   describe :context do
     subject { generic_commit_status.context }
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 0fbc984c061..35eb23c2a9b 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -10,7 +10,7 @@ describe API::API, api: true  do
   let!(:developer) { create(:project_member, :developer, user: user, project: project) }
   let!(:reporter) { create(:project_member, :reporter, user: user2, project: project) }
   let(:commit) { create(:ci_commit, project: project)}
-  let(:build) { create(:ci_build, commit: commit) }
+  let(:build) { create(:ci_build, pipeline: commit) }
 
   describe 'GET /projects/:id/builds ' do
     let(:query) { '' }
@@ -102,7 +102,7 @@ describe API::API, api: true  do
     before { get api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user) }
 
     context 'build with artifacts' do
-      let(:build) { create(:ci_build, :artifacts, commit: commit) }
+      let(:build) { create(:ci_build, :artifacts, pipeline: commit) }
 
       context 'authorized user' do
         let(:download_headers) do
@@ -131,7 +131,7 @@ describe API::API, api: true  do
   end
 
   describe 'GET /projects/:id/builds/:build_id/trace' do
-    let(:build) { create(:ci_build, :trace, commit: commit) }
+    let(:build) { create(:ci_build, :trace, pipeline: commit) }
     
     before { get api("/projects/#{project.id}/builds/#{build.id}/trace", api_user) }
 
@@ -181,7 +181,7 @@ describe API::API, api: true  do
   end
 
   describe 'POST /projects/:id/builds/:build_id/retry' do
-    let(:build) { create(:ci_build, :canceled, commit: commit) }
+    let(:build) { create(:ci_build, :canceled, pipeline: commit) }
 
     before { post api("/projects/#{project.id}/builds/#{build.id}/retry", api_user) }
 
@@ -218,7 +218,7 @@ describe API::API, api: true  do
     end
 
     context 'build is erasable' do
-      let(:build) { create(:ci_build, :trace, :artifacts, :success, project: project, commit: commit) }
+      let(:build) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: commit) }
 
       it 'should erase build content' do
         expect(response.status).to eq 201
@@ -234,7 +234,7 @@ describe API::API, api: true  do
     end
 
     context 'build is not erasable' do
-      let(:build) { create(:ci_build, :trace, project: project, commit: commit) }
+      let(:build) { create(:ci_build, :trace, project: project, pipeline: commit) }
 
       it 'should respond with forbidden' do
         expect(response.status).to eq 403
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index 00d426e9792..5c5850c558b 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -5,7 +5,7 @@ describe API::CommitStatuses, api: true do
 
   let!(:project) { create(:project) }
   let(:commit) { project.repository.commit }
-  let(:commit_status) { create(:commit_status, commit: ci_commit) }
+  let(:commit_status) { create(:commit_status, pipeline: ci_commit) }
   let(:guest) { create_user(:guest) }
   let(:reporter) { create_user(:reporter) }
   let(:developer) { create_user(:developer) }
@@ -27,7 +27,7 @@ describe API::CommitStatuses, api: true do
         let(:statuses_id) { json_response.map { |status| status['id'] } }
 
         def create_status(commit, opts = {})
-          create(:commit_status, { commit: commit, ref: commit.ref }.merge(opts))
+          create(:commit_status, { pipeline: commit, ref: commit.ref }.merge(opts))
         end
 
         let!(:status1) { create_status(master, status: 'running') }
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index e5124ea5ea7..10e3631f5fc 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -39,7 +39,7 @@ describe Ci::API::API do
 
       it "should return 404 error if no builds for specific runner" do
         commit = FactoryGirl.create(:ci_commit, project: shared_project)
-        FactoryGirl.create(:ci_build, commit: commit, status: 'pending')
+        FactoryGirl.create(:ci_build, pipeline: commit, status: 'pending')
 
         post ci_api("/builds/register"), token: runner.token
 
@@ -48,7 +48,7 @@ describe Ci::API::API do
 
       it "should return 404 error if no builds for shared runner" do
         commit = FactoryGirl.create(:ci_commit, project: project)
-        FactoryGirl.create(:ci_build, commit: commit, status: 'pending')
+        FactoryGirl.create(:ci_build, pipeline: commit, status: 'pending')
 
         post ci_api("/builds/register"), token: shared_runner.token
 
@@ -85,7 +85,7 @@ describe Ci::API::API do
         trigger = FactoryGirl.create(:ci_trigger, project: project)
         commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
 
-        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger)
+        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: commit, trigger: trigger)
         commit.create_builds(nil, trigger_request)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 
@@ -132,7 +132,7 @@ describe Ci::API::API do
       context 'when build has no tags' do
         before do
           commit = create(:ci_commit, project: project)
-          create(:ci_build, commit: commit, tags: [])
+          create(:ci_build, pipeline: commit, tags: [])
         end
 
         context 'when runner is allowed to pick untagged builds' do
@@ -164,7 +164,7 @@ describe Ci::API::API do
 
     describe "PUT /builds/:id" do
       let(:commit) {create(:ci_commit, project: project)}
-      let(:build) { create(:ci_build, :trace, commit: commit, runner_id: runner.id) }
+      let(:build) { create(:ci_build, :trace, pipeline: commit, runner_id: runner.id) }
 
       before do
         build.run!
@@ -238,7 +238,7 @@ describe Ci::API::API 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) { create(:ci_commit, project: project) }
-      let(:build) { create(:ci_build, commit: commit, runner_id: runner.id) }
+      let(:build) { create(:ci_build, pipeline: 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") }
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb
index 4cc4b3870d1..4b6d0889f63 100644
--- a/spec/services/ci/image_for_build_service_spec.rb
+++ b/spec/services/ci/image_for_build_service_spec.rb
@@ -6,7 +6,7 @@ module Ci
     let(:project) { FactoryGirl.create(:empty_project) }
     let(:commit_sha) { '01234567890123456789' }
     let(:commit) { project.ensure_ci_commit(commit_sha, 'master') }
-    let(:build) { FactoryGirl.create(:ci_build, commit: commit) }
+    let(:build) { FactoryGirl.create(:ci_build, pipeline: commit) }
 
     describe :execute do
       before { build }
diff --git a/spec/services/ci/register_build_service_spec.rb b/spec/services/ci/register_build_service_spec.rb
index e81f9e757ac..6f4d29a198f 100644
--- a/spec/services/ci/register_build_service_spec.rb
+++ b/spec/services/ci/register_build_service_spec.rb
@@ -5,7 +5,7 @@ module Ci
     let!(:service) { RegisterBuildService.new }
     let!(:project) { FactoryGirl.create :empty_project, shared_runners_enabled: false }
     let!(:commit) { FactoryGirl.create :ci_commit, project: project }
-    let!(:pending_build) { FactoryGirl.create :ci_build, commit: commit }
+    let!(:pending_build) { FactoryGirl.create :ci_build, pipeline: commit }
     let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
     let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
 
diff --git a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
index f70716c9d19..394ebebe31b 100644
--- a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
+++ b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
@@ -23,7 +23,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
 
   describe '#execute' do
     context 'commit status with ref' do
-      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, commit: ci_commit) }
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, pipeline: ci_commit) }
 
       it 'notifies the todo service' do
         expect(todo_service).to receive(:merge_request_build_failed).with(merge_request)
@@ -52,7 +52,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
 
   describe '#close' do
     context 'commit status with ref' do
-      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, commit: ci_commit) }
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, pipeline: ci_commit) }
 
       it 'notifies the todo service' do
         expect(todo_service).to receive(:merge_request_build_retried).with(merge_request)

From 57a3f2845653da1926ea38c061db0b9b08b2902a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 3 Jun 2016 11:48:11 +0100
Subject: [PATCH 1016/1431] Added minimum password length to password field

Closes #17765
---
 app/controllers/sessions_controller.rb        | 1 +
 app/views/devise/shared/_signup_box.html.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index d68c2a708e3..c1b940bf9e5 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -14,6 +14,7 @@ class SessionsController < Devise::SessionsController
   before_action :load_recaptcha
 
   def new
+    set_minimum_password_length
     if Gitlab.config.ldap.enabled
       @ldap_servers = Gitlab::LDAP::Config.servers
     else
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml
index 510215bb8cd..905a8dbcd84 100644
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@@ -16,7 +16,7 @@
       %div
         = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
       .form-group.append-bottom-20#password-strength
-        = f.password_field :password, class: "form-control bottom", placeholder: "Password", required: true
+        = f.password_field :password, class: "form-control bottom", placeholder: "Password - minimum length #{@minimum_password_length} characters", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters"
       %div
       - if current_application_settings.recaptcha_enabled
         = recaptcha_tags

From 3577b57f6b03a0d3c3d32daab6dc6ccf5f6e45f7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 13:09:49 +0200
Subject: [PATCH 1017/1431] Try to use `pipeline` where applicable

---
 app/models/ci/build.rb            | 12 ++++++------
 app/models/commit_status.rb       |  2 +-
 lib/gitlab/build_data_builder.rb  |  2 +-
 spec/factories/ci/builds.rb       |  2 +-
 spec/factories/commit_statuses.rb |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 74441eb97dc..77837e9384a 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -118,12 +118,12 @@ module Ci
                                    .reorder(iid: :asc)
 
       merge_requests.find do |merge_request|
-        merge_request.commits.any? { |ci| ci.id == commit.sha }
+        merge_request.commits.any? { |ci| ci.id == pipeline.sha }
       end
     end
 
     def project_id
-      commit.project.id
+      pipeline.project_id
     end
 
     def project_name
@@ -359,8 +359,8 @@ module Ci
     end
 
     def global_yaml_variables
-      if commit.config_processor
-        commit.config_processor.global_variables.map do |key, value|
+      if pipeline.config_processor
+        pipeline.config_processor.global_variables.map do |key, value|
           { key: key, value: value, public: true }
         end
       else
@@ -369,8 +369,8 @@ module Ci
     end
 
     def job_yaml_variables
-      if commit.config_processor
-        commit.config_processor.job_variables(name).map do |key, value|
+      if pipeline.config_processor
+        pipeline.config_processor.job_variables(name).map do |key, value|
           { key: key, value: value, public: true }
         end
       else
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 3752bf09f16..98a8b541e96 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -55,7 +55,7 @@ class CommitStatus < ActiveRecord::Base
   delegate :sha, :short_sha, to: :commit
 
   def before_sha
-    commit.before_sha || Gitlab::Git::BLANK_SHA
+    pipeline.before_sha || Gitlab::Git::BLANK_SHA
   end
 
   def self.stages
diff --git a/lib/gitlab/build_data_builder.rb b/lib/gitlab/build_data_builder.rb
index 34e949130da..9f45aefda0f 100644
--- a/lib/gitlab/build_data_builder.rb
+++ b/lib/gitlab/build_data_builder.rb
@@ -3,7 +3,7 @@ module Gitlab
     class << self
       def build(build)
         project = build.project
-        commit = build.commit
+        commit = build.pipeline
         user = build.user
 
         data = {
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index e2cb08d2a8b..903e331296a 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -43,7 +43,7 @@ FactoryGirl.define do
     end
 
     after(:build) do |build, evaluator|
-      build.project = build.commit.project
+      build.project = build.pipeline.project
     end
 
     factory :ci_not_started_build do
diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index 67301fbd9a9..65afcc5e50d 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -8,7 +8,7 @@ FactoryGirl.define do
     finished_at 'Tue, 26 Jan 2016 08:23:42 +0100'
 
     after(:build) do |build, evaluator|
-      build.project = build.commit.project
+      build.project = build.pipeline.project
     end
 
     factory :generic_commit_status, class: GenericCommitStatus do

From 08baa9983ee586c10b4fa28f68b10ba8e7807125 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 13:34:03 +0200
Subject: [PATCH 1018/1431] Use pipelines in context of Project

---
 app/views/projects/commit/_commit_box.html.haml            | 6 +++---
 app/views/projects/graphs/ci/_overall.haml                 | 2 +-
 app/views/projects/issues/_merge_requests.html.haml        | 4 ++--
 app/views/projects/issues/_related_branches.html.haml      | 6 +++---
 app/views/projects/merge_requests/_merge_request.html.haml | 4 ++--
 app/views/projects/merge_requests/widget/_show.html.haml   | 2 +-
 app/views/projects/pipelines/_head.html.haml               | 2 +-
 db/fixtures/development/14_builds.rb                       | 2 +-
 lib/api/builds.rb                                          | 2 +-
 lib/api/commit_statuses.rb                                 | 4 ++--
 spec/requests/api/builds_spec.rb                           | 2 +-
 spec/requests/api/commits_spec.rb                          | 2 +-
 spec/services/ci/image_for_build_service_spec.rb           | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 6674d58417b..b117517c0dd 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -53,13 +53,13 @@
 - if @commit.status
   .commit-info-row
     Builds for
-    = pluralize(@commit.ci_commits.count, 'pipeline')
+    = pluralize(@commit.pipelines.count, 'pipeline')
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status-link ci-status-icon-#{@commit.status}" do
       = ci_icon_for_status(@commit.status)
       = ci_label_for_status(@commit.status)
-    - if @commit.ci_commits.duration
+    - if @commit.pipelines.duration
       in
-      = time_interval_in_words @commit.ci_commits.duration
+      = time_interval_in_words @commit.pipelines.duration
 
 .commit-box.content-block
   %h3.commit-title
diff --git a/app/views/projects/graphs/ci/_overall.haml b/app/views/projects/graphs/ci/_overall.haml
index 4b12e5f2da1..edc4f7b079f 100644
--- a/app/views/projects/graphs/ci/_overall.haml
+++ b/app/views/projects/graphs/ci/_overall.haml
@@ -16,4 +16,4 @@
   %li
     Commits covered:
     %strong
-      = @project.ci_commits.count(:all)
+      = @project.pipelines.count(:all)
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index 2f9dc867d0d..313c9433de2 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -6,8 +6,8 @@
     - @merge_requests.each do |merge_request|
       %li
         %span.merge-request-ci-status
-          - if merge_request.ci_commit
-            = render_pipeline_status(merge_request.ci_commit)
+          - if merge_request.pipeline
+            = render_pipeline_status(merge_request.pipeline)
           - elsif has_any_ci
             = icon('blank fw')
         %span.merge-request-id
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
index 5f9d2919982..b9bb6fe559d 100644
--- a/app/views/projects/issues/_related_branches.html.haml
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -5,10 +5,10 @@
     - @related_branches.each do |branch|
       %li
         - sha = @project.repository.find_branch(branch).target
-        - ci_commit = @project.ci_commit(sha, branch) if sha
-        - if ci_commit
+        - pipeline = @project.pipeline(sha, branch) if sha
+        - if ci_copipelinemmit
           %span.related-branch-ci-status
-            = render_pipeline_status(ci_commit)
+            = render_pipeline_status(pipeline)
         %span.related-branch-info
           %strong
             = link_to namespace_project_compare_path(@project.namespace, @project, from: @project.default_branch, to: branch), class: "label-branch" do
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index c02f94490a0..37197c7a027 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -11,9 +11,9 @@
           = icon('ban')
           CLOSED
 
-      - if merge_request.ci_commit
+      - if merge_request.pipeline
         %li
-          = render_pipeline_status(merge_request.ci_commit)
+          = render_pipeline_status(merge_request.pipeline)
 
       - if merge_request.open? && merge_request.broken?
         %li
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index b79508bdc34..d9efe81701f 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -13,7 +13,7 @@
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
     ci_status_url: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     gitlab_icon: "#{asset_path 'gitlab_logo.png'}",
-    ci_status: "#{@merge_request.ci_commit ? @merge_request.ci_commit.status : ''}",
+    ci_status: "#{@merge_request.pipeline ? @merge_request.pipeline.status : ''}",
     ci_message: {
       normal: "Build {{status}} for \"{{title}}\"",
       preparing: "{{status}} build for \"{{title}}\""
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index 6e757df5417..d284694efb7 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -4,7 +4,7 @@
       = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
         %span
           Pipelines
-          %span.badge.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count)
+          %span.badge.count.ci_counter= number_with_delimiter(@project.pipelines.running_or_pending.count)
 
   - if project_nav_tab? :builds
     = nav_link(controller: %w(builds)) do
diff --git a/db/fixtures/development/14_builds.rb b/db/fixtures/development/14_builds.rb
index b99d24a03c9..51ff451eb4c 100644
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
@@ -19,7 +19,7 @@ class Gitlab::Seeder::Builds
     commits = @project.repository.commits('master', nil, 5)
     commits_sha = commits.map { |commit| commit.raw.id }
     commits_sha.map do |sha|
-      @project.ensure_ci_commit(sha, 'master')
+      @project.ensure_pipeline(sha, 'master')
     end
   rescue
     []
diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index 2b104f90aa7..0ff8fa74a84 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -33,7 +33,7 @@ module API
       get ':id/repository/commits/:sha/builds' do
         authorize_read_builds!
 
-        commit = user_project.ci_commits.find_by_sha(params[:sha])
+        commit = user_project.pipelines.find_by_sha(params[:sha])
         return not_found! unless commit
 
         builds = commit.builds.order('id DESC')
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 0c02b5fd574..7fc83380764 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -22,7 +22,7 @@ module API
 
         not_found!('Commit') unless user_project.commit(params[:sha])
 
-        ci_commits = user_project.ci_commits.where(sha: params[:sha])
+        ci_commits = user_project.pipelines.where(sha: params[:sha])
         statuses = ::CommitStatus.where(commit: ci_commits)
         statuses = statuses.latest unless parse_boolean(params[:all])
         statuses = statuses.where(ref: params[:ref]) if params[:ref].present?
@@ -64,7 +64,7 @@ module API
           ref = branches.first
         end
 
-        ci_commit = @project.ensure_ci_commit(commit.sha, ref)
+        ci_commit = @project.ensure_pipeline(commit.sha, ref)
 
         name = params[:name] || params[:context]
         status = GenericCommitStatus.running_or_pending.find_by(commit: ci_commit, name: name, ref: params[:ref])
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 35eb23c2a9b..534b82dc34f 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -59,7 +59,7 @@ describe API::API, api: true  do
 
   describe 'GET /projects/:id/repository/commits/:sha/builds' do
     before do
-      project.ensure_ci_commit(commit.sha, 'master')
+      project.ensure_pipeline(commit.sha, 'master')
       get api("/projects/#{project.id}/repository/commits/#{commit.sha}/builds", api_user)
     end
 
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index cb82ca7802d..2336ec97ed0 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -90,7 +90,7 @@ describe API::API, api: true  do
       end
 
       it "should return status for CI" do
-        ci_commit = project.ensure_ci_commit(project.repository.commit.sha, 'master')
+        ci_commit = project.ensure_pipeline(project.repository.commit.sha, 'master')
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
         expect(response.status).to eq(200)
         expect(json_response['status']).to eq(ci_commit.status)
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb
index 4b6d0889f63..476a888e394 100644
--- a/spec/services/ci/image_for_build_service_spec.rb
+++ b/spec/services/ci/image_for_build_service_spec.rb
@@ -5,7 +5,7 @@ module Ci
     let(:service) { ImageForBuildService.new }
     let(:project) { FactoryGirl.create(:empty_project) }
     let(:commit_sha) { '01234567890123456789' }
-    let(:commit) { project.ensure_ci_commit(commit_sha, 'master') }
+    let(:commit) { project.ensure_pipeline(commit_sha, 'master') }
     let(:build) { FactoryGirl.create(:ci_build, pipeline: commit) }
 
     describe :execute do

From fe5735a8602b286953477eff5c58ce88b0054c7d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 13:34:38 +0200
Subject: [PATCH 1019/1431] Delegate to pipeline instead of commit

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

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 98a8b541e96..e53c483b904 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -52,7 +52,7 @@ class CommitStatus < ActiveRecord::Base
     end
   end
 
-  delegate :sha, :short_sha, to: :commit
+  delegate :sha, :short_sha, to: :pipeline
 
   def before_sha
     pipeline.before_sha || Gitlab::Git::BLANK_SHA

From bcd009e661291554cffe404123de629860519602 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 13:58:35 +0200
Subject: [PATCH 1020/1431] Use foreign_key to define column name

---
 app/models/ci/pipeline.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 4d4f8951366..92fc7c89bd4 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -6,8 +6,8 @@ module Ci
     self.table_name = 'ci_commits'
 
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
-    has_many :statuses, class_name: 'CommitStatus'
-    has_many :builds, class_name: 'Ci::Build'
+    has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id
+    has_many :builds, class_name: 'Ci::Build', foreign_key: :commit_id
     has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest'
 
     validates_presence_of :sha

From d501850e05ebadcbf2f957cbf35a0ffa6dbe31ff Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 3 Jun 2016 14:20:34 +0200
Subject: [PATCH 1021/1431] Add gitlab ci configuration class that holds hash

As for now, we keep this class inside a oryginal config processor class.
We will move implementation to this class and delegate to it from
current config processor.

After original gitlab ci yaml processor not longer has relevant
impelemntation we will replace it with new configuration class.
---
 lib/ci/gitlab_ci_yaml_processor.rb | 10 +++------
 lib/gitlab/ci/config.rb            | 21 ++++++++++++++++++
 spec/lib/gitlab/ci/config_spec.rb  | 34 ++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 lib/gitlab/ci/config.rb
 create mode 100644 spec/lib/gitlab/ci/config_spec.rb

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 026a5ac97ca..9a60c5ab842 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -12,18 +12,14 @@ module Ci
     attr_reader :before_script, :after_script, :image, :services, :path, :cache
 
     def initialize(config, path = nil)
-      @config = YAML.safe_load(config, [Symbol], [], true)
+      @config = Gitlab::Ci::Config.new(config).to_hash
       @path = path
 
-      unless @config.is_a? Hash
-        raise ValidationError, "YAML should be a hash"
-      end
-
-      @config = @config.deep_symbolize_keys
-
       initial_parsing
 
       validate!
+    rescue Gitlab::Ci::Config::ParserError => e
+      raise ValidationError, e.message
     end
 
     def builds_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil)
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
new file mode 100644
index 00000000000..8f88ccf5bf4
--- /dev/null
+++ b/lib/gitlab/ci/config.rb
@@ -0,0 +1,21 @@
+module Gitlab
+  module Ci
+    class Config
+      class ParserError < StandardError; end
+
+      def initialize(config)
+        @config = YAML.safe_load(config, [Symbol], [], true)
+
+        unless @config.is_a?(Hash)
+          raise ParserError, 'YAML should be a hash'
+        end
+
+        @config = @config.deep_symbolize_keys
+      end
+
+      def to_hash
+        @config
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb
new file mode 100644
index 00000000000..6e251706714
--- /dev/null
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Config do
+  let(:config) do
+    described_class.new(yml)
+  end
+
+  context 'when yml config is valid' do
+    let(:yml) do
+      <<-EOS
+        image: ruby:2.2
+
+        rspec:
+          script:
+            - gem install rspec
+            - rspec
+      EOS
+    end
+
+    describe '#to_hash' do
+      it 'returns hash created from string' do
+        hash = {
+          image: 'ruby:2.2',
+          rspec: {
+            script: ['gem install rspec',
+                     'rspec']
+          }
+        }
+
+        expect(config.to_hash).to eq hash
+      end
+    end
+  end
+end

From 4d5f7aa00827f425dd3d2c3bd5a395c8e948f0ba Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 14:46:17 +0200
Subject: [PATCH 1022/1431] Fix more places where we should rename ci_commit to
 pipeline

---
 app/models/ci/pipeline.rb                            |  2 +-
 app/models/ci/trigger_request.rb                     |  2 +-
 spec/models/build_spec.rb                            |  2 +-
 spec/models/ci/{commit_spec.rb => pipeline_spec.rb}  |  2 +-
 spec/models/commit_status_spec.rb                    | 10 +++++-----
 spec/models/merge_request_spec.rb                    | 12 ++++++------
 spec/models/project_spec.rb                          |  2 +-
 .../merge_when_build_succeeds_service_spec.rb        |  4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)
 rename spec/models/ci/{commit_spec.rb => pipeline_spec.rb} (99%)

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 92fc7c89bd4..9352c6f325a 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -8,7 +8,7 @@ module Ci
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id
     has_many :builds, class_name: 'Ci::Build', foreign_key: :commit_id
-    has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest'
+    has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest', foreign_key: :commit_id
 
     validates_presence_of :sha
     validates_presence_of :status
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index 47632c4b40a..59fc9951d11 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -3,7 +3,7 @@ module Ci
     extend Ci::Model
     
     belongs_to :trigger, class_name: 'Ci::Trigger'
-    belongs_to :commit, class_name: 'Ci::Pipeline'
+    belongs_to :commit, class_name: 'Ci::Pipeline', foreign_key: :commit_id
     has_many :builds, class_name: 'Ci::Build'
 
     serialize :variables
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 86d581721b1..6c30d85249a 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
 
         context 'and trigger variables' do
           let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: commit, trigger: trigger) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/pipeline_spec.rb
similarity index 99%
rename from spec/models/ci/commit_spec.rb
rename to spec/models/ci/pipeline_spec.rb
index 8426f28d445..2f8b1d790a7 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -334,7 +334,7 @@ describe Ci::Pipeline, models: true do
 
   describe '#stages' do
     let(:commit2) { FactoryGirl.create :ci_commit, project: project }
-    subject { CommitStatus.where(commit: [commit, commit2]).stages }
+    subject { CommitStatus.where(pipeline: [commit, commit2]).stages }
 
     before do
       FactoryGirl.create :ci_build, pipeline: commit2, stage: 'test', stage_idx: 1
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index b435d835722..ca630e5bc9c 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -4,15 +4,15 @@ describe CommitStatus, models: true do
   let(:commit) { FactoryGirl.create :ci_commit }
   let(:commit_status) { FactoryGirl.create :commit_status, pipeline: commit }
 
-  it { is_expected.to belong_to(:commit) }
+  it { is_expected.to belong_to(:pipeline) }
   it { is_expected.to belong_to(:user) }
   it { is_expected.to belong_to(:project) }
 
   it { is_expected.to validate_presence_of(:name) }
   it { is_expected.to validate_inclusion_of(:status).in_array(%w(pending running failed success canceled)) }
 
-  it { is_expected.to delegate_method(:sha).to(:commit) }
-  it { is_expected.to delegate_method(:short_sha).to(:commit) }
+  it { is_expected.to delegate_method(:sha).to(:pipeline) }
+  it { is_expected.to delegate_method(:short_sha).to(:pipeline) }
   
   it { is_expected.to respond_to :success? }
   it { is_expected.to respond_to :failed? }
@@ -179,7 +179,7 @@ describe CommitStatus, models: true do
     end
 
     context 'stages list' do
-      subject { CommitStatus.where(commit: commit).stages }
+      subject { CommitStatus.where(pipeline: commit).stages }
 
       it 'return ordered list of stages' do
         is_expected.to eq(%w(build test deploy))
@@ -187,7 +187,7 @@ describe CommitStatus, models: true do
     end
 
     context 'stages with statuses' do
-      subject { CommitStatus.where(commit: commit).stages_status }
+      subject { CommitStatus.where(pipeline: commit).stages_status }
 
       it 'return list of stages with statuses' do
         is_expected.to eq({
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 348f2e2f493..21d7a8d8364 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -390,19 +390,19 @@ describe MergeRequest, models: true do
     subject { create :merge_request, :simple }
   end
 
-  describe '#ci_commit' do
+  describe '#pipeline' do
     describe 'when the source project exists' do
       it 'returns the latest commit' do
-        commit    = double(:commit, id: '123abc')
-        ci_commit = double(:ci_commit, ref: 'master')
+        commit   = double(:commit, id: '123abc')
+        pipeline = double(:ci_commit, ref: 'master')
 
         allow(subject).to receive(:last_commit).and_return(commit)
 
-        expect(subject.source_project).to receive(:ci_commit).
+        expect(subject.source_project).to receive(:pipeline).
           with('123abc', 'master').
-          and_return(ci_commit)
+          and_return(pipeline)
 
-        expect(subject.pipeline).to eq(ci_commit)
+        expect(subject.pipeline).to eq(pipeline)
       end
     end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 44debdbdc1c..1135d7b6099 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -22,7 +22,7 @@ describe Project, models: true do
     it { is_expected.to have_one(:pushover_service).dependent(:destroy) }
     it { is_expected.to have_one(:asana_service).dependent(:destroy) }
     it { is_expected.to have_many(:commit_statuses) }
-    it { is_expected.to have_many(:ci_commits) }
+    it { is_expected.to have_many(:pipelines) }
     it { is_expected.to have_many(:builds) }
     it { is_expected.to have_many(:runner_projects) }
     it { is_expected.to have_many(:runners) }
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index 7f8ea8d7c25..d050f4cd95c 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -110,8 +110,8 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
 
     context 'properly handles multiple stages' do
       let(:ref) { mr_merge_if_green_enabled.source_branch }
-      let(:build) { create(:ci_build, commit: ci_commit, ref: ref, name: 'build', stage: 'build') }
-      let(:test) { create(:ci_build, commit: ci_commit, ref: ref, name: 'test', stage: 'test') }
+      let(:build) { create(:ci_build, pipeline: ci_commit, ref: ref, name: 'build', stage: 'build') }
+      let(:test) { create(:ci_build, pipeline: ci_commit, ref: ref, name: 'test', stage: 'test') }
 
       before do
         # This behavior of MergeRequest: we instantiate a new object

From 3ffa494ffe06105d6e36a46df52e8a842be0ab69 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 14:57:34 +0200
Subject: [PATCH 1023/1431] =?UTF-8?q?Changes=20after=20more=20review=20fro?=
 =?UTF-8?q?m=20R=C3=A9my?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/git_http_controller.rb           | 16 +++++++-----
 lib/gitlab/auth.rb                            | 26 +++++++++----------
 spec/lib/gitlab/auth_spec.rb                  |  8 +++---
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 16a85d6f62b..5dfa10d218e 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -41,15 +41,17 @@ class Projects::GitHttpController < Projects::ApplicationController
     return if project && project.public? && upload_pack?
 
     authenticate_or_request_with_http_basic do |login, password|
-      user, type = Gitlab::Auth.find(login, password, project: project, ip: request.ip)
+      auth_result = Gitlab::Auth.find(login, password, project: project, ip: request.ip)
 
-      if (type == :ci) && upload_pack?
+      if auth_result.type == :ci && upload_pack?
         @ci = true
-      elsif (type == :oauth) && !upload_pack?
-        @user = nil
+      elsif auth_result.type == :oauth && !upload_pack?
+        # Not allowed
       else
-        @user = user
+        @user = auth_result.user
       end
+
+      ci? || user
     end
   end
 
@@ -73,7 +75,7 @@ class Projects::GitHttpController < Projects::ApplicationController
   def project_id_with_suffix
     id = params[:project_id] || ''
 
-    %w{.wiki.git .git}.each do |suffix|
+    %w[.wiki.git .git].each do |suffix|
       if id.end_with?(suffix)
         # Be careful to only remove the suffix from the end of 'id'.
         # Accidentally removing it from the middle is how security
@@ -109,7 +111,7 @@ class Projects::GitHttpController < Projects::ApplicationController
     if action_name == 'info_refs'
       params[:service]
     else
-      action_name.gsub('_', '-')
+      action_name.dasherize
     end
   end
 
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index d156fa2978d..672642ebfbe 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -1,22 +1,23 @@
 module Gitlab
   class Auth
+    Result = Struct.new(:user, :type)
+
     class << self
       def find(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?
 
-        user = nil
-        type = nil
+        result = Result.new
 
         if valid_ci_request?(login, password, project)
-          type = :ci
-        elsif user = find_in_gitlab_or_ldap(login, password)
-          type = :master_or_ldap
-        elsif user = oauth_access_token_check(login, password)
-          type = :oauth
+          result.type = :ci
+        elsif result.user = find_in_gitlab_or_ldap(login, password)
+          result.type = :gitlab_or_ldap
+        elsif result.user = oauth_access_token_check(login, password)
+          result.type = :oauth
         end
 
-        rate_limit!(ip, success: !!user || (type == :ci), login: login)
-        [user, type]
+        rate_limit!(ip, success: !!result.user || (result.type == :ci), login: login)
+        result
       end
 
       def find_in_gitlab_or_ldap(login, password)
@@ -67,7 +68,7 @@ module Gitlab
         # from Rack::Attack for that IP. A client may attempt to authenticate
         # with a username and blank password first, and only after it receives
         # a 401 error does it present a password. Resetting the count prevents
-        # false positives from occurring.
+        # false positives.
         #
         # Otherwise, we let Rack::Attack know there was a failed authentication
         # attempt from this IP. This information is stored in the Rails cache
@@ -78,15 +79,14 @@ module Gitlab
         return unless config.enabled
 
         if success
-          # A successful login will reset the auth failure count from this IP
           Rack::Attack::Allow2Ban.reset(ip, config)
         else
           banned = Rack::Attack::Allow2Ban.filter(ip, config) do
-            # Unless the IP is whitelisted, return true so that Allow2Ban
-            # increments the counter (stored in Rails.cache) for the IP
             if config.ip_whitelist.include?(ip)
+              # Don't increment the ban counter for this IP
               false
             else
+              # Increment the ban counter for this IP
               true
             end
           end
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 3c41c4b0681..a814ad2a4e7 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -11,7 +11,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: 'gitlab-ci-token')
-      expect(gl_auth.find('gitlab-ci-token', token, project: project, ip: ip)).to eq([nil, :ci])
+      expect(gl_auth.find('gitlab-ci-token', token, project: project, ip: ip)).to eq(Gitlab::Auth::Result.new(nil, :ci))
     end
 
     it 'recognizes master passwords' do
@@ -19,7 +19,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: user.username)
-      expect(gl_auth.find(user.username, 'password', project: nil, ip: ip)).to eq([user, :master_or_ldap])
+      expect(gl_auth.find(user.username, 'password', project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new(user, :gitlab_or_ldap))
     end
 
     it 'recognizes OAuth tokens' do
@@ -29,7 +29,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: 'oauth2')
-      expect(gl_auth.find("oauth2", token.token, project: nil, ip: ip)).to eq([user, :oauth])
+      expect(gl_auth.find("oauth2", token.token, project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new(user, :oauth))
     end
 
     it 'returns double nil for invalid credentials' do
@@ -37,7 +37,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: false, login: login)
-      expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq([nil, nil])
+      expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new)
     end
   end
 

From 1564074648afc12fc788a7b5e2eb896dc74f62ef Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 15:28:35 +0200
Subject: [PATCH 1024/1431] =?UTF-8?q?Refactor=20=5Fallowed=3F=20methods=20?=
 =?UTF-8?q?as=20R=C3=A9my=20asked?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/git_http_controller.rb           | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 5dfa10d218e..bf7ba7a5829 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -128,26 +128,20 @@ class Projects::GitHttpController < Projects::ApplicationController
   end
 
   def upload_pack_allowed?
-    if !Gitlab.config.gitlab_shell.upload_pack
-      false
-    elsif ci?
-      true
-    elsif user
+    return false unless Gitlab.config.gitlab_shell.upload_pack
+
+    if user
       Gitlab::GitAccess.new(user, project).download_access_check.allowed?
     else
-      project.public?
+      ci? || project.public?
     end
   end
 
   def receive_pack_allowed?
-    if !Gitlab.config.gitlab_shell.receive_pack
-      false
-    elsif user
-      # Skip user authorization on upload request.
-      # It will be done by the pre-receive hook in the repository.
-      true
-    else
-      false
-    end
+    return false unless Gitlab.config.gitlab_shell.receive_pack
+
+    # Skip user authorization on upload request.
+    # It will be done by the pre-receive hook in the repository.
+    user.present?
   end
 end

From 9423547f6181bc7e4c9c32e86bd7f72b4c094de0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 15:35:16 +0200
Subject: [PATCH 1025/1431] Fix other places where we still use commit
 attribute of Build

---
 app/controllers/projects/commit_controller.rb |  6 ++--
 app/models/ci/pipeline.rb                     |  2 +-
 lib/api/commit_statuses.rb                    |  6 ++--
 .../add_todo_when_build_fails_service_spec.rb |  8 ++---
 .../merge_when_build_succeeds_service_spec.rb | 32 +++++++++----------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 287388652e6..737e6c931f7 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -104,7 +104,7 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def ci_builds
-    @ci_builds ||= Ci::Build.where(commit: ci_commits)
+    @ci_builds ||= Ci::Build.where(pipeline: ci_commits)
   end
 
   def define_show_vars
@@ -117,8 +117,8 @@ class Projects::CommitController < Projects::ApplicationController
     @diff_refs = [commit.parent || commit, commit]
     @notes_count = commit.notes.count
 
-    @statuses = CommitStatus.where(commit: ci_commits)
-    @builds = Ci::Build.where(commit: ci_commits)
+    @statuses = CommitStatus.where(pipeline: ci_commits)
+    @builds = Ci::Build.where(pipeline: ci_commits)
   end
 
   def assign_change_commit_vars(mr_source_branch)
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 9352c6f325a..9b5b46f4928 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -23,7 +23,7 @@ module Ci
 
     def self.stages
       # We use pluck here due to problems with MySQL which doesn't allow LIMIT/OFFSET in queries
-      CommitStatus.where(commit: pluck(:id)).stages
+      CommitStatus.where(pipeline: pluck(:id)).stages
     end
 
     def project_id
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 7fc83380764..088d5bac587 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -23,7 +23,7 @@ module API
         not_found!('Commit') unless user_project.commit(params[:sha])
 
         ci_commits = user_project.pipelines.where(sha: params[:sha])
-        statuses = ::CommitStatus.where(commit: ci_commits)
+        statuses = ::CommitStatus.where(pipeline: ci_commits)
         statuses = statuses.latest unless parse_boolean(params[:all])
         statuses = statuses.where(ref: params[:ref]) if params[:ref].present?
         statuses = statuses.where(stage: params[:stage]) if params[:stage].present?
@@ -67,8 +67,8 @@ module API
         ci_commit = @project.ensure_pipeline(commit.sha, ref)
 
         name = params[:name] || params[:context]
-        status = GenericCommitStatus.running_or_pending.find_by(commit: ci_commit, name: name, ref: params[:ref])
-        status ||= GenericCommitStatus.new(project: @project, commit: ci_commit, user: current_user)
+        status = GenericCommitStatus.running_or_pending.find_by(pipeline: ci_commit, name: name, ref: params[:ref])
+        status ||= GenericCommitStatus.new(project: @project, pipeline: ci_commit, user: current_user)
         status.update(attrs)
 
         case params[:state].to_s
diff --git a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
index 394ebebe31b..a7f52a2fa24 100644
--- a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
+++ b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
@@ -6,7 +6,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
   let(:merge_request) { create(:merge_request) }
   let(:project) { create(:project) }
   let(:sha) { '1234567890abcdef1234567890abcdef12345678' }
-  let(:ci_commit) { create(:ci_commit_with_one_job, ref: merge_request.source_branch, project: project, sha: sha) }
+  let(:pipeline) { create(:ci_commit_with_one_job, ref: merge_request.source_branch, project: project, sha: sha) }
   let(:service) { MergeRequests::AddTodoWhenBuildFailsService.new(project, user, commit_message: 'Awesome message') }
   let(:todo_service) { TodoService.new }
 
@@ -17,13 +17,13 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
   end
 
   before do
-    allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
+    allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
     allow(service).to receive(:todo_service).and_return(todo_service)
   end
 
   describe '#execute' do
     context 'commit status with ref' do
-      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, pipeline: ci_commit) }
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, pipeline: pipeline) }
 
       it 'notifies the todo service' do
         expect(todo_service).to receive(:merge_request_build_failed).with(merge_request)
@@ -52,7 +52,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
 
   describe '#close' do
     context 'commit status with ref' do
-      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, pipeline: ci_commit) }
+      let(:commit_status) { create(:generic_commit_status, ref: merge_request.source_branch, pipeline: pipeline) }
 
       it 'notifies the todo service' do
         expect(todo_service).to receive(:merge_request_build_retried).with(merge_request)
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index d050f4cd95c..6d6539a0e71 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -10,7 +10,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
                            source_project: project, target_project: project, state: "opened")
   end
 
-  let(:ci_commit) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) }
+  let(:pipeline) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) }
   let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, commit_message: 'Awesome message') }
 
   describe "#execute" do
@@ -21,7 +21,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
 
     context 'first time enabling' do
       before do
-        allow(merge_request).to receive(:ci_commit).and_return(ci_commit)
+        allow(merge_request).to receive(:pipeline).and_return(pipeline)
         service.execute(merge_request)
       end
 
@@ -43,9 +43,9 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       let(:build)   { create(:ci_build, ref: mr_merge_if_green_enabled.source_branch) }
 
       before do
-        allow(mr_merge_if_green_enabled).to receive(:ci_commit).and_return(ci_commit)
+        allow(mr_merge_if_green_enabled).to receive(:pipeline).and_return(pipeline)
         allow(mr_merge_if_green_enabled).to receive(:mergeable?).and_return(true)
-        allow(ci_commit).to receive(:success?).and_return(true)
+        allow(pipeline).to receive(:success?).and_return(true)
       end
 
       it 'updates the merge params' do
@@ -62,8 +62,8 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       let(:build)     { create(:ci_build, ref: mr_merge_if_green_enabled.source_branch, status: "success") }
 
       it "merges all merge requests with merge when build succeeds enabled" do
-        allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
-        allow(ci_commit).to receive(:success?).and_return(true)
+        allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
+        allow(pipeline).to receive(:success?).and_return(true)
 
         expect(MergeWorker).to receive(:perform_async)
         service.trigger(build)
@@ -75,8 +75,8 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       let(:build)     { create(:ci_build, ref: mr_merge_if_green_enabled.source_branch, status: "success") }
 
       it "merges all merge requests with merge when build succeeds enabled" do
-        allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
-        allow(ci_commit).to receive(:success?).and_return(true)
+        allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
+        allow(pipeline).to receive(:success?).and_return(true)
         allow(old_build).to receive(:sha).and_return('1234abcdef')
 
         expect(MergeWorker).not_to receive(:perform_async)
@@ -99,9 +99,9 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       it 'discovers branches and merges all merge requests when status is success' do
         allow(project.repository).to receive(:branch_names_contains).
           with(commit_status.sha).and_return([mr_merge_if_green_enabled.source_branch])
-        allow(ci_commit).to receive(:success?).and_return(true)
-        allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
-        allow(ci_commit).to receive(:success?).and_return(true)
+        allow(pipeline).to receive(:success?).and_return(true)
+        allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
+        allow(pipeline).to receive(:success?).and_return(true)
 
         expect(MergeWorker).to receive(:perform_async)
         service.trigger(commit_status)
@@ -110,17 +110,17 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
 
     context 'properly handles multiple stages' do
       let(:ref) { mr_merge_if_green_enabled.source_branch }
-      let(:build) { create(:ci_build, pipeline: ci_commit, ref: ref, name: 'build', stage: 'build') }
-      let(:test) { create(:ci_build, pipeline: ci_commit, ref: ref, name: 'test', stage: 'test') }
+      let(:build) { create(:ci_build, pipeline: pipeline, ref: ref, name: 'build', stage: 'build') }
+      let(:test) { create(:ci_build, pipeline: pipeline, ref: ref, name: 'test', stage: 'test') }
 
       before do
         # This behavior of MergeRequest: we instantiate a new object
-        allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_wrap_original do
-          Ci::Pipeline.find(ci_commit.id)
+        allow_any_instance_of(MergeRequest).to receive(:pipeline).and_wrap_original do
+          Ci::Pipeline.find(pipeline.id)
         end
 
         # We create test after the build
-        allow(ci_commit).to receive(:create_next_builds).and_wrap_original do
+        allow(pipeline).to receive(:create_next_builds).and_wrap_original do
           test
         end
       end

From 50a357d7e8fcc7c7ec25eff01495c39f7f90ffd8 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 15:49:52 +0200
Subject: [PATCH 1026/1431] Use #present?

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

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index bf7ba7a5829..e53158c4121 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -124,7 +124,7 @@ class Projects::GitHttpController < Projects::ApplicationController
   end
 
   def ci?
-    !!@ci
+    @ci.present?
   end
 
   def upload_pack_allowed?

From bf2bd2373d9179616436990b483aec52fcfe0f8e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 15:58:37 +0200
Subject: [PATCH 1027/1431] Fix merge_request handling

---
 app/views/projects/issues/_merge_requests.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index 313c9433de2..75f36579b11 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -2,7 +2,7 @@
   %h2.merge-requests-title
     = pluralize(@merge_requests.count, 'Related Merge Request')
   %ul.unstyled-list
-    - has_any_ci = @merge_requests.any?(&:ci_commit)
+    - has_any_ci = @merge_requests.any?(&:pipeline)
     - @merge_requests.each do |merge_request|
       %li
         %span.merge-request-ci-status

From 46d5760c76bc3ba8222698d12cab5bc4d01c822b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 16:04:59 +0200
Subject: [PATCH 1028/1431] Fewer silly instance variables

---
 .../projects/git_http_controller.rb           | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index e53158c4121..380139a9c30 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -88,17 +88,6 @@ class Projects::GitHttpController < Projects::ApplicationController
     [nil, nil]
   end
 
-  def repository
-    @repository ||= begin
-      _, suffix = project_id_with_suffix
-      if suffix == '.wiki.git'
-        project.wiki.repository
-      else
-        project.repository
-      end
-    end
-  end
-
   def upload_pack?
     git_command == 'git-upload-pack'
   end
@@ -119,6 +108,15 @@ class Projects::GitHttpController < Projects::ApplicationController
     render json: Gitlab::Workhorse.git_http_ok(repository, user)
   end
 
+  def repository
+    _, suffix = project_id_with_suffix
+    if suffix == '.wiki.git'
+      project.wiki.repository
+    else
+      project.repository
+    end
+  end
+
   def render_not_found
     render text: 'Not Found', status: :not_found
   end

From 20c7144ed20bad499b878425d5fbab408ad066b5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 16:22:26 +0200
Subject: [PATCH 1029/1431] Rename all `[ci_]commit` to `[ci_]pipeline` in
 specs and features

---
 features/steps/project/commits/commits.rb     |   4 +-
 features/steps/project/merge_requests.rb      |   4 +-
 features/steps/shared/builds.rb               |   6 +-
 features/steps/shared/project.rb              |   2 +-
 .../merge_requests_controller_spec.rb         |   2 +-
 spec/factories/ci/builds.rb                   |   2 +-
 spec/factories/ci/commits.rb                  |  10 +-
 spec/factories/commit_statuses.rb             |   2 +-
 spec/features/admin/admin_builds_spec.rb      |  26 +-
 spec/features/admin/admin_runners_spec.rb     |   4 +-
 spec/features/builds_spec.rb                  |   2 +-
 spec/features/commits_spec.rb                 |  56 ++--
 .../merge_requests/created_from_fork_spec.rb  |   2 +-
 .../merge_when_build_succeeds_spec.rb         |   6 +-
 spec/features/pipelines_spec.rb               |   6 +-
 spec/features/projects/commit/builds_spec.rb  |   2 +-
 .../security/project/public_access_spec.rb    |   4 +-
 spec/lib/ci/charts_spec.rb                    |  10 +-
 spec/lib/gitlab/badge/build_spec.rb           |   5 +-
 spec/models/build_spec.rb                     |  54 ++--
 spec/models/ci/pipeline_spec.rb               | 262 +++++++++---------
 spec/models/commit_status_spec.rb             |  44 +--
 spec/models/generic_commit_status_spec.rb     |   4 +-
 spec/models/merge_request_spec.rb             |   2 +-
 spec/models/project_spec.rb                   |  16 +-
 spec/requests/api/builds_spec.rb              |  18 +-
 spec/requests/api/merge_requests_spec.rb      |   4 +-
 spec/requests/api/triggers_spec.rb            |  12 +-
 spec/requests/ci/api/builds_spec.rb           |  48 ++--
 spec/requests/ci/api/triggers_spec.rb         |  12 +-
 .../services/ci/create_builds_service_spec.rb |   4 +-
 .../ci/create_trigger_request_service_spec.rb |   6 +-
 .../ci/register_build_service_spec.rb         |   4 +-
 .../create_commit_builds_service_spec.rb      |  78 +++---
 .../add_todo_when_build_fails_service_spec.rb |   2 +-
 .../merge_when_build_succeeds_service_spec.rb |   2 +-
 spec/services/system_note_service_spec.rb     |   3 +-
 spec/support/stub_gitlab_calls.rb             |   6 +-
 spec/workers/post_receive_spec.rb             |   4 +-
 39 files changed, 369 insertions(+), 371 deletions(-)

diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 33d3eeab0d2..239036e431d 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -164,8 +164,8 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
 
   step 'commit has ci status' do
     @project.enable_ci
-    ci_commit = create :ci_commit, project: @project, sha: sample_commit.id
-    create :ci_build, pipeline: ci_commit
+    pipeline = create :ci_pipeline, project: @project, sha: sample_commit.id
+    create :ci_build, pipeline: pipeline
   end
 
   step 'repository contains ".gitlab-ci.yml" file' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 0ac7d3a250a..37aa169881a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -519,8 +519,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step '"Bug NS-05" has CI status' do
     project = merge_request.source_project
     project.enable_ci
-    ci_commit = create :ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch
-    create :ci_build, pipeline: ci_commit
+    pipeline = create :ci_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch
+    create :ci_build, pipeline: pipeline
   end
 
   step 'I should see merge request "Bug NS-05" with CI status' do
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 92d7bed0450..4d6b258f577 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -10,8 +10,8 @@ module SharedBuilds
   end
 
   step 'project has a recent build' do
-    @ci_commit = create(:ci_commit, project: @project, sha: @project.commit.sha, ref: 'master')
-    @build = create(:ci_build_with_coverage, commit: @ci_commit)
+    @pipeline = create(:ci_pipeline, project: @project, sha: @project.commit.sha, ref: 'master')
+    @build = create(:ci_build_with_coverage, pipeline: @pipeline)
   end
 
   step 'recent build is successful' do
@@ -23,7 +23,7 @@ module SharedBuilds
   end
 
   step 'project has another build that is running' do
-    create(:ci_build, pipeline: @ci_commit, name: 'second build', status: 'running')
+    create(:ci_build, pipeline: @pipeline, name: 'second build', status: 'running')
   end
 
   step 'I visit recent build details page' do
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index ce9ea7ee18a..b3411c03118 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -230,7 +230,7 @@ module SharedProject
 
   step 'project "Shop" has CI build' do
     project = Project.find_by(name: "Shop")
-    create :ci_commit, project: project, sha: project.commit.sha, ref: 'master', status: 'skipped'
+    create :ci_pipeline, project: project, sha: project.commit.sha, ref: 'master', status: 'skipped'
   end
 
   step 'I should see last commit with CI status' do
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 8499bf07e9f..2a9ee881e98 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -250,7 +250,7 @@ describe Projects::MergeRequestsController do
         end
 
         before do
-          create(:ci_empty_commit, project: project, sha: merge_request.source_sha, ref: merge_request.source_branch)
+          create(:ci_empty_pipeline, project: project, sha: merge_request.source_sha, ref: merge_request.source_branch)
         end
 
         it 'returns :merge_when_build_succeeds' do
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 903e331296a..fe05a0cfc00 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -16,7 +16,7 @@ FactoryGirl.define do
       }
     end
 
-    pipeline factory: :ci_commit
+    pipeline factory: :ci_pipeline
 
     trait :success do
       status 'success'
diff --git a/spec/factories/ci/commits.rb b/spec/factories/ci/commits.rb
index d1082f01326..a039bef6f3c 100644
--- a/spec/factories/ci/commits.rb
+++ b/spec/factories/ci/commits.rb
@@ -17,30 +17,30 @@
 #
 
 FactoryGirl.define do
-  factory :ci_empty_commit, class: Ci::Pipeline do
+  factory :ci_empty_pipeline, class: Ci::Pipeline do
     sha '97de212e80737a608d939f648d959671fb0a0142'
 
     project factory: :empty_project
 
-    factory :ci_commit_without_jobs do
+    factory :ci_pipeline_without_jobs do
       after(:build) do |commit|
         allow(commit).to receive(:ci_yaml_file) { YAML.dump({}) }
       end
     end
 
-    factory :ci_commit_with_one_job do
+    factory :ci_pipeline_with_one_job do
       after(:build) do |commit|
         allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" } }) }
       end
     end
 
-    factory :ci_commit_with_two_jobs do
+    factory :ci_pipeline_with_two_job do
       after(:build) do |commit|
         allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" }, spinach: { script: "ls" } }) }
       end
     end
 
-    factory :ci_commit do
+    factory :ci_pipeline do
       after(:build) do |commit|
         allow(commit).to receive(:ci_yaml_file) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) }
       end
diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index 65afcc5e50d..1e5c479616c 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -3,7 +3,7 @@ FactoryGirl.define do
     name 'default'
     status 'success'
     description 'commit status'
-    pipeline factory: :ci_commit_with_one_job
+    pipeline factory: :ci_pipeline_with_one_job
     started_at 'Tue, 26 Jan 2016 08:21:42 +0100'
     finished_at 'Tue, 26 Jan 2016 08:23:42 +0100'
 
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index f5aedcb0545..a6198389f04 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -6,15 +6,15 @@ describe 'Admin Builds' do
   end
 
   describe 'GET /admin/builds' do
-    let(:commit) { create(:ci_commit) }
+    let(:pipeline) { create(:ci_pipeline) }
 
     context 'All tab' do
       context 'when have builds' do
         it 'shows all builds' do
-          create(:ci_build, pipeline: commit, status: :pending)
-          create(:ci_build, pipeline: commit, status: :running)
-          create(:ci_build, pipeline: commit, status: :success)
-          create(:ci_build, pipeline: commit, status: :failed)
+          create(:ci_build, pipeline: pipeline, status: :pending)
+          create(:ci_build, pipeline: pipeline, status: :running)
+          create(:ci_build, pipeline: pipeline, status: :success)
+          create(:ci_build, pipeline: pipeline, status: :failed)
 
           visit admin_builds_path
 
@@ -39,9 +39,9 @@ describe 'Admin Builds' do
     context 'Running tab' do
       context 'when have running builds' do
         it 'shows running builds' do
-          build1 = create(:ci_build, pipeline: commit, status: :pending)
-          build2 = create(:ci_build, pipeline: commit, status: :success)
-          build3 = create(:ci_build, pipeline: commit, status: :failed)
+          build1 = create(:ci_build, pipeline: pipeline, status: :pending)
+          build2 = create(:ci_build, pipeline: pipeline, status: :success)
+          build3 = create(:ci_build, pipeline: pipeline, status: :failed)
 
           visit admin_builds_path(scope: :running)
 
@@ -55,7 +55,7 @@ describe 'Admin Builds' do
 
       context 'when have no builds running' do
         it 'shows a message' do
-          create(:ci_build, pipeline: commit, status: :success)
+          create(:ci_build, pipeline: pipeline, status: :success)
 
           visit admin_builds_path(scope: :running)
 
@@ -69,9 +69,9 @@ describe 'Admin Builds' do
     context 'Finished tab' do
       context 'when have finished builds' do
         it 'shows finished builds' do
-          build1 = create(:ci_build, pipeline: commit, status: :pending)
-          build2 = create(:ci_build, pipeline: commit, status: :running)
-          build3 = create(:ci_build, pipeline: commit, status: :success)
+          build1 = create(:ci_build, pipeline: pipeline, status: :pending)
+          build2 = create(:ci_build, pipeline: pipeline, status: :running)
+          build3 = create(:ci_build, pipeline: pipeline, status: :success)
 
           visit admin_builds_path(scope: :finished)
 
@@ -85,7 +85,7 @@ describe 'Admin Builds' do
 
       context 'when have no builds finished' do
         it 'shows a message' do
-          create(:ci_build, pipeline: commit, status: :running)
+          create(:ci_build, pipeline: pipeline, status: :running)
 
           visit admin_builds_path(scope: :finished)
 
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 2c87a25913b..9499cd4e025 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -8,8 +8,8 @@ describe "Admin Runners" do
   describe "Runners page" do
     before do
       runner = FactoryGirl.create(:ci_runner)
-      commit = FactoryGirl.create(:ci_commit)
-      FactoryGirl.create(:ci_build, pipeline: commit, runner_id: runner.id)
+      pipeline = FactoryGirl.create(:ci_pipeline)
+      FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
       visit admin_runners_path
     end
 
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index c1c21d4b786..19bc0678814 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -5,7 +5,7 @@ describe "Builds" do
 
   before do
     login_as(:user)
-    @commit = FactoryGirl.create :ci_commit
+    @commit = FactoryGirl.create :ci_pipeline
     @build = FactoryGirl.create :ci_build, pipeline: @commit
     @project = @commit.project
     @project.team << [@user, :developer]
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index d8f5a2f804f..45e1a157a1f 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -8,15 +8,15 @@ describe 'Commits' do
   describe 'CI' do
     before do
       login_as :user
-      stub_ci_commit_to_return_yaml_file
+      stub_ci_pipeline_to_return_yaml_file
     end
 
-    let!(:commit) do
-      FactoryGirl.create :ci_commit, project: project, sha: project.commit.sha
+    let!(:pipeline) do
+      FactoryGirl.create :ci_pipeline, project: project, sha: project.commit.sha
     end
 
     context 'commit status is Generic Commit Status' do
-      let!(:status) { FactoryGirl.create :generic_commit_status, pipeline: commit }
+      let!(:status) { FactoryGirl.create :generic_commit_status, pipeline: pipeline }
 
       before do
         project.team << [@user, :reporter]
@@ -24,10 +24,10 @@ describe 'Commits' do
 
       describe 'Commit builds' do
         before do
-          visit ci_status_path(commit)
+          visit ci_status_path(pipeline)
         end
 
-        it { expect(page).to have_content commit.sha[0..7] }
+        it { expect(page).to have_content pipeline.sha[0..7] }
 
         it 'contains generic commit status build' do
           page.within('.table-holder') do
@@ -39,7 +39,7 @@ describe 'Commits' do
     end
 
     context 'commit status is Ci Build' do
-      let!(:build) { FactoryGirl.create :ci_build, pipeline: commit }
+      let!(:build) { FactoryGirl.create :ci_build, pipeline: pipeline }
       let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
 
       context 'when logged as developer' do
@@ -53,7 +53,7 @@ describe 'Commits' do
           end
 
           it 'should show build status' do
-            page.within("//li[@id='commit-#{commit.short_sha}']") do
+            page.within("//li[@id='commit-#{pipeline.short_sha}']") do
               expect(page).to have_css(".ci-status-link")
             end
           end
@@ -61,12 +61,12 @@ describe 'Commits' do
 
         describe 'Commit builds' do
           before do
-            visit ci_status_path(commit)
+            visit ci_status_path(pipeline)
           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 }
+          it { expect(page).to have_content pipeline.sha[0..7] }
+          it { expect(page).to have_content pipeline.git_commit_message }
+          it { expect(page).to have_content pipeline.git_author_name }
         end
 
         context 'Download artifacts' do
@@ -75,7 +75,7 @@ describe 'Commits' do
           end
 
           it do
-            visit ci_status_path(commit)
+            visit ci_status_path(pipeline)
             click_on 'Download artifacts'
             expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
           end
@@ -83,7 +83,7 @@ describe 'Commits' do
 
         describe 'Cancel all builds' do
           it 'cancels commit' do
-            visit ci_status_path(commit)
+            visit ci_status_path(pipeline)
             click_on 'Cancel running'
             expect(page).to have_content 'canceled'
           end
@@ -91,7 +91,7 @@ describe 'Commits' do
 
         describe 'Cancel build' do
           it 'cancels build' do
-            visit ci_status_path(commit)
+            visit ci_status_path(pipeline)
             click_on 'Cancel'
             expect(page).to have_content 'canceled'
           end
@@ -100,13 +100,13 @@ describe 'Commits' do
         describe '.gitlab-ci.yml not found warning' do
           context 'ci builds enabled' do
             it "does not show warning" do
-              visit ci_status_path(commit)
+              visit ci_status_path(pipeline)
               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)
+              stub_ci_pipeline_yaml_file(nil)
+              visit ci_status_path(pipeline)
               expect(page).to have_content '.gitlab-ci.yml not found in this commit'
             end
           end
@@ -114,8 +114,8 @@ describe 'Commits' do
           context 'ci builds disabled' do
             before do
               stub_ci_builds_disabled
-              stub_ci_commit_yaml_file(nil)
-              visit ci_status_path(commit)
+              stub_ci_pipeline_yaml_file(nil)
+              visit ci_status_path(pipeline)
             end
 
             it 'does not show warning' do
@@ -129,13 +129,13 @@ describe 'Commits' do
         before do
           project.team << [@user, :reporter]
           build.update_attributes(artifacts_file: artifacts_file)
-          visit ci_status_path(commit)
+          visit ci_status_path(pipeline)
         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 have_content pipeline.sha[0..7]
+          expect(page).to have_content pipeline.git_commit_message
+          expect(page).to have_content pipeline.git_author_name
           expect(page).to have_link('Download artifacts')
           expect(page).not_to have_link('Cancel running')
           expect(page).not_to have_link('Retry failed')
@@ -148,13 +148,13 @@ describe 'Commits' do
             visibility_level: Gitlab::VisibilityLevel::INTERNAL,
             public_builds: false)
           build.update_attributes(artifacts_file: artifacts_file)
-          visit ci_status_path(commit)
+          visit ci_status_path(pipeline)
         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 have_content pipeline.sha[0..7]
+          expect(page).to have_content pipeline.git_commit_message
+          expect(page).to have_content pipeline.git_author_name
           expect(page).not_to have_link('Download artifacts')
           expect(page).not_to have_link('Cancel running')
           expect(page).not_to have_link('Retry failed')
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index edc0bdec3db..12d7e52629e 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -29,7 +29,7 @@ feature 'Merge request created from fork' do
     include WaitForAjax
 
     given(:pipeline) do
-      create(:ci_commit_with_two_jobs, project: fork_project,
+      create(:ci_pipeline_with_two_job, project: fork_project,
                                        sha: merge_request.last_commit.id,
                                        ref: merge_request.source_branch)
     end
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index eaa3e6b1471..843bd5acedf 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -12,7 +12,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
   end
 
   context "Active build for Merge Request" do
-    let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+    let!(:pipeline) { create(:ci_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
     let!(:ci_build) { create(:ci_build, pipeline: ci_commit) }
 
     before do
@@ -47,8 +47,8 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
                                                   merge_user: user, title: "MepMep", merge_when_build_succeeds: true)
     end
 
-    let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
-    let!(:ci_build) { create(:ci_build, pipeline: ci_commit) }
+    let!(:pipeline) { create(:ci_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+    let!(:ci_build) { create(:ci_build, pipeline: pipeline) }
 
     before do
       login_as user
diff --git a/spec/features/pipelines_spec.rb b/spec/features/pipelines_spec.rb
index 2026cb7cf17..98703ef3ac4 100644
--- a/spec/features/pipelines_spec.rb
+++ b/spec/features/pipelines_spec.rb
@@ -12,7 +12,7 @@ describe "Pipelines" do
   end
 
   describe 'GET /:project/pipelines' do
-    let!(:pipeline) { create(:ci_commit, project: project, ref: 'master', status: 'running') }
+    let!(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', status: 'running') }
 
     [:all, :running, :branches].each do |scope|
       context "displaying #{scope}" do
@@ -111,7 +111,7 @@ describe "Pipelines" do
   end
 
   describe 'GET /:project/pipelines/:id' do
-    let(:pipeline) { create(:ci_commit, project: project, ref: 'master') }
+    let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master') }
 
     before do
       @success = create(:ci_build, :success, pipeline: pipeline, stage: 'build', name: 'build')
@@ -165,7 +165,7 @@ describe "Pipelines" do
       before { fill_in('Create for', with: 'master') }
 
       context 'with gitlab-ci.yml' do
-        before { stub_ci_commit_to_return_yaml_file }
+        before { stub_ci_pipeline_to_return_yaml_file }
 
         it { expect{ click_on 'Create pipeline' }.to change{ Ci::Pipeline.count }.by(1) }
       end
diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index 40ba0bdc115..73dd568929a 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -11,7 +11,7 @@ feature 'project commit builds' do
 
   context 'when no builds triggered yet' do
     background do
-      create(:ci_commit, project: project,
+      create(:ci_pipeline, project: project,
                          sha: project.commit.sha,
                          ref: 'master')
     end
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 4ce367c3c6d..c5f741709ad 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -142,8 +142,8 @@ describe "Public Project Access", feature: true  do
   end
 
   describe "GET /:project_path/builds/:id" do
-    let(:commit) { create(:ci_commit, project: project) }
-    let(:build) { create(:ci_build, pipeline: commit) }
+    let(:pipeline) { create(:ci_pipeline, project: project) }
+    let(:build) { create(:ci_build, pipeline: pipeline) }
     subject { namespace_project_build_path(project.namespace, project, build.id) }
 
     context "when allowed for public" do
diff --git a/spec/lib/ci/charts_spec.rb b/spec/lib/ci/charts_spec.rb
index 2be50edc347..9c6b4ea5086 100644
--- a/spec/lib/ci/charts_spec.rb
+++ b/spec/lib/ci/charts_spec.rb
@@ -4,19 +4,19 @@ describe Ci::Charts, lib: true do
 
   context "build_times" do
     before do
-      @commit = FactoryGirl.create(:ci_commit)
-      FactoryGirl.create(:ci_build, pipeline: @commit)
+      @pipeline = FactoryGirl.create(:ci_pipeline)
+      FactoryGirl.create(:ci_build, pipeline: @pipeline)
     end
 
     it 'should return build times in minutes' do
-      chart = Ci::Charts::BuildTime.new(@commit.project)
+      chart = Ci::Charts::BuildTime.new(@pipeline.project)
       expect(chart.build_times).to eq([2])
     end
 
     it 'should handle nil build times' do
-      create(:ci_commit, duration: nil, project: @commit.project)
+      create(:ci_pipeline, duration: nil, project: @pipeline.project)
 
-      chart = Ci::Charts::BuildTime.new(@commit.project)
+      chart = Ci::Charts::BuildTime.new(@pipeline.project)
       expect(chart.build_times).to eq([2, 0])
     end
   end
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index e87bf41ea25..530c43bfc0d 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -42,9 +42,8 @@ describe Gitlab::Badge::Build do
   end
 
   context 'build exists' do
-    let(:ci_commit) { create(:ci_commit, project: project, sha: sha, ref: branch) }
-    let!(:build) { create(:ci_build, pipeline: ci_commit) }
-
+    let(:pipeline) { create(:ci_pipeline, project: project, sha: sha, ref: branch) }
+    let!(:build) { create(:ci_build, pipeline: pipeline) }
 
     context 'build success' do
       before { build.success! }
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 6c30d85249a..2beb6cc598d 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Ci::Build, models: true do
   let(:project) { create(:project) }
-  let(:commit) { create(:ci_commit, project: project) }
-  let(:build) { create(:ci_build, pipeline: commit) }
+  let(:pipeline) { create(:ci_pipeline, project: project) }
+  let(:build) { create(:ci_build, pipeline: pipeline) }
 
   it { is_expected.to validate_presence_of :ref }
 
   it { is_expected.to respond_to :trace_html }
 
   describe '#first_pending' do
-    let!(:first) { create(:ci_build, pipeline: commit, status: 'pending', created_at: Date.yesterday) }
-    let!(:second) { create(:ci_build, pipeline: commit, status: 'pending') }
+    let!(:first) { create(:ci_build, pipeline: pipeline, status: 'pending', created_at: Date.yesterday) }
+    let!(:second) { create(:ci_build, pipeline: pipeline, status: 'pending') }
     subject { Ci::Build.first_pending }
 
     it { is_expected.to be_a(Ci::Build) }
@@ -97,7 +97,7 @@ describe Ci::Build, models: true do
   # describe :timeout do
   #   subject { build.timeout }
   #
-  #   it { is_expected.to eq(commit.project.timeout) }
+  #   it { is_expected.to eq(pipeline.project.timeout) }
   # end
 
   describe '#options' do
@@ -124,13 +124,13 @@ describe Ci::Build, models: true do
   describe '#project' do
     subject { build.project }
 
-    it { is_expected.to eq(commit.project) }
+    it { is_expected.to eq(pipeline.project) }
   end
 
   describe '#project_id' do
     subject { build.project_id }
 
-    it { is_expected.to eq(commit.project_id) }
+    it { is_expected.to eq(pipeline.project_id) }
   end
 
   describe '#project_name' do
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
 
         context 'and trigger variables' do
           let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
@@ -428,10 +428,10 @@ describe Ci::Build, models: true do
   end
 
   describe '#depends_on_builds' do
-    let!(:build) { create(:ci_build, pipeline: commit, name: 'build', stage_idx: 0, stage: 'build') }
-    let!(:rspec_test) { create(:ci_build, pipeline: commit, name: 'rspec', stage_idx: 1, stage: 'test') }
-    let!(:rubocop_test) { create(:ci_build, pipeline: commit, name: 'rubocop', stage_idx: 1, stage: 'test') }
-    let!(:staging) { create(:ci_build, pipeline: commit, name: 'staging', stage_idx: 2, stage: 'deploy') }
+    let!(:build) { create(:ci_build, pipeline: pipeline, name: 'build', stage_idx: 0, stage: 'build') }
+    let!(:rspec_test) { create(:ci_build, pipeline: pipeline, name: 'rspec', stage_idx: 1, stage: 'test') }
+    let!(:rubocop_test) { create(:ci_build, pipeline: pipeline, name: 'rubocop', stage_idx: 1, stage: 'test') }
+    let!(:staging) { create(:ci_build, pipeline: pipeline, name: 'staging', stage_idx: 2, stage: 'deploy') }
 
     it 'to have no dependents if this is first build' do
       expect(build.depends_on_builds).to be_empty
@@ -451,19 +451,19 @@ describe Ci::Build, models: true do
     end
   end
 
-  def create_mr(build, commit, factory: :merge_request, created_at: Time.now)
-    create(factory, source_project_id: commit.gl_project_id,
-                    target_project_id: commit.gl_project_id,
+  def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
+    create(factory, source_project_id: pipeline.gl_project_id,
+                    target_project_id: pipeline.gl_project_id,
                     source_branch: build.ref,
                     created_at: created_at)
   end
 
   describe '#merge_request' do
-    context 'when a MR has a reference to the commit' do
+    context 'when a MR has a reference to the pipeline' do
       before do
-        @merge_request = create_mr(build, commit, factory: :merge_request)
+        @merge_request = create_mr(build, pipeline, factory: :merge_request)
 
-        commits = [double(id: commit.sha)]
+        commits = [double(id: pipeline.sha)]
         allow(@merge_request).to receive(:commits).and_return(commits)
         allow(MergeRequest).to receive_message_chain(:includes, :where, :reorder).and_return([@merge_request])
       end
@@ -473,19 +473,19 @@ describe Ci::Build, models: true do
       end
     end
 
-    context 'when there is not a MR referencing the commit' do
+    context 'when there is not a MR referencing the pipeline' do
       it 'returns nil' do
         expect(build.merge_request).to be_nil
       end
     end
 
-    context 'when more than one MR have a reference to the commit' do
+    context 'when more than one MR have a reference to the pipeline' do
       before do
-        @merge_request = create_mr(build, commit, factory: :merge_request)
+        @merge_request = create_mr(build, pipeline, factory: :merge_request)
         @merge_request.close!
-        @merge_request2 = create_mr(build, commit, factory: :merge_request)
+        @merge_request2 = create_mr(build, pipeline, factory: :merge_request)
 
-        commits = [double(id: commit.sha)]
+        commits = [double(id: pipeline.sha)]
         allow(@merge_request).to receive(:commits).and_return(commits)
         allow(@merge_request2).to receive(:commits).and_return(commits)
         allow(MergeRequest).to receive_message_chain(:includes, :where, :reorder).and_return([@merge_request, @merge_request2])
@@ -498,11 +498,11 @@ describe Ci::Build, models: true do
 
     context 'when a Build is created after the MR' do
       before do
-        @merge_request = create_mr(build, commit, factory: :merge_request_with_diffs)
-        commit2 = create(:ci_commit, project: project)
-        @build2 = create(:ci_build, pipeline: commit2)
+        @merge_request = create_mr(build, pipeline, factory: :merge_request_with_diffs)
+        pipeline2 = create(:ci_pipeline, project: project)
+        @build2 = create(:ci_build, pipeline: pipeline2)
 
-        commits = [double(id: commit.sha), double(id: commit2.sha)]
+        commits = [double(id: pipeline.sha), double(id: pipeline2.sha)]
         allow(@merge_request).to receive(:commits).and_return(commits)
         allow(MergeRequest).to receive_message_chain(:includes, :where, :reorder).and_return([@merge_request])
       end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 2f8b1d790a7..0d769ed7324 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Ci::Pipeline, models: true do
   let(:project) { FactoryGirl.create :empty_project }
-  let(:commit) { FactoryGirl.create :ci_commit, project: project }
+  let(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
 
   it { is_expected.to belong_to(:project) }
   it { is_expected.to have_many(:statuses) }
@@ -18,62 +18,62 @@ describe Ci::Pipeline, models: true do
   describe :valid_commit_sha do
     context 'commit.sha can not start with 00000000' do
       before do
-        commit.sha = '0' * 40
-        commit.valid_commit_sha
+        pipeline.sha = '0' * 40
+        pipeline.valid_commit_sha
       end
 
-      it('commit errors should not be empty') { expect(commit.errors).not_to be_empty }
+      it('commit errors should not be empty') { expect(pipeline.errors).not_to be_empty }
     end
   end
 
   describe :short_sha do
-    subject { commit.short_sha }
+    subject { pipeline.short_sha }
 
     it 'has 8 items' do
       expect(subject.size).to eq(8)
     end
-    it { expect(commit.sha).to start_with(subject) }
+    it { expect(pipeline.sha).to start_with(subject) }
   end
 
   describe :create_next_builds do
   end
 
   describe :retried do
-    subject { commit.retried }
+    subject { pipeline.retried }
 
     before do
-      @commit1 = FactoryGirl.create :ci_build, pipeline: commit, name: 'deploy'
-      @commit2 = FactoryGirl.create :ci_build, pipeline: commit, name: 'deploy'
+      @build1 = FactoryGirl.create :ci_build, pipeline: pipeline, name: 'deploy'
+      @build2 = FactoryGirl.create :ci_build, pipeline: pipeline, name: 'deploy'
     end
 
     it 'returns old builds' do
-      is_expected.to contain_exactly(@commit1)
+      is_expected.to contain_exactly(@build1)
     end
   end
 
   describe :create_builds do
-    let!(:commit) { FactoryGirl.create :ci_commit, project: project, ref: 'master', tag: false }
+    let!(:pipeline) { FactoryGirl.create :ci_pipeline, project: project, ref: 'master', tag: false }
 
     def create_builds(trigger_request = nil)
-      commit.create_builds(nil, trigger_request)
+      pipeline.create_builds(nil, trigger_request)
     end
 
     def create_next_builds
-      commit.create_next_builds(commit.builds.order(:id).last)
+      pipeline.create_next_builds(pipeline.builds.order(:id).last)
     end
 
     it 'creates builds' do
       expect(create_builds).to be_truthy
-      commit.builds.update_all(status: "success")
-      expect(commit.builds.count(:all)).to eq(2)
+      pipeline.builds.update_all(status: "success")
+      expect(pipeline.builds.count(:all)).to eq(2)
 
       expect(create_next_builds).to be_truthy
-      commit.builds.update_all(status: "success")
-      expect(commit.builds.count(:all)).to eq(4)
+      pipeline.builds.update_all(status: "success")
+      expect(pipeline.builds.count(:all)).to eq(4)
 
       expect(create_next_builds).to be_truthy
-      commit.builds.update_all(status: "success")
-      expect(commit.builds.count(:all)).to eq(5)
+      pipeline.builds.update_all(status: "success")
+      expect(pipeline.builds.count(:all)).to eq(5)
 
       expect(create_next_builds).to be_falsey
     end
@@ -95,14 +95,14 @@ describe Ci::Pipeline, models: true do
       end
 
       before do
-        stub_ci_commit_yaml_file(YAML.dump(yaml))
+        stub_ci_pipeline_yaml_file(YAML.dump(yaml))
         create_builds
       end
 
       it 'properly schedules builds' do
-        expect(commit.builds.pluck(:status)).to contain_exactly('pending')
-        commit.builds.running_or_pending.each(&:drop)
-        expect(commit.builds.pluck(:status)).to contain_exactly('pending', 'failed')
+        expect(pipeline.builds.pluck(:status)).to contain_exactly('pending')
+        pipeline.builds.running_or_pending.each(&:drop)
+        expect(pipeline.builds.pluck(:status)).to contain_exactly('pending', 'failed')
       end
     end
 
@@ -136,183 +136,183 @@ describe Ci::Pipeline, models: true do
       end
 
       before do
-        stub_ci_commit_yaml_file(YAML.dump(yaml))
+        stub_ci_pipeline_yaml_file(YAML.dump(yaml))
       end
 
       context 'when builds are successful' do
         it 'properly creates builds' do
           expect(create_builds).to be_truthy
-          expect(commit.builds.pluck(:name)).to contain_exactly('build')
-          expect(commit.builds.pluck(:status)).to contain_exactly('pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'success', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy', 'cleanup')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'success', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy', 'cleanup')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'success', 'success', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'success', 'success')
-          commit.reload
-          expect(commit.status).to eq('success')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'success', 'success', 'success')
+          pipeline.reload
+          expect(pipeline.status).to eq('success')
         end
       end
 
       context 'when test job fails' do
         it 'properly creates builds' do
           expect(create_builds).to be_truthy
-          expect(commit.builds.pluck(:name)).to contain_exactly('build')
-          expect(commit.builds.pluck(:status)).to contain_exactly('pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'pending')
-          commit.builds.running_or_pending.each(&:drop)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'pending')
+          pipeline.builds.running_or_pending.each(&:drop)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'failed', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'success', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'failed', 'success', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'success', 'success')
-          commit.reload
-          expect(commit.status).to eq('failed')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'failed', 'success', 'success')
+          pipeline.reload
+          expect(pipeline.status).to eq('failed')
         end
       end
 
       context 'when test and test_failure jobs fail' do
         it 'properly creates builds' do
           expect(create_builds).to be_truthy
-          expect(commit.builds.pluck(:name)).to contain_exactly('build')
-          expect(commit.builds.pluck(:status)).to contain_exactly('pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'pending')
-          commit.builds.running_or_pending.each(&:drop)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'pending')
+          pipeline.builds.running_or_pending.each(&:drop)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'pending')
-          commit.builds.running_or_pending.each(&:drop)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'failed', 'pending')
+          pipeline.builds.running_or_pending.each(&:drop)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'failed', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'failed', 'failed', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'failed', 'failed', 'success')
-          commit.reload
-          expect(commit.status).to eq('failed')
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'test_failure', 'cleanup')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'failed', 'failed', 'success')
+          pipeline.reload
+          expect(pipeline.status).to eq('failed')
         end
       end
 
       context 'when deploy job fails' do
         it 'properly creates builds' do
           expect(create_builds).to be_truthy
-          expect(commit.builds.pluck(:name)).to contain_exactly('build')
-          expect(commit.builds.pluck(:status)).to contain_exactly('pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'pending')
-          commit.builds.running_or_pending.each(&:drop)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'success', 'pending')
+          pipeline.builds.running_or_pending.each(&:drop)
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy', 'cleanup')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'failed', 'pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test', 'deploy', 'cleanup')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'success', 'failed', 'pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'success', 'failed', 'success')
-          commit.reload
-          expect(commit.status).to eq('failed')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'success', 'failed', 'success')
+          pipeline.reload
+          expect(pipeline.status).to eq('failed')
         end
       end
 
       context 'when build is canceled in the second stage' do
         it 'does not schedule builds after build has been canceled' do
           expect(create_builds).to be_truthy
-          expect(commit.builds.pluck(:name)).to contain_exactly('build')
-          expect(commit.builds.pluck(:status)).to contain_exactly('pending')
-          commit.builds.running_or_pending.each(&:success)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('pending')
+          pipeline.builds.running_or_pending.each(&:success)
 
-          expect(commit.builds.running_or_pending).not_to be_empty
+          expect(pipeline.builds.running_or_pending).not_to be_empty
 
-          expect(commit.builds.pluck(:name)).to contain_exactly('build', 'test')
-          expect(commit.builds.pluck(:status)).to contain_exactly('success', 'pending')
-          commit.builds.running_or_pending.each(&:cancel)
+          expect(pipeline.builds.pluck(:name)).to contain_exactly('build', 'test')
+          expect(pipeline.builds.pluck(:status)).to contain_exactly('success', 'pending')
+          pipeline.builds.running_or_pending.each(&:cancel)
 
-          expect(commit.builds.running_or_pending).to be_empty
-          expect(commit.reload.status).to eq('canceled')
+          expect(pipeline.builds.running_or_pending).to be_empty
+          expect(pipeline.reload.status).to eq('canceled')
         end
       end
     end
   end
 
   describe "#finished_at" do
-    let(:commit) { FactoryGirl.create :ci_commit }
+    let(:pipeline) { FactoryGirl.create :ci_pipeline }
 
     it "returns finished_at of latest build" do
-      build = FactoryGirl.create :ci_build, pipeline: commit, finished_at: Time.now - 60
-      FactoryGirl.create :ci_build, pipeline: commit, finished_at: Time.now - 120
+      build = FactoryGirl.create :ci_build, pipeline: pipeline, finished_at: Time.now - 60
+      FactoryGirl.create :ci_build, pipeline: pipeline, finished_at: Time.now - 120
 
-      expect(commit.finished_at.to_i).to eq(build.finished_at.to_i)
+      expect(pipeline.finished_at.to_i).to eq(build.finished_at.to_i)
     end
 
     it "returns nil if there is no finished build" do
-      FactoryGirl.create :ci_not_started_build, pipeline: commit
+      FactoryGirl.create :ci_not_started_build, pipeline: pipeline
 
-      expect(commit.finished_at).to be_nil
+      expect(pipeline.finished_at).to be_nil
     end
   end
 
   describe "coverage" do
     let(:project) { FactoryGirl.create :empty_project, build_coverage_regex: "/.*/" }
-    let(:commit) { FactoryGirl.create :ci_commit, project: project }
+    let(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
 
     it "calculates average when there are two builds with coverage" do
-      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: commit
-      expect(commit.coverage).to eq("35.00")
+      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: pipeline
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: pipeline
+      expect(pipeline.coverage).to eq("35.00")
     end
 
     it "calculates average when there are two builds with coverage and one with nil" do
-      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: commit
-      FactoryGirl.create :ci_build, pipeline: commit
-      expect(commit.coverage).to eq("35.00")
+      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: pipeline
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: pipeline
+      FactoryGirl.create :ci_build, pipeline: pipeline
+      expect(pipeline.coverage).to eq("35.00")
     end
 
     it "calculates average when there are two builds with coverage and one is retried" do
-      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 30, pipeline: commit
-      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: commit
-      expect(commit.coverage).to eq("35.00")
+      FactoryGirl.create :ci_build, name: "rspec", coverage: 30, pipeline: pipeline
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 30, pipeline: pipeline
+      FactoryGirl.create :ci_build, name: "rubocop", coverage: 40, pipeline: pipeline
+      expect(pipeline.coverage).to eq("35.00")
     end
 
     it "calculates average when there is one build without coverage" do
-      FactoryGirl.create :ci_build, pipeline: commit
-      expect(commit.coverage).to be_nil
+      FactoryGirl.create :ci_build, pipeline: pipeline
+      expect(pipeline.coverage).to be_nil
     end
   end
 
   describe '#retryable?' do
-    subject { commit.retryable? }
+    subject { pipeline.retryable? }
 
     context 'no failed builds' do
       before do
-        FactoryGirl.create :ci_build, name: "rspec", pipeline: commit, status: 'success'
+        FactoryGirl.create :ci_build, name: "rspec", pipeline: pipeline, status: 'success'
       end
 
       it 'be not retryable' do
@@ -322,8 +322,8 @@ describe Ci::Pipeline, models: true do
 
     context 'with failed builds' do
       before do
-        FactoryGirl.create :ci_build, name: "rspec", pipeline: commit, status: 'running'
-        FactoryGirl.create :ci_build, name: "rubocop", pipeline: commit, status: 'failed'
+        FactoryGirl.create :ci_build, name: "rspec", pipeline: pipeline, status: 'running'
+        FactoryGirl.create :ci_build, name: "rubocop", pipeline: pipeline, status: 'failed'
       end
 
       it 'be retryable' do
@@ -333,12 +333,12 @@ describe Ci::Pipeline, models: true do
   end
 
   describe '#stages' do
-    let(:commit2) { FactoryGirl.create :ci_commit, project: project }
-    subject { CommitStatus.where(pipeline: [commit, commit2]).stages }
+    let(:pipeline2) { FactoryGirl.create :ci_pipeline, project: project }
+    subject { CommitStatus.where(pipeline: [pipeline, pipeline2]).stages }
 
     before do
-      FactoryGirl.create :ci_build, pipeline: commit2, stage: 'test', stage_idx: 1
-      FactoryGirl.create :ci_build, pipeline: commit, stage: 'build', stage_idx: 0
+      FactoryGirl.create :ci_build, pipeline: pipeline2, stage: 'test', stage_idx: 1
+      FactoryGirl.create :ci_build, pipeline: pipeline, stage: 'build', stage_idx: 0
     end
 
     it 'return all stages' do
@@ -348,22 +348,22 @@ describe Ci::Pipeline, models: true do
 
   describe '#update_state' do
     it 'execute update_state after touching object' do
-      expect(commit).to receive(:update_state).and_return(true)
-      commit.touch
+      expect(pipeline).to receive(:update_state).and_return(true)
+      pipeline.touch
     end
 
     context 'dependent objects' do
-      let(:commit_status) { build :commit_status, pipeline: commit }
+      let(:commit_status) { build :commit_status, pipeline: pipeline }
 
       it 'execute update_state after saving dependent object' do
-        expect(commit).to receive(:update_state).and_return(true)
+        expect(pipeline).to receive(:update_state).and_return(true)
         commit_status.save
       end
     end
 
     context 'update state' do
       let(:current) { Time.now.change(usec: 0) }
-      let(:build) { FactoryGirl.create :ci_build, :success, pipeline: commit, started_at: current - 120, finished_at: current - 60 }
+      let(:build) { FactoryGirl.create :ci_build, :success, pipeline: pipeline, started_at: current - 120, finished_at: current - 60 }
 
       before do
         build
@@ -371,18 +371,18 @@ describe Ci::Pipeline, models: true do
 
       [:status, :started_at, :finished_at, :duration].each do |param|
         it "update #{param}" do
-          expect(commit.send(param)).to eq(build.send(param))
+          expect(pipeline.send(param)).to eq(build.send(param))
         end
       end
     end
   end
 
   describe '#branch?' do
-    subject { commit.branch? }
+    subject { pipeline.branch? }
 
     context 'is not a tag' do
       before do
-        commit.tag = false
+        pipeline.tag = false
       end
 
       it 'return true when tag is set to false' do
@@ -392,7 +392,7 @@ describe Ci::Pipeline, models: true do
 
     context 'is not a tag' do
       before do
-        commit.tag = true
+        pipeline.tag = true
       end
 
       it 'return false when tag is set to true' do
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index ca630e5bc9c..8fb605fff8a 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe CommitStatus, models: true do
-  let(:commit) { FactoryGirl.create :ci_commit }
-  let(:commit_status) { FactoryGirl.create :commit_status, pipeline: commit }
+  let(:pipeline) { FactoryGirl.create :ci_pipeline }
+  let(:commit_status) { FactoryGirl.create :commit_status, pipeline: pipeline }
 
   it { is_expected.to belong_to(:pipeline) }
   it { is_expected.to belong_to(:user) }
@@ -121,11 +121,11 @@ describe CommitStatus, models: true do
     subject { CommitStatus.latest.order(:id) }
 
     before do
-      @commit1 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'bb', status: 'running'
-      @commit2 = FactoryGirl.create :commit_status, pipeline: commit, name: 'cc', ref: 'cc', status: 'pending'
-      @commit3 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'cc', status: 'success'
-      @commit4 = FactoryGirl.create :commit_status, pipeline: commit, name: 'cc', ref: 'bb', status: 'success'
-      @commit5 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'bb', status: 'success'
+      @commit1 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'aa', ref: 'bb', status: 'running'
+      @commit2 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'cc', ref: 'cc', status: 'pending'
+      @commit3 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'aa', ref: 'cc', status: 'success'
+      @commit4 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'cc', ref: 'bb', status: 'success'
+      @commit5 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'aa', ref: 'bb', status: 'success'
     end
 
     it 'return unique statuses' do
@@ -137,11 +137,11 @@ describe CommitStatus, models: true do
     subject { CommitStatus.running_or_pending.order(:id) }
 
     before do
-      @commit1 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: 'bb', status: 'running'
-      @commit2 = FactoryGirl.create :commit_status, pipeline: commit, name: 'cc', ref: 'cc', status: 'pending'
-      @commit3 = FactoryGirl.create :commit_status, pipeline: commit, name: 'aa', ref: nil, status: 'success'
-      @commit4 = FactoryGirl.create :commit_status, pipeline: commit, name: 'dd', ref: nil, status: 'failed'
-      @commit5 = FactoryGirl.create :commit_status, pipeline: commit, name: 'ee', ref: nil, status: 'canceled'
+      @commit1 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'aa', ref: 'bb', status: 'running'
+      @commit2 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'cc', ref: 'cc', status: 'pending'
+      @commit3 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'aa', ref: nil, status: 'success'
+      @commit4 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'dd', ref: nil, status: 'failed'
+      @commit5 = FactoryGirl.create :commit_status, pipeline: pipeline, name: 'ee', ref: nil, status: 'canceled'
     end
 
     it 'return statuses that are running or pending' do
@@ -152,17 +152,17 @@ describe CommitStatus, models: true do
   describe '#before_sha' do
     subject { commit_status.before_sha }
 
-    context 'when no before_sha is set for ci::commit' do
-      before { commit.before_sha = nil }
+    context 'when no before_sha is set for pipeline' do
+      before { pipeline.before_sha = nil }
 
       it 'return blank sha' do
         is_expected.to eq(Gitlab::Git::BLANK_SHA)
       end
     end
 
-    context 'for before_sha set for ci::commit' do
+    context 'for before_sha set for pipeline' do
       let(:value) { '1234' }
-      before { commit.before_sha = value }
+      before { pipeline.before_sha = value }
 
       it 'return the set value' do
         is_expected.to eq(value)
@@ -172,14 +172,14 @@ describe CommitStatus, models: true do
 
   describe '#stages' do
     before do
-      FactoryGirl.create :commit_status, pipeline: commit, stage: 'build', stage_idx: 0, status: 'success'
-      FactoryGirl.create :commit_status, pipeline: commit, stage: 'build', stage_idx: 0, status: 'failed'
-      FactoryGirl.create :commit_status, pipeline: commit, stage: 'deploy', stage_idx: 2, status: 'running'
-      FactoryGirl.create :commit_status, pipeline: commit, stage: 'test', stage_idx: 1, status: 'success'
+      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'build', stage_idx: 0, status: 'success'
+      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'build', stage_idx: 0, status: 'failed'
+      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'deploy', stage_idx: 2, status: 'running'
+      FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'test', stage_idx: 1, status: 'success'
     end
 
     context 'stages list' do
-      subject { CommitStatus.where(pipeline: commit).stages }
+      subject { CommitStatus.where(pipeline: pipeline).stages }
 
       it 'return ordered list of stages' do
         is_expected.to eq(%w(build test deploy))
@@ -187,7 +187,7 @@ describe CommitStatus, models: true do
     end
 
     context 'stages with statuses' do
-      subject { CommitStatus.where(pipeline: commit).stages_status }
+      subject { CommitStatus.where(pipeline: pipeline).stages_status }
 
       it 'return list of stages with statuses' do
         is_expected.to eq({
diff --git a/spec/models/generic_commit_status_spec.rb b/spec/models/generic_commit_status_spec.rb
index d2cd37c9b4f..c4e781dd1dc 100644
--- a/spec/models/generic_commit_status_spec.rb
+++ b/spec/models/generic_commit_status_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe GenericCommitStatus, models: true do
-  let(:commit) { FactoryGirl.create :ci_commit }
-  let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, pipeline: commit }
+  let(:pipeline) { FactoryGirl.create :ci_pipeline }
+  let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, pipeline: pipeline }
 
   describe :context do
     subject { generic_commit_status.context }
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 21d7a8d8364..1b7cbc3efda 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -394,7 +394,7 @@ describe MergeRequest, models: true do
     describe 'when the source project exists' do
       it 'returns the latest commit' do
         commit   = double(:commit, id: '123abc')
-        pipeline = double(:ci_commit, ref: 'master')
+        pipeline = double(:ci_pipeline, ref: 'master')
 
         allow(subject).to receive(:last_commit).and_return(commit)
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 1135d7b6099..89f66092b15 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -399,23 +399,23 @@ describe Project, models: true do
     end
   end
 
-  describe :ci_commit do
+  describe :pipeline do
     let(:project) { create :project }
-    let(:commit) { create :ci_commit, project: project, ref: 'master' }
+    let(:pipeline) { create :pipeline, project: project, ref: 'master' }
 
-    subject { project.pipeline(commit.sha, 'master') }
+    subject { project.pipeline(pipeline.sha, 'master') }
 
-    it { is_expected.to eq(commit) }
+    it { is_expected.to eq(pipeline) }
 
     context 'return latest' do
-      let(:commit2) { create :ci_commit, project: project, ref: 'master' }
+      let(:pipeline2) { create :pipeline, project: project, ref: 'master' }
 
       before do
-        commit
-        commit2
+        pipeline
+        pipeline2
       end
 
-      it { is_expected.to eq(commit2) }
+      it { is_expected.to eq(pipeline2) }
     end
   end
 
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 534b82dc34f..6cb7be188ef 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -9,8 +9,8 @@ describe API::API, api: true  do
   let!(:project) { create(:project, creator_id: user.id) }
   let!(:developer) { create(:project_member, :developer, user: user, project: project) }
   let!(:reporter) { create(:project_member, :reporter, user: user2, project: project) }
-  let(:commit) { create(:ci_commit, project: project)}
-  let(:build) { create(:ci_build, pipeline: commit) }
+  let(:pipeline) { create(:ci_pipeline, project: project)}
+  let(:build) { create(:ci_build, pipeline: pipeline) }
 
   describe 'GET /projects/:id/builds ' do
     let(:query) { '' }
@@ -59,8 +59,8 @@ describe API::API, api: true  do
 
   describe 'GET /projects/:id/repository/commits/:sha/builds' do
     before do
-      project.ensure_pipeline(commit.sha, 'master')
-      get api("/projects/#{project.id}/repository/commits/#{commit.sha}/builds", api_user)
+      project.ensure_pipeline(pipeline.sha, 'master')
+      get api("/projects/#{project.id}/repository/commits/#{pipeline.sha}/builds", api_user)
     end
 
     context 'authorized user' do
@@ -102,7 +102,7 @@ describe API::API, api: true  do
     before { get api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user) }
 
     context 'build with artifacts' do
-      let(:build) { create(:ci_build, :artifacts, pipeline: commit) }
+      let(:build) { create(:ci_build, :artifacts, pipeline: pipeline) }
 
       context 'authorized user' do
         let(:download_headers) do
@@ -131,7 +131,7 @@ describe API::API, api: true  do
   end
 
   describe 'GET /projects/:id/builds/:build_id/trace' do
-    let(:build) { create(:ci_build, :trace, pipeline: commit) }
+    let(:build) { create(:ci_build, :trace, pipeline: pipeline) }
     
     before { get api("/projects/#{project.id}/builds/#{build.id}/trace", api_user) }
 
@@ -181,7 +181,7 @@ describe API::API, api: true  do
   end
 
   describe 'POST /projects/:id/builds/:build_id/retry' do
-    let(:build) { create(:ci_build, :canceled, pipeline: commit) }
+    let(:build) { create(:ci_build, :canceled, pipeline: pipeline) }
 
     before { post api("/projects/#{project.id}/builds/#{build.id}/retry", api_user) }
 
@@ -218,7 +218,7 @@ describe API::API, api: true  do
     end
 
     context 'build is erasable' do
-      let(:build) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: commit) }
+      let(:build) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: pipeline) }
 
       it 'should erase build content' do
         expect(response.status).to eq 201
@@ -234,7 +234,7 @@ describe API::API, api: true  do
     end
 
     context 'build is not erasable' do
-      let(:build) { create(:ci_build, :trace, project: project, pipeline: commit) }
+      let(:build) { create(:ci_build, :trace, project: project, pipeline: pipeline) }
 
       it 'should respond with forbidden' do
         expect(response.status).to eq 403
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 04cf15641d0..33fbdde768f 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -388,7 +388,7 @@ describe API::API, api: true  do
   end
 
   describe "PUT /projects/:id/merge_requests/:merge_request_id/merge" do
-    let(:pipeline) { create(:ci_commit_without_jobs) }
+    let(:pipeline) { create(:ci_pipeline_without_jobs) }
 
     it "should return merge_request in case of success" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
@@ -443,7 +443,7 @@ describe API::API, api: true  do
 
     it "enables merge when build succeeds if the ci is active" do
       allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
-      allow(ci_commit).to receive(:active?).and_return(true)
+      allow(pipeline).to receive(:active?).and_return(true)
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
 
diff --git a/spec/requests/api/triggers_spec.rb b/spec/requests/api/triggers_spec.rb
index 1a0da8d6baa..fdd4ec6d761 100644
--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
@@ -23,7 +23,7 @@ describe API::API do
     end
 
     before do
-      stub_ci_commit_to_return_yaml_file
+      stub_ci_pipeline_to_return_yaml_file
     end
 
     context 'Handles errors' do
@@ -44,13 +44,13 @@ describe API::API do
     end
 
     context 'Have a commit' do
-      let(:commit) { project.pipelines.last }
+      let(:pipeline) { project.pipelines.last }
 
       it 'should create builds' do
         post api("/projects/#{project.id}/trigger/builds"), options.merge(ref: 'master')
         expect(response.status).to eq(201)
-        commit.builds.reload
-        expect(commit.builds.size).to eq(2)
+        pipeline.builds.reload
+        expect(pipeline.builds.size).to eq(2)
       end
 
       it 'should return bad request with no builds created if there\'s no commit for that ref' do
@@ -79,8 +79,8 @@ describe API::API do
         it 'create trigger request with variables' do
           post api("/projects/#{project.id}/trigger/builds"), options.merge(variables: variables, ref: 'master')
           expect(response.status).to eq(201)
-          commit.builds.reload
-          expect(commit.builds.first.trigger_request.variables).to eq(variables)
+          pipeline.builds.reload
+          expect(pipeline.builds.first.trigger_request.variables).to eq(variables)
         end
       end
     end
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 10e3631f5fc..e8508f8f950 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -7,7 +7,7 @@ describe Ci::API::API do
   let(:project) { FactoryGirl.create(:empty_project) }
 
   before do
-    stub_ci_commit_to_return_yaml_file
+    stub_ci_pipeline_to_return_yaml_file
   end
 
   describe "Builds API for runners" do
@@ -20,9 +20,9 @@ describe Ci::API::API do
 
     describe "POST /builds/register" do
       it "should start a build" do
-        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
-        commit.create_builds(nil)
-        build = commit.builds.first
+        pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master')
+        pipeline.create_builds(nil)
+        build = pipeline.builds.first
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
 
@@ -38,8 +38,8 @@ describe Ci::API::API do
       end
 
       it "should return 404 error if no builds for specific runner" do
-        commit = FactoryGirl.create(:ci_commit, project: shared_project)
-        FactoryGirl.create(:ci_build, pipeline: commit, status: 'pending')
+        pipeline = FactoryGirl.create(:ci_pipeline, project: shared_project)
+        FactoryGirl.create(:ci_build, pipeline: pipeline, status: 'pending')
 
         post ci_api("/builds/register"), token: runner.token
 
@@ -47,8 +47,8 @@ describe Ci::API::API do
       end
 
       it "should return 404 error if no builds for shared runner" do
-        commit = FactoryGirl.create(:ci_commit, project: project)
-        FactoryGirl.create(:ci_build, pipeline: commit, status: 'pending')
+        pipeline = FactoryGirl.create(:ci_pipeline, project: project)
+        FactoryGirl.create(:ci_build, pipeline: pipeline, status: 'pending')
 
         post ci_api("/builds/register"), token: shared_runner.token
 
@@ -56,8 +56,8 @@ describe Ci::API::API do
       end
 
       it "returns options" do
-        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
-        commit.create_builds(nil)
+        pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master')
+        pipeline.create_builds(nil)
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
 
@@ -66,8 +66,8 @@ describe Ci::API::API do
       end
 
       it "returns variables" do
-        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
-        commit.create_builds(nil)
+        pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master')
+        pipeline.create_builds(nil)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -83,10 +83,10 @@ describe Ci::API::API do
 
       it "returns variables for triggers" do
         trigger = FactoryGirl.create(:ci_trigger, project: project)
-        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
+        pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master')
 
-        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: commit, trigger: trigger)
-        commit.create_builds(nil, trigger_request)
+        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger)
+        pipeline.create_builds(nil, trigger_request)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -103,9 +103,9 @@ describe Ci::API::API do
       end
 
       it "returns dependent builds" do
-        commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
-        commit.create_builds(nil, nil)
-        commit.builds.where(stage: 'test').each(&:success)
+        pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master')
+        pipeline.create_builds(nil, nil)
+        pipeline.builds.where(stage: 'test').each(&:success)
 
         post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
 
@@ -131,8 +131,8 @@ describe Ci::API::API do
 
       context 'when build has no tags' do
         before do
-          commit = create(:ci_commit, project: project)
-          create(:ci_build, pipeline: commit, tags: [])
+          pipeline = create(:ci_pipeline, project: project)
+          create(:ci_build, pipeline: pipeline, tags: [])
         end
 
         context 'when runner is allowed to pick untagged builds' do
@@ -163,8 +163,8 @@ describe Ci::API::API do
     end
 
     describe "PUT /builds/:id" do
-      let(:commit) {create(:ci_commit, project: project)}
-      let(:build) { create(:ci_build, :trace, pipeline: commit, runner_id: runner.id) }
+      let(:pipeline) {create(:ci_pipeline, project: project)}
+      let(:build) { create(:ci_build, :trace, pipeline: pipeline, runner_id: runner.id) }
 
       before do
         build.run!
@@ -237,8 +237,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) { create(:ci_commit, project: project) }
-      let(:build) { create(:ci_build, pipeline: commit, runner_id: runner.id) }
+      let(:pipeline) { create(:ci_pipeline, project: project) }
+      let(:build) { create(:ci_build, pipeline: pipeline, 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") }
diff --git a/spec/requests/ci/api/triggers_spec.rb b/spec/requests/ci/api/triggers_spec.rb
index 441f8d613e2..72f6a3c981d 100644
--- a/spec/requests/ci/api/triggers_spec.rb
+++ b/spec/requests/ci/api/triggers_spec.rb
@@ -15,7 +15,7 @@ describe Ci::API::API do
     end
 
     before do
-      stub_ci_commit_to_return_yaml_file
+      stub_ci_pipeline_to_return_yaml_file
     end
 
     context 'Handles errors' do
@@ -36,13 +36,13 @@ describe Ci::API::API do
     end
 
     context 'Have a commit' do
-      let(:commit) { project.pipelines.last }
+      let(:pipeline) { project.pipelines.last }
 
       it 'should create builds' do
         post ci_api("/projects/#{project.ci_id}/refs/master/trigger"), options
         expect(response.status).to eq(201)
-        commit.builds.reload
-        expect(commit.builds.size).to eq(2)
+        pipeline.builds.reload
+        expect(pipeline.builds.size).to eq(2)
       end
 
       it 'should return bad request with no builds created if there\'s no commit for that ref' do
@@ -71,8 +71,8 @@ describe Ci::API::API do
         it 'create trigger request with variables' do
           post ci_api("/projects/#{project.ci_id}/refs/master/trigger"), options.merge(variables: variables)
           expect(response.status).to eq(201)
-          commit.builds.reload
-          expect(commit.builds.first.trigger_request.variables).to eq(variables)
+          pipeline.builds.reload
+          expect(pipeline.builds.first.trigger_request.variables).to eq(variables)
         end
       end
     end
diff --git a/spec/services/ci/create_builds_service_spec.rb b/spec/services/ci/create_builds_service_spec.rb
index ecc3a88a262..984b78487d4 100644
--- a/spec/services/ci/create_builds_service_spec.rb
+++ b/spec/services/ci/create_builds_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Ci::CreateBuildsService, services: true do
-  let(:commit) { create(:ci_commit, ref: 'master') }
+  let(:pipeline) { create(:ci_pipeline, ref: 'master') }
   let(:user) { create(:user) }
 
   describe '#execute' do
@@ -9,7 +9,7 @@ describe Ci::CreateBuildsService, services: true do
     #
 
     subject do
-      described_class.new(commit).execute(commit, nil, user, status)
+      described_class.new(pipeline).execute('test', nil, user, status)
     end
 
     context 'next builds available' do
diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb
index dbdc5370bd8..ae4b7aca820 100644
--- a/spec/services/ci/create_trigger_request_service_spec.rb
+++ b/spec/services/ci/create_trigger_request_service_spec.rb
@@ -6,7 +6,7 @@ describe Ci::CreateTriggerRequestService, services: true do
   let(:trigger) { create(:ci_trigger, project: project) }
 
   before do
-    stub_ci_commit_to_return_yaml_file
+    stub_ci_pipeline_to_return_yaml_file
   end
 
   describe :execute do
@@ -27,8 +27,8 @@ describe Ci::CreateTriggerRequestService, services: true do
       subject { service.execute(project, trigger, 'master') }
 
       before do
-        stub_ci_commit_yaml_file('{}')
-        FactoryGirl.create :ci_commit, project: project
+        stub_ci_pipeline_yaml_file('{}')
+        FactoryGirl.create :ci_pipeline, project: project
       end
 
       it { expect(subject).to be_nil }
diff --git a/spec/services/ci/register_build_service_spec.rb b/spec/services/ci/register_build_service_spec.rb
index 6f4d29a198f..d91fc574299 100644
--- a/spec/services/ci/register_build_service_spec.rb
+++ b/spec/services/ci/register_build_service_spec.rb
@@ -4,8 +4,8 @@ module Ci
   describe RegisterBuildService, services: true do
     let!(:service) { RegisterBuildService.new }
     let!(:project) { FactoryGirl.create :empty_project, shared_runners_enabled: false }
-    let!(:commit) { FactoryGirl.create :ci_commit, project: project }
-    let!(:pending_build) { FactoryGirl.create :ci_build, pipeline: commit }
+    let!(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
+    let!(:pending_build) { FactoryGirl.create :ci_build, pipeline: pipeline }
     let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
     let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
 
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 3785723a031..202eede8e24 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -6,12 +6,12 @@ describe CreateCommitBuildsService, services: true do
   let(:user) { nil }
 
   before do
-    stub_ci_commit_to_return_yaml_file
+    stub_ci_pipeline_to_return_yaml_file
   end
 
   describe :execute do
     context 'valid params' do
-      let(:commit) do
+      let(:pipeline) do
         service.execute(project, user,
                         ref: 'refs/heads/master',
                         before: '00000000',
@@ -20,11 +20,11 @@ describe CreateCommitBuildsService, services: true do
                        )
       end
 
-      it { expect(commit).to be_kind_of(Ci::Pipeline) }
-      it { expect(commit).to be_valid }
-      it { expect(commit).to be_persisted }
-      it { expect(commit).to eq(project.pipelines.last) }
-      it { expect(commit.builds.first).to be_kind_of(Ci::Build) }
+      it { expect(pipeline).to be_kind_of(Ci::Pipeline) }
+      it { expect(pipeline).to be_valid }
+      it { expect(pipeline).to be_persisted }
+      it { expect(pipeline).to eq(project.pipelines.last) }
+      it { expect(pipeline.builds.first).to be_kind_of(Ci::Build) }
     end
 
     context "skip tag if there is no build for it" do
@@ -40,7 +40,7 @@ describe CreateCommitBuildsService, services: true do
 
       it "creates commit if there is no appropriate job but deploy job has right ref setting" do
         config = YAML.dump({ deploy: { deploy: "ls", only: ["0_1"] } })
-        stub_ci_commit_yaml_file(config)
+        stub_ci_pipeline_yaml_file(config)
 
         result = service.execute(project, user,
                                  ref: 'refs/heads/0_1',
@@ -53,7 +53,7 @@ describe CreateCommitBuildsService, services: true do
     end
 
     it 'skips creating ci_commit for refs without .gitlab-ci.yml' do
-      stub_ci_commit_yaml_file(nil)
+      stub_ci_pipeline_yaml_file(nil)
       result = service.execute(project, user,
                                ref: 'refs/heads/0_1',
                                before: '00000000',
@@ -67,18 +67,18 @@ describe CreateCommitBuildsService, services: true do
     it 'fails commits if yaml is invalid' do
       message = 'message'
       allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { message }
-      stub_ci_commit_yaml_file('invalid: file: file')
+      stub_ci_pipeline_yaml_file('invalid: file: file')
       commits = [{ message: message }]
-      commit = service.execute(project, user,
+      pipeline = service.execute(project, user,
                                ref: 'refs/tags/0_1',
                                before: '00000000',
                                after: '31das312',
                                commits: commits
                               )
-      expect(commit).to be_persisted
-      expect(commit.builds.any?).to be false
-      expect(commit.status).to eq('failed')
-      expect(commit.yaml_errors).not_to be_nil
+      expect(pipeline).to be_persisted
+      expect(pipeline.builds.any?).to be false
+      expect(pipeline.status).to eq('failed')
+      expect(pipeline.yaml_errors).not_to be_nil
     end
 
     describe :ci_skip? do
@@ -90,45 +90,45 @@ describe CreateCommitBuildsService, services: true do
 
       it "skips builds creation if there is [ci skip] tag in commit message" do
         commits = [{ message: message }]
-        commit = service.execute(project, user,
+        pipeline = service.execute(project, user,
                                  ref: 'refs/tags/0_1',
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
                                 )
-        expect(commit).to be_persisted
-        expect(commit.builds.any?).to be false
-        expect(commit.status).to eq("skipped")
+        expect(pipeline).to be_persisted
+        expect(pipeline.builds.any?).to be false
+        expect(pipeline.status).to eq("skipped")
       end
 
       it "does not skips builds creation if there is no [ci skip] tag in commit message" do
         allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { "some message" }
 
         commits = [{ message: "some message" }]
-        commit = service.execute(project, user,
+        pipeline = service.execute(project, user,
                                  ref: 'refs/tags/0_1',
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
                                 )
 
-        expect(commit).to be_persisted
-        expect(commit.builds.first.name).to eq("staging")
+        expect(pipeline).to be_persisted
+        expect(pipeline.builds.first.name).to eq("staging")
       end
 
       it "skips builds creation if there is [ci skip] tag in commit message and yaml is invalid" do
-        stub_ci_commit_yaml_file('invalid: file: fiile')
+        stub_ci_pipeline_yaml_file('invalid: file: fiile')
         commits = [{ message: message }]
-        commit = service.execute(project, user,
+        pipeline = service.execute(project, user,
                                  ref: 'refs/tags/0_1',
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
                                 )
-        expect(commit).to be_persisted
-        expect(commit.builds.any?).to be false
-        expect(commit.status).to eq("skipped")
-        expect(commit.yaml_errors).to be_nil
+        expect(pipeline).to be_persisted
+        expect(pipeline.builds.any?).to be false
+        expect(pipeline.status).to eq("skipped")
+        expect(pipeline.yaml_errors).to be_nil
       end
     end
 
@@ -136,40 +136,40 @@ describe CreateCommitBuildsService, services: true do
       allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file) { gitlab_ci_yaml }
 
       commits = [{ message: "message" }]
-      commit = service.execute(project, user,
+      pipeline = service.execute(project, user,
                                ref: 'refs/heads/master',
                                before: '00000000',
                                after: '31das312',
                                commits: commits
                               )
-      expect(commit).to be_persisted
-      expect(commit.builds.count(:all)).to eq(2)
+      expect(pipeline).to be_persisted
+      expect(pipeline.builds.count(:all)).to eq(2)
 
-      commit = service.execute(project, user,
+      pipeline = service.execute(project, user,
                                ref: 'refs/heads/master',
                                before: '00000000',
                                after: '31das312',
                                commits: commits
                               )
-      expect(commit).to be_persisted
-      expect(commit.builds.count(:all)).to eq(2)
+      expect(pipeline).to be_persisted
+      expect(pipeline.builds.count(:all)).to eq(2)
     end
 
     it "creates commit with failed status if yaml is invalid" do
-      stub_ci_commit_yaml_file('invalid: file')
+      stub_ci_pipeline_yaml_file('invalid: file')
 
       commits = [{ message: "some message" }]
 
-      commit = service.execute(project, user,
+      pipeline = service.execute(project, user,
                                ref: 'refs/tags/0_1',
                                before: '00000000',
                                after: '31das312',
                                commits: commits
                               )
 
-      expect(commit).to be_persisted
-      expect(commit.status).to eq("failed")
-      expect(commit.builds.any?).to be false
+      expect(pipeline).to be_persisted
+      expect(pipeline.status).to eq("failed")
+      expect(pipeline.builds.any?).to be false
     end
   end
 end
diff --git a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
index a7f52a2fa24..dd656c3bbb7 100644
--- a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
+++ b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
@@ -6,7 +6,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
   let(:merge_request) { create(:merge_request) }
   let(:project) { create(:project) }
   let(:sha) { '1234567890abcdef1234567890abcdef12345678' }
-  let(:pipeline) { create(:ci_commit_with_one_job, ref: merge_request.source_branch, project: project, sha: sha) }
+  let(:pipeline) { create(:ci_pipeline_with_one_job, ref: merge_request.source_branch, project: project, sha: sha) }
   let(:service) { MergeRequests::AddTodoWhenBuildFailsService.new(project, user, commit_message: 'Awesome message') }
   let(:todo_service) { TodoService.new }
 
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index 6d6539a0e71..4da8146e3d6 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -10,7 +10,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
                            source_project: project, target_project: project, state: "opened")
   end
 
-  let(:pipeline) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) }
+  let(:pipeline) { create(:ci_pipeline_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) }
   let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, commit_message: 'Awesome message') }
 
   describe "#execute" do
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 29e0a63d8ce..09f0ee3871d 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -208,7 +208,7 @@ describe SystemNoteService, services: true do
   end
 
   describe '.merge_when_build_succeeds' do
-    let(:ci_commit) { build(:ci_commit_without_jobs )}
+    let(:pipeline) { build(:ci_pipeline_without_jobs )}
     let(:noteable) do
       create(:merge_request, source_project: project, target_project: project)
     end
@@ -223,7 +223,6 @@ describe SystemNoteService, services: true do
   end
 
   describe '.cancel_merge_when_build_succeeds' do
-    let(:ci_commit) { build(:ci_commit_without_jobs) }
     let(:noteable) do
       create(:merge_request, source_project: project, target_project: project)
     end
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index 49660a48a86..93f96cacc00 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -13,11 +13,11 @@ module StubGitlabCalls
     allow_any_instance_of(Network).to receive(:projects) { project_hash_array }
   end
 
-  def stub_ci_commit_to_return_yaml_file
-    stub_ci_commit_yaml_file(gitlab_ci_yaml)
+  def stub_ci_pipeline_to_return_yaml_file
+    stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
   end
 
-  def stub_ci_commit_yaml_file(ci_yaml)
+  def stub_ci_pipeline_yaml_file(ci_yaml)
     allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file) { ci_yaml }
   end
 
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 7d0cfed3627..b8e73682c91 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -53,13 +53,13 @@ describe PostReceive do
       subject { PostReceive.new.perform(pwd(project), key_id, base64_changes) }
 
       context "creates a Ci::Pipeline for every change" do
-        before { stub_ci_commit_to_return_yaml_file }
+        before { stub_ci_pipeline_to_return_yaml_file }
 
         it { expect{ subject }.to change{ Ci::Pipeline.count }.by(2) }
       end
 
       context "does not create a Ci::Pipeline" do
-        before { stub_ci_commit_yaml_file(nil) }
+        before { stub_ci_pipeline_yaml_file(nil) }
 
         it { expect{ subject }.not_to change{ Ci::Pipeline.count } }
       end

From 393ec8e74a328660b3d7eaafb25708bc1fa13ee3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 16:22:53 +0200
Subject: [PATCH 1030/1431] Rename `commit` to `pipeline` in application code

---
 app/services/ci/create_builds_service.rb     | 18 +++++++++---------
 app/services/create_commit_builds_service.rb | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb
index 18274ce24e2..41ce6982cbe 100644
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
@@ -1,7 +1,7 @@
 module Ci
   class CreateBuildsService
-    def initialize(commit)
-      @commit = commit
+    def initialize(pipeline)
+      @pipeline = pipeline
     end
 
     def execute(stage, user, status, trigger_request = nil)
@@ -21,8 +21,8 @@ module Ci
 
       builds_attrs.map do |build_attrs|
         # don't create the same build twice
-        unless @commit.builds.find_by(ref: @commit.ref, tag: @commit.tag,
-                                      trigger_request: trigger_request, name: build_attrs[:name])
+        unless @pipeline.builds.find_by(ref: @pipeline.ref, tag: @pipeline.tag,
+                                        trigger_request: trigger_request, name: build_attrs[:name])
           build_attrs.slice!(:name,
                              :commands,
                              :tag_list,
@@ -31,13 +31,13 @@ module Ci
                              :stage,
                              :stage_idx)
 
-          build_attrs.merge!(ref: @commit.ref,
-                             tag: @commit.tag,
+          build_attrs.merge!(ref: @pipeline.ref,
+                             tag: @pipeline.tag,
                              trigger_request: trigger_request,
                              user: user,
-                             project: @commit.project)
+                             project: @pipeline.project)
 
-          @commit.builds.create!(build_attrs)
+          @pipeline.builds.create!(build_attrs)
         end
       end
     end
@@ -45,7 +45,7 @@ module Ci
     private
 
     def config_processor
-      @config_processor ||= @commit.config_processor
+      @config_processor ||= @pipeline.config_processor
     end
   end
 end
diff --git a/app/services/create_commit_builds_service.rb b/app/services/create_commit_builds_service.rb
index 70a7d4bef4d..9091424ccfd 100644
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
@@ -18,23 +18,23 @@ class CreateCommitBuildsService
       return false
     end
 
-    commit = Ci::Pipeline.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
+    pipeline = Ci::Pipeline.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
 
     # Skip creating ci_commit when no gitlab-ci.yml is found
-    unless commit.ci_yaml_file
+    unless pipeline.ci_yaml_file
       return false
     end
 
     # Create a new ci_commit
-    commit.save!
+    pipeline.save!
 
     # Skip creating builds for commits that have [ci skip]
-    unless commit.skip_ci?
+    unless pipeline.skip_ci?
       # Create builds for commit
-      commit.create_builds(user)
+      pipeline.create_builds(user)
     end
 
-    commit.touch
-    commit
+    pipeline.touch
+    pipeline
   end
 end

From 1927a2d30bf88ab9fe3c1235cb529f5fd8dc01be Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 16:27:50 +0200
Subject: [PATCH 1031/1431] Rename all ci_commit[s] in application code to
 pipeline[s]

---
 app/controllers/projects/commit_controller.rb | 10 ++--
 .../projects/merge_requests_controller.rb     |  2 +-
 app/helpers/ci_status_helper.rb               |  6 +--
 .../ci/create_trigger_request_service.rb      |  6 +--
 app/services/ci/image_for_build_service.rb    |  6 +--
 app/services/create_commit_builds_service.rb  |  4 +-
 .../merge_when_build_succeeds_service.rb      |  4 +-
 app/views/projects/commit/_builds.html.haml   |  4 +-
 .../projects/commit/_ci_commit.html.haml      | 52 -------------------
 app/views/projects/commit/_pipeline.html.haml | 52 +++++++++++++++++++
 .../merge_requests/_new_submit.html.haml      |  4 +-
 .../projects/merge_requests/_show.html.haml   |  2 +-
 .../merge_requests/show/_builds.html.haml     |  2 +-
 .../merge_requests/widget/_heading.html.haml  |  6 +--
 .../widget/open/_accept.html.haml             |  4 +-
 app/views/projects/pipelines/show.html.haml   |  2 +-
 lib/api/commit_statuses.rb                    | 10 ++--
 17 files changed, 88 insertions(+), 88 deletions(-)
 delete mode 100644 app/views/projects/commit/_ci_commit.html.haml
 create mode 100644 app/views/projects/commit/_pipeline.html.haml

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 737e6c931f7..20637fa46fe 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -99,12 +99,12 @@ class Projects::CommitController < Projects::ApplicationController
     @commit ||= @project.commit(params[:id])
   end
 
-  def ci_commits
-    @ci_commits ||= project.pipelines.where(sha: commit.sha)
+  def pipelines
+    @pipelines ||= project.pipelines.where(sha: commit.sha)
   end
 
   def ci_builds
-    @ci_builds ||= Ci::Build.where(pipeline: ci_commits)
+    @ci_builds ||= Ci::Build.where(pipeline: pipelines)
   end
 
   def define_show_vars
@@ -117,8 +117,8 @@ class Projects::CommitController < Projects::ApplicationController
     @diff_refs = [commit.parent || commit, commit]
     @notes_count = commit.notes.count
 
-    @statuses = CommitStatus.where(pipeline: ci_commits)
-    @builds = Ci::Build.where(pipeline: ci_commits)
+    @statuses = CommitStatus.where(pipeline: pipelines)
+    @builds = Ci::Build.where(pipeline: pipelines)
   end
 
   def assign_change_commit_vars(mr_source_branch)
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e6924a6a450..1fca05e949a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -316,7 +316,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @merge_request_diff = @merge_request.merge_request_diff
 
     @pipeline = @merge_request.pipeline
-    @statuses = @ci_commit.statuses if @pipeline
+    @statuses = @pipeline.statuses if @pipeline
 
     if @merge_request.locked_long_ago?
       @merge_request.unlock_mr
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index cfad17dcacf..07e5c146844 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -1,7 +1,7 @@
 module CiStatusHelper
-  def ci_status_path(ci_commit)
-    project = ci_commit.project
-    builds_namespace_project_commit_path(project.namespace, project, ci_commit.sha)
+  def ci_status_path(pipeline)
+    project = pipeline.project
+    builds_namespace_project_commit_path(project.namespace, project, pipeline.sha)
   end
 
   def ci_status_with_icon(status, target = nil)
diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb
index cd8a2b25100..c3194f45b10 100644
--- a/app/services/ci/create_trigger_request_service.rb
+++ b/app/services/ci/create_trigger_request_service.rb
@@ -7,14 +7,14 @@ module Ci
       # check if ref is tag
       tag = project.repository.find_tag(ref).present?
 
-      ci_commit = project.pipelines.create(sha: commit.sha, ref: ref, tag: tag)
+      pipeline = project.pipelines.create(sha: commit.sha, ref: ref, tag: tag)
 
       trigger_request = trigger.trigger_requests.create!(
         variables: variables,
-        commit: ci_commit,
+        commit: pipeline,
       )
 
-      if ci_commit.create_builds(nil, trigger_request)
+      if pipeline.create_builds(nil, trigger_request)
         trigger_request
       end
     end
diff --git a/app/services/ci/image_for_build_service.rb b/app/services/ci/image_for_build_service.rb
index 90eb3e365f8..75d847d5bee 100644
--- a/app/services/ci/image_for_build_service.rb
+++ b/app/services/ci/image_for_build_service.rb
@@ -3,9 +3,9 @@ module Ci
     def execute(project, opts)
       sha = opts[:sha] || ref_sha(project, opts[:ref])
 
-      ci_commits = project.pipelines.where(sha: sha)
-      ci_commits = ci_commits.where(ref: opts[:ref]) if opts[:ref]
-      image_name = image_for_status(ci_commits.status)
+      pipelines = project.pipelines.where(sha: sha)
+      pipelines = pipelines.where(ref: opts[:ref]) if opts[:ref]
+      image_name = image_for_status(pipelines.status)
 
       image_path = Rails.root.join('public/ci', image_name)
       OpenStruct.new(path: image_path, name: image_name)
diff --git a/app/services/create_commit_builds_service.rb b/app/services/create_commit_builds_service.rb
index 9091424ccfd..418f5cf8091 100644
--- a/app/services/create_commit_builds_service.rb
+++ b/app/services/create_commit_builds_service.rb
@@ -20,12 +20,12 @@ class CreateCommitBuildsService
 
     pipeline = Ci::Pipeline.new(project: project, sha: sha, ref: ref, before_sha: before_sha, tag: tag)
 
-    # Skip creating ci_commit when no gitlab-ci.yml is found
+    # Skip creating pipeline when no gitlab-ci.yml is found
     unless pipeline.ci_yaml_file
       return false
     end
 
-    # Create a new ci_commit
+    # Create a new pipeline
     pipeline.save!
 
     # Skip creating builds for commits that have [ci skip]
diff --git a/app/services/merge_requests/merge_when_build_succeeds_service.rb b/app/services/merge_requests/merge_when_build_succeeds_service.rb
index 8fd6a4ea1f6..12edfb2d671 100644
--- a/app/services/merge_requests/merge_when_build_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_build_succeeds_service.rb
@@ -20,10 +20,10 @@ module MergeRequests
 
     # Triggers the automatic merge of merge_request once the build succeeds
     def trigger(commit_status)
-      each_merge_request(commit_status) do |merge_request, ci_commit|
+      each_merge_request(commit_status) do |merge_request, pipeline|
         next unless merge_request.merge_when_build_succeeds?
         next unless merge_request.mergeable?
-        next unless ci_commit.success?
+        next unless pipeline.success?
 
         MergeWorker.perform_async(merge_request.id, merge_request.merge_user_id, merge_request.merge_params)
       end
diff --git a/app/views/projects/commit/_builds.html.haml b/app/views/projects/commit/_builds.html.haml
index 7f7a15aa214..a508382578a 100644
--- a/app/views/projects/commit/_builds.html.haml
+++ b/app/views/projects/commit/_builds.html.haml
@@ -1,2 +1,2 @@
-- @ci_commits.each do |ci_commit|
-  = render "ci_commit", ci_commit: ci_commit, pipeline_details: true
+- @pipelines.each do |pipeline|
+  = render "pipeline", pipeline: pipeline, pipeline_details: true
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
deleted file mode 100644
index 32ff4d30977..00000000000
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ /dev/null
@@ -1,52 +0,0 @@
-.row-content-block.build-content.middle-block
-  .pull-right
-    - if can?(current_user, :update_pipeline, ci_commit.project)
-      - if ci_commit.builds.latest.failed.any?(&:retryable?)
-        = link_to "Retry failed", retry_namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post
-
-      - if ci_commit.builds.running_or_pending.any?
-        = link_to "Cancel running", cancel_namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
-
-  .oneline.clearfix
-    - if defined?(pipeline_details) && pipeline_details
-      Pipeline
-      = link_to "##{ci_commit.id}", namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), class: "monospace"
-      with
-      = pluralize ci_commit.statuses.count(:id), "build"
-      - if ci_commit.ref
-        for
-        = link_to ci_commit.ref, namespace_project_commits_path(ci_commit.project.namespace, ci_commit.project, ci_commit.ref), class: "monospace"
-      - if defined?(link_to_commit) && link_to_commit
-        for commit
-        = link_to ci_commit.short_sha, namespace_project_commit_path(ci_commit.project.namespace, ci_commit.project, ci_commit.sha), class: "monospace"
-      - if ci_commit.duration
-        in
-        = time_interval_in_words ci_commit.duration
-
-- if ci_commit.yaml_errors.present?
-  .bs-callout.bs-callout-danger
-    %h4 Found errors in your .gitlab-ci.yml:
-    %ul
-      - ci_commit.yaml_errors.split(",").each do |error|
-        %li= error
-    You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
-
-- if ci_commit.project.builds_enabled? && !ci_commit.ci_yaml_file
-  .bs-callout.bs-callout-warning
-    \.gitlab-ci.yml not found in this commit
-
-.table-holder
-  %table.table.builds
-    %thead
-      %tr
-        %th Status
-        %th Build ID
-        %th Name
-        %th Tags
-        %th Duration
-        %th Finished at
-        - if ci_commit.project.build_coverage_enabled?
-          %th Coverage
-        %th
-    - ci_commit.statuses.stages.each do |stage|
-      = render 'projects/commit/ci_stage', stage: stage, statuses: ci_commit.statuses.where(stage: stage)
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
new file mode 100644
index 00000000000..0411137b7c6
--- /dev/null
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -0,0 +1,52 @@
+.row-content-block.build-content.middle-block
+  .pull-right
+    - if can?(current_user, :update_pipeline, pipeline.project)
+      - if pipeline.builds.latest.failed.any?(&:retryable?)
+        = link_to "Retry failed", retry_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: 'btn btn-grouped btn-primary', method: :post
+
+      - if pipeline.builds.running_or_pending.any?
+        = link_to "Cancel running", cancel_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
+
+  .oneline.clearfix
+    - if defined?(pipeline_details) && pipeline_details
+      Pipeline
+      = link_to "##{pipeline.id}", namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "monospace"
+      with
+      = pluralize pipeline.statuses.count(:id), "build"
+      - if pipeline.ref
+        for
+        = link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace"
+      - if defined?(link_to_commit) && link_to_commit
+        for commit
+        = link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "monospace"
+      - if pipeline.duration
+        in
+        = time_interval_in_words pipeline.duration
+
+- if pipeline.yaml_errors.present?
+  .bs-callout.bs-callout-danger
+    %h4 Found errors in your .gitlab-ci.yml:
+    %ul
+      - pipeline.yaml_errors.split(",").each do |error|
+        %li= error
+    You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
+
+- if pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
+  .bs-callout.bs-callout-warning
+    \.gitlab-ci.yml not found in this commit
+
+.table-holder
+  %table.table.builds
+    %thead
+      %tr
+        %th Status
+        %th Build ID
+        %th Name
+        %th Tags
+        %th Duration
+        %th Finished at
+        - if pipeline.project.build_coverage_enabled?
+          %th Coverage
+        %th
+    - pipeline.statuses.stages.each do |stage|
+      = render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.where(stage: stage)
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 18b3f9e1549..a5e67b95727 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -23,7 +23,7 @@
       = link_to url_for(params), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
         Commits
         %span.badge= @commits.size
-    - if @ci_commit
+    - if @pipeline
       %li.builds-tab.active
         = link_to url_for(params), data: {target: 'div#builds', action: 'builds', toggle: 'tab'} do
           Builds
@@ -43,7 +43,7 @@
           %p To preserve performance the line changes are not shown.
       - else
         = render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @merge_request.diff_refs, show_whitespace_toggle: false
-    - if @ci_commit
+    - if @pipeline
       #builds.builds.tab-pane
         = render "projects/merge_requests/show/builds"
 
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 7af227129ec..c2e1a78d3cc 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -54,7 +54,7 @@
           = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
             Commits
             %span.badge= @commits.size
-        - if @ci_commit
+        - if @pipeline
           %li.builds-tab
             = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
               Builds
diff --git a/app/views/projects/merge_requests/show/_builds.html.haml b/app/views/projects/merge_requests/show/_builds.html.haml
index a116ffe2e15..81de60f116c 100644
--- a/app/views/projects/merge_requests/show/_builds.html.haml
+++ b/app/views/projects/merge_requests/show/_builds.html.haml
@@ -1,2 +1,2 @@
-= render "projects/commit/ci_commit", ci_commit: @ci_commit, link_to_commit: true
+= render "projects/commit/pipeline", pipeline: @pipeline, link_to_commit: true
 
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 4d381754610..08a38d283d2 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,7 +1,7 @@
-- if @ci_commit
+- if @pipeline
   .mr-widget-heading
     - %w[success skipped canceled failed running pending].each do |status|
-      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @ci_commit.status == status) }
+      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
         = ci_icon_for_status(status)
         %span
           CI build
@@ -9,7 +9,7 @@
         for
         - commit = @merge_request.last_commit
         = succeed "." do
-          = link_to @ci_commit.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @ci_commit.sha), class: "monospace"
+          = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace"
         %span.ci-coverage
         = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
 
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 0d49b6471a9..60d7d6ff1f5 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -1,4 +1,4 @@
-- status_class = @ci_commit ? " ci-#{@ci_commit.status}" : nil
+- status_class = @pipeline ? " ci-#{@pipeline.status}" : nil
 
 = form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-quick-submit js-requires-input' } do |f|
   = hidden_field_tag :authenticity_token, form_authenticity_token
@@ -6,7 +6,7 @@
   .accept-merge-holder.clearfix.js-toggle-container
     .clearfix
       .accept-action
-        - if @ci_commit && @ci_commit.active?
+        - if @pipeline && @pipeline.active?
           %span.btn-group
             = button_tag class: "btn btn-create js-merge-button merge_when_build_succeeds" do
               Merge When Build Succeeds
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
index 2aad5602414..75943c64276 100644
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@@ -5,4 +5,4 @@
     = render "projects/pipelines/info"
   %div.block-connector
 
-= render "projects/commit/ci_commit", ci_commit: @pipeline
+= render "projects/commit/pipeline", pipeline: @pipeline
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 088d5bac587..323a7086890 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -22,8 +22,8 @@ module API
 
         not_found!('Commit') unless user_project.commit(params[:sha])
 
-        ci_commits = user_project.pipelines.where(sha: params[:sha])
-        statuses = ::CommitStatus.where(pipeline: ci_commits)
+        pipelines = user_project.pipelines.where(sha: params[:sha])
+        statuses = ::CommitStatus.where(pipeline: pipelines)
         statuses = statuses.latest unless parse_boolean(params[:all])
         statuses = statuses.where(ref: params[:ref]) if params[:ref].present?
         statuses = statuses.where(stage: params[:stage]) if params[:stage].present?
@@ -64,11 +64,11 @@ module API
           ref = branches.first
         end
 
-        ci_commit = @project.ensure_pipeline(commit.sha, ref)
+        pipeline = @project.ensure_pipeline(commit.sha, ref)
 
         name = params[:name] || params[:context]
-        status = GenericCommitStatus.running_or_pending.find_by(pipeline: ci_commit, name: name, ref: params[:ref])
-        status ||= GenericCommitStatus.new(project: @project, pipeline: ci_commit, user: current_user)
+        status = GenericCommitStatus.running_or_pending.find_by(pipeline: pipeline, name: name, ref: params[:ref])
+        status ||= GenericCommitStatus.new(project: @project, pipeline: pipeline, user: current_user)
         status.update(attrs)
 
         case params[:state].to_s

From 836061ddfde6652c1e240ac093c32b9d95b8cd84 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 16:28:15 +0200
Subject: [PATCH 1032/1431] Rename remaining ci_commits in specs

---
 .../features/merge_requests/merge_when_build_succeeds_spec.rb | 2 +-
 spec/requests/api/commit_statuses_spec.rb                     | 2 +-
 spec/requests/api/commits_spec.rb                             | 4 ++--
 spec/services/create_commit_builds_service_spec.rb            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index 843bd5acedf..c5e6412d7bf 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -13,7 +13,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
 
   context "Active build for Merge Request" do
     let!(:pipeline) { create(:ci_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
-    let!(:ci_build) { create(:ci_build, pipeline: ci_commit) }
+    let!(:ci_build) { create(:ci_build, pipeline: pipeline) }
 
     before do
       login_as user
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index 5c5850c558b..298cdbad329 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -5,7 +5,7 @@ describe API::CommitStatuses, api: true do
 
   let!(:project) { create(:project) }
   let(:commit) { project.repository.commit }
-  let(:commit_status) { create(:commit_status, pipeline: ci_commit) }
+  let(:commit_status) { create(:commit_status, pipeline: pipeline) }
   let(:guest) { create_user(:guest) }
   let(:reporter) { create_user(:reporter) }
   let(:developer) { create_user(:developer) }
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 2336ec97ed0..6fc38f537d3 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -90,10 +90,10 @@ describe API::API, api: true  do
       end
 
       it "should return status for CI" do
-        ci_commit = project.ensure_pipeline(project.repository.commit.sha, 'master')
+        pipeline = project.ensure_pipeline(project.repository.commit.sha, 'master')
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
         expect(response.status).to eq(200)
-        expect(json_response['status']).to eq(ci_commit.status)
+        expect(json_response['status']).to eq(pipeline.status)
       end
     end
 
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 202eede8e24..706319b63ed 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -52,7 +52,7 @@ describe CreateCommitBuildsService, services: true do
       end
     end
 
-    it 'skips creating ci_commit for refs without .gitlab-ci.yml' do
+    it 'skips creating pipeline for refs without .gitlab-ci.yml' do
       stub_ci_pipeline_yaml_file(nil)
       result = service.execute(project, user,
                                ref: 'refs/heads/0_1',

From 77d4d5e3a694b73a7db7de7f630ce62912a896e8 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Fri, 3 Jun 2016 16:35:56 +0200
Subject: [PATCH 1033/1431] :police_car:

---
 app/services/issues/move_service.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index 138730ca355..ab667456db7 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -74,12 +74,12 @@ module Issues
     end
 
     def rewrite_award_emoji
-       @old_issue.award_emoji.each do |award|
-         new_award = award.dup
-         new_award.awardable = @new_issue
-         new_award.save
-       end
-     end
+      @old_issue.award_emoji.each do |award|
+        new_award = award.dup
+        new_award.awardable = @new_issue
+        new_award.save
+      end
+    end
 
     def rewrite_content(content)
       return unless content

From fa35aea3ddf1093db26f8b7fec78175a5f88af7a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 17:07:40 +0200
Subject: [PATCH 1034/1431] Refactor Gitlab::Auth rate limiting

---
 lib/gitlab/auth.rb              | 36 +++++++++-------------------
 lib/gitlab/auth/rate_limiter.rb | 42 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 lib/gitlab/auth/rate_limiter.rb

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 672642ebfbe..dd6ba84c973 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -1,5 +1,5 @@
 module Gitlab
-  class Auth
+  module Auth
     Result = Struct.new(:user, :type)
 
     class << self
@@ -64,34 +64,20 @@ module Gitlab
       end
 
       def rate_limit!(ip, success:, login:)
-        # If the user authenticated successfully, we reset the auth failure count
-        # from Rack::Attack for that IP. A client may attempt to authenticate
-        # with a username and blank password first, and only after it receives
-        # a 401 error does it present a password. Resetting the count prevents
-        # false positives.
-        #
-        # Otherwise, we let Rack::Attack know there was a failed authentication
-        # attempt from this IP. This information is stored in the Rails cache
-        # (Redis) and will be used by the Rack::Attack middleware to decide
-        # whether to block requests from this IP.
-
-        config = Gitlab.config.rack_attack.git_basic_auth
-        return unless config.enabled
+        rate_limiter = IpRateLimiter.new(ip)
+        return unless rate_limiter.enabled?
 
         if success
-          Rack::Attack::Allow2Ban.reset(ip, config)
+          # Repeated login 'failures' are normal behavior for some Git clients so
+          # it is important to reset the ban counter once the client has proven
+          # they are not a 'bad guy'.
+          rate_limiter.reset!
         else
-          banned = Rack::Attack::Allow2Ban.filter(ip, config) do
-            if config.ip_whitelist.include?(ip)
-              # Don't increment the ban counter for this IP
-              false
-            else
-              # Increment the ban counter for this IP
-              true
-            end
-          end
+          # Register a login failure so that Rack::Attack can block the next
+          # request from this IP if needed.
+          rate_limiter.register_fail!(ip, config)
 
-          if banned
+          if rate_limiter.banned?
             Rails.logger.info "IP #{ip} failed to login " \
               "as #{login} but has been temporarily banned from Git auth"
           end
diff --git a/lib/gitlab/auth/rate_limiter.rb b/lib/gitlab/auth/rate_limiter.rb
new file mode 100644
index 00000000000..4be9f6d0efe
--- /dev/null
+++ b/lib/gitlab/auth/rate_limiter.rb
@@ -0,0 +1,42 @@
+module Gitlab
+  module Auth
+    class IpRateLimiter
+      attr_reader :ip
+
+      def initialize(ip)
+        @ip = ip
+        @banned = false
+      end
+
+      def enabled?
+        config.enabled
+      end
+      
+      def reset!
+        Rack::Attack::Allow2Ban.reset(ip, config)
+      end
+      
+      def register_fail!
+        # Allow2Ban.filter will return false if this IP has not failed too often yet
+        @banned = Rack::Attack::Allow2Ban.filter(ip, config) do
+          # If we return false here, the failure for this IP is ignored by Allow2Ban
+          ignore_failure?
+        end
+      end
+      
+      def banned?
+        @banned
+      end
+      
+      private
+      
+      def config
+        Gitlab.config.rack_attack.git_basic_auth
+      end
+      
+      def ignore_failure?
+        config.ip_whitelist.exclude?(ip)
+      end
+    end
+  end
+end

From 0a1fccb2ed0e0479dbaa4c22726d5c7a440f014c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 20:17:15 -0500
Subject: [PATCH 1035/1431] Try to use knapsack

---
 .gitlab-ci.yml          | 91 ++++++++++++++++++++---------------------
 Gemfile                 |  1 +
 Gemfile.lock            |  5 +++
 Rakefile                |  3 ++
 features/support/env.rb |  3 ++
 spec/knapsack_merger.rb | 41 +++++++++++++++++++
 spec/spec_helper.rb     |  4 ++
 7 files changed, 101 insertions(+), 47 deletions(-)
 create mode 100644 spec/knapsack_merger.rb

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85730e1b687..a819610c41e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,58 +25,55 @@ before_script:
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
 
+.rspec_tests: &rspec_tests
+  stage: test
+  variables:
+    RAILS_ENV: "test"
+    SIMPLECOV: "true"
+  script:
+    - JOB_NAME=( $CI_BUILD_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[1]}
+    - export CI_NODE_TOTAL=${JOB_NAME[2]}
+    - bundle exec rake assets:precompile 2>/dev/null
+    - bundle exec rake knapsack:rspec
+
+.spinach_tests: &spinach_tests
+  stage: test
+  variables:
+    RAILS_ENV: "test"
+    SIMPLECOV: "true"
+  script:
+    - JOB_NAME=( $CI_BUILD_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[1]}
+    - export CI_NODE_TOTAL=${JOB_NAME[2]}
+    - bundle exec rake assets:precompile 2>/dev/null
+    - bundle exec rake knapsack:cucumber
+
 stages:
 - test
 - notifications
 
-spec:feature:
-  stage: test
-  script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+spec 0 10: *rspec_tests
+spec 1 10: *rspec_tests
+spec 2 10: *rspec_tests
+spec 3 10: *rspec_tests
+spec 4 10: *rspec_tests
+spec 5 10: *rspec_tests
+spec 6 10: *rspec_tests
+spec 7 10: *rspec_tests
+spec 8 10: *rspec_tests
+spec 9 10: *rspec_tests
 
-spec:api:
-  stage: test
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
-
-spec:models:
-  stage: test
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
-
-spec:lib:
-  stage: test
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
-
-spec:services:
-  stage: test
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
-
-spec:other:
-  stage: test
-  script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
-
-spinach:project:half:
-  stage: test
-  script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
-
-spinach:project:rest:
-  stage: test
-  script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
-
-spinach:other:
-  stage: test
-  script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+spinach 0 10: *spinach_tests
+spinach 1 10: *spinach_tests
+spinach 2 10: *spinach_tests
+spinach 3 10: *spinach_tests
+spinach 4 10: *spinach_tests
+spinach 5 10: *spinach_tests
+spinach 6 10: *spinach_tests
+spinach 7 10: *spinach_tests
+spinach 8 10: *spinach_tests
+spinach 9 10: *spinach_tests
 
 teaspoon:
   stage: test
diff --git a/Gemfile b/Gemfile
index d9429de786f..b9ae1aecb50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -313,6 +313,7 @@ group :test do
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit', '~> 0.4.2'
   gem 'sham_rack'
+  gem 'knapsack'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ae25269e65..930a0f3f8d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -358,6 +358,9 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
+    knapsack (1.9.0)
+      rake
+      timecop (>= 0.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
@@ -728,6 +731,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
+    timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     tinder (1.10.1)
       eventmachine (~> 1.0)
@@ -874,6 +878,7 @@ DEPENDENCIES
   jquery-ui-rails (~> 5.0.0)
   jwt
   kaminari (~> 0.17.0)
+  knapsack
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
diff --git a/Rakefile b/Rakefile
index 5dd389d5678..16261bf8ae2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,8 +3,11 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
+require 'knapsack'
 
 relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
 
 Gitlab::Application.load_tasks
+
+Knapsack.load_tasks
diff --git a/features/support/env.rb b/features/support/env.rb
index 357d164d87f..6ebd012a40f 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,6 +11,7 @@ ENV['RAILS_ENV'] = 'test'
 require './config/environment'
 require 'rspec/expectations'
 require 'sidekiq/testing/inline'
+require 'knapsack'
 
 require_relative 'capybara'
 require_relative 'db_cleaner'
@@ -20,6 +21,8 @@ require_relative 'rerun'
   require Rails.root.join('spec', 'support', f)
 end
 
+Knapsack::Adapters::CucumberAdapter.bind
+
 Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file }
 
 WebMock.allow_net_connect!
diff --git a/spec/knapsack_merger.rb b/spec/knapsack_merger.rb
new file mode 100644
index 00000000000..c6bcefe8464
--- /dev/null
+++ b/spec/knapsack_merger.rb
@@ -0,0 +1,41 @@
+begin
+  class Knapsack::Report
+    alias_method :save_without_leading_existing_report, :save
+
+    def load_existing_report
+      Knapsack::Presenter.existing_report = open
+    rescue
+      false
+    end
+
+    def save
+      load_existing_report
+      save_without_leading_existing_report
+    end
+  end
+
+  class << Knapsack::Presenter
+    attr_accessor :existing_report
+
+    def initialize
+      @existing_report = []
+    end
+
+    def report_hash
+      return current_report_hash unless existing_report
+      existing_report.merge(current_report_hash).sort.to_h
+    end
+
+    def current_report_hash
+      Knapsack.tracker.test_files_with_time
+    end
+
+    def report_yml
+      report_hash.to_yaml
+    end
+
+    def report_json
+      JSON.pretty_generate(report_hash)
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 576d16e7ea3..84b9ee75f6a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,6 +15,10 @@ require 'rspec/rails'
 require 'shoulda/matchers'
 require 'sidekiq/testing/inline'
 require 'rspec/retry'
+require 'knapsack'
+require_relative 'knapsack_merger'
+
+Knapsack::Adapters::RSpecAdapter.bind
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

From 28469ac712c37584a709fc33a8cfaa25a810711c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 20:34:35 -0500
Subject: [PATCH 1036/1431] Touch reports

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a819610c41e..f2252e9018f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@ before_script:
     RAILS_ENV: "test"
     SIMPLECOV: "true"
   script:
+    - touch knapsack_rspec_report.json
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
@@ -43,6 +44,7 @@ before_script:
     RAILS_ENV: "test"
     SIMPLECOV: "true"
   script:
+    - touch knapsack_cucumber_report.json
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}

From 5ebc2a53ef536982f93fb7d32dd616a1162c07b3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 20:41:17 -0500
Subject: [PATCH 1037/1431] Use build stage

---
 .gitlab-ci.yml | 55 ++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2252e9018f..d7b99cf27bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,8 @@ variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
   # retry tests only in CI environment
   RSPEC_RETRY_RETRY_COUNT: "3"
+  RAILS_ENV: "test"
+  SIMPLECOV: "true"
 
 before_script:
   - source ./scripts/prepare_build.sh
@@ -23,15 +25,11 @@ before_script:
   - touch log/application.log
   - touch log/test.log
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
-  - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
+  - bundle exec rake db:drop db:create db:schema:load db:migrate
 
 .rspec_tests: &rspec_tests
   stage: test
-  variables:
-    RAILS_ENV: "test"
-    SIMPLECOV: "true"
   script:
-    - touch knapsack_rspec_report.json
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
@@ -40,11 +38,7 @@ before_script:
 
 .spinach_tests: &spinach_tests
   stage: test
-  variables:
-    RAILS_ENV: "test"
-    SIMPLECOV: "true"
   script:
-    - touch knapsack_cucumber_report.json
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
@@ -52,9 +46,22 @@ before_script:
     - bundle exec rake knapsack:cucumber
 
 stages:
+- build
 - test
 - notifications
 
+prepare:
+  stage: build
+  script:
+    - bundle exec rake assets:precompile
+    - echo "{}" > knapsack_rspec_report.json
+    - echo "{}" > knapsack_cucumber_report.json
+  artifacts:
+    paths:
+    - assets/public/
+    - knapsack_rspec_report.json
+    - knapsack_cucumber_report.json
+
 spec 0 10: *rspec_tests
 spec 1 10: *rspec_tests
 spec 2 10: *rspec_tests
@@ -80,7 +87,7 @@ spinach 9 10: *spinach_tests
 teaspoon:
   stage: test
   script:
-    - RAILS_ENV=test bundle exec teaspoon
+    - bundle exec teaspoon
 
 rubocop:
   stage: test
@@ -117,7 +124,7 @@ bundler:audit:
 db-migrate-reset:
   stage: test
   script:
-    - RAILS_ENV=test bundle exec rake db:migrate:reset
+    - bundle exec rake db:migrate:reset
 
 # Ruby 2.2 jobs
 
@@ -127,8 +134,8 @@ spec:feature:ruby22:
   only:
     - master
   script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+    - bundle exec rake assets:precompile 2>/dev/null
+    - bundle exec rake spec:feature
   cache:
     key: "ruby22"
     paths:
@@ -140,7 +147,7 @@ spec:api:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+    - bundle exec rake spec:api
   cache:
     key: "ruby22"
     paths:
@@ -152,7 +159,7 @@ spec:models:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+    - bundle exec rake spec:models
   cache:
     key: "ruby22"
     paths:
@@ -164,7 +171,7 @@ spec:lib:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+    - bundle exec rake spec:lib
   cache:
     key: "ruby22"
     paths:
@@ -176,7 +183,7 @@ spec:services:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+    - bundle exec rake spec:services
   cache:
     key: "ruby22"
     paths:
@@ -188,7 +195,7 @@ spec:other:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+    - bundle exec rake spec:other
   cache:
     key: "ruby22"
     paths:
@@ -200,8 +207,8 @@ spinach:project:half:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+    - bundle exec rake assets:precompile 2>/dev/null
+    - bundle exec rake spinach:project:half
   cache:
     key: "ruby22"
     paths:
@@ -213,8 +220,8 @@ spinach:project:rest:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+    - bundle exec rake assets:precompile 2>/dev/null
+    - bundle exec rake spinach:project:rest
   cache:
     key: "ruby22"
     paths:
@@ -226,8 +233,8 @@ spinach:other:ruby22:
   only:
   - master
   script:
-    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+    - bundle exec rake assets:precompile 2>/dev/null
+    - bundle exec rake spinach:other
   cache:
     key: "ruby22"
     paths:

From 71edcf59ee1f8bf7047ca293d5693642feeb3669 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 20:51:09 -0500
Subject: [PATCH 1038/1431] Improve .gitlab-ci.yml

---
 .gitlab-ci.yml | 110 +++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 72 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7b99cf27bb..dc81a698551 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,35 +15,13 @@ variables:
   RSPEC_RETRY_RETRY_COUNT: "3"
   RAILS_ENV: "test"
   SIMPLECOV: "true"
+  USE_DB: "true"
 
 before_script:
   - source ./scripts/prepare_build.sh
-  - ruby -v
-  - which ruby
-  - retry gem install bundler --no-ri --no-rdoc
   - cp config/gitlab.yml.example config/gitlab.yml
-  - touch log/application.log
-  - touch log/test.log
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
-  - bundle exec rake db:drop db:create db:schema:load db:migrate
-
-.rspec_tests: &rspec_tests
-  stage: test
-  script:
-    - JOB_NAME=( $CI_BUILD_NAME )
-    - export CI_NODE_INDEX=${JOB_NAME[1]}
-    - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - bundle exec rake assets:precompile 2>/dev/null
-    - bundle exec rake knapsack:rspec
-
-.spinach_tests: &spinach_tests
-  stage: test
-  script:
-    - JOB_NAME=( $CI_BUILD_NAME )
-    - export CI_NODE_INDEX=${JOB_NAME[1]}
-    - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - bundle exec rake assets:precompile 2>/dev/null
-    - bundle exec rake knapsack:cucumber
+  - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
 stages:
 - build
@@ -52,6 +30,8 @@ stages:
 
 prepare:
   stage: build
+  variables:
+    USE_DB: "false"
   script:
     - bundle exec rake assets:precompile
     - echo "{}" > knapsack_rspec_report.json
@@ -62,57 +42,48 @@ prepare:
     - knapsack_rspec_report.json
     - knapsack_cucumber_report.json
 
-spec 0 10: *rspec_tests
-spec 1 10: *rspec_tests
-spec 2 10: *rspec_tests
-spec 3 10: *rspec_tests
-spec 4 10: *rspec_tests
-spec 5 10: *rspec_tests
-spec 6 10: *rspec_tests
-spec 7 10: *rspec_tests
-spec 8 10: *rspec_tests
-spec 9 10: *rspec_tests
-
-spinach 0 10: *spinach_tests
-spinach 1 10: *spinach_tests
-spinach 2 10: *spinach_tests
-spinach 3 10: *spinach_tests
-spinach 4 10: *spinach_tests
-spinach 5 10: *spinach_tests
-spinach 6 10: *spinach_tests
-spinach 7 10: *spinach_tests
-spinach 8 10: *spinach_tests
-spinach 9 10: *spinach_tests
-
-teaspoon:
+.knapsack: &knapsack
   stage: test
   script:
-    - bundle exec teaspoon
+    - JOB_NAME=( $CI_BUILD_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[1]}
+    - export CI_NODE_TOTAL=${JOB_NAME[2]}
+    - bundle exec rake knapsack:${JOB_NAME[0]}
 
-rubocop:
+.exec: &exec
   stage: test
   script:
-    - bundle exec rubocop
+    - bundle exec $CI_BUILD_NAME
 
-scss-lint:
-  stage: test
-  script:
-    - bundle exec rake scss_lint
+rspec 0 10: *knapsack
+rspec 1 10: *knapsack
+rspec 2 10: *knapsack
+rspec 3 10: *knapsack
+rspec 4 10: *knapsack
+rspec 5 10: *knapsack
+rspec 6 10: *knapsack
+rspec 7 10: *knapsack
+rspec 8 10: *knapsack
+rspec 9 10: *knapsack
 
-brakeman:
-  stage: test
-  script:
-    - bundle exec rake brakeman
+spinach 0 10: *knapsack
+spinach 1 10: *knapsack
+spinach 2 10: *knapsack
+spinach 3 10: *knapsack
+spinach 4 10: *knapsack
+spinach 5 10: *knapsack
+spinach 6 10: *knapsack
+spinach 7 10: *knapsack
+spinach 8 10: *knapsack
+spinach 9 10: *knapsack
 
-flog:
-  stage: test
-  script:
-    - bundle exec rake flog
-
-flay:
-  stage: test
-  script:
-    - bundle exec rake flay
+teaspoon: *exec
+rubocop: *exec
+rake scss_lint: *exec
+rake brakeman: *exec
+rake flog: *exec
+rake flay: *exec
+rake db:migrate:reset: *exec
 
 bundler:audit:
   stage: test
@@ -121,11 +92,6 @@ bundler:audit:
   script:
     - "bundle exec bundle-audit check --update --ignore OSVDB-115941"
 
-db-migrate-reset:
-  stage: test
-  script:
-    - bundle exec rake db:migrate:reset
-
 # Ruby 2.2 jobs
 
 spec:feature:ruby22:

From e77c7116cc83775c0f20f0c106b92a56681208a2 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 20:52:19 -0500
Subject: [PATCH 1039/1431] Fix assets

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc81a698551..99ec069a533 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ prepare:
     - echo "{}" > knapsack_cucumber_report.json
   artifacts:
     paths:
-    - assets/public/
+    - public/assets/
     - knapsack_rspec_report.json
     - knapsack_cucumber_report.json
 

From f768d2ccd4506be132bf6903a22d5f5748dec24b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 21:04:26 -0500
Subject: [PATCH 1040/1431] add bundler

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99ec069a533..3896c37c335 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
 before_script:
   - source ./scripts/prepare_build.sh
   - cp config/gitlab.yml.example config/gitlab.yml
+  - retry gem install bundler --no-ri --no-rdoc
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 

From 1276bc6c069dca8410ec39ab880bf5a0b61eca9f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 23:34:54 -0500
Subject: [PATCH 1041/1431] Test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3896c37c335..29359e935e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
 before_script:
   - source ./scripts/prepare_build.sh
   - cp config/gitlab.yml.example config/gitlab.yml
-  - retry gem install bundler --no-ri --no-rdoc
+  - retry gem install bundler
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 

From 713bbed74e2d144d5e92969fd942621c166bf319 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 23:45:16 -0500
Subject: [PATCH 1042/1431] Test

---
 .gitlab-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29359e935e9..20c86aa00fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,11 @@ stages:
 - test
 - notifications
 
+test-bundler:
+  stage: build
+  script:
+    - bundle exec bundle --version
+
 prepare:
   stage: build
   variables:

From 2494569d59a8f2fa4c61f62a06f0afe739635a6d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 21 May 2016 23:57:25 -0500
Subject: [PATCH 1043/1431] Test

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20c86aa00fa..50233a2d8ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
 before_script:
   - source ./scripts/prepare_build.sh
   - cp config/gitlab.yml.example config/gitlab.yml
-  - retry gem install bundler
+  #- retry gem install bundler
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
@@ -31,7 +31,10 @@ stages:
 
 test-bundler:
   stage: build
+  variables:
+    USE_DB: "false"
   script:
+    - retry gem install bundler
     - bundle exec bundle --version
 
 prepare:

From 3e61c8feb448bf44b025e7e7b02935b73ea52765 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 00:31:38 -0500
Subject: [PATCH 1044/1431] Test

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50233a2d8ac..2aaafdf0d92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
 before_script:
   - source ./scripts/prepare_build.sh
   - cp config/gitlab.yml.example config/gitlab.yml
+  - bundle --version
   #- retry gem install bundler
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'

From 20dc6a708b4bad9507412e3a96c1c0bd25cf6fc4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 19:27:34 -0500
Subject: [PATCH 1045/1431] Use knapsack directly

---
 .gitlab-ci.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2aaafdf0d92..837aed3ae0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,6 @@ before_script:
   - source ./scripts/prepare_build.sh
   - cp config/gitlab.yml.example config/gitlab.yml
   - bundle --version
-  #- retry gem install bundler
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
@@ -30,20 +29,12 @@ stages:
 - test
 - notifications
 
-test-bundler:
-  stage: build
-  variables:
-    USE_DB: "false"
-  script:
-    - retry gem install bundler
-    - bundle exec bundle --version
-
 prepare:
   stage: build
   variables:
     USE_DB: "false"
   script:
-    - bundle exec rake assets:precompile
+    #- bundle exec rake assets:precompile
     - echo "{}" > knapsack_rspec_report.json
     - echo "{}" > knapsack_cucumber_report.json
   artifacts:
@@ -58,7 +49,8 @@ prepare:
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - bundle exec rake knapsack:${JOB_NAME[0]}
+    - gem install knapsack
+    - knapsack ${JOB_NAME[0]}
 
 .exec: &exec
   stage: test

From 8d8d2759efaba594ec010a030bed94785016e274 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 20:23:40 -0500
Subject: [PATCH 1046/1431] WIP

---
 .gitlab-ci.yml          | 2 +-
 features/support/env.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 837aed3ae0a..a5065693b5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ prepare:
   variables:
     USE_DB: "false"
   script:
-    #- bundle exec rake assets:precompile
+    - bundle exec rake assets:precompile
     - echo "{}" > knapsack_rspec_report.json
     - echo "{}" > knapsack_cucumber_report.json
   artifacts:
diff --git a/features/support/env.rb b/features/support/env.rb
index 6ebd012a40f..5a34159ec92 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -21,8 +21,6 @@ require_relative 'rerun'
   require Rails.root.join('spec', 'support', f)
 end
 
-Knapsack::Adapters::CucumberAdapter.bind
-
 Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file }
 
 WebMock.allow_net_connect!

From 77f8deec2ccbde0e502ecf35e1484f2c2e4e8a54 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 20:34:36 -0500
Subject: [PATCH 1047/1431] Use own version of knapsack which supports spinach
 tests

---
 Gemfile                 | 2 +-
 Gemfile.lock            | 4 ++--
 Rakefile                | 2 +-
 features/support/env.rb | 4 +++-
 spec/spec_helper.rb     | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index b9ae1aecb50..f4602008ecf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -313,7 +313,7 @@ group :test do
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit', '~> 0.4.2'
   gem 'sham_rack'
-  gem 'knapsack'
+  gem 'knapsack-gitlab'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 930a0f3f8d2..c04a3b1351d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -358,7 +358,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    knapsack (1.9.0)
+    knapsack-gitlab (1.9.0)
       rake
       timecop (>= 0.1.0)
     launchy (2.4.3)
@@ -878,7 +878,7 @@ DEPENDENCIES
   jquery-ui-rails (~> 5.0.0)
   jwt
   kaminari (~> 0.17.0)
-  knapsack
+  knapsack-gitlab
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
diff --git a/Rakefile b/Rakefile
index 16261bf8ae2..bcfcba634d2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'knapsack'
+require 'knapsack-gitlab'
 
 relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
diff --git a/features/support/env.rb b/features/support/env.rb
index 5a34159ec92..b4b3e7359b4 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,12 +11,14 @@ ENV['RAILS_ENV'] = 'test'
 require './config/environment'
 require 'rspec/expectations'
 require 'sidekiq/testing/inline'
-require 'knapsack'
+require 'knapsack-gitlab'
 
 require_relative 'capybara'
 require_relative 'db_cleaner'
 require_relative 'rerun'
 
+Knapsack::Adapters::SpinachAdapter.bind
+
 %w(select2_helper test_env repo_helpers).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 84b9ee75f6a..f6d8dd42249 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,7 +15,7 @@ require 'rspec/rails'
 require 'shoulda/matchers'
 require 'sidekiq/testing/inline'
 require 'rspec/retry'
-require 'knapsack'
+require 'knapsack-gitlab'
 require_relative 'knapsack_merger'
 
 Knapsack::Adapters::RSpecAdapter.bind

From e275b6d2510fc94ea32e94acb44429cfcec28543 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 20:40:56 -0500
Subject: [PATCH 1048/1431] fix yml

---
 .gitlab-ci.yml | 2 +-
 Rakefile       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5065693b5a..61136564623 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ before_script:
   - cp config/gitlab.yml.example config/gitlab.yml
   - bundle --version
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
+  - retry gem install knapsack-gitlab
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
 stages:
@@ -49,7 +50,6 @@ prepare:
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - gem install knapsack
     - knapsack ${JOB_NAME[0]}
 
 .exec: &exec
diff --git a/Rakefile b/Rakefile
index bcfcba634d2..16261bf8ae2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'knapsack-gitlab'
+require 'knapsack'
 
 relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")

From 9df2613a4e22741f8c0dfd6ff053adc7b0ff7a69 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 21:52:21 -0500
Subject: [PATCH 1049/1431] Fix knapsack usage

---
 .gitlab-ci.yml | 2 +-
 Gemfile.lock   | 2 +-
 Rakefile       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61136564623..d573d80cdb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ prepare:
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - knapsack ${JOB_NAME[0]}
+    - knapsack-gitlab ${JOB_NAME[0]}
 
 .exec: &exec
   stage: test
diff --git a/Gemfile.lock b/Gemfile.lock
index c04a3b1351d..0f75c231d4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -358,7 +358,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    knapsack-gitlab (1.9.0)
+    knapsack-gitlab (1.9.2)
       rake
       timecop (>= 0.1.0)
     launchy (2.4.3)
diff --git a/Rakefile b/Rakefile
index 16261bf8ae2..bcfcba634d2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'knapsack'
+require 'knapsack-gitlab'
 
 relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")

From fb404466b697ee9e0dc914710115c74718e614ab Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 22:03:19 -0500
Subject: [PATCH 1050/1431] Use spinach record

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d573d80cdb8..3e63c4a45d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,12 +37,12 @@ prepare:
   script:
     - bundle exec rake assets:precompile
     - echo "{}" > knapsack_rspec_report.json
-    - echo "{}" > knapsack_cucumber_report.json
+    - echo "{}" > knapsack_spinach_report.json
   artifacts:
     paths:
     - public/assets/
     - knapsack_rspec_report.json
-    - knapsack_cucumber_report.json
+    - knapsack_spinach_report.json
 
 .knapsack: &knapsack
   stage: test

From 2defc128bc46d327a19763ce72bdb90d26e27d8f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 22:07:22 -0500
Subject: [PATCH 1051/1431] Use more concurrency

---
 .gitlab-ci.yml | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e63c4a45d6..8b5db89c94b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,16 +57,26 @@ prepare:
   script:
     - bundle exec $CI_BUILD_NAME
 
-rspec 0 10: *knapsack
-rspec 1 10: *knapsack
-rspec 2 10: *knapsack
-rspec 3 10: *knapsack
-rspec 4 10: *knapsack
-rspec 5 10: *knapsack
-rspec 6 10: *knapsack
-rspec 7 10: *knapsack
-rspec 8 10: *knapsack
-rspec 9 10: *knapsack
+rspec 0 20: *knapsack
+rspec 1 20: *knapsack
+rspec 2 20: *knapsack
+rspec 3 20: *knapsack
+rspec 4 20: *knapsack
+rspec 5 20: *knapsack
+rspec 6 20: *knapsack
+rspec 7 20: *knapsack
+rspec 8 20: *knapsack
+rspec 9 20: *knapsack
+rspec 10 20: *knapsack
+rspec 11 20: *knapsack
+rspec 12 20: *knapsack
+rspec 13 20: *knapsack
+rspec 14 20: *knapsack
+rspec 15 20: *knapsack
+rspec 16 20: *knapsack
+rspec 17 20: *knapsack
+rspec 18 20: *knapsack
+rspec 19 20: *knapsack
 
 spinach 0 10: *knapsack
 spinach 1 10: *knapsack

From 432b96640fb2955d118f43ae2463347745cb8386 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 22 May 2016 22:39:21 -0500
Subject: [PATCH 1052/1431] More spinaches

---
 .gitlab-ci.yml | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b5db89c94b..d0bce69cf5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,16 +78,26 @@ rspec 17 20: *knapsack
 rspec 18 20: *knapsack
 rspec 19 20: *knapsack
 
-spinach 0 10: *knapsack
-spinach 1 10: *knapsack
-spinach 2 10: *knapsack
-spinach 3 10: *knapsack
-spinach 4 10: *knapsack
-spinach 5 10: *knapsack
-spinach 6 10: *knapsack
-spinach 7 10: *knapsack
-spinach 8 10: *knapsack
-spinach 9 10: *knapsack
+spinach 0 20: *knapsack
+spinach 1 20: *knapsack
+spinach 2 20: *knapsack
+spinach 3 20: *knapsack
+spinach 4 20: *knapsack
+spinach 5 20: *knapsack
+spinach 6 20: *knapsack
+spinach 7 20: *knapsack
+spinach 8 20: *knapsack
+spinach 9 20: *knapsack
+spinach 10 20: *knapsack
+spinach 11 20: *knapsack
+spinach 12 20: *knapsack
+spinach 13 20: *knapsack
+spinach 14 20: *knapsack
+spinach 15 20: *knapsack
+spinach 16 20: *knapsack
+spinach 17 20: *knapsack
+spinach 18 20: *knapsack
+spinach 19 20: *knapsack
 
 teaspoon: *exec
 rubocop: *exec

From 1fab583266af0904dfc29facfe4551e37c06342a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 17:08:44 +0200
Subject: [PATCH 1053/1431] Remove instances of Auth.new

---
 app/controllers/jwt_controller.rb | 2 +-
 lib/gitlab/backend/grack_auth.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index cee3b6c43e7..c05a55633b5 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -45,7 +45,7 @@ class JwtController < ApplicationController
     # TODO: this is a copy and paste from grack_auth,
     # it should be refactored in the future
 
-    user = Gitlab::Auth.new.find(login, password)
+    user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
 
     # If the user authenticated successfully, we reset the auth failure count
     # from Rack::Attack for that IP. A client may attempt to authenticate
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index 492ffb138a3..9e09d2e118d 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -95,7 +95,7 @@ module Grack
     end
 
     def authenticate_user(login, password)
-      user = Gitlab::Auth.new.find_in_gitlab_or_ldap(login, password)
+      user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
 
       unless user
         user = oauth_access_token_check(login, password)

From 03bec6b0e943a3a047fd8f6185f71a976c02506c Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 17:14:13 +0200
Subject: [PATCH 1054/1431] Argh mixed up all the negatives

---
 lib/gitlab/auth/rate_limiter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/auth/rate_limiter.rb b/lib/gitlab/auth/rate_limiter.rb
index 4be9f6d0efe..1089bc9f89e 100644
--- a/lib/gitlab/auth/rate_limiter.rb
+++ b/lib/gitlab/auth/rate_limiter.rb
@@ -20,7 +20,7 @@ module Gitlab
         # Allow2Ban.filter will return false if this IP has not failed too often yet
         @banned = Rack::Attack::Allow2Ban.filter(ip, config) do
           # If we return false here, the failure for this IP is ignored by Allow2Ban
-          ignore_failure?
+          ip_can_be_banned?
         end
       end
       
@@ -34,7 +34,7 @@ module Gitlab
         Gitlab.config.rack_attack.git_basic_auth
       end
       
-      def ignore_failure?
+      def ip_can_be_banned?
         config.ip_whitelist.exclude?(ip)
       end
     end

From 95c3a927b319c8495c28e6431152e5ca0c5df30b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 17:15:00 +0200
Subject: [PATCH 1055/1431] Use knapsack 1.11.0

---
 .gitlab-ci.yml | 21 +++++++++++++--------
 Gemfile        |  2 +-
 Gemfile.lock   |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0bce69cf5a..cf85820abdf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,27 +22,27 @@ before_script:
   - cp config/gitlab.yml.example config/gitlab.yml
   - bundle --version
   - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
-  - retry gem install knapsack-gitlab
+  - retry gem install knapsack
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
 stages:
-- build
+- prepare
 - test
 - notifications
 
 prepare:
-  stage: build
+  stage: prepare
   variables:
     USE_DB: "false"
   script:
     - bundle exec rake assets:precompile
-    - echo "{}" > knapsack_rspec_report.json
-    - echo "{}" > knapsack_spinach_report.json
+    - mkdir knapsack/
+    - echo "{}" > knapsack/rspec_report.json
+    - echo "{}" > knapsack/spinach_report.json
   artifacts:
     paths:
     - public/assets/
-    - knapsack_rspec_report.json
-    - knapsack_spinach_report.json
+    - knapsack/
 
 .knapsack: &knapsack
   stage: test
@@ -50,7 +50,12 @@ prepare:
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - knapsack-gitlab ${JOB_NAME[0]}
+    - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
+    - knapsack ${JOB_NAME[0]}
+  artifacts:
+    paths:
+    - knapsack/
 
 .exec: &exec
   stage: test
diff --git a/Gemfile b/Gemfile
index f4602008ecf..b9ae1aecb50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -313,7 +313,7 @@ group :test do
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit', '~> 0.4.2'
   gem 'sham_rack'
-  gem 'knapsack-gitlab'
+  gem 'knapsack'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f75c231d4e..8bfdf8ea9bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -358,7 +358,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    knapsack-gitlab (1.9.2)
+    knapsack (1.11.0)
       rake
       timecop (>= 0.1.0)
     launchy (2.4.3)
@@ -878,7 +878,7 @@ DEPENDENCIES
   jquery-ui-rails (~> 5.0.0)
   jwt
   kaminari (~> 0.17.0)
-  knapsack-gitlab
+  knapsack
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)

From 3f3b036defe4f22656f945f341c1d7da06d5543c Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 3 Jun 2016 17:23:34 +0200
Subject: [PATCH 1056/1431] Use public_send

---
 lib/gitlab/auth.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index dd6ba84c973..bd129d7216a 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -49,8 +49,7 @@ module Gitlab
         elsif Service.available_services_names.include?(underscored_service)
           # We treat underscored_service as a trusted input because it is included
           # in the Service.available_services_names whitelist.
-          service_method = "#{underscored_service}_service"
-          service = project.send(service_method)
+          service = project.public_send("#{underscored_service}_service")
 
           service && service.activated? && service.valid_token?(password)
         end

From 792670f4ce467f278b5cdfd609a221bbbe26187d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 17:35:00 +0200
Subject: [PATCH 1057/1431] Merge knapsack reports and upload them to external
 server

---
 .gitlab-ci.yml        | 19 ++++++++++++++++++-
 scripts/merge-reports | 29 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100755 scripts/merge-reports

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf85820abdf..6fc410b4b51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ before_script:
 stages:
 - prepare
 - test
+- post-test
 - notifications
 
 prepare:
@@ -36,7 +37,7 @@ prepare:
     USE_DB: "false"
   script:
     - bundle exec rake assets:precompile
-    - mkdir knapsack/
+    - mkdir -p knapsack/
     - echo "{}" > knapsack/rspec_report.json
     - echo "{}" > knapsack/spinach_report.json
   artifacts:
@@ -57,6 +58,22 @@ prepare:
     paths:
     - knapsack/
 
+post-tests:
+  stage: post-test
+  variables:
+    USE_DB: "false"
+  script:
+    - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
+    - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
+    - rm -f knapsack/*_node_*.json
+  cache:
+    key: "knapsack"
+    paths:
+    - knapsack/
+  artifacts:
+    paths:
+    - knapsack/
+
 .exec: &exec
   stage: test
   script:
diff --git a/scripts/merge-reports b/scripts/merge-reports
new file mode 100755
index 00000000000..f7b574001ac
--- /dev/null
+++ b/scripts/merge-reports
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'yaml'
+
+main_report_file = ARGV.shift
+unless main_report_file
+  puts 'usage: merge_reports <main-report> [extra reports...]'
+  exit 1
+end
+
+puts "Loading #{main_report_file}..."
+main_report = JSON.parse(File.read(main_report_file))
+new_report = main_report.dup
+
+ARGV.each do |report_file|
+  report = JSON.parse(File.read(report_file))
+
+  # Remove existing values
+  updates = report.delete_if do |key, value|
+    main_report[key] && main_report[key] == value
+  end
+  new_report.merge!(updates)
+
+  puts "Merged #{report_file} adding #{updates.size} results."
+end
+
+File.write(main_report_file, JSON.pretty_generate(new_report))
+puts "Saved #{main_report_file}."

From 86498d4d99472edcb70ab1631f463133995a8cbf Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 17:39:53 +0200
Subject: [PATCH 1058/1431] Use knapsack everywhere

---
 Rakefile                | 2 +-
 features/support/env.rb | 2 +-
 spec/spec_helper.rb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index bcfcba634d2..16261bf8ae2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'knapsack-gitlab'
+require 'knapsack'
 
 relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
diff --git a/features/support/env.rb b/features/support/env.rb
index b4b3e7359b4..4552db8ad77 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,7 +11,7 @@ ENV['RAILS_ENV'] = 'test'
 require './config/environment'
 require 'rspec/expectations'
 require 'sidekiq/testing/inline'
-require 'knapsack-gitlab'
+require 'knapsack'
 
 require_relative 'capybara'
 require_relative 'db_cleaner'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f6d8dd42249..84b9ee75f6a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,7 +15,7 @@ require 'rspec/rails'
 require 'shoulda/matchers'
 require 'sidekiq/testing/inline'
 require 'rspec/retry'
-require 'knapsack-gitlab'
+require 'knapsack'
 require_relative 'knapsack_merger'
 
 Knapsack::Adapters::RSpecAdapter.bind

From 903946c78a0f73e5cbdfce7b93d31c4d1bd045cd Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 1 Jun 2016 16:37:15 -0600
Subject: [PATCH 1059/1431] Replace colorize gem with rainbow.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Colorize is a gem licensed under the GPLv2, so we can’t use it in GitLab without relicensing GitLab under the terms of the GPL. Rainbow is licensed under the MIT license and does the exact same thing as Colorize, so Rainbow was added in place of Colorize.

The syntax is slightly different for Rainbow vs. Colorize, and was updated in accordance.

The gem is still a dependency of Spinach, so it’s included in the development/test environments, but won’t be packaged with the actual product, and therefore doesn’t require we relicense the product.

An attempt at relicensing Colorize was made, but didn’t succeed as the library owner never responded.

Rainbow library: https://github.com/sickill/rainbow
Relevant issue regarding licensing in GitLab's gems: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3775
---
 Gemfile                                   |   2 +-
 Gemfile.lock                              |   2 +-
 lib/backup/database.rb                    |   4 +-
 lib/backup/manager.rb                     |  30 ++--
 lib/backup/repository.rb                  |  26 ++--
 lib/gitlab/seeder.rb                      |   2 +-
 lib/tasks/gitlab/backup.rake              |  80 +++++-----
 lib/tasks/gitlab/check.rake               | 178 +++++++++++-----------
 lib/tasks/gitlab/cleanup.rake             |  18 +--
 lib/tasks/gitlab/db.rake                  |   8 +-
 lib/tasks/gitlab/git.rake                 |   8 +-
 lib/tasks/gitlab/import.rake              |  14 +-
 lib/tasks/gitlab/info.rake                |  26 ++--
 lib/tasks/gitlab/shell.rake               |   4 +-
 lib/tasks/gitlab/task_helpers.rake        |  10 +-
 lib/tasks/gitlab/two_factor.rake          |   8 +-
 lib/tasks/gitlab/update_commit_count.rake |   6 +-
 lib/tasks/gitlab/update_gitignore.rake    |   4 +-
 lib/tasks/gitlab/web_hook.rake            |   6 +-
 lib/tasks/migrate/migrate_iids.rake       |   6 +-
 lib/tasks/spinach.rake                    |   2 +-
 21 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/Gemfile b/Gemfile
index d9429de786f..a50d7e632ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@ gem 'redis-namespace'
 gem "httparty", '~> 0.13.3'
 
 # Colored output to console
-gem "colorize", '~> 0.7.0'
+gem "rainbow", '~> 2.1.0'
 
 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ae25269e65..1771b919b60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -823,7 +823,6 @@ DEPENDENCIES
   carrierwave (~> 0.10.0)
   charlock_holmes (~> 0.7.3)
   coffee-rails (~> 4.1.0)
-  colorize (~> 0.7.0)
   connection_pool (~> 2.0)
   coveralls (~> 0.8.2)
   creole (~> 0.5.0)
@@ -914,6 +913,7 @@ DEPENDENCIES
   rack-oauth2 (~> 1.2.1)
   rails (= 4.2.6)
   rails-deprecated_sanitizer (~> 1.0.3)
+  rainbow (~> 2.1.0)
   raphael-rails (~> 2.1.2)
   rblineprof
   rdoc (~> 3.6)
diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index 67b2a64bd10..22319ec6623 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -86,9 +86,9 @@ module Backup
 
     def report_success(success)
       if success
-        $progress.puts '[DONE]'.green
+        $progress.puts '[DONE]'.color(:green)
       else
-        $progress.puts '[FAILED]'.red
+        $progress.puts '[FAILED]'.color(:red)
       end
     end
   end
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 660ca8c2923..9dd665441a0 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -27,9 +27,9 @@ module Backup
         # Set file permissions on open to prevent chmod races.
         tar_system_options = {out: [tar_file, 'w', Gitlab.config.backup.archive_permissions]}
         if Kernel.system('tar', '-cf', '-', *backup_contents, tar_system_options)
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         else
-          puts "creating archive #{tar_file} failed".red
+          puts "creating archive #{tar_file} failed".color(:red)
           abort 'Backup failed'
         end
 
@@ -43,7 +43,7 @@ module Backup
 
       connection_settings = Gitlab.config.backup.upload.connection
       if connection_settings.blank?
-        $progress.puts "skipped".yellow
+        $progress.puts "skipped".color(:yellow)
         return
       end
 
@@ -53,9 +53,9 @@ module Backup
       if directory.files.create(key: tar_file, body: File.open(tar_file), public: false,
           multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size,
           encryption: Gitlab.config.backup.upload.encryption)
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       else
-        puts "uploading backup to #{remote_directory} failed".red
+        puts "uploading backup to #{remote_directory} failed".color(:red)
         abort 'Backup failed'
       end
     end
@@ -67,9 +67,9 @@ module Backup
         next unless File.exist?(File.join(Gitlab.config.backup.path, dir))
 
         if FileUtils.rm_rf(File.join(Gitlab.config.backup.path, dir))
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         else
-          puts "deleting tmp directory '#{dir}' failed".red
+          puts "deleting tmp directory '#{dir}' failed".color(:red)
           abort 'Backup failed'
         end
       end
@@ -95,9 +95,9 @@ module Backup
           end
         end
 
-        $progress.puts "done. (#{removed} removed)".green
+        $progress.puts "done. (#{removed} removed)".color(:green)
       else
-        $progress.puts "skipping".yellow
+        $progress.puts "skipping".color(:yellow)
       end
     end
 
@@ -124,20 +124,20 @@ module Backup
       $progress.print "Unpacking backup ... "
 
       unless Kernel.system(*%W(tar -xf #{tar_file}))
-        puts "unpacking backup failed".red
+        puts "unpacking backup failed".color(:red)
         exit 1
       else
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
 
       ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0
 
       # restoring mismatching backups can lead to unexpected problems
       if settings[:gitlab_version] != Gitlab::VERSION
-        puts "GitLab version mismatch:".red
-        puts "  Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".red
-        puts "  Please switch to the following version and try again:".red
-        puts "  version: #{settings[:gitlab_version]}".red
+        puts "GitLab version mismatch:".color(:red)
+        puts "  Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".color(:red)
+        puts "  Please switch to the following version and try again:".color(:red)
+        puts "  version: #{settings[:gitlab_version]}".color(:red)
         puts
         puts "Hint: git checkout v#{settings[:gitlab_version]}"
         exit 1
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index a82a7e1f7bf..7b91215d50b 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -14,14 +14,14 @@ module Backup
         FileUtils.mkdir_p(File.join(backup_repos_path, project.namespace.path)) if project.namespace
 
         if project.empty_repo?
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           cmd = %W(tar -cf #{path_to_bundle(project)} -C #{path_to_repo(project)} .)
           output, status = Gitlab::Popen.popen(cmd)
           if status.zero?
-            $progress.puts "[DONE]".green
+            $progress.puts "[DONE]".color(:green)
           else
-            puts "[FAILED]".red
+            puts "[FAILED]".color(:red)
             puts "failed: #{cmd.join(' ')}"
             puts output
             abort 'Backup failed'
@@ -33,14 +33,14 @@ module Backup
         if File.exists?(path_to_repo(wiki))
           $progress.print " * #{wiki.path_with_namespace} ... "
           if wiki.repository.empty?
-            $progress.puts " [SKIPPED]".cyan
+            $progress.puts " [SKIPPED]".color(:cyan)
           else
             cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path_to_repo(wiki)} bundle create #{path_to_bundle(wiki)} --all)
             output, status = Gitlab::Popen.popen(cmd)
             if status.zero?
-              $progress.puts " [DONE]".green
+              $progress.puts " [DONE]".color(:green)
             else
-              puts " [FAILED]".red
+              puts " [FAILED]".color(:red)
               puts "failed: #{cmd.join(' ')}"
               abort 'Backup failed'
             end
@@ -71,9 +71,9 @@ module Backup
         end
 
         if system(*cmd, silent)
-          $progress.puts "[DONE]".green
+          $progress.puts "[DONE]".color(:green)
         else
-          puts "[FAILED]".red
+          puts "[FAILED]".color(:red)
           puts "failed: #{cmd.join(' ')}"
           abort 'Restore failed'
         end
@@ -90,21 +90,21 @@ module Backup
           cmd = %W(#{Gitlab.config.git.bin_path} clone --bare #{path_to_bundle(wiki)} #{path_to_repo(wiki)})
 
           if system(*cmd, silent)
-            $progress.puts " [DONE]".green
+            $progress.puts " [DONE]".color(:green)
           else
-            puts " [FAILED]".red
+            puts " [FAILED]".color(:red)
             puts "failed: #{cmd.join(' ')}"
             abort 'Restore failed'
           end
         end
       end
 
-      $progress.print 'Put GitLab hooks in repositories dirs'.yellow
+      $progress.print 'Put GitLab hooks in repositories dirs'.color(:yellow)
       cmd = "#{Gitlab.config.gitlab_shell.path}/bin/create-hooks"
       if system(cmd)
-        $progress.puts " [DONE]".green
+        $progress.puts " [DONE]".color(:green)
       else
-        puts " [FAILED]".red
+        puts " [FAILED]".color(:red)
         puts "failed: #{cmd}"
       end
 
diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index 2ef0e982256..7cf506ebe64 100644
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -5,7 +5,7 @@ module Gitlab
       SeedFu.quiet = true
       yield
       SeedFu.quiet = false
-      puts "\nOK".green
+      puts "\nOK".color(:green)
     end
 
     def self.by_user(user)
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 596eaca6d0d..9ee72fde92f 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -40,14 +40,14 @@ namespace :gitlab do
             removed.
           MSG
           ask_to_continue
-          puts 'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'.yellow
+          puts 'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'.color(:yellow)
           sleep(5)
         end
         # Drop all tables Load the schema to ensure we don't have any newer tables
         # hanging out from a failed upgrade
-        $progress.puts 'Cleaning the database ... '.blue
+        $progress.puts 'Cleaning the database ... '.color(:blue)
         Rake::Task['gitlab:db:drop_tables'].invoke
-        $progress.puts 'done'.green
+        $progress.puts 'done'.color(:green)
         Rake::Task['gitlab:backup:db:restore'].invoke
       end
       Rake::Task['gitlab:backup:repo:restore'].invoke unless backup.skipped?('repositories')
@@ -63,141 +63,141 @@ namespace :gitlab do
 
     namespace :repo do
       task create: :environment do
-        $progress.puts "Dumping repositories ...".blue
+        $progress.puts "Dumping repositories ...".color(:blue)
 
         if ENV["SKIP"] && ENV["SKIP"].include?("repositories")
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           Backup::Repository.new.dump
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring repositories ...".blue
+        $progress.puts "Restoring repositories ...".color(:blue)
         Backup::Repository.new.restore
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
     end
 
     namespace :db do
       task create: :environment do
-        $progress.puts "Dumping database ... ".blue
+        $progress.puts "Dumping database ... ".color(:blue)
 
         if ENV["SKIP"] && ENV["SKIP"].include?("db")
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           Backup::Database.new.dump
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring database ... ".blue
+        $progress.puts "Restoring database ... ".color(:blue)
         Backup::Database.new.restore
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
     end
 
     namespace :builds do
       task create: :environment do
-        $progress.puts "Dumping builds ... ".blue
+        $progress.puts "Dumping builds ... ".color(:blue)
 
         if ENV["SKIP"] && ENV["SKIP"].include?("builds")
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           Backup::Builds.new.dump
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring builds ... ".blue
+        $progress.puts "Restoring builds ... ".color(:blue)
         Backup::Builds.new.restore
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
     end
 
     namespace :uploads do
       task create: :environment do
-        $progress.puts "Dumping uploads ... ".blue
+        $progress.puts "Dumping uploads ... ".color(:blue)
 
         if ENV["SKIP"] && ENV["SKIP"].include?("uploads")
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           Backup::Uploads.new.dump
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring uploads ... ".blue
+        $progress.puts "Restoring uploads ... ".color(:blue)
         Backup::Uploads.new.restore
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
     end
 
     namespace :artifacts do
       task create: :environment do
-        $progress.puts "Dumping artifacts ... ".blue
+        $progress.puts "Dumping artifacts ... ".color(:blue)
 
         if ENV["SKIP"] && ENV["SKIP"].include?("artifacts")
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           Backup::Artifacts.new.dump
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring artifacts ... ".blue
+        $progress.puts "Restoring artifacts ... ".color(:blue)
         Backup::Artifacts.new.restore
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
     end
 
     namespace :lfs do
       task create: :environment do
-        $progress.puts "Dumping lfs objects ... ".blue
+        $progress.puts "Dumping lfs objects ... ".color(:blue)
 
         if ENV["SKIP"] && ENV["SKIP"].include?("lfs")
-          $progress.puts "[SKIPPED]".cyan
+          $progress.puts "[SKIPPED]".color(:cyan)
         else
           Backup::Lfs.new.dump
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring lfs objects ... ".blue
+        $progress.puts "Restoring lfs objects ... ".color(:blue)
         Backup::Lfs.new.restore
-        $progress.puts "done".green
+        $progress.puts "done".color(:green)
       end
     end
 
     namespace :registry do
       task create: :environment do
-        $progress.puts "Dumping container registry images ... ".blue
+        $progress.puts "Dumping container registry images ... ".color(:blue)
 
         if Gitlab.config.registry.enabled
           if ENV["SKIP"] && ENV["SKIP"].include?("registry")
-            $progress.puts "[SKIPPED]".cyan
+            $progress.puts "[SKIPPED]".color(:cyan)
           else
             Backup::Registry.new.dump
-            $progress.puts "done".green
+            $progress.puts "done".color(:green)
           end
         else
-          $progress.puts "[DISABLED]".cyan
+          $progress.puts "[DISABLED]".color(:cyan)
         end
       end
 
       task restore: :environment do
-        $progress.puts "Restoring container registry images ... ".blue
+        $progress.puts "Restoring container registry images ... ".color(:blue)
         if Gitlab.config.registry.enabled
           Backup::Registry.new.restore
-          $progress.puts "done".green
+          $progress.puts "done".color(:green)
         else
-          $progress.puts "[DISABLED]".cyan
+          $progress.puts "[DISABLED]".color(:cyan)
         end
       end
     end
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index fad89c73762..12d6ac45fb6 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -50,14 +50,14 @@ namespace :gitlab do
       end
 
       if correct_options.all?
-        puts "yes".green
+        puts "yes".color(:green)
       else
         print "Trying to fix Git error automatically. ..."
 
         if auto_fix_git_config(options)
-          puts "Success".green
+          puts "Success".color(:green)
         else
-          puts "Failed".red
+          puts "Failed".color(:red)
           try_fixing_it(
             sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global core.autocrlf \"#{options["core.autocrlf"]}\"")
           )
@@ -74,9 +74,9 @@ namespace :gitlab do
       database_config_file = Rails.root.join("config", "database.yml")
 
       if File.exists?(database_config_file)
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Copy config/database.yml.<your db> to config/database.yml",
           "Check that the information in config/database.yml is correct"
@@ -95,9 +95,9 @@ namespace :gitlab do
       gitlab_config_file = Rails.root.join("config", "gitlab.yml")
 
       if File.exists?(gitlab_config_file)
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Copy config/gitlab.yml.example to config/gitlab.yml",
           "Update config/gitlab.yml to match your setup"
@@ -114,14 +114,14 @@ namespace :gitlab do
 
       gitlab_config_file = Rails.root.join("config", "gitlab.yml")
       unless File.exists?(gitlab_config_file)
-        puts "can't check because of previous errors".magenta
+        puts "can't check because of previous errors".color(:magenta)
       end
 
       # omniauth or ldap could have been deleted from the file
       unless Gitlab.config['git_host']
-        puts "no".green
+        puts "no".color(:green)
       else
-        puts "yes".red
+        puts "yes".color(:red)
         try_fixing_it(
           "Backup your config/gitlab.yml",
           "Copy config/gitlab.yml.example to config/gitlab.yml",
@@ -138,16 +138,16 @@ namespace :gitlab do
       print "Init script exists? ... "
 
       if omnibus_gitlab?
-        puts 'skipped (omnibus-gitlab has no init script)'.magenta
+        puts 'skipped (omnibus-gitlab has no init script)'.color(:magenta)
         return
       end
 
       script_path = "/etc/init.d/gitlab"
 
       if File.exists?(script_path)
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Install the init script"
         )
@@ -162,7 +162,7 @@ namespace :gitlab do
       print "Init script up-to-date? ... "
 
       if omnibus_gitlab?
-        puts 'skipped (omnibus-gitlab has no init script)'.magenta
+        puts 'skipped (omnibus-gitlab has no init script)'.color(:magenta)
         return
       end
 
@@ -170,7 +170,7 @@ namespace :gitlab do
       script_path = "/etc/init.d/gitlab"
 
       unless File.exists?(script_path)
-        puts "can't check because of previous errors".magenta
+        puts "can't check because of previous errors".color(:magenta)
         return
       end
 
@@ -178,9 +178,9 @@ namespace :gitlab do
       script_content = File.read(script_path)
 
       if recipe_content == script_content
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Redownload the init script"
         )
@@ -197,9 +197,9 @@ namespace :gitlab do
       migration_status, _ = Gitlab::Popen.popen(%W(bundle exec rake db:migrate:status))
 
       unless migration_status =~ /down\s+\d{14}/
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           sudo_gitlab("bundle exec rake db:migrate RAILS_ENV=production")
         )
@@ -210,13 +210,13 @@ namespace :gitlab do
     def check_orphaned_group_members
       print "Database contains orphaned GroupMembers? ... "
       if GroupMember.where("user_id not in (select id from users)").count > 0
-        puts "yes".red
+        puts "yes".color(:red)
         try_fixing_it(
           "You can delete the orphaned records using something along the lines of:",
           sudo_gitlab("bundle exec rails runner -e production 'GroupMember.where(\"user_id NOT IN (SELECT id FROM users)\").delete_all'")
         )
       else
-        puts "no".green
+        puts "no".color(:green)
       end
     end
 
@@ -226,9 +226,9 @@ namespace :gitlab do
       log_path = Rails.root.join("log")
 
       if File.writable?(log_path)
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "sudo chown -R gitlab #{log_path}",
           "sudo chmod -R u+rwX #{log_path}"
@@ -246,9 +246,9 @@ namespace :gitlab do
       tmp_path = Rails.root.join("tmp")
 
       if File.writable?(tmp_path)
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "sudo chown -R gitlab #{tmp_path}",
           "sudo chmod -R u+rwX #{tmp_path}"
@@ -264,7 +264,7 @@ namespace :gitlab do
       print "Uploads directory setup correctly? ... "
 
       unless File.directory?(Rails.root.join('public/uploads'))
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
         )
@@ -280,16 +280,16 @@ namespace :gitlab do
 
       if File.stat(upload_path).mode == 040700
         unless Dir.exists?(upload_path_tmp)
-          puts 'skipped (no tmp uploads folder yet)'.magenta
+          puts 'skipped (no tmp uploads folder yet)'.color(:magenta)
           return
         end
 
         # If tmp upload dir has incorrect permissions, assume others do as well
         # Verify drwx------ permissions
         if File.stat(upload_path_tmp).mode == 040700 && File.owned?(upload_path_tmp)
-          puts "yes".green
+          puts "yes".color(:green)
         else
-          puts "no".red
+          puts "no".color(:red)
           try_fixing_it(
             "sudo chown -R #{gitlab_user} #{upload_path}",
             "sudo find #{upload_path} -type f -exec chmod 0644 {} \\;",
@@ -301,7 +301,7 @@ namespace :gitlab do
           fix_and_rerun
         end
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "sudo chmod 700 #{upload_path}"
         )
@@ -320,9 +320,9 @@ namespace :gitlab do
       redis_version = redis_version.try(:match, /redis-cli (\d+\.\d+\.\d+)/)
       if redis_version &&
           (Gem::Version.new(redis_version[1]) > Gem::Version.new(min_redis_version))
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Update your redis server to a version >= #{min_redis_version}"
         )
@@ -361,10 +361,10 @@ namespace :gitlab do
       repo_base_path = Gitlab.config.gitlab_shell.repos_path
 
       if File.exists?(repo_base_path)
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
-        puts "#{repo_base_path} is missing".red
+        puts "no".color(:red)
+        puts "#{repo_base_path} is missing".color(:red)
         try_fixing_it(
           "This should have been created when setting up GitLab Shell.",
           "Make sure it's set correctly in config/gitlab.yml",
@@ -382,14 +382,14 @@ namespace :gitlab do
 
       repo_base_path = Gitlab.config.gitlab_shell.repos_path
       unless File.exists?(repo_base_path)
-        puts "can't check because of previous errors".magenta
+        puts "can't check because of previous errors".color(:magenta)
         return
       end
 
       unless File.symlink?(repo_base_path)
-        puts "no".green
+        puts "no".color(:green)
       else
-        puts "yes".red
+        puts "yes".color(:red)
         try_fixing_it(
           "Make sure it's set to the real directory in config/gitlab.yml"
         )
@@ -402,14 +402,14 @@ namespace :gitlab do
 
       repo_base_path = Gitlab.config.gitlab_shell.repos_path
       unless File.exists?(repo_base_path)
-        puts "can't check because of previous errors".magenta
+        puts "can't check because of previous errors".color(:magenta)
         return
       end
 
       if File.stat(repo_base_path).mode.to_s(8).ends_with?("2770")
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "sudo chmod -R ug+rwX,o-rwx #{repo_base_path}",
           "sudo chmod -R ug-s #{repo_base_path}",
@@ -429,17 +429,17 @@ namespace :gitlab do
 
       repo_base_path = Gitlab.config.gitlab_shell.repos_path
       unless File.exists?(repo_base_path)
-        puts "can't check because of previous errors".magenta
+        puts "can't check because of previous errors".color(:magenta)
         return
       end
 
       uid = uid_for(gitlab_shell_ssh_user)
       gid = gid_for(gitlab_shell_owner_group)
       if File.stat(repo_base_path).uid == uid && File.stat(repo_base_path).gid == gid
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
-        puts "  User id for #{gitlab_shell_ssh_user}: #{uid}. Groupd id for #{gitlab_shell_owner_group}: #{gid}".blue
+        puts "no".color(:red)
+        puts "  User id for #{gitlab_shell_ssh_user}: #{uid}. Groupd id for #{gitlab_shell_owner_group}: #{gid}".color(:blue)
         try_fixing_it(
           "sudo chown -R #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group} #{repo_base_path}"
         )
@@ -456,7 +456,7 @@ namespace :gitlab do
       gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
 
       unless Project.count > 0
-        puts "can't check, you have no projects".magenta
+        puts "can't check, you have no projects".color(:magenta)
         return
       end
       puts ""
@@ -466,12 +466,12 @@ namespace :gitlab do
         project_hook_directory = File.join(project.repository.path_to_repo, "hooks")
 
         if project.empty_repo?
-          puts "repository is empty".magenta
+          puts "repository is empty".color(:magenta)
         elsif File.directory?(project_hook_directory) && File.directory?(gitlab_shell_hooks_path) &&
             (File.realpath(project_hook_directory) == File.realpath(gitlab_shell_hooks_path))
-          puts 'ok'.green
+          puts 'ok'.color(:green)
         else
-          puts "wrong or missing hooks".red
+          puts "wrong or missing hooks".color(:red)
           try_fixing_it(
             sudo_gitlab("#{File.join(gitlab_shell_path, 'bin/create-hooks')}"),
             'Check the hooks_path in config/gitlab.yml',
@@ -491,9 +491,9 @@ namespace :gitlab do
       check_cmd = File.expand_path('bin/check', gitlab_shell_repo_base)
       puts "Running #{check_cmd}"
       if system(check_cmd, chdir: gitlab_shell_repo_base)
-        puts 'gitlab-shell self-check successful'.green
+        puts 'gitlab-shell self-check successful'.color(:green)
       else
-        puts 'gitlab-shell self-check failed'.red
+        puts 'gitlab-shell self-check failed'.color(:red)
         try_fixing_it(
           'Make sure GitLab is running;',
           'Check the gitlab-shell configuration file:',
@@ -507,7 +507,7 @@ namespace :gitlab do
       print "projects have namespace: ... "
 
       unless Project.count > 0
-        puts "can't check, you have no projects".magenta
+        puts "can't check, you have no projects".color(:magenta)
         return
       end
       puts ""
@@ -516,9 +516,9 @@ namespace :gitlab do
         print sanitized_message(project)
 
         if project.namespace
-          puts "yes".green
+          puts "yes".color(:green)
         else
-          puts "no".red
+          puts "no".color(:red)
           try_fixing_it(
             "Migrate global projects"
           )
@@ -576,9 +576,9 @@ namespace :gitlab do
       print "Running? ... "
 
       if sidekiq_process_count > 0
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           sudo_gitlab("RAILS_ENV=production bin/background_jobs start")
         )
@@ -596,9 +596,9 @@ namespace :gitlab do
 
       print 'Number of Sidekiq processes ... '
       if process_count == 1
-        puts '1'.green
+        puts '1'.color(:green)
       else
-        puts "#{process_count}".red
+        puts "#{process_count}".color(:red)
         try_fixing_it(
           'sudo service gitlab stop',
           "sudo pkill -u #{gitlab_user} -f sidekiq",
@@ -646,16 +646,16 @@ namespace :gitlab do
       print "Init.d configured correctly? ... "
 
       if omnibus_gitlab?
-        puts 'skipped (omnibus-gitlab has no init script)'.magenta
+        puts 'skipped (omnibus-gitlab has no init script)'.color(:magenta)
         return
       end
 
       path = "/etc/default/gitlab"
 
       if File.exist?(path) && File.read(path).include?("mail_room_enabled=true")
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Enable mail_room in the init.d configuration."
         )
@@ -672,9 +672,9 @@ namespace :gitlab do
       path = Rails.root.join("Procfile")
 
       if File.exist?(path) && File.read(path) =~ /^mail_room:/
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Enable mail_room in your Procfile."
         )
@@ -691,14 +691,14 @@ namespace :gitlab do
       path = "/etc/default/gitlab"
 
       unless File.exist?(path) && File.read(path).include?("mail_room_enabled=true")
-        puts "can't check because of previous errors".magenta
+        puts "can't check because of previous errors".color(:magenta)
         return
       end
 
       if mail_room_running?
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           sudo_gitlab("RAILS_ENV=production bin/mail_room start")
         )
@@ -729,9 +729,9 @@ namespace :gitlab do
       end
 
       if connected
-        puts "yes".green
+        puts "yes".color(:green)
       else
-        puts "no".red
+        puts "no".color(:red)
         try_fixing_it(
           "Check that the information in config/gitlab.yml is correct"
         )
@@ -799,7 +799,7 @@ namespace :gitlab do
   namespace :user do
     desc "GitLab | Check the integrity of a specific user's repositories"
     task :check_repos, [:username] => :environment do |t, args|
-      username = args[:username] || prompt("Check repository integrity for which username? ".blue)
+      username = args[:username] || prompt("Check repository integrity for which username? ".color(:blue))
       user = User.find_by(username: username)
       if user
         repo_dirs = user.authorized_projects.map do |p|
@@ -811,7 +811,7 @@ namespace :gitlab do
 
         repo_dirs.each { |repo_dir| check_repo_integrity(repo_dir) }
       else
-        puts "\nUser '#{username}' not found".red
+        puts "\nUser '#{username}' not found".color(:red)
       end
     end
   end
@@ -820,13 +820,13 @@ namespace :gitlab do
   ##########################
 
   def fix_and_rerun
-    puts "  Please #{"fix the error above"} and rerun the checks.".red
+    puts "  Please #{"fix the error above"} and rerun the checks.".color(:red)
   end
 
   def for_more_information(*sources)
     sources = sources.shift if sources.first.is_a?(Array)
 
-    puts "  For more information see:".blue
+    puts "  For more information see:".color(:blue)
     sources.each do |source|
       puts "  #{source}"
     end
@@ -834,7 +834,7 @@ namespace :gitlab do
 
   def finished_checking(component)
     puts ""
-    puts "Checking #{component.yellow} ... #{"Finished".green}"
+    puts "Checking #{component.color(:yellow)} ... #{"Finished".color(:green)}"
     puts ""
   end
 
@@ -855,14 +855,14 @@ namespace :gitlab do
   end
 
   def start_checking(component)
-    puts "Checking #{component.yellow} ..."
+    puts "Checking #{component.color(:yellow)} ..."
     puts ""
   end
 
   def try_fixing_it(*steps)
     steps = steps.shift if steps.first.is_a?(Array)
 
-    puts "  Try fixing it:".blue
+    puts "  Try fixing it:".color(:blue)
     steps.each do |step|
       puts "  #{step}"
     end
@@ -874,9 +874,9 @@ namespace :gitlab do
 
     print "GitLab Shell version >= #{required_version} ? ... "
     if current_version.valid? && required_version <= current_version
-      puts "OK (#{current_version})".green
+      puts "OK (#{current_version})".color(:green)
     else
-      puts "FAIL. Please update gitlab-shell to #{required_version} from #{current_version}".red
+      puts "FAIL. Please update gitlab-shell to #{required_version} from #{current_version}".color(:red)
     end
   end
 
@@ -887,9 +887,9 @@ namespace :gitlab do
     print "Ruby version >= #{required_version} ? ... "
 
     if current_version.valid? && required_version <= current_version
-      puts "yes (#{current_version})".green
+      puts "yes (#{current_version})".color(:green)
     else
-      puts "no".red
+      puts "no".color(:red)
       try_fixing_it(
         "Update your ruby to a version >= #{required_version} from #{current_version}"
       )
@@ -905,9 +905,9 @@ namespace :gitlab do
     print "Git version >= #{required_version} ? ... "
 
     if current_version.valid? && required_version <= current_version
-      puts "yes (#{current_version})".green
+      puts "yes (#{current_version})".color(:green)
     else
-      puts "no".red
+      puts "no".color(:red)
       try_fixing_it(
         "Update your git to a version >= #{required_version} from #{current_version}"
       )
@@ -925,9 +925,9 @@ namespace :gitlab do
 
   def sanitized_message(project)
     if should_sanitize?
-      "#{project.namespace_id.to_s.yellow}/#{project.id.to_s.yellow} ... "
+      "#{project.namespace_id.to_s.color(:yellow)}/#{project.id.to_s.color(:yellow)} ... "
     else
-      "#{project.name_with_namespace.yellow} ... "
+      "#{project.name_with_namespace.color(:yellow)} ... "
     end
   end
 
@@ -940,7 +940,7 @@ namespace :gitlab do
   end
 
   def check_repo_integrity(repo_dir)
-    puts "\nChecking repo at #{repo_dir.yellow}"
+    puts "\nChecking repo at #{repo_dir.color(:yellow)}"
 
     git_fsck(repo_dir)
     check_config_lock(repo_dir)
@@ -948,25 +948,25 @@ namespace :gitlab do
   end
 
   def git_fsck(repo_dir)
-    puts "Running `git fsck`".yellow
+    puts "Running `git fsck`".color(:yellow)
     system(*%W(#{Gitlab.config.git.bin_path} fsck), chdir: repo_dir)
   end
 
   def check_config_lock(repo_dir)
     config_exists = File.exist?(File.join(repo_dir,'config.lock'))
-    config_output = config_exists ? 'yes'.red : 'no'.green
-    puts "'config.lock' file exists?".yellow + " ... #{config_output}"
+    config_output = config_exists ? 'yes'.color(:red) : 'no'.color(:green)
+    puts "'config.lock' file exists?".color(:yellow) + " ... #{config_output}"
   end
 
   def check_ref_locks(repo_dir)
     lock_files = Dir.glob(File.join(repo_dir,'refs/heads/*.lock'))
     if lock_files.present?
-      puts "Ref lock files exist:".red
+      puts "Ref lock files exist:".color(:red)
       lock_files.each do |lock_file|
         puts "  #{lock_file}"
       end
     else
-      puts "No ref lock files exist".green
+      puts "No ref lock files exist".color(:green)
     end
   end
 end
diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake
index 9f5852ac613..ab0028d6603 100644
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -10,7 +10,7 @@ namespace :gitlab do
       git_base_path = Gitlab.config.gitlab_shell.repos_path
       all_dirs = Dir.glob(git_base_path + '/*')
 
-      puts git_base_path.yellow
+      puts git_base_path.color(:yellow)
       puts "Looking for directories to remove... "
 
       all_dirs.reject! do |dir|
@@ -29,17 +29,17 @@ namespace :gitlab do
 
         if remove_flag
           if FileUtils.rm_rf dir_path
-            puts "Removed...#{dir_path}".red
+            puts "Removed...#{dir_path}".color(:red)
           else
-            puts "Cannot remove #{dir_path}".red
+            puts "Cannot remove #{dir_path}".color(:red)
           end
         else
-          puts "Can be removed: #{dir_path}".red
+          puts "Can be removed: #{dir_path}".color(:red)
         end
       end
 
       unless remove_flag
-        puts "To cleanup this directories run this command with REMOVE=true".yellow
+        puts "To cleanup this directories run this command with REMOVE=true".color(:yellow)
       end
     end
 
@@ -75,19 +75,19 @@ namespace :gitlab do
         next unless user.ldap_user?
         print "#{user.name} (#{user.ldap_identity.extern_uid}) ..."
         if Gitlab::LDAP::Access.allowed?(user)
-          puts " [OK]".green
+          puts " [OK]".color(:green)
         else
           if block_flag
             user.block! unless user.blocked?
-            puts " [BLOCKED]".red
+            puts " [BLOCKED]".color(:red)
           else
-            puts " [NOT IN LDAP]".yellow
+            puts " [NOT IN LDAP]".color(:yellow)
           end
         end
       end
 
       unless block_flag
-        puts "To block these users run this command with BLOCK=true".yellow
+        puts "To block these users run this command with BLOCK=true".color(:yellow)
       end
     end
   end
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 86f5d65f128..86584e91093 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -3,22 +3,22 @@ namespace :gitlab do
     desc 'GitLab | Manually insert schema migration version'
     task :mark_migration_complete, [:version] => :environment do |_, args|
       unless args[:version]
-        puts "Must specify a migration version as an argument".red
+        puts "Must specify a migration version as an argument".color(:red)
         exit 1
       end
 
       version = args[:version].to_i
       if version == 0
-        puts "Version '#{args[:version]}' must be a non-zero integer".red
+        puts "Version '#{args[:version]}' must be a non-zero integer".color(:red)
         exit 1
       end
 
       sql = "INSERT INTO schema_migrations (version) VALUES (#{version})"
       begin
         ActiveRecord::Base.connection.execute(sql)
-        puts "Successfully marked '#{version}' as complete".green
+        puts "Successfully marked '#{version}' as complete".color(:green)
       rescue ActiveRecord::RecordNotUnique
-        puts "Migration version '#{version}' is already marked complete".yellow
+        puts "Migration version '#{version}' is already marked complete".color(:yellow)
       end
     end
 
diff --git a/lib/tasks/gitlab/git.rake b/lib/tasks/gitlab/git.rake
index 65ee430d550..f9834a4dae8 100644
--- a/lib/tasks/gitlab/git.rake
+++ b/lib/tasks/gitlab/git.rake
@@ -5,7 +5,7 @@ namespace :gitlab do
     task repack: :environment do
       failures = perform_git_cmd(%W(git repack -a --quiet), "Repacking repo")
       if failures.empty?
-        puts "Done".green
+        puts "Done".color(:green)
       else
         output_failures(failures)
       end
@@ -15,7 +15,7 @@ namespace :gitlab do
     task gc: :environment do
       failures = perform_git_cmd(%W(git gc --auto --quiet), "Garbage Collecting")
       if failures.empty?
-        puts "Done".green
+        puts "Done".color(:green)
       else
         output_failures(failures)
       end
@@ -25,7 +25,7 @@ namespace :gitlab do
     task prune: :environment do
       failures = perform_git_cmd(%W(git prune), "Git Prune")
       if failures.empty?
-        puts "Done".green
+        puts "Done".color(:green)
       else
         output_failures(failures)
       end
@@ -47,7 +47,7 @@ namespace :gitlab do
     end
 
     def output_failures(failures)
-      puts "The following repositories reported errors:".red
+      puts "The following repositories reported errors:".color(:red)
       failures.each { |f| puts "- #{f}" }
     end
 
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index 1c04f47f08f..4753f00c26a 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -23,7 +23,7 @@ namespace :gitlab do
         group_name, name = File.split(path)
         group_name = nil if group_name == '.'
 
-        puts "Processing #{repo_path}".yellow
+        puts "Processing #{repo_path}".color(:yellow)
 
         if path.end_with?('.wiki')
           puts " * Skipping wiki repo"
@@ -51,9 +51,9 @@ namespace :gitlab do
               group.path = group_name
               group.owner = user
               if group.save
-                puts " * Created Group #{group.name} (#{group.id})".green
+                puts " * Created Group #{group.name} (#{group.id})".color(:green)
               else
-                puts " * Failed trying to create group #{group.name}".red
+                puts " * Failed trying to create group #{group.name}".color(:red)
               end
             end
             # set project group
@@ -63,17 +63,17 @@ namespace :gitlab do
           project = Projects::CreateService.new(user, project_params).execute
 
           if project.persisted?
-            puts " * Created #{project.name} (#{repo_path})".green
+            puts " * Created #{project.name} (#{repo_path})".color(:green)
             project.update_repository_size
             project.update_commit_count
           else
-            puts " * Failed trying to create #{project.name} (#{repo_path})".red
-            puts "   Errors: #{project.errors.messages}".red
+            puts " * Failed trying to create #{project.name} (#{repo_path})".color(:red)
+            puts "   Errors: #{project.errors.messages}".color(:red)
           end
         end
       end
 
-      puts "Done!".green
+      puts "Done!".color(:green)
     end
   end
 end
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index d6883a563ee..352b566df24 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -15,15 +15,15 @@ namespace :gitlab do
       rake_version = run_and_match(%W(rake --version), /[\d\.]+/).try(:to_s)
 
       puts ""
-      puts "System information".yellow
-      puts "System:\t\t#{os_name || "unknown".red}"
+      puts "System information".color(:yellow)
+      puts "System:\t\t#{os_name || "unknown".color(:red)}"
       puts "Current User:\t#{run(%W(whoami))}"
-      puts "Using RVM:\t#{rvm_version.present? ? "yes".green : "no"}"
+      puts "Using RVM:\t#{rvm_version.present? ? "yes".color(:green) : "no"}"
       puts "RVM Version:\t#{rvm_version}" if rvm_version.present?
-      puts "Ruby Version:\t#{ruby_version || "unknown".red}"
-      puts "Gem Version:\t#{gem_version || "unknown".red}"
-      puts "Bundler Version:#{bunder_version || "unknown".red}"
-      puts "Rake Version:\t#{rake_version || "unknown".red}"
+      puts "Ruby Version:\t#{ruby_version || "unknown".color(:red)}"
+      puts "Gem Version:\t#{gem_version || "unknown".color(:red)}"
+      puts "Bundler Version:#{bunder_version || "unknown".color(:red)}"
+      puts "Rake Version:\t#{rake_version || "unknown".color(:red)}"
       puts "Sidekiq Version:#{Sidekiq::VERSION}"
 
 
@@ -39,7 +39,7 @@ namespace :gitlab do
       omniauth_providers.map! { |provider| provider['name'] }
 
       puts ""
-      puts "GitLab information".yellow
+      puts "GitLab information".color(:yellow)
       puts "Version:\t#{Gitlab::VERSION}"
       puts "Revision:\t#{Gitlab::REVISION}"
       puts "Directory:\t#{Rails.root}"
@@ -47,9 +47,9 @@ namespace :gitlab do
       puts "URL:\t\t#{Gitlab.config.gitlab.url}"
       puts "HTTP Clone URL:\t#{http_clone_url}"
       puts "SSH Clone URL:\t#{ssh_clone_url}"
-      puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".green : "no"}"
-      puts "Using Omniauth:\t#{Gitlab.config.omniauth.enabled ? "yes".green : "no"}"
-      puts "Omniauth Providers: #{omniauth_providers.map(&:magenta).join(', ')}" if Gitlab.config.omniauth.enabled
+      puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".color(:green) : "no"}"
+      puts "Using Omniauth:\t#{Gitlab.config.omniauth.enabled ? "yes".color(:green) : "no"}"
+      puts "Omniauth Providers: #{omniauth_providers.join(', ')}" if Gitlab.config.omniauth.enabled
 
 
 
@@ -60,8 +60,8 @@ namespace :gitlab do
       end
 
       puts ""
-      puts "GitLab Shell".yellow
-      puts "Version:\t#{gitlab_shell_version || "unknown".red}"
+      puts "GitLab Shell".color(:yellow)
+      puts "Version:\t#{gitlab_shell_version || "unknown".color(:red)}"
       puts "Repositories:\t#{Gitlab.config.gitlab_shell.repos_path}"
       puts "Hooks:\t\t#{Gitlab.config.gitlab_shell.hooks_path}"
       puts "Git:\t\t#{Gitlab.config.git.bin_path}"
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake
index dd61632e557..b1648a4602a 100644
--- a/lib/tasks/gitlab/shell.rake
+++ b/lib/tasks/gitlab/shell.rake
@@ -118,12 +118,12 @@ namespace :gitlab do
     puts ""
 
     unless $?.success?
-      puts "Failed to add keys...".red
+      puts "Failed to add keys...".color(:red)
       exit 1
     end
 
   rescue Gitlab::TaskAbortedByUserError
-    puts "Quitting...".red
+    puts "Quitting...".color(:red)
     exit 1
   end
 
diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake
index d33b5b31e18..d0c019044b7 100644
--- a/lib/tasks/gitlab/task_helpers.rake
+++ b/lib/tasks/gitlab/task_helpers.rake
@@ -2,7 +2,7 @@ module Gitlab
   class TaskAbortedByUserError < StandardError; end
 end
 
-String.disable_colorization = true unless STDOUT.isatty
+require 'rainbow/ext/string'
 
 # Prevent StateMachine warnings from outputting during a cron task
 StateMachines::Machine.ignore_method_conflicts = true if ENV['CRON']
@@ -14,7 +14,7 @@ namespace :gitlab do
   # Returns "yes" the user chose to continue
   # Raises Gitlab::TaskAbortedByUserError if the user chose *not* to continue
   def ask_to_continue
-    answer = prompt("Do you want to continue (yes/no)? ".blue, %w{yes no})
+    answer = prompt("Do you want to continue (yes/no)? ".color(:blue), %w{yes no})
     raise Gitlab::TaskAbortedByUserError unless answer == "yes"
   end
 
@@ -98,10 +98,10 @@ namespace :gitlab do
       gitlab_user = Gitlab.config.gitlab.user
       current_user = run(%W(whoami)).chomp
       unless current_user == gitlab_user
-        puts " Warning ".colorize(:black).on_yellow
-        puts "  You are running as user #{current_user.magenta}, we hope you know what you are doing."
+        puts " Warning ".color(:black).background(:yellow)
+        puts "  You are running as user #{current_user.color(:magenta)}, we hope you know what you are doing."
         puts "  Things may work\/fail for the wrong reasons."
-        puts "  For correct results you should run this as user #{gitlab_user.magenta}."
+        puts "  For correct results you should run this as user #{gitlab_user.color(:magenta)}."
         puts ""
       end
       @warned_user_not_gitlab = true
diff --git a/lib/tasks/gitlab/two_factor.rake b/lib/tasks/gitlab/two_factor.rake
index 9196677a017..fc0ccc726ed 100644
--- a/lib/tasks/gitlab/two_factor.rake
+++ b/lib/tasks/gitlab/two_factor.rake
@@ -6,17 +6,17 @@ namespace :gitlab do
       count = scope.count
 
       if count > 0
-        puts "This will disable 2FA for #{count.to_s.red} users..."
+        puts "This will disable 2FA for #{count.to_s.color(:red)} users..."
 
         begin
           ask_to_continue
           scope.find_each(&:disable_two_factor!)
-          puts "Successfully disabled 2FA for #{count} users.".green
+          puts "Successfully disabled 2FA for #{count} users.".color(:green)
         rescue Gitlab::TaskAbortedByUserError
-          puts "Quitting...".red
+          puts "Quitting...".color(:red)
         end
       else
-        puts "There are currently no users with 2FA enabled.".yellow
+        puts "There are currently no users with 2FA enabled.".color(:yellow)
       end
     end
   end
diff --git a/lib/tasks/gitlab/update_commit_count.rake b/lib/tasks/gitlab/update_commit_count.rake
index 9b636f12d9f..3bd10b0208b 100644
--- a/lib/tasks/gitlab/update_commit_count.rake
+++ b/lib/tasks/gitlab/update_commit_count.rake
@@ -6,15 +6,15 @@ namespace :gitlab do
     ask_to_continue unless ENV['force'] == 'yes'
 
     projects.find_each(batch_size: 100) do |project|
-      print "#{project.name_with_namespace.yellow} ... "
+      print "#{project.name_with_namespace.color(:yellow)} ... "
 
       unless project.repo_exists?
-        puts "skipping, because the repo is empty".magenta
+        puts "skipping, because the repo is empty".color(:magenta)
         next
       end
 
       project.update_commit_count
-      puts project.commit_count.to_s.green
+      puts project.commit_count.to_s.color(:green)
     end
   end
 end
diff --git a/lib/tasks/gitlab/update_gitignore.rake b/lib/tasks/gitlab/update_gitignore.rake
index 84aa312002b..4fd48cccb1d 100644
--- a/lib/tasks/gitlab/update_gitignore.rake
+++ b/lib/tasks/gitlab/update_gitignore.rake
@@ -2,14 +2,14 @@ namespace :gitlab do
   desc "GitLab | Update gitignore"
   task :update_gitignore do
     unless clone_gitignores
-      puts "Cloning the gitignores failed".red
+      puts "Cloning the gitignores failed".color(:red)
       return
     end
 
     remove_unneeded_files(gitignore_directory)
     remove_unneeded_files(global_directory)
 
-    puts "Done".green
+    puts "Done".color(:green)
   end
 
   def clone_gitignores
diff --git a/lib/tasks/gitlab/web_hook.rake b/lib/tasks/gitlab/web_hook.rake
index cc0f668474e..f467cc0ee29 100644
--- a/lib/tasks/gitlab/web_hook.rake
+++ b/lib/tasks/gitlab/web_hook.rake
@@ -12,9 +12,9 @@ namespace :gitlab do
         print "- #{project.name} ... "
         web_hook = project.hooks.new(url: web_hook_url)
         if web_hook.save
-          puts "added".green
+          puts "added".color(:green)
         else
-          print "failed".red
+          print "failed".color(:red)
           puts "  [#{web_hook.errors.full_messages.to_sentence}]"
         end
       end
@@ -57,7 +57,7 @@ namespace :gitlab do
       if namespace
         Project.in_namespace(namespace.id)
       else
-        puts "Namespace not found: #{namespace_path}".red
+        puts "Namespace not found: #{namespace_path}".color(:red)
         exit 2
       end
     end
diff --git a/lib/tasks/migrate/migrate_iids.rake b/lib/tasks/migrate/migrate_iids.rake
index d258c6fd08d..4f2486157b7 100644
--- a/lib/tasks/migrate/migrate_iids.rake
+++ b/lib/tasks/migrate/migrate_iids.rake
@@ -1,6 +1,6 @@
 desc "GitLab | Build internal ids for issues and merge requests"
 task migrate_iids: :environment do
-  puts 'Issues'.yellow
+  puts 'Issues'.color(:yellow)
   Issue.where(iid: nil).find_each(batch_size: 100) do |issue|
     begin
       issue.set_iid
@@ -15,7 +15,7 @@ task migrate_iids: :environment do
   end
 
   puts 'done'
-  puts 'Merge Requests'.yellow
+  puts 'Merge Requests'.color(:yellow)
   MergeRequest.where(iid: nil).find_each(batch_size: 100) do |mr|
     begin
       mr.set_iid
@@ -30,7 +30,7 @@ task migrate_iids: :environment do
   end
 
   puts 'done'
-  puts 'Milestones'.yellow
+  puts 'Milestones'.color(:yellow)
   Milestone.where(iid: nil).find_each(batch_size: 100) do |m|
     begin
       m.set_iid
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
index 01d23b89bb7..da255f5464b 100644
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
@@ -52,7 +52,7 @@ def run_spinach_tests(tags)
 
     tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp)
     puts ''
-    puts "Spinach tests for #{tags}: Retrying tests... #{tests}".red
+    puts "Spinach tests for #{tags}: Retrying tests... #{tests}".color(:red)
     puts ''
     sleep(3)
     success = run_spinach_command(tests)

From 4cd111e70b2dd597dfc3452afed016016136ab8c Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 3 Jun 2016 10:37:43 -0600
Subject: [PATCH 1060/1431] Add CHANGELOG entry.

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

diff --git a/CHANGELOG b/CHANGELOG
index 7215a919d79..9e65dfd814b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.9.0 (unreleased)
   - Reduce number of queries needed to render issue labels in the sidebar
   - Improve error handling importing projects
   - Put project Files and Commits tabs under Code tab
+  - Replace Colorize with Rainbow for coloring console output in Rake tasks.
 
 v 8.8.4
   - Fix todos page throwing errors when you have a project pending deletion

From 01e1139f68066e46b86ef92749513377eee63f5b Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Thu, 12 May 2016 20:50:49 +0200
Subject: [PATCH 1061/1431] Workhorse to serve raw diffs

---
 .../projects/merge_requests_controller.rb       | 13 ++++++++++---
 app/models/merge_request.rb                     |  7 -------
 features/project/merge_requests.feature         | 12 ------------
 lib/gitlab/workhorse.rb                         | 17 +++++++++++++++--
 .../projects/merge_requests_controller_spec.rb  |  9 +++------
 5 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 3142fe5c767..fe811f30c03 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -57,9 +57,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     respond_to do |format|
       format.html
-      format.json { render json: @merge_request }
-      format.diff { render text: @merge_request.to_diff }
-      format.patch { render text: @merge_request.to_patch }
+      format.json   { render json: @merge_request }
+      format.patch  { render text: @merge_request.to_patch }
+      format.diff do
+        headers.store(*Gitlab::Workhorse.send_git_diff(@project.repository,
+                                                        @merge_request.diff_base_commit.id,
+                                                        @merge_request.last_commit.id))
+        headers['Content-Disposition'] = 'inline'
+
+        head :ok
+      end
     end
   end
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 722c258244c..22505363654 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -313,13 +313,6 @@ class MergeRequest < ActiveRecord::Base
     )
   end
 
-  # Returns the raw diff for this merge request
-  #
-  # see "git diff"
-  def to_diff
-    target_project.repository.diff_text(diff_base_commit.sha, source_sha)
-  end
-
   # Returns the commit as a series of email patches.
   #
   # see "git format-patch"
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index ecda4ea8240..cc04ea7fe48 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -76,18 +76,6 @@ Feature: Project Merge Requests
     And I submit new merge request "Wiki Feature"
     Then I should see merge request "Wiki Feature"
 
-  Scenario: I download a diff on a public merge request
-    Given public project "Community"
-    And "John Doe" owns public project "Community"
-    And project "Community" has "Bug CO-01" open merge request with diffs inside
-    Given I logout directly
-    And I visit merge request page "Bug CO-01"
-    And I click on "Email Patches"
-    Then I should see a patch diff
-    And I visit merge request page "Bug CO-01"
-    And I click on "Plain Diff"
-    Then I should see a patch diff
-
   @javascript
   Scenario: I comment on a merge request
     Given I visit merge request page "Bug NS-04"
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index c3ddd4c2680..7f6ef71b303 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -29,9 +29,22 @@ module Gitlab
           "git-archive:#{encode(params)}",
         ]
       end
-      
+
+      def send_git_diff(repository, from, to)
+        params = {
+            'RepoPath'  => repository.path_to_repo,
+            'ShaFrom'   => from,
+            'ShaTo'     => to
+        }
+
+        [
+          SEND_DATA_HEADER,
+          "git-diff:#{encode(params)}"
+        ]
+      end
+
       protected
-      
+
       def encode(hash)
         Base64.urlsafe_encode64(JSON.dump(hash))
       end
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 8499bf07e9f..368fd498928 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -84,17 +84,14 @@ describe Projects::MergeRequestsController do
     end
 
     describe "as diff" do
-      include_examples "export merge as", :diff
-      let(:format) { :diff }
-
-      it "should really only be a git diff" do
+      it "triggers workhorse to serve the request" do
         get(:show,
             namespace_id: project.namespace.to_param,
             project_id: project.to_param,
             id: merge_request.iid,
-            format: format)
+            format: :diff)
 
-        expect(response.body).to start_with("diff --git")
+        expect(response.headers['Gitlab-Workhorse-Send-Data']).to start_with("git-diff:")
       end
     end
 

From d47218fb9732841956a5511afbde38ff731ab106 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Fri, 3 Jun 2016 18:41:01 +0200
Subject: [PATCH 1062/1431] Bump workhorse version to v0.7.5

---
 CHANGELOG                | 1 +
 GITLAB_WORKHORSE_VERSION | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7215a919d79..214758f38e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -162,6 +162,7 @@ v 8.7.6
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
   - Fix notification delay when changing status of an issue
+  - Bump Workhorse to 0.7.5 so it can serve raw diffs
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 0a1ffad4b4d..8bd6ba8c5c3 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.7.4
+0.7.5

From 317cfcbd4dd5891409b5362d9ce24faa66719b44 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 27 May 2016 15:05:46 +0100
Subject: [PATCH 1063/1431] Fixed issue with search autocomplete not allow
 arrow key navigation

Closes #15649
---
 app/assets/javascripts/gl_dropdown.js.coffee    | 17 +++++++++++------
 .../javascripts/search_autocomplete.js.coffee   | 13 ++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index b3f1dc969b8..d263faa287a 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -470,20 +470,25 @@ class GitLabDropdown
 
       return selectedObject
 
-  selectRowAtIndex: (index) ->
-    selector = ".dropdown-content li:not(.divider):eq(#{index}) a"
+  selectRowAtIndex: (e, index) ->
+    selector = ".dropdown-content li:not(.divider,.dropdown-header,.separator):eq(#{index}) a"
 
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one #{selector}"
 
     # simulate a click on the first link
-    $(selector, @dropdown).trigger "click"
+    $el = $(selector, @dropdown)
+
+    if $el.length
+      e.preventDefault()
+      e.stopImmediatePropagation()
+      $(selector, @dropdown)[0].click()
 
   addArrowKeyEvent: ->
     ARROW_KEY_CODES = [38, 40]
     $input = @dropdown.find(".dropdown-input-field")
 
-    selector = '.dropdown-content li:not(.divider)'
+    selector = '.dropdown-content li:not(.divider,.dropdown-header,.separator)'
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one #{selector}"
 
@@ -511,8 +516,8 @@ class GitLabDropdown
 
         return false
 
-      if currentKeyCode is 13
-        @selectRowAtIndex if currentIndex < 0 then 0 else currentIndex
+      if currentKeyCode is 13 and currentIndex isnt -1
+        @selectRowAtIndex e, currentIndex
 
   removeArrayKeyEvent: ->
     $('body').off 'keydown'
diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 2122e80f57a..5eb915a51ea 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -156,11 +156,14 @@ class @SearchAutocomplete
     # No need to enable anything if user is not logged in
     return if !gon.current_user_id
 
-    _this = @
-    @loadingSuggestions = false
+    unless @dropdown.hasClass('open')
+      _this = @
+      @loadingSuggestions = false
 
-    @dropdown.addClass('open')
-    @searchInput.removeClass('disabled')
+      @dropdown
+        .addClass('open')
+        .trigger('shown.bs.dropdown')
+      @searchInput.removeClass('disabled')
 
   onSearchInputKeyDown: =>
     # Saves last length of the entered text
@@ -191,7 +194,7 @@ class @SearchAutocomplete
           @disableAutocomplete()
         else
           # We should display the menu only when input is not empty
-          @enableAutocomplete()
+          @enableAutocomplete() if e.keyCode isnt KEYCODE.ENTER
 
     @wrap.toggleClass 'has-value', !!e.target.value
 

From e696795a42ccb69d0d29300db7a12c3ee3b1fd35 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 27 May 2016 15:25:42 +0100
Subject: [PATCH 1064/1431] CHANGELOG item

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

diff --git a/CHANGELOG b/CHANGELOG
index 7215a919d79..899543fdae6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,6 +42,7 @@ v 8.8.4
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
+  - Fix issue with arrow keys not working in search autocomplete dropdown
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 2e8f039ae91767b912da2511d7697d7993293534 Mon Sep 17 00:00:00 2001
From: Mark Fletcher <mark@gitlab.com>
Date: Fri, 3 Jun 2016 18:56:26 +0100
Subject: [PATCH 1065/1431] Document the API endpoint for gathering a build log
 * Resolves #18015

---
 doc/api/builds.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doc/api/builds.md b/doc/api/builds.md
index 4c0a47d1ea0..5669bd0cdda 100644
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
@@ -278,6 +278,30 @@ Response:
 
 [ce-2893]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2893
 
+## Get a trace file
+
+Get a trace of a specific build of a project
+
+```
+GET /projects/:id/builds/:build_id/trace
+```
+
+| 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/trace"
+```
+
+Response:
+
+| Status    | Description                       |
+|-----------|-----------------------------------|
+| 200       | Serves the trace file             |
+| 404       | Build not found or no trace file  |
+
 ## Cancel a build
 
 Cancel a single build of a project

From f9cc619c7c705619e85f6f1af4fc03f28e52c525 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 3 Jun 2016 12:32:42 -0600
Subject: [PATCH 1066/1431] The spritesheet should only load when an award
 emoji picker is opened.

---
 app/views/award_emoji/_awards_block.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index f1f93c1375b..e9302c39753 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -2,7 +2,7 @@
 .awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
   - awards_sort(grouped_emojis).each do |emoji, awards|
     %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } }
-      = emoji_icon(emoji)
+      = emoji_icon(emoji, sprite: false)
       %span.award-control-text.js-counter
         = awards.count
 

From d2b708ac43b0810ea2ce4de196ce46692e536027 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 3 Jun 2016 20:54:33 +0200
Subject: [PATCH 1067/1431] Extract CI config YAML parser to a separate class

With this approach it would be easier to add different sources of
configuration, that we do not necessairly have to be in YAML format.
---
 lib/gitlab/ci/config.rb                  |  8 ++--
 lib/gitlab/ci/config/parser.rb           | 25 +++++++++++
 spec/lib/gitlab/ci/config/parser_spec.rb | 54 ++++++++++++++++++++++++
 spec/lib/gitlab/ci/config_spec.rb        | 14 +++++-
 4 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 lib/gitlab/ci/config/parser.rb
 create mode 100644 spec/lib/gitlab/ci/config/parser_spec.rb

diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 8f88ccf5bf4..0baefa70f61 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -4,13 +4,13 @@ module Gitlab
       class ParserError < StandardError; end
 
       def initialize(config)
-        @config = YAML.safe_load(config, [Symbol], [], true)
+        parser = Parser.new(config)
 
-        unless @config.is_a?(Hash)
-          raise ParserError, 'YAML should be a hash'
+        unless parser.valid?
+          raise ParserError, 'Invalid configuration format!'
         end
 
-        @config = @config.deep_symbolize_keys
+        @config = parser.parse
       end
 
       def to_hash
diff --git a/lib/gitlab/ci/config/parser.rb b/lib/gitlab/ci/config/parser.rb
new file mode 100644
index 00000000000..6e1b7ec8267
--- /dev/null
+++ b/lib/gitlab/ci/config/parser.rb
@@ -0,0 +1,25 @@
+module Gitlab
+  module Ci
+    class Config
+      class Parser
+        class FormatError < StandardError; end
+
+        def initialize(config)
+          @config = YAML.safe_load(config, [Symbol], [], true)
+        end
+
+        def valid?
+          @config.is_a?(Hash)
+        end
+
+        def parse
+          unless valid?
+            raise FormatError, 'Invalid configuration format'
+          end
+
+          @config.deep_symbolize_keys
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/config/parser_spec.rb b/spec/lib/gitlab/ci/config/parser_spec.rb
new file mode 100644
index 00000000000..b35e66cde51
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/parser_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Config::Parser do
+  let(:parser) { described_class.new(yml) }
+
+  context 'when yaml syntax is correct' do
+    let(:yml) { 'image: ruby:2.2' }
+
+    describe '#valid?' do
+      it 'returns true' do
+        expect(parser.valid?).to be true
+      end
+    end
+
+    describe '#parse' do
+      it 'returns a hash' do
+        expect(parser.parse).to be_a Hash
+      end
+
+      it 'returns a valid hash' do
+        expect(parser.parse).to eq(image: 'ruby:2.2')
+      end
+    end
+  end
+
+  context 'when yaml syntax is incorrect' do
+    let(:yml) { '// incorrect' }
+
+    describe '#valid?' do
+      it 'returns false' do
+        expect(parser.valid?).to be false
+      end
+    end
+
+    describe '#parse' do
+      it 'raises error' do
+        expect { parser.parse }.to raise_error(
+          Gitlab::Ci::Config::Parser::FormatError,
+          'Invalid configuration format'
+        )
+      end
+    end
+  end
+
+  context 'when yaml config is empty' do
+    let(:yml) { '' }
+
+    describe '#valid?' do
+      it 'returns false' do
+        expect(parser.valid?).to be false
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb
index 6e251706714..691c1ee8ba7 100644
--- a/spec/lib/gitlab/ci/config_spec.rb
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -5,7 +5,7 @@ describe Gitlab::Ci::Config do
     described_class.new(yml)
   end
 
-  context 'when yml config is valid' do
+  context 'when config is valid' do
     let(:yml) do
       <<-EOS
         image: ruby:2.2
@@ -30,5 +30,17 @@ describe Gitlab::Ci::Config do
         expect(config.to_hash).to eq hash
       end
     end
+
+    context 'when config is invalid' do
+      let(:yml) { '// invalid' }
+
+      describe '.new' do
+        it 'raises error' do
+          expect { config }.to raise_error(
+            Gitlab::Ci::Config::ParserError, /Invalid configuration format/
+          )
+        end
+      end
+    end
   end
 end

From 8450fe3074140b86e7d2e5a85d2cdb65051906ee Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 3 Jun 2016 15:49:34 -0300
Subject: [PATCH 1068/1431] Add index to notification settings

---
 CHANGELOG                                                | 1 +
 ...0603180330_remove_duplicated_notification_settings.rb | 7 +++++++
 .../20160603182247_add_index_to_notification_settings.rb | 9 +++++++++
 lib/gitlab/database/migration_helpers.rb                 | 6 +++++-
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160603180330_remove_duplicated_notification_settings.rb
 create mode 100644 db/migrate/20160603182247_add_index_to_notification_settings.rb

diff --git a/CHANGELOG b/CHANGELOG
index 7215a919d79..bcb7e290ede 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@ v 8.9.0 (unreleased)
   - Cache project build count in sidebar nav
   - Reduce number of queries needed to render issue labels in the sidebar
   - Improve error handling importing projects
+  - Remove duplicated notification settings
   - Put project Files and Commits tabs under Code tab
 
 v 8.8.4
diff --git a/db/migrate/20160603180330_remove_duplicated_notification_settings.rb b/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
new file mode 100644
index 00000000000..c2fcac4c53d
--- /dev/null
+++ b/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
@@ -0,0 +1,7 @@
+class RemoveDuplicatedNotificationSettings < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      DELETE FROM notification_settings WHERE id NOT IN ( SELECT min_id from (SELECT MIN(id) as min_id FROM notification_settings GROUP BY user_id, source_type, source_id) as dups )
+    SQL
+  end
+end
diff --git a/db/migrate/20160603182247_add_index_to_notification_settings.rb b/db/migrate/20160603182247_add_index_to_notification_settings.rb
new file mode 100644
index 00000000000..06462042b09
--- /dev/null
+++ b/db/migrate/20160603182247_add_index_to_notification_settings.rb
@@ -0,0 +1,9 @@
+class AddIndexToNotificationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    add_concurrent_index :notification_settings, [:user_id, :source_id, :source_type], { unique: true, name: "index_notifications_on_user_id_and_source_id_and_source_type" }
+  end
+end
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index fd14234c558..b88e50748f6 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -19,7 +19,11 @@ module Gitlab
         end
 
         if Database.postgresql?
-          args << { algorithm: :concurrently }
+          if args[2].present?
+            args[2].merge!({ algorithm: :concurrently })
+          else
+            args << { algorithm: :concurrently }
+          end
         end
 
         add_index(*args)

From d8e90d03b7b8dddeca54245b6f2662aa39b5cda8 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 21:53:04 +0200
Subject: [PATCH 1069/1431] Generate knapsack reports

---
 .gitlab-ci.yml                                   | 1 +
 app/controllers/projects/artifacts_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fc410b4b51..9af4b5fc7ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,7 @@ prepare:
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
     - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - export KNAPSACK_GENERATE_REPORT=true
     - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
     - knapsack ${JOB_NAME[0]}
   artifacts:
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index cfea1266516..832d7deb57d 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -37,7 +37,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
   private
 
   def build
-    @build ||= project.builds.unscoped.find_by!(id: params[:build_id])
+    @build ||= project.builds.find_by!(id: params[:build_id])
   end
 
   def artifacts_file

From ea731cac08efb8b2a4edbc7c76523ae5a5b17070 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 22:54:25 +0200
Subject: [PATCH 1070/1431] Preserve knapsack state

---
 .gitlab-ci.yml | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9af4b5fc7ae..e3319843656 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ before_script:
   - source ./scripts/prepare_build.sh
   - cp config/gitlab.yml.example config/gitlab.yml
   - bundle --version
-  - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
+  - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"'
   - retry gem install knapsack
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
@@ -31,18 +31,26 @@ stages:
 - post-test
 - notifications
 
-prepare:
+precompile:
   stage: prepare
   variables:
     USE_DB: "false"
   script:
     - bundle exec rake assets:precompile
-    - mkdir -p knapsack/
-    - echo "{}" > knapsack/rspec_report.json
-    - echo "{}" > knapsack/spinach_report.json
   artifacts:
     paths:
     - public/assets/
+
+.knapsack_state: &knapsack_state
+  variables:
+    USE_DB: "false"
+    USE_BUNDLE_INSTALL: "false"
+  cache:
+    key: "knapsack"
+    paths:
+    - knapsack/
+  artifacts:
+    paths:
     - knapsack/
 
 .knapsack: &knapsack
@@ -59,21 +67,21 @@ prepare:
     paths:
     - knapsack/
 
-post-tests:
+knapsack:
+  <<: *knapsack_state
+  stage: prepare
+  script:
+    - mkdir -p knapsack/
+    - '[[ -f knapsack/rspec_report.json ]] || echo "{}" > knapsack/rspec_report.json'
+    - '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
+
+update-knapsack:
+  <<: *knapsack_state
   stage: post-test
-  variables:
-    USE_DB: "false"
   script:
     - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
     - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
     - rm -f knapsack/*_node_*.json
-  cache:
-    key: "knapsack"
-    paths:
-    - knapsack/
-  artifacts:
-    paths:
-    - knapsack/
 
 .exec: &exec
   stage: test

From ccc8d419e65f19cfa8ea60622b527299de55d533 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 3 Jun 2016 15:00:04 -0600
Subject: [PATCH 1071/1431] Add confidential issue notice in comment box.

---
 app/assets/stylesheets/pages/note_form.scss | 33 +++++++++++++++++++++
 app/views/projects/_md_preview.html.haml    |  6 ++++
 2 files changed, 39 insertions(+)

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 7fa13e66b43..a6765fbc7c7 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -87,6 +87,39 @@
   }
 }
 
+.md-header .nav-links {
+  display: flex;
+  display: -webkit-flex;
+  flex-flow: row wrap;
+  -webkit-flex-flow: row wrap;
+  width: 100%;
+
+  .pull-right {
+    // Flexbox quirk to make sure right-aligned items stay right-aligned.
+    margin-left: auto;
+  }
+}
+
+.confidential-issue-warning {
+  background-color: $gray-normal;
+  border-radius: 3px;
+  padding: 3px 12px;
+  margin: auto;
+  margin-top: 0;
+  text-align: center;
+  font-size: 13px;
+
+  @media (max-width: $screen-md-min) {
+    // On smaller devices the warning becomes the fourth item in the list,
+    // rather than centering, and grows to span the full width of the
+    // comment area.
+    order: 4;
+    -webkit-order: 4;
+    margin: 6px auto;
+    width: 100%;
+  }
+}
+
 .discussion-form {
   padding: $gl-padding-top $gl-padding;
   background-color: $white-light;
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index 81afea2c60a..59a952dd662 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -7,6 +7,12 @@
       %li
         %a.js-md-preview-button{ href: "#md-preview-holder", tabindex: -1 }
           Preview
+
+      - if @issue.confidential?
+        %li.confidential-issue-warning
+          = icon('warning')
+          %span This is a confidential issue. Your comment will not be visible to the public.
+          
       %li.pull-right
         %button.zen-control.zen-control-full.js-zen-enter{ type: 'button', tabindex: -1 }
           Go full screen

From 9a201adddf0f5bdf10ff5cda65f6d58ef904df4b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 23:03:58 +0200
Subject: [PATCH 1072/1431] USE_BUNDLE_INSTALL

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3319843656..dc04f3f298f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ variables:
   RAILS_ENV: "test"
   SIMPLECOV: "true"
   USE_DB: "true"
+  USE_BUNDLE_INSTALL: "true"
 
 before_script:
   - source ./scripts/prepare_build.sh

From 82f7831d734805188c84e687aced459564549325 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Jun 2016 23:05:15 +0200
Subject: [PATCH 1073/1431] Don't start services if they are not needed

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc04f3f298f..9774602cbdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,7 @@ stages:
 
 precompile:
   stage: prepare
+  services: []
   variables:
     USE_DB: "false"
   script:
@@ -43,6 +44,7 @@ precompile:
     - public/assets/
 
 .knapsack_state: &knapsack_state
+  services: []
   variables:
     USE_DB: "false"
     USE_BUNDLE_INSTALL: "false"

From 5b0316eab51546addea9cde74b710e9742fc95b8 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 3 Jun 2016 15:10:52 -0600
Subject: [PATCH 1074/1431] Add Changelog entry.

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

diff --git a/CHANGELOG b/CHANGELOG
index d54cac7f93b..8c0a1d42d34 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.9.0 (unreleased)
   - Improve error handling importing projects
   - Put project Files and Commits tabs under Code tab
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
+  - An indicator is now displayed at the top of the comment field for confidential issues.
 
 v 8.8.4
   - Fix todos page throwing errors when you have a project pending deletion

From 1f608ac4614f57130992916931ad10f4d5fd9d50 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Sat, 4 Jun 2016 00:02:40 +0200
Subject: [PATCH 1076/1431] Remove 'unscoped' from project builds selection

---
 .../projects/artifacts_controller.rb          |   2 +-
 app/controllers/projects/builds_controller.rb |   2 +-
 spec/features/builds_spec.rb                  | 168 ++++++++++++++----
 3 files changed, 138 insertions(+), 34 deletions(-)

diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index cfea1266516..832d7deb57d 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -37,7 +37,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
   private
 
   def build
-    @build ||= project.builds.unscoped.find_by!(id: params[:build_id])
+    @build ||= project.builds.find_by!(id: params[:build_id])
   end
 
   def artifacts_file
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index bb1f6c5e980..db3ae586059 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -81,7 +81,7 @@ class Projects::BuildsController < Projects::ApplicationController
   private
 
   def build
-    @build ||= project.builds.unscoped.find_by!(id: params[:id])
+    @build ||= project.builds.find_by!(id: params[:id])
   end
 
   def build_path(build)
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 7a05d30e8b5..e268d76755f 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -7,6 +7,7 @@ describe "Builds" do
     login_as(:user)
     @commit = FactoryGirl.create :ci_commit
     @build = FactoryGirl.create :ci_build, commit: @commit
+    @build2 = FactoryGirl.create :ci_build
     @project = @commit.project
     @project.team << [@user, :developer]
   end
@@ -66,13 +67,24 @@ describe "Builds" do
   end
 
   describe "GET /:project/builds/:id" do
-    before do
-      visit namespace_project_build_path(@project.namespace, @project, @build)
+    context "Build from project" do
+      before do
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+      end
+
+      it { expect(page.status_code).to eq(200) }
+      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
 
-    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 }
+    context "Build from other project" do
+      before do
+        visit namespace_project_build_path(@project.namespace, @project, @build2)
+      end
+
+      it { expect(page.status_code).to eq(404) }
+    end
 
     context "Download artifacts" do
       before do
@@ -103,51 +115,143 @@ describe "Builds" do
   end
 
   describe "POST /:project/builds/:id/cancel" do
-    before do
-      @build.run!
-      visit namespace_project_build_path(@project.namespace, @project, @build)
-      click_link "Cancel"
+    context "Build from project" do
+      before do
+        @build.run!
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+        click_link "Cancel"
+      end
+
+      it { expect(page.status_code).to eq(200) }
+      it { expect(page).to have_content 'canceled' }
+      it { expect(page).to have_content 'Retry' }
     end
 
-    it { expect(page).to have_content 'canceled' }
-    it { expect(page).to have_content 'Retry' }
+    context "Build from other project" do
+      before do
+        @build.run!
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+        page.driver.post(cancel_namespace_project_build_path(@project.namespace, @project, @build2))
+      end
+
+      it { expect(page.status_code).to eq(404) }
+    end
   end
 
   describe "POST /:project/builds/:id/retry" do
-    before do
-      @build.run!
-      visit namespace_project_build_path(@project.namespace, @project, @build)
-      click_link "Cancel"
-      click_link 'Retry'
+    context "Build from project" do
+      before do
+        @build.run!
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+        click_link 'Cancel'
+        click_link 'Retry'
+      end
+
+      it { expect(page.status_code).to eq(200) }
+      it { expect(page).to have_content 'pending' }
+      it { expect(page).to have_content 'Cancel' }
     end
 
-    it { expect(page).to have_content 'pending' }
-    it { expect(page).to have_content 'Cancel' }
+    context "Build from other project" do
+      before do
+        @build.run!
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+        click_link 'Cancel'
+        page.driver.post(retry_namespace_project_build_path(@project.namespace, @project, @build2))
+      end
+
+      it { expect(page.status_code).to eq(404) }
+    end
   end
 
   describe "GET /:project/builds/:id/download" do
-    before do
-      @build.update_attributes(artifacts_file: artifacts_file)
-      visit namespace_project_build_path(@project.namespace, @project, @build)
-      page.within('.artifacts') { click_link 'Download' }
+    context "Build from project" do
+      before do
+        @build.update_attributes(artifacts_file: artifacts_file)
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+        page.within('.artifacts') { click_link 'Download' }
+      end
+
+      it { expect(page.status_code).to eq(200) }
+      it { expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type) }
     end
 
-    it { expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type) }
+    context "Build from other project" do
+      before do
+        @build2.update_attributes(artifacts_file: artifacts_file)
+        visit download_namespace_project_build_artifacts_path(@project.namespace, @project, @build2)
+      end
+
+      it { expect(page.status_code).to eq(404) }
+    end
   end
 
   describe "GET /:project/builds/:id/raw" do
-    before do
-      Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile')
-      @build.run!
-      @build.trace = 'BUILD TRACE'
-      visit namespace_project_build_path(@project.namespace, @project, @build)
+    context "Build from project" do
+      before do
+        Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile')
+        @build.run!
+        @build.trace = 'BUILD TRACE'
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+        page.within('.build-controls') { click_link 'Raw' }
+      end
+
+      it 'sends the right headers' do
+        expect(page.status_code).to eq(200)
+        expect(page.response_headers['Content-Type']).to eq('text/plain; charset=utf-8')
+        expect(page.response_headers['X-Sendfile']).to eq(@build.path_to_trace)
+      end
     end
 
-    it 'sends the right headers' do
-      page.within('.build-controls') { click_link 'Raw' }
+    context "Build from other project" do
+      before do
+        Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile')
+        @build2.run!
+        @build2.trace = 'BUILD TRACE'
+        visit raw_namespace_project_build_path(@project.namespace, @project, @build2)
+        puts page.status_code
+        puts current_url
+      end
 
-      expect(page.response_headers['Content-Type']).to eq('text/plain; charset=utf-8')
-      expect(page.response_headers['X-Sendfile']).to eq(@build.path_to_trace)
+      it 'sends the right headers' do
+        expect(page.status_code).to eq(404)
+      end
+    end
+  end
+
+  describe "GET /:project/builds/:id/trace.json" do
+    context "Build from project" do
+      before do
+        visit trace_namespace_project_build_path(@project.namespace, @project, @build, format: :json)
+      end
+
+      it { expect(page.status_code).to eq(200) }
+    end
+
+    context "Build from other project" do
+      before do
+        visit trace_namespace_project_build_path(@project.namespace, @project, @build2, format: :json)
+      end
+
+      it { expect(page.status_code).to eq(404) }
+    end
+  end
+
+  describe "GET /:project/builds/:id/status" do
+    context "Build from project" do
+      before do
+        visit status_namespace_project_build_path(@project.namespace, @project, @build)
+      end
+
+      it { expect(page.status_code).to eq(200) }
+    end
+
+    context "Build from other project" do
+      before do
+        visit status_namespace_project_build_path(@project.namespace, @project, @build2)
+      end
+
+      it { expect(page.status_code).to eq(404) }
     end
   end
 end

From dbccacdb82bc40ce7f88e1e5027a0c2820f08349 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 22 Apr 2016 16:14:28 -0500
Subject: [PATCH 1077/1431] Ability to assign a label to multiple issues

---
 app/assets/javascripts/labels_select.js.coffee      |  4 ++++
 app/controllers/projects/issues_controller.rb       |  3 ++-
 app/views/shared/issuable/_filter.html.haml         |  4 ++++
 app/views/shared/issuable/_label_dropdown.html.haml | 10 +++++++++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 995fd768603..b4ee41a8507 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -12,6 +12,7 @@ class @LabelsSelect
       newColorField = $('#new_label_color')
       showNo = $dropdown.data('show-no')
       showAny = $dropdown.data('show-any')
+      useId = $dropdown.data('use-id')
       defaultLabel = $dropdown.data('default-label')
       abilityName = $dropdown.data('ability-name')
       $selectbox = $dropdown.closest('.selectbox')
@@ -284,6 +285,9 @@ class @LabelsSelect
 
         multiSelect: $dropdown.hasClass 'js-multiselect'
         clicked: (label) ->
+          if $dropdown.hasClass('js-filter-bulk-update')
+            return
+
           page = $('body').data 'page'
           isIssueIndex = page is 'projects:issues:index'
           isMRIndex = page is 'projects:merge_requests:index'
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 5f3745d94b9..4ec8d31986a 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -216,7 +216,8 @@ class Projects::IssuesController < Projects::ApplicationController
       :issues_ids,
       :assignee_id,
       :milestone_id,
-      :state_event
+      :state_event,
+      :label_ids
     )
   end
 end
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index cedff4af2e0..c4324809fb2 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -44,6 +44,10 @@
               placeholder: "Search authors", data: { first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: @project.id, field_name: "update[assignee_id]" } })
           .filter-item.inline
             = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update', filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), use_id: true } })
+
+          .filter-item.inline.labels-filter
+            = render "shared/issuable/label_dropdown", classes: ' js-filter-bulk-update js-multiselect ', extra_options: false, show_footer: false, extra_options: false, data_options: {  field_name: "update[label_ids]", show_no: false, show_any: false, use_id: true }
+
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]
           .filter-item.inline
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index 61fd1e9c335..0091e4f49ff 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -1,9 +1,17 @@
+- extra_options = local_assigns.fetch(:extra_options, true)
+- show_footer = local_assigns.fetch(:show_footer, true)
+- data_options = local_assigns.fetch(:data_options, {})
+- classes = local_assigns.fetch(:classes, '')
+- dropdown_data = {toggle: 'dropdown', field_name: 'label_name[]', show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}
+- dropdown_data.merge!(data_options)
+- classes << ' js-extra-options ' if extra_options
+
 - if params[:label_name].present?
   - if params[:label_name].respond_to?('any?')
     - params[:label_name].each do |label|
       = hidden_field_tag "label_name[]", label, id: nil
 .dropdown
-  %button.dropdown-menu-toggle.js-label-select.js-filter-submit.js-multiselect.js-extra-options{type: "button", data: {toggle: "dropdown", field_name: "label_name[]", show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}}
+  %button.dropdown-menu-toggle.js-label-select.js-filter-submit.js-multiselect{class: classes, type: "button", data: dropdown_data}
     %span.dropdown-toggle-text
       = h(multi_label_name(params[:label_name], "Label"))
     = icon('chevron-down')

From da29ad4b9d8db9a035791ee7e46b8fdc237d5edf Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 25 Apr 2016 17:09:13 -0500
Subject: [PATCH 1078/1431] Add label_ids to bulk_update_params

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

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 4ec8d31986a..5897418ed56 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -217,7 +217,7 @@ class Projects::IssuesController < Projects::ApplicationController
       :assignee_id,
       :milestone_id,
       :state_event,
-      :label_ids
+      label_ids: []
     )
   end
 end

From af30c87cf28c589bb080ead96938ac77e433b0fb Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 25 Apr 2016 17:10:12 -0500
Subject: [PATCH 1079/1431] Remove unnecesary assignment

---
 app/assets/javascripts/labels_select.js.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index b4ee41a8507..b8205565dbc 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -12,7 +12,6 @@ class @LabelsSelect
       newColorField = $('#new_label_color')
       showNo = $dropdown.data('show-no')
       showAny = $dropdown.data('show-any')
-      useId = $dropdown.data('use-id')
       defaultLabel = $dropdown.data('default-label')
       abilityName = $dropdown.data('ability-name')
       $selectbox = $dropdown.closest('.selectbox')

From 243e51325536ca8468a9d2692cc68aa5f466b5e3 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 25 Apr 2016 17:11:17 -0500
Subject: [PATCH 1080/1431] Add .js-filter-submit when needed

---
 app/views/shared/issuable/_filter.html.haml         | 2 +-
 app/views/shared/issuable/_label_dropdown.html.haml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index c4324809fb2..0ca4b9a681a 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -46,7 +46,7 @@
             = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update', filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), use_id: true } })
 
           .filter-item.inline.labels-filter
-            = render "shared/issuable/label_dropdown", classes: ' js-filter-bulk-update js-multiselect ', extra_options: false, show_footer: false, extra_options: false, data_options: {  field_name: "update[label_ids]", show_no: false, show_any: false, use_id: true }
+            = render "shared/issuable/label_dropdown", classes: ' js-filter-bulk-update js-multiselect ', extra_options: false, filter_submit: false, show_footer: false, extra_options: false, data_options: {  field_name: "update[label_ids][]", show_no: false, show_any: false, use_id: true }
 
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index 0091e4f49ff..5e25d838666 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -1,17 +1,19 @@
 - extra_options = local_assigns.fetch(:extra_options, true)
+- filter_submit = local_assigns.fetch(:filter_submit, true)
 - show_footer = local_assigns.fetch(:show_footer, true)
 - data_options = local_assigns.fetch(:data_options, {})
 - classes = local_assigns.fetch(:classes, '')
 - dropdown_data = {toggle: 'dropdown', field_name: 'label_name[]', show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}
 - dropdown_data.merge!(data_options)
 - classes << ' js-extra-options ' if extra_options
+- classes << ' js-filter-submit ' if filter_submit
 
 - if params[:label_name].present?
   - if params[:label_name].respond_to?('any?')
     - params[:label_name].each do |label|
       = hidden_field_tag "label_name[]", label, id: nil
 .dropdown
-  %button.dropdown-menu-toggle.js-label-select.js-filter-submit.js-multiselect{class: classes, type: "button", data: dropdown_data}
+  %button.dropdown-menu-toggle.js-label-select.js-multiselect{class: classes, type: "button", data: dropdown_data}
     %span.dropdown-toggle-text
       = h(multi_label_name(params[:label_name], "Label"))
     = icon('chevron-down')

From 4ab6bfcef50b5e3a8c879ad06161bbc8b56bfb9a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 13:05:21 -0500
Subject: [PATCH 1081/1431] Set indeterminated items

---
 app/assets/javascripts/gl_dropdown.js.coffee  | 14 +++++++-
 .../javascripts/labels_select.js.coffee       | 32 +++++++++++++++++--
 .../stylesheets/framework/dropdowns.scss      | 11 +++++--
 app/helpers/issuables_helper.rb               |  5 +++
 app/views/projects/issues/_issue.html.haml    |  2 +-
 5 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index d263faa287a..7a23a3cf881 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -11,6 +11,8 @@ class GitLabDropdownFilter
     $inputContainer = @input.parent()
     $clearButton = $inputContainer.find('.js-dropdown-input-clear')
 
+    @indeterminatedIds = []
+
     # Clear click
     $clearButton.on 'click', (e) =>
       e.preventDefault()
@@ -298,6 +300,13 @@ class GitLabDropdown
   opened: =>
     @addArrowKeyEvent()
 
+    if @options.setIndeterminatedIds
+      @options.setIndeterminatedIds.call(@)
+
+    # Makes indeterminated items effective
+    if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
+      @parseData @fullData
+
     contentHtml = $('.dropdown-content', @dropdown).html()
     if @remote && contentHtml is ""
       @remote.execute()
@@ -309,6 +318,9 @@ class GitLabDropdown
 
   hidden: (e) =>
     @removeArrayKeyEvent()
+
+    return if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
+
     if @options.filterable
       @dropdown
         .find(".dropdown-input-field")
@@ -358,7 +370,7 @@ class GitLabDropdown
 
     if @options.renderRow
       # Call the render function
-      html = @options.renderRow(data)
+      html = @options.renderRow.call(@options, data, @)
     else
       if not selected
         value = if @options.id then @options.id(data) else data.id
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index b8205565dbc..0aedc7a5f0b 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -1,5 +1,7 @@
 class @LabelsSelect
   constructor: ->
+    _this = @
+
     $('.js-label-select').each (i, dropdown) ->
       $dropdown = $(dropdown)
       projectId = $dropdown.data('project-id')
@@ -196,15 +198,25 @@ class @LabelsSelect
 
             callback data
 
-        renderRow: (label) ->
+        renderRow: (label, instance) ->
+          selectedClass = []
           removesAll = label.id is 0 or not label.id?
 
-          selectedClass = []
+          if $dropdown.hasClass('js-filter-bulk-update')
+            indeterminated = instance.indeterminatedIds
+            if indeterminated.indexOf(label.id) isnt -1
+              selectedClass.push 'indeterminated'
+
           if $form.find("input[type='hidden']\
             [name='#{$dropdown.data('fieldName')}']\
             [value='#{this.id(label)}']").length
             selectedClass.push 'is-active'
 
+            index = selectedClass.indexOf('indeterminated')
+
+            if index isnt -1
+              selectedClass.splice(index, 1)
+
           if $dropdown.hasClass('js-multiselect') and removesAll
             selectedClass.push 'dropdown-clear-active'
 
@@ -264,6 +276,8 @@ class @LabelsSelect
             label.id
 
         hidden: ->
+          return if $dropdown.hasClass('js-filter-bulk-update')
+
           page = $('body').data 'page'
           isIssueIndex = page is 'projects:issues:index'
           isMRIndex = page is 'projects:merge_requests:index'
@@ -301,4 +315,18 @@ class @LabelsSelect
               return
             else
               saveLabelData()
+
+        setIndeterminatedIds: ->
+          if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
+            console.log 'options.setIndeterminatedIds'
+            @indeterminatedIds = _this.getIndeterminatedIds()
       )
+
+  getIndeterminatedIds: ->
+    label_ids = []
+
+    $('.selected_issue:checked').each (i, el) ->
+      issue_id = $(el).data('id')
+      label_ids.push $("#issue_#{issue_id}").data('labels')
+
+    _.flatten(label_ids)
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 93c63c69843..a77c19bf2a7 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -232,9 +232,8 @@
   a {
     padding-left: 25px;
 
-    &.is-active {
+    &.indeterminated, &.is-active{
       &::before {
-        content: "\f00c";
         position: absolute;
         left: 5px;
         top: 50%;
@@ -246,6 +245,14 @@
         -moz-osx-font-smoothing: grayscale;
       }
     }
+
+    &.indeterminated::before {
+      content: "\f068";
+    }
+
+    &.is-active::before {
+      content: "\f00c";
+    }
   }
 }
 
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index fe84ee3de44..b1ff95f6208 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -97,4 +97,9 @@ module IssuablesHelper
     end
   end
 
+  def label_ids(issuable)
+    return nil if !issuable.labels.any?
+    issuable.labels.pluck :id
+  end
+
 end
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 4701429215b..ebaa34f4fff 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -1,4 +1,4 @@
-%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue) }
+%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), :'data-labels' => label_ids(issue) }
   - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
     .issue-check
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"

From 6974d970b40af6b01e14941314a09d250d87c8d3 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 14:34:19 -0500
Subject: [PATCH 1082/1431] typo

---
 app/assets/javascripts/gl_dropdown.js.coffee  |  8 ++++----
 .../javascripts/labels_select.js.coffee       | 19 +++++++------------
 .../stylesheets/framework/dropdowns.scss      |  4 ++--
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 7a23a3cf881..989ab3023ca 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -11,7 +11,7 @@ class GitLabDropdownFilter
     $inputContainer = @input.parent()
     $clearButton = $inputContainer.find('.js-dropdown-input-clear')
 
-    @indeterminatedIds = []
+    @indeterminateIds = []
 
     # Clear click
     $clearButton.on 'click', (e) =>
@@ -300,10 +300,10 @@ class GitLabDropdown
   opened: =>
     @addArrowKeyEvent()
 
-    if @options.setIndeterminatedIds
-      @options.setIndeterminatedIds.call(@)
+    if @options.setIndeterminateIds
+      @options.setIndeterminateIds.call(@)
 
-    # Makes indeterminated items effective
+    # Makes indeterminate items effective
     if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
       @parseData @fullData
 
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 0aedc7a5f0b..da2c85967df 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -203,20 +203,15 @@ class @LabelsSelect
           removesAll = label.id is 0 or not label.id?
 
           if $dropdown.hasClass('js-filter-bulk-update')
-            indeterminated = instance.indeterminatedIds
-            if indeterminated.indexOf(label.id) isnt -1
-              selectedClass.push 'indeterminated'
+            indeterminate = instance.indeterminateIds
+            if indeterminate.indexOf(label.id) isnt -1
+              selectedClass.push 'indeterminate'
 
           if $form.find("input[type='hidden']\
             [name='#{$dropdown.data('fieldName')}']\
             [value='#{this.id(label)}']").length
             selectedClass.push 'is-active'
 
-            index = selectedClass.indexOf('indeterminated')
-
-            if index isnt -1
-              selectedClass.splice(index, 1)
-
           if $dropdown.hasClass('js-multiselect') and removesAll
             selectedClass.push 'dropdown-clear-active'
 
@@ -316,13 +311,13 @@ class @LabelsSelect
             else
               saveLabelData()
 
-        setIndeterminatedIds: ->
+        setIndeterminateIds: ->
           if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
-            console.log 'options.setIndeterminatedIds'
-            @indeterminatedIds = _this.getIndeterminatedIds()
+            console.log 'options.setIndeterminateIds'
+            @indeterminateIds = _this.getIndeterminateIds()
       )
 
-  getIndeterminatedIds: ->
+  getIndeterminateIds: ->
     label_ids = []
 
     $('.selected_issue:checked').each (i, el) ->
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index a77c19bf2a7..6ef0405c7e7 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -232,7 +232,7 @@
   a {
     padding-left: 25px;
 
-    &.indeterminated, &.is-active{
+    &.indeterminate, &.is-active{
       &::before {
         position: absolute;
         left: 5px;
@@ -246,7 +246,7 @@
       }
     }
 
-    &.indeterminated::before {
+    &.indeterminate::before {
       content: "\f068";
     }
 

From eccc1f5911ce686ca6d5ce32c7f25aa1f905609a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 14:57:53 -0500
Subject: [PATCH 1083/1431] Update classname for indeterminate state

---
 app/assets/javascripts/labels_select.js.coffee  | 2 +-
 app/assets/stylesheets/framework/dropdowns.scss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index da2c85967df..6a3c8de3009 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -205,7 +205,7 @@ class @LabelsSelect
           if $dropdown.hasClass('js-filter-bulk-update')
             indeterminate = instance.indeterminateIds
             if indeterminate.indexOf(label.id) isnt -1
-              selectedClass.push 'indeterminate'
+              selectedClass.push 'is-indeterminate'
 
           if $form.find("input[type='hidden']\
             [name='#{$dropdown.data('fieldName')}']\
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 6ef0405c7e7..d18d00c1e5e 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -232,7 +232,7 @@
   a {
     padding-left: 25px;
 
-    &.indeterminate, &.is-active{
+    &.is-indeterminate, &.is-active{
       &::before {
         position: absolute;
         left: 5px;
@@ -246,7 +246,7 @@
       }
     }
 
-    &.indeterminate::before {
+    &.is-indeterminate::before {
       content: "\f068";
     }
 

From d8aaf018ac318aefa126f35bf0110da913441735 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 16:50:48 -0500
Subject: [PATCH 1084/1431] Handle unchecking of indeterminate items

---
 app/assets/javascripts/gl_dropdown.js.coffee  | 32 ++++++++++++++-----
 .../javascripts/labels_select.js.coffee       |  9 ++++--
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 989ab3023ca..1e144861741 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -144,6 +144,7 @@ class GitLabDropdown
   LOADING_CLASS = "is-loading"
   PAGE_TWO_CLASS = "is-page-two"
   ACTIVE_CLASS = "is-active"
+  INDETERMINATE_CLASS = "is-indeterminate"
   currentIndex = -1
 
   FILTER_INPUT = '.dropdown-input .dropdown-input-field'
@@ -319,8 +320,6 @@ class GitLabDropdown
   hidden: (e) =>
     @removeArrayKeyEvent()
 
-    return if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
-
     if @options.filterable
       @dropdown
         .find(".dropdown-input-field")
@@ -455,6 +454,17 @@ class GitLabDropdown
         $(@el).find(".dropdown-toggle-text").text @options.toggleLabel
       else
         selectedObject
+    else if el.hasClass(INDETERMINATE_CLASS)
+      el.addClass ACTIVE_CLASS
+      el.removeClass INDETERMINATE_CLASS
+
+      if !value?
+        field.remove()
+
+      if !field.length and fieldName
+        @addInput(fieldName, value)
+
+      return selectedObject
     else
       if not @options.multiSelect or el.hasClass('dropdown-clear-active')
         @dropdown.find(".#{ACTIVE_CLASS}").removeClass ACTIVE_CLASS
@@ -471,17 +481,23 @@ class GitLabDropdown
         $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selectedObject, el)
       if value?
         if !field.length and fieldName
-          # Create hidden input for form
-          input = "<input type='hidden' name='#{fieldName}' value='#{value}' />"
-          if @options.inputId?
-            input = $(input)
-                      .attr('id', @options.inputId)
-          @dropdown.before input
+          @addInput(fieldName, value)
         else
           field.val value
 
       return selectedObject
 
+  addInput: (fieldName, value)->
+    # Create hidden input for form
+    input = "<input type='hidden' name='#{fieldName}' value='#{value}' />"
+    if @options.inputId?
+      input = $(input)
+                .attr('id', @options.inputId)
+    @dropdown.before input
+
+  removeInputs: ->
+    @dropdown.parent().find('input[type="hidden"]').remove()
+
   selectRowAtIndex: (e, index) ->
     selector = ".dropdown-content li:not(.divider,.dropdown-header,.separator):eq(#{index}) a"
 
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 6a3c8de3009..000d47c6ce5 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -271,8 +271,6 @@ class @LabelsSelect
             label.id
 
         hidden: ->
-          return if $dropdown.hasClass('js-filter-bulk-update')
-
           page = $('body').data 'page'
           isIssueIndex = page is 'projects:issues:index'
           isMRIndex = page is 'projects:merge_requests:index'
@@ -289,7 +287,12 @@ class @LabelsSelect
             else if $dropdown.hasClass('js-filter-submit')
               $dropdown.closest('form').submit()
             else
-              saveLabelData()
+              if not $dropdown.hasClass 'js-filter-bulk-update'
+                saveLabelData()
+
+          if $dropdown.hasClass('js-filter-bulk-update')
+            @removeInputs()
+            $dropdown.parent().find('.is-active, .is-indeterminate').removeClass()
 
         multiSelect: $dropdown.hasClass 'js-multiselect'
         clicked: (label) ->

From 02fc7adf11e3675818399ffa97571a38efd9cac1 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 22:16:18 -0500
Subject: [PATCH 1085/1431] Remove console.log

---
 app/assets/javascripts/labels_select.js.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 000d47c6ce5..8c259d45b9f 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -316,7 +316,6 @@ class @LabelsSelect
 
         setIndeterminateIds: ->
           if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
-            console.log 'options.setIndeterminateIds'
             @indeterminateIds = _this.getIndeterminateIds()
       )
 

From 558ef36f6ce5b1acb86ce5a1e38ab078fe96bcc2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 22:29:01 -0500
Subject: [PATCH 1086/1431] Do not remove inputs when dropdown menu hides

---
 app/assets/javascripts/labels_select.js.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 8c259d45b9f..9f845078b7f 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -291,7 +291,6 @@ class @LabelsSelect
                 saveLabelData()
 
           if $dropdown.hasClass('js-filter-bulk-update')
-            @removeInputs()
             $dropdown.parent().find('.is-active, .is-indeterminate').removeClass()
 
         multiSelect: $dropdown.hasClass 'js-multiselect'

From e250e8571b27ea6abdb4db4ed5e1695485c84f34 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 26 Apr 2016 23:55:58 -0500
Subject: [PATCH 1087/1431] Bulk assignment tests

---
 .../issues/bulk_assigment_labels_spec.rb      | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 spec/features/issues/bulk_assigment_labels_spec.rb

diff --git a/spec/features/issues/bulk_assigment_labels_spec.rb b/spec/features/issues/bulk_assigment_labels_spec.rb
new file mode 100644
index 00000000000..417c4cf09b7
--- /dev/null
+++ b/spec/features/issues/bulk_assigment_labels_spec.rb
@@ -0,0 +1,109 @@
+require 'rails_helper'
+
+feature 'Issues > Labels bulk assignment', feature: true do
+  include WaitForAjax
+
+  let(:user)    { create(:user) }
+  let!(:project) { create(:project) }
+  let!(:issue1)  { create(:issue, project: project, title: "Issue 1") }
+  let!(:issue2)  { create(:issue, project: project, title: "Issue 2") }
+
+  before do
+    create(:label, project: project, title: 'bug')
+    create(:label, project: project, title: 'feature')
+  end
+
+  context 'as a allowed user', js: true do
+    before do
+      project.team << [user, :master]
+      login_as user
+
+      visit namespace_project_issues_path(project.namespace, project)
+    end
+
+    context 'can bulk assign a label' do
+      context 'to all issues' do
+        before do
+          check 'check_all_issues'
+          open_labels_dropdown ['bug']
+          click_button 'Update issues'
+        end
+
+        it do
+          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+        end
+      end
+
+      context 'to a issue' do
+        before do
+          check "selected_issue_#{issue1.id}"
+          open_labels_dropdown ['bug']
+          click_button 'Update issues'
+        end
+
+        it do
+          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue2.id}")).not_to have_content 'bug'
+        end
+      end
+    end
+
+    context 'can bulk assign multiple labels' do
+      context 'to all issues' do
+        before do
+          check 'check_all_issues'
+          open_labels_dropdown ['bug', 'feature']
+          click_button 'Update issues'
+        end
+
+        it do
+          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue1.id}")).to have_content 'feature'
+          expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue2.id}")).to have_content 'feature'
+        end
+      end
+
+      context 'to a issue' do
+        before do
+          check "selected_issue_#{issue1.id}"
+          open_labels_dropdown ['bug', 'feature']
+          click_button 'Update issues'
+        end
+
+        it do
+          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue1.id}")).to have_content 'feature'
+          expect(find("#issue_#{issue2.id}")).not_to have_content 'bug'
+          expect(find("#issue_#{issue2.id}")).not_to have_content 'feature'
+        end
+      end
+    end
+  end
+
+  context 'as a guest' do
+    before do
+      login_as user
+
+      visit namespace_project_issues_path(project.namespace, project)
+    end
+
+    context 'cannot bulk assign labels' do
+      it do
+        expect(page).not_to have_css '.check_all_issues'
+        expect(page).not_to have_css '.issue-check'
+      end
+    end
+  end
+
+  def open_labels_dropdown(items = [])
+    page.within('.issues_bulk_update') do
+      click_button 'Label'
+      wait_for_ajax
+      items.map do |item|
+        click_link item
+      end
+    end
+  end
+end
\ No newline at end of file

From 112f6a1e6d2e12e4c7f507a8fc0adb996e4a25b0 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 27 Apr 2016 11:07:09 -0500
Subject: [PATCH 1088/1431] Add empty line to end of file

---
 spec/features/issues/bulk_assigment_labels_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/issues/bulk_assigment_labels_spec.rb b/spec/features/issues/bulk_assigment_labels_spec.rb
index 417c4cf09b7..b99729ffd09 100644
--- a/spec/features/issues/bulk_assigment_labels_spec.rb
+++ b/spec/features/issues/bulk_assigment_labels_spec.rb
@@ -106,4 +106,4 @@ feature 'Issues > Labels bulk assignment', feature: true do
       end
     end
   end
-end
\ No newline at end of file
+end

From 7712aaf2a757835657f4e6b1af3349b0a8974fc9 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 27 Apr 2016 11:09:29 -0500
Subject: [PATCH 1089/1431] Add space

---
 app/assets/stylesheets/framework/dropdowns.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index d18d00c1e5e..28634d0c59f 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -232,7 +232,7 @@
   a {
     padding-left: 25px;
 
-    &.is-indeterminate, &.is-active{
+    &.is-indeterminate, &.is-active {
       &::before {
         position: absolute;
         left: 5px;

From 5a474ff8dafcd238f8bc3d93a34ff2093d0332a6 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 27 Apr 2016 11:24:11 -0500
Subject: [PATCH 1090/1431] Ensure we are clicking a visible dropdown

---
 features/steps/project/issues/filter_labels.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb
index d82c6856918..d34fa694789 100644
--- a/features/steps/project/issues/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
@@ -29,7 +29,7 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
   end
 
   step 'I click link "bug"' do
-    page.find('.js-label-select').click
+    page.find('.js-label-select', visible: true).click
     sleep 0.5
     execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()")
   end

From e42f88ca3783cc848137a04ed0c21f9cb3c0b7a7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 27 Apr 2016 18:07:25 -0500
Subject: [PATCH 1091/1431] Restore dropdown state when unchecking all issues

---
 app/assets/javascripts/labels_select.js.coffee | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 9f845078b7f..52c1e8a469b 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -318,6 +318,20 @@ class @LabelsSelect
             @indeterminateIds = _this.getIndeterminateIds()
       )
 
+    @bindEvents()
+
+  bindEvents: ->
+    $('body').on 'change', '.selected_issue', @onSelectCheckboxIssue
+
+  onSelectCheckboxIssue: ->
+    return if $('.selected_issue:checked').length
+
+    # Remove inputs
+    $('.issues_bulk_update .labels-filter input[type="hidden"]').remove()
+
+    # Also restore button text
+    $('.issues_bulk_update .labels-filter .dropdown-toggle-text').text('Label')
+
   getIndeterminateIds: ->
     label_ids = []
 

From 81a21c945eb8a6c2f0af7bb074a1aec389fe9394 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 29 Apr 2016 17:38:07 +0100
Subject: [PATCH 1092/1431] WIP: allow adding and removing labels in bulk

---
 app/controllers/projects/issues_controller.rb |  4 ++-
 app/services/issuable_base_service.rb         | 35 ++++++++++++++++---
 app/services/issues/bulk_update_service.rb    |  6 ++--
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 5897418ed56..855b4cfa09c 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -217,7 +217,9 @@ class Projects::IssuesController < Projects::ApplicationController
       :assignee_id,
       :milestone_id,
       :state_event,
-      label_ids: []
+      label_ids: [],
+      add_label_ids: [],
+      remove_label_ids: []
     )
   end
 end
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 2b16089df1b..969c87a6ed8 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -45,6 +45,8 @@ class IssuableBaseService < BaseService
 
     unless can?(current_user, ability, project)
       params.delete(:milestone_id)
+      params.delete(:add_label_ids)
+      params.delete(:remove_label_ids)
       params.delete(:label_ids)
       params.delete(:assignee_id)
     end
@@ -67,10 +69,35 @@ class IssuableBaseService < BaseService
   end
 
   def filter_labels
-    return if params[:label_ids].to_a.empty?
+    if params[:add_label_ids].present? || params[:remove_label_ids].present?
+      params.delete(:label_ids)
 
-    params[:label_ids] =
-      project.labels.where(id: params[:label_ids]).pluck(:id)
+      filter_labels_by_name([:add_label_ids, :remove_label_ids])
+    else
+      filter_labels_by_name([:label_ids])
+    end
+  end
+
+  def filter_labels_by_name(keys)
+    keys.each do |key|
+      return if params[key].to_a.empty?
+
+      params[key] = project.labels.where(id: params[key]).pluck(:id)
+    end
+  end
+
+  def update_issuable(issuable, attributes)
+    issuable.with_transaction_returning_status do
+      add_label_ids = attributes.delete(:add_label_ids)
+      remove_label_ids = attributes.delete(:remove_label_ids)
+
+      issuable.label_ids |= add_label_ids if add_label_ids
+      issuable.label_ids -= remove_label_ids if remove_label_ids
+
+      issuable.assign_attributes(attributes)
+
+      issuable.save
+    end
   end
 
   def update(issuable)
@@ -78,7 +105,7 @@ class IssuableBaseService < BaseService
     filter_params
     old_labels = issuable.labels.to_a
 
-    if params.present? && issuable.update_attributes(params.merge(updated_by: current_user))
+    if params.present? && update_issuable(issuable, params.merge(updated_by: current_user))
       issuable.reset_events_cache
       handle_common_system_notes(issuable, old_labels: old_labels)
       handle_changes(issuable, old_labels: old_labels)
diff --git a/app/services/issues/bulk_update_service.rb b/app/services/issues/bulk_update_service.rb
index de8387c4900..2772add1d02 100644
--- a/app/services/issues/bulk_update_service.rb
+++ b/app/services/issues/bulk_update_service.rb
@@ -4,9 +4,9 @@ module Issues
       issues_ids   = params.delete(:issues_ids).split(",")
       issue_params = params
 
-      issue_params.delete(:state_event)   unless issue_params[:state_event].present?
-      issue_params.delete(:milestone_id)  unless issue_params[:milestone_id].present?
-      issue_params.delete(:assignee_id)   unless issue_params[:assignee_id].present?
+      [:state_event, :milestone_id, :assignee_id, :label_ids, :add_label_ids, :remove_label_ids].each do |key|
+        issue_params.delete(key) unless issue_params[key].present?
+      end
 
       issues = Issue.where(id: issues_ids)
       issues.each do |issue|

From ac40843c94f369cad07f98a2403cd06db041f986 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 2 May 2016 16:25:21 +0100
Subject: [PATCH 1093/1431] fixup! WIP: allow adding and removing labels in
 bulk

---
 .../issues/bulk_update_service_spec.rb        | 148 ++++++++++++++++++
 1 file changed, 148 insertions(+)

diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index 454d5849495..09a1415abf0 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -111,4 +111,152 @@ describe Issues::BulkUpdateService, services: true do
     end
   end
 
+  describe 'updating labels' do
+    def create_issue_with_labels(labels)
+      create(:issue, project: project) { |issue| issue.labels = labels }
+    end
+
+    let(:user) { create(:user) }
+    let(:project) { Projects::CreateService.new(user, namespace: user.namespace, name: 'test').execute }
+    let(:label_1) { create(:label, project: project) }
+    let(:label_2) { create(:label, project: project) }
+    let(:label_3) { create(:label, project: project) }
+
+    let(:issue_all_labels) { create_issue_with_labels([label_1, label_2, label_3]) }
+    let(:issue_labels_1_and_2) { create_issue_with_labels([label_1, label_2]) }
+    let(:issue_labels_1_and_3) { create_issue_with_labels([label_1, label_3]) }
+    let(:issue_no_labels) { create(:issue, project: project) }
+    let(:issues) { [issue_all_labels, issue_labels_1_and_2, issue_labels_1_and_3, issue_no_labels] }
+
+    let(:labels) { [] }
+    let(:add_labels) { [] }
+    let(:remove_labels) { [] }
+
+    let(:params) do
+      {
+        label_ids: labels.map(&:id),
+        add_label_ids: add_labels.map(&:id),
+        remove_label_ids: remove_labels.map(&:id),
+        issues_ids: issues.map(&:id).join(',')
+      }
+    end
+
+    before { Issues::BulkUpdateService.new(project, user, params).execute }
+
+    context 'when label_ids are passed' do
+      let(:issues) { [issue_all_labels, issue_no_labels] }
+      let(:labels) { [label_1, label_2] }
+
+      it 'updates the labels of all issues passed to the labels passed' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(eq(labels.map(&:id)))
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+      end
+    end
+
+    context 'when add_label_ids are passed' do
+      let(:issues) { [issue_all_labels, issue_labels_1_and_3, issue_no_labels] }
+      let(:add_labels) { [label_1, label_2, label_3] }
+
+      it 'adds those label IDs to all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(*add_labels.map(&:id)))
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+      end
+    end
+
+    context 'when remove_label_ids are passed' do
+      let(:issues) { [issue_all_labels, issue_labels_1_and_3, issue_no_labels] }
+      let(:remove_labels) { [label_1, label_2, label_3] }
+
+      it 'removes those label IDs from all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(be_empty)
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+      end
+    end
+
+    context 'when add_label_ids and remove_label_ids are passed' do
+      let(:issues) { [issue_all_labels, issue_labels_1_and_3, issue_no_labels] }
+      let(:add_labels) { [label_1] }
+      let(:remove_labels) { [label_3] }
+
+      it 'adds the label IDs to all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_1.id))
+      end
+
+      it 'removes the label IDs from all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_3.id)
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+      end
+    end
+
+    context 'when add_label_ids and label_ids are passed' do
+      let(:issues) { [issue_all_labels, issue_labels_1_and_2, issue_labels_1_and_3] }
+      let(:labels) { [label_3] }
+      let(:add_labels) { [label_2] }
+
+      it 'adds the label IDs to all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_2.id))
+      end
+
+      it 'ignores the label IDs parameter' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_1.id))
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_no_labels.label_ids).to be_empty
+      end
+    end
+
+    context 'when remove_label_ids and label_ids are passed' do
+      let(:issues) { [issue_no_labels, issue_labels_1_and_2] }
+      let(:labels) { [label_3] }
+      let(:remove_labels) { [label_2] }
+
+      it 'remove the label IDs from all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_2.id)
+      end
+
+      it 'ignores the label IDs parameter' do
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_3.id)
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_all_labels.label_ids).to contain_exactly(label_1.id, label_2.id, label_3.id)
+      end
+    end
+
+    context 'when add_label_ids, remove_label_ids, and label_ids are passed' do
+      let(:issues) { [issue_labels_1_and_3, issue_no_labels] }
+      let(:labels) { [label_2] }
+      let(:add_labels) { [label_1] }
+      let(:remove_labels) { [label_3] }
+
+      it 'adds the label IDs to all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_1.id))
+      end
+
+      it 'removes the label IDs from all issues passed' do
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_3.id)
+      end
+
+      it 'ignores the label IDs parameter' do
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_2.id)
+      end
+
+      it 'does not update issues not passed in' do
+        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+      end
+    end
+  end
 end

From 0fcf6e109454e3a3ac6b8179ca241bad58975136 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 2 May 2016 17:36:25 +0100
Subject: [PATCH 1094/1431] Tidy up BulkUpdateService specs

1. Don't use instance variables, use `let` instead.
2. Add descriptions for all specs.
3. Share variables where possible.
4. Give labels more vivid names than 1, 2, and 3.
5. Remove deprecation warnings by passing issue IDs as '1,2,3' instead
   of an array, as that's how they're passed by the front-end. (The
   deprecation warning is for passing a nested array, which is what
   happens if an actual array is passed, as:
     `[1, 2, 3].split(',') == [[1, 2, 3]]`
---
 .../issues/bulk_update_service_spec.rb        | 228 +++++++++---------
 1 file changed, 111 insertions(+), 117 deletions(-)

diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index 09a1415abf0..91d08636951 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -1,36 +1,28 @@
 require 'spec_helper'
 
 describe Issues::BulkUpdateService, services: true do
-  let(:issue) { create(:issue, project: @project) }
+  let(:user) { create(:user) }
+  let(:project) { Projects::CreateService.new(user, namespace: user.namespace, name: 'test').execute }
 
-  before do
-    @user = create :user
-    opts = {
-      name: "GitLab",
-      namespace: @user.namespace
-    }
-    @project = Projects::CreateService.new(@user, opts).execute
-  end
-
-  describe :close_issue do
+  let!(:result) { Issues::BulkUpdateService.new(project, user, params).execute }
 
     before do
       @issues = create_list(:issue, 5, project: @project)
       @params = {
         state_event: 'close',
-        issues_ids: @issues.map(&:id).join(",")
+        issues_ids: issues.map(&:id).join(',')
       }
     end
 
-    it do
-      result = Issues::BulkUpdateService.new(@project, @user, @params).execute
+    it 'succeeds and returns the correct number of issues updated' do
       expect(result[:success]).to be_truthy
-      expect(result[:count]).to eq(@issues.count)
-
-      expect(@project.issues.opened).to be_empty
-      expect(@project.issues.closed).not_to be_empty
+      expect(result[:count]).to eq(issues.count)
     end
 
+    it 'closes all the issues passed' do
+      expect(project.issues.opened).to be_empty
+      expect(project.issues.closed).not_to be_empty
+    end
   end
 
   describe :reopen_issues do
@@ -38,95 +30,99 @@ describe Issues::BulkUpdateService, services: true do
       @issues = create_list(:closed_issue, 5, project: @project)
       @params = {
         state_event: 'reopen',
-        issues_ids: @issues.map(&:id).join(",")
+        issues_ids: issues.map(&:id).join(',')
       }
     end
 
-    it do
-      result = Issues::BulkUpdateService.new(@project, @user, @params).execute
+    it 'succeeds and returns the correct number of issues updated' do
       expect(result[:success]).to be_truthy
-      expect(result[:count]).to eq(@issues.count)
-
-      expect(@project.issues.closed).to be_empty
-      expect(@project.issues.opened).not_to be_empty
+      expect(result[:count]).to eq(issues.count)
     end
 
-  end
-
-  describe :update_assignee do
-
-    before do
-      @new_assignee = create :user
-      @params = {
-        issues_ids: issue.id.to_s,
-        assignee_id: @new_assignee.id
-      }
-    end
-
-    it do
-      result = Issues::BulkUpdateService.new(@project, @user, @params).execute
-      expect(result[:success]).to be_truthy
-      expect(result[:count]).to eq(1)
-
-      expect(@project.issues.first.assignee).to eq(@new_assignee)
-    end
-
-    it 'allows mass-unassigning' do
-      @project.issues.first.update_attribute(:assignee, @new_assignee)
-      expect(@project.issues.first.assignee).not_to be_nil
-
-      @params[:assignee_id] = -1
-
-      Issues::BulkUpdateService.new(@project, @user, @params).execute
-      expect(@project.issues.first.assignee).to be_nil
-    end
-
-    it 'does not unassign when assignee_id is not present' do
-      @project.issues.first.update_attribute(:assignee, @new_assignee)
-      expect(@project.issues.first.assignee).not_to be_nil
-
-      @params[:assignee_id] = ''
-
-      Issues::BulkUpdateService.new(@project, @user, @params).execute
-      expect(@project.issues.first.assignee).not_to be_nil
+    it 'reopens all the issues passed' do
+      expect(project.issues.closed).to be_empty
+      expect(project.issues.opened).not_to be_empty
     end
   end
 
-  describe :update_milestone do
+  describe 'updating assignee' do
+    let(:issue) do
+      create(:issue, project: project) { |issue| issue.update_attributes(assignee: user) }
+    end
 
-    before do
-      @milestone = create(:milestone, project: @project)
-      @params = {
-        issues_ids: issue.id.to_s,
-        milestone_id: @milestone.id
+    let(:params) do
+      {
+        assignee_id: assignee_id,
+        issues_ids: issue.id.to_s
       }
     end
 
-    it do
-      result = Issues::BulkUpdateService.new(@project, @user, @params).execute
+    context 'when the new assignee ID is a valid user' do
+      let(:new_assignee) { create(:user) }
+      let(:assignee_id) { new_assignee.id }
+
+      it 'succeeds' do
+        expect(result[:success]).to be_truthy
+        expect(result[:count]).to eq(1)
+      end
+
+      it 'updates the assignee to the use ID passed' do
+        expect(issue.reload.assignee).to eq(new_assignee)
+      end
+    end
+
+    context 'when the new assignee ID is -1' do
+      let(:assignee_id) { -1 }
+
+      it 'unassigns the issues' do
+        expect(issue.reload.assignee).to be_nil
+      end
+    end
+
+    context 'when the new assignee ID is not present', focus: true do
+      let(:assignee_id) { nil }
+
+      it 'does not unassign' do
+        expect(issue.reload.assignee).to eq(user)
+      end
+    end
+  end
+
+  describe 'updating milestones' do
+    let(:issue) { create(:issue, project: project) }
+    let(:milestone) { create(:milestone, project: project) }
+
+    let(:params) do
+      {
+        issues_ids: issue.id.to_s,
+        milestone_id: milestone.id
+      }
+    end
+
+    it 'succeeds' do
       expect(result[:success]).to be_truthy
       expect(result[:count]).to eq(1)
+    end
 
-      expect(@project.issues.first.milestone).to eq(@milestone)
+    it 'updates the issue milestone' do
+      expect(project.issues.first.milestone).to eq(milestone)
     end
   end
 
   describe 'updating labels' do
     def create_issue_with_labels(labels)
-      create(:issue, project: project) { |issue| issue.labels = labels }
+      create(:issue, project: project) { |issue| issue.update_attributes(labels: labels) }
     end
 
-    let(:user) { create(:user) }
-    let(:project) { Projects::CreateService.new(user, namespace: user.namespace, name: 'test').execute }
-    let(:label_1) { create(:label, project: project) }
-    let(:label_2) { create(:label, project: project) }
-    let(:label_3) { create(:label, project: project) }
+    let(:bug) { create(:label, project: project) }
+    let(:regression) { create(:label, project: project) }
+    let(:merge_requests) { create(:label, project: project) }
 
-    let(:issue_all_labels) { create_issue_with_labels([label_1, label_2, label_3]) }
-    let(:issue_labels_1_and_2) { create_issue_with_labels([label_1, label_2]) }
-    let(:issue_labels_1_and_3) { create_issue_with_labels([label_1, label_3]) }
+    let(:issue_all_labels) { create_issue_with_labels([bug, regression, merge_requests]) }
+    let(:issue_bug_and_regression) { create_issue_with_labels([bug, regression]) }
+    let(:issue_bug_and_merge_requests) { create_issue_with_labels([bug, merge_requests]) }
     let(:issue_no_labels) { create(:issue, project: project) }
-    let(:issues) { [issue_all_labels, issue_labels_1_and_2, issue_labels_1_and_3, issue_no_labels] }
+    let(:issues) { [issue_all_labels, issue_bug_and_regression, issue_bug_and_merge_requests, issue_no_labels] }
 
     let(:labels) { [] }
     let(:add_labels) { [] }
@@ -141,76 +137,74 @@ describe Issues::BulkUpdateService, services: true do
       }
     end
 
-    before { Issues::BulkUpdateService.new(project, user, params).execute }
-
     context 'when label_ids are passed' do
       let(:issues) { [issue_all_labels, issue_no_labels] }
-      let(:labels) { [label_1, label_2] }
+      let(:labels) { [bug, regression] }
 
       it 'updates the labels of all issues passed to the labels passed' do
         expect(issues.map(&:reload).map(&:label_ids)).to all(eq(labels.map(&:id)))
       end
 
       it 'does not update issues not passed in' do
-        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
 
     context 'when add_label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_labels_1_and_3, issue_no_labels] }
-      let(:add_labels) { [label_1, label_2, label_3] }
+      let(:issues) { [issue_all_labels, issue_bug_and_merge_requests, issue_no_labels] }
+      let(:add_labels) { [bug, regression, merge_requests] }
 
       it 'adds those label IDs to all issues passed' do
         expect(issues.map(&:reload).map(&:label_ids)).to all(include(*add_labels.map(&:id)))
       end
 
       it 'does not update issues not passed in' do
-        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
 
     context 'when remove_label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_labels_1_and_3, issue_no_labels] }
-      let(:remove_labels) { [label_1, label_2, label_3] }
+      let(:issues) { [issue_all_labels, issue_bug_and_merge_requests, issue_no_labels] }
+      let(:remove_labels) { [bug, regression, merge_requests] }
 
       it 'removes those label IDs from all issues passed' do
         expect(issues.map(&:reload).map(&:label_ids)).to all(be_empty)
       end
 
       it 'does not update issues not passed in' do
-        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
 
     context 'when add_label_ids and remove_label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_labels_1_and_3, issue_no_labels] }
-      let(:add_labels) { [label_1] }
-      let(:remove_labels) { [label_3] }
+      let(:issues) { [issue_all_labels, issue_bug_and_merge_requests, issue_no_labels] }
+      let(:add_labels) { [bug] }
+      let(:remove_labels) { [merge_requests] }
 
       it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_1.id))
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
       end
 
       it 'removes the label IDs from all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_3.id)
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(merge_requests.id)
       end
 
       it 'does not update issues not passed in' do
-        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
 
     context 'when add_label_ids and label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_labels_1_and_2, issue_labels_1_and_3] }
-      let(:labels) { [label_3] }
-      let(:add_labels) { [label_2] }
+      let(:issues) { [issue_all_labels, issue_bug_and_regression, issue_bug_and_merge_requests] }
+      let(:labels) { [merge_requests] }
+      let(:add_labels) { [regression] }
 
       it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_2.id))
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(regression.id))
       end
 
       it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_1.id))
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
       end
 
       it 'does not update issues not passed in' do
@@ -219,43 +213,43 @@ describe Issues::BulkUpdateService, services: true do
     end
 
     context 'when remove_label_ids and label_ids are passed' do
-      let(:issues) { [issue_no_labels, issue_labels_1_and_2] }
-      let(:labels) { [label_3] }
-      let(:remove_labels) { [label_2] }
+      let(:issues) { [issue_no_labels, issue_bug_and_regression] }
+      let(:labels) { [merge_requests] }
+      let(:remove_labels) { [regression] }
 
       it 'remove the label IDs from all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_2.id)
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(regression.id)
       end
 
       it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_3.id)
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(merge_requests.id)
       end
 
       it 'does not update issues not passed in' do
-        expect(issue_all_labels.label_ids).to contain_exactly(label_1.id, label_2.id, label_3.id)
+        expect(issue_all_labels.label_ids).to contain_exactly(bug.id, regression.id, merge_requests.id)
       end
     end
 
     context 'when add_label_ids, remove_label_ids, and label_ids are passed' do
-      let(:issues) { [issue_labels_1_and_3, issue_no_labels] }
-      let(:labels) { [label_2] }
-      let(:add_labels) { [label_1] }
-      let(:remove_labels) { [label_3] }
+      let(:issues) { [issue_bug_and_merge_requests, issue_no_labels] }
+      let(:labels) { [regression] }
+      let(:add_labels) { [bug] }
+      let(:remove_labels) { [merge_requests] }
 
       it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(label_1.id))
+        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
       end
 
       it 'removes the label IDs from all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_3.id)
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(merge_requests.id)
       end
 
       it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(label_2.id)
+        expect(issues.map(&:reload).map(&:label_ids).flatten).not_to include(regression.id)
       end
 
       it 'does not update issues not passed in' do
-        expect(issue_labels_1_and_2.label_ids).to contain_exactly(label_1.id, label_2.id)
+        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
   end

From 116f5f26ea8e8f824caa89d1cb407b1082e32399 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 3 May 2016 17:03:53 -0500
Subject: [PATCH 1095/1431] Fix statement

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

diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 969c87a6ed8..fbe9b7d7f16 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -80,7 +80,7 @@ class IssuableBaseService < BaseService
 
   def filter_labels_by_name(keys)
     keys.each do |key|
-      return if params[key].to_a.empty?
+      next if params[key].to_a.empty?
 
       params[key] = project.labels.where(id: params[key]).pluck(:id)
     end

From 5d7445198fd830c093d5242bc5651d68b07bb079 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 16:42:34 -0500
Subject: [PATCH 1096/1431] Only filter asynchronously if option remote is
 true.

We need to update the results right away when we do bulk assignment.
---
 app/assets/javascripts/gl_dropdown.js.coffee | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 1e144861741..e98a8a561d5 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -37,20 +37,20 @@ class GitLabDropdownFilter
       if keyCode is 13
         return false
 
-      clearTimeout timeout
-      timeout = setTimeout =>
-        blur_field = @shouldBlur keyCode
-        search_text = @input.val()
+      # Only filter asynchronously only if option remote is set
+      if @options.remote
+        clearTimeout timeout
+        timeout = setTimeout =>
+          blur_field = @shouldBlur keyCode
 
-        if blur_field and @filterInputBlur
-          @input.blur()
+          if blur_field and @filterInputBlur
+            @input.blur()
 
-        if @options.remote
-          @options.query search_text, (data) =>
+          @options.query @input.val(), (data) =>
             @options.callback(data)
-        else
-          @filter search_text
-      , 250
+        , 250
+      else
+        @filter @input.val()
 
   shouldBlur: (keyCode) ->
     return BLUR_KEYCODES.indexOf(keyCode) >= 0

From 9df4da4bc08b90ff9c8a1d4ab28670e4615616d8 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 16:44:35 -0500
Subject: [PATCH 1097/1431] Remove unneeded call to keyup event

This was re-rendering the dropdown unnecessarily
---
 app/assets/javascripts/gl_dropdown.js.coffee | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index e98a8a561d5..fd51d5ee5fd 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -185,9 +185,6 @@ class GitLabDropdown
             @fullData = data
 
             @parseData @fullData
-
-            if @options.filterable
-              @filterInput.trigger 'keyup'
         }
 
     # Init filterable

From 0be26a47f20d0a536e8600a22e61ff7825983414 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 16:47:50 -0500
Subject: [PATCH 1098/1431] Do not trigger keyup event if we are persisting
 state

Triggering keyup will re-render the dropdown which is not needed when option persistWhenHide is true
---
 app/assets/javascripts/gl_dropdown.js.coffee | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index fd51d5ee5fd..5897502ed5b 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -317,12 +317,17 @@ class GitLabDropdown
   hidden: (e) =>
     @removeArrayKeyEvent()
 
+    $input = @dropdown.find(".dropdown-input-field")
+
     if @options.filterable
-      @dropdown
-        .find(".dropdown-input-field")
+      $input
         .blur()
         .val("")
-        .trigger("keyup")
+
+    # Triggering 'keyup' will re-render the dropdown which is not always required
+    # specially if we want to keep the state of the dropdown needed for bulk-assignment
+    if not @options.persistWhenHide
+      $input.trigger("keyup")
 
     if @dropdown.find(".dropdown-toggle-page").length
       $('.dropdown-menu', @dropdown).removeClass PAGE_TWO_CLASS

From d09114e4eda026fd695a758a52cf990b6afc23f4 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 16:57:35 -0500
Subject: [PATCH 1099/1431] Add show_footer parameter for ability to hide
 footer

---
 app/views/shared/issuable/_label_dropdown.html.haml     | 1 +
 app/views/shared/issuable/_label_page_default.html.haml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index 5e25d838666..bf6fac34300 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -20,5 +20,6 @@
   .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
     = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label" }
     - if can? current_user, :admin_label, @project and @project
+    = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label", show_footer: show_footer }
       = render partial: "shared/issuable/label_page_create"
     = dropdown_loading
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index 7f4867417f7..e5be3751d2f 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -1,10 +1,11 @@
 - title = local_assigns.fetch(:title, 'Assign labels')
+- show_footer = local_assigns.fetch(:show_footer, true)
 - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels')
 .dropdown-page-one
   = dropdown_title(title)
   = dropdown_filter(filter_placeholder)
   = dropdown_content
-  - if @project
+  - if @project and show_footer
     = dropdown_footer do
       %ul.dropdown-footer-list
         - if can? current_user, :admin_label, @project

From 90c2ab02b5a5f6a63e419c3616dc6f5b00c0a68d Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 17:08:23 -0500
Subject: [PATCH 1100/1431] Add show_create param to toggle label creation
 option

---
 app/views/shared/issuable/_label_dropdown.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index bf6fac34300..b095fd19629 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -1,3 +1,4 @@
+- show_create = local_assigns.fetch(:show_create, true)
 - extra_options = local_assigns.fetch(:extra_options, true)
 - filter_submit = local_assigns.fetch(:filter_submit, true)
 - show_footer = local_assigns.fetch(:show_footer, true)
@@ -18,8 +19,7 @@
       = h(multi_label_name(params[:label_name], "Label"))
     = icon('chevron-down')
   .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
-    = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label" }
-    - if can? current_user, :admin_label, @project and @project
     = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label", show_footer: show_footer }
+    - if can? current_user, :admin_label, @project and @project and show_create
       = render partial: "shared/issuable/label_page_create"
     = dropdown_loading

From 7ee3fc8080ede0e1c76f02a70cb242b961605a94 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 17:09:11 -0500
Subject: [PATCH 1101/1431] Expose label ID

---
 app/views/projects/labels/_label.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 8bf544b8371..a36535458f7 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,4 +1,4 @@
-%li{id: dom_id(label)}
+%li{id: dom_id(label), :"data-id" => label.id}
   = render "shared/label_row", label: label
 
   .pull-info-right

From 151158f1d775de477a767fd93c34197d9349cd1a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 17:09:35 -0500
Subject: [PATCH 1102/1431] Expose Issue ID

---
 app/views/projects/issues/_issue.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index ebaa34f4fff..c22f5e150e9 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -1,4 +1,4 @@
-%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), :'data-labels' => label_ids(issue) }
+%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: label_ids(issue), id: issue.id } }
   - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
     .issue-check
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"

From f02ee98697ba2829bf092d662c24e2e553832fe9 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 17:10:12 -0500
Subject: [PATCH 1103/1431] Tweaks for bulk assignment

---
 app/assets/javascripts/labels_select.js.coffee | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 52c1e8a469b..eb249e24f67 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -237,13 +237,23 @@ class @LabelsSelect
           else
             colorEl = ''
 
+          # We need to identify which items are actually labels
+          labelIdHtml = labelClass = ''
+
+          if label.id
+            # Add label id only for labels
+            labelIdHtml = "data-label-id='#{label.id}'"
+
+            # Add class only for labels
+            labelClass = 'label-item'
+
           "<li>
-            <a href='#' class='#{selectedClass.join(' ')}'>
+            <a href='#' #{labelIdHtml} class='#{labelClass} #{selectedClass.join(' ')}'>
               #{colorEl}
               #{_.escape(label.title)}
             </a>
           </li>"
-        filterable: true
+        persistWhenHide: $dropdown.data('persistWhenHide')
         search:
           fields: ['title']
         selectable: true
@@ -291,7 +301,9 @@ class @LabelsSelect
                 saveLabelData()
 
           if $dropdown.hasClass('js-filter-bulk-update')
-            $dropdown.parent().find('.is-active, .is-indeterminate').removeClass()
+            # If we are persisting state we need the classes
+            if not @options.persistWhenHide
+              $dropdown.parent().find('.is-active, .is-indeterminate').removeClass()
 
         multiSelect: $dropdown.hasClass 'js-multiselect'
         clicked: (label) ->

From f1291b1b9f28f2ee32d7bbc63b7b57db10b03006 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 5 May 2016 17:10:54 -0500
Subject: [PATCH 1104/1431] Bulk assignment implementation

---
 app/assets/javascripts/dispatcher.js.coffee   |   1 +
 .../issues-bulk-assignment.js.coffee          | 108 ++++++++++++++++++
 app/views/shared/issuable/_filter.html.haml   |   4 +-
 3 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/issues-bulk-assignment.js.coffee

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index cd418ad244a..bae67a2ebaf 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -17,6 +17,7 @@ class Dispatcher
     switch page
       when 'projects:issues:index'
         Issuable.init()
+        new IssuableBulkActions()
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:issues:show'
         new Issue()
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
new file mode 100644
index 00000000000..da463a586c0
--- /dev/null
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -0,0 +1,108 @@
+class @IssuableBulkActions
+  constructor: (opts = {}) ->
+    # Set defaults
+    {
+      @container = $('.content')
+      @form = @getElement('.bulk-update')
+      @issues = @getElement('.issues-list .issue')
+    } = opts
+
+    @bindEvents()
+
+  getElement: (selector) ->
+    @container.find selector
+
+  bindEvents: ->
+    @form.on 'submit', @onFormSubmit.bind(@)
+
+  onFormSubmit: (e) ->
+    e.preventDefault()
+    @submit()
+
+  submit: ->
+    _this = @
+
+    xhr = $.ajax
+            url: @form.attr 'action'
+            method: @form.attr 'method'
+            dataType: 'JSON',
+            data: @getFormDataAsObject()
+
+    xhr.done (response, status, xhr) ->
+      Turbolinks.visit(location.href)
+
+    xhr.fail ->
+      console.error 'fail'
+
+    xhr.always ->
+      _this.onFormSubmitAlways()
+
+  onFormSubmitAlways: ->
+    @form.find('[type="submit"]').enable()
+
+  getSelectedIssues: ->
+    @issues.has('.selected_issue:checked')
+
+  getLabelsFromSelection: ->
+    labels = []
+
+    @getSelectedIssues().map ->
+      _labels = $(@).data('labels')
+      console.log _labels
+      if _labels
+        _labels.map (labelId)->
+          labels.push(labelId) if labels.indexOf(labelId) is -1
+
+    labels
+
+  ###*
+   * Will return only labels that were marked previously and the user has unmarked
+   * @return {Array} Label IDs
+  ###
+  getUnmarkedIndeterminedLabels: ->
+    result = []
+    labelsToKeep = []
+
+    for el in @getElement('.labels-filter .is-indeterminate')
+      labelsToKeep.push $(el).data('labelId')
+
+    for id in @getLabelsFromSelection()
+      # Only the ones that we are not going to keep
+      result.push(id) if labelsToKeep.indexOf(id) is -1
+
+    result
+
+  ###*
+   * Simple form serialization, it will return just what we need
+   * Returns key/value pairs from form data
+  ###
+  getFormDataAsObject: ->
+    formData =
+      update:
+        issues_ids: @form.find('#update_issues_ids').val()
+        add_label_ids: []
+        remove_label_ids: []
+
+    for id in @getLabelsToApply()
+      formData.update.add_label_ids.push id
+
+    for id in @getLabelsToRemove()
+      formData.update.remove_label_ids.push id
+
+    formData
+
+  getLabelsToApply: ->
+    labelIds = []
+    $labels = @form.find('.labels-filter input[name="update[label_ids][]"]')
+
+    for label in $labels
+      labelIds.push $(label).val() if label
+
+    labelIds
+
+  ###*
+   * Just an alias of @getUnmarkedIndeterminedLabels
+   * @return {Array} Array of labels
+  ###
+  getLabelsToRemove: ->
+    @getUnmarkedIndeterminedLabels()
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 0ca4b9a681a..8758de12f42 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -31,7 +31,7 @@
 
     - if controller.controller_name == 'issues'
       .issues_bulk_update.hide
-        = form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post  do
+        = form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post, class: 'bulk-update'  do
           .filter-item.inline
             = dropdown_tag("Status", options: { toggle_class: "js-issue-status", title: "Change status", dropdown_class: "dropdown-menu-status dropdown-menu-selectable", data: { field_name: "update[state_event]" } } ) do
               %ul
@@ -46,7 +46,7 @@
             = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update', filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), use_id: true } })
 
           .filter-item.inline.labels-filter
-            = render "shared/issuable/label_dropdown", classes: ' js-filter-bulk-update js-multiselect ', extra_options: false, filter_submit: false, show_footer: false, extra_options: false, data_options: {  field_name: "update[label_ids][]", show_no: false, show_any: false, use_id: true }
+            = render "shared/issuable/label_dropdown", classes: ' js-filter-bulk-update js-multiselect ', show_create: false, show_footer: false, extra_options: false, filter_submit: false, show_footer: false, data_options: { persist_when_hide: "true", field_name: "update[label_ids][]", show_no: false, show_any: false, use_id: true }
 
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]

From dbf9df1dd2719acaa0c540efdc37502297f34a92 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 6 May 2016 15:22:44 -0500
Subject: [PATCH 1105/1431] Remove console.log

---
 app/assets/javascripts/issues-bulk-assignment.js.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index da463a586c0..72c4a6aa4b0 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -48,7 +48,6 @@ class @IssuableBulkActions
 
     @getSelectedIssues().map ->
       _labels = $(@).data('labels')
-      console.log _labels
       if _labels
         _labels.map (labelId)->
           labels.push(labelId) if labels.indexOf(labelId) is -1

From d84f1180d8687c694f64f76a5a91a3dae7d178bf Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 6 May 2016 15:58:21 -0500
Subject: [PATCH 1106/1431] Bulk assignment tests

---
 .../issues/bulk_assigment_labels_spec.rb      | 158 +++++++++++++-----
 1 file changed, 120 insertions(+), 38 deletions(-)

diff --git a/spec/features/issues/bulk_assigment_labels_spec.rb b/spec/features/issues/bulk_assigment_labels_spec.rb
index b99729ffd09..df080a4c661 100644
--- a/spec/features/issues/bulk_assigment_labels_spec.rb
+++ b/spec/features/issues/bulk_assigment_labels_spec.rb
@@ -3,80 +3,147 @@ require 'rails_helper'
 feature 'Issues > Labels bulk assignment', feature: true do
   include WaitForAjax
 
-  let(:user)    { create(:user) }
-  let!(:project) { create(:project) }
-  let!(:issue1)  { create(:issue, project: project, title: "Issue 1") }
-  let!(:issue2)  { create(:issue, project: project, title: "Issue 2") }
-
-  before do
-    create(:label, project: project, title: 'bug')
-    create(:label, project: project, title: 'feature')
-  end
+  let(:user)      { create(:user) }
+  let!(:project)  { create(:project) }
+  let!(:issue1)   { create(:issue, project: project, title: "Issue 1") }
+  let!(:issue2)   { create(:issue, project: project, title: "Issue 2") }
+  let!(:bug)      { create(:label, project: project, title: 'bug') }
+  let!(:feature)  { create(:label, project: project, title: 'feature') }
 
   context 'as a allowed user', js: true do
     before do
       project.team << [user, :master]
+
       login_as user
-
-      visit namespace_project_issues_path(project.namespace, project)
     end
 
-    context 'can bulk assign a label' do
-      context 'to all issues' do
-        before do
-          check 'check_all_issues'
-          open_labels_dropdown ['bug']
-          click_button 'Update issues'
+    context 'can bulk assign' do
+      before do
+        visit namespace_project_issues_path(project.namespace, project)
+      end
+
+      context 'a label' do
+        context 'to all issues' do
+          before do
+            check 'check_all_issues'
+            open_labels_dropdown ['bug']
+            click_button 'Update issues'
+          end
+
+          it do
+            expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+            expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+          end
         end
 
-        it do
-          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
-          expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+        context 'to a issue' do
+          before do
+            check "selected_issue_#{issue1.id}"
+            open_labels_dropdown ['bug']
+            click_button 'Update issues'
+          end
+
+          it do
+            expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+            expect(find("#issue_#{issue2.id}")).not_to have_content 'bug'
+          end
         end
       end
 
-      context 'to a issue' do
+      context 'multiple labels' do
+        context 'to all issues' do
+          before do
+            check 'check_all_issues'
+            open_labels_dropdown ['bug', 'feature']
+            click_button 'Update issues'
+          end
+
+          it do
+            expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+            expect(find("#issue_#{issue1.id}")).to have_content 'feature'
+            expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+            expect(find("#issue_#{issue2.id}")).to have_content 'feature'
+          end
+        end
+
+        context 'to a issue' do
+          before do
+            check "selected_issue_#{issue1.id}"
+            open_labels_dropdown ['bug', 'feature']
+            click_button 'Update issues'
+          end
+
+          it do
+            expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+            expect(find("#issue_#{issue1.id}")).to have_content 'feature'
+            expect(find("#issue_#{issue2.id}")).not_to have_content 'bug'
+            expect(find("#issue_#{issue2.id}")).not_to have_content 'feature'
+          end
+        end
+      end
+    end
+
+    context 'can bulk un-assign' do
+      context 'all labels to all issues' do
         before do
-          check "selected_issue_#{issue1.id}"
-          open_labels_dropdown ['bug']
+          issue1.labels << bug
+          issue1.labels << feature
+          issue2.labels << bug
+          issue2.labels << feature
+
+          visit namespace_project_issues_path(project.namespace, project)
+
+          check 'check_all_issues'
+          unmark_labels_in_dropdown ['bug', 'feature']
           click_button 'Update issues'
         end
 
         it do
-          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue1.id}")).not_to have_content 'bug'
+          expect(find("#issue_#{issue1.id}")).not_to have_content 'feature'
           expect(find("#issue_#{issue2.id}")).not_to have_content 'bug'
+          expect(find("#issue_#{issue2.id}")).not_to have_content 'feature'
         end
       end
-    end
 
-    context 'can bulk assign multiple labels' do
-      context 'to all issues' do
+      context 'a label to a issue' do
         before do
-          check 'check_all_issues'
-          open_labels_dropdown ['bug', 'feature']
+          issue1.labels << bug
+          issue2.labels << feature
+
+          visit namespace_project_issues_path(project.namespace, project)
+
+          check_issue issue1
+          unmark_labels_in_dropdown ['bug']
           click_button 'Update issues'
         end
 
         it do
-          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
-          expect(find("#issue_#{issue1.id}")).to have_content 'feature'
-          expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue1.id}")).not_to have_content 'bug'
           expect(find("#issue_#{issue2.id}")).to have_content 'feature'
         end
       end
 
-      context 'to a issue' do
+      context 'a label and keep the others label' do
         before do
-          check "selected_issue_#{issue1.id}"
-          open_labels_dropdown ['bug', 'feature']
+          issue1.labels << bug
+          issue1.labels << feature
+          issue2.labels << bug
+          issue2.labels << feature
+
+          visit namespace_project_issues_path(project.namespace, project)
+
+          check_issue issue1
+          check_issue issue2
+          unmark_labels_in_dropdown ['bug']
           click_button 'Update issues'
         end
 
         it do
-          expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+          expect(find("#issue_#{issue1.id}")).not_to have_content 'bug'
           expect(find("#issue_#{issue1.id}")).to have_content 'feature'
           expect(find("#issue_#{issue2.id}")).not_to have_content 'bug'
-          expect(find("#issue_#{issue2.id}")).not_to have_content 'feature'
+          expect(find("#issue_#{issue2.id}")).to have_content 'feature'
         end
       end
     end
@@ -97,13 +164,28 @@ feature 'Issues > Labels bulk assignment', feature: true do
     end
   end
 
-  def open_labels_dropdown(items = [])
+  def open_labels_dropdown(items = [], unmark = false)
     page.within('.issues_bulk_update') do
       click_button 'Label'
       wait_for_ajax
       items.map do |item|
         click_link item
       end
+      if unmark
+        items.map do |item|
+          click_link item
+        end
+      end
+    end
+  end
+
+  def unmark_labels_in_dropdown(items = [])
+    open_labels_dropdown(items, true)
+  end
+
+  def check_issue(issue)
+    page.within('.issues-list') do
+      check "selected_issue_#{issue.id}"
     end
   end
 end

From 830ccdfd3e1bb6d4b0c333fd2e7931cf65dac4b9 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 15:53:33 -0500
Subject: [PATCH 1107/1431] Fix failing specs

---
 spec/features/issues/update_issues_spec.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index 466a6f7dfa7..c109de1cbdb 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 feature 'Multiple issue updating from issues#index', feature: true do
+  include WaitForAjax
+
   let!(:project)   { create(:project) }
   let!(:issue)     { create(:issue, project: project) }
   let!(:user)      { create(:user)}
@@ -24,9 +26,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
 
     it 'should be set to open' do
       create_closed
-      visit namespace_project_issues_path(project.namespace, project)
-
-      find('.issues-state-filters a', text: 'Closed').click
+      visit namespace_project_issues_path(project.namespace, project, state: 'closed')
 
       find('#check_all_issues').click
       find('.js-issue-status').click
@@ -61,8 +61,8 @@ feature 'Multiple issue updating from issues#index', feature: true do
 
       click_link 'Unassigned'
       click_update_issues_button
-
-      within first('.issue .controls') do
+      sleep 1 # needed
+      page.within first('.issue .controls') do
         expect(page).to have_no_selector('.author_link')
       end
     end
@@ -95,7 +95,8 @@ feature 'Multiple issue updating from issues#index', feature: true do
       find('.dropdown-menu-milestone a', text: "No Milestone").click
       click_update_issues_button
 
-      expect(first('.issue')).not_to have_content milestone.title
+      sleep 1 # needed
+      expect(first('.issue')).to_not have_content milestone.title
     end
   end
 
@@ -113,5 +114,6 @@ feature 'Multiple issue updating from issues#index', feature: true do
 
   def click_update_issues_button
     find('.update_selected_issues').click
+    wait_for_ajax
   end
 end

From 90bf5aa8f8feff5ceeaee1d1a245c4f894a4feca Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 15:54:12 -0500
Subject: [PATCH 1108/1431] Add mising params

---
 app/assets/javascripts/issues-bulk-assignment.js.coffee | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index 72c4a6aa4b0..837661aef60 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -78,9 +78,12 @@ class @IssuableBulkActions
   getFormDataAsObject: ->
     formData =
       update:
-        issues_ids: @form.find('#update_issues_ids').val()
-        add_label_ids: []
-        remove_label_ids: []
+        state_event       : @form.find('input[name="update[state_event]"]').val()
+        assignee_id       : @form.find('input[name="update[assignee_id]"]').val()
+        milestone_id      : @form.find('input[name="update[milestone_id]"]').val()
+        issues_ids        : @form.find('input[name="update[issues_ids]"]').val()
+        add_label_ids     : []
+        remove_label_ids  : []
 
     for id in @getLabelsToApply()
       formData.update.add_label_ids.push id

From 73b528f9a34767268af199ea0231e659491b03e4 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 15:54:20 -0500
Subject: [PATCH 1109/1431] Fix spec

---
 app/assets/javascripts/issues-bulk-assignment.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index 837661aef60..c7dbda064e5 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -29,7 +29,7 @@ class @IssuableBulkActions
             data: @getFormDataAsObject()
 
     xhr.done (response, status, xhr) ->
-      Turbolinks.visit(location.href)
+      location.reload()
 
     xhr.fail ->
       console.error 'fail'

From 812ae973db7f6fa72246c975fb4eff6b1a95c886 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 9 May 2016 15:54:46 -0500
Subject: [PATCH 1110/1431] Respond to .json only

---
 app/controllers/projects/issues_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 855b4cfa09c..4e2d3bebb2e 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -156,7 +156,12 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def bulk_update
     result = Issues::BulkUpdateService.new(project, current_user, bulk_update_params).execute
-    redirect_back_or_default(default: { action: 'index' }, options: { notice: "#{result[:count]} issues updated" })
+
+    respond_to do |format|
+      format.json do
+        render json: { notice: "#{result[:count]} issues updated" }
+      end
+    end
   end
 
   protected

From 15108cbaac059b341eae9d733c5ff8cb1dfbdb28 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 10 May 2016 18:11:16 -0500
Subject: [PATCH 1111/1431] Fix spec

---
 spec/features/issues/update_issues_spec.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index c109de1cbdb..c6181eed9af 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -42,7 +42,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
       visit namespace_project_issues_path(project.namespace, project)
 
       find('#check_all_issues').click
-      find('.js-update-assignee').click
+      click_update_assignee_button
 
       find('.dropdown-menu-user-link', text: user.username).click
       click_update_issues_button
@@ -57,14 +57,11 @@ feature 'Multiple issue updating from issues#index', feature: true do
       visit namespace_project_issues_path(project.namespace, project)
 
       find('#check_all_issues').click
-      find('.js-update-assignee').click
+      click_update_assignee_button
 
       click_link 'Unassigned'
       click_update_issues_button
-      sleep 1 # needed
-      page.within first('.issue .controls') do
-        expect(page).to have_no_selector('.author_link')
-      end
+      expect(find('.issue:first-child .controls')).not_to have_css('.author_link')
     end
   end
 
@@ -95,8 +92,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
       find('.dropdown-menu-milestone a', text: "No Milestone").click
       click_update_issues_button
 
-      sleep 1 # needed
-      expect(first('.issue')).to_not have_content milestone.title
+      expect(find('.issue:first-child')).to_not have_content milestone.title
     end
   end
 
@@ -112,6 +108,11 @@ feature 'Multiple issue updating from issues#index', feature: true do
     create(:issue, project: project, milestone: milestone)
   end
 
+  def click_update_assignee_button
+    find('.js-update-assignee').click
+    wait_for_ajax
+  end
+
   def click_update_issues_button
     find('.update_selected_issues').click
     wait_for_ajax

From 2ee779f17d5fa318bf54e1bab9023bc7f74f0f9d Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 10 May 2016 18:22:18 -0500
Subject: [PATCH 1112/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index d54cac7f93b..d4885dbe8b6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -164,6 +164,7 @@ v 8.7.6
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
   - Fix notification delay when changing status of an issue
+  - Bulk assign/unassign labels to issues.
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From 5ea01651758beee85003bafd9ebea767090cb9f1 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 13 May 2016 00:56:37 -0500
Subject: [PATCH 1113/1431] Enhancements

---
 app/assets/javascripts/flash.js.coffee        |  2 +-
 app/assets/javascripts/gl_dropdown.js.coffee  | 16 +++++++---------
 .../issues-bulk-assignment.js.coffee          | 13 ++++++-------
 .../issues/bulk_assigment_labels_spec.rb      | 19 ++++++++++++-------
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee
index 5de012e409f..4f73d215b85 100644
--- a/app/assets/javascripts/flash.js.coffee
+++ b/app/assets/javascripts/flash.js.coffee
@@ -1,5 +1,5 @@
 class @Flash
-  constructor: (message, type)->
+  constructor: (message, type = 'alert')->
     @flash = $(".flash-container")
     @flash.html("")
 
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 5897502ed5b..4b8e4bb490d 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -460,10 +460,10 @@ class GitLabDropdown
       el.addClass ACTIVE_CLASS
       el.removeClass INDETERMINATE_CLASS
 
-      if !value?
+      if not value?
         field.remove()
 
-      if !field.length and fieldName
+      if not field.length and fieldName
         @addInput(fieldName, value)
 
       return selectedObject
@@ -491,14 +491,12 @@ class GitLabDropdown
 
   addInput: (fieldName, value)->
     # Create hidden input for form
-    input = "<input type='hidden' name='#{fieldName}' value='#{value}' />"
-    if @options.inputId?
-      input = $(input)
-                .attr('id', @options.inputId)
-    @dropdown.before input
+    $input = $("<input type='hidden' name='#{fieldName}' value='#{value}' />")
 
-  removeInputs: ->
-    @dropdown.parent().find('input[type="hidden"]').remove()
+    if @options.inputId?
+      $input.attr('id', @options.inputId)
+
+    @dropdown.before $input
 
   selectRowAtIndex: (e, index) ->
     selector = ".dropdown-content li:not(.divider,.dropdown-header,.separator):eq(#{index}) a"
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index c7dbda064e5..40751c81fd2 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -32,10 +32,9 @@ class @IssuableBulkActions
       location.reload()
 
     xhr.fail ->
-      console.error 'fail'
+      new Flash("Issue update failed")
 
-    xhr.always ->
-      _this.onFormSubmitAlways()
+    xhr.always @onFormSubmitAlways.bind(@)
 
   onFormSubmitAlways: ->
     @form.find('[type="submit"]').enable()
@@ -49,7 +48,7 @@ class @IssuableBulkActions
     @getSelectedIssues().map ->
       _labels = $(@).data('labels')
       if _labels
-        _labels.map (labelId)->
+        _labels.map (labelId) ->
           labels.push(labelId) if labels.indexOf(labelId) is -1
 
     labels
@@ -85,10 +84,10 @@ class @IssuableBulkActions
         add_label_ids     : []
         remove_label_ids  : []
 
-    for id in @getLabelsToApply()
+    @getLabelsToApply().map (id) ->
       formData.update.add_label_ids.push id
 
-    for id in @getLabelsToRemove()
+    @getLabelsToRemove().map (id) ->
       formData.update.remove_label_ids.push id
 
     formData
@@ -97,7 +96,7 @@ class @IssuableBulkActions
     labelIds = []
     $labels = @form.find('.labels-filter input[name="update[label_ids][]"]')
 
-    for label in $labels
+    $labels.each (k, label) ->
       labelIds.push $(label).val() if label
 
     labelIds
diff --git a/spec/features/issues/bulk_assigment_labels_spec.rb b/spec/features/issues/bulk_assigment_labels_spec.rb
index df080a4c661..c58b87281a3 100644
--- a/spec/features/issues/bulk_assigment_labels_spec.rb
+++ b/spec/features/issues/bulk_assigment_labels_spec.rb
@@ -27,7 +27,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
           before do
             check 'check_all_issues'
             open_labels_dropdown ['bug']
-            click_button 'Update issues'
+            update_issues
           end
 
           it do
@@ -40,7 +40,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
           before do
             check "selected_issue_#{issue1.id}"
             open_labels_dropdown ['bug']
-            click_button 'Update issues'
+            update_issues
           end
 
           it do
@@ -55,7 +55,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
           before do
             check 'check_all_issues'
             open_labels_dropdown ['bug', 'feature']
-            click_button 'Update issues'
+            update_issues
           end
 
           it do
@@ -70,7 +70,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
           before do
             check "selected_issue_#{issue1.id}"
             open_labels_dropdown ['bug', 'feature']
-            click_button 'Update issues'
+            update_issues
           end
 
           it do
@@ -95,7 +95,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
 
           check 'check_all_issues'
           unmark_labels_in_dropdown ['bug', 'feature']
-          click_button 'Update issues'
+          update_issues
         end
 
         it do
@@ -115,7 +115,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
 
           check_issue issue1
           unmark_labels_in_dropdown ['bug']
-          click_button 'Update issues'
+          update_issues
         end
 
         it do
@@ -136,7 +136,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
           check_issue issue1
           check_issue issue2
           unmark_labels_in_dropdown ['bug']
-          click_button 'Update issues'
+          update_issues
         end
 
         it do
@@ -188,4 +188,9 @@ feature 'Issues > Labels bulk assignment', feature: true do
       check "selected_issue_#{issue.id}"
     end
   end
+
+  def update_issues
+    click_button 'Update issues'
+    wait_for_ajax
+  end
 end

From d78fd6df0c21f56887d1ca76cb5a40c16d3552b0 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 23 May 2016 12:02:53 -0500
Subject: [PATCH 1114/1431] Update CHANGELOG

---
 CHANGELOG                                        | 1 +
 spec/features/issues/update_issues_spec.rb       | 2 +-
 spec/services/issues/bulk_update_service_spec.rb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d4885dbe8b6..29926fad7c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -74,6 +74,7 @@ v 8.8.2
   - Fixed issue with enter key selecting wrong option in dropdown. !4210
   - When creating a .gitignore file a dropdown with templates will be provided. !4075
   - Fix concurrent request when updating build log in browser. !4183
+  - Bulk assign/unassign labels to issues.
 
 v 8.8.1
   - Add documentation for the "Health Check" feature
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index c6181eed9af..ddbd69b2891 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -92,7 +92,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
       find('.dropdown-menu-milestone a', text: "No Milestone").click
       click_update_issues_button
 
-      expect(find('.issue:first-child')).to_not have_content milestone.title
+      expect(find('.issue:first-child')).not_to have_content milestone.title
     end
   end
 
diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index 91d08636951..c777d475dd4 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -79,7 +79,7 @@ describe Issues::BulkUpdateService, services: true do
       end
     end
 
-    context 'when the new assignee ID is not present', focus: true do
+    context 'when the new assignee ID is not present' do
       let(:assignee_id) { nil }
 
       it 'does not unassign' do

From 165d799fb3ca36768497d964619ceeacf2deeae3 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 31 May 2016 11:14:15 +0100
Subject: [PATCH 1115/1431] Allow bulk-updating to remove all labels

Instead of passing `remove_label_ids`, just pass an empty array for
`label_ids` (and don't pass `add_label_ids` or `remove_label_ids`).
---
 app/services/issues/bulk_update_service.rb       | 2 +-
 spec/services/issues/bulk_update_service_spec.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/services/issues/bulk_update_service.rb b/app/services/issues/bulk_update_service.rb
index 2772add1d02..15825b81685 100644
--- a/app/services/issues/bulk_update_service.rb
+++ b/app/services/issues/bulk_update_service.rb
@@ -4,7 +4,7 @@ module Issues
       issues_ids   = params.delete(:issues_ids).split(",")
       issue_params = params
 
-      [:state_event, :milestone_id, :assignee_id, :label_ids, :add_label_ids, :remove_label_ids].each do |key|
+      %i(state_event milestone_id assignee_id add_label_ids remove_label_ids).each do |key|
         issue_params.delete(key) unless issue_params[key].present?
       end
 
diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index c777d475dd4..ad19fe0f151 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -148,6 +148,14 @@ describe Issues::BulkUpdateService, services: true do
       it 'does not update issues not passed in' do
         expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
+
+      context 'when those label IDs are empty' do
+        let(:labels) { [] }
+
+        it 'updates the issues passed to have no labels' do
+          expect(issues.map(&:reload).map(&:label_ids)).to all(be_empty)
+        end
+      end
     end
 
     context 'when add_label_ids are passed' do

From 071ad63630c2f8f9666c0c1fae6b6b3491e3cf9f Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 31 May 2016 12:45:55 +0100
Subject: [PATCH 1116/1431] Spec label add / delete in UpdateService

---
 app/services/issuable_base_service.rb       | 17 ++++----
 spec/services/issues/update_service_spec.rb | 46 +++++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index fbe9b7d7f16..e3dc569152c 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -72,18 +72,17 @@ class IssuableBaseService < BaseService
     if params[:add_label_ids].present? || params[:remove_label_ids].present?
       params.delete(:label_ids)
 
-      filter_labels_by_name([:add_label_ids, :remove_label_ids])
+      filter_labels_in_param(:add_label_ids)
+      filter_labels_in_param(:remove_label_ids)
     else
-      filter_labels_by_name([:label_ids])
+      filter_labels_in_param(:label_ids)
     end
   end
 
-  def filter_labels_by_name(keys)
-    keys.each do |key|
-      next if params[key].to_a.empty?
+  def filter_labels_in_param(key)
+    return if params[key].to_a.empty?
 
-      params[key] = project.labels.where(id: params[key]).pluck(:id)
-    end
+    params[key] = project.labels.where(id: params[key]).pluck(:id)
   end
 
   def update_issuable(issuable, attributes)
@@ -94,7 +93,7 @@ class IssuableBaseService < BaseService
       issuable.label_ids |= add_label_ids if add_label_ids
       issuable.label_ids -= remove_label_ids if remove_label_ids
 
-      issuable.assign_attributes(attributes)
+      issuable.assign_attributes(attributes.merge(updated_by: current_user))
 
       issuable.save
     end
@@ -105,7 +104,7 @@ class IssuableBaseService < BaseService
     filter_params
     old_labels = issuable.labels.to_a
 
-    if params.present? && update_issuable(issuable, params.merge(updated_by: current_user))
+    if params.present? && update_issuable(issuable, params)
       issuable.reset_events_cache
       handle_common_system_notes(issuable, old_labels: old_labels)
       handle_changes(issuable, old_labels: old_labels)
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index be19be17151..dacbcd8fb46 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 describe Issues::UpdateService, services: true do
@@ -273,5 +274,50 @@ describe Issues::UpdateService, services: true do
         end
       end
     end
+
+    context 'updating labels' do
+      let(:label3) { create(:label, project: project) }
+      let(:result) { Issues::UpdateService.new(project, user, params).execute(issue).reload }
+
+      context 'when add_label_ids and label_ids are passed' do
+        let(:params) { { label_ids: [label.id], add_label_ids: [label3.id] } }
+
+        it 'ignores the label_ids parameter' do
+          expect(result.label_ids).not_to include(label.id)
+        end
+
+        it 'adds the passed labels' do
+          expect(result.label_ids).to include(label3.id)
+        end
+      end
+
+      context 'when remove_label_ids and label_ids are passed' do
+        let(:params) { { label_ids: [], remove_label_ids: [label.id] } }
+
+        before { issue.update_attributes(labels: [label, label3]) }
+
+        it 'ignores the label_ids parameter' do
+          expect(result.label_ids).not_to be_empty
+        end
+
+        it 'removes the passed labels' do
+          expect(result.label_ids).not_to include(label.id)
+        end
+      end
+
+      context 'when add_label_ids and remove_label_ids are passed' do
+        let(:params) { { add_label_ids: [label3.id], remove_label_ids: [label.id] } }
+
+        before { issue.update_attributes(labels: [label]) }
+
+        it 'adds the passed labels' do
+          expect(result.label_ids).to include(label3.id)
+        end
+
+        it 'removes the passed labels' do
+          expect(result.label_ids).not_to include(label.id)
+        end
+      end
+    end
   end
 end

From 228a68458716fe36ece59bd21567e2183b2ca313 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 31 May 2016 11:20:25 -0500
Subject: [PATCH 1117/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 29926fad7c4..e2ba6bc79dd 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.9.0 (unreleased)
+  - Bulk assign/unassign labels to issues.
   - Allow enabling wiki page events from Webhook management UI
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
@@ -74,7 +75,6 @@ v 8.8.2
   - Fixed issue with enter key selecting wrong option in dropdown. !4210
   - When creating a .gitignore file a dropdown with templates will be provided. !4075
   - Fix concurrent request when updating build log in browser. !4183
-  - Bulk assign/unassign labels to issues.
 
 v 8.8.1
   - Add documentation for the "Health Check" feature
@@ -165,7 +165,6 @@ v 8.7.6
   - Fix import from GitLab.com to a private instance failure. !4181
   - Fix external imports not finding the import data. !4106
   - Fix notification delay when changing status of an issue
-  - Bulk assign/unassign labels to issues.
 
 v 8.7.5
   - Fix relative links in wiki pages. !4050

From 22b8b9a7f399abb685e95ea5669beb033d30101b Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 31 May 2016 16:11:46 -0500
Subject: [PATCH 1118/1431] Address feedback

---
 app/assets/javascripts/gl_dropdown.js.coffee  |  4 +++-
 .../issues-bulk-assignment.js.coffee          |  2 +-
 .../javascripts/labels_select.js.coffee       | 21 ++++++++-----------
 app/helpers/issuables_helper.rb               |  6 ------
 app/views/projects/issues/_issue.html.haml    |  2 +-
 app/views/projects/labels/_label.html.haml    |  2 +-
 app/views/shared/issuable/_filter.html.haml   |  2 +-
 .../shared/issuable/_label_dropdown.html.haml | 12 +++++------
 .../issuable/_label_page_default.html.haml    |  7 ++++---
 9 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 4b8e4bb490d..7c7334e9e40 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -491,7 +491,9 @@ class GitLabDropdown
 
   addInput: (fieldName, value)->
     # Create hidden input for form
-    $input = $("<input type='hidden' name='#{fieldName}' value='#{value}' />")
+    $input = $('<input>').attr('type', 'hidden')
+                         .attr('name', fieldName)
+                        .val(value)
 
     if @options.inputId?
       $input.attr('id', @options.inputId)
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index 40751c81fd2..16d023dd391 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -13,7 +13,7 @@ class @IssuableBulkActions
     @container.find selector
 
   bindEvents: ->
-    @form.on 'submit', @onFormSubmit.bind(@)
+    @form.off('submit').on('submit', @onFormSubmit.bind(@))
 
   onFormSubmit: (e) ->
     e.preventDefault()
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index eb249e24f67..ec74dfaae1a 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -199,6 +199,9 @@ class @LabelsSelect
             callback data
 
         renderRow: (label, instance) ->
+          $li = $('<li>')
+          $a  = $('<a href="#">')
+
           selectedClass = []
           removesAll = label.id is 0 or not label.id?
 
@@ -238,21 +241,15 @@ class @LabelsSelect
             colorEl = ''
 
           # We need to identify which items are actually labels
-          labelIdHtml = labelClass = ''
-
           if label.id
-            # Add label id only for labels
-            labelIdHtml = "data-label-id='#{label.id}'"
+            selectedClass.push('label-item')
+            $a.attr('data-label-id', label.id)
 
-            # Add class only for labels
-            labelClass = 'label-item'
+          $a.addClass(selectedClass.join(' '))
+            .html("#{colorEl} #{_.escape(label.title)}")
 
-          "<li>
-            <a href='#' #{labelIdHtml} class='#{labelClass} #{selectedClass.join(' ')}'>
-              #{colorEl}
-              #{_.escape(label.title)}
-            </a>
-          </li>"
+          # Return generated html
+          $li.html($a).prop('outerHTML')
         persistWhenHide: $dropdown.data('persistWhenHide')
         search:
           fields: ['title']
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index b1ff95f6208..37b93f63145 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -96,10 +96,4 @@ module IssuablesHelper
       issuable.open? ? :opened : :closed
     end
   end
-
-  def label_ids(issuable)
-    return nil if !issuable.labels.any?
-    issuable.labels.pluck :id
-  end
-
 end
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index c22f5e150e9..79b14819865 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -1,4 +1,4 @@
-%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: label_ids(issue), id: issue.id } }
+%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } }
   - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
     .issue-check
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index a36535458f7..950f6e284b1 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,4 +1,4 @@
-%li{id: dom_id(label), :"data-id" => label.id}
+%li{id: dom_id(label), data: { id: label.id } } }
   = render "shared/label_row", label: label
 
   .pull-info-right
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 8758de12f42..380ab465bf4 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -46,7 +46,7 @@
             = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update', filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), use_id: true } })
 
           .filter-item.inline.labels-filter
-            = render "shared/issuable/label_dropdown", classes: ' js-filter-bulk-update js-multiselect ', show_create: false, show_footer: false, extra_options: false, filter_submit: false, show_footer: false, data_options: { persist_when_hide: "true", field_name: "update[label_ids][]", show_no: false, show_any: false, use_id: true }
+            = render "shared/issuable/label_dropdown", classes: ['js-filter-bulk-update', 'js-multiselect'], show_create: false, show_footer: false, extra_options: false, filter_submit: false, show_footer: false, data_options: { persist_when_hide: "true", field_name: "update[label_ids][]", show_no: false, show_any: false, use_id: true }
 
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index b095fd19629..d34d28f6736 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -3,23 +3,23 @@
 - filter_submit = local_assigns.fetch(:filter_submit, true)
 - show_footer = local_assigns.fetch(:show_footer, true)
 - data_options = local_assigns.fetch(:data_options, {})
-- classes = local_assigns.fetch(:classes, '')
+- classes = local_assigns.fetch(:classes, [])
 - dropdown_data = {toggle: 'dropdown', field_name: 'label_name[]', show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}
 - dropdown_data.merge!(data_options)
-- classes << ' js-extra-options ' if extra_options
-- classes << ' js-filter-submit ' if filter_submit
+- classes << 'js-extra-options' if extra_options
+- classes << 'js-filter-submit' if filter_submit
 
 - if params[:label_name].present?
   - if params[:label_name].respond_to?('any?')
     - params[:label_name].each do |label|
       = hidden_field_tag "label_name[]", label, id: nil
 .dropdown
-  %button.dropdown-menu-toggle.js-label-select.js-multiselect{class: classes, type: "button", data: dropdown_data}
+  %button.dropdown-menu-toggle.js-label-select.js-multiselect{class: classes.join(' '), type: "button", data: dropdown_data}
     %span.dropdown-toggle-text
       = h(multi_label_name(params[:label_name], "Label"))
     = icon('chevron-down')
   .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
-    = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label", show_footer: show_footer }
-    - if can? current_user, :admin_label, @project and @project and show_create
+    = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label", show_footer: show_footer, show_create: show_create }
+    - if show_create and @project and can?(current_user, :admin_label, @project)
       = render partial: "shared/issuable/label_page_create"
     = dropdown_loading
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index e5be3751d2f..935a0193a2d 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -1,4 +1,5 @@
 - title = local_assigns.fetch(:title, 'Assign labels')
+- show_create = local_assigns.fetch(:show_create, true)
 - show_footer = local_assigns.fetch(:show_footer, true)
 - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels')
 .dropdown-page-one
@@ -8,14 +9,14 @@
   - if @project and show_footer
     = dropdown_footer do
       %ul.dropdown-footer-list
-        - if can? current_user, :admin_label, @project
+        - if can?(current_user, :admin_label, @project)
           %li
             %a.dropdown-toggle-page{href: "#"}
               Create new
         %li
           = link_to namespace_project_labels_path(@project.namespace, @project), :"data-is-link" => true do
-            - if can? current_user, :admin_label, @project
+            - if show_create && @project && can?(current_user, :admin_label, @project)
               Manage labels
             - else
               View labels
-  = dropdown_loading
\ No newline at end of file
+  = dropdown_loading

From 7df4a3c53a654782c6ca2214d8a5bd452b52835b Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 31 May 2016 16:33:18 -0500
Subject: [PATCH 1119/1431] Fix spec

---
 .../shared/issuable/_label_page_default.html.haml   |  2 +-
 spec/services/issues/bulk_update_service_spec.rb    | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index 935a0193a2d..4e280c371ac 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -6,7 +6,7 @@
   = dropdown_title(title)
   = dropdown_filter(filter_placeholder)
   = dropdown_content
-  - if @project and show_footer
+  - if @project && show_footer
     = dropdown_footer do
       %ul.dropdown-footer-list
         - if can?(current_user, :admin_label, @project)
diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb
index ad19fe0f151..4a689e64dc5 100644
--- a/spec/services/issues/bulk_update_service_spec.rb
+++ b/spec/services/issues/bulk_update_service_spec.rb
@@ -6,9 +6,10 @@ describe Issues::BulkUpdateService, services: true do
 
   let!(:result) { Issues::BulkUpdateService.new(project, user, params).execute }
 
-    before do
-      @issues = create_list(:issue, 5, project: @project)
-      @params = {
+  describe :close_issue do
+    let(:issues) { create_list(:issue, 5, project: project) }
+    let(:params) do
+      {
         state_event: 'close',
         issues_ids: issues.map(&:id).join(',')
       }
@@ -26,9 +27,9 @@ describe Issues::BulkUpdateService, services: true do
   end
 
   describe :reopen_issues do
-    before do
-      @issues = create_list(:closed_issue, 5, project: @project)
-      @params = {
+    let(:issues) { create_list(:closed_issue, 5, project: project) }
+    let(:params) do
+      {
         state_event: 'reopen',
         issues_ids: issues.map(&:id).join(',')
       }

From 94d9efaa8e59a93d7350e2e1f7a4f99ef93a5ab7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 31 May 2016 19:36:00 -0500
Subject: [PATCH 1120/1431] Remove extra bracket

---
 app/views/projects/labels/_label.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 950f6e284b1..294fec422c5 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,6 +1,5 @@
-%li{id: dom_id(label), data: { id: label.id } } }
+%li{ id: dom_id(label), data: { id: label.id } }
   = render "shared/label_row", label: label
-
   .pull-info-right
     %span.append-right-20
       = link_to_label(label, type: :merge_request) do

From e6567bc13c3c92ed581e916306ecfb758e311f19 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 4 Jun 2016 00:24:33 +0200
Subject: [PATCH 1121/1431] Use gitlab-build-images for precache some of the
 dependencies

---
 .gitlab-ci.yml           | 34 ++++++++++++----------------------
 scripts/prepare_build.sh | 14 --------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9774602cbdc..85bf783ace6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
-image: "ruby:2.1"
+image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1
 
 services:
   - mysql:latest
-  - redis:latest
+  - redis:alpine
 
 cache:
   key: "ruby21"
@@ -112,26 +112,16 @@ rspec 17 20: *knapsack
 rspec 18 20: *knapsack
 rspec 19 20: *knapsack
 
-spinach 0 20: *knapsack
-spinach 1 20: *knapsack
-spinach 2 20: *knapsack
-spinach 3 20: *knapsack
-spinach 4 20: *knapsack
-spinach 5 20: *knapsack
-spinach 6 20: *knapsack
-spinach 7 20: *knapsack
-spinach 8 20: *knapsack
-spinach 9 20: *knapsack
-spinach 10 20: *knapsack
-spinach 11 20: *knapsack
-spinach 12 20: *knapsack
-spinach 13 20: *knapsack
-spinach 14 20: *knapsack
-spinach 15 20: *knapsack
-spinach 16 20: *knapsack
-spinach 17 20: *knapsack
-spinach 18 20: *knapsack
-spinach 19 20: *knapsack
+spinach 0 10: *knapsack
+spinach 1 10: *knapsack
+spinach 2 10: *knapsack
+spinach 3 10: *knapsack
+spinach 4 10: *knapsack
+spinach 5 10: *knapsack
+spinach 6 10: *knapsack
+spinach 7 10: *knapsack
+spinach 8 10: *knapsack
+spinach 9 10: *knapsack
 
 teaspoon: *exec
 rubocop: *exec
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 247383aa46c..9540d7d128f 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -12,20 +12,6 @@ retry() {
 }
 
 if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
-    mkdir -p vendor
-
-    # Install phantomjs package
-    pushd vendor
-    if [ ! -e 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
-    fi
-    dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
-    popd
-
-    # Try to install packages
-    retry 'apt-get update -yqqq; 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
     sed -i 's/username:.*/username: root/g' config/database.yml
     sed -i 's/password:.*/password:/g' config/database.yml

From 1faed033ce12fb5a7190a3393e43cbea0154cb8a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 4 Jun 2016 20:43:18 +0200
Subject: [PATCH 1122/1431] Disable Rails/UniqBeforePluck rubocop cop

---
 .rubocop.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 3593ae29f24..bbe4e1ece33 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1088,6 +1088,9 @@ Rails/TimeZone:
 Rails/Validation:
   Enabled: false
 
+Rails/UniqBeforePluck:
+  Enabled: false
+
 ##################### RSpec ##################################
 
 # Check that instances are not being stubbed globally.

From f0f8efeb3465d5a6915a680bc96a4cdc9384bd4b Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 5 Jun 2016 12:24:36 -0600
Subject: [PATCH 1123/1431] Fix error on non-issue pages with comment areas.

---
 app/views/projects/_md_preview.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index 59a952dd662..28a28282fd3 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -8,7 +8,7 @@
         %a.js-md-preview-button{ href: "#md-preview-holder", tabindex: -1 }
           Preview
 
-      - if @issue.confidential?
+      - if defined?(@issue) && @issue.confidential?
         %li.confidential-issue-warning
           = icon('warning')
           %span This is a confidential issue. Your comment will not be visible to the public.

From 90a3c947a712845770dc9fe2266b727092e717cb Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 5 Jun 2016 14:49:25 -0400
Subject: [PATCH 1124/1431] Fix CHANGELOG for 8.8.4 (unreleased)

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

diff --git a/CHANGELOG b/CHANGELOG
index e2ba6bc79dd..ecce18af066 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,13 +38,11 @@ v 8.9.0 (unreleased)
   - Put project Files and Commits tabs under Code tab
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
 
-v 8.8.4
-  - Fix todos page throwing errors when you have a project pending deletion
-  - Reduce number of SQL queries when rendering user references
-
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
   - Fix issue with arrow keys not working in search autocomplete dropdown
+  - Fix todos page throwing errors when you have a project pending deletion
+  - Reduce number of SQL queries when rendering user references
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 86df113907907b282de226e86b27e1136432563e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 31 May 2016 18:22:33 +0100
Subject: [PATCH 1125/1431] Upgraded jQuery to version 2

Closes #12440
---
 app/assets/javascripts/application.js.coffee  |   2 +-
 vendor/assets/javascripts/task_list.js.coffee | 258 ++++++++++++++++++
 2 files changed, 259 insertions(+), 1 deletion(-)
 create mode 100644 vendor/assets/javascripts/task_list.js.coffee

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 18c1aa0d4e2..0bf99bb1f4a 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -4,7 +4,7 @@
 # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 # the compiled file.
 #
-#= require jquery
+#= require jquery2
 #= require jquery-ui/autocomplete
 #= require jquery-ui/datepicker
 #= require jquery-ui/draggable
diff --git a/vendor/assets/javascripts/task_list.js.coffee b/vendor/assets/javascripts/task_list.js.coffee
new file mode 100644
index 00000000000..584751af8ea
--- /dev/null
+++ b/vendor/assets/javascripts/task_list.js.coffee
@@ -0,0 +1,258 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 GitHub, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# TaskList Behavior
+#
+#= provides tasklist:enabled
+#= provides tasklist:disabled
+#= provides tasklist:change
+#= provides tasklist:changed
+#
+#
+# Enables Task List update behavior.
+#
+# ### Example Markup
+#
+#   <div class="js-task-list-container">
+#     <ul class="task-list">
+#       <li class="task-list-item">
+#         <input type="checkbox" class="js-task-list-item-checkbox" disabled />
+#         text
+#       </li>
+#     </ul>
+#     <form>
+#       <textarea class="js-task-list-field">- [ ] text</textarea>
+#     </form>
+#   </div>
+#
+# ### Specification
+#
+# TaskLists MUST be contained in a `(div).js-task-list-container`.
+#
+# TaskList Items SHOULD be an a list (`UL`/`OL`) element.
+#
+# Task list items MUST match `(input).task-list-item-checkbox` and MUST be
+# `disabled` by default.
+#
+# TaskLists MUST have a `(textarea).js-task-list-field` form element whose
+# `value` attribute is the source (Markdown) to be udpated. The source MUST
+# follow the syntax guidelines.
+#
+# TaskList updates trigger `tasklist:change` events. If the change is
+# successful, `tasklist:changed` is fired. The change can be canceled.
+#
+# jQuery is required.
+#
+# ### Methods
+#
+# `.taskList('enable')` or `.taskList()`
+#
+# Enables TaskList updates for the container.
+#
+# `.taskList('disable')`
+#
+# Disables TaskList updates for the container.
+#
+## ### Events
+#
+# `tasklist:enabled`
+#
+# Fired when the TaskList is enabled.
+#
+# * **Synchronicity** Sync
+# * **Bubbles** Yes
+# * **Cancelable** No
+# * **Target** `.js-task-list-container`
+#
+# `tasklist:disabled`
+#
+# Fired when the TaskList is disabled.
+#
+# * **Synchronicity** Sync
+# * **Bubbles** Yes
+# * **Cancelable** No
+# * **Target** `.js-task-list-container`
+#
+# `tasklist:change`
+#
+# Fired before the TaskList item change takes affect.
+#
+# * **Synchronicity** Sync
+# * **Bubbles** Yes
+# * **Cancelable** Yes
+# * **Target** `.js-task-list-field`
+#
+# `tasklist:changed`
+#
+# Fired once the TaskList item change has taken affect.
+#
+# * **Synchronicity** Sync
+# * **Bubbles** Yes
+# * **Cancelable** No
+# * **Target** `.js-task-list-field`
+#
+# ### NOTE
+#
+# Task list checkboxes are rendered as disabled by default because rendered
+# user content is cached without regard for the viewer.
+
+incomplete = "[ ]"
+complete   = "[x]"
+
+# Escapes the String for regular expression matching.
+escapePattern = (str) ->
+  str.
+    replace(/([\[\]])/g, "\\$1"). # escape square brackets
+    replace(/\s/, "\\s").         # match all white space
+    replace("x", "[xX]")          # match all cases
+
+incompletePattern = ///
+  #{escapePattern(incomplete)}
+///
+completePattern = ///
+  #{escapePattern(complete)}
+///
+
+# Pattern used to identify all task list items.
+# Useful when you need iterate over all items.
+itemPattern = ///
+  ^
+  (?:                     # prefix, consisting of
+    \s*                   # optional leading whitespace
+    (?:>\s*)*             # zero or more blockquotes
+    (?:[-+*]|(?:\d+\.))   # list item indicator
+  )
+  \s*                     # optional whitespace prefix
+  (                       # checkbox
+    #{escapePattern(complete)}|
+    #{escapePattern(incomplete)}
+  )
+  \s+                     # is followed by whitespace
+  (?!
+    \(.*?\)               # is not part of a [foo](url) link
+  )
+  (?=                     # and is followed by zero or more links
+    (?:\[.*?\]\s*(?:\[.*?\]|\(.*?\))\s*)*
+    (?:[^\[]|$)           # and either a non-link or the end of the string
+  )
+///
+
+# Used to filter out code fences from the source for comparison only.
+# http://rubular.com/r/x5EwZVrloI
+# Modified slightly due to issues with JS
+codeFencesPattern = ///
+  ^`{3}           # ```
+    (?:\s*\w+)?   # followed by optional language
+    [\S\s]        # whitespace
+  .*              # code
+  [\S\s]          # whitespace
+  ^`{3}$          # ```
+///mg
+
+# Used to filter out potential mismatches (items not in lists).
+# http://rubular.com/r/OInl6CiePy
+itemsInParasPattern = ///
+  ^
+  (
+    #{escapePattern(complete)}|
+    #{escapePattern(incomplete)}
+  )
+  .+
+  $
+///g
+
+# Given the source text, updates the appropriate task list item to match the
+# given checked value.
+#
+# Returns the updated String text.
+updateTaskListItem = (source, itemIndex, checked) ->
+  clean = source.replace(/\r/g, '').replace(codeFencesPattern, '').
+    replace(itemsInParasPattern, '').split("\n")
+  index = 0
+  result = for line in source.split("\n")
+    if line in clean && line.match(itemPattern)
+      index += 1
+      if index == itemIndex
+        line =
+          if checked
+            line.replace(incompletePattern, complete)
+          else
+            line.replace(completePattern, incomplete)
+    line
+  result.join("\n")
+
+# Updates the $field value to reflect the state of $item.
+# Triggers the `tasklist:change` event before the value has changed, and fires
+# a `tasklist:changed` event once the value has changed.
+updateTaskList = ($item) ->
+  $container = $item.closest '.js-task-list-container'
+  $field     = $container.find '.js-task-list-field'
+  index      = 1 + $container.find('.task-list-item-checkbox').index($item)
+  checked    = $item.prop 'checked'
+
+  event = $.Event 'tasklist:change'
+  $field.trigger event, [index, checked]
+
+  unless event.isDefaultPrevented()
+    $field.val updateTaskListItem($field.val(), index, checked)
+    $field.trigger 'change'
+    $field.trigger 'tasklist:changed', [index, checked]
+
+# When the task list item checkbox is updated, submit the change
+$(document).on 'change', '.task-list-item-checkbox', ->
+  updateTaskList $(this)
+
+# Enables TaskList item changes.
+enableTaskList = ($container) ->
+  if $container.find('.js-task-list-field').length > 0
+    $container.
+      find('.task-list-item').addClass('enabled').
+      find('.task-list-item-checkbox').attr('disabled', null)
+    $container.addClass('is-task-list-enabled').
+      trigger 'tasklist:enabled'
+
+# Enables a collection of TaskList containers.
+enableTaskLists = ($containers) ->
+  for container in $containers
+    enableTaskList $(container)
+
+# Disable TaskList item changes.
+disableTaskList = ($container) ->
+  $container.
+    find('.task-list-item').removeClass('enabled').
+    find('.task-list-item-checkbox').attr('disabled', 'disabled')
+  $container.removeClass('is-task-list-enabled').
+    trigger 'tasklist:disabled'
+
+# Disables a collection of TaskList containers.
+disableTaskLists = ($containers) ->
+  for container in $containers
+    disableTaskList $(container)
+
+$.fn.taskList = (method) ->
+  $container = $(this).closest('.js-task-list-container')
+
+  methods =
+    enable: enableTaskLists
+    disable: disableTaskLists
+
+  methods[method || 'enable']($container)

From 515a5aeb3325848de22eec6421b1a0dcaf434e2c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 1 Jun 2016 10:11:30 +0100
Subject: [PATCH 1126/1431] Fixed JS errors CHANGELOG item

---
 CHANGELOG                                            |  1 +
 app/assets/javascripts/due_date_select.js.coffee     |  5 +++--
 app/assets/javascripts/milestone_select.js.coffee    |  4 ++--
 app/assets/javascripts/users_select.js.coffee        |  2 +-
 spec/features/issues_spec.rb                         |  8 ++------
 .../graphs/stat_graph_contributors_util_spec.js      | 12 ++++++------
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ecce18af066..6d5663134d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.8.4 (unreleased)
   - Fix issue with arrow keys not working in search autocomplete dropdown
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
+  - Upgrade to jQuery 2
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
index 3cc70185178..3d009a96d05 100644
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ b/app/assets/javascripts/due_date_select.js.coffee
@@ -21,7 +21,7 @@ class @DueDateSelect
       $dropdown.glDropdown(
         hidden: ->
           $selectbox.hide()
-          $value.removeAttr('style')
+          $value.css('display', '')
       )
 
       addDueDate = (isDropdown) ->
@@ -42,12 +42,13 @@ class @DueDateSelect
           type: 'PUT'
           url: issueUpdateURL
           data: data
+          dataType: 'json'
           beforeSend: ->
             $loading.fadeIn()
             if isDropdown
               $dropdown.trigger('loading.gl.dropdown')
               $selectbox.hide()
-            $value.removeAttr('style')
+            $value.css('display', '')
 
             $valueContent.html(mediumDate)
             $sidebarValue.html(mediumDate)
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index 345a0e447af..1d061d5edb7 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -83,7 +83,7 @@ class @MilestoneSelect
           $selectbox.hide()
 
           # display:block overrides the hide-collapse rule
-          $value.removeAttr('style')
+          $value.css('display', '')
         clicked: (selected) ->
           page = $('body').data 'page'
           isIssueIndex = page is 'projects:issues:index'
@@ -118,7 +118,7 @@ class @MilestoneSelect
               $dropdown.trigger('loaded.gl.dropdown')
               $loading.fadeOut()
               $selectbox.hide()
-              $value.removeAttr('style')
+              $value.css('display', '')
               if data.milestone?
                 data.milestone.namespace = _this.currentProject.namespace
                 data.milestone.path = _this.currentProject.path
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index 519618aa617..de0eae58bff 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -149,7 +149,7 @@ class @UsersSelect
         hidden: (e) ->
           $selectbox.hide()
           # display:block overrides the hide-collapse rule
-          $value.removeAttr('style')
+          $value.css('display', '')
 
         clicked: (user) ->
           page = $('body').data 'page'
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index a4eed5031c9..460d7f82b36 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -365,13 +365,9 @@ describe 'Issues', feature: true do
 
         page.within('.assignee') do
           expect(page).to have_content "#{@user.name}"
-        end
 
-        find('.block.assignee .edit-link').click
-        sleep 2 # wait for ajax stuff to complete
-        first('.dropdown-menu-user-link').click
-        sleep 2
-        page.within('.assignee') do
+          click_link 'Edit'
+          click_link 'Unassigned'
           expect(page).to have_content 'No assignee'
         end
 
diff --git a/spec/javascripts/graphs/stat_graph_contributors_util_spec.js b/spec/javascripts/graphs/stat_graph_contributors_util_spec.js
index 5b992447473..56970e22e34 100644
--- a/spec/javascripts/graphs/stat_graph_contributors_util_spec.js
+++ b/spec/javascripts/graphs/stat_graph_contributors_util_spec.js
@@ -9,14 +9,14 @@ describe("ContributorsStatGraphUtil", function () {
             {author_email: "dzaporozhets@email.com", author_name: "Dmitriy Zaporozhets", date: "2013-05-08", additions: 6, deletions: 1},
             {author_email: "dzaporozhets@email.com", author_name: "Dmitriy Zaporozhets", date: "2013-05-08", additions: 19, deletions: 3},
             {author_email: "dzaporozhets@email.com", author_name: "Dmitriy Zaporozhets", date: "2013-05-08", additions: 29, deletions: 3}]
-      
+
       var correct_parsed_log = {
         total: [
         {date: "2013-05-09", additions: 471, deletions: 0, commits: 1},
         {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}],
         by_author:
         [
-        { 
+        {
           author_name: "Karlo Soriano", author_email: "karlo@email.com",
           "2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1}
         },
@@ -132,8 +132,8 @@ describe("ContributorsStatGraphUtil", function () {
       total: [{date: "2013-05-09", additions: 471, deletions: 0, commits: 1},
       {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}],
       by_author:[
-      { 
-        author: "Karlo Soriano", 
+      {
+        author: "Karlo Soriano",
         "2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1}
       },
       {
@@ -161,11 +161,11 @@ describe("ContributorsStatGraphUtil", function () {
     it("returns the log by author sorted by specified field", function () {
       var fake_parsed_log = {
         total: [
-          {date: "2013-05-09", additions: 471, deletions: 0, commits: 1}, 
+          {date: "2013-05-09", additions: 471, deletions: 0, commits: 1},
           {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}
         ],
         by_author: [
-          { 
+          {
             author_name: "Karlo Soriano", author_email: "karlo@email.com",
             "2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1}
           },

From b75945e9e4718eb7c2b029b7fb7884eb2006fab1 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 6 Jun 2016 07:42:12 +0200
Subject: [PATCH 1127/1431] Fix rubocop offense in awardable specs

---
 spec/models/concerns/awardable_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/models/concerns/awardable_spec.rb b/spec/models/concerns/awardable_spec.rb
index 6851d068367..a371c4a18a9 100644
--- a/spec/models/concerns/awardable_spec.rb
+++ b/spec/models/concerns/awardable_spec.rb
@@ -38,12 +38,11 @@ describe Issue, "Awardable" do
 
   describe "#toggle_award_emoji" do
     it "adds an emoji if it isn't awarded yet" do
-      expect { issue.toggle_award_emoji("thumbsup", award_emoji.user) }.to change { AwardEmoji.count }.by 1
+      expect { issue.toggle_award_emoji("thumbsup", award_emoji.user) }.to change { AwardEmoji.count }.by(1)
     end
 
     it "toggles already awarded emoji" do
-
-      expect { issue.toggle_award_emoji("thumbsdown", award_emoji.user) }.to change { AwardEmoji.count }.by -1
+      expect { issue.toggle_award_emoji("thumbsdown", award_emoji.user) }.to change { AwardEmoji.count }.by(-1)
     end
   end
 end

From 23030439c2cf3b3ad48099eb9a4371b8bf55066f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 6 Jun 2016 08:20:55 +0200
Subject: [PATCH 1128/1431] Rename class that loads CI configuration to Loader

---
 lib/ci/gitlab_ci_yaml_processor.rb            |  2 +-
 lib/gitlab/ci/config.rb                       | 10 ++++----
 lib/gitlab/ci/config/{parser.rb => loader.rb} |  4 ++--
 .../config/{parser_spec.rb => loader_spec.rb} | 24 ++++++++-----------
 spec/lib/gitlab/ci/config_spec.rb             |  2 +-
 5 files changed, 19 insertions(+), 23 deletions(-)
 rename lib/gitlab/ci/config/{parser.rb => loader.rb} (92%)
 rename spec/lib/gitlab/ci/config/{parser_spec.rb => loader_spec.rb} (56%)

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 9a60c5ab842..46a923161c8 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -18,7 +18,7 @@ module Ci
       initial_parsing
 
       validate!
-    rescue Gitlab::Ci::Config::ParserError => e
+    rescue Gitlab::Ci::Config::LoaderError => e
       raise ValidationError, e.message
     end
 
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 0baefa70f61..5fc4894311f 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -1,16 +1,16 @@
 module Gitlab
   module Ci
     class Config
-      class ParserError < StandardError; end
+      class LoaderError < StandardError; end
 
       def initialize(config)
-        parser = Parser.new(config)
+        loader = Loader.new(config)
 
-        unless parser.valid?
-          raise ParserError, 'Invalid configuration format!'
+        unless loader.valid?
+          raise LoaderError, 'Invalid configuration format!'
         end
 
-        @config = parser.parse
+        @config = loader.load
       end
 
       def to_hash
diff --git a/lib/gitlab/ci/config/parser.rb b/lib/gitlab/ci/config/loader.rb
similarity index 92%
rename from lib/gitlab/ci/config/parser.rb
rename to lib/gitlab/ci/config/loader.rb
index 6e1b7ec8267..ed9cc16702c 100644
--- a/lib/gitlab/ci/config/parser.rb
+++ b/lib/gitlab/ci/config/loader.rb
@@ -1,7 +1,7 @@
 module Gitlab
   module Ci
     class Config
-      class Parser
+      class Loader
         class FormatError < StandardError; end
 
         def initialize(config)
@@ -12,7 +12,7 @@ module Gitlab
           @config.is_a?(Hash)
         end
 
-        def parse
+        def load
           unless valid?
             raise FormatError, 'Invalid configuration format'
           end
diff --git a/spec/lib/gitlab/ci/config/parser_spec.rb b/spec/lib/gitlab/ci/config/loader_spec.rb
similarity index 56%
rename from spec/lib/gitlab/ci/config/parser_spec.rb
rename to spec/lib/gitlab/ci/config/loader_spec.rb
index b35e66cde51..6f1a10085dd 100644
--- a/spec/lib/gitlab/ci/config/parser_spec.rb
+++ b/spec/lib/gitlab/ci/config/loader_spec.rb
@@ -1,24 +1,20 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Config::Parser do
-  let(:parser) { described_class.new(yml) }
+describe Gitlab::Ci::Config::Loader do
+  let(:loader) { described_class.new(yml) }
 
   context 'when yaml syntax is correct' do
     let(:yml) { 'image: ruby:2.2' }
 
     describe '#valid?' do
       it 'returns true' do
-        expect(parser.valid?).to be true
+        expect(loader.valid?).to be true
       end
     end
 
-    describe '#parse' do
-      it 'returns a hash' do
-        expect(parser.parse).to be_a Hash
-      end
-
+    describe '#load' do
       it 'returns a valid hash' do
-        expect(parser.parse).to eq(image: 'ruby:2.2')
+        expect(loader.load).to eq(image: 'ruby:2.2')
       end
     end
   end
@@ -28,14 +24,14 @@ describe Gitlab::Ci::Config::Parser do
 
     describe '#valid?' do
       it 'returns false' do
-        expect(parser.valid?).to be false
+        expect(loader.valid?).to be false
       end
     end
 
-    describe '#parse' do
+    describe '#load' do
       it 'raises error' do
-        expect { parser.parse }.to raise_error(
-          Gitlab::Ci::Config::Parser::FormatError,
+        expect { loader.load }.to raise_error(
+          Gitlab::Ci::Config::Loader::FormatError,
           'Invalid configuration format'
         )
       end
@@ -47,7 +43,7 @@ describe Gitlab::Ci::Config::Parser do
 
     describe '#valid?' do
       it 'returns false' do
-        expect(parser.valid?).to be false
+        expect(loader.valid?).to be false
       end
     end
   end
diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb
index 691c1ee8ba7..52aafbcaaa6 100644
--- a/spec/lib/gitlab/ci/config_spec.rb
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::Ci::Config do
       describe '.new' do
         it 'raises error' do
           expect { config }.to raise_error(
-            Gitlab::Ci::Config::ParserError, /Invalid configuration format/
+            Gitlab::Ci::Config::LoaderError, /Invalid configuration format/
           )
         end
       end

From 791cc9138be6ea1783e3c3853370cf0290f4d41e Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:08:42 +0530
Subject: [PATCH 1129/1431] Add a `U2fRegistrations` table/model.

- To hold registrations from U2F devices, and to authenticate them.
- Previously, `User#two_factor_enabled` was aliased to the
  `otp_required_for_login` column on `users`.
- This commit changes things a bit:
    - `User#two_factor_enabled` is not a method anymore
    - `User#two_factor_enabled?` checks both the
      `otp_required_for_login` column, as well as `U2fRegistration`s
    - Change all instances of `User#two_factor_enabled` to
      `User#two_factor_enabled?`
- Add the `u2f` gem, and implement registration/authentication at the
  model level.
---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 +
 app/controllers/application_controller.rb     |  4 +-
 app/helpers/auth_helper.rb                    |  2 +-
 app/models/u2f_registration.rb                | 40 +++++++++++++
 app/models/user.rb                            | 45 ++++++++++----
 ...20160425045124_create_u2f_registrations.rb | 13 ++++
 db/schema.rb                                  | 15 ++++-
 lib/api/entities.rb                           |  2 +-
 spec/factories/u2f_registrations.rb           |  8 +++
 spec/factories/users.rb                       | 14 ++++-
 spec/features/admin/admin_users_spec.rb       | 10 ++--
 spec/models/user_spec.rb                      | 60 +++++++++++++++++++
 13 files changed, 194 insertions(+), 22 deletions(-)
 create mode 100644 app/models/u2f_registration.rb
 create mode 100644 db/migrate/20160425045124_create_u2f_registrations.rb
 create mode 100644 spec/factories/u2f_registrations.rb

diff --git a/Gemfile b/Gemfile
index a50d7e632ae..1e7c7869cba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,6 +45,7 @@ gem 'akismet', '~> 2.0'
 gem 'devise-two-factor', '~> 3.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
 gem 'attr_encrypted', '~> 3.0.0'
+gem 'u2f', '~> 0.2.1'
 
 # Browser detection
 gem "browser", '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1771b919b60..bdf7ab97746 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -747,6 +747,7 @@ GEM
       simple_oauth (~> 0.1.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    u2f (0.2.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -963,6 +964,7 @@ DEPENDENCIES
   thin (~> 1.6.1)
   tinder (~> 1.10.0)
   turbolinks (~> 2.5.0)
+  u2f (~> 0.2.1)
   uglifier (~> 2.7.2)
   underscore-rails (~> 1.8.0)
   unf (~> 0.1.4)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c28d1ca9e3b..e73b2d08551 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -182,8 +182,8 @@ class ApplicationController < ActionController::Base
   end
 
   def check_2fa_requirement
-    if two_factor_authentication_required? && current_user && !current_user.two_factor_enabled && !skip_two_factor?
-      redirect_to new_profile_two_factor_auth_path
+    if two_factor_authentication_required? && current_user && !current_user.two_factor_enabled? && !skip_two_factor?
+      redirect_to profile_two_factor_auth_path
     end
   end
 
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index b05fa0a14d6..cd4d778e508 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -66,7 +66,7 @@ module AuthHelper
 
   def two_factor_skippable?
     current_application_settings.require_two_factor_authentication &&
-      !current_user.two_factor_enabled &&
+      !current_user.two_factor_enabled? &&
       current_application_settings.two_factor_grace_period &&
       !two_factor_grace_period_expired?
   end
diff --git a/app/models/u2f_registration.rb b/app/models/u2f_registration.rb
new file mode 100644
index 00000000000..00b19686d48
--- /dev/null
+++ b/app/models/u2f_registration.rb
@@ -0,0 +1,40 @@
+# Registration information for U2F (universal 2nd factor) devices, like Yubikeys
+
+class U2fRegistration < ActiveRecord::Base
+  belongs_to :user
+
+  def self.register(user, app_id, json_response, challenges)
+    u2f = U2F::U2F.new(app_id)
+    registration = self.new
+
+    begin
+      response = U2F::RegisterResponse.load_from_json(json_response)
+      registration_data = u2f.register!(challenges, response)
+      registration.update(certificate: registration_data.certificate,
+                          key_handle: registration_data.key_handle,
+                          public_key: registration_data.public_key,
+                          counter: registration_data.counter,
+                          user: user)
+    rescue JSON::ParserError, NoMethodError, ArgumentError
+      registration.errors.add(:base, 'Your U2F device did not send a valid JSON response.')
+    rescue U2F::Error => e
+      registration.errors.add(:base, e.message)
+    end
+
+    registration
+  end
+
+  def self.authenticate(user, app_id, json_response, challenges)
+    response = U2F::SignResponse.load_from_json(json_response)
+    registration = user.u2f_registrations.find_by_key_handle(response.key_handle)
+    u2f = U2F::U2F.new(app_id)
+
+    if registration
+      u2f.authenticate!(challenges, response, Base64.decode64(registration.public_key), registration.counter)
+      registration.update(counter: response.counter)
+      true
+    end
+  rescue JSON::ParserError, NoMethodError, ArgumentError, U2F::Error
+    false
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index bbc88f7e38a..e0987e07e1f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -27,7 +27,6 @@ class User < ActiveRecord::Base
 
   devise :two_factor_authenticatable,
          otp_secret_encryption_key: Gitlab::Application.config.secret_key_base
-  alias_attribute :two_factor_enabled, :otp_required_for_login
 
   devise :two_factor_backupable, otp_number_of_backup_codes: 10
   serialize :otp_backup_codes, JSON
@@ -51,6 +50,7 @@ class User < ActiveRecord::Base
   has_many :keys, dependent: :destroy
   has_many :emails, dependent: :destroy
   has_many :identities, dependent: :destroy, autosave: true
+  has_many :u2f_registrations, dependent: :destroy
 
   # Groups
   has_many :members, dependent: :destroy
@@ -175,8 +175,16 @@ class User < ActiveRecord::Base
   scope :active, -> { with_state(:active) }
   scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : all }
   scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM members)') }
-  scope :with_two_factor,    -> { where(two_factor_enabled: true) }
-  scope :without_two_factor, -> { where(two_factor_enabled: false) }
+
+  def self.with_two_factor
+    joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id").
+      where("u2f.id IS NOT NULL OR otp_required_for_login = ?", true).distinct(arel_table[:id])
+  end
+
+  def self.without_two_factor
+    joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id").
+      where("u2f.id IS NULL AND otp_required_for_login = ?", false)
+  end
 
   #
   # Class methods
@@ -323,14 +331,29 @@ class User < ActiveRecord::Base
   end
 
   def disable_two_factor!
-    update_attributes(
-      two_factor_enabled:          false,
-      encrypted_otp_secret:        nil,
-      encrypted_otp_secret_iv:     nil,
-      encrypted_otp_secret_salt:   nil,
-      otp_grace_period_started_at: nil,
-      otp_backup_codes:            nil
-    )
+    transaction do
+      update_attributes(
+        otp_required_for_login:      false,
+        encrypted_otp_secret:        nil,
+        encrypted_otp_secret_iv:     nil,
+        encrypted_otp_secret_salt:   nil,
+        otp_grace_period_started_at: nil,
+        otp_backup_codes:            nil
+      )
+      self.u2f_registrations.destroy_all
+    end
+  end
+
+  def two_factor_enabled?
+    two_factor_otp_enabled? || two_factor_u2f_enabled?
+  end
+
+  def two_factor_otp_enabled?
+    self.otp_required_for_login?
+  end
+
+  def two_factor_u2f_enabled?
+    self.u2f_registrations.exists?
   end
 
   def namespace_uniq
diff --git a/db/migrate/20160425045124_create_u2f_registrations.rb b/db/migrate/20160425045124_create_u2f_registrations.rb
new file mode 100644
index 00000000000..93bdd9de2eb
--- /dev/null
+++ b/db/migrate/20160425045124_create_u2f_registrations.rb
@@ -0,0 +1,13 @@
+class CreateU2fRegistrations < ActiveRecord::Migration
+  def change
+    create_table :u2f_registrations do |t|
+      t.text :certificate
+      t.string :key_handle, index: true
+      t.string :public_key
+      t.integer :counter
+      t.references :user, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 28902119615..9b991f347a9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,7 +12,6 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160530150109) do
-
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"
@@ -940,6 +939,19 @@ ActiveRecord::Schema.define(version: 20160530150109) do
   add_index "todos", ["target_type", "target_id"], name: "index_todos_on_target_type_and_target_id", using: :btree
   add_index "todos", ["user_id"], name: "index_todos_on_user_id", using: :btree
 
+  create_table "u2f_registrations", force: :cascade do |t|
+    t.text     "certificate"
+    t.string   "key_handle"
+    t.string   "public_key"
+    t.integer  "counter"
+    t.integer  "user_id"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
+  add_index "u2f_registrations", ["key_handle"], name: "index_u2f_registrations_on_key_handle", using: :btree
+  add_index "u2f_registrations", ["user_id"], name: "index_u2f_registrations_on_user_id", using: :btree
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                       default: "",    null: false
     t.string   "encrypted_password",          default: "",    null: false
@@ -1047,4 +1059,5 @@ ActiveRecord::Schema.define(version: 20160530150109) do
   add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree
   add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree
 
+  add_foreign_key "u2f_registrations", "users"
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1a996846e9d..66c138eb902 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -30,7 +30,7 @@ module API
       expose :identities, using: Entities::Identity
       expose :can_create_group?, as: :can_create_group
       expose :can_create_project?, as: :can_create_project
-      expose :two_factor_enabled
+      expose :two_factor_enabled?, as: :two_factor_enabled
       expose :external
     end
 
diff --git a/spec/factories/u2f_registrations.rb b/spec/factories/u2f_registrations.rb
new file mode 100644
index 00000000000..df92b079581
--- /dev/null
+++ b/spec/factories/u2f_registrations.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :u2f_registration do
+    certificate { FFaker::BaconIpsum.characters(728) }
+    key_handle { FFaker::BaconIpsum.characters(86) }
+    public_key { FFaker::BaconIpsum.characters(88) }
+    counter 0
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index a9b2148bd2a..c6f7869516e 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -15,14 +15,26 @@ FactoryGirl.define do
     end
 
     trait :two_factor do
+      two_factor_via_otp
+    end
+
+    trait :two_factor_via_otp do
       before(:create) do |user|
-        user.two_factor_enabled = true
+        user.otp_required_for_login = true
         user.otp_secret = User.generate_otp_secret(32)
         user.otp_grace_period_started_at = Time.now
         user.generate_otp_backup_codes!
       end
     end
 
+    trait :two_factor_via_u2f do
+      transient { registrations_count 5 }
+
+      after(:create) do |user, evaluator|
+        create_list(:u2f_registration, evaluator.registrations_count, user: user)
+      end
+    end
+
     factory :omniauth_user do
       transient do
         extern_uid '123456'
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 96621843b30..b72ad405479 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -19,7 +19,7 @@ describe "Admin::Users", feature: true  do
 
     describe 'Two-factor Authentication filters' do
       it 'counts users who have enabled 2FA' do
-        create(:user, two_factor_enabled: true)
+        create(:user, :two_factor)
 
         visit admin_users_path
 
@@ -29,7 +29,7 @@ describe "Admin::Users", feature: true  do
       end
 
       it 'filters by users who have enabled 2FA' do
-        user = create(:user, two_factor_enabled: true)
+        user = create(:user, :two_factor)
 
         visit admin_users_path
         click_link '2FA Enabled'
@@ -38,7 +38,7 @@ describe "Admin::Users", feature: true  do
       end
 
       it 'counts users who have not enabled 2FA' do
-        create(:user, two_factor_enabled: false)
+        create(:user)
 
         visit admin_users_path
 
@@ -48,7 +48,7 @@ describe "Admin::Users", feature: true  do
       end
 
       it 'filters by users who have not enabled 2FA' do
-        user = create(:user, two_factor_enabled: false)
+        user = create(:user)
 
         visit admin_users_path
         click_link '2FA Disabled'
@@ -173,7 +173,7 @@ describe "Admin::Users", feature: true  do
 
     describe 'Two-factor Authentication status' do
       it 'shows when enabled' do
-        @user.update_attribute(:two_factor_enabled, true)
+        @user.update_attribute(:otp_required_for_login, true)
 
         visit admin_user_path(@user)
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 528a79bf221..6ea8bf9bbe1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -121,6 +121,66 @@ describe User, models: true do
     end
   end
 
+  describe "scopes" do
+    describe ".with_two_factor" do
+      it "returns users with 2fa enabled via OTP" do
+        user_with_2fa = create(:user, :two_factor_via_otp)
+        user_without_2fa = create(:user)
+        users_with_two_factor = User.with_two_factor.pluck(:id)
+
+        expect(users_with_two_factor).to include(user_with_2fa.id)
+        expect(users_with_two_factor).not_to include(user_without_2fa.id)
+      end
+
+      it "returns users with 2fa enabled via U2F" do
+        user_with_2fa = create(:user, :two_factor_via_u2f)
+        user_without_2fa = create(:user)
+        users_with_two_factor = User.with_two_factor.pluck(:id)
+
+        expect(users_with_two_factor).to include(user_with_2fa.id)
+        expect(users_with_two_factor).not_to include(user_without_2fa.id)
+      end
+
+      it "returns users with 2fa enabled via OTP and U2F" do
+        user_with_2fa = create(:user, :two_factor_via_otp, :two_factor_via_u2f)
+        user_without_2fa = create(:user)
+        users_with_two_factor = User.with_two_factor.pluck(:id)
+
+        expect(users_with_two_factor).to eq([user_with_2fa.id])
+        expect(users_with_two_factor).not_to include(user_without_2fa.id)
+      end
+    end
+
+    describe ".without_two_factor" do
+      it "excludes users with 2fa enabled via OTP" do
+        user_with_2fa = create(:user, :two_factor_via_otp)
+        user_without_2fa = create(:user)
+        users_without_two_factor = User.without_two_factor.pluck(:id)
+
+        expect(users_without_two_factor).to include(user_without_2fa.id)
+        expect(users_without_two_factor).not_to include(user_with_2fa.id)
+      end
+
+      it "excludes users with 2fa enabled via U2F" do
+        user_with_2fa = create(:user, :two_factor_via_u2f)
+        user_without_2fa = create(:user)
+        users_without_two_factor = User.without_two_factor.pluck(:id)
+
+        expect(users_without_two_factor).to include(user_without_2fa.id)
+        expect(users_without_two_factor).not_to include(user_with_2fa.id)
+      end
+
+      it "excludes users with 2fa enabled via OTP and U2F" do
+        user_with_2fa = create(:user, :two_factor_via_otp, :two_factor_via_u2f)
+        user_without_2fa = create(:user)
+        users_without_two_factor = User.without_two_factor.pluck(:id)
+
+        expect(users_without_two_factor).to include(user_without_2fa.id)
+        expect(users_without_two_factor).not_to include(user_with_2fa.id)
+      end
+    end
+  end
+
   describe "Respond to" do
     it { is_expected.to respond_to(:is_admin?) }
     it { is_expected.to respond_to(:name) }

From e5823f3609136dafdee05204cd17436e09985177 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:09:58 +0530
Subject: [PATCH 1130/1431] Update the `browser` gem.

- Need the `mobile?` detection (that the new version provides) for the
  U2F registration/ authentication flow
---
 Gemfile                             | 2 +-
 Gemfile.lock                        | 6 +++---
 app/views/help/_shortcuts.html.haml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1e7c7869cba..38ff536fd71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ gem 'attr_encrypted', '~> 3.0.0'
 gem 'u2f', '~> 0.2.1'
 
 # Browser detection
-gem "browser", '~> 1.0.0'
+gem "browser", '~> 2.0.3'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
diff --git a/Gemfile.lock b/Gemfile.lock
index bdf7ab97746..5f1dbd431e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
       sass (~> 3.0)
       slim (>= 1.3.6, < 4.0)
       terminal-table (~> 1.4)
-    browser (1.0.1)
+    browser (2.0.3)
     builder (3.2.2)
     bullet (5.0.0)
       activesupport (>= 3.0.0)
@@ -815,7 +815,7 @@ DEPENDENCIES
   binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.3.0)
   brakeman (~> 3.2.0)
-  browser (~> 1.0.0)
+  browser (~> 2.0.3)
   bullet
   bundler-audit
   byebug
@@ -977,4 +977,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.12.4
+   1.12.5
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 70e88da7aae..01648047ce2 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -24,7 +24,7 @@
                 %td Show/hide this dialog
               %tr
                 %td.shortcut
-                  - if browser.mac?
+                  - if browser.platform.mac?
                     .key &#8984; shift p
                   - else
                     .key ctrl shift p

From 1f713d52d71cc283cb2190cfcdf38155a6fdfeac Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:12:39 +0530
Subject: [PATCH 1131/1431] Render `gon` data in the page `body`, not `head`

- Turbolinks caches the `head`, so `gon` updates don't show up unless
  the user navigates to page directly (by URL) or performs a refresh.
- The solution is to render `gon` in the body instead.
- Also update the syntax to the new Rails 4 (according to the gon
  README) syntax.
---
 app/views/layouts/_head.html.haml        | 2 --
 app/views/layouts/application.html.haml  | 2 ++
 app/views/layouts/devise.html.haml       | 1 +
 app/views/layouts/devise_empty.html.haml | 1 +
 app/views/layouts/errors.html.haml       | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index b30fb0a5da9..e0ed657919e 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -35,8 +35,6 @@
 
   = csrf_meta_tags
 
-  = include_gon
-
   - unless browser.safari?
     %meta{name: 'referrer', content: 'origin-when-cross-origin'}
   %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e4d1c773d03..2b86b289bbe 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,6 +2,8 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body{class: "#{user_application_theme}", 'data-page' => body_data_page}
+    = Gon::Base.render_data
+
     -# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body.
     = yield :scripts_body_top
 
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index f08cb0a5428..3d28eec84ef 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -2,6 +2,7 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body.ui_charcoal.login-page.application.navless
+    = Gon::Base.render_data
     = render "layouts/header/empty"
     = render "layouts/broadcast"
     .container.navless-container
diff --git a/app/views/layouts/devise_empty.html.haml b/app/views/layouts/devise_empty.html.haml
index 7c061dd531f..6bd427b02ac 100644
--- a/app/views/layouts/devise_empty.html.haml
+++ b/app/views/layouts/devise_empty.html.haml
@@ -2,6 +2,7 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body.ui_charcoal.login-page.application.navless
+    = Gon::Base.render_data
     = render "layouts/header/empty"
     = render "layouts/broadcast"
     .container.navless-container
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index 915acc4612e..7fbe065df00 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -2,6 +2,7 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body{class: "#{user_application_theme} application navless"}
+    = Gon::Base.render_data
     = render "layouts/header/empty"
     .container.navless-container
       = render "layouts/flash"

From 128549f10beb406333fa23c1693750c06ff7bc4a Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:14:51 +0530
Subject: [PATCH 1132/1431] Implement U2F registration.

- Move the `TwoFactorAuthsController`'s `new` action to `show`, since
  the page is not used to create a single "two factor auth" anymore. We
  can have a single 2FA authenticator app, along with any number of U2F
  devices, in any combination, so the page will be accessed after the
  first "two factor auth" is created.
- Add the `u2f` javascript library, which provides an API to the
  browser's U2F implementation.
- Add tests for the JS components
---
 app/assets/javascripts/application.js.coffee  |   2 +
 app/assets/javascripts/u2f/error.js.coffee    |  13 +
 app/assets/javascripts/u2f/register.js.coffee |  63 ++
 app/assets/javascripts/u2f/util.js.coffee.erb |  15 +
 app/controllers/application_controller.rb     |  11 +
 .../profiles/two_factor_auths_controller.rb   |  45 +-
 app/views/profiles/accounts/show.html.haml    |  25 +-
 .../profiles/two_factor_auths/new.html.haml   |  39 -
 .../profiles/two_factor_auths/show.html.haml  |  69 ++
 app/views/u2f/_register.html.haml             |  31 +
 config/routes.rb                              |   3 +-
 .../two_factor_auths_controller_spec.rb       |  14 +-
 .../fixtures/u2f/register.html.haml           |   1 +
 .../javascripts/u2f/mock_u2f_device.js.coffee |  15 +
 spec/javascripts/u2f/register_spec.js.coffee  |  57 ++
 vendor/assets/javascripts/u2f.js              | 748 ++++++++++++++++++
 16 files changed, 1086 insertions(+), 65 deletions(-)
 create mode 100644 app/assets/javascripts/u2f/error.js.coffee
 create mode 100644 app/assets/javascripts/u2f/register.js.coffee
 create mode 100644 app/assets/javascripts/u2f/util.js.coffee.erb
 delete mode 100644 app/views/profiles/two_factor_auths/new.html.haml
 create mode 100644 app/views/profiles/two_factor_auths/show.html.haml
 create mode 100644 app/views/u2f/_register.html.haml
 create mode 100644 spec/javascripts/fixtures/u2f/register.html.haml
 create mode 100644 spec/javascripts/u2f/mock_u2f_device.js.coffee
 create mode 100644 spec/javascripts/u2f/register_spec.js.coffee
 create mode 100644 vendor/assets/javascripts/u2f.js

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 18c1aa0d4e2..a76b111bf03 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -56,9 +56,11 @@
 #= require_directory ./commit
 #= require_directory ./extensions
 #= require_directory ./lib
+#= require_directory ./u2f
 #= require_directory .
 #= require fuzzaldrin-plus
 #= require cropper
+#= require u2f
 
 window.slugify = (text) ->
   text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
diff --git a/app/assets/javascripts/u2f/error.js.coffee b/app/assets/javascripts/u2f/error.js.coffee
new file mode 100644
index 00000000000..1a2fc3e757f
--- /dev/null
+++ b/app/assets/javascripts/u2f/error.js.coffee
@@ -0,0 +1,13 @@
+class @U2FError
+  constructor: (@errorCode) ->
+    @httpsDisabled = (window.location.protocol isnt 'https:')
+    console.error("U2F Error Code: #{@errorCode}")
+
+  message: () =>
+    switch
+      when (@errorCode is u2f.ErrorCodes.BAD_REQUEST and @httpsDisabled)
+        "U2F only works with HTTPS-enabled websites. Contact your administrator for more details."
+      when @errorCode is u2f.ErrorCodes.DEVICE_INELIGIBLE
+        "This device has already been registered with us."
+      else
+        "There was a problem communicating with your device."
diff --git a/app/assets/javascripts/u2f/register.js.coffee b/app/assets/javascripts/u2f/register.js.coffee
new file mode 100644
index 00000000000..74472cfa120
--- /dev/null
+++ b/app/assets/javascripts/u2f/register.js.coffee
@@ -0,0 +1,63 @@
+# Register U2F (universal 2nd factor) devices for users to authenticate with.
+#
+# State Flow #1: setup -> in_progress -> registered -> POST to server
+# State Flow #2: setup -> in_progress -> error -> setup
+
+class @U2FRegister
+  constructor: (@container, u2fParams) ->
+    @appId = u2fParams.app_id
+    @registerRequests = u2fParams.register_requests
+    @signRequests = u2fParams.sign_requests
+
+  start: () =>
+    if U2FUtil.isU2FSupported()
+      @renderSetup()
+    else
+      @renderNotSupported()
+
+  register: () =>
+    u2f.register(@appId, @registerRequests, @signRequests, (response) =>
+      if response.errorCode
+        error = new U2FError(response.errorCode)
+        @renderError(error);
+      else
+        @renderRegistered(JSON.stringify(response))
+    , 10)
+
+  #############
+  # Rendering #
+  #############
+
+  templates: {
+    "notSupported": "#js-register-u2f-not-supported",
+    "setup": '#js-register-u2f-setup',
+    "inProgress": '#js-register-u2f-in-progress',
+    "error": '#js-register-u2f-error',
+    "registered": '#js-register-u2f-registered'
+  }
+
+  renderTemplate: (name, params) =>
+    templateString = $(@templates[name]).html()
+    template = _.template(templateString)
+    @container.html(template(params))
+
+  renderSetup: () =>
+    @renderTemplate('setup')
+    @container.find('#js-setup-u2f-device').on('click', @renderInProgress)
+
+  renderInProgress: () =>
+    @renderTemplate('inProgress')
+    @register()
+
+  renderError: (error) =>
+    @renderTemplate('error', {error_message: error.message()})
+    @container.find('#js-u2f-try-again').on('click', @renderSetup)
+
+  renderRegistered: (deviceResponse) =>
+    @renderTemplate('registered')
+    # Prefer to do this instead of interpolating using Underscore templates
+    # because of JSON escaping issues.
+    @container.find("#js-device-response").val(deviceResponse)
+
+  renderNotSupported: () =>
+    @renderTemplate('notSupported')
diff --git a/app/assets/javascripts/u2f/util.js.coffee.erb b/app/assets/javascripts/u2f/util.js.coffee.erb
new file mode 100644
index 00000000000..d59341c38b9
--- /dev/null
+++ b/app/assets/javascripts/u2f/util.js.coffee.erb
@@ -0,0 +1,15 @@
+# Helper class for U2F (universal 2nd factor) device registration and authentication.
+
+class @U2FUtil
+  @isU2FSupported: ->
+    if @testMode
+      true
+    else
+      gon.u2f.browser_supports_u2f
+
+  @enableTestMode: ->
+    @testMode = true
+
+<% if Rails.env.test? %>
+U2FUtil.enableTestMode();
+<% end %>
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e73b2d08551..62f63701799 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -342,6 +342,10 @@ class ApplicationController < ActionController::Base
     session[:skip_tfa] && session[:skip_tfa] > Time.current
   end
 
+  def browser_supports_u2f?
+    browser.chrome? && browser.version.to_i >= 41 && !browser.device.mobile?
+  end
+
   def redirect_to_home_page_url?
     # If user is not signed-in and tries to access root_path - redirect him to landing page
     # Don't redirect to the default URL to prevent endless redirections
@@ -355,6 +359,13 @@ class ApplicationController < ActionController::Base
     current_user.nil? && root_path == request.path
   end
 
+  # U2F (universal 2nd factor) devices need a unique identifier for the application
+  # to perform authentication.
+  # https://developers.yubico.com/U2F/App_ID.html
+  def u2f_app_id
+    request.base_url
+  end
+
   private
 
   def set_default_sort
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index 8f83fdd02bc..6a358fdcc05 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -1,7 +1,7 @@
 class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
   skip_before_action :check_2fa_requirement
 
-  def new
+  def show
     unless current_user.otp_secret
       current_user.otp_secret = User.generate_otp_secret(32)
     end
@@ -12,21 +12,22 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
     current_user.save! if current_user.changed?
 
-    if two_factor_authentication_required?
+    if two_factor_authentication_required? && !current_user.two_factor_enabled?
       if two_factor_grace_period_expired?
-        flash.now[:alert] = 'You must enable Two-factor Authentication for your account.'
+        flash.now[:alert] = 'You must enable Two-Factor Authentication for your account.'
       else
         grace_period_deadline = current_user.otp_grace_period_started_at + two_factor_grace_period.hours
-        flash.now[:alert] = "You must enable Two-factor Authentication for your account before #{l(grace_period_deadline)}."
+        flash.now[:alert] = "You must enable Two-Factor Authentication for your account before #{l(grace_period_deadline)}."
       end
     end
 
     @qr_code = build_qr_code
+    setup_u2f_registration
   end
 
   def create
     if current_user.validate_and_consume_otp!(params[:pin_code])
-      current_user.two_factor_enabled = true
+      current_user.otp_required_for_login = true
       @codes = current_user.generate_otp_backup_codes!
       current_user.save!
 
@@ -34,8 +35,23 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
     else
       @error = 'Invalid pin code'
       @qr_code = build_qr_code
+      setup_u2f_registration
+      render 'show'
+    end
+  end
 
-      render 'new'
+  # A U2F (universal 2nd factor) device's information is stored after successful
+  # registration, which is then used while 2FA authentication is taking place.
+  def create_u2f
+    @u2f_registration = U2fRegistration.register(current_user, u2f_app_id, params[:device_response], session[:challenges])
+
+    if @u2f_registration.persisted?
+      session.delete(:challenges)
+      redirect_to profile_account_path, notice: "Your U2F device was registered!"
+    else
+      @qr_code = build_qr_code
+      setup_u2f_registration
+      render :show
     end
   end
 
@@ -70,4 +86,21 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
   def issuer_host
     Gitlab.config.gitlab.host
   end
+
+  # Setup in preparation of communication with a U2F (universal 2nd factor) device
+  # Actual communication is performed using a Javascript API
+  def setup_u2f_registration
+    @u2f_registration ||= U2fRegistration.new
+    @registration_key_handles = current_user.u2f_registrations.pluck(:key_handle)
+    u2f = U2F::U2F.new(u2f_app_id)
+
+    registration_requests = u2f.registration_requests
+    sign_requests = u2f.authentication_requests(@registration_key_handles)
+    session[:challenges] = registration_requests.map(&:challenge)
+
+    gon.push(u2f: { challenges: session[:challenges], app_id: u2f_app_id,
+                    register_requests: registration_requests,
+                    sign_requests: sign_requests,
+                    browser_supports_u2f: browser_supports_u2f? })
+  end
 end
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index 01ac8161945..3d2a245ecbd 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -11,7 +11,7 @@
     %p
       Your private token is used to access application resources without authentication.
   .col-lg-9
-    = form_for @user, url: reset_private_token_profile_path, method: :put, html: {class: "private-token"} do |f|
+    = form_for @user, url: reset_private_token_profile_path, method: :put, html: { class: "private-token" } do |f|
       %p.cgray
         - if current_user.private_token
           = label_tag "token", "Private token", class: "label-light"
@@ -29,21 +29,22 @@
 .row.prepend-top-default
   .col-lg-3.profile-settings-sidebar
     %h4.prepend-top-0
-      Two-factor Authentication
+      Two-Factor Authentication
     %p
-      Increase your account's security by enabling two-factor authentication (2FA).
+      Increase your account's security by enabling Two-Factor Authentication (2FA).
   .col-lg-9
     %p
-      Status: #{current_user.two_factor_enabled? ? 'enabled' : 'disabled'}
-    - if !current_user.two_factor_enabled?
-      %p
-        Download the Google Authenticator application from App Store for iOS or Google Play for Android and scan this code.
-        More information is available in the #{link_to('documentation', help_page_path('profile', 'two_factor_authentication'))}.
-      .append-bottom-10
-        = link_to 'Enable two-factor authentication', new_profile_two_factor_auth_path, class: 'btn btn-success'
+      Status: #{current_user.two_factor_enabled? ? 'Enabled' : 'Disabled'}
+    - if current_user.two_factor_enabled?
+      = link_to 'Manage Two-Factor Authentication', profile_two_factor_auth_path, class: 'btn btn-info'
+      = link_to 'Disable', profile_two_factor_auth_path,
+                method: :delete,
+                data: { confirm: "Are you sure? This will invalidate your registered applications and U2F devices." },
+                class: 'btn btn-danger'
     - else
-      = link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-danger',
-              data: { confirm: 'Are you sure?' }
+      .append-bottom-10
+        = link_to 'Enable Two-Factor Authentication', profile_two_factor_auth_path, class: 'btn btn-success'
+
 %hr
 - if button_based_providers.any?
   .row.prepend-top-default
diff --git a/app/views/profiles/two_factor_auths/new.html.haml b/app/views/profiles/two_factor_auths/new.html.haml
deleted file mode 100644
index 69fc81cb45c..00000000000
--- a/app/views/profiles/two_factor_auths/new.html.haml
+++ /dev/null
@@ -1,39 +0,0 @@
-- page_title 'Two-factor Authentication', 'Account'
-
-.row.prepend-top-default
-  .col-lg-3
-    %h4.prepend-top-0
-      Two-factor Authentication (2FA)
-    %p
-      Increase your account's security by enabling two-factor authentication (2FA).
-  .col-lg-9
-    %p
-      Download the Google Authenticator application from App Store for iOS or Google Play for Android and scan this code.
-      More information is available in the #{link_to('documentation', help_page_path('profile', 'two_factor_authentication'))}.
-    .row.append-bottom-10
-      .col-md-3
-        = raw @qr_code
-      .col-md-9
-        .account-well
-          %p.prepend-top-0.append-bottom-0
-            Can't scan the code?
-          %p.prepend-top-0.append-bottom-0
-            To add the entry manually, provide the following details to the application on your phone.
-          %p.prepend-top-0.append-bottom-0
-            Account:
-            = current_user.email
-          %p.prepend-top-0.append-bottom-0
-            Key:
-            = current_user.otp_secret.scan(/.{4}/).join(' ')
-          %p.two-factor-new-manual-content
-            Time based: Yes
-    = form_tag profile_two_factor_auth_path, method: :post do |f|
-      - if @error
-        .alert.alert-danger
-          = @error
-      .form-group
-        = label_tag :pin_code, nil, class: "label-light"
-        = text_field_tag :pin_code, nil, class: "form-control", required: true
-      .prepend-top-default
-        = submit_tag 'Enable two-factor authentication', class: 'btn btn-success'
-        = link_to 'Configure it later', skip_profile_two_factor_auth_path, :method => :patch,  class: 'btn btn-cancel' if two_factor_skippable?
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
new file mode 100644
index 00000000000..ce76cb73c9c
--- /dev/null
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -0,0 +1,69 @@
+- page_title 'Two-Factor Authentication', 'Account'
+- header_title "Two-Factor Authentication", profile_two_factor_auth_path
+
+.row.prepend-top-default
+  .col-lg-3
+    %h4.prepend-top-0
+      Register Two-Factor Authentication App
+    %p
+      Use an app on your mobile device to enable two-factor authentication (2FA).
+  .col-lg-9
+    - if current_user.two_factor_otp_enabled?
+      = icon "check inverse", base: "circle", class: "text-success", text: "You've already enabled two-factor authentication using mobile authenticator applications. You can disable it from your account settings page."
+    - else
+      %p
+        Download the Google Authenticator application from App Store or Google Play Store and scan this code.
+        More information is available in the #{link_to('documentation', help_page_path('profile', 'two_factor_authentication'))}.
+      .row.append-bottom-10
+        .col-md-3
+          = raw @qr_code
+        .col-md-9
+          .account-well
+            %p.prepend-top-0.append-bottom-0
+              Can't scan the code?
+            %p.prepend-top-0.append-bottom-0
+              To add the entry manually, provide the following details to the application on your phone.
+            %p.prepend-top-0.append-bottom-0
+              Account:
+              = current_user.email
+            %p.prepend-top-0.append-bottom-0
+              Key:
+              = current_user.otp_secret.scan(/.{4}/).join(' ')
+            %p.two-factor-new-manual-content
+              Time based: Yes
+      = form_tag profile_two_factor_auth_path, method: :post do |f|
+        - if @error
+          .alert.alert-danger
+            = @error
+        .form-group
+          = label_tag :pin_code, nil, class: "label-light"
+          = text_field_tag :pin_code, nil, class: "form-control", required: true
+        .prepend-top-default
+          = submit_tag 'Register with Two-Factor App', class: 'btn btn-success'
+
+%hr
+
+.row.prepend-top-default
+
+  .col-lg-3
+    %h4.prepend-top-0
+      Register Universal Two-Factor (U2F) Device
+    %p
+      Use a hardware device to add the second factor of authentication.
+    %p
+      As U2F devices are only supported by a few browsers, it's recommended that you set up a
+      two-factor authentication app as well as a U2F device so you'll always be able to log in
+      using an unsupported browser.
+  .col-lg-9
+    %p
+      - if @registration_key_handles.present?
+        = icon "check inverse", base: "circle", class: "text-success", text: "You have #{pluralize(@registration_key_handles.size, 'U2F device')} registered with GitLab."
+    - if @u2f_registration.errors.present?
+      = form_errors(@u2f_registration)
+    = render "u2f/register"
+
+- if two_factor_skippable?
+  :javascript
+    var button = "<a class='btn btn-xs btn-warning pull-right' data-method='patch' href='#{skip_profile_two_factor_auth_path}'>Configure it later</a>";
+    $(".flash-alert").append(button);
+
diff --git a/app/views/u2f/_register.html.haml b/app/views/u2f/_register.html.haml
new file mode 100644
index 00000000000..46af591fc43
--- /dev/null
+++ b/app/views/u2f/_register.html.haml
@@ -0,0 +1,31 @@
+#js-register-u2f
+
+%script#js-register-u2f-not-supported{ type: "text/template" }
+  %p Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).
+
+%script#js-register-u2f-setup{ type: "text/template" }
+  .row.append-bottom-10
+    .col-md-3
+      %a#js-setup-u2f-device.btn.btn-info{ href: 'javascript:void(0)' } Setup New U2F Device
+    .col-md-9
+      %p Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.
+
+%script#js-register-u2f-in-progress{ type: "text/template" }
+  %p Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.
+
+%script#js-register-u2f-error{ type: "text/template" }
+  %div
+    %p
+      %span <%= error_message %>
+    %a.btn.btn-warning#js-u2f-try-again Try again?
+
+%script#js-register-u2f-registered{ type: "text/template" }
+  %div.row.append-bottom-10
+    %p Your device was successfully set up! Click this button to register with the GitLab server.
+    = form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do
+      = hidden_field_tag :device_response, nil, class: 'form-control', required: true, id: "js-device-response"
+      = submit_tag "Register U2F Device", class: "btn btn-success"
+
+:javascript
+  var u2fRegister = new U2FRegister($("#js-register-u2f"), gon.u2f);
+  u2fRegister.start();
diff --git a/config/routes.rb b/config/routes.rb
index 1fc7985136b..27ab79d68f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -343,8 +343,9 @@ Rails.application.routes.draw do
       resources :keys
       resources :emails, only: [:index, :create, :destroy]
       resource :avatar, only: [:destroy]
-      resource :two_factor_auth, only: [:new, :create, :destroy] do
+      resource :two_factor_auth, only: [:show, :create, :destroy] do
         member do
+          post :create_u2f
           post :codes
           patch :skip
         end
diff --git a/spec/controllers/profiles/two_factor_auths_controller_spec.rb b/spec/controllers/profiles/two_factor_auths_controller_spec.rb
index 4fb1473c2d2..d08d0018b35 100644
--- a/spec/controllers/profiles/two_factor_auths_controller_spec.rb
+++ b/spec/controllers/profiles/two_factor_auths_controller_spec.rb
@@ -8,21 +8,21 @@ describe Profiles::TwoFactorAuthsController do
     allow(subject).to receive(:current_user).and_return(user)
   end
 
-  describe 'GET new' do
+  describe 'GET show' do
     let(:user) { create(:user) }
 
     it 'generates otp_secret for user' do
       expect(User).to receive(:generate_otp_secret).with(32).and_return('secret').once
 
-      get :new
-      get :new # Second hit shouldn't re-generate it
+      get :show
+      get :show # Second hit shouldn't re-generate it
     end
 
     it 'assigns qr_code' do
       code = double('qr code')
       expect(subject).to receive(:build_qr_code).and_return(code)
 
-      get :new
+      get :show
       expect(assigns[:qr_code]).to eq code
     end
   end
@@ -40,7 +40,7 @@ describe Profiles::TwoFactorAuthsController do
         expect(user).to receive(:validate_and_consume_otp!).with(pin).and_return(true)
       end
 
-      it 'sets two_factor_enabled' do
+      it 'enables 2fa for the user' do
         go
 
         user.reload
@@ -79,9 +79,9 @@ describe Profiles::TwoFactorAuthsController do
         expect(assigns[:qr_code]).to eq code
       end
 
-      it 'renders new' do
+      it 'renders show' do
         go
-        expect(response).to render_template(:new)
+        expect(response).to render_template(:show)
       end
     end
   end
diff --git a/spec/javascripts/fixtures/u2f/register.html.haml b/spec/javascripts/fixtures/u2f/register.html.haml
new file mode 100644
index 00000000000..393c0613fd3
--- /dev/null
+++ b/spec/javascripts/fixtures/u2f/register.html.haml
@@ -0,0 +1 @@
+= render partial: "u2f/register", locals: { create_u2f_profile_two_factor_auth_path: '/profile/two_factor_auth/create_u2f' }
diff --git a/spec/javascripts/u2f/mock_u2f_device.js.coffee b/spec/javascripts/u2f/mock_u2f_device.js.coffee
new file mode 100644
index 00000000000..97ed0e83a0e
--- /dev/null
+++ b/spec/javascripts/u2f/mock_u2f_device.js.coffee
@@ -0,0 +1,15 @@
+class @MockU2FDevice
+  constructor: () ->
+    window.u2f ||= {}
+
+    window.u2f.register = (appId, registerRequests, signRequests, callback) =>
+      @registerCallback = callback
+
+    window.u2f.sign = (appId, challenges, signRequests, callback) =>
+      @authenticateCallback = callback
+
+  respondToRegisterRequest: (params) =>
+    @registerCallback(params)
+
+  respondToAuthenticateRequest: (params) =>
+    @authenticateCallback(params)
diff --git a/spec/javascripts/u2f/register_spec.js.coffee b/spec/javascripts/u2f/register_spec.js.coffee
new file mode 100644
index 00000000000..0858abeca1a
--- /dev/null
+++ b/spec/javascripts/u2f/register_spec.js.coffee
@@ -0,0 +1,57 @@
+#= require u2f/register
+#= require u2f/util
+#= require u2f/error
+#= require u2f
+#= require ./mock_u2f_device
+
+describe 'U2FRegister', ->
+  U2FUtil.enableTestMode()
+  fixture.load('u2f/register')
+
+  beforeEach ->
+    @u2fDevice = new MockU2FDevice
+    @container = $("#js-register-u2f")
+    @component = new U2FRegister(@container, $("#js-register-u2f-templates"), {}, "token")
+    @component.start()
+
+  it 'allows registering a U2F device', ->
+    setupButton = @container.find("#js-setup-u2f-device")
+    expect(setupButton.text()).toBe('Setup New U2F Device')
+    setupButton.trigger('click')
+
+    inProgressMessage = @container.children("p")
+    expect(inProgressMessage.text()).toContain("Trying to communicate with your device")
+
+    @u2fDevice.respondToRegisterRequest({deviceData: "this is data from the device"})
+    registeredMessage = @container.find('p')
+    deviceResponse = @container.find('#js-device-response')
+    expect(registeredMessage.text()).toContain("Your device was successfully set up!")
+    expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}')
+
+  describe "errors", ->
+    it "doesn't allow the same device to be registered twice (for the same user", ->
+      setupButton = @container.find("#js-setup-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToRegisterRequest({errorCode: 4})
+      errorMessage = @container.find("p")
+      expect(errorMessage.text()).toContain("already been registered with us")
+
+    it "displays an error message for other errors", ->
+      setupButton = @container.find("#js-setup-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToRegisterRequest({errorCode: "error!"})
+      errorMessage = @container.find("p")
+      expect(errorMessage.text()).toContain("There was a problem communicating with your device")
+
+    it "allows retrying registration after an error", ->
+      setupButton = @container.find("#js-setup-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToRegisterRequest({errorCode: "error!"})
+      retryButton = @container.find("#U2FTryAgain")
+      retryButton.trigger('click')
+
+      setupButton = @container.find("#js-setup-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToRegisterRequest({deviceData: "this is data from the device"})
+      registeredMessage = @container.find("p")
+      expect(registeredMessage.text()).toContain("Your device was successfully set up!")
diff --git a/vendor/assets/javascripts/u2f.js b/vendor/assets/javascripts/u2f.js
new file mode 100644
index 00000000000..e666b136051
--- /dev/null
+++ b/vendor/assets/javascripts/u2f.js
@@ -0,0 +1,748 @@
+//Copyright 2014-2015 Google Inc. All rights reserved.
+
+//Use of this source code is governed by a BSD-style
+//license that can be found in the LICENSE file or at
+//https://developers.google.com/open-source/licenses/bsd
+
+/**
+ * @fileoverview The U2F api.
+ */
+'use strict';
+
+
+/**
+ * Namespace for the U2F api.
+ * @type {Object}
+ */
+var u2f = u2f || {};
+
+/**
+ * FIDO U2F Javascript API Version
+ * @number
+ */
+var js_api_version;
+
+/**
+ * The U2F extension id
+ * @const {string}
+ */
+// The Chrome packaged app extension ID.
+// Uncomment this if you want to deploy a server instance that uses
+// the package Chrome app and does not require installing the U2F Chrome extension.
+u2f.EXTENSION_ID = 'kmendfapggjehodndflmmgagdbamhnfd';
+// The U2F Chrome extension ID.
+// Uncomment this if you want to deploy a server instance that uses
+// the U2F Chrome extension to authenticate.
+// u2f.EXTENSION_ID = 'pfboblefjcgdjicmnffhdgionmgcdmne';
+
+
+/**
+ * Message types for messsages to/from the extension
+ * @const
+ * @enum {string}
+ */
+u2f.MessageTypes = {
+    'U2F_REGISTER_REQUEST': 'u2f_register_request',
+    'U2F_REGISTER_RESPONSE': 'u2f_register_response',
+    'U2F_SIGN_REQUEST': 'u2f_sign_request',
+    'U2F_SIGN_RESPONSE': 'u2f_sign_response',
+    'U2F_GET_API_VERSION_REQUEST': 'u2f_get_api_version_request',
+    'U2F_GET_API_VERSION_RESPONSE': 'u2f_get_api_version_response'
+};
+
+
+/**
+ * Response status codes
+ * @const
+ * @enum {number}
+ */
+u2f.ErrorCodes = {
+    'OK': 0,
+    'OTHER_ERROR': 1,
+    'BAD_REQUEST': 2,
+    'CONFIGURATION_UNSUPPORTED': 3,
+    'DEVICE_INELIGIBLE': 4,
+    'TIMEOUT': 5
+};
+
+
+/**
+ * A message for registration requests
+ * @typedef {{
+ *   type: u2f.MessageTypes,
+ *   appId: ?string,
+ *   timeoutSeconds: ?number,
+ *   requestId: ?number
+ * }}
+ */
+u2f.U2fRequest;
+
+
+/**
+ * A message for registration responses
+ * @typedef {{
+ *   type: u2f.MessageTypes,
+ *   responseData: (u2f.Error | u2f.RegisterResponse | u2f.SignResponse),
+ *   requestId: ?number
+ * }}
+ */
+u2f.U2fResponse;
+
+
+/**
+ * An error object for responses
+ * @typedef {{
+ *   errorCode: u2f.ErrorCodes,
+ *   errorMessage: ?string
+ * }}
+ */
+u2f.Error;
+
+/**
+ * Data object for a single sign request.
+ * @typedef {enum {BLUETOOTH_RADIO, BLUETOOTH_LOW_ENERGY, USB, NFC}}
+ */
+u2f.Transport;
+
+
+/**
+ * Data object for a single sign request.
+ * @typedef {Array<u2f.Transport>}
+ */
+u2f.Transports;
+
+/**
+ * Data object for a single sign request.
+ * @typedef {{
+ *   version: string,
+ *   challenge: string,
+ *   keyHandle: string,
+ *   appId: string
+ * }}
+ */
+u2f.SignRequest;
+
+
+/**
+ * Data object for a sign response.
+ * @typedef {{
+ *   keyHandle: string,
+ *   signatureData: string,
+ *   clientData: string
+ * }}
+ */
+u2f.SignResponse;
+
+
+/**
+ * Data object for a registration request.
+ * @typedef {{
+ *   version: string,
+ *   challenge: string
+ * }}
+ */
+u2f.RegisterRequest;
+
+
+/**
+ * Data object for a registration response.
+ * @typedef {{
+ *   version: string,
+ *   keyHandle: string,
+ *   transports: Transports,
+ *   appId: string
+ * }}
+ */
+u2f.RegisterResponse;
+
+
+/**
+ * Data object for a registered key.
+ * @typedef {{
+ *   version: string,
+ *   keyHandle: string,
+ *   transports: ?Transports,
+ *   appId: ?string
+ * }}
+ */
+u2f.RegisteredKey;
+
+
+/**
+ * Data object for a get API register response.
+ * @typedef {{
+ *   js_api_version: number
+ * }}
+ */
+u2f.GetJsApiVersionResponse;
+
+
+//Low level MessagePort API support
+
+/**
+ * Sets up a MessagePort to the U2F extension using the
+ * available mechanisms.
+ * @param {function((MessagePort|u2f.WrappedChromeRuntimePort_))} callback
+ */
+u2f.getMessagePort = function(callback) {
+    if (typeof chrome != 'undefined' && chrome.runtime) {
+        // The actual message here does not matter, but we need to get a reply
+        // for the callback to run. Thus, send an empty signature request
+        // in order to get a failure response.
+        var msg = {
+            type: u2f.MessageTypes.U2F_SIGN_REQUEST,
+            signRequests: []
+        };
+        chrome.runtime.sendMessage(u2f.EXTENSION_ID, msg, function() {
+            if (!chrome.runtime.lastError) {
+                // We are on a whitelisted origin and can talk directly
+                // with the extension.
+                u2f.getChromeRuntimePort_(callback);
+            } else {
+                // chrome.runtime was available, but we couldn't message
+                // the extension directly, use iframe
+                u2f.getIframePort_(callback);
+            }
+        });
+    } else if (u2f.isAndroidChrome_()) {
+        u2f.getAuthenticatorPort_(callback);
+    } else if (u2f.isIosChrome_()) {
+        u2f.getIosPort_(callback);
+    } else {
+        // chrome.runtime was not available at all, which is normal
+        // when this origin doesn't have access to any extensions.
+        u2f.getIframePort_(callback);
+    }
+};
+
+/**
+ * Detect chrome running on android based on the browser's useragent.
+ * @private
+ */
+u2f.isAndroidChrome_ = function() {
+    var userAgent = navigator.userAgent;
+    return userAgent.indexOf('Chrome') != -1 &&
+        userAgent.indexOf('Android') != -1;
+};
+
+/**
+ * Detect chrome running on iOS based on the browser's platform.
+ * @private
+ */
+u2f.isIosChrome_ = function() {
+    return $.inArray(navigator.platform, ["iPhone", "iPad", "iPod"]) > -1;
+};
+
+/**
+ * Connects directly to the extension via chrome.runtime.connect.
+ * @param {function(u2f.WrappedChromeRuntimePort_)} callback
+ * @private
+ */
+u2f.getChromeRuntimePort_ = function(callback) {
+    var port = chrome.runtime.connect(u2f.EXTENSION_ID,
+        {'includeTlsChannelId': true});
+    setTimeout(function() {
+        callback(new u2f.WrappedChromeRuntimePort_(port));
+    }, 0);
+};
+
+/**
+ * Return a 'port' abstraction to the Authenticator app.
+ * @param {function(u2f.WrappedAuthenticatorPort_)} callback
+ * @private
+ */
+u2f.getAuthenticatorPort_ = function(callback) {
+    setTimeout(function() {
+        callback(new u2f.WrappedAuthenticatorPort_());
+    }, 0);
+};
+
+/**
+ * Return a 'port' abstraction to the iOS client app.
+ * @param {function(u2f.WrappedIosPort_)} callback
+ * @private
+ */
+u2f.getIosPort_ = function(callback) {
+    setTimeout(function() {
+        callback(new u2f.WrappedIosPort_());
+    }, 0);
+};
+
+/**
+ * A wrapper for chrome.runtime.Port that is compatible with MessagePort.
+ * @param {Port} port
+ * @constructor
+ * @private
+ */
+u2f.WrappedChromeRuntimePort_ = function(port) {
+    this.port_ = port;
+};
+
+/**
+ * Format and return a sign request compliant with the JS API version supported by the extension.
+ * @param {Array<u2f.SignRequest>} signRequests
+ * @param {number} timeoutSeconds
+ * @param {number} reqId
+ * @return {Object}
+ */
+u2f.formatSignRequest_ =
+    function(appId, challenge, registeredKeys, timeoutSeconds, reqId) {
+        if (js_api_version === undefined || js_api_version < 1.1) {
+            // Adapt request to the 1.0 JS API
+            var signRequests = [];
+            for (var i = 0; i < registeredKeys.length; i++) {
+                signRequests[i] = {
+                    version: registeredKeys[i].version,
+                    challenge: challenge,
+                    keyHandle: registeredKeys[i].keyHandle,
+                    appId: appId
+                };
+            }
+            return {
+                type: u2f.MessageTypes.U2F_SIGN_REQUEST,
+                signRequests: signRequests,
+                timeoutSeconds: timeoutSeconds,
+                requestId: reqId
+            };
+        }
+        // JS 1.1 API
+        return {
+            type: u2f.MessageTypes.U2F_SIGN_REQUEST,
+            appId: appId,
+            challenge: challenge,
+            registeredKeys: registeredKeys,
+            timeoutSeconds: timeoutSeconds,
+            requestId: reqId
+        };
+    };
+
+/**
+ * Format and return a register request compliant with the JS API version supported by the extension..
+ * @param {Array<u2f.SignRequest>} signRequests
+ * @param {Array<u2f.RegisterRequest>} signRequests
+ * @param {number} timeoutSeconds
+ * @param {number} reqId
+ * @return {Object}
+ */
+u2f.formatRegisterRequest_ =
+    function(appId, registeredKeys, registerRequests, timeoutSeconds, reqId) {
+        if (js_api_version === undefined || js_api_version < 1.1) {
+            // Adapt request to the 1.0 JS API
+            for (var i = 0; i < registerRequests.length; i++) {
+                registerRequests[i].appId = appId;
+            }
+            var signRequests = [];
+            for (var i = 0; i < registeredKeys.length; i++) {
+                signRequests[i] = {
+                    version: registeredKeys[i].version,
+                    challenge: registerRequests[0],
+                    keyHandle: registeredKeys[i].keyHandle,
+                    appId: appId
+                };
+            }
+            return {
+                type: u2f.MessageTypes.U2F_REGISTER_REQUEST,
+                signRequests: signRequests,
+                registerRequests: registerRequests,
+                timeoutSeconds: timeoutSeconds,
+                requestId: reqId
+            };
+        }
+        // JS 1.1 API
+        return {
+            type: u2f.MessageTypes.U2F_REGISTER_REQUEST,
+            appId: appId,
+            registerRequests: registerRequests,
+            registeredKeys: registeredKeys,
+            timeoutSeconds: timeoutSeconds,
+            requestId: reqId
+        };
+    };
+
+
+/**
+ * Posts a message on the underlying channel.
+ * @param {Object} message
+ */
+u2f.WrappedChromeRuntimePort_.prototype.postMessage = function(message) {
+    this.port_.postMessage(message);
+};
+
+
+/**
+ * Emulates the HTML 5 addEventListener interface. Works only for the
+ * onmessage event, which is hooked up to the chrome.runtime.Port.onMessage.
+ * @param {string} eventName
+ * @param {function({data: Object})} handler
+ */
+u2f.WrappedChromeRuntimePort_.prototype.addEventListener =
+    function(eventName, handler) {
+        var name = eventName.toLowerCase();
+        if (name == 'message' || name == 'onmessage') {
+            this.port_.onMessage.addListener(function(message) {
+                // Emulate a minimal MessageEvent object
+                handler({'data': message});
+            });
+        } else {
+            console.error('WrappedChromeRuntimePort only supports onMessage');
+        }
+    };
+
+/**
+ * Wrap the Authenticator app with a MessagePort interface.
+ * @constructor
+ * @private
+ */
+u2f.WrappedAuthenticatorPort_ = function() {
+    this.requestId_ = -1;
+    this.requestObject_ = null;
+}
+
+/**
+ * Launch the Authenticator intent.
+ * @param {Object} message
+ */
+u2f.WrappedAuthenticatorPort_.prototype.postMessage = function(message) {
+    var intentUrl =
+        u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ +
+        ';S.request=' + encodeURIComponent(JSON.stringify(message)) +
+        ';end';
+    document.location = intentUrl;
+};
+
+/**
+ * Tells what type of port this is.
+ * @return {String} port type
+ */
+u2f.WrappedAuthenticatorPort_.prototype.getPortType = function() {
+    return "WrappedAuthenticatorPort_";
+};
+
+
+/**
+ * Emulates the HTML 5 addEventListener interface.
+ * @param {string} eventName
+ * @param {function({data: Object})} handler
+ */
+u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function(eventName, handler) {
+    var name = eventName.toLowerCase();
+    if (name == 'message') {
+        var self = this;
+        /* Register a callback to that executes when
+         * chrome injects the response. */
+        window.addEventListener(
+            'message', self.onRequestUpdate_.bind(self, handler), false);
+    } else {
+        console.error('WrappedAuthenticatorPort only supports message');
+    }
+};
+
+/**
+ * Callback invoked  when a response is received from the Authenticator.
+ * @param function({data: Object}) callback
+ * @param {Object} message message Object
+ */
+u2f.WrappedAuthenticatorPort_.prototype.onRequestUpdate_ =
+    function(callback, message) {
+        var messageObject = JSON.parse(message.data);
+        var intentUrl = messageObject['intentURL'];
+
+        var errorCode = messageObject['errorCode'];
+        var responseObject = null;
+        if (messageObject.hasOwnProperty('data')) {
+            responseObject = /** @type {Object} */ (
+                JSON.parse(messageObject['data']));
+        }
+
+        callback({'data': responseObject});
+    };
+
+/**
+ * Base URL for intents to Authenticator.
+ * @const
+ * @private
+ */
+u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ =
+    'intent:#Intent;action=com.google.android.apps.authenticator.AUTHENTICATE';
+
+/**
+ * Wrap the iOS client app with a MessagePort interface.
+ * @constructor
+ * @private
+ */
+u2f.WrappedIosPort_ = function() {};
+
+/**
+ * Launch the iOS client app request
+ * @param {Object} message
+ */
+u2f.WrappedIosPort_.prototype.postMessage = function(message) {
+    var str = JSON.stringify(message);
+    var url = "u2f://auth?" + encodeURI(str);
+    location.replace(url);
+};
+
+/**
+ * Tells what type of port this is.
+ * @return {String} port type
+ */
+u2f.WrappedIosPort_.prototype.getPortType = function() {
+    return "WrappedIosPort_";
+};
+
+/**
+ * Emulates the HTML 5 addEventListener interface.
+ * @param {string} eventName
+ * @param {function({data: Object})} handler
+ */
+u2f.WrappedIosPort_.prototype.addEventListener = function(eventName, handler) {
+    var name = eventName.toLowerCase();
+    if (name !== 'message') {
+        console.error('WrappedIosPort only supports message');
+    }
+};
+
+/**
+ * Sets up an embedded trampoline iframe, sourced from the extension.
+ * @param {function(MessagePort)} callback
+ * @private
+ */
+u2f.getIframePort_ = function(callback) {
+    // Create the iframe
+    var iframeOrigin = 'chrome-extension://' + u2f.EXTENSION_ID;
+    var iframe = document.createElement('iframe');
+    iframe.src = iframeOrigin + '/u2f-comms.html';
+    iframe.setAttribute('style', 'display:none');
+    document.body.appendChild(iframe);
+
+    var channel = new MessageChannel();
+    var ready = function(message) {
+        if (message.data == 'ready') {
+            channel.port1.removeEventListener('message', ready);
+            callback(channel.port1);
+        } else {
+            console.error('First event on iframe port was not "ready"');
+        }
+    };
+    channel.port1.addEventListener('message', ready);
+    channel.port1.start();
+
+    iframe.addEventListener('load', function() {
+        // Deliver the port to the iframe and initialize
+        iframe.contentWindow.postMessage('init', iframeOrigin, [channel.port2]);
+    });
+};
+
+
+//High-level JS API
+
+/**
+ * Default extension response timeout in seconds.
+ * @const
+ */
+u2f.EXTENSION_TIMEOUT_SEC = 30;
+
+/**
+ * A singleton instance for a MessagePort to the extension.
+ * @type {MessagePort|u2f.WrappedChromeRuntimePort_}
+ * @private
+ */
+u2f.port_ = null;
+
+/**
+ * Callbacks waiting for a port
+ * @type {Array<function((MessagePort|u2f.WrappedChromeRuntimePort_))>}
+ * @private
+ */
+u2f.waitingForPort_ = [];
+
+/**
+ * A counter for requestIds.
+ * @type {number}
+ * @private
+ */
+u2f.reqCounter_ = 0;
+
+/**
+ * A map from requestIds to client callbacks
+ * @type {Object.<number,(function((u2f.Error|u2f.RegisterResponse))
+ *                       |function((u2f.Error|u2f.SignResponse)))>}
+ * @private
+ */
+u2f.callbackMap_ = {};
+
+/**
+ * Creates or retrieves the MessagePort singleton to use.
+ * @param {function((MessagePort|u2f.WrappedChromeRuntimePort_))} callback
+ * @private
+ */
+u2f.getPortSingleton_ = function(callback) {
+    if (u2f.port_) {
+        callback(u2f.port_);
+    } else {
+        if (u2f.waitingForPort_.length == 0) {
+            u2f.getMessagePort(function(port) {
+                u2f.port_ = port;
+                u2f.port_.addEventListener('message',
+                    /** @type {function(Event)} */ (u2f.responseHandler_));
+
+                // Careful, here be async callbacks. Maybe.
+                while (u2f.waitingForPort_.length)
+                    u2f.waitingForPort_.shift()(u2f.port_);
+            });
+        }
+        u2f.waitingForPort_.push(callback);
+    }
+};
+
+/**
+ * Handles response messages from the extension.
+ * @param {MessageEvent.<u2f.Response>} message
+ * @private
+ */
+u2f.responseHandler_ = function(message) {
+    var response = message.data;
+    var reqId = response['requestId'];
+    if (!reqId || !u2f.callbackMap_[reqId]) {
+        console.error('Unknown or missing requestId in response.');
+        return;
+    }
+    var cb = u2f.callbackMap_[reqId];
+    delete u2f.callbackMap_[reqId];
+    cb(response['responseData']);
+};
+
+/**
+ * Dispatches an array of sign requests to available U2F tokens.
+ * If the JS API version supported by the extension is unknown, it first sends a
+ * message to the extension to find out the supported API version and then it sends
+ * the sign request.
+ * @param {string=} appId
+ * @param {string=} challenge
+ * @param {Array<u2f.RegisteredKey>} registeredKeys
+ * @param {function((u2f.Error|u2f.SignResponse))} callback
+ * @param {number=} opt_timeoutSeconds
+ */
+u2f.sign = function(appId, challenge, registeredKeys, callback, opt_timeoutSeconds) {
+    if (js_api_version === undefined) {
+        // Send a message to get the extension to JS API version, then send the actual sign request.
+        u2f.getApiVersion(
+            function (response) {
+                js_api_version = response['js_api_version'] === undefined ? 0 : response['js_api_version'];
+                console.log("Extension JS API Version: ", js_api_version);
+                u2f.sendSignRequest(appId, challenge, registeredKeys, callback, opt_timeoutSeconds);
+            });
+    } else {
+        // We know the JS API version. Send the actual sign request in the supported API version.
+        u2f.sendSignRequest(appId, challenge, registeredKeys, callback, opt_timeoutSeconds);
+    }
+};
+
+/**
+ * Dispatches an array of sign requests to available U2F tokens.
+ * @param {string=} appId
+ * @param {string=} challenge
+ * @param {Array<u2f.RegisteredKey>} registeredKeys
+ * @param {function((u2f.Error|u2f.SignResponse))} callback
+ * @param {number=} opt_timeoutSeconds
+ */
+u2f.sendSignRequest = function(appId, challenge, registeredKeys, callback, opt_timeoutSeconds) {
+    u2f.getPortSingleton_(function(port) {
+        var reqId = ++u2f.reqCounter_;
+        u2f.callbackMap_[reqId] = callback;
+        var timeoutSeconds = (typeof opt_timeoutSeconds !== 'undefined' ?
+            opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC);
+        var req = u2f.formatSignRequest_(appId, challenge, registeredKeys, timeoutSeconds, reqId);
+        port.postMessage(req);
+    });
+};
+
+/**
+ * Dispatches register requests to available U2F tokens. An array of sign
+ * requests identifies already registered tokens.
+ * If the JS API version supported by the extension is unknown, it first sends a
+ * message to the extension to find out the supported API version and then it sends
+ * the register request.
+ * @param {string=} appId
+ * @param {Array<u2f.RegisterRequest>} registerRequests
+ * @param {Array<u2f.RegisteredKey>} registeredKeys
+ * @param {function((u2f.Error|u2f.RegisterResponse))} callback
+ * @param {number=} opt_timeoutSeconds
+ */
+u2f.register = function(appId, registerRequests, registeredKeys, callback, opt_timeoutSeconds) {
+    if (js_api_version === undefined) {
+        // Send a message to get the extension to JS API version, then send the actual register request.
+        u2f.getApiVersion(
+            function (response) {
+                js_api_version = response['js_api_version'] === undefined ? 0: response['js_api_version'];
+                console.log("Extension JS API Version: ", js_api_version);
+                u2f.sendRegisterRequest(appId, registerRequests, registeredKeys,
+                    callback, opt_timeoutSeconds);
+            });
+    } else {
+        // We know the JS API version. Send the actual register request in the supported API version.
+        u2f.sendRegisterRequest(appId, registerRequests, registeredKeys,
+            callback, opt_timeoutSeconds);
+    }
+};
+
+/**
+ * Dispatches register requests to available U2F tokens. An array of sign
+ * requests identifies already registered tokens.
+ * @param {string=} appId
+ * @param {Array<u2f.RegisterRequest>} registerRequests
+ * @param {Array<u2f.RegisteredKey>} registeredKeys
+ * @param {function((u2f.Error|u2f.RegisterResponse))} callback
+ * @param {number=} opt_timeoutSeconds
+ */
+u2f.sendRegisterRequest = function(appId, registerRequests, registeredKeys, callback, opt_timeoutSeconds) {
+    u2f.getPortSingleton_(function(port) {
+        var reqId = ++u2f.reqCounter_;
+        u2f.callbackMap_[reqId] = callback;
+        var timeoutSeconds = (typeof opt_timeoutSeconds !== 'undefined' ?
+            opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC);
+        var req = u2f.formatRegisterRequest_(
+            appId, registeredKeys, registerRequests, timeoutSeconds, reqId);
+        port.postMessage(req);
+    });
+};
+
+
+/**
+ * Dispatches a message to the extension to find out the supported
+ * JS API version.
+ * If the user is on a mobile phone and is thus using Google Authenticator instead
+ * of the Chrome extension, don't send the request and simply return 0.
+ * @param {function((u2f.Error|u2f.GetJsApiVersionResponse))} callback
+ * @param {number=} opt_timeoutSeconds
+ */
+u2f.getApiVersion = function(callback, opt_timeoutSeconds) {
+    u2f.getPortSingleton_(function(port) {
+        // If we are using Android Google Authenticator or iOS client app,
+        // do not fire an intent to ask which JS API version to use.
+        if (port.getPortType) {
+            var apiVersion;
+            switch (port.getPortType()) {
+                case 'WrappedIosPort_':
+                case 'WrappedAuthenticatorPort_':
+                    apiVersion = 1.1;
+                    break;
+
+                default:
+                    apiVersion = 0;
+                    break;
+            }
+            callback({ 'js_api_version': apiVersion });
+            return;
+        }
+        var reqId = ++u2f.reqCounter_;
+        u2f.callbackMap_[reqId] = callback;
+        var req = {
+            type: u2f.MessageTypes.U2F_GET_API_VERSION_REQUEST,
+            timeoutSeconds: (typeof opt_timeoutSeconds !== 'undefined' ?
+                opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC),
+            requestId: reqId
+        };
+        port.postMessage(req);
+    });
+};
\ No newline at end of file

From 86b07caa599a7f064e9077770b1a87c670d7607c Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:20:39 +0530
Subject: [PATCH 1133/1431] Implement authentication (login) using a U2F
 device.

- Move the `authenticate_with_two_factor` method from
  `ApplicationController` to the `AuthenticatesWithTwoFactor` module,
  where it should be.
---
 .../javascripts/u2f/authenticate.js.coffee    | 63 +++++++++++++++++++
 .../concerns/authenticates_with_two_factor.rb | 59 ++++++++++++++++-
 app/controllers/sessions_controller.rb        | 23 +------
 .../devise/sessions/two_factor.html.haml      | 21 ++++---
 app/views/u2f/_authenticate.html.haml         | 28 +++++++++
 spec/features/login_spec.rb                   | 26 ++++----
 .../fixtures/u2f/authenticate.html.haml       |  1 +
 spec/javascripts/u2f/authenticate_spec.coffee | 52 +++++++++++++++
 8 files changed, 230 insertions(+), 43 deletions(-)
 create mode 100644 app/assets/javascripts/u2f/authenticate.js.coffee
 create mode 100644 app/views/u2f/_authenticate.html.haml
 create mode 100644 spec/javascripts/fixtures/u2f/authenticate.html.haml
 create mode 100644 spec/javascripts/u2f/authenticate_spec.coffee

diff --git a/app/assets/javascripts/u2f/authenticate.js.coffee b/app/assets/javascripts/u2f/authenticate.js.coffee
new file mode 100644
index 00000000000..6deb902c8de
--- /dev/null
+++ b/app/assets/javascripts/u2f/authenticate.js.coffee
@@ -0,0 +1,63 @@
+# Authenticate U2F (universal 2nd factor) devices for users to authenticate with.
+#
+# State Flow #1: setup -> in_progress -> authenticated -> POST to server
+# State Flow #2: setup -> in_progress -> error -> setup
+
+class @U2FAuthenticate
+  constructor: (@container, u2fParams) ->
+    @appId = u2fParams.app_id
+    @challenges = u2fParams.challenges
+    @signRequests = u2fParams.sign_requests
+
+  start: () =>
+    if U2FUtil.isU2FSupported()
+      @renderSetup()
+    else
+      @renderNotSupported()
+
+  authenticate: () =>
+    u2f.sign(@appId, @challenges, @signRequests, (response) =>
+      if response.errorCode
+        error = new U2FError(response.errorCode)
+        @renderError(error);
+      else
+        @renderAuthenticated(JSON.stringify(response))
+    , 10)
+
+  #############
+  # Rendering #
+  #############
+
+  templates: {
+    "notSupported": "#js-authenticate-u2f-not-supported",
+    "setup": '#js-authenticate-u2f-setup',
+    "inProgress": '#js-authenticate-u2f-in-progress',
+    "error": '#js-authenticate-u2f-error',
+    "authenticated": '#js-authenticate-u2f-authenticated'
+  }
+
+  renderTemplate: (name, params) =>
+    templateString = $(@templates[name]).html()
+    template = _.template(templateString)
+    @container.html(template(params))
+
+  renderSetup: () =>
+    @renderTemplate('setup')
+    @container.find('#js-login-u2f-device').on('click', @renderInProgress)
+
+  renderInProgress: () =>
+    @renderTemplate('inProgress')
+    @authenticate()
+
+  renderError: (error) =>
+    @renderTemplate('error', {error_message: error.message()})
+    @container.find('#js-u2f-try-again').on('click', @renderSetup)
+
+  renderAuthenticated: (deviceResponse) =>
+    @renderTemplate('authenticated')
+    # Prefer to do this instead of interpolating using Underscore templates
+    # because of JSON escaping issues.
+    @container.find("#js-device-response").val(deviceResponse)
+
+  renderNotSupported: () =>
+    @renderTemplate('notSupported')
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb
index d5918a7af3b..998b8adc411 100644
--- a/app/controllers/concerns/authenticates_with_two_factor.rb
+++ b/app/controllers/concerns/authenticates_with_two_factor.rb
@@ -24,7 +24,64 @@ module AuthenticatesWithTwoFactor
   # Returns nil
   def prompt_for_two_factor(user)
     session[:otp_user_id] = user.id
+    setup_u2f_authentication(user)
+    render 'devise/sessions/two_factor'
+  end
 
-    render 'devise/sessions/two_factor' and return
+  def authenticate_with_two_factor
+    user = self.resource = find_user
+
+    if user_params[:otp_attempt].present? && session[:otp_user_id]
+      authenticate_with_two_factor_via_otp(user)
+    elsif user_params[:device_response].present? && session[:otp_user_id]
+      authenticate_with_two_factor_via_u2f(user)
+    elsif user && user.valid_password?(user_params[:password])
+      prompt_for_two_factor(user)
+    end
+  end
+
+  private
+
+  def authenticate_with_two_factor_via_otp(user)
+    if valid_otp_attempt?(user)
+      # Remove any lingering user data from login
+      session.delete(:otp_user_id)
+
+      remember_me(user) if user_params[:remember_me] == '1'
+      sign_in(user)
+    else
+      flash.now[:alert] = 'Invalid two-factor code.'
+      render :two_factor
+    end
+  end
+
+  # Authenticate using the response from a U2F (universal 2nd factor) device
+  def authenticate_with_two_factor_via_u2f(user)
+    if U2fRegistration.authenticate(user, u2f_app_id, user_params[:device_response], session[:challenges])
+      # Remove any lingering user data from login
+      session.delete(:otp_user_id)
+      session.delete(:challenges)
+
+      sign_in(user)
+    else
+      flash.now[:alert] = 'Authentication via U2F device failed.'
+      prompt_for_two_factor(user)
+    end
+  end
+
+  # Setup in preparation of communication with a U2F (universal 2nd factor) device
+  # Actual communication is performed using a Javascript API
+  def setup_u2f_authentication(user)
+    key_handles = user.u2f_registrations.pluck(:key_handle)
+    u2f = U2F::U2F.new(u2f_app_id)
+
+    if key_handles.present?
+      sign_requests = u2f.authentication_requests(key_handles)
+      challenges = sign_requests.map(&:challenge)
+      session[:challenges] = challenges
+      gon.push(u2f: { challenges: challenges, app_id: u2f_app_id,
+                      sign_requests: sign_requests,
+                      browser_supports_u2f: browser_supports_u2f? })
+    end
   end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index d68c2a708e3..1c19c1cc1a8 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -54,7 +54,7 @@ class SessionsController < Devise::SessionsController
   end
 
   def user_params
-    params.require(:user).permit(:login, :password, :remember_me, :otp_attempt)
+    params.require(:user).permit(:login, :password, :remember_me, :otp_attempt, :device_response)
   end
 
   def find_user
@@ -89,27 +89,6 @@ class SessionsController < Devise::SessionsController
     find_user.try(:two_factor_enabled?)
   end
 
-  def authenticate_with_two_factor
-    user = self.resource = find_user
-
-    if user_params[:otp_attempt].present? && session[:otp_user_id]
-      if valid_otp_attempt?(user)
-        # Remove any lingering user data from login
-        session.delete(:otp_user_id)
-
-        remember_me(user) if user_params[:remember_me] == '1'
-        sign_in(user) and return
-      else
-        flash.now[:alert] = 'Invalid two-factor code.'
-        render :two_factor and return
-      end
-    else
-      if user && user.valid_password?(user_params[:password])
-        prompt_for_two_factor(user)
-      end
-    end
-  end
-
   def auto_sign_in_with_provider
     provider = Gitlab.config.omniauth.auto_sign_in_with_provider
     return unless provider.present?
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index fd5937a45ce..9d04db2c45e 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -1,11 +1,18 @@
 %div
   .login-box
     .login-heading
-      %h3 Two-factor Authentication
+      %h3 Two-Factor Authentication
     .login-body
-      = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-        = f.hidden_field :remember_me, value: params[resource_name][:remember_me]
-        = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor Authentication code', required: true, autofocus: true, autocomplete: 'off'
-        %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
-        .prepend-top-20
-          = f.submit "Verify code", class: "btn btn-save"
+      - if @user.two_factor_otp_enabled?
+        %h5 Authenticate via Two-Factor App
+        = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
+          = f.hidden_field :remember_me, value: params[resource_name][:remember_me]
+          = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-Factor Authentication code', required: true, autofocus: true, autocomplete: 'off'
+          %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
+          .prepend-top-20
+            = f.submit "Verify code", class: "btn btn-save"
+
+      - if @user.two_factor_u2f_enabled?
+
+        %hr
+        = render "u2f/authenticate"
diff --git a/app/views/u2f/_authenticate.html.haml b/app/views/u2f/_authenticate.html.haml
new file mode 100644
index 00000000000..75fb0e303ad
--- /dev/null
+++ b/app/views/u2f/_authenticate.html.haml
@@ -0,0 +1,28 @@
+#js-authenticate-u2f
+
+%script#js-authenticate-u2f-not-supported{ type: "text/template" }
+  %p Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).
+
+%script#js-authenticate-u2f-setup{ type: "text/template" }
+  %div
+    %p Insert your security key (if you haven't already), and press the button below.
+    %a.btn.btn-info#js-login-u2f-device{ href: 'javascript:void(0)' } Login Via U2F Device
+
+%script#js-authenticate-u2f-in-progress{ type: "text/template" }
+  %p Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.
+
+%script#js-authenticate-u2f-error{ type: "text/template" }
+  %div
+    %p <%= error_message %>
+    %a.btn.btn-warning#js-u2f-try-again Try again?
+
+%script#js-authenticate-u2f-authenticated{ type: "text/template" }
+  %div
+    %p We heard back from your U2F device. Click this button to authenticate with the GitLab server.
+    = form_tag(new_user_session_path, method: :post) do |f|
+      = hidden_field_tag 'user[device_response]', nil, class: 'form-control', required: true, id: "js-device-response"
+      = submit_tag "Authenticate via U2F Device", class: "btn btn-success"
+
+:javascript
+  var u2fAuthenticate = new U2FAuthenticate($("#js-authenticate-u2f"), gon.u2f);
+  u2fAuthenticate.start();
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index c1b178c3b6c..72b5ff231f7 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -33,11 +33,11 @@ feature 'Login', feature: true do
 
       before do
         login_with(user, remember: true)
-        expect(page).to have_content('Two-factor Authentication')
+        expect(page).to have_content('Two-Factor Authentication')
       end
 
       def enter_code(code)
-        fill_in 'Two-factor Authentication code', with: code
+        fill_in 'Two-Factor Authentication code', with: code
         click_button 'Verify code'
       end
 
@@ -143,12 +143,12 @@ feature 'Login', feature: true do
 
       context 'within the grace period' do
         it 'redirects to two-factor configuration page' do
-          expect(current_path).to eq new_profile_two_factor_auth_path
-          expect(page).to have_content('You must enable Two-factor Authentication for your account before')
+          expect(current_path).to eq profile_two_factor_auth_path
+          expect(page).to have_content('You must enable Two-Factor Authentication for your account before')
         end
 
-        it 'disallows skipping two-factor configuration' do
-          expect(current_path).to eq new_profile_two_factor_auth_path
+        it 'allows skipping two-factor configuration', js: true do
+          expect(current_path).to eq profile_two_factor_auth_path
 
           click_link 'Configure it later'
           expect(current_path).to eq root_path
@@ -159,26 +159,26 @@ feature 'Login', feature: true do
         let(:user) { create(:user, otp_grace_period_started_at: 9999.hours.ago) }
 
         it 'redirects to two-factor configuration page' do
-          expect(current_path).to eq new_profile_two_factor_auth_path
-          expect(page).to have_content('You must enable Two-factor Authentication for your account.')
+          expect(current_path).to eq profile_two_factor_auth_path
+          expect(page).to have_content('You must enable Two-Factor Authentication for your account.')
         end
 
-        it 'disallows skipping two-factor configuration' do
-          expect(current_path).to eq new_profile_two_factor_auth_path
+        it 'disallows skipping two-factor configuration', js: true do
+          expect(current_path).to eq profile_two_factor_auth_path
           expect(page).not_to have_link('Configure it later')
         end
       end
     end
 
-    context 'without grace pariod defined' do
+    context 'without grace period defined' do
       before(:each) do
         stub_application_setting(two_factor_grace_period: 0)
         login_with(user)
       end
 
       it 'redirects to two-factor configuration page' do
-        expect(current_path).to eq new_profile_two_factor_auth_path
-        expect(page).to have_content('You must enable Two-factor Authentication for your account.')
+        expect(current_path).to eq profile_two_factor_auth_path
+        expect(page).to have_content('You must enable Two-Factor Authentication for your account.')
       end
     end
   end
diff --git a/spec/javascripts/fixtures/u2f/authenticate.html.haml b/spec/javascripts/fixtures/u2f/authenticate.html.haml
new file mode 100644
index 00000000000..859e79a6c9e
--- /dev/null
+++ b/spec/javascripts/fixtures/u2f/authenticate.html.haml
@@ -0,0 +1 @@
+= render partial: "u2f/authenticate", locals: { new_user_session_path: "/users/sign_in" }
diff --git a/spec/javascripts/u2f/authenticate_spec.coffee b/spec/javascripts/u2f/authenticate_spec.coffee
new file mode 100644
index 00000000000..e8a2892d678
--- /dev/null
+++ b/spec/javascripts/u2f/authenticate_spec.coffee
@@ -0,0 +1,52 @@
+#= require u2f/authenticate
+#= require u2f/util
+#= require u2f/error
+#= require u2f
+#= require ./mock_u2f_device
+
+describe 'U2FAuthenticate', ->
+  U2FUtil.enableTestMode()
+  fixture.load('u2f/authenticate')
+
+  beforeEach ->
+    @u2fDevice = new MockU2FDevice
+    @container = $("#js-authenticate-u2f")
+    @component = new U2FAuthenticate(@container, {}, "token")
+    @component.start()
+
+  it 'allows authenticating via a U2F device', ->
+    setupButton = @container.find("#js-login-u2f-device")
+    setupMessage = @container.find("p")
+    expect(setupMessage.text()).toContain('Insert your security key')
+    expect(setupButton.text()).toBe('Login Via U2F Device')
+    setupButton.trigger('click')
+
+    inProgressMessage = @container.find("p")
+    expect(inProgressMessage.text()).toContain("Trying to communicate with your device")
+
+    @u2fDevice.respondToAuthenticateRequest({deviceData: "this is data from the device"})
+    authenticatedMessage = @container.find("p")
+    deviceResponse = @container.find('#js-device-response')
+    expect(authenticatedMessage.text()).toContain("Click this button to authenticate with the GitLab server")
+    expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}')
+
+  describe "errors", ->
+    it "displays an error message", ->
+      setupButton = @container.find("#js-login-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToAuthenticateRequest({errorCode: "error!"})
+      errorMessage = @container.find("p")
+      expect(errorMessage.text()).toContain("There was a problem communicating with your device")
+
+    it "allows retrying authentication after an error", ->
+      setupButton = @container.find("#js-login-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToAuthenticateRequest({errorCode: "error!"})
+      retryButton = @container.find("#js-u2f-try-again")
+      retryButton.trigger('click')
+
+      setupButton = @container.find("#js-login-u2f-device")
+      setupButton.trigger('click')
+      @u2fDevice.respondToAuthenticateRequest({deviceData: "this is data from the device"})
+      authenticatedMessage = @container.find("p")
+      expect(authenticatedMessage.text()).toContain("Click this button to authenticate with the GitLab server")

From 4db19bb4455cd21e80097a3e547d8b266a884aea Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:22:06 +0530
Subject: [PATCH 1134/1431] Add a U2F-specific audit log entry after logging
 in.

- "two-factor" for OTP-based 2FA
- "two-factor-via-u2f-device" for U2F-based 2FA
- "standard" for non-2FA login
---
 app/controllers/sessions_controller.rb       | 13 ++++++++--
 spec/controllers/sessions_controller_spec.rb | 26 +++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 1c19c1cc1a8..f6eedb1773c 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -30,8 +30,7 @@ class SessionsController < Devise::SessionsController
         resource.update_attributes(reset_password_token: nil,
                                    reset_password_sent_at: nil)
       end
-      authenticated_with = user_params[:otp_attempt] ? "two-factor" : "standard"
-      log_audit_event(current_user, with: authenticated_with)
+      log_audit_event(current_user, with: authentication_method)
     end
   end
 
@@ -117,4 +116,14 @@ class SessionsController < Devise::SessionsController
   def load_recaptcha
     Gitlab::Recaptcha.load_configurations!
   end
+
+  def authentication_method
+    if user_params[:otp_attempt]
+      "two-factor"
+    elsif user_params[:device_response]
+      "two-factor-via-u2f-device"
+    else
+      "standard"
+    end
+  end
 end
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 5dc8724fb50..4e9bfb0c69b 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -25,10 +25,15 @@ describe SessionsController do
           expect(response).to set_flash.to /Signed in successfully/
           expect(subject.current_user). to eq user
         end
+
+        it "creates an audit log record" do
+          expect { post(:create, user: { login: user.username, password: user.password }) }.to change { SecurityEvent.count }.by(1)
+          expect(SecurityEvent.last.details[:with]).to eq("standard")
+        end
       end
     end
 
-    context 'when using two-factor authentication' do
+    context 'when using two-factor authentication via OTP' do
       let(:user) { create(:user, :two_factor) }
 
       def authenticate_2fa(user_params)
@@ -117,6 +122,25 @@ describe SessionsController do
           end
         end
       end
+
+      it "creates an audit log record" do
+        expect { authenticate_2fa(login: user.username, otp_attempt: user.current_otp) }.to change { SecurityEvent.count }.by(1)
+        expect(SecurityEvent.last.details[:with]).to eq("two-factor")
+      end
+    end
+
+    context 'when using two-factor authentication via U2F device' do
+      let(:user) { create(:user, :two_factor) }
+
+      def authenticate_2fa_u2f(user_params)
+        post(:create, { user: user_params }, { otp_user_id: user.id })
+      end
+
+      it "creates an audit log record" do
+        allow(U2fRegistration).to receive(:authenticate).and_return(true)
+        expect { authenticate_2fa_u2f(login: user.username, device_response: "{}") }.to change { SecurityEvent.count }.by(1)
+        expect(SecurityEvent.last.details[:with]).to eq("two-factor-via-u2f-device")
+      end
     end
   end
 end

From 7232bdb9ad459147201d4ec5250465776168a62b Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:23:27 +0530
Subject: [PATCH 1135/1431] Add feature specs covering U2F registration and
 authentication.

---
 spec/features/u2f_spec.rb       | 239 ++++++++++++++++++++++++++++++++
 spec/support/fake_u2f_device.rb |  36 +++++
 2 files changed, 275 insertions(+)
 create mode 100644 spec/features/u2f_spec.rb
 create mode 100644 spec/support/fake_u2f_device.rb

diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
new file mode 100644
index 00000000000..366a90228b1
--- /dev/null
+++ b/spec/features/u2f_spec.rb
@@ -0,0 +1,239 @@
+require 'spec_helper'
+
+feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature: true, js: true do
+  def register_u2f_device(u2f_device = nil)
+    u2f_device ||= FakeU2fDevice.new(page)
+    u2f_device.respond_to_u2f_registration
+    click_on 'Setup New U2F Device'
+    expect(page).to have_content('Your device was successfully set up')
+    click_on 'Register U2F Device'
+    u2f_device
+  end
+
+  describe "registration" do
+    let(:user) { create(:user) }
+    before { login_as(user) }
+
+    describe 'when 2FA via OTP is disabled' do
+      it 'allows registering a new device' do
+        visit profile_account_path
+        click_on 'Enable Two-Factor Authentication'
+
+        register_u2f_device
+
+        expect(page.body).to match('Your U2F device was registered')
+      end
+
+      it 'allows registering more than one device' do
+        visit profile_account_path
+
+        # First device
+        click_on 'Enable Two-Factor Authentication'
+        register_u2f_device
+        expect(page.body).to match('Your U2F device was registered')
+
+        # Second device
+        click_on 'Manage Two-Factor Authentication'
+        register_u2f_device
+        expect(page.body).to match('Your U2F device was registered')
+        click_on 'Manage Two-Factor Authentication'
+
+        expect(page.body).to match('You have 2 U2F devices registered')
+      end
+    end
+
+    describe 'when 2FA via OTP is enabled' do
+      before { user.update_attributes(otp_required_for_login: true) }
+
+      it 'allows registering a new device' do
+        visit profile_account_path
+        click_on 'Manage Two-Factor Authentication'
+        expect(page.body).to match("You've already enabled two-factor authentication using mobile")
+
+        register_u2f_device
+
+        expect(page.body).to match('Your U2F device was registered')
+      end
+
+      it 'allows registering more than one device' do
+        visit profile_account_path
+
+        # First device
+        click_on 'Manage Two-Factor Authentication'
+        register_u2f_device
+        expect(page.body).to match('Your U2F device was registered')
+
+        # Second device
+        click_on 'Manage Two-Factor Authentication'
+        register_u2f_device
+        expect(page.body).to match('Your U2F device was registered')
+
+        click_on 'Manage Two-Factor Authentication'
+        expect(page.body).to match('You have 2 U2F devices registered')
+      end
+    end
+
+    it 'allows the same device to be registered for multiple users' do
+      # First user
+      visit profile_account_path
+      click_on 'Enable Two-Factor Authentication'
+      u2f_device = register_u2f_device
+      expect(page.body).to match('Your U2F device was registered')
+      logout
+
+      # Second user
+      login_as(:user)
+      visit profile_account_path
+      click_on 'Enable Two-Factor Authentication'
+      register_u2f_device(u2f_device)
+      expect(page.body).to match('Your U2F device was registered')
+
+      expect(U2fRegistration.count).to eq(2)
+    end
+
+    context "when there are form errors" do
+      it "doesn't register the device if there are errors" do
+        visit profile_account_path
+        click_on 'Enable Two-Factor Authentication'
+
+        # Have the "u2f device" respond with bad data
+        page.execute_script("u2f.register = function(_,_,_,callback) { callback('bad response'); };")
+        click_on 'Setup New U2F Device'
+        expect(page).to have_content('Your device was successfully set up')
+        click_on 'Register U2F Device'
+
+        expect(U2fRegistration.count).to eq(0)
+        expect(page.body).to match("The form contains the following error")
+        expect(page.body).to match("did not send a valid JSON response")
+      end
+
+      it "allows retrying registration" do
+        visit profile_account_path
+        click_on 'Enable Two-Factor Authentication'
+
+        # Failed registration
+        page.execute_script("u2f.register = function(_,_,_,callback) { callback('bad response'); };")
+        click_on 'Setup New U2F Device'
+        expect(page).to have_content('Your device was successfully set up')
+        click_on 'Register U2F Device'
+        expect(page.body).to match("The form contains the following error")
+
+        # Successful registration
+        register_u2f_device
+
+        expect(page.body).to match('Your U2F device was registered')
+        expect(U2fRegistration.count).to eq(1)
+      end
+    end
+  end
+
+  describe "authentication" do
+    let(:user) { create(:user) }
+
+    before do
+      # Register and logout
+      login_as(user)
+      visit profile_account_path
+      click_on 'Enable Two-Factor Authentication'
+      @u2f_device = register_u2f_device
+      logout
+    end
+
+    describe "when 2FA via OTP is disabled" do
+      it "allows logging in with the U2F device" do
+        login_with(user)
+
+        @u2f_device.respond_to_u2f_authentication
+        click_on "Login Via U2F Device"
+        expect(page.body).to match('We heard back from your U2F device')
+        click_on "Authenticate via U2F Device"
+
+        expect(page.body).to match('Signed in successfully')
+      end
+    end
+
+    describe "when 2FA via OTP is enabled" do
+      it "allows logging in with the U2F device" do
+        user.update_attributes(otp_required_for_login: true)
+        login_with(user)
+
+        @u2f_device.respond_to_u2f_authentication
+        click_on "Login Via U2F Device"
+        expect(page.body).to match('We heard back from your U2F device')
+        click_on "Authenticate via U2F Device"
+
+        expect(page.body).to match('Signed in successfully')
+      end
+    end
+
+    describe "when a given U2F device has already been registered by another user" do
+      describe "but not the current user" do
+        it "does not allow logging in with that particular device" do
+          # Register current user with the different U2F device
+          current_user = login_as(:user)
+          visit profile_account_path
+          click_on 'Enable Two-Factor Authentication'
+          register_u2f_device
+          logout
+
+          # Try authenticating user with the old U2F device
+          login_as(current_user)
+          @u2f_device.respond_to_u2f_authentication
+          click_on "Login Via U2F Device"
+          expect(page.body).to match('We heard back from your U2F device')
+          click_on "Authenticate via U2F Device"
+
+          expect(page.body).to match('Authentication via U2F device failed')
+        end
+      end
+
+      describe "and also the current user" do
+        it "allows logging in with that particular device" do
+          # Register current user with the same U2F device
+          current_user = login_as(:user)
+          visit profile_account_path
+          click_on 'Enable Two-Factor Authentication'
+          register_u2f_device(@u2f_device)
+          logout
+
+          # Try authenticating user with the same U2F device
+          login_as(current_user)
+          @u2f_device.respond_to_u2f_authentication
+          click_on "Login Via U2F Device"
+          expect(page.body).to match('We heard back from your U2F device')
+          click_on "Authenticate via U2F Device"
+
+          expect(page.body).to match('Signed in successfully')
+        end
+      end
+    end
+
+    describe "when a given U2F device has not been registered" do
+      it "does not allow logging in with that particular device" do
+        unregistered_device = FakeU2fDevice.new(page)
+        login_as(user)
+        unregistered_device.respond_to_u2f_authentication
+        click_on "Login Via U2F Device"
+        expect(page.body).to match('We heard back from your U2F device')
+        click_on "Authenticate via U2F Device"
+
+        expect(page.body).to match('Authentication via U2F device failed')
+      end
+    end
+  end
+
+  describe "when two-factor authentication is disabled" do
+    let(:user) { create(:user) }
+
+    before do
+      login_as(user)
+      visit profile_account_path
+      click_on 'Enable Two-Factor Authentication'
+      register_u2f_device
+    end
+
+    it "deletes u2f registrations" do
+      expect { click_on "Disable" }.to change { U2fRegistration.count }.from(1).to(0)
+    end
+  end
+end
diff --git a/spec/support/fake_u2f_device.rb b/spec/support/fake_u2f_device.rb
new file mode 100644
index 00000000000..553fe9f1fbc
--- /dev/null
+++ b/spec/support/fake_u2f_device.rb
@@ -0,0 +1,36 @@
+class FakeU2fDevice
+  def initialize(page)
+    @page = page
+  end
+  
+  def respond_to_u2f_registration
+    app_id = @page.evaluate_script('gon.u2f.app_id')
+    challenges = @page.evaluate_script('gon.u2f.challenges')
+
+    json_response = u2f_device(app_id).register_response(challenges[0])
+
+    @page.execute_script("
+    u2f.register = function(appId, registerRequests, signRequests, callback) {
+      callback(#{json_response});
+    };
+    ")
+  end
+
+  def respond_to_u2f_authentication
+    app_id = @page.evaluate_script('gon.u2f.app_id')
+    challenges = @page.evaluate_script('gon.u2f.challenges')
+    json_response = u2f_device(app_id).sign_response(challenges[0])
+
+    @page.execute_script("
+    u2f.sign = function(appId, challenges, signRequests, callback) {
+      callback(#{json_response});
+    };
+    ")
+  end
+
+  private
+
+  def u2f_device(app_id)
+    @u2f_device ||= U2F::FakeU2F.new(app_id)
+  end
+end

From 09a2f2dbdc4a14a2f4199f33a898ebf2aee383ef Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:23:57 +0530
Subject: [PATCH 1136/1431] Add documentation for U2F registration &
 authentication.

---
 doc/profile/2fa_u2f_authenticate.png     | Bin 0 -> 54413 bytes
 doc/profile/2fa_u2f_register.png         | Bin 0 -> 112414 bytes
 doc/profile/two_factor_authentication.md |  63 ++++++++++++++++++++---
 3 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 doc/profile/2fa_u2f_authenticate.png
 create mode 100644 doc/profile/2fa_u2f_register.png

diff --git a/doc/profile/2fa_u2f_authenticate.png b/doc/profile/2fa_u2f_authenticate.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9138ff60dbf3085b0083c047541df609f69122e
GIT binary patch
literal 54413
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

literal 0
HcmV?d00001

diff --git a/doc/profile/2fa_u2f_register.png b/doc/profile/2fa_u2f_register.png
new file mode 100644
index 0000000000000000000000000000000000000000..15b3683ef73ee59768e21e5139b43b88db56987c
GIT binary patch
literal 112414
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

literal 0
HcmV?d00001

diff --git a/doc/profile/two_factor_authentication.md b/doc/profile/two_factor_authentication.md
index a0e23c1586c..82505b13401 100644
--- a/doc/profile/two_factor_authentication.md
+++ b/doc/profile/two_factor_authentication.md
@@ -8,12 +8,27 @@ your phone.
 By enabling 2FA, the only way someone other than you can log into your account
 is to know your username and password *and* have access to your phone.
 
-#### Note
+> **Note:**
 When you enable 2FA, don't forget to back up your recovery codes. For your safety, if you
 lose your codes for GitLab.com, we can't disable or recover them.  
 
+In addition to a phone application, GitLab supports U2F (universal 2nd factor) devices as
+the second factor of authentication. Once enabled, in addition to supplying your username and
+password to login, you'll be prompted to activate your U2F device (usually by pressing
+a button on it), and it will perform secure authentication on your behalf.
+
+> **Note:** Support for U2F devices was added in version 8.8
+
+The U2F workflow is only supported by Google Chrome at this point, so we _strongly_ recommend 
+that you set up both methods of two-factor authentication, so you can still access your account 
+from other browsers.
+
+> **Note:** GitLab officially only supports [Yubikey] U2F devices.
+
 ## Enabling 2FA
 
+### Enable 2FA via mobile application
+
 **In GitLab:**
 
 1. Log in to your GitLab account.
@@ -38,9 +53,26 @@ lose your codes for GitLab.com, we can't disable or recover them.
 1. Click **Submit**.
 
 If the pin you entered was correct, you'll see a message indicating that
-Two-factor Authentication has been enabled, and you'll be presented with a list
+Two-Factor Authentication has been enabled, and you'll be presented with a list
 of recovery codes.
 
+### Enable 2FA via U2F device
+
+**In GitLab:**
+
+1. Log in to your GitLab account.
+1. Go to your **Profile Settings**.
+1. Go to **Account**.
+1. Click **Enable Two-Factor Authentication**.
+1. Plug in your U2F device.
+1. Click on **Setup New U2F Device**.
+1. A light will start blinking on your device. Activate it by pressing its button.
+
+You will see a message indicating that your device was successfully set up. 
+Click on **Register U2F Device** to complete the process.
+
+![Two-Factor U2F Setup](2fa_u2f_register.png)
+
 ## Recovery Codes
 
 Should you ever lose access to your phone, you can use one of the ten provided
@@ -51,21 +83,39 @@ account.
 If you lose the recovery codes or just want to generate new ones, you can do so
 from the **Profile Settings** > **Account** page where you first enabled 2FA.
 
+> **Note:** Recovery codes are not generated for U2F devices.
+
 ## Logging in with 2FA Enabled
 
 Logging in with 2FA enabled is only slightly different than a normal login.
 Enter your username and password credentials as you normally would, and you'll
-be presented with a second prompt for an authentication code. Enter the pin from
-your phone's application or a recovery code to log in.
+be presented with a second prompt, depending on which type of 2FA you've enabled.
 
-![Two-factor authentication on sign in](2fa_auth.png)
+### Log in via mobile application
+
+Enter the pin from your phone's application or a recovery code to log in.
+
+![Two-Factor Authentication on sign in via OTP](2fa_auth.png)
+
+### Log in via U2F device
+
+1. Click **Login via U2F Device**
+1. A light will start blinking on your device. Activate it by pressing its button.
+
+You will see a message indicating that your device responded to the authentication request.
+Click on **Authenticate via U2F Device** to complete the process.
+
+![Two-Factor Authentication on sign in via U2F device](2fa_u2f_authenticate.png)
 
 ## Disabling 2FA
 
 1. Log in to your GitLab account.
 1. Go to your **Profile Settings**.
 1. Go to **Account**.
-1. Click **Disable Two-factor Authentication**.
+1. Click **Disable**, under **Two-Factor Authentication**.
+
+This will clear all your two-factor authentication registrations, including mobile
+applications and U2F devices.
 
 ## Note to GitLab administrators
 
@@ -74,3 +124,4 @@ You need to take special care to that 2FA keeps working after
 
 [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
 [FreeOTP]: https://fedorahosted.org/freeotp/
+[YubiKey]: https://www.yubico.com/products/yubikey-hardware/

From cdf7a6c2ded729174a5e099b2fc255ee61f0cc79 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 6 Jun 2016 10:25:07 +0530
Subject: [PATCH 1137/1431] Add the U2F feature to the CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index ecce18af066..72fe32a01a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ v 8.9.0 (unreleased)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels
+  - Add support for using Yubikeys (U2F) for two-factor authentication
   - Link to blank group icon doesn't throw a 404 anymore
   - Remove 'main language' feature
   - Pipelines can be canceled only when there are running builds

From f5f65d69138f6c348a69a486f38ef5dc693fe7d2 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Jun 2016 10:55:13 +0200
Subject: [PATCH 1138/1431] Refactor all testing suites

---
 .gitlab-ci.yml | 208 ++++++++++++++++---------------------------------
 1 file changed, 68 insertions(+), 140 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85bf783ace6..d8d8557a465 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,16 +32,7 @@ stages:
 - post-test
 - notifications
 
-precompile:
-  stage: prepare
-  services: []
-  variables:
-    USE_DB: "false"
-  script:
-    - bundle exec rake assets:precompile
-  artifacts:
-    paths:
-    - public/assets/
+# Prepare and merge knapsack tests
 
 .knapsack_state: &knapsack_state
   services: []
@@ -56,20 +47,6 @@ precompile:
     paths:
     - knapsack/
 
-.knapsack: &knapsack
-  stage: test
-  script:
-    - JOB_NAME=( $CI_BUILD_NAME )
-    - export CI_NODE_INDEX=${JOB_NAME[1]}
-    - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
-    - export KNAPSACK_GENERATE_REPORT=true
-    - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
-    - knapsack ${JOB_NAME[0]}
-  artifacts:
-    paths:
-    - knapsack/
-
 knapsack:
   <<: *knapsack_state
   stage: prepare
@@ -86,10 +63,22 @@ update-knapsack:
     - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
     - rm -f knapsack/*_node_*.json
 
-.exec: &exec
+# Execute all testing suites
+
+.knapsack: &knapsack
   stage: test
   script:
-    - bundle exec $CI_BUILD_NAME
+    - bundle exec rake assets:precompile 2>/dev/null
+    - JOB_NAME=( $CI_BUILD_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[1]}
+    - export CI_NODE_TOTAL=${JOB_NAME[2]}
+    - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - export KNAPSACK_GENERATE_REPORT=true
+    - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
+    - knapsack ${JOB_NAME[0]}
+  artifacts:
+    paths:
+    - knapsack/
 
 rspec 0 20: *knapsack
 rspec 1 20: *knapsack
@@ -123,6 +112,57 @@ spinach 7 10: *knapsack
 spinach 8 10: *knapsack
 spinach 9 10: *knapsack
 
+# Execute all testing suites against Ruby 2.2
+
+.knapsack-ruby22: &knapsack-ruby22
+  <<: *knapsack
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.2
+  only:
+    - master
+  cache:
+    key: "ruby22"
+    paths:
+    - vendor
+
+rspec 0 20 ruby22: *knapsack-ruby22
+rspec 1 20 ruby22: *knapsack-ruby22
+rspec 2 20 ruby22: *knapsack-ruby22
+rspec 3 20 ruby22: *knapsack-ruby22
+rspec 4 20 ruby22: *knapsack-ruby22
+rspec 5 20 ruby22: *knapsack-ruby22
+rspec 6 20 ruby22: *knapsack-ruby22
+rspec 7 20 ruby22: *knapsack-ruby22
+rspec 8 20 ruby22: *knapsack-ruby22
+rspec 9 20 ruby22: *knapsack-ruby22
+rspec 10 20 ruby22: *knapsack-ruby22
+rspec 11 20 ruby22: *knapsack-ruby22
+rspec 12 20 ruby22: *knapsack-ruby22
+rspec 13 20 ruby22: *knapsack-ruby22
+rspec 14 20 ruby22: *knapsack-ruby22
+rspec 15 20 ruby22: *knapsack-ruby22
+rspec 16 20 ruby22: *knapsack-ruby22
+rspec 17 20 ruby22: *knapsack-ruby22
+rspec 18 20 ruby22: *knapsack-ruby22
+rspec 19 20 ruby22: *knapsack-ruby22
+
+spinach 0 10 ruby22: *knapsack-ruby22
+spinach 1 10 ruby22: *knapsack-ruby22
+spinach 2 10 ruby22: *knapsack-ruby22
+spinach 3 10 ruby22: *knapsack-ruby22
+spinach 4 10 ruby22: *knapsack-ruby22
+spinach 5 10 ruby22: *knapsack-ruby22
+spinach 6 10 ruby22: *knapsack-ruby22
+spinach 7 10 ruby22: *knapsack-ruby22
+spinach 8 10 ruby22: *knapsack-ruby22
+spinach 9 10 ruby22: *knapsack-ruby22
+
+# Other generic tests
+
+.exec: &exec
+  stage: test
+  script:
+    - bundle exec $CI_BUILD_NAME
+
 teaspoon: *exec
 rubocop: *exec
 rake scss_lint: *exec
@@ -138,122 +178,10 @@ bundler:audit:
   script:
     - "bundle exec bundle-audit check --update --ignore OSVDB-115941"
 
-# Ruby 2.2 jobs
-
-spec:feature:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-    - master
-  script:
-    - bundle exec rake assets:precompile 2>/dev/null
-    - bundle exec rake spec:feature
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spec:api:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake spec:api
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spec:models:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake spec:models
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spec:lib:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake spec:lib
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spec:services:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake spec:services
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spec:other:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake spec:other
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spinach:project:half:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake assets:precompile 2>/dev/null
-    - bundle exec rake spinach:project:half
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spinach:project:rest:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake assets:precompile 2>/dev/null
-    - bundle exec rake spinach:project:rest
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-
-spinach:other:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - bundle exec rake assets:precompile 2>/dev/null
-    - bundle exec rake spinach:other
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
+# Notify slack in the end
 
 notify:slack:
-  stage: notifications
+  stage: post-test
   script:
     - ./scripts/notify_slack.sh "#builds" "Build on \`$CI_BUILD_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_BUILD_REF"/builds>"
   when: on_failure

From 2f9c2149a38e8a4067cb50c1cd1bbb1e72c263b3 Mon Sep 17 00:00:00 2001
From: ZJ van de Weg <zegerjan@gitlab.com>
Date: Wed, 25 May 2016 21:07:36 +0200
Subject: [PATCH 1139/1431] Backend awardables on comments

---
 app/assets/javascripts/notes.js.coffee        |  2 +-
 .../concerns/toggle_award_emoji.rb            | 11 +++++-
 app/controllers/projects/notes_controller.rb  |  3 ++
 app/models/note.rb                            |  1 +
 .../projects/notes_controller_spec.rb         | 36 +++++++++++++++++++
 spec/models/note_spec.rb                      | 10 ++++++
 6 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 spec/controllers/projects/notes_controller_spec.rb

diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 7c3d57fc194..101154114ba 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -162,7 +162,7 @@ class @Notes
   renderNote: (note) ->
     unless note.valid
       if note.award
-        flash = new Flash('You have already used this award emoji!', 'alert')
+        flash = new Flash('You have already awarded this emoji!', 'alert')
         flash.pinTo('.header-content')
       return
 
diff --git a/app/controllers/concerns/toggle_award_emoji.rb b/app/controllers/concerns/toggle_award_emoji.rb
index 09ff44f291b..036777c80c1 100644
--- a/app/controllers/concerns/toggle_award_emoji.rb
+++ b/app/controllers/concerns/toggle_award_emoji.rb
@@ -9,13 +9,22 @@ module ToggleAwardEmoji
     name = params.require(:name)
 
     awardable.toggle_award_emoji(name, current_user)
-    TodoService.new.new_award_emoji(awardable, current_user)
+    TodoService.new.new_award_emoji(to_todoable(awardable), current_user)
 
     render json: { ok: true }
   end
 
   private
 
+  def to_todoable(awardable)
+    case awardable
+    when Note
+      awardable.noteable
+    else
+      awardable
+    end
+  end
+
   def awardable
     raise NotImplementedError
   end
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index c205474e999..836f79ff080 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -1,4 +1,6 @@
 class Projects::NotesController < Projects::ApplicationController
+  include ToggleAwardEmoji
+
   # Authorize
   before_action :authorize_read_note!
   before_action :authorize_create_note!, only: [:create]
@@ -61,6 +63,7 @@ class Projects::NotesController < Projects::ApplicationController
   def note
     @note ||= @project.notes.find(params[:id])
   end
+  alias_method :awardable, :note
 
   def note_to_html(note)
     render_to_string(
diff --git a/app/models/note.rb b/app/models/note.rb
index 46c3f6e24af..585d8c4ad84 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -3,6 +3,7 @@ class Note < ActiveRecord::Base
   include Gitlab::CurrentSettings
   include Participable
   include Mentionable
+  include Awardable
 
   default_value_for :system, false
 
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
new file mode 100644
index 00000000000..cb7d04a059c
--- /dev/null
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -0,0 +1,36 @@
+require('spec_helper')
+
+describe Projects::NotesController do
+  let(:user)    { create(:user) }
+  let(:project) { create(:project) }
+  let(:issue)   { create(:issue, project: project) }
+  let(:note)    { create(:note, noteable: issue, project: project) }
+
+  describe 'POST #toggle_award_emoji' do
+    before do
+      sign_in(user)
+      project.team << [user, :developer]
+    end
+
+    it "toggles the award emoji" do
+      expect do
+        post(:toggle_award_emoji, namespace_id: project.namespace.path,
+                                  project_id: project.path, id: note.id, name: "thumbsup")
+      end.to change { AwardEmoji.count }.by(1)
+
+      expect(response.status).to eq(200)
+    end
+
+    it "removes the already let award emoji" do
+      post(:toggle_award_emoji, namespace_id: project.namespace.path,
+                                project_id: project.path, id: note.id, name: "thumbsup")
+
+      expect do
+        post(:toggle_award_emoji, namespace_id: project.namespace.path,
+                                  project_id: project.path, id: note.id, name: "thumbsup")
+      end.to change { AwardEmoji.count }.by(-1)
+
+      expect(response.status).to eq(200)
+    end
+  end
+end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 139f7cb9783..f15e96714b2 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -9,6 +9,16 @@ describe Note, models: true do
     it { is_expected.to have_many(:todos).dependent(:destroy) }
   end
 
+  describe 'modules' do
+    subject { described_class }
+
+    it { is_expected.to include_module(Participable) }
+    it { is_expected.to include_module(Mentionable) }
+    it { is_expected.to include_module(Awardable) }
+
+    it { is_expected.to include_module(Gitlab::CurrentSettings) }
+  end
+
   describe 'validation' do
     it { is_expected.to validate_presence_of(:note) }
     it { is_expected.to validate_presence_of(:project) }

From eaff5afc9b50f41aceae32282e92f6450062a074 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 26 May 2016 12:15:20 +0300
Subject: [PATCH 1140/1431] Show emoji menu in notes.

---
 app/assets/javascripts/awards_handler.coffee |  9 ++++++---
 app/assets/stylesheets/pages/notes.scss      | 16 ++++++++++++++++
 app/views/projects/notes/_note.html.haml     |  3 +++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 766c653111a..e211c86f425 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -51,7 +51,7 @@ class @AwardsHandler
         $('#emoji_search').focus()
     else
       $addBtn.addClass 'is-loading is-active'
-      url = $addBtn.data 'award-menu-url'
+      url = @getAwardMenuUrl()
 
       @createEmojiMenu url, =>
         $addBtn.removeClass 'is-loading'
@@ -74,6 +74,7 @@ class @AwardsHandler
 
 
   positionMenu: ($menu, $addBtn) ->
+
     position = $addBtn.data('position')
 
     # The menu could potentially be off-screen or in a hidden overflow element
@@ -240,8 +241,10 @@ class @AwardsHandler
 
     return @createEmoji_ emoji if $('.emoji-menu').length
 
-    awardMenuUrl = gl.awardMenuUrl or '/emojis'
-    @createEmojiMenu awardMenuUrl, => @createEmoji emoji
+    @createEmojiMenu @getAwardMenuUrl(), => @createEmoji emoji
+
+
+  getAwardMenuUrl: -> return gl.awardMenuUrl or '/emojis'
 
 
   resolveNameToCssClass: (emoji) ->
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index a3e1ac13a43..3acc9152c01 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -120,6 +120,22 @@ ul.notes {
       padding-bottom: 3px;
     }
 
+    .note-emoji-button {
+      .fa-spinner {
+        display: none;
+      }
+
+      &.is-loading {
+        .fa-smile-o {
+          display: none;
+        }
+
+        .fa-spinner {
+          display: inline-block;
+        }
+      }
+    }
+
   }
 }
 
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index f1045bbd8c3..c176778c515 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -22,6 +22,9 @@
             %span.note-role
               = access
           - if note_editable
+            = link_to '#', title: 'Add Reaction', class: 'note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
+              = icon('spinner spin')
+              = icon('smile-o')
             = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
               = icon('pencil')
             = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do

From f261be0949bb589b54359b8fba2bcee9872e69cf Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 27 May 2016 18:29:27 +0300
Subject: [PATCH 1141/1431] Award emoji implementation for notes.

---
 app/assets/javascripts/awards_handler.coffee  | 151 ++++++++++--------
 app/views/award_emoji/_awards_block.html.haml |   2 +-
 app/views/projects/notes/_note.html.haml      |   4 +-
 3 files changed, 92 insertions(+), 65 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index e211c86f425..071dbd36641 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -6,35 +6,43 @@ class @AwardsHandler
 
     $(document)
       .off 'click', '.js-add-award'
-      .on  'click', '.js-add-award', (event) =>
-        event.stopPropagation()
-        event.preventDefault()
+      .on  'click', '.js-add-award', (e) =>
+        e.stopPropagation()
+        e.preventDefault()
 
-        @showEmojiMenu $(event.currentTarget)
+        @showEmojiMenu $(e.currentTarget)
 
-    $('html').on 'click', (event) ->
-      unless $(event.target).closest('.emoji-menu').length
+    $('html').on 'click', (e) ->
+      $target = $ e.target
+
+      unless $target.closest('.emoji-menu-content').length
+        $('.js-awards-block.current').removeClass 'current'
+
+      unless $target.closest('.emoji-menu').length
         if $('.emoji-menu').is(':visible')
           $('.js-add-award.is-active').removeClass 'is-active'
           $('.emoji-menu').removeClass 'is-visible'
 
     $(document)
       .off 'click', '.js-emoji-btn'
-      .on  'click', '.js-emoji-btn', @handleClick
+      .on  'click', '.js-emoji-btn', (e) =>
+        e.preventDefault()
 
+        $target = $ e.currentTarget
+        emoji   = $target.find('.icon').data 'emoji'
 
-  handleClick: (e) =>
-
-    e.preventDefault()
-
-    emoji = $(e.currentTarget).find('.icon').data 'emoji'
-    @getVotesBlock().addClass 'js-awards-block'
-    @addAward @getAwardUrl(), emoji
+        $target.closest('.js-awards-block').addClass 'current'
+        @addAward @getAwardUrl(), emoji
 
 
   showEmojiMenu: ($addBtn) ->
 
-    $menu = $('.emoji-menu')
+    $menu = $ '.emoji-menu'
+
+    if $addBtn.hasClass 'note-emoji-button'
+      $addBtn.parents('.note').find('.js-awards-block').addClass 'current'
+    else
+      $addBtn.closest('.js-awards-block').addClass 'current'
 
     if $menu.length
       $holder = $addBtn.closest('.js-award-holder')
@@ -68,7 +76,7 @@ class @AwardsHandler
 
   createEmojiMenu: (awardMenuUrl, callback) ->
 
-    $.get awardMenuUrl, (response) =>
+    $.get awardMenuUrl, (response) ->
       $('body').append response
       callback()
 
@@ -94,11 +102,10 @@ class @AwardsHandler
 
   addAward: (awardUrl, emoji, checkMutuality = yes) ->
 
-    emoji = @normilizeEmojiName(emoji)
-    @postEmoji awardUrl, emoji, =>
-      @addAwardToEmojiBar(emoji, checkMutuality)
+    emoji = @normilizeEmojiName emoji
 
-      $('.js-awards-block-current').removeClass 'js-awards-block-current'
+    @postEmoji awardUrl, emoji, =>
+      @addAwardToEmojiBar emoji, checkMutuality
 
     $('.emoji-menu').removeClass 'is-visible'
 
@@ -108,25 +115,26 @@ class @AwardsHandler
     @checkMutuality emoji  if checkForMutuality
     @addEmojiToFrequentlyUsedList(emoji)
 
-    emoji = @normilizeEmojiName(emoji)
+    emoji     = @normilizeEmojiName(emoji)
     $emojiBtn = @findEmojiIcon(emoji).parent()
 
     if $emojiBtn.length > 0
-      if @isActive($emojiBtn)
-        @decrementCounter($emojiBtn, emoji)
+      if @isActive $emojiBtn
+        @decrementCounter $emojiBtn, emoji
       else
-        counter = $emojiBtn.find('.js-counter')
-        counter.text(parseInt(counter.text()) + 1)
-        $emojiBtn.addClass('active')
-        @addMeToUserList(emoji)
+        counter = $emojiBtn.find '.js-counter'
+        counter.text parseInt(counter.text()) + 1
+        $emojiBtn.addClass 'active'
+        @addMeToUserList emoji
     else
-      @createEmoji(emoji)
+      @getVotesBlock().removeClass 'hidden'
+      @createEmoji emoji
 
 
-  getVotesBlock: -> return $ '.awards.js-awards-block'
+  getVotesBlock: -> return $ '.js-awards-block.current'
 
 
-  getAwardUrl: -> @getVotesBlock().data 'award-url'
+  getAwardUrl: -> return @getVotesBlock().data 'award-url'
 
 
   checkMutuality: (emoji) ->
@@ -135,8 +143,9 @@ class @AwardsHandler
 
     if emoji in [ 'thumbsup', 'thumbsdown' ]
       mutualVote = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
+      selector   = "[data-emoji=#{mutualVote}]"
 
-      isAlreadyVoted = $("[data-emoji=#{mutualVote}]").parent().hasClass 'active'
+      isAlreadyVoted = @getVotesBlock().find(selector).parent().hasClass 'active'
       @addAward awardUrl, mutualVote, no if isAlreadyVoted
 
 
@@ -144,28 +153,35 @@ class @AwardsHandler
 
 
   decrementCounter: ($emojiBtn, emoji) ->
-    isntNoteBody = $emojiBtn.closest('.note-body').length is 0
-    counter = $('.js-counter', $emojiBtn)
-    counterNumber = parseInt(counter.text())
 
-    if !isntNoteBody
-      # If this is a note body, we just hide the award emoji row like the initial state
-      $emojiBtn.closest('.js-awards-block').addClass 'hidden'
+    counter       = $('.js-counter', $emojiBtn)
+    counterNumber = parseInt(counter.text())
 
     if counterNumber > 1
       counter.text(counterNumber - 1)
       @removeMeFromUserList($emojiBtn, emoji)
-    else if (emoji == 'thumbsup' || emoji == 'thumbsdown') && isntNoteBody
+    else if emoji is 'thumbsup' or emoji is 'thumbsdown'
       $emojiBtn.tooltip('destroy')
       counter.text('0')
       @removeMeFromUserList($emojiBtn, emoji)
+      @removeEmoji $emojiBtn if $emojiBtn.parents('.note').length
     else
-      $emojiBtn.tooltip('destroy')
-      $emojiBtn.remove()
+      @removeEmoji $emojiBtn
 
     $emojiBtn.removeClass('active')
 
 
+  removeEmoji: ($emojiBtn) ->
+
+    $emojiBtn.tooltip('destroy')
+    $emojiBtn.remove()
+
+    $votesBlock = @getVotesBlock()
+
+    if $votesBlock.find('.js-emoji-btn').length is 0
+      $votesBlock.addClass 'hidden'
+
+
   getAwardTooltip: ($awardBlock) ->
 
     return $awardBlock.attr('data-original-title') or $awardBlock.attr('data-title')
@@ -225,16 +241,12 @@ class @AwardsHandler
     </button>"
 
     emoji_node = $(buttonHtml)
-      .insertBefore '.js-awards-block .js-award-holder:not(.js-award-action-btn)'
+      .insertBefore '.js-awards-block.current .js-award-holder:not(.js-award-action-btn)'
       .find '.emoji-icon'
       .data 'emoji', emoji
 
     $('.award-control').tooltip()
-
-    $currentBlock = $ '.js-awards-block'
-
-    if $currentBlock.is '.hidden'
-      $currentBlock.removeClass 'hidden'
+    $('.js-awards-block.current').removeClass 'current'
 
 
   createEmoji: (emoji) ->
@@ -261,42 +273,53 @@ class @AwardsHandler
 
 
   postEmoji: (awardUrl, emoji, callback) ->
+
     $.post awardUrl, { name: emoji }, (data) ->
-      if data.ok
-        callback.call()
+      callback.call() if data.ok
+
 
   findEmojiIcon: (emoji) ->
-    $(".js-awards-block.awards > .js-emoji-btn [data-emoji='#{emoji}']")
+
+    return $(".js-awards-block.current > .js-emoji-btn [data-emoji='#{emoji}']")
+
 
   scrollToAwards: ->
-    $('body, html').animate({
-      scrollTop: $('.awards').offset().top - 80
-    }, 200)
 
-  normilizeEmojiName: (emoji) ->
-    @aliases[emoji] || emoji
+    options = scrollTop: $('.awards').offset().top - 80
+    $('body, html').animate options, 200
+
+
+  normilizeEmojiName: (emoji) -> return @aliases[emoji] or emoji
+
 
   addEmojiToFrequentlyUsedList: (emoji) ->
-    frequently_used_emojis = @getFrequentlyUsedEmojis()
-    frequently_used_emojis.push(emoji)
-    $.cookie('frequently_used_emojis', frequently_used_emojis.join(','), { expires: 365 })
+
+    frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
+    frequentlyUsedEmojis.push emoji
+    $.cookie 'frequently_used_emojis', frequentlyUsedEmojis.join(','), { expires: 365 }
+
 
   getFrequentlyUsedEmojis: ->
-    frequently_used_emojis = ($.cookie('frequently_used_emojis') || '').split(',')
-    _.compact(_.uniq(frequently_used_emojis))
+
+    frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') or '').split(',')
+    return _.compact _.uniq frequentlyUsedEmojis
+
 
   renderFrequentlyUsedBlock: ->
-    if $.cookie('frequently_used_emojis')
-      frequently_used_emojis = @getFrequentlyUsedEmojis()
+
+    if $.cookie 'frequently_used_emojis'
+      frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
 
       ul = $("<ul class='clearfix emoji-menu-list'>")
 
-      for emoji in frequently_used_emojis
+      for emoji in frequentlyUsedEmojis
         $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
 
       $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
 
+
   setupSearch: ->
+
     $('input.emoji-search').on 'keyup', (ev) =>
       term = $(ev.target).val()
 
@@ -313,5 +336,7 @@ class @AwardsHandler
       else
         $('.emoji-menu-content').children().show()
 
-  searchEmojis: (term)->
+
+  searchEmojis: (term) ->
+
     $(".emoji-menu-content [data-emoji*='#{term}']").closest('li').clone()
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index e9302c39753..84fd146a26b 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -11,7 +11,7 @@
       gl.awardMenuUrl = "#{emojis_path}"
 
     .award-menu-holder.js-award-holder
-      %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } }
+      %button.btn.award-control.js-add-award{ type: "button" }
         = icon('smile-o', class: "award-control-icon award-control-icon-normal")
         = icon('spinner spin', class: "award-control-icon award-control-icon-loading")
         %span.award-control-text
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index c176778c515..47ab8906316 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -22,7 +22,7 @@
             %span.note-role
               = access
           - if note_editable
-            = link_to '#', title: 'Add Reaction', class: 'note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
+            = link_to '#', title: 'Award Emoji', class: 'note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
               = icon('spinner spin')
               = icon('smile-o')
             = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
@@ -35,6 +35,8 @@
             = markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author)
         - if note_editable
           = render 'projects/notes/edit_form', note: note
+        .note-awards
+          = render 'award_emoji/awards_block', awardable: note, inline: false
       = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
 
       - if note.attachment.url

From 40c86c916e252dd3556c0dc526e6a9de505e5de3 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Sat, 28 May 2016 01:49:18 +0300
Subject: [PATCH 1142/1431] Refactor awardsHandler methods to work with
 votesBlock.

---
 app/assets/javascripts/awards_handler.coffee | 68 ++++++++++----------
 app/assets/javascripts/notes.js.coffee       |  3 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 071dbd36641..27b2853e7d1 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -32,7 +32,7 @@ class @AwardsHandler
         emoji   = $target.find('.icon').data 'emoji'
 
         $target.closest('.js-awards-block').addClass 'current'
-        @addAward @getAwardUrl(), emoji
+        @addAward @getVotesBlock(), @getAwardUrl(), emoji
 
 
   showEmojiMenu: ($addBtn) ->
@@ -100,23 +100,23 @@ class @AwardsHandler
     $menu.css(css)
 
 
-  addAward: (awardUrl, emoji, checkMutuality = yes) ->
+  addAward: (votesBlock, awardUrl, emoji, checkMutuality = yes) ->
 
     emoji = @normilizeEmojiName emoji
 
     @postEmoji awardUrl, emoji, =>
-      @addAwardToEmojiBar emoji, checkMutuality
+      @addAwardToEmojiBar votesBlock, emoji, checkMutuality
 
     $('.emoji-menu').removeClass 'is-visible'
 
 
-  addAwardToEmojiBar: (emoji, checkForMutuality = yes) ->
+  addAwardToEmojiBar: (votesBlock, emoji, checkForMutuality = yes) ->
 
-    @checkMutuality emoji  if checkForMutuality
-    @addEmojiToFrequentlyUsedList(emoji)
+    @checkMutuality votesBlock, emoji  if checkForMutuality
+    @addEmojiToFrequentlyUsedList emoji
 
-    emoji     = @normilizeEmojiName(emoji)
-    $emojiBtn = @findEmojiIcon(emoji).parent()
+    emoji     = @normilizeEmojiName emoji
+    $emojiBtn = @findEmojiIcon(votesBlock, emoji).parent()
 
     if $emojiBtn.length > 0
       if @isActive $emojiBtn
@@ -125,10 +125,10 @@ class @AwardsHandler
         counter = $emojiBtn.find '.js-counter'
         counter.text parseInt(counter.text()) + 1
         $emojiBtn.addClass 'active'
-        @addMeToUserList emoji
+        @addMeToUserList votesBlock, emoji
     else
-      @getVotesBlock().removeClass 'hidden'
-      @createEmoji emoji
+      votesBlock.removeClass 'hidden'
+      @createEmoji votesBlock, emoji
 
 
   getVotesBlock: -> return $ '.js-awards-block.current'
@@ -137,7 +137,7 @@ class @AwardsHandler
   getAwardUrl: -> return @getVotesBlock().data 'award-url'
 
 
-  checkMutuality: (emoji) ->
+  checkMutuality: (votesBlock, emoji) ->
 
     awardUrl = @getAwardUrl()
 
@@ -145,8 +145,8 @@ class @AwardsHandler
       mutualVote = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
       selector   = "[data-emoji=#{mutualVote}]"
 
-      isAlreadyVoted = @getVotesBlock().find(selector).parent().hasClass 'active'
-      @addAward awardUrl, mutualVote, no if isAlreadyVoted
+      isAlreadyVoted = votesBlock.find(selector).parent().hasClass 'active'
+      @addAward votesBlock, awardUrl, mutualVote, no if isAlreadyVoted
 
 
   isActive: ($emojiBtn) -> $emojiBtn.hasClass 'active'
@@ -155,20 +155,20 @@ class @AwardsHandler
   decrementCounter: ($emojiBtn, emoji) ->
 
     counter       = $('.js-counter', $emojiBtn)
-    counterNumber = parseInt(counter.text())
+    counterNumber = parseInt counter.text(), 10
 
     if counterNumber > 1
-      counter.text(counterNumber - 1)
-      @removeMeFromUserList($emojiBtn, emoji)
+      counter.text counterNumber - 1
+      @removeMeFromUserList $emojiBtn, emoji
     else if emoji is 'thumbsup' or emoji is 'thumbsdown'
-      $emojiBtn.tooltip('destroy')
-      counter.text('0')
-      @removeMeFromUserList($emojiBtn, emoji)
+      $emojiBtn.tooltip 'destroy'
+      counter.text '0'
+      @removeMeFromUserList $emojiBtn, emoji
       @removeEmoji $emojiBtn if $emojiBtn.parents('.note').length
     else
       @removeEmoji $emojiBtn
 
-    $emojiBtn.removeClass('active')
+    $emojiBtn.removeClass 'active'
 
 
   removeEmoji: ($emojiBtn) ->
@@ -207,9 +207,9 @@ class @AwardsHandler
     @resetTooltip(awardBlock)
 
 
-  addMeToUserList: (emoji) ->
+  addMeToUserList: (votesBlock, emoji) ->
 
-    awardBlock = @findEmojiIcon(emoji).parent()
+    awardBlock = @findEmojiIcon(votesBlock, emoji).parent()
     origTitle  = @getAwardTooltip awardBlock
     users      = []
 
@@ -231,29 +231,29 @@ class @AwardsHandler
     ), 200
 
 
-  createEmoji_: (emoji) ->
+  createEmoji_: (votesBlock, emoji) ->
 
     emojiCssClass = @resolveNameToCssClass emoji
-
-    buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
+    buttonHtml    = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
       <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
       <span class='award-control-text js-counter'>1</span>
     </button>"
 
     emoji_node = $(buttonHtml)
-      .insertBefore '.js-awards-block.current .js-award-holder:not(.js-award-action-btn)'
+      .insertBefore votesBlock.find '.js-award-holder:not(.js-award-action-btn)'
       .find '.emoji-icon'
       .data 'emoji', emoji
 
     $('.award-control').tooltip()
-    $('.js-awards-block.current').removeClass 'current'
+    votesBlock.removeClass 'current'
 
 
-  createEmoji: (emoji) ->
+  createEmoji: (votesBlock, emoji) ->
 
-    return @createEmoji_ emoji if $('.emoji-menu').length
+    if $('.emoji-menu').length
+      return @createEmoji_ votesBlock, emoji
 
-    @createEmojiMenu @getAwardMenuUrl(), => @createEmoji emoji
+    @createEmojiMenu @getAwardMenuUrl(), => @createEmoji votesBlock, emoji
 
 
   getAwardMenuUrl: -> return gl.awardMenuUrl or '/emojis'
@@ -278,14 +278,14 @@ class @AwardsHandler
       callback.call() if data.ok
 
 
-  findEmojiIcon: (emoji) ->
+  findEmojiIcon: (votesBlock, emoji) ->
 
-    return $(".js-awards-block.current > .js-emoji-btn [data-emoji='#{emoji}']")
+    return votesBlock.find ".js-emoji-btn [data-emoji='#{emoji}']"
 
 
   scrollToAwards: ->
 
-    options = scrollTop: $('.awards').offset().top - 80
+    options = scrollTop: $('.awards').offset().top - 110
     $('body, html').animate options, 200
 
 
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 101154114ba..0fdbe55ea9c 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -167,7 +167,8 @@ class @Notes
       return
 
     if note.award
-      awardsHandler.addAwardToEmojiBar(note.name)
+      votesBlock = $('.js-awards-block').eq 0
+      awardsHandler.addAwardToEmojiBar votesBlock, note.name
       awardsHandler.scrollToAwards()
 
     # render note if it not present in loaded list

From ce5729139fb8e37f4242996b29c4dfb181610acd Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 30 May 2016 16:15:02 +0300
Subject: [PATCH 1143/1431] Fix mutual exclusivity for emoji only comments.

---
 app/assets/javascripts/awards_handler.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 27b2853e7d1..2b3e6ad6224 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -131,7 +131,10 @@ class @AwardsHandler
       @createEmoji votesBlock, emoji
 
 
-  getVotesBlock: -> return $ '.js-awards-block.current'
+  getVotesBlock: ->
+
+    currentBlock = $ '.js-awards-block.current'
+    return if currentBlock.length then currentBlock else $('.js-awards-block').eq 0
 
 
   getAwardUrl: -> return @getVotesBlock().data 'award-url'

From 59b34188fa26bd50e0696df6dd6fef786334f092 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 30 May 2016 16:27:25 +0300
Subject: [PATCH 1144/1431] Animate emoji when rendered.

---
 app/assets/javascripts/awards_handler.coffee | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 2b3e6ad6224..0c7b3493a19 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -126,6 +126,7 @@ class @AwardsHandler
         counter.text parseInt(counter.text()) + 1
         $emojiBtn.addClass 'active'
         @addMeToUserList votesBlock, emoji
+        @animateEmoji $emojiBtn
     else
       votesBlock.removeClass 'hidden'
       @createEmoji votesBlock, emoji
@@ -242,15 +243,25 @@ class @AwardsHandler
       <span class='award-control-text js-counter'>1</span>
     </button>"
 
-    emoji_node = $(buttonHtml)
+    $emojiButton = $ buttonHtml
+    emoji_node   = $emojiButton
       .insertBefore votesBlock.find '.js-award-holder:not(.js-award-action-btn)'
       .find '.emoji-icon'
       .data 'emoji', emoji
 
+    @animateEmoji $emojiButton
     $('.award-control').tooltip()
     votesBlock.removeClass 'current'
 
 
+  animateEmoji: ($emoji) ->
+
+    className = 'pulse animated'
+
+    $emoji.addClass className
+    setTimeout (-> $emoji.removeClass className), 321
+
+
   createEmoji: (votesBlock, emoji) ->
 
     if $('.emoji-menu').length

From 47fc235fe1d8b6387428a13ea7bda33b59561cee Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 30 May 2016 16:39:43 +0300
Subject: [PATCH 1145/1431] Be consistent on naming.

It was named as $emojiBtn before I was using $emojiButton so updated them to be consistent.
---
 app/assets/javascripts/awards_handler.coffee | 44 ++++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 0c7b3493a19..4425921b134 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -115,18 +115,18 @@ class @AwardsHandler
     @checkMutuality votesBlock, emoji  if checkForMutuality
     @addEmojiToFrequentlyUsedList emoji
 
-    emoji     = @normilizeEmojiName emoji
-    $emojiBtn = @findEmojiIcon(votesBlock, emoji).parent()
+    emoji        = @normilizeEmojiName emoji
+    $emojiButton = @findEmojiIcon(votesBlock, emoji).parent()
 
-    if $emojiBtn.length > 0
-      if @isActive $emojiBtn
-        @decrementCounter $emojiBtn, emoji
+    if $emojiButton.length > 0
+      if @isActive $emojiButton
+        @decrementCounter $emojiButton, emoji
       else
-        counter = $emojiBtn.find '.js-counter'
+        counter = $emojiButton.find '.js-counter'
         counter.text parseInt(counter.text()) + 1
-        $emojiBtn.addClass 'active'
+        $emojiButton.addClass 'active'
         @addMeToUserList votesBlock, emoji
-        @animateEmoji $emojiBtn
+        @animateEmoji $emojiButton
     else
       votesBlock.removeClass 'hidden'
       @createEmoji votesBlock, emoji
@@ -153,32 +153,32 @@ class @AwardsHandler
       @addAward votesBlock, awardUrl, mutualVote, no if isAlreadyVoted
 
 
-  isActive: ($emojiBtn) -> $emojiBtn.hasClass 'active'
+  isActive: ($emojiButton) -> $emojiButton.hasClass 'active'
 
 
-  decrementCounter: ($emojiBtn, emoji) ->
+  decrementCounter: ($emojiButton, emoji) ->
 
-    counter       = $('.js-counter', $emojiBtn)
+    counter       = $('.js-counter', $emojiButton)
     counterNumber = parseInt counter.text(), 10
 
     if counterNumber > 1
       counter.text counterNumber - 1
-      @removeMeFromUserList $emojiBtn, emoji
+      @removeMeFromUserList $emojiButton, emoji
     else if emoji is 'thumbsup' or emoji is 'thumbsdown'
-      $emojiBtn.tooltip 'destroy'
+      $emojiButton.tooltip 'destroy'
       counter.text '0'
-      @removeMeFromUserList $emojiBtn, emoji
-      @removeEmoji $emojiBtn if $emojiBtn.parents('.note').length
+      @removeMeFromUserList $emojiButton, emoji
+      @removeEmoji $emojiButton if $emojiButton.parents('.note').length
     else
-      @removeEmoji $emojiBtn
+      @removeEmoji $emojiButton
 
-    $emojiBtn.removeClass 'active'
+    $emojiButton.removeClass 'active'
 
 
-  removeEmoji: ($emojiBtn) ->
+  removeEmoji: ($emojiButton) ->
 
-    $emojiBtn.tooltip('destroy')
-    $emojiBtn.remove()
+    $emojiButton.tooltip('destroy')
+    $emojiButton.remove()
 
     $votesBlock = @getVotesBlock()
 
@@ -191,9 +191,9 @@ class @AwardsHandler
     return $awardBlock.attr('data-original-title') or $awardBlock.attr('data-title')
 
 
-  removeMeFromUserList: ($emojiBtn, emoji) ->
+  removeMeFromUserList: ($emojiButton, emoji) ->
 
-    awardBlock    = $emojiBtn
+    awardBlock    = $emojiButton
     originalTitle = @getAwardTooltip awardBlock
 
     authors = originalTitle.split ', '

From f1d74ccc8ca8e3fa91e87193fc886e9a00a636b3 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 30 May 2016 19:33:43 +0300
Subject: [PATCH 1146/1431] Some design related tweaks.

---
 app/assets/javascripts/awards_handler.coffee   |  2 +-
 app/assets/stylesheets/framework/timeline.scss |  2 +-
 app/assets/stylesheets/pages/awards.scss       |  1 +
 app/assets/stylesheets/pages/notes.scss        | 16 ++++++++++++++++
 app/views/projects/issues/show.html.haml       |  6 +++---
 app/views/projects/notes/_note.html.haml       |  4 ++--
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 4425921b134..8a6f6d7d185 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -39,7 +39,7 @@ class @AwardsHandler
 
     $menu = $ '.emoji-menu'
 
-    if $addBtn.hasClass 'note-emoji-button'
+    if $addBtn.hasClass 'js-note-emoji'
       $addBtn.parents('.note').find('.js-awards-block').addClass 'current'
     else
       $addBtn.closest('.js-awards-block').addClass 'current'
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 29501069d27..62935c95c51 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -5,7 +5,7 @@
   padding: 0;
 
   .timeline-entry {
-    padding: $gl-padding $gl-btn-padding;
+    padding: $gl-padding $gl-btn-padding 11px $gl-btn-padding;
     border-color: $table-border-color;
     color: $gl-gray;
     border-bottom: 1px solid $border-white-light;
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 07d40f40556..56d04229f0b 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -95,6 +95,7 @@
 
 .award-control {
   margin-right: 5px;
+  margin-bottom: 5px;
   padding-left: 5px;
   padding-right: 5px;
   line-height: 20px;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 3acc9152c01..53a9d1144c8 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -69,6 +69,10 @@ ul.notes {
 
       .note-edit-form {
         display: block;
+
+        &.current-note-edit-form + .note-awards {
+          display: none;
+        }
       }
     }
 
@@ -116,6 +120,18 @@ ul.notes {
       }
     }
 
+    .note-awards {
+      .js-awards-block {
+        padding: 2px 0;
+        margin-top: 10px;
+      }
+
+      .award-control {
+        font-size: 13px;
+        padding: 2px 5px;
+      }
+    }
+
     .note-header {
       padding-bottom: 3px;
     }
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index a35c13fbd40..b2f14a54073 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -68,9 +68,9 @@
     #related-branches{ data: { url: related_branches_namespace_project_issue_url(@project.namespace, @project, @issue) } }
       // This element is filled in using JavaScript.
 
-    .content-block.content-block-small
-      = render 'new_branch'
-      = render 'award_emoji/awards_block', awardable: @issue, inline: true
+  .content-block.content-block-small
+    = render 'new_branch'
+    = render 'award_emoji/awards_block', awardable: @issue, inline: true
 
   %section.issuable-discussion
     = render 'projects/issues/discussion'
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 47ab8906316..3a1aa35fa21 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -22,7 +22,7 @@
             %span.note-role
               = access
           - if note_editable
-            = link_to '#', title: 'Award Emoji', class: 'note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
+            = link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
               = icon('spinner spin')
               = icon('smile-o')
             = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
@@ -33,11 +33,11 @@
         .note-text
           = preserve do
             = markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author)
+          = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
         - if note_editable
           = render 'projects/notes/edit_form', note: note
         .note-awards
           = render 'award_emoji/awards_block', awardable: note, inline: false
-      = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
 
       - if note.attachment.url
         .note-attachment

From 63a5402182aa9697bbd9e2d7192ef661c6d74b86 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 30 May 2016 20:04:08 +0300
Subject: [PATCH 1147/1431] Create and show emoji loader on the fly.

---
 app/assets/javascripts/awards_handler.coffee | 24 ++++++++++++++++----
 app/assets/stylesheets/pages/awards.scss     |  3 ++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 8a6f6d7d185..e01c5d68c43 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -100,12 +100,13 @@ class @AwardsHandler
     $menu.css(css)
 
 
-  addAward: (votesBlock, awardUrl, emoji, checkMutuality = yes) ->
+  addAward: (votesBlock, awardUrl, emoji, checkMutuality = yes, callback) ->
 
     emoji = @normilizeEmojiName emoji
 
     @postEmoji awardUrl, emoji, =>
       @addAwardToEmojiBar votesBlock, emoji, checkMutuality
+      callback?()
 
     $('.emoji-menu').removeClass 'is-visible'
 
@@ -146,11 +147,24 @@ class @AwardsHandler
     awardUrl = @getAwardUrl()
 
     if emoji in [ 'thumbsup', 'thumbsdown' ]
-      mutualVote = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
-      selector   = "[data-emoji=#{mutualVote}]"
+      mutualVote     = if emoji is 'thumbsup' then 'thumbsdown' else 'thumbsup'
+      $emojiButton   = votesBlock.find("[data-emoji=#{mutualVote}]").parent()
+      isAlreadyVoted = $emojiButton.hasClass 'active'
 
-      isAlreadyVoted = votesBlock.find(selector).parent().hasClass 'active'
-      @addAward votesBlock, awardUrl, mutualVote, no if isAlreadyVoted
+      if isAlreadyVoted
+        @showEmojiLoader $emojiButton
+        @addAward votesBlock, awardUrl, mutualVote, no, ->
+          $emojiButton.removeClass 'is-loading'
+
+
+  showEmojiLoader: ($emojiButton) ->
+
+    $loader = $emojiButton.find '.fa-spinner'
+
+    unless $loader.length
+      $emojiButton.append '<i class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"></i>'
+
+    $emojiButton.addClass 'is-loading'
 
 
   isActive: ($emojiButton) -> $emojiButton.hasClass 'active'
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 56d04229f0b..05d1ee5b998 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -109,7 +109,8 @@
   }
 
   &.is-loading {
-    .award-control-icon-normal {
+    .award-control-icon-normal,
+    .emoji-icon {
       display: none;
     }
 

From c1e2b02e34e5038be0c39e11c3172c3375dc0734 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 31 May 2016 22:32:29 +0300
Subject: [PATCH 1148/1431] Added tests for award emoji feature.

---
 app/assets/javascripts/awards_handler.coffee  |  20 +-
 app/assets/stylesheets/pages/notes.scss       |   2 +-
 .../javascripts/awards_handler_spec.js.coffee | 202 ++++
 .../behaviors/quick_submit_spec.js.coffee     |  22 +-
 .../fixtures/awards_handler.html.haml         |  52 +
 .../fixtures/behaviors/quick_submit.html.haml |   2 +-
 spec/javascripts/fixtures/emoji_menu.coffee   | 957 ++++++++++++++++++
 spec/javascripts/new_branch_spec.js.coffee    |   2 +-
 8 files changed, 1235 insertions(+), 24 deletions(-)
 create mode 100644 spec/javascripts/awards_handler_spec.js.coffee
 create mode 100644 spec/javascripts/fixtures/awards_handler.html.haml
 create mode 100644 spec/javascripts/fixtures/emoji_menu.coffee

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index e01c5d68c43..4f4009e6db0 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -202,7 +202,7 @@ class @AwardsHandler
 
   getAwardTooltip: ($awardBlock) ->
 
-    return $awardBlock.attr('data-original-title') or $awardBlock.attr('data-title')
+    return $awardBlock.attr('data-original-title') or $awardBlock.attr('data-title') or ''
 
 
   removeMeFromUserList: ($emojiButton, emoji) ->
@@ -222,7 +222,7 @@ class @AwardsHandler
       .attr 'data-original-title', newAuthors
       .attr 'data-title', newAuthors
 
-    @resetTooltip(awardBlock)
+    @resetTooltip awardBlock
 
 
   addMeToUserList: (votesBlock, emoji) ->
@@ -232,21 +232,21 @@ class @AwardsHandler
     users      = []
 
     if origTitle
-      users = origTitle.trim().split(', ')
+      users = origTitle.trim().split ', '
 
-    users.push('me')
-    awardBlock.attr('title', users.join(', '))
+    users.push 'me'
+    awardBlock.attr 'title', users.join ', '
 
-    @resetTooltip(awardBlock)
+    @resetTooltip awardBlock
 
 
   resetTooltip: (award) ->
-    award.tooltip('destroy')
+
+    award.tooltip 'destroy'
 
     # 'destroy' call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
-    setTimeout (->
-      award.tooltip()
-    ), 200
+    cb = -> award.tooltip()
+    setTimeout cb, 200
 
 
   createEmoji_: (votesBlock, emoji) ->
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 53a9d1144c8..4ebaf227279 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -122,7 +122,7 @@ ul.notes {
 
     .note-awards {
       .js-awards-block {
-        padding: 2px 0;
+        padding: 2px;
         margin-top: 10px;
       }
 
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee
new file mode 100644
index 00000000000..5a95ae52dc8
--- /dev/null
+++ b/spec/javascripts/awards_handler_spec.js.coffee
@@ -0,0 +1,202 @@
+#= require awards_handler
+#= require jquery
+#= require jquery.cookie
+#= require ./fixtures/emoji_menu
+
+awardsHandler = null
+window.gl   or= {}
+window.gl.awardMenuUrl = '/emojis'
+window.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
+
+
+lazyAssert = (done, assertFn) ->
+
+  setTimeout -> # Maybe jasmine.clock here?
+    assertFn()
+    done()
+  , 333
+
+
+describe 'AwardsHandler', ->
+
+  fixture.preload 'awards_handler.html'
+
+  beforeEach ->
+    fixture.load 'awards_handler.html'
+    awardsHandler = new AwardsHandler
+    spyOn(awardsHandler, 'postEmoji').and.callFake (url, emoji, cb) => cb()
+    spyOn(jQuery, 'get').and.callFake (req, cb) ->
+      expect(req).toBe '/emojis'
+      cb window.emojiMenu
+
+
+  describe '::showEmojiMenu', ->
+
+    it 'should show emoji menu when Add emoji button clicked', (done) ->
+
+      $('.js-add-award').eq(0).click()
+
+      lazyAssert done, ->
+        $emojiMenu = $ '.emoji-menu'
+        expect($emojiMenu.length).toBe 1
+        expect($emojiMenu.hasClass('is-visible')).toBe yes
+        expect($emojiMenu.find('#emoji_search').length).toBe 1
+        expect($('.js-awards-block.current').length).toBe 1
+
+
+    it 'should also show emoji menu for the smiley icon in notes', (done) ->
+
+      $('.note-action-button').click()
+
+      lazyAssert done, ->
+        $emojiMenu = $ '.emoji-menu'
+        expect($emojiMenu.length).toBe 1
+
+
+    it 'should remove emoji menu when body is clicked', (done) ->
+
+      $('.js-add-award').eq(0).click()
+
+      lazyAssert done, ->
+        $emojiMenu = $('.emoji-menu')
+        $('body').click()
+        expect($emojiMenu.length).toBe 1
+        expect($emojiMenu.hasClass('is-visible')).toBe no
+        expect($('.js-awards-block.current').length).toBe 0
+
+
+  describe '::addAwardToEmojiBar', ->
+
+    it 'should add emoji to votes block', ->
+
+      $votesBlock = $('.js-awards-block').eq 0
+      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
+
+      $emojiButton = $votesBlock.find '[data-emoji=heart]'
+
+      expect($emojiButton.length).toBe 1
+      expect($emojiButton.next('.js-counter').text()).toBe '1'
+      expect($votesBlock.hasClass('hidden')).toBe no
+
+
+    it 'should remove the emoji when we click again', ->
+
+      $votesBlock = $('.js-awards-block').eq 0
+      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
+      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
+      $emojiButton = $votesBlock.find '[data-emoji=heart]'
+
+      expect($emojiButton.length).toBe 0
+
+
+    it 'should decrement the emoji counter', ->
+
+      $votesBlock = $('.js-awards-block').eq 0
+      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
+
+      $emojiButton = $votesBlock.find '[data-emoji=heart]'
+      $emojiButton.next('.js-counter').text 5
+
+      awardsHandler.addAwardToEmojiBar $votesBlock, 'heart', no
+
+      expect($emojiButton.length).toBe 1
+      expect($emojiButton.next('.js-counter').text()).toBe '4'
+
+
+  describe '::getAwardUrl', ->
+
+    it 'should return the url for request', ->
+
+      expect(awardsHandler.getAwardUrl()).toBe '/gitlab-org/gitlab-test/issues/8/toggle_award_emoji'
+
+
+  describe '::addAward and ::checkMutuality', ->
+
+    it 'should handle :+1: and :-1: mutuality', ->
+
+      awardUrl         = awardsHandler.getAwardUrl()
+      $votesBlock      = $('.js-awards-block').eq 0
+      $thumbsUpEmoji   = $votesBlock.find('[data-emoji=thumbsup]').parent()
+      $thumbsDownEmoji = $votesBlock.find('[data-emoji=thumbsdown]').parent()
+
+      awardsHandler.addAward $votesBlock, awardUrl, 'thumbsup', no
+
+      expect($thumbsUpEmoji.hasClass('active')).toBe yes
+      expect($thumbsDownEmoji.hasClass('active')).toBe no
+
+      $thumbsUpEmoji.tooltip()
+      $thumbsDownEmoji.tooltip()
+
+      awardsHandler.addAward $votesBlock, awardUrl, 'thumbsdown', yes
+
+      expect($thumbsUpEmoji.hasClass('active')).toBe no
+      expect($thumbsDownEmoji.hasClass('active')).toBe yes
+
+
+  describe '::removeEmoji', ->
+
+    it 'should remove emoji', ->
+
+      awardUrl    = awardsHandler.getAwardUrl()
+      $votesBlock = $('.js-awards-block').eq 0
+
+      awardsHandler.addAward $votesBlock, awardUrl, 'fire',  no
+      expect($votesBlock.find('[data-emoji=fire]').length).toBe  1
+
+      awardsHandler.removeEmoji $votesBlock.find('[data-emoji=fire]').closest('button')
+      expect($votesBlock.find('[data-emoji=fire]').length).toBe  0
+
+
+  describe 'search', ->
+
+    it 'should filter the emoji', ->
+
+      $('.js-add-award').eq(0).click()
+
+      expect($('[data-emoji=angel]').is(':visible')).toBe yes
+      expect($('[data-emoji=anger]').is(':visible')).toBe yes
+
+      $('#emoji_search').val('ali').trigger 'keyup'
+
+      expect($('[data-emoji=angel]').is(':visible')).toBe no
+      expect($('[data-emoji=anger]').is(':visible')).toBe no
+      expect($('[data-emoji=alien]').is(':visible')).toBe yes
+      expect($('h5.emoji-search').is(':visible')).toBe yes
+
+
+  describe 'emoji menu', ->
+
+    selector = '[data-emoji=sunglasses]'
+
+    openEmojiMenuAndAddEmoji = ->
+
+      $('.js-add-award').eq(0).click()
+
+      $menu  = $ '.emoji-menu'
+      $block = $ '.js-awards-block'
+      $emoji = $menu.find ".emoji-menu-list-item #{selector}"
+
+      expect($emoji.length).toBe 1
+      expect($block.find(selector).length).toBe 0
+
+      $emoji.click()
+
+      expect($menu.hasClass('.is-visible')).toBe no
+      expect($block.find(selector).length).toBe 1
+
+
+    it 'should add selected emoji to awards block', ->
+
+      openEmojiMenuAndAddEmoji()
+
+
+    it 'should remove already selected emoji', ->
+
+      openEmojiMenuAndAddEmoji()
+      $('.js-add-award').eq(0).click()
+
+      $block = $ '.js-awards-block'
+      $emoji = $('.emoji-menu').find ".emoji-menu-list-item #{selector}"
+
+      $emoji.click()
+      expect($block.find(selector).length).toBe 0
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js.coffee b/spec/javascripts/behaviors/quick_submit_spec.js.coffee
index 09708c12ed4..d3b003a328a 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js.coffee
+++ b/spec/javascripts/behaviors/quick_submit_spec.js.coffee
@@ -14,17 +14,17 @@ describe 'Quick Submit behavior', ->
     }
 
   it 'does not respond to other keyCodes', ->
-    $('input').trigger(keydownEvent(keyCode: 32))
+    $('input.quick-submit-input').trigger(keydownEvent(keyCode: 32))
 
     expect(@spies.submit).not.toHaveBeenTriggered()
 
   it 'does not respond to Enter alone', ->
-    $('input').trigger(keydownEvent(ctrlKey: false, metaKey: false))
+    $('input.quick-submit-input').trigger(keydownEvent(ctrlKey: false, metaKey: false))
 
     expect(@spies.submit).not.toHaveBeenTriggered()
 
   it 'does not respond to repeated events', ->
-    $('input').trigger(keydownEvent(repeat: true))
+    $('input.quick-submit-input').trigger(keydownEvent(repeat: true))
 
     expect(@spies.submit).not.toHaveBeenTriggered()
 
@@ -38,26 +38,26 @@ describe 'Quick Submit behavior', ->
   # only run the tests that apply to the current platform
   if navigator.userAgent.match(/Macintosh/)
     it 'responds to Meta+Enter', ->
-      $('input').trigger(keydownEvent())
+      $('input.quick-submit-input').trigger(keydownEvent())
 
       expect(@spies.submit).toHaveBeenTriggered()
 
     it 'excludes other modifier keys', ->
-      $('input').trigger(keydownEvent(altKey: true))
-      $('input').trigger(keydownEvent(ctrlKey: true))
-      $('input').trigger(keydownEvent(shiftKey: true))
+      $('input.quick-submit-input').trigger(keydownEvent(altKey: true))
+      $('input.quick-submit-input').trigger(keydownEvent(ctrlKey: true))
+      $('input.quick-submit-input').trigger(keydownEvent(shiftKey: true))
 
       expect(@spies.submit).not.toHaveBeenTriggered()
   else
     it 'responds to Ctrl+Enter', ->
-      $('input').trigger(keydownEvent())
+      $('input.quick-submit-input').trigger(keydownEvent())
 
       expect(@spies.submit).toHaveBeenTriggered()
 
     it 'excludes other modifier keys', ->
-      $('input').trigger(keydownEvent(altKey: true))
-      $('input').trigger(keydownEvent(metaKey: true))
-      $('input').trigger(keydownEvent(shiftKey: true))
+      $('input.quick-submit-input').trigger(keydownEvent(altKey: true))
+      $('input.quick-submit-input').trigger(keydownEvent(metaKey: true))
+      $('input.quick-submit-input').trigger(keydownEvent(shiftKey: true))
 
       expect(@spies.submit).not.toHaveBeenTriggered()
 
diff --git a/spec/javascripts/fixtures/awards_handler.html.haml b/spec/javascripts/fixtures/awards_handler.html.haml
new file mode 100644
index 00000000000..d55936ee4f9
--- /dev/null
+++ b/spec/javascripts/fixtures/awards_handler.html.haml
@@ -0,0 +1,52 @@
+.issue-details.issuable-details
+  .detail-page-description.content-block
+    %h2.title Quibusdam sint officiis earum molestiae ipsa autem voluptatem nisi rem.
+    .description.js-task-list-container.is-task-list-enabled
+      .wiki
+        %p Qui exercitationem magnam optio quae fuga earum odio.
+        %textarea.hidden.js-task-list-field Qui exercitationem magnam optio quae fuga earum odio.
+      %small.edited-text
+    .content-block.content-block-small
+      .awards.js-awards-block{"data-award-url" => "/gitlab-org/gitlab-test/issues/8/toggle_award_emoji"}
+        %button.award-control.btn.js-emoji-btn{"data-placement" => "bottom", "data-title" => "", :type => "button"}
+          .icon.emoji-icon.emoji-1F44D{"data-aliases" => "", "data-emoji" => "thumbsup", "data-unicode-name" => "1F44D", :title => "thumbsup"}
+          %span.award-control-text.js-counter 0
+        %button.award-control.btn.js-emoji-btn{"data-placement" => "bottom", "data-title" => "", :type => "button"}
+          .icon.emoji-icon.emoji-1F44E{"data-aliases" => "", "data-emoji" => "thumbsdown", "data-unicode-name" => "1F44E", :title => "thumbsdown"}
+          %span.award-control-text.js-counter 0
+        .award-menu-holder.js-award-holder
+          %button.btn.award-control.js-add-award{:type => "button"}
+            %i.fa.fa-smile-o.award-control-icon.award-control-icon-normal
+            %i.fa.fa-spinner.fa-spin.award-control-icon.award-control-icon-loading
+            %span.award-control-text Add
+    %section.issuable-discussion
+      #notes
+        %ul#notes-list.notes.main-notes-list.timeline
+          %li#note_348.note.note-row-348.timeline-entry{"data-author-id" => "18", "data-editable" => ""}
+            .timeline-entry-inner
+              .timeline-icon
+                %a{:href => "/u/agustin"}
+                  %img.avatar.s40{:alt => "", :src => "#"}/
+              .timeline-content
+                .note-header
+                  %a.author_link{:href => "/u/agustin"}
+                    %span.author Brenna Stokes
+                  .inline.note-headline-light
+                    @agustin commented
+                    %a{:href => "#note_348"}
+                      %time 11 days ago
+                  .note-actions
+                    %span.note-role Reporter
+                    %a.note-action-button.note-emoji-button.js-add-award.js-note-emoji{"data-position" => "right", :href => "#", :title => "Award Emoji"}
+                      %i.fa.fa-spinner.fa-spin
+                      %i.fa.fa-smile-o
+                .js-task-list-container.note-body.is-task-list-enabled
+                  .note-text
+                    %p Suscipit sunt quia quisquam sed eveniet ipsam.
+                  .note-awards
+                    .awards.hidden.js-awards-block{"data-award-url" => "/gitlab-org/gitlab-test/notes/348/toggle_award_emoji"}
+                      .award-menu-holder.js-award-holder
+                        %button.btn.award-control.js-add-award{:type => "button"}
+                          %i.fa.fa-smile-o.award-control-icon.award-control-icon-normal
+                          %i.fa.fa-spinner.fa-spin.award-control-icon.award-control-icon-loading
+                          %span.award-control-text Add
diff --git a/spec/javascripts/fixtures/behaviors/quick_submit.html.haml b/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
index e3788bee813..dc2ceed42f4 100644
--- a/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
+++ b/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
@@ -1,5 +1,5 @@
 %form.js-quick-submit{ action: '/foo' }
-  %input{ type: 'text' }
+  %input{ type: 'text', class: 'quick-submit-input'}
   %textarea
 
   %input{ type: 'submit'} Submit
diff --git a/spec/javascripts/fixtures/emoji_menu.coffee b/spec/javascripts/fixtures/emoji_menu.coffee
new file mode 100644
index 00000000000..e529dd5f1cd
--- /dev/null
+++ b/spec/javascripts/fixtures/emoji_menu.coffee
@@ -0,0 +1,957 @@
+window.emojiMenu = """
+  <div class='emoji-menu'>
+    <div class='emoji-menu-content'>
+      <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" />
+      <h5 class='emoji-menu-title'>
+      Emoticons
+      </h5>
+      <ul class='clearfix emoji-menu-list'>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F47D" title="alien" data-aliases="" data-emoji="alien" data-unicode-name="1F47D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F47C" title="angel" data-aliases="" data-emoji="angel" data-unicode-name="1F47C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A2" title="anger" data-aliases="" data-emoji="anger" data-unicode-name="1F4A2"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F620" title="angry" data-aliases="" data-emoji="angry" data-unicode-name="1F620"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F627" title="anguished" data-aliases="" data-emoji="anguished" data-unicode-name="1F627"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F632" title="astonished" data-aliases="" data-emoji="astonished" data-unicode-name="1F632"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F45F" title="athletic_shoe" data-aliases="" data-emoji="athletic_shoe" data-unicode-name="1F45F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F476" title="baby" data-aliases="" data-emoji="baby" data-unicode-name="1F476"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F459" title="bikini" data-aliases="" data-emoji="bikini" data-unicode-name="1F459"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F499" title="blue_heart" data-aliases="" data-emoji="blue_heart" data-unicode-name="1F499"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F60A" title="blush" data-aliases="" data-emoji="blush" data-unicode-name="1F60A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A5" title="boom" data-aliases="" data-emoji="boom" data-unicode-name="1F4A5"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F462" title="boot" data-aliases="" data-emoji="boot" data-unicode-name="1F462"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F647" title="bow" data-aliases="" data-emoji="bow" data-unicode-name="1F647"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F466" title="boy" data-aliases="" data-emoji="boy" data-unicode-name="1F466"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F470" title="bride_with_veil" data-aliases="" data-emoji="bride_with_veil" data-unicode-name="1F470"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4BC" title="briefcase" data-aliases="" data-emoji="briefcase" data-unicode-name="1F4BC"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F494" title="broken_heart" data-aliases="" data-emoji="broken_heart" data-unicode-name="1F494"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F464" title="bust_in_silhouette" data-aliases="" data-emoji="bust_in_silhouette" data-unicode-name="1F464"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F465" title="busts_in_silhouette" data-aliases="" data-emoji="busts_in_silhouette" data-unicode-name="1F465"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F44F" title="clap" data-aliases="" data-emoji="clap" data-unicode-name="1F44F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F302" title="closed_umbrella" data-aliases="" data-emoji="closed_umbrella" data-unicode-name="1F302"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F630" title="cold_sweat" data-aliases="" data-emoji="cold_sweat" data-unicode-name="1F630"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F616" title="confounded" data-aliases="" data-emoji="confounded" data-unicode-name="1F616"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F615" title="confused" data-aliases="" data-emoji="confused" data-unicode-name="1F615"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F477" title="construction_worker" data-aliases="" data-emoji="construction_worker" data-unicode-name="1F477"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F46E" title="cop" data-aliases="" data-emoji="cop" data-unicode-name="1F46E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F46B" title="couple" data-aliases="" data-emoji="couple" data-unicode-name="1F46B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F491" title="couple_with_heart" data-aliases="" data-emoji="couple_with_heart" data-unicode-name="1F491"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F48F" title="couplekiss" data-aliases="" data-emoji="couplekiss" data-unicode-name="1F48F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F451" title="crown" data-aliases="" data-emoji="crown" data-unicode-name="1F451"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F622" title="cry" data-aliases="" data-emoji="cry" data-unicode-name="1F622"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F63F" title="crying_cat_face" data-aliases="" data-emoji="crying_cat_face" data-unicode-name="1F63F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F498" title="cupid" data-aliases="" data-emoji="cupid" data-unicode-name="1F498"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F483" title="dancer" data-aliases="" data-emoji="dancer" data-unicode-name="1F483"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F46F" title="dancers" data-aliases="" data-emoji="dancers" data-unicode-name="1F46F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A8" title="dash" data-aliases="" data-emoji="dash" data-unicode-name="1F4A8"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F61E" title="disappointed" data-aliases="" data-emoji="disappointed" data-unicode-name="1F61E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F625" title="disappointed_relieved" data-aliases="" data-emoji="disappointed_relieved" data-unicode-name="1F625"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4AB" title="dizzy" data-aliases="" data-emoji="dizzy" data-unicode-name="1F4AB"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F635" title="dizzy_face" data-aliases="" data-emoji="dizzy_face" data-unicode-name="1F635"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F457" title="dress" data-aliases="" data-emoji="dress" data-unicode-name="1F457"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A7" title="droplet" data-aliases="" data-emoji="droplet" data-unicode-name="1F4A7"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F442" title="ear" data-aliases="" data-emoji="ear" data-unicode-name="1F442"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F611" title="expressionless" data-aliases="" data-emoji="expressionless" data-unicode-name="1F611"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F453" title="eyeglasses" data-aliases="" data-emoji="eyeglasses" data-unicode-name="1F453"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F440" title="eyes" data-aliases="" data-emoji="eyes" data-unicode-name="1F440"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F46A" title="family" data-aliases="" data-emoji="family" data-unicode-name="1F46A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F628" title="fearful" data-aliases="" data-emoji="fearful" data-unicode-name="1F628"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F525" title="fire" data-aliases=":flame:" data-emoji="fire" data-unicode-name="1F525"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-270A" title="fist" data-aliases="" data-emoji="fist" data-unicode-name="270A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F633" title="flushed" data-aliases="" data-emoji="flushed" data-unicode-name="1F633"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F463" title="footprints" data-aliases="" data-emoji="footprints" data-unicode-name="1F463"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F626" title="frowning" data-aliases=":anguished:" data-emoji="frowning" data-unicode-name="1F626"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F48E" title="gem" data-aliases="" data-emoji="gem" data-unicode-name="1F48E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F467" title="girl" data-aliases="" data-emoji="girl" data-unicode-name="1F467"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F49A" title="green_heart" data-aliases="" data-emoji="green_heart" data-unicode-name="1F49A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F62C" title="grimacing" data-aliases="" data-emoji="grimacing" data-unicode-name="1F62C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F601" title="grin" data-aliases="" data-emoji="grin" data-unicode-name="1F601"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F600" title="grinning" data-aliases="" data-emoji="grinning" data-unicode-name="1F600"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F482" title="guardsman" data-aliases="" data-emoji="guardsman" data-unicode-name="1F482"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F487" title="haircut" data-aliases="" data-emoji="haircut" data-unicode-name="1F487"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F45C" title="handbag" data-aliases="" data-emoji="handbag" data-unicode-name="1F45C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F649" title="hear_no_evil" data-aliases="" data-emoji="hear_no_evil" data-unicode-name="1F649"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-2764" title="heart" data-aliases="" data-emoji="heart" data-unicode-name="2764"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F60D" title="heart_eyes" data-aliases="" data-emoji="heart_eyes" data-unicode-name="1F60D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F63B" title="heart_eyes_cat" data-aliases="" data-emoji="heart_eyes_cat" data-unicode-name="1F63B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F493" title="heartbeat" data-aliases="" data-emoji="heartbeat" data-unicode-name="1F493"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F497" title="heartpulse" data-aliases="" data-emoji="heartpulse" data-unicode-name="1F497"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F460" title="high_heel" data-aliases="" data-emoji="high_heel" data-unicode-name="1F460"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F62F" title="hushed" data-aliases="" data-emoji="hushed" data-unicode-name="1F62F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F47F" title="imp" data-aliases="" data-emoji="imp" data-unicode-name="1F47F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F481" title="information_desk_person" data-aliases="" data-emoji="information_desk_person" data-unicode-name="1F481"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F607" title="innocent" data-aliases="" data-emoji="innocent" data-unicode-name="1F607"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F47A" title="japanese_goblin" data-aliases="" data-emoji="japanese_goblin" data-unicode-name="1F47A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F479" title="japanese_ogre" data-aliases="" data-emoji="japanese_ogre" data-unicode-name="1F479"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F456" title="jeans" data-aliases="" data-emoji="jeans" data-unicode-name="1F456"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F602" title="joy" data-aliases="" data-emoji="joy" data-unicode-name="1F602"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F639" title="joy_cat" data-aliases="" data-emoji="joy_cat" data-unicode-name="1F639"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F458" title="kimono" data-aliases="" data-emoji="kimono" data-unicode-name="1F458"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F48B" title="kiss" data-aliases="" data-emoji="kiss" data-unicode-name="1F48B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F617" title="kissing" data-aliases="" data-emoji="kissing" data-unicode-name="1F617"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F63D" title="kissing_cat" data-aliases="" data-emoji="kissing_cat" data-unicode-name="1F63D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F61A" title="kissing_closed_eyes" data-aliases="" data-emoji="kissing_closed_eyes" data-unicode-name="1F61A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F618" title="kissing_heart" data-aliases="" data-emoji="kissing_heart" data-unicode-name="1F618"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F619" title="kissing_smiling_eyes" data-aliases="" data-emoji="kissing_smiling_eyes" data-unicode-name="1F619"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F606" title="laughing" data-aliases=":satisfied:" data-emoji="laughing" data-unicode-name="1F606"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F444" title="lips" data-aliases="" data-emoji="lips" data-unicode-name="1F444"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F484" title="lipstick" data-aliases="" data-emoji="lipstick" data-unicode-name="1F484"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F48C" title="love_letter" data-aliases="" data-emoji="love_letter" data-unicode-name="1F48C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F468" title="man" data-aliases="" data-emoji="man" data-unicode-name="1F468"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F472" title="man_with_gua_pi_mao" data-aliases="" data-emoji="man_with_gua_pi_mao" data-unicode-name="1F472"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F473" title="man_with_turban" data-aliases="" data-emoji="man_with_turban" data-unicode-name="1F473"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F45E" title="mans_shoe" data-aliases="" data-emoji="mans_shoe" data-unicode-name="1F45E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F637" title="mask" data-aliases="" data-emoji="mask" data-unicode-name="1F637"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F486" title="massage" data-aliases="" data-emoji="massage" data-unicode-name="1F486"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4AA" title="muscle" data-aliases="" data-emoji="muscle" data-unicode-name="1F4AA"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F485" title="nail_care" data-aliases="" data-emoji="nail_care" data-unicode-name="1F485"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F454" title="necktie" data-aliases="" data-emoji="necktie" data-unicode-name="1F454"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F610" title="neutral_face" data-aliases="" data-emoji="neutral_face" data-unicode-name="1F610"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F645" title="no_good" data-aliases="" data-emoji="no_good" data-unicode-name="1F645"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F636" title="no_mouth" data-aliases="" data-emoji="no_mouth" data-unicode-name="1F636"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F443" title="nose" data-aliases="" data-emoji="nose" data-unicode-name="1F443"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F44C" title="ok_hand" data-aliases="" data-emoji="ok_hand" data-unicode-name="1F44C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F646" title="ok_woman" data-aliases="" data-emoji="ok_woman" data-unicode-name="1F646"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F474" title="older_man" data-aliases="" data-emoji="older_man" data-unicode-name="1F474"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F475" title="older_woman" data-aliases=":grandma:" data-emoji="older_woman" data-unicode-name="1F475"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F450" title="open_hands" data-aliases="" data-emoji="open_hands" data-unicode-name="1F450"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F62E" title="open_mouth" data-aliases="" data-emoji="open_mouth" data-unicode-name="1F62E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F614" title="pensive" data-aliases="" data-emoji="pensive" data-unicode-name="1F614"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F623" title="persevere" data-aliases="" data-emoji="persevere" data-unicode-name="1F623"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F64D" title="person_frowning" data-aliases="" data-emoji="person_frowning" data-unicode-name="1F64D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F471" title="person_with_blond_hair" data-aliases="" data-emoji="person_with_blond_hair" data-unicode-name="1F471"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F64E" title="person_with_pouting_face" data-aliases="" data-emoji="person_with_pouting_face" data-unicode-name="1F64E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F447" title="point_down" data-aliases="" data-emoji="point_down" data-unicode-name="1F447"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F448" title="point_left" data-aliases="" data-emoji="point_left" data-unicode-name="1F448"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F449" title="point_right" data-aliases="" data-emoji="point_right" data-unicode-name="1F449"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-261D" title="point_up" data-aliases="" data-emoji="point_up" data-unicode-name="261D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F446" title="point_up_2" data-aliases="" data-emoji="point_up_2" data-unicode-name="1F446"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A9" title="poop" data-aliases=":shit: :hankey: :poo:" data-emoji="poop" data-unicode-name="1F4A9"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F45D" title="pouch" data-aliases="" data-emoji="pouch" data-unicode-name="1F45D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F63E" title="pouting_cat" data-aliases="" data-emoji="pouting_cat" data-unicode-name="1F63E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F64F" title="pray" data-aliases="" data-emoji="pray" data-unicode-name="1F64F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F478" title="princess" data-aliases="" data-emoji="princess" data-unicode-name="1F478"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F44A" title="punch" data-aliases="" data-emoji="punch" data-unicode-name="1F44A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F49C" title="purple_heart" data-aliases="" data-emoji="purple_heart" data-unicode-name="1F49C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F45B" title="purse" data-aliases="" data-emoji="purse" data-unicode-name="1F45B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F621" title="rage" data-aliases="" data-emoji="rage" data-unicode-name="1F621"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-270B" title="raised_hand" data-aliases="" data-emoji="raised_hand" data-unicode-name="270B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F64C" title="raised_hands" data-aliases="" data-emoji="raised_hands" data-unicode-name="1F64C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F64B" title="raising_hand" data-aliases="" data-emoji="raising_hand" data-unicode-name="1F64B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-263A" title="relaxed" data-aliases="" data-emoji="relaxed" data-unicode-name="263A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F60C" title="relieved" data-aliases="" data-emoji="relieved" data-unicode-name="1F60C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F49E" title="revolving_hearts" data-aliases="" data-emoji="revolving_hearts" data-unicode-name="1F49E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F380" title="ribbon" data-aliases="" data-emoji="ribbon" data-unicode-name="1F380"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F48D" title="ring" data-aliases="" data-emoji="ring" data-unicode-name="1F48D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F3C3" title="runner" data-aliases="" data-emoji="runner" data-unicode-name="1F3C3"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F3BD" title="running_shirt_with_sash" data-aliases="" data-emoji="running_shirt_with_sash" data-unicode-name="1F3BD"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F461" title="sandal" data-aliases="" data-emoji="sandal" data-unicode-name="1F461"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F631" title="scream" data-aliases="" data-emoji="scream" data-unicode-name="1F631"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F640" title="scream_cat" data-aliases="" data-emoji="scream_cat" data-unicode-name="1F640"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F648" title="see_no_evil" data-aliases="" data-emoji="see_no_evil" data-unicode-name="1F648"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F455" title="shirt" data-aliases="" data-emoji="shirt" data-unicode-name="1F455"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F480" title="skull" data-aliases=":skeleton:" data-emoji="skull" data-unicode-name="1F480"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F634" title="sleeping" data-aliases="" data-emoji="sleeping" data-unicode-name="1F634"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F62A" title="sleepy" data-aliases="" data-emoji="sleepy" data-unicode-name="1F62A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F604" title="smile" data-aliases="" data-emoji="smile" data-unicode-name="1F604"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F638" title="smile_cat" data-aliases="" data-emoji="smile_cat" data-unicode-name="1F638"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F603" title="smiley" data-aliases="" data-emoji="smiley" data-unicode-name="1F603"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F63A" title="smiley_cat" data-aliases="" data-emoji="smiley_cat" data-unicode-name="1F63A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F608" title="smiling_imp" data-aliases="" data-emoji="smiling_imp" data-unicode-name="1F608"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F60F" title="smirk" data-aliases="" data-emoji="smirk" data-unicode-name="1F60F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F63C" title="smirk_cat" data-aliases="" data-emoji="smirk_cat" data-unicode-name="1F63C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F62D" title="sob" data-aliases="" data-emoji="sob" data-unicode-name="1F62D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-2728" title="sparkles" data-aliases="" data-emoji="sparkles" data-unicode-name="2728"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F496" title="sparkling_heart" data-aliases="" data-emoji="sparkling_heart" data-unicode-name="1F496"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F64A" title="speak_no_evil" data-aliases="" data-emoji="speak_no_evil" data-unicode-name="1F64A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4AC" title="speech_balloon" data-aliases="" data-emoji="speech_balloon" data-unicode-name="1F4AC"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F31F" title="star2" data-aliases="" data-emoji="star2" data-unicode-name="1F31F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F61B" title="stuck_out_tongue" data-aliases="" data-emoji="stuck_out_tongue" data-unicode-name="1F61B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F61D" title="stuck_out_tongue_closed_eyes" data-aliases="" data-emoji="stuck_out_tongue_closed_eyes" data-unicode-name="1F61D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F61C" title="stuck_out_tongue_winking_eye" data-aliases="" data-emoji="stuck_out_tongue_winking_eye" data-unicode-name="1F61C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F60E" title="sunglasses" data-aliases="" data-emoji="sunglasses" data-unicode-name="1F60E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F613" title="sweat" data-aliases="" data-emoji="sweat" data-unicode-name="1F613"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A6" title="sweat_drops" data-aliases="" data-emoji="sweat_drops" data-unicode-name="1F4A6"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F605" title="sweat_smile" data-aliases="" data-emoji="sweat_smile" data-unicode-name="1F605"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4AD" title="thought_balloon" data-aliases="" data-emoji="thought_balloon" data-unicode-name="1F4AD"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F44E" title="thumbsdown" data-aliases=":-1:" data-emoji="thumbsdown" data-unicode-name="1F44E"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F44D" title="thumbsup" data-aliases=":+1:" data-emoji="thumbsup" data-unicode-name="1F44D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F62B" title="tired_face" data-aliases="" data-emoji="tired_face" data-unicode-name="1F62B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F445" title="tongue" data-aliases="" data-emoji="tongue" data-unicode-name="1F445"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F3A9" title="tophat" data-aliases="" data-emoji="tophat" data-unicode-name="1F3A9"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F624" title="triumph" data-aliases="" data-emoji="triumph" data-unicode-name="1F624"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F495" title="two_hearts" data-aliases="" data-emoji="two_hearts" data-unicode-name="1F495"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F46C" title="two_men_holding_hands" data-aliases="" data-emoji="two_men_holding_hands" data-unicode-name="1F46C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F46D" title="two_women_holding_hands" data-aliases="" data-emoji="two_women_holding_hands" data-unicode-name="1F46D"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F612" title="unamused" data-aliases="" data-emoji="unamused" data-unicode-name="1F612"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-270C" title="v" data-aliases="" data-emoji="v" data-unicode-name="270C"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F6B6" title="walking" data-aliases="" data-emoji="walking" data-unicode-name="1F6B6"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F44B" title="wave" data-aliases="" data-emoji="wave" data-unicode-name="1F44B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F629" title="weary" data-aliases="" data-emoji="weary" data-unicode-name="1F629"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F609" title="wink" data-aliases="" data-emoji="wink" data-unicode-name="1F609"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F469" title="woman" data-aliases="" data-emoji="woman" data-unicode-name="1F469"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F45A" title="womans_clothes" data-aliases="" data-emoji="womans_clothes" data-unicode-name="1F45A"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F452" title="womans_hat" data-aliases="" data-emoji="womans_hat" data-unicode-name="1F452"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F61F" title="worried" data-aliases="" data-emoji="worried" data-unicode-name="1F61F"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F49B" title="yellow_heart" data-aliases="" data-emoji="yellow_heart" data-unicode-name="1F49B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F60B" title="yum" data-aliases="" data-emoji="yum" data-unicode-name="1F60B"></div>
+          </button>
+        </li>
+        <li class='pull-left text-center emoji-menu-list-item'>
+          <button class='emoji-menu-btn text-center js-emoji-btn' type='button'>
+          <div class="icon emoji-icon emoji-1F4A4" title="zzz" data-aliases="" data-emoji="zzz" data-unicode-name="1F4A4"></div>
+          </button>
+        </li>
+      </ul>
+    </div>
+  </div>
+"""
diff --git a/spec/javascripts/new_branch_spec.js.coffee b/spec/javascripts/new_branch_spec.js.coffee
index f2ce85efcdc..ce773793817 100644
--- a/spec/javascripts/new_branch_spec.js.coffee
+++ b/spec/javascripts/new_branch_spec.js.coffee
@@ -1,4 +1,4 @@
-#= require jquery-ui
+#= require jquery-ui/autocomplete
 #= require new_branch_form
 
 describe 'Branch', ->

From 5dbb3883f81682f07425c2ddb52bd0f75059885d Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 1 Jun 2016 20:14:45 +0300
Subject: [PATCH 1149/1431] Fix scss-lint.

---
 app/assets/stylesheets/framework/timeline.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 62935c95c51..0b0bd80c326 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -5,7 +5,7 @@
   padding: 0;
 
   .timeline-entry {
-    padding: $gl-padding $gl-btn-padding 11px $gl-btn-padding;
+    padding: $gl-padding $gl-btn-padding 11px;
     border-color: $table-border-color;
     color: $gl-gray;
     border-bottom: 1px solid $border-white-light;

From 7d3f8f542f0fe02ae27d5f527d578c19f47eec71 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Thu, 2 Jun 2016 18:25:51 +0200
Subject: [PATCH 1150/1431] Update tests on wording

---
 spec/controllers/projects/notes_controller_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index cb7d04a059c..00bc38b6071 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -16,12 +16,12 @@ describe Projects::NotesController do
       expect do
         post(:toggle_award_emoji, namespace_id: project.namespace.path,
                                   project_id: project.path, id: note.id, name: "thumbsup")
-      end.to change { AwardEmoji.count }.by(1)
+      end.to change { note.award_emoji.count }.by(1)
 
       expect(response.status).to eq(200)
     end
 
-    it "removes the already let award emoji" do
+    it "removes the already awarded emoji" do
       post(:toggle_award_emoji, namespace_id: project.namespace.path,
                                 project_id: project.path, id: note.id, name: "thumbsup")
 

From 9614c52266fd7009c1dd2960564d4f65b1a12f80 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Jun 2016 11:19:54 +0200
Subject: [PATCH 1151/1431] Fix tests offenses: use `pipeline` of Ci::Build and
 rename views

---
 .../projects/merge_requests_controller.rb     |  2 +-
 app/views/admin/runners/show.html.haml        |  4 +-
 app/views/notify/build_fail_email.html.haml   |  4 +-
 app/views/notify/build_fail_email.text.erb    |  6 +--
 .../notify/build_success_email.html.haml      |  4 +-
 app/views/notify/build_success_email.text.erb |  6 +--
 app/views/projects/builds/show.html.haml      | 12 ++---
 .../_pipeline.html.haml}                      | 44 +++++++++----------
 features/steps/shared/builds.rb               |  2 +-
 spec/requests/api/merge_requests_spec.rb      |  2 +-
 spec/requests/ci/api/builds_spec.rb           |  2 +-
 11 files changed, 44 insertions(+), 44 deletions(-)
 rename app/views/projects/ci/{commits/_commit.html.haml => pipelines/_pipeline.html.haml} (57%)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e6924a6a450..1fca05e949a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -316,7 +316,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @merge_request_diff = @merge_request.merge_request_diff
 
     @pipeline = @merge_request.pipeline
-    @statuses = @ci_commit.statuses if @pipeline
+    @statuses = @pipeline.statuses if @pipeline
 
     if @merge_request.locked_long_ago?
       @merge_request.unlock_mr
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index c3784bf7192..e049b40bfab 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -99,8 +99,8 @@
 
           %td.build-link
             - if project
-              = link_to ci_status_path(build.commit) do
-                %strong #{build.commit.short_sha}
+              = link_to ci_status_path(build.pipeline) do
+                %strong #{build.pipeline.short_sha}
 
           %td.timestamp
             - if build.finished_at
diff --git a/app/views/notify/build_fail_email.html.haml b/app/views/notify/build_fail_email.html.haml
index 81d65037312..4bf7c1f4d64 100644
--- a/app/views/notify/build_fail_email.html.haml
+++ b/app/views/notify/build_fail_email.html.haml
@@ -10,7 +10,7 @@
 %p
   Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.project.namespace, @build.project, @build.sha)}
 %p
-  Author: #{@build.commit.git_author_name}
+  Author: #{@build.pipeline.git_author_name}
 %p
   Branch: #{@build.ref}
 %p
@@ -18,7 +18,7 @@
 %p
   Job: #{@build.name}
 %p
-  Message: #{@build.commit.git_commit_message}
+  Message: #{@build.pipeline.git_commit_message}
 
 %p
   Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
diff --git a/app/views/notify/build_fail_email.text.erb b/app/views/notify/build_fail_email.text.erb
index 675acea60a1..9d497983498 100644
--- a/app/views/notify/build_fail_email.text.erb
+++ b/app/views/notify/build_fail_email.text.erb
@@ -1,11 +1,11 @@
 Build failed for <%= @project.name %>
 
 Status:   <%= @build.status %>
-Commit:   <%= @build.commit.short_sha %>
-Author:   <%= @build.commit.git_author_name %>
+Commit:   <%= @build.pipeline.short_sha %>
+Author:   <%= @build.pipeline.git_author_name %>
 Branch:   <%= @build.ref %>
 Stage:    <%= @build.stage %>
 Job:      <%= @build.name %>
-Message:  <%= @build.commit.git_commit_message %>
+Message:  <%= @build.pipeline.git_commit_message %>
 
 Url:      <%= namespace_project_build_url(@build.project.namespace, @build.project, @build) %>
diff --git a/app/views/notify/build_success_email.html.haml b/app/views/notify/build_success_email.html.haml
index 5d247eb4cf2..252a5b7152c 100644
--- a/app/views/notify/build_success_email.html.haml
+++ b/app/views/notify/build_success_email.html.haml
@@ -10,7 +10,7 @@
 %p
   Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.project.namespace, @build.project, @build.sha)}
 %p
-  Author: #{@build.commit.git_author_name}
+  Author: #{@build.pipeline.git_author_name}
 %p
   Branch: #{@build.ref}
 %p
@@ -18,7 +18,7 @@
 %p
   Job: #{@build.name}
 %p
-  Message: #{@build.commit.git_commit_message}
+  Message: #{@build.pipeline.git_commit_message}
 
 %p
   Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
diff --git a/app/views/notify/build_success_email.text.erb b/app/views/notify/build_success_email.text.erb
index 747da44acae..c5ed4f84861 100644
--- a/app/views/notify/build_success_email.text.erb
+++ b/app/views/notify/build_success_email.text.erb
@@ -1,11 +1,11 @@
 Build successful for <%= @project.name %>
 
 Status:   <%= @build.status %>
-Commit:   <%= @build.commit.short_sha %>
-Author:   <%= @build.commit.git_author_name %>
+Commit:   <%= @build.pipeline.short_sha %>
+Author:   <%= @build.pipeline.git_author_name %>
 Branch:   <%= @build.ref %>
 Stage:    <%= @build.stage %>
 Job:      <%= @build.name %>
-Message:  <%= @build.commit.git_commit_message %>
+Message:  <%= @build.pipeline.git_commit_message %>
 
 Url:      <%= namespace_project_build_url(@build.project.namespace, @build.project, @build) %>
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 16017c994ba..5477fc65c2b 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -4,7 +4,7 @@
 .build-page
   .row-content-block.top-block
     Build ##{@build.id} for commit
-    %strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit)
+    %strong.monospace= link_to @build.pipeline.short_sha, ci_status_path(@build.pipeline)
     from
     = link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref)
     - merge_request = @build.merge_request
@@ -13,7 +13,7 @@
       = link_to "merge request #{merge_request.to_reference}", merge_request_path(merge_request)
 
   #up-build-trace
-  - builds = @build.commit.builds.latest.to_a
+  - builds = @build.pipeline.builds.latest.to_a
   - if builds.size > 1
     %ul.nav-links.no-top.no-bottom
       - builds.each do |build|
@@ -178,16 +178,16 @@
           Commit
           .pull-right
             %small
-              = link_to @build.commit.short_sha, ci_status_path(@build.commit), class: "monospace"
+              = link_to @build.pipeline.short_sha, ci_status_path(@build.pipeline), class: "monospace"
         %p
           %span.attr-name Branch:
           = link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref)
         %p
           %span.attr-name Author:
-          #{@build.commit.git_author_name}
+          #{@build.pipeline.git_author_name}
         %p
           %span.attr-name Message:
-          #{@build.commit.git_commit_message}
+          #{@build.pipeline.git_commit_message}
 
       - if @build.tags.any?
         .build-widget
@@ -201,7 +201,7 @@
         .build-widget
           %h4.title #{pluralize(@builds.count(:id), "other build")} for
           = succeed ":" do
-            = link_to @build.commit.short_sha, ci_status_path(@build.commit), class: "monospace"
+            = link_to @build.pipeline.short_sha, ci_status_path(@build.pipeline), class: "monospace"
           %table.table.builds
             - @builds.each_with_index do |build, i|
               %tr.build
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
similarity index 57%
rename from app/views/projects/ci/commits/_commit.html.haml
rename to app/views/projects/ci/pipelines/_pipeline.html.haml
index 5e3a4123a8e..a0ffa065067 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -1,55 +1,55 @@
-- status = commit.status
+- status = pipeline.status
 %tr.commit
   %td.commit-link
-    = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: "ci-status ci-#{status}" do
+    = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: "ci-status ci-#{status}" do
       = ci_icon_for_status(status)
-      %strong ##{commit.id}
+      %strong ##{pipeline.id}
 
   %td
     %div.branch-commit
-      - if commit.ref
-        = link_to commit.ref, namespace_project_commits_path(@project.namespace, @project, commit.ref), class: "monospace"
+      - if pipeline.ref
+        = link_to pipeline.ref, namespace_project_commits_path(@project.namespace, @project, pipeline.ref), class: "monospace"
         &middot;
-      = link_to commit.short_sha, namespace_project_commit_path(@project.namespace, @project, commit.sha), class: "commit-id monospace"
+      = link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: "commit-id monospace"
       &nbsp;
-      - if commit.tag?
+      - if pipeline.tag?
         %span.label.label-primary tag
-      - elsif commit.latest?
+      - elsif pipeline.latest?
         %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
-      - if commit.triggered?
+      - if pipeline.triggered?
         %span.label.label-primary triggered
-      - if commit.yaml_errors.present?
-        %span.label.label-danger.has-tooltip{ title: "#{commit.yaml_errors}" } yaml invalid
-      - if commit.builds.any?(&:stuck?)
+      - if pipeline.yaml_errors.present?
+        %span.label.label-danger.has-tooltip{ title: "#{pipeline.yaml_errors}" } yaml invalid
+      - if pipeline.builds.any?(&:stuck?)
         %span.label.label-warning stuck
 
       %p.commit-title
-        - if commit_data = commit.commit_data
+        - if commit_data = pipeline.commit_data
           = link_to_gfm truncate(commit_data.title, length: 60), namespace_project_commit_path(@project.namespace, @project, commit_data.id), class: "commit-row-message"
         - else
           Cant find HEAD commit for this branch
 
 
-    - stages_status = commit.statuses.stages_status
+    - stages_status = pipeline.statuses.stages_status
     - stages.each do |stage|
       %td
         - status = stages_status[stage]
         - tooltip = "#{stage.titleize}: #{status || 'not found'}"
         - if status
-          = link_to namespace_project_pipeline_path(@project.namespace, @project, commit.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
+          = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
             = ci_icon_for_status(status)
         - else
           .light.has-tooltip{ title: tooltip }
             \-
 
   %td
-    - if commit.started_at && commit.finished_at
+    - if pipeline.started_at && pipeline.finished_at
       %p.duration
-        #{duration_in_words(commit.finished_at, commit.started_at)}
+        #{duration_in_words(pipeline.finished_at, pipeline.started_at)}
 
   %td
     .controls.hidden-xs.pull-right
-      - artifacts = commit.builds.latest.select { |b| b.artifacts? }
+      - artifacts = pipeline.builds.latest.select { |b| b.artifacts? }
       - if artifacts.present?
         .dropdown.inline.build-artifacts
           %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
@@ -63,9 +63,9 @@
                   %span #{build.name}
 
       - if can?(current_user, :update_pipeline, @project)
-        - if commit.retryable?
-          = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do
+        - if pipeline.retryable?
+          = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do
             = icon("repeat")
-        - if commit.cancelable?
-          = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
+        - if pipeline.cancelable?
+          = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do
             = icon("remove")
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 92d7bed0450..bcb8d0fc507 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -11,7 +11,7 @@ module SharedBuilds
 
   step 'project has a recent build' do
     @ci_commit = create(:ci_commit, project: @project, sha: @project.commit.sha, ref: 'master')
-    @build = create(:ci_build_with_coverage, commit: @ci_commit)
+    @build = create(:ci_build_with_coverage, pipeline: @ci_commit)
   end
 
   step 'recent build is successful' do
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 04cf15641d0..03bc8b70551 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -443,7 +443,7 @@ describe API::API, api: true  do
 
     it "enables merge when build succeeds if the ci is active" do
       allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
-      allow(ci_commit).to receive(:active?).and_return(true)
+      allow(pipeline).to receive(:active?).and_return(true)
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
 
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 10e3631f5fc..11316d89eba 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -85,7 +85,7 @@ describe Ci::API::API do
         trigger = FactoryGirl.create(:ci_trigger, project: project)
         commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
 
-        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: commit, trigger: trigger)
+        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger)
         commit.create_builds(nil, trigger_request)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 

From 72947148e54cda37723adad4cad73311e0c926d7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Jun 2016 12:17:37 +0200
Subject: [PATCH 1152/1431] Don't install knapsack

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8d8557a465..ac522160d69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,6 @@ before_script:
   - cp config/gitlab.yml.example config/gitlab.yml
   - bundle --version
   - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"'
-  - retry gem install knapsack
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
 stages:

From 8c3ba8d6c9021f250fb1597f6b597d817af46b38 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 6 Jun 2016 13:16:30 +0200
Subject: [PATCH 1153/1431] Add workhorse controller and API helpers

---
 app/controllers/application_controller.rb       |  1 +
 app/controllers/projects/avatars_controller.rb  |  5 +----
 app/controllers/projects/raw_controller.rb      |  5 +----
 .../projects/repositories_controller.rb         |  3 +--
 app/helpers/workhorse_helper.rb                 | 17 +++++++++++++++++
 db/schema.rb                                    |  1 +
 lib/api/helpers.rb                              | 10 ++++++++++
 lib/api/repositories.rb                         | 10 +++-------
 lib/gitlab/workhorse.rb                         |  8 ++++----
 .../controllers/projects/raw_controller_spec.rb |  2 ++
 .../projects/repositories_controller_spec.rb    |  5 +++--
 spec/lib/gitlab/workhorse_spec.rb               |  2 +-
 12 files changed, 45 insertions(+), 24 deletions(-)
 create mode 100644 app/helpers/workhorse_helper.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 62f63701799..cd6ae507cf1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,6 +6,7 @@ class ApplicationController < ActionController::Base
   include Gitlab::GonHelper
   include GitlabRoutingHelper
   include PageLayoutHelper
+  include WorkhorseHelper
 
   before_action :authenticate_user_from_token!
   before_action :authenticate_user!
diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb
index 72921b3aa14..5962f74c39b 100644
--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -10,10 +10,7 @@ class Projects::AvatarsController < Projects::ApplicationController
 
       return if cached_blob?
 
-      headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob))
-      headers['Content-Disposition'] = 'inline'
-      headers['Content-Type'] = safe_content_type(@blob)
-      head :ok # 'render nothing: true' messes up the Content-Type
+      send_git_blob @repository, @blob
     else
       render_404
     end
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index 10de0e60530..10d24da16d7 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -18,10 +18,7 @@ class Projects::RawController < Projects::ApplicationController
       if @blob.lfs_pointer?
         send_lfs_object
       else
-        headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob))
-        headers['Content-Disposition'] = 'inline'
-        headers['Content-Type'] = safe_content_type(@blob)
-        head :ok # 'render nothing: true' messes up the Content-Type
+        send_git_blob @repository, @blob
       end
     else
       render_404
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index bb7a6b6a5ab..d5af0341d18 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -11,8 +11,7 @@ class Projects::RepositoriesController < Projects::ApplicationController
   end
 
   def archive
-    headers.store(*Gitlab::Workhorse.send_git_archive(@project, params[:ref], params[:format]))
-    head :ok
+    send_git_archive @repository, ref: params[:ref], format: params[:format]
   rescue => ex
     logger.error("#{self.class.name}: #{ex}")
     return git_not_found!
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb
new file mode 100644
index 00000000000..9d306c9096e
--- /dev/null
+++ b/app/helpers/workhorse_helper.rb
@@ -0,0 +1,17 @@
+# Helpers to send Git blobs or archives through Workhorse.
+# Workhorse will also serve files when using `send_file`.
+module WorkhorseHelper
+  # Send a Git blob through Workhorse
+  def send_git_blob(repository, blob)
+    headers.store(*Gitlab::Workhorse.send_git_blob(repository, blob))
+    headers['Content-Disposition'] = 'inline'
+    headers['Content-Type'] = safe_content_type(blob)
+    head :ok # 'render nothing: true' messes up the Content-Type
+  end
+
+  # Archive a Git repository and send it through Workhorse
+  def send_git_archive(repository, ref:, format:)
+    headers.store(*Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format))
+    head :ok
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9b991f347a9..659ddc6df04 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160530150109) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 2aaa0557ea3..0e47bb0b8ad 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -408,5 +408,15 @@ module API
       error!(errors[:access_level], 422) if errors[:access_level].any?
       not_found!(errors)
     end
+
+    def send_git_blob(repository, blob)
+      env['api.format'] = :txt
+      content_type 'text/plain'
+      header *Gitlab::Workhorse.send_git_blob(repository, blob)
+    end
+
+    def send_git_archive(repository, ref:, format:)
+      header *Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format)
+    end
   end
 end
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 9cb14e95ebc..f55aceed92c 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -56,8 +56,7 @@ module API
         blob = Gitlab::Git::Blob.find(repo, commit.id, params[:filepath])
         not_found! "File" unless blob
 
-        content_type 'text/plain'
-        header(*Gitlab::Workhorse.send_git_blob(repo, blob))
+        send_git_blob repo, blob
       end
 
       # Get a raw blob contents by blob sha
@@ -80,10 +79,7 @@ module API
 
         not_found! 'Blob' unless blob
 
-        env['api.format'] = :txt
-
-        content_type blob.mime_type
-        header(*Gitlab::Workhorse.send_git_blob(repo, blob))
+        send_git_blob repo, blob
       end
 
       # Get a an archive of the repository
@@ -98,7 +94,7 @@ module API
         authorize! :download_code, user_project
 
         begin
-          header(*Gitlab::Workhorse.send_git_archive(user_project, params[:sha], params[:format]))
+          send_git_archive user_project.repository, ref: params[:sha], format: params[:format]
         rescue
           not_found!('File')
         end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index c3ddd4c2680..96e99dc0088 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -18,10 +18,10 @@ module Gitlab
         ]
       end
 
-      def send_git_archive(project, ref, format)
+      def send_git_archive(repository, ref:, format:)
         format ||= 'tar.gz'
         format.downcase!
-        params = project.repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
+        params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
         raise "Repository or ref not found" if params.empty?
 
         [
@@ -29,9 +29,9 @@ module Gitlab
           "git-archive:#{encode(params)}",
         ]
       end
-      
+
       protected
-      
+
       def encode(hash)
         Base64.urlsafe_encode64(JSON.dump(hash))
       end
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index fb29274c687..33c35161da3 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -17,6 +17,7 @@ describe Projects::RawController do
         expect(response.header['Content-Type']).to eq('text/plain; charset=utf-8')
         expect(response.header['Content-Disposition']).
             to eq("inline")
+        expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-blob:")
       end
     end
 
@@ -31,6 +32,7 @@ describe Projects::RawController do
 
         expect(response.status).to eq(200)
         expect(response.header['Content-Type']).to eq('image/jpeg')
+        expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-blob:")
       end
     end
 
diff --git a/spec/controllers/projects/repositories_controller_spec.rb b/spec/controllers/projects/repositories_controller_spec.rb
index 0ddbec9eac2..aad62cf20e3 100644
--- a/spec/controllers/projects/repositories_controller_spec.rb
+++ b/spec/controllers/projects/repositories_controller_spec.rb
@@ -20,10 +20,11 @@ describe Projects::RepositoriesController do
         project.team << [user, :developer]
         sign_in(user)
       end
-      it "uses Gitlab::Workhorse" do
-        expect(Gitlab::Workhorse).to receive(:send_git_archive).with(project, "master", "zip")
 
+      it "uses Gitlab::Workhorse" do
         get :archive, namespace_id: project.namespace.path, project_id: project.path, ref: "master", format: "zip"
+
+        expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-archive:")
       end
 
       context "when the service raises an error" do
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index d940bf05061..c5c1402e8fc 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -11,7 +11,7 @@ describe Gitlab::Workhorse, lib: true do
       end
 
       it "raises an error" do
-        expect { subject.send_git_archive(project, "master", "zip") }.to raise_error(RuntimeError)
+        expect { subject.send_git_archive(project.repository, ref: "master", format: "zip") }.to raise_error(RuntimeError)
       end
     end
   end

From ae011aff63bd6b20043d8ee533f07a65db0b75ff Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 6 Jun 2016 13:35:26 +0200
Subject: [PATCH 1154/1431] Add changelog item

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

diff --git a/CHANGELOG b/CHANGELOG
index 72fe32a01a3..4594d9d554f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,6 +63,7 @@ v 8.8.3
   - Fix serious performance bug with rendering Markdown with InlineDiffFilter.  !4392
   - Fix missing number on generated ordered list element. !4437
   - Prevent disclosure of notes on confidential issues in search results.
+  - Add workhorse controller and API helpers
 
 v 8.8.2
   - Added remove due date button. !4209

From 3855e33cf8fe95d6de83b18698a958095fa49df5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 6 Jun 2016 15:34:50 +0200
Subject: [PATCH 1155/1431] Move changelog item

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

diff --git a/CHANGELOG b/CHANGELOG
index 4594d9d554f..03e7e5b1e56 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@ v 8.9.0 (unreleased)
   - Improve error handling importing projects
   - Put project Files and Commits tabs under Code tab
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
+  - Add workhorse controller and API helpers
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
@@ -63,7 +64,6 @@ v 8.8.3
   - Fix serious performance bug with rendering Markdown with InlineDiffFilter.  !4392
   - Fix missing number on generated ordered list element. !4437
   - Prevent disclosure of notes on confidential issues in search results.
-  - Add workhorse controller and API helpers
 
 v 8.8.2
   - Added remove due date button. !4209

From 8dc1fa0d8dc9106ab95a3039723e9013c4eed00c Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Sat, 4 Jun 2016 00:16:13 +0300
Subject: [PATCH 1156/1431] Updated MR notes.

---
 app/assets/javascripts/awards_handler.coffee  | 24 +++++++++----------
 app/assets/javascripts/dispatcher.js.coffee   |  4 ++--
 .../lib/emoji_aliases.js.coffee.erb           |  2 +-
 app/assets/javascripts/notes.js.coffee        |  4 ++--
 config/routes.rb                              |  1 +
 .../javascripts/awards_handler_spec.js.coffee |  8 +++----
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 4f4009e6db0..efa8f6cd010 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -2,7 +2,7 @@ class @AwardsHandler
 
   constructor: ->
 
-    @aliases = emojiAliases()
+    @aliases = gl.emojiAliases()
 
     $(document)
       .off 'click', '.js-add-award'
@@ -172,7 +172,7 @@ class @AwardsHandler
 
   decrementCounter: ($emojiButton, emoji) ->
 
-    counter       = $('.js-counter', $emojiButton)
+    counter       = $ '.js-counter', $emojiButton
     counterNumber = parseInt counter.text(), 10
 
     if counterNumber > 1
@@ -218,9 +218,7 @@ class @AwardsHandler
     awardBlock
       .closest '.js-emoji-btn'
       .removeData 'original-title'
-      .removeData 'title'
       .attr 'data-original-title', newAuthors
-      .attr 'data-title', newAuthors
 
     @resetTooltip awardBlock
 
@@ -258,8 +256,8 @@ class @AwardsHandler
     </button>"
 
     $emojiButton = $ buttonHtml
-    emoji_node   = $emojiButton
-      .insertBefore votesBlock.find '.js-award-holder:not(.js-award-action-btn)'
+    $emojiButton
+      .insertBefore votesBlock.find '.js-award-holder'
       .find '.emoji-icon'
       .data 'emoji', emoji
 
@@ -281,21 +279,21 @@ class @AwardsHandler
     if $('.emoji-menu').length
       return @createEmoji_ votesBlock, emoji
 
-    @createEmojiMenu @getAwardMenuUrl(), => @createEmoji votesBlock, emoji
+    @createEmojiMenu @getAwardMenuUrl(), => @createEmoji_ votesBlock, emoji
 
 
-  getAwardMenuUrl: -> return gl.awardMenuUrl or '/emojis'
+  getAwardMenuUrl: -> return gl.awardMenuUrl
 
 
   resolveNameToCssClass: (emoji) ->
 
-    emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
+    emojiIcon = $ ".emoji-menu-content [data-emoji='#{emoji}']"
 
-    if emoji_icon.length > 0
-      unicodeName = emoji_icon.data('unicode-name')
+    if emojiIcon.length > 0
+      unicodeName = emojiIcon.data 'unicode-name'
     else
       # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name')
+      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data 'unicode-name'
 
     return "emoji-#{unicodeName}"
 
@@ -303,7 +301,7 @@ class @AwardsHandler
   postEmoji: (awardUrl, emoji, callback) ->
 
     $.post awardUrl, { name: emoji }, (data) ->
-      callback.call() if data.ok
+      callback() if data.ok
 
 
   findEmojiIcon: (votesBlock, emoji) ->
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index bae67a2ebaf..ec540060457 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -23,7 +23,7 @@ class Dispatcher
         new Issue()
         shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
-        window.awardsHandler = new AwardsHandler()
+        gl.awardsHandler = new AwardsHandler()
       when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
         new Milestone()
       when 'dashboard:todos:index'
@@ -54,7 +54,7 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
-        window.awardsHandler = new AwardsHandler()
+        gl.awardsHandler = new AwardsHandler()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
index 97be65116e2..80f9936b9c2 100644
--- a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
+++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
@@ -1,2 +1,2 @@
-window.emojiAliases = ->
+gl.emojiAliases = ->
   JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>')
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 0fdbe55ea9c..8e33e915ba5 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -168,8 +168,8 @@ class @Notes
 
     if note.award
       votesBlock = $('.js-awards-block').eq 0
-      awardsHandler.addAwardToEmojiBar votesBlock, note.name
-      awardsHandler.scrollToAwards()
+      gl.awardsHandler.addAwardToEmojiBar votesBlock, note.name
+      gl.awardsHandler.scrollToAwards()
 
     # render note if it not present in loaded list
     # or skip if rendered
diff --git a/config/routes.rb b/config/routes.rb
index 1fc7985136b..9b54b292845 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -757,6 +757,7 @@ Rails.application.routes.draw do
 
         resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
           member do
+            post :toggle_award_emoji
             delete :delete_attachment
           end
         end
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee
index 5a95ae52dc8..0bd6d696387 100644
--- a/spec/javascripts/awards_handler_spec.js.coffee
+++ b/spec/javascripts/awards_handler_spec.js.coffee
@@ -3,10 +3,10 @@
 #= require jquery.cookie
 #= require ./fixtures/emoji_menu
 
-awardsHandler = null
-window.gl   or= {}
-window.gl.awardMenuUrl = '/emojis'
-window.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
+awardsHandler   = null
+window.gl     or= {}
+gl.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
+gl.awardMenuUrl = '/emojis'
 
 
 lazyAssert = (done, assertFn) ->

From 13d4231eb9f577456b420ff5044c55584add9b39 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Jun 2016 16:46:18 +0200
Subject: [PATCH 1157/1431] Use `@ci_commit` in merge_request_controller

---
 app/controllers/projects/merge_requests_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 0de34420883..e96e816bcd7 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -317,8 +317,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @merge_request_diff = @merge_request.merge_request_diff
 
-    @pipeline = @merge_request.pipeline
-    @statuses = @pipeline.statuses if @pipeline
+    @ci_commit = @merge_request.pipeline
+    @statuses = @ci_commit.statuses if @ci_commit
 
     if @merge_request.locked_long_ago?
       @merge_request.unlock_mr
@@ -327,8 +327,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def define_widget_vars
-    @pipeline = @merge_request.pipeline
-    @pipelines = [@pipeline].compact
+    @ci_commit = @merge_request.pipeline
+    @ci_commits = [@ci_commit].compact
     closes_issues
   end
 

From 028592eba6485e574fb0fb42937519b9e8ace37d Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 6 Jun 2016 17:59:20 +0300
Subject: [PATCH 1158/1431] Use warning color merge conflicts icon in MR status
 widget.

---
 app/assets/stylesheets/pages/merge_requests.scss             | 5 +++++
 .../projects/merge_requests/widget/open/_conflicts.html.haml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 8046e203a99..9ddb216d944 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -105,6 +105,11 @@
       font-size: 17px;
       margin: 5px 0;
       color: $gl-gray-dark;
+
+      &.has-conflicts .fa-exclamation-triangle {
+        color: $gl-warning;
+      }
+
     }
 
     p:last-child {
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
index e6c089fefb2..06ab0a3fa00 100644
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
@@ -1,9 +1,9 @@
-%h4
+%h4.has-conflicts
   = icon("exclamation-triangle")
   This merge request contains merge conflicts
 
 %p
-  Please resolve these conflicts or 
+  Please resolve these conflicts or
   - if @merge_request.can_be_merged_by?(current_user)
     #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
   - else

From 659d5d48303c4550a2c4ef7cc938d17b5b45d4c9 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 3 Jun 2016 15:30:38 -0300
Subject: [PATCH 1159/1431] Disable Webhooks before proceeding with the GitHub
 import

---
 lib/gitlab/github_import/hook_formatter.rb    | 23 +++++++
 lib/gitlab/github_import/importer.rb          | 26 ++++++--
 .../github_import/hook_formatter_spec.rb      | 65 +++++++++++++++++++
 3 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 lib/gitlab/github_import/hook_formatter.rb
 create mode 100644 spec/lib/gitlab/github_import/hook_formatter_spec.rb

diff --git a/lib/gitlab/github_import/hook_formatter.rb b/lib/gitlab/github_import/hook_formatter.rb
new file mode 100644
index 00000000000..db1fabaa18a
--- /dev/null
+++ b/lib/gitlab/github_import/hook_formatter.rb
@@ -0,0 +1,23 @@
+module Gitlab
+  module GithubImport
+    class HookFormatter
+      EVENTS = %w[* create delete pull_request push].freeze
+
+      attr_reader :raw
+
+      delegate :id, :name, :active, to: :raw
+
+      def initialize(raw)
+        @raw = raw
+      end
+
+      def config
+        raw.config.attrs
+      end
+
+      def valid?
+        (EVENTS & raw.events).any? && active
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 9d077e79c39..860ced5474c 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -69,6 +69,9 @@ module Gitlab
       end
 
       def import_pull_requests
+        hooks = client.hooks(repo).map { |raw| HookFormatter.new(raw) }.select(&:valid?)
+        disable_webhooks(hooks)
+
         pull_requests = client.pull_requests(repo, state: :all, sort: :created, direction: :asc)
                               .map { |raw| PullRequestFormatter.new(project, raw) }
                               .select(&:valid?)
@@ -77,7 +80,7 @@ module Gitlab
         target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch_name, pr.target_branch_sha] }
         branches_removed = source_branches_removed | target_branches_removed
 
-        create_refs(branches_removed)
+        restore_branches(branches_removed)
 
         pull_requests.each do |pull_request|
           merge_request = MergeRequest.new(pull_request.attributes)
@@ -93,10 +96,25 @@ module Gitlab
       rescue ActiveRecord::RecordInvalid => e
         raise Projects::ImportService::Error, e.message
       ensure
-        delete_refs(branches_removed)
+        clean_up_restored_branches(branches_removed)
+        clean_up_disabled_webhooks(hooks)
       end
 
-      def create_refs(branches)
+      def disable_webhooks(hooks)
+        update_webhooks(hooks, active: false)
+      end
+
+      def clean_up_disabled_webhooks(hooks)
+        update_webhooks(hooks, active: true)
+      end
+
+      def update_webhooks(hooks, options)
+        hooks.each do |hook|
+          client.edit_hook(repo, hook.id, hook.name, hook.config, options)
+        end
+      end
+
+      def restore_branches(branches)
         branches.each do |name, sha|
           client.create_ref(repo, "refs/heads/#{name}", sha)
         end
@@ -104,7 +122,7 @@ module Gitlab
         project.repository.fetch_ref(repo_url, '+refs/heads/*', 'refs/heads/*')
       end
 
-      def delete_refs(branches)
+      def clean_up_restored_branches(branches)
         branches.each do |name, _|
           client.delete_ref(repo, "heads/#{name}")
           project.repository.rm_branch(project.creator, name)
diff --git a/spec/lib/gitlab/github_import/hook_formatter_spec.rb b/spec/lib/gitlab/github_import/hook_formatter_spec.rb
new file mode 100644
index 00000000000..110ba428258
--- /dev/null
+++ b/spec/lib/gitlab/github_import/hook_formatter_spec.rb
@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::HookFormatter, lib: true do
+  describe '#id' do
+    it 'returns raw id' do
+      raw = double(id: 100000)
+      formatter = described_class.new(raw)
+      expect(formatter.id).to eq 100000
+    end
+  end
+
+  describe '#name' do
+    it 'returns raw id' do
+      raw = double(name: 'web')
+      formatter = described_class.new(raw)
+      expect(formatter.name).to eq 'web'
+    end
+  end
+
+  describe '#config' do
+    it 'returns raw config.attrs' do
+      raw = double(config: double(attrs: { url: 'http://something.com/webhook' }))
+      formatter = described_class.new(raw)
+      expect(formatter.config).to eq({ url: 'http://something.com/webhook' })
+    end
+  end
+
+  describe '#valid?' do
+    it 'returns true when events contains the wildcard event' do
+      raw = double(events: ['*', 'commit_comment'], active: true)
+      formatter = described_class.new(raw)
+      expect(formatter.valid?).to eq true
+    end
+
+    it 'returns true when events contains the create event' do
+      raw = double(events: ['create', 'commit_comment'], active: true)
+      formatter = described_class.new(raw)
+      expect(formatter.valid?).to eq true
+    end
+
+    it 'returns true when events contains delete event' do
+      raw = double(events: ['delete', 'commit_comment'], active: true)
+      formatter = described_class.new(raw)
+      expect(formatter.valid?).to eq true
+    end
+
+    it 'returns true when events contains pull_request event' do
+      raw = double(events: ['pull_request', 'commit_comment'], active: true)
+      formatter = described_class.new(raw)
+      expect(formatter.valid?).to eq true
+    end
+
+    it 'returns false when events does not contains branch related events' do
+      raw = double(events: ['member', 'commit_comment'], active: true)
+      formatter = described_class.new(raw)
+      expect(formatter.valid?).to eq false
+    end
+
+    it 'returns false when hook is not active' do
+      raw = double(events: ['pull_request', 'commit_comment'], active: false)
+      formatter = described_class.new(raw)
+      expect(formatter.valid?).to eq false
+    end
+  end
+end

From 17152602b05021b90261fc8f82024e323724d458 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 3 Jun 2016 15:31:34 -0300
Subject: [PATCH 1160/1431] Add a message warning user that Webhooks will be
 disabled

---
 app/views/import/github/status.html.haml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index 5b7f11440c1..6c4a9d68d1f 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -4,6 +4,10 @@
   %i.fa.fa-github
   Import projects from GitHub
 
+%p
+  %i.fa.fa-warning
+  To import GitHub pull requests, any pull request source branches that had been deleted are temporarily restored on GitHub. To prevent any connected CI services from being overloaded with dozens of irrelevant branches being created and deleted again, GitHub webhooks are temporarily disabled during the import process.
+
 %p.light
   Select projects you want to import.
 %hr

From 1fb1e64fdd3c608f265a59607c748ba4a999d928 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 6 Jun 2016 11:28:20 -0300
Subject: [PATCH 1161/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index fe9b9bec868..e44ec023959 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ v 8.8.4 (unreleased)
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
   - Upgrade to jQuery 2
+  - Disable Webhooks before proceeding with the GitHub import
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 9437b8a2e4ae4c688272d0febfbca4007232e4f5 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 18 May 2016 16:14:20 -0500
Subject: [PATCH 1162/1431] Import GitHub repositories respecting the API rate
 limit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While Octokit auto pagination set the page size to the maximum 100, and
seek to not overstep the rate limit. When the rate limit is reached its
raises an exception, and stop doing new requests.

Here we use a custom pattern for traversing large lists, so we can
check if we’ll reach the rate limit and wait the API to reset the rate
limit before making new requests.
---
 lib/gitlab/github_import/importer.rb          | 112 ++++++++++++------
 lib/gitlab/github_import/issue_formatter.rb   |   4 +
 lib/gitlab/github_import/label_formatter.rb   |   4 +
 .../github_import/milestone_formatter.rb      |   4 +
 .../github_import/pull_request_formatter.rb   |   4 +
 5 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 9d077e79c39..a2ee56bee89 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -3,6 +3,9 @@ module Gitlab
     class Importer
       include Gitlab::ShellAdapter
 
+      GITHUB_SAFE_REMAINING_REQUESTS = 100
+      GITHUB_SAFE_SLEEP_TIME = 500
+
       attr_reader :client, :project, :repo, :repo_url
 
       def initialize(project)
@@ -25,14 +28,53 @@ module Gitlab
 
       private
 
+      def turn_auto_pagination_off!
+        client.auto_paginate = false
+      end
+
+      def turn_auto_pagination_on!
+        client.auto_paginate = true
+      end
+
+      def rate_limit
+        client.rate_limit!
+      end
+
+      def rate_limit_exceed?
+        rate_limit.remaining <= GITHUB_SAFE_REMAINING_REQUESTS
+      end
+
+      def rate_limit_sleep_time
+        rate_limit.resets_in + GITHUB_SAFE_SLEEP_TIME
+      end
+
+      def paginate
+        turn_auto_pagination_off!
+
+        sleep rate_limit_sleep_time if rate_limit_exceed?
+
+        data = yield
+
+        last_response = client.last_response
+
+        while last_response.rels[:next]
+          sleep rate_limit_sleep_time if rate_limit_exceed?
+          last_response = last_response.rels[:next].get
+          data.concat(last_response.data) if last_response.data.is_a?(Array)
+        end
+
+        turn_auto_pagination_on!
+
+        data
+      end
+
       def credentials
         @credentials ||= project.import_data.credentials if project.import_data
       end
 
       def import_labels
-        client.labels(repo).each do |raw_data|
-          Label.create!(LabelFormatter.new(project, raw_data).attributes)
-        end
+        labels = paginate { client.labels(repo, per_page: 100) }
+        labels.each { |raw| LabelFormatter.new(project, raw).create! }
 
         true
       rescue ActiveRecord::RecordInvalid => e
@@ -40,9 +82,8 @@ module Gitlab
       end
 
       def import_milestones
-        client.list_milestones(repo, state: :all).each do |raw_data|
-          Milestone.create!(MilestoneFormatter.new(project, raw_data).attributes)
-        end
+        milestones = paginate { client.milestones(repo, state: :all, per_page: 100) }
+        milestones.each { |raw| MilestoneFormatter.new(project, raw).create! }
 
         true
       rescue ActiveRecord::RecordInvalid => e
@@ -50,16 +91,15 @@ module Gitlab
       end
 
       def import_issues
-        client.list_issues(repo, state: :all, sort: :created, direction: :asc).each do |raw_data|
-          gh_issue = IssueFormatter.new(project, raw_data)
+        data = paginate { client.issues(repo, state: :all, sort: :created, direction: :asc, per_page: 100) }
+
+        data.each do |raw|
+          gh_issue = IssueFormatter.new(project, raw)
 
           if gh_issue.valid?
-            issue = Issue.create!(gh_issue.attributes)
-            apply_labels(gh_issue.number, issue)
-
-            if gh_issue.has_comments?
-              import_comments(gh_issue.number, issue)
-            end
+            issue = gh_issue.create!
+            apply_labels(issue)
+            import_comments(issue) if gh_issue.has_comments?
           end
         end
 
@@ -69,9 +109,8 @@ module Gitlab
       end
 
       def import_pull_requests
-        pull_requests = client.pull_requests(repo, state: :all, sort: :created, direction: :asc)
-                              .map { |raw| PullRequestFormatter.new(project, raw) }
-                              .select(&:valid?)
+        pull_requests = paginate { client.pull_requests(repo, state: :all, sort: :created, direction: :asc, per_page: 100) }
+        pull_requests = pull_requests.map { |raw| PullRequestFormatter.new(project, raw) }.select(&:valid?)
 
         source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch_name, pr.source_branch_sha] }
         target_branches_removed = pull_requests.reject(&:target_branch_exists?).map { |pr| [pr.target_branch_name, pr.target_branch_sha] }
@@ -80,13 +119,10 @@ module Gitlab
         create_refs(branches_removed)
 
         pull_requests.each do |pull_request|
-          merge_request = MergeRequest.new(pull_request.attributes)
-
-          if merge_request.save
-            apply_labels(pull_request.number, merge_request)
-            import_comments(pull_request.number, merge_request)
-            import_comments_on_diff(pull_request.number, merge_request)
-          end
+          merge_request = pull_request.create!
+          apply_labels(merge_request)
+          import_comments(merge_request)
+          import_comments_on_diff(merge_request)
         end
 
         true
@@ -98,6 +134,7 @@ module Gitlab
 
       def create_refs(branches)
         branches.each do |name, sha|
+          sleep rate_limit_sleep_time if rate_limit_exceed?
           client.create_ref(repo, "refs/heads/#{name}", sha)
         end
 
@@ -106,13 +143,16 @@ module Gitlab
 
       def delete_refs(branches)
         branches.each do |name, _|
+          sleep rate_limit_sleep_time if rate_limit_exceed?
           client.delete_ref(repo, "heads/#{name}")
           project.repository.rm_branch(project.creator, name)
         end
       end
 
-      def apply_labels(number, issuable)
-        issue = client.issue(repo, number)
+      def apply_labels(issuable)
+        sleep rate_limit_sleep_time if rate_limit_exceed?
+
+        issue = client.issue(repo, issuable.iid)
 
         if issue.labels.count > 0
           label_ids = issue.labels.map do |raw|
@@ -123,20 +163,20 @@ module Gitlab
         end
       end
 
-      def import_comments(issue_number, noteable)
-        comments = client.issue_comments(repo, issue_number)
-        create_comments(comments, noteable)
+      def import_comments(issuable)
+        comments = paginate { client.issue_comments(repo, issuable.iid, per_page: 100) }
+        create_comments(issuable, comments)
       end
 
-      def import_comments_on_diff(pull_request_number, merge_request)
-        comments = client.pull_request_comments(repo, pull_request_number)
-        create_comments(comments, merge_request)
+      def import_comments_on_diff(merge_request)
+        comments = paginate { client.pull_request_comments(repo, merge_request.iid, per_page: 100) }
+        create_comments(merge_request, comments)
       end
 
-      def create_comments(comments, noteable)
-        comments.each do |raw_data|
-          comment = CommentFormatter.new(project, raw_data)
-          noteable.notes.create!(comment.attributes)
+      def create_comments(issuable, comments)
+        comments.each do |raw|
+          comment = CommentFormatter.new(project, raw)
+          issuable.notes.create!(comment.attributes)
         end
       end
 
diff --git a/lib/gitlab/github_import/issue_formatter.rb b/lib/gitlab/github_import/issue_formatter.rb
index c8173913b4e..47f625efb3a 100644
--- a/lib/gitlab/github_import/issue_formatter.rb
+++ b/lib/gitlab/github_import/issue_formatter.rb
@@ -16,6 +16,10 @@ module Gitlab
         }
       end
 
+      def create!
+        Issue.create!(self.attributes)
+      end
+
       def has_comments?
         raw_data.comments > 0
       end
diff --git a/lib/gitlab/github_import/label_formatter.rb b/lib/gitlab/github_import/label_formatter.rb
index c2b9d40b511..87b51a0a178 100644
--- a/lib/gitlab/github_import/label_formatter.rb
+++ b/lib/gitlab/github_import/label_formatter.rb
@@ -9,6 +9,10 @@ module Gitlab
         }
       end
 
+      def create!
+        Label.create!(self.attributes)
+      end
+
       private
 
       def color
diff --git a/lib/gitlab/github_import/milestone_formatter.rb b/lib/gitlab/github_import/milestone_formatter.rb
index e91a7e328cf..a0d2e47c412 100644
--- a/lib/gitlab/github_import/milestone_formatter.rb
+++ b/lib/gitlab/github_import/milestone_formatter.rb
@@ -14,6 +14,10 @@ module Gitlab
         }
       end
 
+      def create!
+        Milestone.create!(self.attributes)
+      end
+
       private
 
       def number
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index a2947b56ad9..0d21c49035e 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -24,6 +24,10 @@ module Gitlab
         }
       end
 
+      def create!
+        MergeRequest.create!(self.attributes)
+      end
+
       def number
         raw_data.number
       end

From 7c072c76fc05f7db51e7d7ba6cb0fad2850ecf85 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 6 Jun 2016 12:19:03 -0300
Subject: [PATCH 1163/1431] Fix importer for GitHub comments on diff

Fix comments on diff after LegacyDiffNote was extracted from Note
---
 CHANGELOG                                               | 1 +
 lib/gitlab/github_import/comment_formatter.rb           | 5 +++++
 spec/lib/gitlab/github_import/comment_formatter_spec.rb | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index fe9b9bec868..9012f1363b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ v 8.8.4 (unreleased)
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
   - Upgrade to jQuery 2
+  - Fix importer for GitHub comments on diff
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
diff --git a/lib/gitlab/github_import/comment_formatter.rb b/lib/gitlab/github_import/comment_formatter.rb
index 7d679eaec6a..2c1b94ef2cd 100644
--- a/lib/gitlab/github_import/comment_formatter.rb
+++ b/lib/gitlab/github_import/comment_formatter.rb
@@ -8,6 +8,7 @@ module Gitlab
           commit_id: raw_data.commit_id,
           line_code: line_code,
           author_id: author_id,
+          type: type,
           created_at: raw_data.created_at,
           updated_at: raw_data.updated_at
         }
@@ -53,6 +54,10 @@ module Gitlab
       def note
         formatter.author_line(author) + body
       end
+
+      def type
+        'LegacyDiffNote' if on_diff?
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/github_import/comment_formatter_spec.rb b/spec/lib/gitlab/github_import/comment_formatter_spec.rb
index 55e86d4ceac..9ae02a6c45f 100644
--- a/spec/lib/gitlab/github_import/comment_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/comment_formatter_spec.rb
@@ -29,6 +29,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
           commit_id: nil,
           line_code: nil,
           author_id: project.creator_id,
+          type: nil,
           created_at: created_at,
           updated_at: updated_at
         }
@@ -56,6 +57,7 @@ describe Gitlab::GithubImport::CommentFormatter, lib: true do
           commit_id: '6dcb09b5b57875f334f61aebed695e2e4193db5e',
           line_code: 'ce1be0ff4065a6e9415095c95f25f47a633cef2b_4_3',
           author_id: project.creator_id,
+          type: 'LegacyDiffNote',
           created_at: created_at,
           updated_at: updated_at
         }

From 07f49626d01ddffcd127e937c528b74b8248043b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 6 Jun 2016 17:40:26 +0200
Subject: [PATCH 1164/1431] Fix tests

---
 lib/gitlab/auth.rb                            | 42 +++++++++----------
 .../{rate_limiter.rb => ip_rate_limiter.rb}   |  0
 spec/requests/jwt_controller_spec.rb          |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
 rename lib/gitlab/auth/{rate_limiter.rb => ip_rate_limiter.rb} (100%)

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index bd129d7216a..076e2af7d38 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -35,6 +35,27 @@ module Gitlab
         end
       end
 
+      def rate_limit!(ip, success:, login:)
+        rate_limiter = Gitlab::Auth::IpRateLimiter.new(ip)
+        return unless rate_limiter.enabled?
+
+        if success
+          # Repeated login 'failures' are normal behavior for some Git clients so
+          # it is important to reset the ban counter once the client has proven
+          # they are not a 'bad guy'.
+          rate_limiter.reset!
+        else
+          # Register a login failure so that Rack::Attack can block the next
+          # request from this IP if needed.
+          rate_limiter.register_fail!
+
+          if rate_limiter.banned?
+            Rails.logger.info "IP #{ip} failed to login " \
+              "as #{login} but has been temporarily banned from Git auth"
+          end
+        end
+      end
+
       private
 
       def valid_ci_request?(login, password, project)
@@ -61,27 +82,6 @@ module Gitlab
           token && token.accessible? && User.find_by(id: token.resource_owner_id)
         end
       end
-
-      def rate_limit!(ip, success:, login:)
-        rate_limiter = IpRateLimiter.new(ip)
-        return unless rate_limiter.enabled?
-
-        if success
-          # Repeated login 'failures' are normal behavior for some Git clients so
-          # it is important to reset the ban counter once the client has proven
-          # they are not a 'bad guy'.
-          rate_limiter.reset!
-        else
-          # Register a login failure so that Rack::Attack can block the next
-          # request from this IP if needed.
-          rate_limiter.register_fail!(ip, config)
-
-          if rate_limiter.banned?
-            Rails.logger.info "IP #{ip} failed to login " \
-              "as #{login} but has been temporarily banned from Git auth"
-          end
-        end
-      end
     end
   end
 end
diff --git a/lib/gitlab/auth/rate_limiter.rb b/lib/gitlab/auth/ip_rate_limiter.rb
similarity index 100%
rename from lib/gitlab/auth/rate_limiter.rb
rename to lib/gitlab/auth/ip_rate_limiter.rb
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index d006ff195cf..c995993a853 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -44,7 +44,7 @@ describe JwtController do
       let(:user) { create(:user) }
       let(:headers) { { authorization: credentials('user', 'password') } }
 
-      before { expect_any_instance_of(Gitlab::Auth).to receive(:find).with('user', 'password').and_return(user) }
+      before { expect(Gitlab::Auth).to receive(:find_in_gitlab_or_ldap).with('user', 'password').and_return(user) }
 
       subject! { get '/jwt/auth', parameters, headers }
 

From ff7c4e588ab4f7a397963d43becbe00d1bb584a1 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 6 Jun 2016 17:40:30 +0200
Subject: [PATCH 1165/1431] Remove code duplication in JwtController

---
 app/controllers/jwt_controller.rb | 40 +------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index c05a55633b5..131a16dad9b 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -42,46 +42,8 @@ class JwtController < ApplicationController
   end
 
   def authenticate_user(login, password)
-    # TODO: this is a copy and paste from grack_auth,
-    # it should be refactored in the future
-
     user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
-
-    # If the user authenticated successfully, we reset the auth failure count
-    # from Rack::Attack for that IP. A client may attempt to authenticate
-    # with a username and blank password first, and only after it receives
-    # a 401 error does it present a password. Resetting the count prevents
-    # false positives from occurring.
-    #
-    # Otherwise, we let Rack::Attack know there was a failed authentication
-    # attempt from this IP. This information is stored in the Rails cache
-    # (Redis) and will be used by the Rack::Attack middleware to decide
-    # whether to block requests from this IP.
-    config = Gitlab.config.rack_attack.git_basic_auth
-
-    if config.enabled
-      if user
-        # A successful login will reset the auth failure count from this IP
-        Rack::Attack::Allow2Ban.reset(request.ip, config)
-      else
-        banned = Rack::Attack::Allow2Ban.filter(request.ip, config) do
-          # Unless the IP is whitelisted, return true so that Allow2Ban
-          # increments the counter (stored in Rails.cache) for the IP
-          if config.ip_whitelist.include?(request.ip)
-            false
-          else
-            true
-          end
-        end
-
-        if banned
-          Rails.logger.info "IP #{request.ip} failed to login " \
-              "as #{login} but has been temporarily banned from Git auth"
-          return
-        end
-      end
-    end
-
+    Gitlab::Auth.rate_limit!(request.ip, success: user.present?, login: login)
     user
   end
 end

From 0dba294f99e5ec672b4a8a97b5d51ac79a3efc8b Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Mon, 6 Jun 2016 18:50:38 +0300
Subject: [PATCH 1166/1431] Favor the ternary operator. :police_car:

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

diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 2abb0e9b179..f6a8ae3fd63 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -56,7 +56,7 @@ module MilestonesHelper
 
   def milestone_remaining_days(milestone, withContentTag = true)
     if milestone.expired?
-      if withContentTag then content_tag(:strong, 'expired') else 'expired' end
+      withContentTag ? content_tag(:strong, 'expired') : 'expired'
     elsif milestone.due_date
       days = milestone.remaining_days
 

From 535d11302e73fe88702f7c65effc3cd443bf56fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Mon, 6 Jun 2016 12:01:50 -0400
Subject: [PATCH 1167/1431] Remove prev/next buttons on issues and merge
 requests

The buttons were rarely used and added at least 1 query each on every page load.
---
 CHANGELOG                                      |  1 +
 .../javascripts/shortcuts_issuable.coffee      | 18 ------------------
 app/helpers/issuables_helper.rb                | 12 ------------
 app/views/shared/issuable/_sidebar.html.haml   | 15 ---------------
 features/project/issues/issues.feature         |  7 -------
 features/project/merge_requests.feature        |  2 --
 features/steps/shared/issuable.rb              | 16 ----------------
 7 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fe9b9bec868..47e37152c18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ v 8.8.4 (unreleased)
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
   - Upgrade to jQuery 2
+  - Remove prev/next buttons on issues and merge requests
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
diff --git a/app/assets/javascripts/shortcuts_issuable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee
index ccb42ab2168..c93bcf3ceec 100644
--- a/app/assets/javascripts/shortcuts_issuable.coffee
+++ b/app/assets/javascripts/shortcuts_issuable.coffee
@@ -10,14 +10,6 @@ class @ShortcutsIssuable extends ShortcutsNavigation
       @replyWithSelectedText()
       return false
     )
-    Mousetrap.bind('j', =>
-      @prevIssue()
-      return false
-    )
-    Mousetrap.bind('k', =>
-      @nextIssue()
-      return false
-    )
     Mousetrap.bind('e', =>
       @editIssue()
       return false
@@ -29,16 +21,6 @@ class @ShortcutsIssuable extends ShortcutsNavigation
     else
       @enabledHelp.push('.hidden-shortcut.issues')
 
-  prevIssue: ->
-    $prevBtn = $('.prev-btn')
-    if not $prevBtn.hasClass('disabled')
-      Turbolinks.visit($prevBtn.attr('href'))
-
-  nextIssue: ->
-    $nextBtn = $('.next-btn')
-    if not $nextBtn.hasClass('disabled')
-      Turbolinks.visit($nextBtn.attr('href'))
-
   replyWithSelectedText: ->
     if window.getSelection
       selected = window.getSelection().toString()
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 37b93f63145..40d8ce8a1d3 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -8,14 +8,6 @@ module IssuablesHelper
     "right-sidebar-#{sidebar_gutter_collapsed? ? 'collapsed' : 'expanded'}"
   end
 
-  def issuables_count(issuable)
-    base_issuable_scope(issuable).maximum(:iid)
-  end
-
-  def next_issuable_for(issuable)
-    base_issuable_scope(issuable).where('iid > ?', issuable.iid).last
-  end
-
   def multi_label_name(current_labels, default_label)
     # current_labels may be a string from before
     if current_labels.is_a?(Array)
@@ -45,10 +37,6 @@ module IssuablesHelper
     end
   end
 
-  def prev_issuable_for(issuable)
-    base_issuable_scope(issuable).where('iid < ?', issuable.iid).first
-  end
-
   def user_dropdown_label(user_id, default_label)
     return default_label if user_id.nil?
     return "Unassigned" if user_id == "0"
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index d6552ae7f18..1ec2436c835 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -2,23 +2,8 @@
   .issuable-sidebar
     - can_edit_issuable = can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
     .block.issuable-sidebar-header
-      %span.issuable-count.hide-collapsed.pull-left
-        = issuable.iid
-        of
-        = issuables_count(issuable)
       %a.gutter-toggle.pull-right.js-sidebar-toggle{href: '#'}
         = sidebar_gutter_toggle_icon
-      .issuable-nav.hide-collapsed.pull-right.btn-group{role: 'group', "aria-label" => '...'}
-        - if prev_issuable = prev_issuable_for(issuable)
-          = link_to 'Prev', [@project.namespace.becomes(Namespace), @project, prev_issuable], class: 'btn btn-default prev-btn issuable-pager'
-        - else
-          %a.btn.btn-default.issuable-pager.disabled{href: '#'}
-            Prev
-        - if next_issuable = next_issuable_for(issuable)
-          = link_to 'Next', [@project.namespace.becomes(Namespace), @project, next_issuable], class: 'btn btn-default next-btn issuable-pager'
-        - else
-          %a.btn.btn-default.issuable-pager.disabled{href: '#'}
-            Next
 
     = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, format: :json, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
       .block.assignee
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index de7e2b37725..2259b7125c4 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -25,13 +25,6 @@ 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 filter by author
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index ecda4ea8240..396eb7cc11b 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -49,14 +49,12 @@ Feature: Project Merge Requests
   Scenario: I visit an open 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 visit a merged merge request page
     Given project "Shop" have "Feature NS-05" merged merge request
     And I click link "Merged"
     And I click link "Feature NS-05"
     Then I should see merge request "Feature NS-05"
-    And I should see "3 of 3" in the sidebar
 
   Scenario: I close merge request page
     Given I click link "Bug NS-04"
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index 733e80b7279..c6572cf386e 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -138,22 +138,6 @@ 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 should see "3 of 3" in the sidebar' do
-    expect_sidebar_content('3 of 3')
-  end
-
   step 'I click link "Next" in the sidebar' do
     page.within '.issuable-sidebar' do
       click_link 'Next'

From 9264203103bbd2b4f46ce777304f210b07765c43 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 6 Jun 2016 11:30:17 -0300
Subject: [PATCH 1168/1431] change add_concurrent_index function arguments

---
 lib/gitlab/database/migration_helpers.rb           | 10 +++-------
 spec/lib/gitlab/database/migration_helpers_spec.rb | 13 ++++++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index b88e50748f6..978c3f7896d 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -11,7 +11,7 @@ module Gitlab
       #     add_concurrent_index :users, :some_column
       #
       # See Rails' `add_index` for more info on the available arguments.
-      def add_concurrent_index(*args)
+      def add_concurrent_index(table_name, column_name, options = {})
         if transaction_open?
           raise 'add_concurrent_index can not be run inside a transaction, ' \
             'you can disable transactions by calling disable_ddl_transaction! ' \
@@ -19,14 +19,10 @@ module Gitlab
         end
 
         if Database.postgresql?
-          if args[2].present?
-            args[2].merge!({ algorithm: :concurrently })
-          else
-            args << { algorithm: :concurrently }
-          end
+          options = options.merge({ algorithm: :concurrently })
         end
 
-        add_index(*args)
+        add_index(table_name, column_name, options)
       end
 
       # Updates the value of a column in batches.
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 35ade7a2be0..83ddabe6b0b 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -16,14 +16,21 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       end
 
       context 'using PostgreSQL' do
-        it 'creates the index concurrently' do
-          expect(Gitlab::Database).to receive(:postgresql?).and_return(true)
+        before { expect(Gitlab::Database).to receive(:postgresql?).and_return(true) }
 
+        it 'creates the index concurrently' do
           expect(model).to receive(:add_index).
             with(:users, :foo, algorithm: :concurrently)
 
           model.add_concurrent_index(:users, :foo)
         end
+
+        it 'creates unique index concurrently' do
+          expect(model).to receive(:add_index).
+            with(:users, :foo, { algorithm: :concurrently, unique: true })
+
+          model.add_concurrent_index(:users, :foo, unique: true)
+        end
       end
 
       context 'using MySQL' do
@@ -31,7 +38,7 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           expect(Gitlab::Database).to receive(:postgresql?).and_return(false)
 
           expect(model).to receive(:add_index).
-            with(:users, :foo)
+            with(:users, :foo, {})
 
           model.add_concurrent_index(:users, :foo)
         end

From 0e2f26dd2a10ed876f96b0496dff2de6780eeaea Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 2 May 2016 18:19:46 -0500
Subject: [PATCH 1169/1431] Prioritize labels functionality

---
 app/assets/javascripts/LabelManager.js.coffee | 79 +++++++++++++++++++
 app/assets/javascripts/dispatcher.js.coffee   |  2 +
 app/assets/stylesheets/pages/labels.scss      | 12 +++
 app/controllers/projects/labels_controller.rb | 22 +++++-
 app/models/label.rb                           |  2 +
 app/views/projects/labels/_label.html.haml    | 12 ++-
 app/views/projects/labels/index.html.haml     | 27 ++++---
 config/routes.rb                              |  2 +
 8 files changed, 146 insertions(+), 12 deletions(-)
 create mode 100644 app/assets/javascripts/LabelManager.js.coffee

diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee
new file mode 100644
index 00000000000..056a03651b5
--- /dev/null
+++ b/app/assets/javascripts/LabelManager.js.coffee
@@ -0,0 +1,79 @@
+class @LabelManager
+  constructor: (opts = {}) ->
+    # Defaults
+    {
+      @togglePriorityButton = $('.js-toggle-priority')
+      @prioritizedLabels = $('.js-prioritized-labels')
+      @otherLabels = $('.js-other-labels')
+    } = opts
+
+    @prioritizedLabels.sortable(
+      items: 'li'
+      update: @onPrioritySortUpdate.bind(@)
+    )
+
+    @bindEvents()
+
+  bindEvents: ->
+    @togglePriorityButton.on 'click', @, @onTogglePriorityClick
+
+  onTogglePriorityClick: (e) ->
+    e.preventDefault()
+    _this = e.data
+    $btn = $(e.currentTarget)
+    $label = $("##{$btn.data('domId')}")
+    action = if $btn.parents('.js-prioritized-labels').length then 'remove' else 'add'
+    _this.toggleLabelPriority($label, action)
+
+  toggleLabelPriority: ($label, action, pasive = false) ->
+    _this = @
+    url = $label.find('.js-toggle-priority').data 'url'
+
+    $target = @prioritizedLabels
+    $from = @otherLabels
+
+    # Optimistic update
+    if action is 'remove'
+      $target = @otherLabels
+      $from = @prioritizedLabels
+
+    if $from.find('li').length is 1
+      $from.find('.empty-message').show()
+
+    if not $target.find('li').length
+      $target.find('.empty-message').hide()
+
+    $label.detach().appendTo($target)
+
+    # Return if we are not persisting state
+    return if pasive
+
+    xhr = $.post url
+
+    # If request fails, put label back to Other labels group
+    xhr.fail ->
+      _this.toggleLabelPriority($label, 'remove', true)
+
+      # Show a message
+      new Flash('Unable to update label prioritization at this time' , 'alert')
+
+  onPrioritySortUpdate: ->
+    @savePrioritySort()
+
+  savePrioritySort: ->
+    xhr = $.post
+            url: @prioritizedLabels.data('url')
+            data:
+              label_ids: @getSortedLabelsIds()
+
+    xhr.done ->
+      console.log 'done'
+
+    xhr.fail ->
+      console.log 'fail'
+
+  getSortedLabelsIds: ->
+    sortedIds = []
+    @prioritizedLabels.find('li').each ->
+      sortedIds.push $(@).data 'id'
+    sortedIds
\ No newline at end of file
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index ec540060457..49fc7ef2e12 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -100,6 +100,8 @@ class Dispatcher
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:labels:new', 'projects:labels:edit'
         new Labels()
+      when 'projects:labels:index'
+        new LabelManager()
       when 'projects:network:show'
         # Ensure we don't create a particular shortcut handler here. This is
         # already created, where the network graph is created.
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index e179bdf0048..4b0b512db88 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -138,3 +138,15 @@
     }
   }
 }
+
+.prioritized-labels {
+  .add-priority {
+    display: none;
+  }
+}
+
+.other-labels {
+  .remove-priority {
+    display: none;
+  }
+}
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index ff771ea6d9c..88d745e6bae 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -11,7 +11,8 @@ class Projects::LabelsController < Projects::ApplicationController
   respond_to :js, :html
 
   def index
-    @labels = @project.labels.page(params[:page])
+    @labels = @project.labels.prioritized(false).page(params[:page])
+    @prioritized = @project.labels.prioritized
 
     respond_to do |format|
       format.html
@@ -71,6 +72,25 @@ class Projects::LabelsController < Projects::ApplicationController
     end
   end
 
+  def toggle_priority
+    priority = label.priority
+
+    respond_to do |format|
+      if label.update_attributes(priority: !priority)
+        format.json { render json: label }
+      else
+        message = label.errors.full_messages.uniq.join('. ')
+        format.json { render json: { message: message }, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def set_sorting
+    respond_to do |format|
+      format.json { render json: {message: 'success'}}
+    end
+  end
+
   protected
 
   def module_enabled
diff --git a/app/models/label.rb b/app/models/label.rb
index e5ad11983be..59e7afe53f3 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -19,6 +19,7 @@ class Label < ActiveRecord::Base
 
   validates :color, color: true, allow_blank: false
   validates :project, presence: true, unless: Proc.new { |service| service.template? }
+  validates :priority, presence: false, default: false
 
   # Don't allow '?', '&', and ',' for label titles
   validates :title,
@@ -29,6 +30,7 @@ class Label < ActiveRecord::Base
   default_scope { order(title: :asc) }
 
   scope :templates, ->  { where(template: true) }
+  scope :prioritized, ->(value = true) { where(priority: value) }
 
   alias_attribute :name, :title
 
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 294fec422c5..eda75b64e79 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,4 +1,12 @@
-%li{ id: dom_id(label), data: { id: label.id } }
+- label_css_id = dom_id(label)
+%li{id: label_css_id, :"data-id" => label.id}
+  %a.js-toggle-priority{:href => "#",
+    :"data-url" => toggle_priority_namespace_project_label_path(@project.namespace, @project, label),
+    :"data-dom-id" => "#{label_css_id}" }
+    %span.add-priority
+      (+)
+    %span.remove-priority
+      (-)
   = render "shared/label_row", label: label
   .pull-info-right
     %span.append-right-20
@@ -24,4 +32,4 @@
 
 - if current_user
   :javascript
-    new Subscription('##{dom_id(label)} .label-subscription');
+    new Subscription('##{label_css_id} .label-subscription');
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 2557d1a4d5b..d71db7545ef 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -10,13 +10,22 @@
         New label
 
 .labels
-  - if @labels.present?
-    %ul.content-list.manage-labels-list
-      = render @labels
-    = paginate @labels, theme: 'gitlab'
-  - else
-    .nothing-here-block
-      - if can? current_user, :admin_label, @project
-        Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
+  .prioritized-labels
+    %h5 Prioritized Label
+    %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) }
+      - if @prioritized.present?
+        = render @prioritized
       - else
-        No labels created
+        %p.empty-message No prioritized labels yet
+  .other-labels
+    %h5 Other Labels
+    - if @labels.present?
+      %ul.content-list.manage-labels-list.js-other-labels
+        = render @labels
+      = paginate @labels, theme: 'gitlab'
+    - else
+      .nothing-here-block
+        - if can? current_user, :admin_label, @project
+          Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
+        - else
+          No labels created
diff --git a/config/routes.rb b/config/routes.rb
index 7e735541f7f..5aa8a0fe8a5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -719,10 +719,12 @@ Rails.application.routes.draw do
         resources :labels, constraints: { id: /\d+/ } do
           collection do
             post :generate
+            post :set_sorting
           end
 
           member do
             post :toggle_subscription
+            post :toggle_priority
           end
         end
 

From d8263b285193d9163089683eb77825f1cd673b14 Mon Sep 17 00:00:00 2001
From: Thijs Wouters <thijs@morewood.be>
Date: Mon, 14 Mar 2016 10:46:26 +0100
Subject: [PATCH 1170/1431] Sort by label priority
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/controllers/projects/labels_controller.rb |  2 +-
 app/finders/issuable_finder.rb                |  8 +++++--
 app/helpers/sorting_helper.rb                 | 11 ++++++++-
 app/models/concerns/issuable.rb               |  9 +++++++-
 app/models/label.rb                           | 23 +++++++++++++++++++
 app/views/projects/labels/_form.html.haml     |  4 ++++
 app/views/shared/_sort_dropdown.html.haml     |  2 ++
 config/initializers/nulls_last.rb             | 15 ++++++++++++
 .../20160314094147_add_priority_to_label.rb   |  6 +++++
 db/schema.rb                                  |  2 ++
 10 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 config/initializers/nulls_last.rb
 create mode 100644 db/migrate/20160314094147_add_priority_to_label.rb

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 88d745e6bae..0a60a802430 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -100,7 +100,7 @@ class Projects::LabelsController < Projects::ApplicationController
   end
 
   def label_params
-    params.require(:label).permit(:title, :description, :color)
+    params.require(:label).permit(:title, :description, :color, :priority)
   end
 
   def label
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 7d8c56f4c22..68ab6e87684 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -224,7 +224,7 @@ class IssuableFinder
   def sort(items)
     # Ensure we always have an explicit sort order (instead of inheriting
     # multiple orders when combining ActiveRecord::Relation objects).
-    params[:sort] ? items.sort(params[:sort]) : items.reorder(id: :desc)
+    params[:sort] ? items.sort(params[:sort], label_names) : items.reorder(id: :desc)
   end
 
   def by_assignee(items)
@@ -318,7 +318,11 @@ class IssuableFinder
   end
 
   def label_names
-    params[:label_name].is_a?(String) ? params[:label_name].split(',') : params[:label_name]
+    if labels?
+      params[:label_name].is_a?(String) ? params[:label_name].split(',') : params[:label_name]
+    else
+      []
+    end
   end
 
   def current_user_related?
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 630e10ea892..d86f1999f5c 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -14,7 +14,8 @@ module SortingHelper
       sort_value_recently_signin => sort_title_recently_signin,
       sort_value_oldest_signin => sort_title_oldest_signin,
       sort_value_downvotes => sort_title_downvotes,
-      sort_value_upvotes => sort_title_upvotes
+      sort_value_upvotes => sort_title_upvotes,
+      sort_value_priority => sort_title_priority
     }
   end
 
@@ -28,6 +29,10 @@ module SortingHelper
     }
   end
 
+  def sort_title_priority
+    'Priority'
+  end
+
   def sort_title_oldest_updated
     'Oldest updated'
   end
@@ -84,6 +89,10 @@ module SortingHelper
     'Most popular'
   end
 
+  def sort_value_priority
+    'priority'
+  end
+
   def sort_value_oldest_updated
     'updated_asc'
   end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 5d279ae602a..8871cb8a6cd 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -48,6 +48,12 @@ module Issuable
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
 
 
+    def self.order_priority(labels)
+      select("#{table_name}.*, (#{Label.high_priority(name, table_name, labels).to_sql}) AS highest_priority")
+        .group("#{table_name}.id")
+        .reorder(nulls_last('highest_priority', 'ASC'))
+    end
+
     delegate :name,
              :email,
              to: :author,
@@ -105,12 +111,13 @@ module Issuable
       where(t[:title].matches(pattern).or(t[:description].matches(pattern)))
     end
 
-    def sort(method)
+    def sort(method, labels = [])
       case method.to_s
       when 'milestone_due_asc' then order_milestone_due_asc
       when 'milestone_due_desc' then order_milestone_due_desc
       when 'downvotes_desc' then order_downvotes_desc
       when 'upvotes_desc' then order_upvotes_desc
+      when 'priority' then order_priority(labels)
       else
         order_by(method)
       end
diff --git a/app/models/label.rb b/app/models/label.rb
index 59e7afe53f3..4437ca393ed 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -27,11 +27,28 @@ class Label < ActiveRecord::Base
             format: { with: /\A[^&\?,]+\z/ },
             uniqueness: { scope: :project_id }
 
+  before_save :nillify_priority
+
   default_scope { order(title: :asc) }
 
   scope :templates, ->  { where(template: true) }
   scope :prioritized, ->(value = true) { where(priority: value) }
 
+  def self.high_priority(name, table_name, labels)
+    unfiltered = unscoped
+      .select("MIN(labels.priority)")
+      .joins("INNER JOIN label_links ON label_links.label_id = labels.id")
+      .where("label_links.target_type = '#{name}'")
+      .where("label_links.target_id = #{table_name}.id")
+      .where("labels.project_id = #{table_name}.project_id")
+
+    if labels.empty?
+      unfiltered
+    else
+      unfiltered.where("labels.title NOT IN (?)", labels)
+    end
+  end
+
   alias_attribute :name, :title
 
   def self.reference_prefix
@@ -120,4 +137,10 @@ class Label < ActiveRecord::Base
       id
     end
   end
+
+  def nillify_priority
+    unless self.priority.present?
+      self.priority = nil
+    end
+  end
 end
diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index aa143e54ffe..227ce5d2317 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -24,6 +24,10 @@
         - suggested_colors.each do |color|
           = link_to '#', style: "background-color: #{color}", data: { color: color } do
             &nbsp;
+  .form-group
+    = f.label :priority, "Priority", class: 'control-label'
+    .col-sm-10
+      = f.text_field :priority, class: "form-control"
 
   .form-actions
     - if @label.persisted?
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index 1e0f075b303..249bce926ce 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -8,6 +8,8 @@
     %b.caret
   %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-sort
     %li
+      = link_to page_filter_path(sort: sort_value_priority) do
+        = sort_title_priority
       = link_to page_filter_path(sort: sort_value_recently_created) do
         = sort_title_recently_created
       = link_to page_filter_path(sort: sort_value_oldest_created) do
diff --git a/config/initializers/nulls_last.rb b/config/initializers/nulls_last.rb
new file mode 100644
index 00000000000..47b7b0bb3d2
--- /dev/null
+++ b/config/initializers/nulls_last.rb
@@ -0,0 +1,15 @@
+module ActiveRecord
+  class Base
+    def self.nulls_last(field, direction = 'ASC')
+      if Gitlab::Database.postgresql?
+        "#{field} #{direction} NULLS LAST"
+      else
+        if direction.upcase == 'ASC'
+          "-#{field} DESC"
+        else
+          "#{field} DESC"
+        end
+      end
+    end
+  end
+end
diff --git a/db/migrate/20160314094147_add_priority_to_label.rb b/db/migrate/20160314094147_add_priority_to_label.rb
new file mode 100644
index 00000000000..8ddf7782972
--- /dev/null
+++ b/db/migrate/20160314094147_add_priority_to_label.rb
@@ -0,0 +1,6 @@
+class AddPriorityToLabel < ActiveRecord::Migration
+  def change
+    add_column :labels, :priority, :integer
+    add_index :labels, :priority
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9b991f347a9..69e37470de0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -496,8 +496,10 @@ ActiveRecord::Schema.define(version: 20160530150109) do
     t.datetime "updated_at"
     t.boolean  "template",    default: false
     t.string   "description"
+    t.integer  "priority"
   end
 
+  add_index "labels", ["priority"], name: "index_labels_on_priority", using: :btree
   add_index "labels", ["project_id"], name: "index_labels_on_project_id", using: :btree
 
   create_table "lfs_objects", force: :cascade do |t|

From 499bb9f305e78d0e3488c2eee6328ce76af39920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 13 May 2016 17:26:18 +0200
Subject: [PATCH 1171/1431] Improve Issuable.order_labels_priority
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/assets/javascripts/LabelManager.js.coffee | 21 +++++++------
 app/controllers/projects/labels_controller.rb | 15 ++++++----
 app/finders/issuable_finder.rb                |  2 +-
 app/models/concerns/issuable.rb               | 30 ++++++++++++++-----
 app/models/issue.rb                           |  4 +--
 app/models/label.rb                           | 21 +++----------
 app/views/projects/labels/_label.html.haml    |  2 +-
 config/initializers/nulls_last.rb             | 15 ----------
 config/routes.rb                              |  2 +-
 lib/gitlab/database.rb                        | 14 +++++++++
 spec/lib/gitlab/database_spec.rb              | 16 ++++++++++
 11 files changed, 83 insertions(+), 59 deletions(-)
 delete mode 100644 config/initializers/nulls_last.rb

diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee
index 056a03651b5..ad2acb9d0b9 100644
--- a/app/assets/javascripts/LabelManager.js.coffee
+++ b/app/assets/javascripts/LabelManager.js.coffee
@@ -25,7 +25,7 @@ class @LabelManager
     action = if $btn.parents('.js-prioritized-labels').length then 'remove' else 'add'
     _this.toggleLabelPriority($label, action)
 
-  toggleLabelPriority: ($label, action, pasive = false) ->
+  toggleLabelPriority: ($label, action, persistState = false) ->
     _this = @
     url = $label.find('.js-toggle-priority').data 'url'
 
@@ -46,16 +46,19 @@ class @LabelManager
     $label.detach().appendTo($target)
 
     # Return if we are not persisting state
-    return if pasive
+    return if persistState
 
-    xhr = $.post url
+    if action is 'remove'
+      xhr = $.ajax url: url, type: 'DELETE'
 
-    # If request fails, put label back to Other labels group
-    xhr.fail ->
-      _this.toggleLabelPriority($label, 'remove', true)
+      # If request fails, put label back to Other labels group
+      xhr.fail ->
+        _this.toggleLabelPriority($label, 'remove', true)
 
-      # Show a message
-      new Flash('Unable to update label prioritization at this time' , 'alert')
+        # Show a message
+        new Flash('Unable to update label prioritization at this time' , 'alert')
+    else
+      @savePrioritySort()
 
   onPrioritySortUpdate: ->
     @savePrioritySort()
@@ -76,4 +79,4 @@ class @LabelManager
     sortedIds = []
     @prioritizedLabels.find('li').each ->
       sortedIds.push $(@).data 'id'
-    sortedIds
\ No newline at end of file
+    sortedIds
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 0a60a802430..bd46a81ff10 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -72,11 +72,9 @@ class Projects::LabelsController < Projects::ApplicationController
     end
   end
 
-  def toggle_priority
-    priority = label.priority
-
+  def remove_priority
     respond_to do |format|
-      if label.update_attributes(priority: !priority)
+      if label.update_attribute(:priority, nil)
         format.json { render json: label }
       else
         message = label.errors.full_messages.uniq.join('. ')
@@ -86,8 +84,15 @@ class Projects::LabelsController < Projects::ApplicationController
   end
 
   def set_sorting
+    Label.transaction do
+      params[:label_ids].each_with_index do |label_id, index|
+        label = @project.labels.find_by_id(label_id)
+        label.update_attribute(:priority, index) if label
+      end
+    end
+
     respond_to do |format|
-      format.json { render json: {message: 'success'}}
+      format.json { render json: { message: 'success' } }
     end
   end
 
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 68ab6e87684..a0932712bd0 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -224,7 +224,7 @@ class IssuableFinder
   def sort(items)
     # Ensure we always have an explicit sort order (instead of inheriting
     # multiple orders when combining ActiveRecord::Relation objects).
-    params[:sort] ? items.sort(params[:sort], label_names) : items.reorder(id: :desc)
+    params[:sort] ? items.sort(params[:sort], excluded_labels: label_names) : items.reorder(id: :desc)
   end
 
   def by_assignee(items)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 8871cb8a6cd..92526a99147 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -48,12 +48,6 @@ module Issuable
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
 
 
-    def self.order_priority(labels)
-      select("#{table_name}.*, (#{Label.high_priority(name, table_name, labels).to_sql}) AS highest_priority")
-        .group("#{table_name}.id")
-        .reorder(nulls_last('highest_priority', 'ASC'))
-    end
-
     delegate :name,
              :email,
              to: :author,
@@ -111,18 +105,24 @@ module Issuable
       where(t[:title].matches(pattern).or(t[:description].matches(pattern)))
     end
 
-    def sort(method, labels = [])
+    def sort(method, excluded_labels: [])
       case method.to_s
       when 'milestone_due_asc' then order_milestone_due_asc
       when 'milestone_due_desc' then order_milestone_due_desc
       when 'downvotes_desc' then order_downvotes_desc
       when 'upvotes_desc' then order_upvotes_desc
-      when 'priority' then order_priority(labels)
+      when 'priority' then order_labels_priority(excluded_labels: excluded_labels)
       else
         order_by(method)
       end
     end
 
+    def order_labels_priority(excluded_labels: [])
+      select("#{table_name}.*, (#{highest_label_priority(excluded_labels).to_sql}) AS highest_priority").
+        group(arel_table[:id]).
+        reorder(Gitlab::Database.nulls_last_order('highest_priority', 'ASC'))
+    end
+
     def with_label(title, sort = nil)
       if title.is_a?(Array) && title.size > 1
         joins(:labels).where(labels: { title: title }).group(*grouping_columns(sort)).having("COUNT(DISTINCT labels.title) = #{title.size}")
@@ -146,6 +146,20 @@ module Issuable
 
       grouping_columns
     end
+
+    private
+
+    def highest_label_priority(excluded_labels)
+      query = Label.select(Label.arel_table[:priority].minimum).
+        joins(:label_links).
+        where(label_links: { target_type: name }).
+        where("label_links.target_id = #{table_name}.id").
+        reorder(nil)
+
+      query.where.not(title: excluded_labels) if excluded_labels.present?
+
+      query
+    end
   end
 
   def today?
diff --git a/app/models/issue.rb b/app/models/issue.rb
index bd0fbc96d18..235922710ad 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -75,10 +75,10 @@ class Issue < ActiveRecord::Base
     @link_reference_pattern ||= super("issues", /(?<issue>\d+)/)
   end
 
-  def self.sort(method)
+  def self.sort(method, excluded_labels: [])
     case method.to_s
     when 'due_date_asc' then order_due_date_asc
-    when 'due_date_desc'  then order_due_date_desc
+    when 'due_date_desc' then order_due_date_desc
     else
       super
     end
diff --git a/app/models/label.rb b/app/models/label.rb
index 4437ca393ed..7fd77880558 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -19,7 +19,6 @@ class Label < ActiveRecord::Base
 
   validates :color, color: true, allow_blank: false
   validates :project, presence: true, unless: Proc.new { |service| service.template? }
-  validates :priority, presence: false, default: false
 
   # Don't allow '?', '&', and ',' for label titles
   validates :title,
@@ -32,21 +31,11 @@ class Label < ActiveRecord::Base
   default_scope { order(title: :asc) }
 
   scope :templates, ->  { where(template: true) }
-  scope :prioritized, ->(value = true) { where(priority: value) }
 
-  def self.high_priority(name, table_name, labels)
-    unfiltered = unscoped
-      .select("MIN(labels.priority)")
-      .joins("INNER JOIN label_links ON label_links.label_id = labels.id")
-      .where("label_links.target_type = '#{name}'")
-      .where("label_links.target_id = #{table_name}.id")
-      .where("labels.project_id = #{table_name}.project_id")
+  def self.prioritized(bool = true)
+    query = bool ? where.not(priority: nil) : where(priority: nil)
 
-    if labels.empty?
-      unfiltered
-    else
-      unfiltered.where("labels.title NOT IN (?)", labels)
-    end
+    query.reorder(Gitlab::Database.nulls_last_order(:priority), :title)
   end
 
   alias_attribute :name, :title
@@ -139,8 +128,6 @@ class Label < ActiveRecord::Base
   end
 
   def nillify_priority
-    unless self.priority.present?
-      self.priority = nil
-    end
+    self.priority = nil if priority.blank?
   end
 end
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index eda75b64e79..a22dee1a626 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,7 +1,7 @@
 - label_css_id = dom_id(label)
 %li{id: label_css_id, :"data-id" => label.id}
   %a.js-toggle-priority{:href => "#",
-    :"data-url" => toggle_priority_namespace_project_label_path(@project.namespace, @project, label),
+    :"data-url" => remove_priority_namespace_project_label_path(@project.namespace, @project, label),
     :"data-dom-id" => "#{label_css_id}" }
     %span.add-priority
       (+)
diff --git a/config/initializers/nulls_last.rb b/config/initializers/nulls_last.rb
deleted file mode 100644
index 47b7b0bb3d2..00000000000
--- a/config/initializers/nulls_last.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ActiveRecord
-  class Base
-    def self.nulls_last(field, direction = 'ASC')
-      if Gitlab::Database.postgresql?
-        "#{field} #{direction} NULLS LAST"
-      else
-        if direction.upcase == 'ASC'
-          "-#{field} DESC"
-        else
-          "#{field} DESC"
-        end
-      end
-    end
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index 5aa8a0fe8a5..93ff825d7b2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -724,7 +724,7 @@ Rails.application.routes.draw do
 
           member do
             post :toggle_subscription
-            post :toggle_priority
+            delete :remove_priority
           end
         end
 
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 42bec913a45..04fa6a3a5de 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -16,6 +16,20 @@ module Gitlab
       database_version.match(/\A(?:PostgreSQL |)([^\s]+).*\z/)[1]
     end
 
+    def self.nulls_last_order(field, direction = 'ASC')
+      order = "#{field} #{direction}"
+
+      if Gitlab::Database.postgresql?
+        order << ' NULLS LAST'
+      else
+        # `field IS NULL` will be `0` for non-NULL columns and `1` for NULL
+        # columns. In the (default) ascending order, `0` comes first.
+        order.prepend("#{field} IS NULL, ") if direction == 'ASC'
+      end
+
+      order
+    end
+
     def true_value
       if Gitlab::Database.postgresql?
         "'t'"
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index d0a447753b7..3031559c613 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -39,6 +39,22 @@ describe Gitlab::Database, lib: true do
     end
   end
 
+  describe '.nulls_last_order' do
+    context 'when using PostgreSQL' do
+      before { expect(described_class).to receive(:postgresql?).and_return(true) }
+
+      it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column ASC NULLS LAST'}
+      it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC NULLS LAST'}
+    end
+
+    context 'when using MySQL' do
+      before { expect(described_class).to receive(:postgresql?).and_return(false) }
+
+      it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column IS NULL, column ASC'}
+      it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC'}
+    end
+  end
+
   describe '#true_value' do
     it 'returns correct value for PostgreSQL' do
       expect(described_class).to receive(:postgresql?).and_return(true)

From 25ee66e88cc6a3a32dea9a38157b3ee5709c5f9e Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 19 May 2016 00:46:09 -0500
Subject: [PATCH 1172/1431] Sorting improvements and styling

---
 app/assets/javascripts/LabelManager.js.coffee |  2 ++
 app/assets/stylesheets/framework/lists.scss   | 12 +++++++++++
 app/assets/stylesheets/pages/labels.scss      | 21 ++++++++++++++++++-
 app/views/projects/labels/_label.html.haml    |  7 -------
 app/views/projects/labels/index.html.haml     |  2 +-
 app/views/shared/_label_row.html.haml         |  7 +++++++
 6 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee
index ad2acb9d0b9..7c2e4ff46c7 100644
--- a/app/assets/javascripts/LabelManager.js.coffee
+++ b/app/assets/javascripts/LabelManager.js.coffee
@@ -9,6 +9,8 @@ class @LabelManager
 
     @prioritizedLabels.sortable(
       items: 'li'
+      placeholder: 'list-placeholder'
+      axis: 'y'
       update: @onPrioritySortUpdate.bind(@)
     )
 
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index b17c8bcbb1e..96e7aa4fb15 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -141,6 +141,18 @@ ul.content-list {
         padding: 10px 14px;
       }
     }
+
+    // When dragging a list item
+    &.ui-sortable-helper {
+      border-bottom: none;
+    }
+
+    &.list-placeholder {
+      background-color: $gray-light;
+      border: dotted 1px $gray-dark;
+      margin: 1px 0;
+      min-height: 30px;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 4b0b512db88..2cd9d74b2de 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -51,7 +51,7 @@
 .label-row {
   .label-name {
     display: inline-block;
-    width: 200px;
+    width: 170px;
 
     @media (max-width: $screen-xs-min) {
       display: block;
@@ -140,8 +140,11 @@
 }
 
 .prioritized-labels {
+  margin-bottom: 30px;
+
   .add-priority {
     display: none;
+    color: $gray-light;
   }
 }
 
@@ -150,3 +153,19 @@
     display: none;
   }
 }
+
+.toggle-priority {
+  display: inline-block;
+  vertical-align: middle;
+
+  button {
+    border-color: transparent;
+    padding: 5px 8px;
+    vertical-align: top;
+    font-size: 14px;
+
+    &:hover {
+      border-color: transparent;
+    }
+  }
+}
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index a22dee1a626..a637d64267c 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,12 +1,5 @@
 - label_css_id = dom_id(label)
 %li{id: label_css_id, :"data-id" => label.id}
-  %a.js-toggle-priority{:href => "#",
-    :"data-url" => remove_priority_namespace_project_label_path(@project.namespace, @project, label),
-    :"data-dom-id" => "#{label_css_id}" }
-    %span.add-priority
-      (+)
-    %span.remove-priority
-      (-)
   = render "shared/label_row", label: label
   .pull-info-right
     %span.append-right-20
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index d71db7545ef..325c50abaf2 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -10,7 +10,7 @@
         New label
 
 .labels
-  .prioritized-labels
+  .prioritized-labels{ class: ('hide' if params[:page].present?)}
     %h5 Prioritized Label
     %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) }
       - if @prioritized.present?
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index 9ce5562e667..b06a783e98b 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -1,4 +1,11 @@
+- label_css_id = dom_id(label)
 %span.label-row
+  .js-toggle-priority.toggle-priority{ :"data-url" => remove_priority_namespace_project_label_path(@project.namespace, @project, label),
+    :"data-dom-id" => "#{label_css_id}" }
+    %button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' }
+      %i.fa.fa-star-o
+    %button.remove-priority.btn.has-tooltip{ title: 'Remove priority', :'data-placement' => 'top' }
+      %i.fa.fa-star
   %span.label-name
     = link_to_label(label, tooltip: false)
   %span.prepend-left-10

From 0960cba0902776a5c41f55f3729260db4562236f Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 19 May 2016 16:21:26 -0500
Subject: [PATCH 1173/1431] Add tests for label prioritization

---
 .../labels/update_prioritization_spec.rb      | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 spec/features/projects/labels/update_prioritization_spec.rb

diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
new file mode 100644
index 00000000000..2fcaed84169
--- /dev/null
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+feature 'Prioritize labels', feature: true do
+  include WaitForAjax
+
+  let(:user)    { create(:user) }
+  let(:project) { create(:project, name: 'test', namespace: user.namespace) }
+
+  scenario 'user can prioritize a label', js: true do
+    bug     = create(:label, title: 'bug')
+    wontfix = create(:label, title: 'wontfix')
+
+    project.labels << bug
+    project.labels << wontfix
+
+    login_as user
+    visit namespace_project_labels_path(project.namespace, project)
+
+    expect(page).to have_content('No prioritized labels yet')
+
+    page.within('.other-labels') do
+      first('.js-toggle-priority').click
+      wait_for_ajax
+      expect(page).not_to have_content('bug')
+    end
+
+    page.within('.prioritized-labels') do
+      expect(page).not_to have_content('No prioritized labels yet')
+      expect(page).to have_content('bug')
+    end
+  end
+
+  scenario 'user can unprioritize a label', js: true do
+    bug     = create(:label, title: 'bug', priority: 1)
+    wontfix = create(:label, title: 'wontfix')
+
+    project.labels << bug
+    project.labels << wontfix
+
+    login_as user
+    visit namespace_project_labels_path(project.namespace, project)
+
+    expect(page).to have_content('bug')
+
+    page.within('.prioritized-labels') do
+      first('.js-toggle-priority').click
+      wait_for_ajax
+      expect(page).not_to have_content('bug')
+    end
+
+    page.within('.other-labels') do
+      expect(page).to have_content('bug')
+      expect(page).to have_content('wontfix')
+    end
+  end
+
+  scenario 'user can sort prioritized labels', js: true do
+    bug     = create(:label, title: 'bug', priority: 1)
+    wontfix = create(:label, title: 'wontfix', priority: 2)
+
+    project.labels << bug
+    project.labels << wontfix
+
+    login_as user
+    visit namespace_project_labels_path(project.namespace, project)
+
+    expect(page).to have_content 'bug'
+    expect(page).to have_content 'wontfix'
+
+    # Sort labels
+    find("#label_#{bug.id}").drag_to find("#label_#{wontfix.id}")
+
+    page.within('.prioritized-labels') do
+      expect(first('li')).to have_content('wontfix')
+      expect(page.all('li').last).to have_content('bug')
+    end
+  end
+end

From ae2fb991b0e56f0f9c232a5c7d1d3255c811092c Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 19 May 2016 16:21:56 -0500
Subject: [PATCH 1174/1431] Show proper error message when saving priority
 fails

---
 app/assets/javascripts/LabelManager.js.coffee | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee
index 7c2e4ff46c7..8a561ad1a46 100644
--- a/app/assets/javascripts/LabelManager.js.coffee
+++ b/app/assets/javascripts/LabelManager.js.coffee
@@ -71,11 +71,8 @@ class @LabelManager
             data:
               label_ids: @getSortedLabelsIds()
 
-    xhr.done ->
-      console.log 'done'
-
     xhr.fail ->
-      console.log 'fail'
+      new Flash('Unable to update label prioritization at this time' , 'alert')
 
   getSortedLabelsIds: ->
     sortedIds = []

From 1648c395e5d65ec7fd5fe8810ac743355bee0f6a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 19 May 2016 16:49:41 -0500
Subject: [PATCH 1175/1431] Fix syntax

---
 app/views/projects/labels/_label.html.haml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index a637d64267c..be367ab4562 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -11,16 +11,16 @@
         = pluralize label.open_issues_count(current_user), 'open issue'
 
     - if current_user
-      .label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}}
-        .subscription-status{data: {status: label_subscription_status(label)}}
+      .label-subscription{ data: { url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } }
+        .subscription-status{ data: { status: label_subscription_status(label) } }
 
         %button.js-subscribe-button.label-subscribe-button.btn.action-buttons{ type: "button", data: { toggle: "tooltip" } }
           %span= label_subscription_toggle_button_text(label)
 
     - if can? current_user, :admin_label, @project
-      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn action-buttons', data: {toggle: "tooltip"} do
+      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn action-buttons', data: { toggle: 'tooltip' } do
         %i.fa.fa-pencil-square-o
-      = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip"} do
+      = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn action-buttons remove-row', method: :delete, remote: true, data: { confirm: 'Remove this label? Are you sure?', toggle: 'tooltip' } do
         %i.fa.fa-trash-o
 
 - if current_user

From 91e6bc1258c5e9923482b7829ed38191a2f572d7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 19 May 2016 19:52:40 -0500
Subject: [PATCH 1176/1431] Add tests for issue prioritization

---
 .../labels/issues_sorted_by_priority_spec.rb  | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 spec/features/projects/labels/issues_sorted_by_priority_spec.rb

diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
new file mode 100644
index 00000000000..097ee4350fc
--- /dev/null
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+feature 'Issue prioritization', feature: true do
+
+  let(:user)    { create(:user) }
+  let(:project) { create(:project, name: 'test', namespace: user.namespace) }
+
+  # According to https://gitlab.com/gitlab-org/gitlab-ce/issues/14189#note_4360653
+  context 'when assigned with prioritized labels' do
+    scenario 'Are sorted properly' do
+      login_as user
+
+      label_1 = create(:label, title: 'label_1', priority: 1)
+      label_2 = create(:label, title: 'label_2', priority: 2)
+      label_3 = create(:label, title: 'label_3', priority: 3)
+      label_4 = create(:label, title: 'label_4', priority: 4)
+      label_5 = create(:label, title: 'label_5') # no priority
+
+      project.labels << label_1
+      project.labels << label_2
+      project.labels << label_3
+      project.labels << label_4
+      project.labels << label_5
+
+      issue_1 = create(:issue, title: 'issue_1', project: project)
+      issue_2 = create(:issue, title: 'issue_2', project: project)
+      issue_3 = create(:issue, title: 'issue_3', project: project)
+      issue_4 = create(:issue, title: 'issue_4', project: project)
+      issue_5 = create(:issue, title: 'issue_5', project: project)
+      issue_6 = create(:issue, title: 'issue_6', project: project)
+      issue_7 = create(:issue, title: 'issue_7', project: project)
+      issue_8 = create(:issue, title: 'issue_8', project: project)
+
+      # Assign labels to issues disorderly
+      issue_4.labels << label_1
+      issue_3.labels << label_2
+      issue_5.labels << label_3
+      issue_2.labels << label_4
+      issue_1.labels << label_5
+      issue_6.labels << label_5
+      issue_7.labels << label_5
+      issue_8.labels << label_5
+
+      visit namespace_project_issues_path(project.namespace, project, sort: 'priority')
+
+      # Ensure we are indicating that issues are sorted by priority
+      expect(page).to have_selector('.dropdown-toggle', text: 'Priority')
+
+      page.within('.issues-list') do
+        expect(find('> li:nth-of-type(1)')).to have_content('issue_4')
+        expect(find('> li:nth-of-type(2)')).to have_content('issue_3')
+        expect(find('> li:nth-of-type(3)')).to have_content('issue_5')
+        expect(find('> li:nth-of-type(4)')).to have_content('issue_2')
+
+        # the rest should be at the bottom
+        expect(find('> li:nth-of-type(5)')).to have_content('issue_7')
+        expect(find('> li:nth-of-type(6)')).to have_content('issue_8')
+        expect(find('> li:nth-of-type(7)')).to have_content('issue_1')
+        expect(find('> li:nth-of-type(8)')).to have_content('issue_6')
+      end
+    end
+  end
+end

From d6cecf7addc00e4cae61d4ecbb5b82e3187d0f44 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 20 May 2016 16:11:29 -0500
Subject: [PATCH 1177/1431] Fix failing tests

---
 features/steps/project/issues/labels.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/steps/project/issues/labels.rb b/features/steps/project/issues/labels.rb
index 8d87f6a7a58..e02b57bbf84 100644
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -60,25 +60,25 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
   end
 
   step 'I should see label \'feature\'' do
-    page.within '.manage-labels-list' do
+    page.within '.other-labels .manage-labels-list' do
       expect(page).to have_content 'feature'
     end
   end
 
   step 'I should see label \'bug\'' do
-    page.within '.manage-labels-list' do
+    page.within '.other-labels .manage-labels-list' do
       expect(page).to have_content 'bug'
     end
   end
 
   step 'I should not see label \'bug\'' do
-    page.within '.manage-labels-list' do
+    page.within '.other-labels .manage-labels-list' do
       expect(page).not_to have_content 'bug'
     end
   end
 
   step 'I should see label \'support\'' do
-    page.within '.manage-labels-list' do
+    page.within '.other-labels .manage-labels-list' do
       expect(page).to have_content 'support'
     end
   end
@@ -90,7 +90,7 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
   end
 
   step 'I should see label \'fix\'' do
-    page.within '.manage-labels-list' do
+    page.within '.other-labels .manage-labels-list' do
       expect(page).to have_content 'fix'
     end
   end

From 6aea7666c336ba1dffa192249b391164d4b50d36 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 20 May 2016 19:01:01 -0500
Subject: [PATCH 1178/1431] Add tests for issues with multiple labels

---
 .../labels/issues_sorted_by_priority_spec.rb  | 93 ++++++++++++-------
 1 file changed, 62 insertions(+), 31 deletions(-)

diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
index 097ee4350fc..fac70087c0b 100644
--- a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -5,23 +5,53 @@ feature 'Issue prioritization', feature: true do
   let(:user)    { create(:user) }
   let(:project) { create(:project, name: 'test', namespace: user.namespace) }
 
+  # Labels
+  let(:label_1) { create(:label, title: 'label_1', project: project, priority: 1) }
+  let(:label_2) { create(:label, title: 'label_2', project: project, priority: 2) }
+  let(:label_3) { create(:label, title: 'label_3', project: project, priority: 3) }
+  let(:label_4) { create(:label, title: 'label_4', project: project, priority: 4) }
+  let(:label_5) { create(:label, title: 'label_5', project: project) } # no priority
+
   # According to https://gitlab.com/gitlab-org/gitlab-ce/issues/14189#note_4360653
-  context 'when assigned with prioritized labels' do
+  context 'when issues have one label' do
     scenario 'Are sorted properly' do
+
+      # Issues
+      issue_1 = create(:issue, title: 'issue_1', project: project)
+      issue_2 = create(:issue, title: 'issue_2', project: project)
+      issue_3 = create(:issue, title: 'issue_3', project: project)
+      issue_4 = create(:issue, title: 'issue_4', project: project)
+      issue_5 = create(:issue, title: 'issue_5', project: project)
+
+      # Assign labels to issues disorderly
+      issue_4.labels << label_1
+      issue_3.labels << label_2
+      issue_5.labels << label_3
+      issue_2.labels << label_4
+      issue_1.labels << label_5
+
       login_as user
+      visit namespace_project_issues_path(project.namespace, project, sort: 'priority')
 
-      label_1 = create(:label, title: 'label_1', priority: 1)
-      label_2 = create(:label, title: 'label_2', priority: 2)
-      label_3 = create(:label, title: 'label_3', priority: 3)
-      label_4 = create(:label, title: 'label_4', priority: 4)
-      label_5 = create(:label, title: 'label_5') # no priority
+      # Ensure we are indicating that issues are sorted by priority
+      expect(page).to have_selector('.dropdown-toggle', text: 'Priority')
 
-      project.labels << label_1
-      project.labels << label_2
-      project.labels << label_3
-      project.labels << label_4
-      project.labels << label_5
+      page.within('.issues-holder') do
+        expect(page).to have_selector('.issues-list > li:nth-of-type(1)', text: 'issue_4')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(2)', text: 'issue_3')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(3)', text: 'issue_5')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(4)', text: 'issue_2')
 
+        # the rest should be at the bottom
+        expect(page).to have_selector('.issues-list > li:nth-of-type(5)', text: 'issue_1')
+      end
+    end
+  end
+
+  context 'when issues have multiple labels' do
+    scenario 'Are sorted properly' do
+
+      # Issues
       issue_1 = create(:issue, title: 'issue_1', project: project)
       issue_2 = create(:issue, title: 'issue_2', project: project)
       issue_3 = create(:issue, title: 'issue_3', project: project)
@@ -32,31 +62,32 @@ feature 'Issue prioritization', feature: true do
       issue_8 = create(:issue, title: 'issue_8', project: project)
 
       # Assign labels to issues disorderly
-      issue_4.labels << label_1
-      issue_3.labels << label_2
-      issue_5.labels << label_3
-      issue_2.labels << label_4
-      issue_1.labels << label_5
-      issue_6.labels << label_5
-      issue_7.labels << label_5
-      issue_8.labels << label_5
+      issue_5.labels << label_1 # 1
+      issue_5.labels << label_2
+      issue_8.labels << label_1 # 2
+      issue_1.labels << label_2 # 3
+      issue_1.labels << label_3
+      issue_3.labels << label_2 # 4
+      issue_3.labels << label_4
+      issue_7.labels << label_2 # 5
+      issue_2.labels << label_3 # 6
+      issue_4.labels << label_4 # 7
+      issue_6.labels << label_5 # 8  – No priority
 
+      login_as user
       visit namespace_project_issues_path(project.namespace, project, sort: 'priority')
 
-      # Ensure we are indicating that issues are sorted by priority
       expect(page).to have_selector('.dropdown-toggle', text: 'Priority')
 
-      page.within('.issues-list') do
-        expect(find('> li:nth-of-type(1)')).to have_content('issue_4')
-        expect(find('> li:nth-of-type(2)')).to have_content('issue_3')
-        expect(find('> li:nth-of-type(3)')).to have_content('issue_5')
-        expect(find('> li:nth-of-type(4)')).to have_content('issue_2')
-
-        # the rest should be at the bottom
-        expect(find('> li:nth-of-type(5)')).to have_content('issue_7')
-        expect(find('> li:nth-of-type(6)')).to have_content('issue_8')
-        expect(find('> li:nth-of-type(7)')).to have_content('issue_1')
-        expect(find('> li:nth-of-type(8)')).to have_content('issue_6')
+      page.within('.issues-holder') do
+        expect(page).to have_selector('.issues-list > li:nth-of-type(1)', text: 'issue_5')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(2)', text: 'issue_8')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(3)', text: 'issue_1')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(4)', text: 'issue_3')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(5)', text: 'issue_7')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(6)', text: 'issue_2')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(7)', text: 'issue_4')
+        expect(page).to have_selector('.issues-list > li:nth-of-type(8)', text: 'issue_6')
       end
     end
   end

From b28237b4d269e1e191597324769113ee4254d7c3 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 30 May 2016 17:53:08 +0100
Subject: [PATCH 1179/1431] Don't try to count a relation with aliases

Work around ActiveRecord count and column aliases issue as described at:
  <https://github.com/rails/rails/issues/15138#issuecomment-61325080>

AR doesn't promise that `#count` (which is called by `#any?`) will work
for relations using `#select`, which means we need a workaround instead.
---
 app/views/shared/_issues.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index 8ff9d4c1c7f..1150614c329 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -1,4 +1,4 @@
-- if @issues.any?
+- if @issues.reorder('').any?
   - @issues.group_by(&:project).each do |group|
     .panel.panel-default.panel-small
       - project = group[0]

From 1cc0209a8057c32cb7b073b822410f8b4c4ad3c9 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 1 Jun 2016 13:35:43 +0100
Subject: [PATCH 1180/1431] Fix style

- `reorder(nil)` is better than `reorder('')`
- Only use ASCII in comments
---
 app/views/shared/_issues.html.haml                             | 2 +-
 .../features/projects/labels/issues_sorted_by_priority_spec.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index 1150614c329..a5df502d7b5 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -1,4 +1,4 @@
-- if @issues.reorder('').any?
+- if @issues.reorder(nil).any?
   - @issues.group_by(&:project).each do |group|
     .panel.panel-default.panel-small
       - project = group[0]
diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
index fac70087c0b..453ded8ee71 100644
--- a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 feature 'Issue prioritization', feature: true do
@@ -72,7 +73,7 @@ feature 'Issue prioritization', feature: true do
       issue_7.labels << label_2 # 5
       issue_2.labels << label_3 # 6
       issue_4.labels << label_4 # 7
-      issue_6.labels << label_5 # 8  – No priority
+      issue_6.labels << label_5 # 8 - No priority
 
       login_as user
       visit namespace_project_issues_path(project.namespace, project, sort: 'priority')

From 91b475a9c0ab880c533b4d802afdc2db97ed1abb Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 1 Jun 2016 13:18:33 -0500
Subject: [PATCH 1181/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index fe9b9bec868..8e8daf35ff3 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.9.0 (unreleased)
   - Bulk assign/unassign labels to issues.
+  - Ability to prioritize labels !4009 / !3205 (Thijs Wouters)
   - Allow enabling wiki page events from Webhook management UI
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository

From bf0c4426ffb1994b647a4f7e8c74b0fef29645d2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 14:48:18 -0500
Subject: [PATCH 1182/1431] Feedback

---
 app/views/projects/labels/_form.html.haml  |  4 ----
 app/views/projects/labels/_label.html.haml |  2 +-
 app/views/projects/labels/index.html.haml  |  5 +++--
 app/views/shared/_label_row.html.haml      | 11 +++++------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index 227ce5d2317..aa143e54ffe 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -24,10 +24,6 @@
         - suggested_colors.each do |color|
           = link_to '#', style: "background-color: #{color}", data: { color: color } do
             &nbsp;
-  .form-group
-    = f.label :priority, "Priority", class: 'control-label'
-    .col-sm-10
-      = f.text_field :priority, class: "form-control"
 
   .form-actions
     - if @label.persisted?
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index be367ab4562..b7df0aa36a7 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,5 +1,5 @@
 - label_css_id = dom_id(label)
-%li{id: label_css_id, :"data-id" => label.id}
+%li{id: label_css_id, data: {id: label.id } }
   = render "shared/label_row", label: label
   .pull-info-right
     %span.append-right-20
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 325c50abaf2..4b2fb04323f 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -10,7 +10,8 @@
         New label
 
 .labels
-  .prioritized-labels{ class: ('hide' if params[:page].present?)}
+  - hide_class = 'hide' if ((params[:page].present? and params[:page] != '1') or @labels.blank?)
+  .prioritized-labels{ class: hide_class }
     %h5 Prioritized Label
     %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) }
       - if @prioritized.present?
@@ -18,7 +19,7 @@
       - else
         %p.empty-message No prioritized labels yet
   .other-labels
-    %h5 Other Labels
+    %h5{ class: hide_class } Other Labels
     - if @labels.present?
       %ul.content-list.manage-labels-list.js-other-labels
         = render @labels
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index b06a783e98b..41d7411f3f0 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -1,12 +1,11 @@
-- label_css_id = dom_id(label)
 %span.label-row
-  .js-toggle-priority.toggle-priority{ :"data-url" => remove_priority_namespace_project_label_path(@project.namespace, @project, label),
-    :"data-dom-id" => "#{label_css_id}" }
+  .js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label),
+    dom_id: dom_id(label) } }
     %button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' }
-      %i.fa.fa-star-o
+      = icon('star-o')
     %button.remove-priority.btn.has-tooltip{ title: 'Remove priority', :'data-placement' => 'top' }
-      %i.fa.fa-star
+      = icon('star')
   %span.label-name
     = link_to_label(label, tooltip: false)
   %span.prepend-left-10
-    = markdown(label.description, pipeline: :single_line)
\ No newline at end of file
+    = markdown(label.description, pipeline: :single_line)

From 8f0bf297676dac33ecc8ced10da5ae88f36a9ab0 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 14:57:31 -0500
Subject: [PATCH 1183/1431] Add unprioritized scope

---
 app/controllers/projects/labels_controller.rb | 4 ++--
 app/models/label.rb                           | 8 +++++---
 app/views/projects/labels/index.html.haml     | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index bd46a81ff10..13f634fdd0e 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -11,8 +11,8 @@ class Projects::LabelsController < Projects::ApplicationController
   respond_to :js, :html
 
   def index
-    @labels = @project.labels.prioritized(false).page(params[:page])
-    @prioritized = @project.labels.prioritized
+    @labels = @project.labels.unprioritized.page(params[:page])
+    @prioritized_labels = @project.labels.prioritized
 
     respond_to do |format|
       format.html
diff --git a/app/models/label.rb b/app/models/label.rb
index 7fd77880558..9e04c5263bd 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -32,10 +32,12 @@ class Label < ActiveRecord::Base
 
   scope :templates, ->  { where(template: true) }
 
-  def self.prioritized(bool = true)
-    query = bool ? where.not(priority: nil) : where(priority: nil)
+  def self.prioritized
+     where.not(priority: nil).reorder(Gitlab::Database.nulls_last_order(:priority), :title)
+  end
 
-    query.reorder(Gitlab::Database.nulls_last_order(:priority), :title)
+  def self.unprioritized
+    where(priority: nil).reorder(Gitlab::Database.nulls_last_order(:priority), :title)
   end
 
   alias_attribute :name, :title
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 4b2fb04323f..77c42ec356d 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -14,8 +14,8 @@
   .prioritized-labels{ class: hide_class }
     %h5 Prioritized Label
     %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) }
-      - if @prioritized.present?
-        = render @prioritized
+      - if @prioritized_labels.present?
+        = render @prioritized_labels
       - else
         %p.empty-message No prioritized labels yet
   .other-labels

From f011f038cd6cd1fcb01a18de5774ef7be34d6cef Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 15:21:00 -0500
Subject: [PATCH 1184/1431] Update method name

---
 app/models/label.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/label.rb b/app/models/label.rb
index 9e04c5263bd..e4fc4f251d8 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -26,7 +26,7 @@ class Label < ActiveRecord::Base
             format: { with: /\A[^&\?,]+\z/ },
             uniqueness: { scope: :project_id }
 
-  before_save :nillify_priority
+  before_save :nullify_priority
 
   default_scope { order(title: :asc) }
 
@@ -129,7 +129,7 @@ class Label < ActiveRecord::Base
     end
   end
 
-  def nillify_priority
+  def nullify_priority
     self.priority = nil if priority.blank?
   end
 end

From fa6593b226ab4eae267a45716dde65b641532674 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 15:21:15 -0500
Subject: [PATCH 1185/1431] Update method and route

---
 app/controllers/projects/labels_controller.rb | 4 ++--
 config/routes.rb                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 13f634fdd0e..885dd0eb45d 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -5,7 +5,7 @@ class Projects::LabelsController < Projects::ApplicationController
   before_action :label, only: [:edit, :update, :destroy]
   before_action :authorize_read_label!
   before_action :authorize_admin_labels!, only: [
-    :new, :create, :edit, :update, :generate, :destroy
+    :new, :create, :edit, :update, :generate, :destroy, :remove_priority
   ]
 
   respond_to :js, :html
@@ -83,7 +83,7 @@ class Projects::LabelsController < Projects::ApplicationController
     end
   end
 
-  def set_sorting
+  def set_priorities
     Label.transaction do
       params[:label_ids].each_with_index do |label_id, index|
         label = @project.labels.find_by_id(label_id)
diff --git a/config/routes.rb b/config/routes.rb
index 93ff825d7b2..240dcc74b06 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -719,7 +719,7 @@ Rails.application.routes.draw do
         resources :labels, constraints: { id: /\d+/ } do
           collection do
             post :generate
-            post :set_sorting
+            post :set_priorities
           end
 
           member do

From b0bfd789480d52f7783ecd2a9c4ea61c690c83a7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 15:21:39 -0500
Subject: [PATCH 1186/1431] Typo

---
 app/views/projects/labels/index.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 77c42ec356d..3ba6ccd443c 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -12,8 +12,8 @@
 .labels
   - hide_class = 'hide' if ((params[:page].present? and params[:page] != '1') or @labels.blank?)
   .prioritized-labels{ class: hide_class }
-    %h5 Prioritized Label
-    %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) }
+    %h5 Prioritized Labels
+    %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }
       - if @prioritized_labels.present?
         = render @prioritized_labels
       - else

From 221d2e3aa0f100b9d6da74ebe08dbab35ac5297f Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 16:33:53 -0500
Subject: [PATCH 1187/1431] Remove unnecesary param

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

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 885dd0eb45d..ec8e1497d89 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -105,7 +105,7 @@ class Projects::LabelsController < Projects::ApplicationController
   end
 
   def label_params
-    params.require(:label).permit(:title, :description, :color, :priority)
+    params.require(:label).permit(:title, :description, :color)
   end
 
   def label

From d4bcf51692122abaef1272fe80e8897b5be0f178 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 16:38:55 -0500
Subject: [PATCH 1188/1431] Show prioritized labels only on the first page and
 when there's labels created

---
 app/views/projects/labels/index.html.haml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 3ba6ccd443c..82fb6029838 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -10,7 +10,10 @@
         New label
 
 .labels
-  - hide_class = 'hide' if ((params[:page].present? and params[:page] != '1') or @labels.blank?)
+  - hide_class = ''
+  -# Only show it in the first page
+  - if (params[:page].present? and params[:page] != '1') or @project.labels.blank? or (params[:page] == nil and @project.labels.blank?)
+    - hide_class = 'hide'
   .prioritized-labels{ class: hide_class }
     %h5 Prioritized Labels
     %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }

From 4ac907ee77784006b32a6c918792d3a82a0bb5c8 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 2 Jun 2016 18:42:13 -0500
Subject: [PATCH 1189/1431] typo

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

diff --git a/app/models/label.rb b/app/models/label.rb
index e4fc4f251d8..aed74d0bde1 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -33,7 +33,7 @@ class Label < ActiveRecord::Base
   scope :templates, ->  { where(template: true) }
 
   def self.prioritized
-     where.not(priority: nil).reorder(Gitlab::Database.nulls_last_order(:priority), :title)
+    where.not(priority: nil).reorder(Gitlab::Database.nulls_last_order(:priority), :title)
   end
 
   def self.unprioritized

From 8b3ed9c35513a8d8ee576ffdb69630a08c53875b Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 3 Jun 2016 01:13:15 -0500
Subject: [PATCH 1190/1431] add :set_priorities to :authorize_admin_labels!

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

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index ec8e1497d89..0ca675623e5 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -5,7 +5,7 @@ class Projects::LabelsController < Projects::ApplicationController
   before_action :label, only: [:edit, :update, :destroy]
   before_action :authorize_read_label!
   before_action :authorize_admin_labels!, only: [
-    :new, :create, :edit, :update, :generate, :destroy, :remove_priority
+    :new, :create, :edit, :update, :generate, :destroy, :remove_priority, :set_priorities
   ]
 
   respond_to :js, :html

From e487b0995cef810fead3f03cce45bc220a6111c2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 3 Jun 2016 01:15:32 -0500
Subject: [PATCH 1191/1431] Improve functionality

---
 app/assets/javascripts/LabelManager.js.coffee | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee
index 8a561ad1a46..365a062bb81 100644
--- a/app/assets/javascripts/LabelManager.js.coffee
+++ b/app/assets/javascripts/LabelManager.js.coffee
@@ -1,4 +1,6 @@
 class @LabelManager
+  errorMessage: 'Unable to update label prioritization at this time'
+
   constructor: (opts = {}) ->
     # Defaults
     {
@@ -27,7 +29,7 @@ class @LabelManager
     action = if $btn.parents('.js-prioritized-labels').length then 'remove' else 'add'
     _this.toggleLabelPriority($label, action)
 
-  toggleLabelPriority: ($label, action, persistState = false) ->
+  toggleLabelPriority: ($label, action, persistState = true) ->
     _this = @
     url = $label.find('.js-toggle-priority').data 'url'
 
@@ -48,31 +50,32 @@ class @LabelManager
     $label.detach().appendTo($target)
 
     # Return if we are not persisting state
-    return if persistState
+    return unless persistState
 
     if action is 'remove'
       xhr = $.ajax url: url, type: 'DELETE'
-
-      # If request fails, put label back to Other labels group
-      xhr.fail ->
-        _this.toggleLabelPriority($label, 'remove', true)
-
-        # Show a message
-        new Flash('Unable to update label prioritization at this time' , 'alert')
     else
-      @savePrioritySort()
+      xhr = @savePrioritySort($label, action)
+
+    xhr.fail @rollbackLabelPosition.bind(@, $label, action)
 
   onPrioritySortUpdate: ->
-    @savePrioritySort()
-
-  savePrioritySort: ->
-    xhr = $.post
-            url: @prioritizedLabels.data('url')
-            data:
-              label_ids: @getSortedLabelsIds()
+    xhr = @savePrioritySort()
 
     xhr.fail ->
-      new Flash('Unable to update label prioritization at this time' , 'alert')
+      new Flash(@errorMessage, 'alert')
+
+  savePrioritySort: () ->
+    $.post
+      url: @prioritizedLabels.data('url')
+      data:
+        label_ids: @getSortedLabelsIds()
+
+  rollbackLabelPosition: ($label, originalAction)->
+    action = if originalAction is 'remove' then 'add' else 'remove'
+    @toggleLabelPriority($label, action, false)
+
+    new Flash(@errorMessage, 'alert')
 
   getSortedLabelsIds: ->
     sortedIds = []

From b4e4e61184b017ecbe3c3664ba916388947b49d2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 3 Jun 2016 01:36:09 -0500
Subject: [PATCH 1192/1431] Show functionality only for users with the ability
 to edit labels

---
 app/views/projects/labels/index.html.haml | 26 ++++++++++++-----------
 app/views/shared/_label_row.html.haml     | 13 ++++++------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 82fb6029838..0450f512041 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Labels"
+- hide_class = ''
 
 .top-area
   .nav-text
@@ -10,19 +11,20 @@
         New label
 
 .labels
-  - hide_class = ''
-  -# Only show it in the first page
-  - if (params[:page].present? and params[:page] != '1') or @project.labels.blank? or (params[:page] == nil and @project.labels.blank?)
-    - hide_class = 'hide'
-  .prioritized-labels{ class: hide_class }
-    %h5 Prioritized Labels
-    %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }
-      - if @prioritized_labels.present?
-        = render @prioritized_labels
-      - else
-        %p.empty-message No prioritized labels yet
+  - if can?(current_user, :admin_label, @project)
+    -# Only show it in the first page
+    - if (params[:page].present? and params[:page] != '1') or @project.labels.blank? or (params[:page] == nil and @project.labels.blank?)
+      - hide_class = 'hide'
+    .prioritized-labels{ class: hide_class }
+      %h5 Prioritized Labels
+      %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }
+        - if @prioritized_labels.present?
+          = render @prioritized_labels
+        - else
+          %p.empty-message No prioritized labels yet
   .other-labels
-    %h5{ class: hide_class } Other Labels
+    - if can?(current_user, :admin_label, @project)
+      %h5{ class: hide_class } Other Labels
     - if @labels.present?
       %ul.content-list.manage-labels-list.js-other-labels
         = render @labels
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index 41d7411f3f0..c53f32d97e8 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -1,10 +1,11 @@
 %span.label-row
-  .js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label),
-    dom_id: dom_id(label) } }
-    %button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' }
-      = icon('star-o')
-    %button.remove-priority.btn.has-tooltip{ title: 'Remove priority', :'data-placement' => 'top' }
-      = icon('star')
+  - if can? current_user, :admin_label, @project
+    .js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label),
+      dom_id: dom_id(label) } }
+      %button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' }
+        = icon('star-o')
+      %button.remove-priority.btn.has-tooltip{ title: 'Remove priority', :'data-placement' => 'top' }
+        = icon('star')
   %span.label-name
     = link_to_label(label, tooltip: false)
   %span.prepend-left-10

From a966e6e4512e8073d7193c540fafba3fe86ea228 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 3 Jun 2016 01:37:23 -0500
Subject: [PATCH 1193/1431] Initialize LabelManager only when necessary

---
 app/assets/javascripts/dispatcher.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 49fc7ef2e12..5d6ac6e757e 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -101,7 +101,7 @@ class Dispatcher
       when 'projects:labels:new', 'projects:labels:edit'
         new Labels()
       when 'projects:labels:index'
-        new LabelManager()
+        new LabelManager() if $('.prioritized-labels').length
       when 'projects:network:show'
         # Ensure we don't create a particular shortcut handler here. This is
         # already created, where the network graph is created.

From 2ca32a09b68b1b74e8142d6211ffc8f70acf472e Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 3 Jun 2016 02:14:39 -0500
Subject: [PATCH 1194/1431] Add test for the case when user can't prioritize
 labels

---
 .../labels/update_prioritization_spec.rb      | 130 +++++++++++-------
 1 file changed, 80 insertions(+), 50 deletions(-)

diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
index 2fcaed84169..2a0bf6548db 100644
--- a/spec/features/projects/labels/update_prioritization_spec.rb
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -3,76 +3,106 @@ require 'spec_helper'
 feature 'Prioritize labels', feature: true do
   include WaitForAjax
 
-  let(:user)    { create(:user) }
-  let(:project) { create(:project, name: 'test', namespace: user.namespace) }
+  context 'when project belongs to user' do
+    let(:user)    { create(:user) }
+    let(:project) { create(:project, name: 'test', namespace: user.namespace) }
 
-  scenario 'user can prioritize a label', js: true do
-    bug     = create(:label, title: 'bug')
-    wontfix = create(:label, title: 'wontfix')
+    scenario 'user can prioritize a label', js: true do
+      bug     = create(:label, title: 'bug')
+      wontfix = create(:label, title: 'wontfix')
 
-    project.labels << bug
-    project.labels << wontfix
+      project.labels << bug
+      project.labels << wontfix
 
-    login_as user
-    visit namespace_project_labels_path(project.namespace, project)
+      login_as user
+      visit namespace_project_labels_path(project.namespace, project)
 
-    expect(page).to have_content('No prioritized labels yet')
+      expect(page).to have_content('No prioritized labels yet')
 
-    page.within('.other-labels') do
-      first('.js-toggle-priority').click
-      wait_for_ajax
-      expect(page).not_to have_content('bug')
+      page.within('.other-labels') do
+        first('.js-toggle-priority').click
+        wait_for_ajax
+        expect(page).not_to have_content('bug')
+      end
+
+      page.within('.prioritized-labels') do
+        expect(page).not_to have_content('No prioritized labels yet')
+        expect(page).to have_content('bug')
+      end
     end
 
-    page.within('.prioritized-labels') do
-      expect(page).not_to have_content('No prioritized labels yet')
+    scenario 'user can unprioritize a label', js: true do
+      bug     = create(:label, title: 'bug', priority: 1)
+      wontfix = create(:label, title: 'wontfix')
+
+      project.labels << bug
+      project.labels << wontfix
+
+      login_as user
+      visit namespace_project_labels_path(project.namespace, project)
+
       expect(page).to have_content('bug')
+
+      page.within('.prioritized-labels') do
+        first('.js-toggle-priority').click
+        wait_for_ajax
+        expect(page).not_to have_content('bug')
+      end
+
+      page.within('.other-labels') do
+        expect(page).to have_content('bug')
+        expect(page).to have_content('wontfix')
+      end
+    end
+
+    scenario 'user can sort prioritized labels', js: true do
+      bug     = create(:label, title: 'bug', priority: 1)
+      wontfix = create(:label, title: 'wontfix', priority: 2)
+
+      project.labels << bug
+      project.labels << wontfix
+
+      login_as user
+      visit namespace_project_labels_path(project.namespace, project)
+
+      expect(page).to have_content 'bug'
+      expect(page).to have_content 'wontfix'
+
+      # Sort labels
+      find("#label_#{bug.id}").drag_to find("#label_#{wontfix.id}")
+
+      page.within('.prioritized-labels') do
+        expect(first('li')).to have_content('wontfix')
+        expect(page.all('li').last).to have_content('bug')
+      end
     end
   end
 
-  scenario 'user can unprioritize a label', js: true do
-    bug     = create(:label, title: 'bug', priority: 1)
-    wontfix = create(:label, title: 'wontfix')
+  context 'as a guest' do
+    it 'can not prioritize labels' do
+      user = create(:user)
+      guest = create(:user)
+      project = create(:project, name: 'test', namespace: user.namespace)
 
-    project.labels << bug
-    project.labels << wontfix
+      create(:label, title: 'bug')
 
-    login_as user
-    visit namespace_project_labels_path(project.namespace, project)
+      login_as guest
+      visit namespace_project_labels_path(project.namespace, project)
 
-    expect(page).to have_content('bug')
-
-    page.within('.prioritized-labels') do
-      first('.js-toggle-priority').click
-      wait_for_ajax
-      expect(page).not_to have_content('bug')
-    end
-
-    page.within('.other-labels') do
-      expect(page).to have_content('bug')
-      expect(page).to have_content('wontfix')
+      expect(page).not_to have_css('.prioritized-labels')
     end
   end
 
-  scenario 'user can sort prioritized labels', js: true do
-    bug     = create(:label, title: 'bug', priority: 1)
-    wontfix = create(:label, title: 'wontfix', priority: 2)
+  context 'as a non signed in user' do
+    it 'can not prioritize labels' do
+      user = create(:user)
+      project = create(:project, name: 'test', namespace: user.namespace)
 
-    project.labels << bug
-    project.labels << wontfix
+      create(:label, title: 'bug')
 
-    login_as user
-    visit namespace_project_labels_path(project.namespace, project)
+      visit namespace_project_labels_path(project.namespace, project)
 
-    expect(page).to have_content 'bug'
-    expect(page).to have_content 'wontfix'
-
-    # Sort labels
-    find("#label_#{bug.id}").drag_to find("#label_#{wontfix.id}")
-
-    page.within('.prioritized-labels') do
-      expect(first('li')).to have_content('wontfix')
-      expect(page.all('li').last).to have_content('bug')
+      expect(page).not_to have_css('.prioritized-labels')
     end
   end
 end

From b0ec4b9cc37f30c90d4bceff5e8b8efbac25dedc Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 3 Jun 2016 18:06:23 -0500
Subject: [PATCH 1195/1431] Remove comment

Just to trigger CI
---
 spec/features/projects/labels/issues_sorted_by_priority_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
index 453ded8ee71..323b2665996 100644
--- a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'spec_helper'
 
 feature 'Issue prioritization', feature: true do

From 77f30af0179164fe3e893df616eb60beb8a1d9fe Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 6 Jun 2016 15:40:35 +0100
Subject: [PATCH 1196/1431] Tidy up Ruby style in templates

---
 app/views/projects/labels/index.html.haml | 9 ++++-----
 app/views/shared/_label_row.html.haml     | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 0450f512041..5deb84ad41e 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -13,9 +13,8 @@
 .labels
   - if can?(current_user, :admin_label, @project)
     -# Only show it in the first page
-    - if (params[:page].present? and params[:page] != '1') or @project.labels.blank? or (params[:page] == nil and @project.labels.blank?)
-      - hide_class = 'hide'
-    .prioritized-labels{ class: hide_class }
+    - hide = @project.labels.empty? || (params[:page].present? && params[:page] != '1')
+    .prioritized-labels{ class: ('hide' if hide) }
       %h5 Prioritized Labels
       %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }
         - if @prioritized_labels.present?
@@ -24,14 +23,14 @@
           %p.empty-message No prioritized labels yet
   .other-labels
     - if can?(current_user, :admin_label, @project)
-      %h5{ class: hide_class } Other Labels
+      %h5{ class: ('hide' if hide } Other Labels
     - if @labels.present?
       %ul.content-list.manage-labels-list.js-other-labels
         = render @labels
       = paginate @labels, theme: 'gitlab'
     - else
       .nothing-here-block
-        - if can? current_user, :admin_label, @project
+        - if can?(current_user, :admin_label, @project)
           Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
         - else
           No labels created
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index c53f32d97e8..d315a3fe93b 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -1,5 +1,5 @@
 %span.label-row
-  - if can? current_user, :admin_label, @project
+  - if can?(current_user, :admin_label, @project)
     .js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label),
       dom_id: dom_id(label) } }
       %button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' }

From bf193eb78bd7022b58d6ceebd928f2b140205f65 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 6 Jun 2016 15:41:33 +0100
Subject: [PATCH 1197/1431] Remove unnecessary null-specific order

---
 app/models/label.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/label.rb b/app/models/label.rb
index aed74d0bde1..9760f1aefa9 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -33,11 +33,11 @@ class Label < ActiveRecord::Base
   scope :templates, ->  { where(template: true) }
 
   def self.prioritized
-    where.not(priority: nil).reorder(Gitlab::Database.nulls_last_order(:priority), :title)
+    where.not(priority: nil).reorder(:title)
   end
 
   def self.unprioritized
-    where(priority: nil).reorder(Gitlab::Database.nulls_last_order(:priority), :title)
+    where(priority: nil).reorder(:title)
   end
 
   alias_attribute :name, :title

From 7bc65b2bef1aaacb0122eabca23e1db0849321b0 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 6 Jun 2016 16:12:32 +0100
Subject: [PATCH 1198/1431] Clarify issue priority spec

We don't care particularly about the ordering within a priority level,
just that the levels are in the right order.
---
 .../labels/issues_sorted_by_priority_spec.rb  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
index 323b2665996..461f1737928 100644
--- a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -37,13 +37,9 @@ feature 'Issue prioritization', feature: true do
       expect(page).to have_selector('.dropdown-toggle', text: 'Priority')
 
       page.within('.issues-holder') do
-        expect(page).to have_selector('.issues-list > li:nth-of-type(1)', text: 'issue_4')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(2)', text: 'issue_3')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(3)', text: 'issue_5')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(4)', text: 'issue_2')
+        issue_titles = all('.issues-list .issue-title-text').map(&:text)
 
-        # the rest should be at the bottom
-        expect(page).to have_selector('.issues-list > li:nth-of-type(5)', text: 'issue_1')
+        expect(issue_titles).to eq(['issue_4', 'issue_3', 'issue_5', 'issue_2', 'issue_1'])
       end
     end
   end
@@ -80,14 +76,11 @@ feature 'Issue prioritization', feature: true do
       expect(page).to have_selector('.dropdown-toggle', text: 'Priority')
 
       page.within('.issues-holder') do
-        expect(page).to have_selector('.issues-list > li:nth-of-type(1)', text: 'issue_5')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(2)', text: 'issue_8')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(3)', text: 'issue_1')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(4)', text: 'issue_3')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(5)', text: 'issue_7')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(6)', text: 'issue_2')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(7)', text: 'issue_4')
-        expect(page).to have_selector('.issues-list > li:nth-of-type(8)', text: 'issue_6')
+        issue_titles = all('.issues-list .issue-title-text').map(&:text)
+
+        expect(issue_titles[0..1]).to contain_exactly('issue_5', 'issue_8')
+        expect(issue_titles[2..4]).to contain_exactly('issue_1', 'issue_3', 'issue_7')
+        expect(issue_titles[5..-1]).to eq(['issue_2', 'issue_4', 'issue_6'])
       end
     end
   end

From a04897b76b00e4a099faf55e30443378928e28e1 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 6 Jun 2016 10:59:22 -0500
Subject: [PATCH 1199/1431] Typo

---
 app/views/projects/labels/_label.html.haml | 4 ++--
 app/views/projects/labels/index.html.haml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index b7df0aa36a7..1c51ea676c7 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,5 +1,5 @@
 - label_css_id = dom_id(label)
-%li{id: label_css_id, data: {id: label.id } }
+%li{id: label_css_id, data: { id: label.id } }
   = render "shared/label_row", label: label
   .pull-info-right
     %span.append-right-20
@@ -17,7 +17,7 @@
         %button.js-subscribe-button.label-subscribe-button.btn.action-buttons{ type: "button", data: { toggle: "tooltip" } }
           %span= label_subscription_toggle_button_text(label)
 
-    - if can? current_user, :admin_label, @project
+    - if can?(current_user, :admin_label, @project)
       = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn action-buttons', data: { toggle: 'tooltip' } do
         %i.fa.fa-pencil-square-o
       = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn action-buttons remove-row', method: :delete, remote: true, data: { confirm: 'Remove this label? Are you sure?', toggle: 'tooltip' } do
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 5deb84ad41e..c72eddba37f 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -5,7 +5,7 @@
   .nav-text
     Labels can be applied to issues and merge requests.
   .nav-controls
-    - if can? current_user, :admin_label, @project
+    - if can?(current_user, :admin_label, @project)
       = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do
         = icon('plus')
         New label
@@ -23,7 +23,7 @@
           %p.empty-message No prioritized labels yet
   .other-labels
     - if can?(current_user, :admin_label, @project)
-      %h5{ class: ('hide' if hide } Other Labels
+      %h5{ class: ('hide' if hide) } Other Labels
     - if @labels.present?
       %ul.content-list.manage-labels-list.js-other-labels
         = render @labels

From 67c02edccf2dc3d42126dcf4269862c2a1622fff Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 6 Jun 2016 14:00:44 -0300
Subject: [PATCH 1200/1431] Move create! method from formatters to the
 BaseFormatter

---
 lib/gitlab/github_import/base_formatter.rb         | 4 ++++
 lib/gitlab/github_import/issue_formatter.rb        | 8 ++++----
 lib/gitlab/github_import/label_formatter.rb        | 4 ++--
 lib/gitlab/github_import/milestone_formatter.rb    | 4 ++--
 lib/gitlab/github_import/pull_request_formatter.rb | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/gitlab/github_import/base_formatter.rb b/lib/gitlab/github_import/base_formatter.rb
index 202263c6742..72992baffd4 100644
--- a/lib/gitlab/github_import/base_formatter.rb
+++ b/lib/gitlab/github_import/base_formatter.rb
@@ -9,6 +9,10 @@ module Gitlab
         @formatter = Gitlab::ImportFormatter.new
       end
 
+      def create!
+        self.klass.create!(self.attributes)
+      end
+
       private
 
       def gl_user_id(github_id)
diff --git a/lib/gitlab/github_import/issue_formatter.rb b/lib/gitlab/github_import/issue_formatter.rb
index 47f625efb3a..835ec858b35 100644
--- a/lib/gitlab/github_import/issue_formatter.rb
+++ b/lib/gitlab/github_import/issue_formatter.rb
@@ -16,14 +16,14 @@ module Gitlab
         }
       end
 
-      def create!
-        Issue.create!(self.attributes)
-      end
-
       def has_comments?
         raw_data.comments > 0
       end
 
+      def klass
+        Issue
+      end
+
       def number
         raw_data.number
       end
diff --git a/lib/gitlab/github_import/label_formatter.rb b/lib/gitlab/github_import/label_formatter.rb
index 87b51a0a178..9f18244e7d7 100644
--- a/lib/gitlab/github_import/label_formatter.rb
+++ b/lib/gitlab/github_import/label_formatter.rb
@@ -9,8 +9,8 @@ module Gitlab
         }
       end
 
-      def create!
-        Label.create!(self.attributes)
+      def klass
+        Label
       end
 
       private
diff --git a/lib/gitlab/github_import/milestone_formatter.rb b/lib/gitlab/github_import/milestone_formatter.rb
index a0d2e47c412..53d4b3102d1 100644
--- a/lib/gitlab/github_import/milestone_formatter.rb
+++ b/lib/gitlab/github_import/milestone_formatter.rb
@@ -14,8 +14,8 @@ module Gitlab
         }
       end
 
-      def create!
-        Milestone.create!(self.attributes)
+      def klass
+        Milestone
       end
 
       private
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 0d21c49035e..498b00cb658 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -24,8 +24,8 @@ module Gitlab
         }
       end
 
-      def create!
-        MergeRequest.create!(self.attributes)
+      def klass
+        MergeRequest
       end
 
       def number

From 246410003f2a100547c3abd3d75947946f2fae77 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 6 Jun 2016 13:45:33 -0300
Subject: [PATCH 1201/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index fe9b9bec868..243dc29b8c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ v 8.8.4 (unreleased)
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
   - Upgrade to jQuery 2
+  - Import GitHub repositories respecting the API rate limit
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 456a75fb7baa13da26921618b7c7800252a011f7 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 6 Jun 2016 12:11:49 -0600
Subject: [PATCH 1202/1431] Improve input padding, fix #18237.

---
 app/assets/stylesheets/framework/forms.scss     | 1 +
 app/assets/stylesheets/framework/selects.scss   | 2 +-
 app/assets/stylesheets/framework/variables.scss | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 46acc3b772f..43d55661541 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -76,6 +76,7 @@ label {
 .form-control {
   @include box-shadow(none);
   border-radius: 3px;
+  padding: $gl-vert-padding $gl-input-padding;
 }
 
 .select-wrapper {
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index 6efc6ec1e4b..f242706ebe4 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -8,7 +8,7 @@
     background: #fff;
     border-color: $input-border;
     height: 35px;
-    padding: $gl-vert-padding $gl-btn-padding;
+    padding: $gl-vert-padding $gl-input-padding;
     font-size: $gl-font-size;
     line-height: 1.42857143;
     border-radius: $border-radius-base;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index f253da814bc..1c2e259a633 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -57,6 +57,7 @@ $code_line_height: 1.5;
  */
 $gl-padding: 16px;
 $gl-btn-padding: 10px;
+$gl-input-padding: 10px;
 $gl-vert-padding: 6px;
 $gl-padding-top: 10px;
 

From aebfdcd8513b5513f8631f7e67d7f2900f093278 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Jun 2016 20:19:39 +0200
Subject: [PATCH 1203/1431] Install bundler

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac522160d69..7bece719b00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,6 +74,7 @@ update-knapsack:
     - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
     - export KNAPSACK_GENERATE_REPORT=true
     - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
+    - bundle exec gem install bundler
     - knapsack ${JOB_NAME[0]}
   artifacts:
     paths:

From d2b7c39a55913a1ba416dae2711059e656a7d10a Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 6 Jun 2016 12:22:59 -0600
Subject: [PATCH 1204/1431] Add padding to bottom of wiki page, fix #12921.

---
 app/views/projects/wikis/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index 1cb48a1e85d..9166c0edb3b 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -18,7 +18,7 @@
     You can view the #{link_to "most recent version", namespace_project_wiki_path(@project.namespace, @project, @page)} or browse the #{link_to "history", namespace_project_wiki_history_path(@project.namespace, @project, @page)}.
 
 
-.wiki-holder.prepend-top-default
+.wiki-holder.prepend-top-default.append-bottom-default
   .wiki
     = preserve do
       = render_wiki_content(@page)

From b51b14507c06ed898ae4a63ffda0e84ca40342d3 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 17 Apr 2016 15:35:18 -0600
Subject: [PATCH 1205/1431] Add License Finder gem.

In order to rehost all our gems in our own gem host, we need to have the legal rights to do so for every gem should they be taken down from RubyGems. License Finder automates checking of gems to ensure that we're in the clear legally.

Approved the MIT License because it essentially allows us to do "whatever" with those gems.

I am not a lawyer.

https://github.com/pivotal/LicenseFinder
---
 Gemfile      | 2 ++
 Gemfile.lock | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/Gemfile b/Gemfile
index 38ff536fd71..51ef0bd1b4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -306,6 +306,8 @@ group :development, :test do
   gem 'bundler-audit', require: false
 
   gem 'benchmark-ips', require: false
+
+  gem "license_finder", require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f1dbd431e4..86e102d6fb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,6 +366,12 @@ GEM
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
+    license_finder (2.1.0)
+      bundler
+      httparty
+      rubyzip
+      thor
+      xml-simple
     licensee (8.0.0)
       rugged (>= 0.24b)
     listen (3.0.5)
@@ -618,6 +624,7 @@ GEM
       sexp_processor (~> 4.1)
     rubyntlm (0.5.2)
     rubypants (0.2.0)
+    rubyzip (1.2.0)
     rufus-scheduler (3.1.10)
     rugged (0.24.0)
     safe_yaml (1.0.4)
@@ -875,6 +882,7 @@ DEPENDENCIES
   jwt
   kaminari (~> 0.17.0)
   letter_opener_web (~> 1.3.0)
+  license_finder
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
   mail_room (~> 0.7)

From 9442482d091cd4fabd760797aa9455f96e5abbb6 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 17 Apr 2016 15:56:10 -0600
Subject: [PATCH 1206/1431] Add some gems' licenses not caught by License
 Finder.

Also add License Finder to CI (only runs on master).
---
 .gitlab-ci.yml            |  5 +++
 config/.decisions.yml     | 89 +++++++++++++++++++++++++++++++++++++++
 config/license_finder.yml |  2 +
 3 files changed, 96 insertions(+)
 create mode 100644 config/.decisions.yml
 create mode 100644 config/license_finder.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85730e1b687..e4d81ccf350 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,6 +93,11 @@ scss-lint:
   script:
     - bundle exec rake scss_lint
 
+license-finder:
+  stage: test
+  script:
+    - bundle exec license_finder
+
 brakeman:
   stage: test
   script:
diff --git a/config/.decisions.yml b/config/.decisions.yml
new file mode 100644
index 00000000000..7e4a8be6c48
--- /dev/null
+++ b/config/.decisions.yml
@@ -0,0 +1,89 @@
+---
+- - :whitelist
+  - MIT
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-04-17 21:12:24.558441000 Z
+- - :ignore_group
+  - development
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-04-17 21:27:01.054140000 Z
+- - :ignore_group
+  - test
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-04-17 21:27:06.250326000 Z
+- - :license
+  - raphael-rails
+  - MIT
+  - :who: 
+    :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt
+    :versions: []
+    :when: 2016-04-17 21:30:07.575392000 Z
+- - :license
+  - rouge
+  - MIT
+  - :who: 
+    :why: https://github.com/jneen/rouge/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:31:29.490394000 Z
+- - :license
+  - pyu-ruby-sasl
+  - MIT
+  - :who: 
+    :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE
+    :versions: []
+    :when: 2016-04-17 21:41:55.266420000 Z
+- - :license
+  - six
+  - MIT
+  - :who: 
+    :why: https://github.com/randx/six/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:42:31.420186000 Z
+- - :license
+  - rdoc
+  - GPLv2
+  - :who: 
+    :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc
+    :versions: []
+    :when: 2016-04-17 21:43:30.480413000 Z
+- - :license
+  - rubypants
+  - unknown
+  - :who: 
+    :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc
+    :versions: []
+    :when: 2016-04-17 21:44:49.443453000 Z
+- - :license
+  - expression_parser
+  - MIT
+  - :who: 
+    :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE
+    :versions: []
+    :when: 2016-04-17 21:45:41.829912000 Z
+- - :license
+  - ace-rails-ap
+  - MIT
+  - :who: 
+    :why: https://github.com/codykrieger/ace-rails-ap/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:46:19.767922000 Z
+- - :license
+  - jquery-scrollto-rails
+  - MIT, GPLv2
+  - :who: 
+    :why: https://github.com/JohnColvin/jquery-scrollto-rails/blob/master/MIT%20License
+    :versions: []
+    :when: 2016-04-17 21:47:56.967946000 Z
+- - :license
+  - creole
+  - ruby
+  - :who: 
+    :why: https://github.com/minad/creole#license
+    :versions: []
+    :when: 2016-04-17 21:49:10.329759000 Z
diff --git a/config/license_finder.yml b/config/license_finder.yml
new file mode 100644
index 00000000000..d641563719f
--- /dev/null
+++ b/config/license_finder.yml
@@ -0,0 +1,2 @@
+---
+decisions_file: './config/.decisions.yml'

From ddca2806c754b9be86138dfeddb4b581d9b6a40f Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 1 May 2016 23:59:43 -0600
Subject: [PATCH 1207/1431] Add gems and licenses that were previously missing.
 Approve a number of licenses after a bunch of research today.

---
 Gemfile.lock          |   1 +
 config/.decisions.yml | 123 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 116 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 86e102d6fb6..53685058faf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -796,6 +796,7 @@ GEM
       builder
       expression_parser
       rinku
+    xml-simple (1.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
diff --git a/config/.decisions.yml b/config/.decisions.yml
index 7e4a8be6c48..9cfc9a186bb 100644
--- a/config/.decisions.yml
+++ b/config/.decisions.yml
@@ -47,18 +47,11 @@
     :when: 2016-04-17 21:42:31.420186000 Z
 - - :license
   - rdoc
-  - GPLv2
+  - ruby
   - :who: 
     :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc
     :versions: []
     :when: 2016-04-17 21:43:30.480413000 Z
-- - :license
-  - rubypants
-  - unknown
-  - :who: 
-    :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc
-    :versions: []
-    :when: 2016-04-17 21:44:49.443453000 Z
 - - :license
   - expression_parser
   - MIT
@@ -87,3 +80,117 @@
     :why: https://github.com/minad/creole#license
     :versions: []
     :when: 2016-04-17 21:49:10.329759000 Z
+- - :license
+  - eventmachine
+  - ruby
+  - :who: 
+    :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:49:10.329759001 Z
+- - :whitelist
+  - Apache 2.0
+  - :who: Connor Shea
+    :why: http://choosealicense.com/licenses/apache-2.0/
+    :versions: []
+    :when: 2016-05-02 05:27:43.762702000 Z
+- - :blacklist
+  - GPLv2
+  - :who: Connor Shea
+    :why: GPL-licensed libraries cannot be linked to from non-GPL projects.
+    :versions: []
+    :when: 2016-05-02 05:29:27.637336000 Z
+- - :blacklist
+  - GPLv3
+  - :who: Connor Shea
+    :why: GPL-licensed libraries cannot be linked to from non-GPL projects.
+    :versions: []
+    :when: 2016-05-02 05:29:43.904715000 Z
+- - :whitelist
+  - ruby
+  - :who: Connor Shea
+    :why: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING
+    :versions: []
+    :when: 2016-05-02 05:31:54.498490000 Z
+- - :whitelist
+  - LGPL
+  - :who: Connor Shea
+    :why: http://www.gnu.org/licenses/license-list.html#LGPLv2.1
+    :versions: []
+    :when: 2016-05-02 05:32:48.645841000 Z
+- - :whitelist
+  - ISC
+  - :who: Connor Shea
+    :why: http://www.gnu.org/licenses/license-list.html#ISC
+    :versions: []
+    :when: 2016-05-02 05:42:01.894452000 Z
+- - :whitelist
+  - New BSD
+  - :who: Connor Shea
+    :why: https://opensource.org/licenses/BSD-3-Clause
+    :versions: []
+    :when: 2016-05-02 05:44:38.246021000 Z
+- - :license
+  - unicorn
+  - ruby
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 05:45:28.817510000 Z
+- - :license
+  - unicorn-worker-killer
+  - ruby
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 05:45:38.323867000 Z
+- - :license
+  - json
+  - ruby
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 05:50:07.826564000 Z
+- - :license
+  - unf
+  - BSD
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 05:51:46.886872000 Z
+- - :whitelist
+  - LGPL-2.1+
+  - :who: 
+    :why: Equivalent to LGPL.
+    :versions: []
+    :when: 2016-05-02 05:52:56.303239000 Z
+- - :whitelist
+  - BSD
+  - :who: 
+    :why: https://opensource.org/licenses/BSD-2-Clause
+    :versions: []
+    :when: 2016-05-02 05:55:09.796363000 Z
+- - :license
+  - rubypants
+  - MIT
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 05:56:50.696858000 Z
+- - :ignore
+  - bundler
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 06:41:31.504230000 Z
+- - :heed
+  - bundler
+  - :who: 
+    :why: 
+    :versions: []
+    :when: 2016-05-02 06:41:38.703526000 Z
+- - :ignore
+  - bundler
+  - :who: 
+    :why: Bundler is MIT licensed but will sometimes fail in CI.
+    :versions: []
+    :when: 2016-05-02 06:42:08.045090000 Z

From 4cff270f20cbf09641b3c65086a769f684cf8755 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 2 Jun 2016 11:08:59 -0600
Subject: [PATCH 1208/1431] Fix up all the decisions in the YML file.

---
 config/.decisions.yml | 263 ++++++++++++++++++++----------------------
 1 file changed, 122 insertions(+), 141 deletions(-)

diff --git a/config/.decisions.yml b/config/.decisions.yml
index 9cfc9a186bb..2327b2d17a1 100644
--- a/config/.decisions.yml
+++ b/config/.decisions.yml
@@ -1,110 +1,37 @@
 ---
-- - :whitelist
-  - MIT
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-04-17 21:12:24.558441000 Z
+# IGNORED GROUPS AND GEMS
 - - :ignore_group
   - development
-  - :who: 
-    :why: 
+  - :who: Connor Shea
+    :why: Development gems are not distributed with the final product and are therefore exempt.
     :versions: []
     :when: 2016-04-17 21:27:01.054140000 Z
 - - :ignore_group
   - test
-  - :who: 
-    :why: 
+  - :who: Connor Shea
+    :why: Test gems are not distributed with the final product and are therefore exempt.
     :versions: []
     :when: 2016-04-17 21:27:06.250326000 Z
-- - :license
-  - raphael-rails
+- - :ignore
+  - bundler
+  - :who: Connor Shea
+    :why: Bundler is MIT licensed but will sometimes fail in CI.
+    :versions: []
+    :when: 2016-05-02 06:42:08.045090000 Z
+
+# LICENSE WHITELIST
+- - :whitelist
   - MIT
-  - :who: 
-    :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt
+  - :who: Connor Shea
+    :why: Compatible with itself.
     :versions: []
-    :when: 2016-04-17 21:30:07.575392000 Z
-- - :license
-  - rouge
-  - MIT
-  - :who: 
-    :why: https://github.com/jneen/rouge/blob/master/LICENSE
-    :versions: []
-    :when: 2016-04-17 21:31:29.490394000 Z
-- - :license
-  - pyu-ruby-sasl
-  - MIT
-  - :who: 
-    :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE
-    :versions: []
-    :when: 2016-04-17 21:41:55.266420000 Z
-- - :license
-  - six
-  - MIT
-  - :who: 
-    :why: https://github.com/randx/six/blob/master/LICENSE
-    :versions: []
-    :when: 2016-04-17 21:42:31.420186000 Z
-- - :license
-  - rdoc
-  - ruby
-  - :who: 
-    :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc
-    :versions: []
-    :when: 2016-04-17 21:43:30.480413000 Z
-- - :license
-  - expression_parser
-  - MIT
-  - :who: 
-    :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE
-    :versions: []
-    :when: 2016-04-17 21:45:41.829912000 Z
-- - :license
-  - ace-rails-ap
-  - MIT
-  - :who: 
-    :why: https://github.com/codykrieger/ace-rails-ap/blob/master/LICENSE
-    :versions: []
-    :when: 2016-04-17 21:46:19.767922000 Z
-- - :license
-  - jquery-scrollto-rails
-  - MIT, GPLv2
-  - :who: 
-    :why: https://github.com/JohnColvin/jquery-scrollto-rails/blob/master/MIT%20License
-    :versions: []
-    :when: 2016-04-17 21:47:56.967946000 Z
-- - :license
-  - creole
-  - ruby
-  - :who: 
-    :why: https://github.com/minad/creole#license
-    :versions: []
-    :when: 2016-04-17 21:49:10.329759000 Z
-- - :license
-  - eventmachine
-  - ruby
-  - :who: 
-    :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE
-    :versions: []
-    :when: 2016-04-17 21:49:10.329759001 Z
+    :when: 2016-04-17 21:12:24.558441000 Z
 - - :whitelist
   - Apache 2.0
   - :who: Connor Shea
     :why: http://choosealicense.com/licenses/apache-2.0/
     :versions: []
     :when: 2016-05-02 05:27:43.762702000 Z
-- - :blacklist
-  - GPLv2
-  - :who: Connor Shea
-    :why: GPL-licensed libraries cannot be linked to from non-GPL projects.
-    :versions: []
-    :when: 2016-05-02 05:29:27.637336000 Z
-- - :blacklist
-  - GPLv3
-  - :who: Connor Shea
-    :why: GPL-licensed libraries cannot be linked to from non-GPL projects.
-    :versions: []
-    :when: 2016-05-02 05:29:43.904715000 Z
 - - :whitelist
   - ruby
   - :who: Connor Shea
@@ -129,68 +56,122 @@
     :why: https://opensource.org/licenses/BSD-3-Clause
     :versions: []
     :when: 2016-05-02 05:44:38.246021000 Z
-- - :license
-  - unicorn
-  - ruby
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-05-02 05:45:28.817510000 Z
-- - :license
-  - unicorn-worker-killer
-  - ruby
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-05-02 05:45:38.323867000 Z
-- - :license
-  - json
-  - ruby
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-05-02 05:50:07.826564000 Z
-- - :license
-  - unf
-  - BSD
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-05-02 05:51:46.886872000 Z
 - - :whitelist
   - LGPL-2.1+
-  - :who: 
+  - :who: Connor Shea
     :why: Equivalent to LGPL.
     :versions: []
     :when: 2016-05-02 05:52:56.303239000 Z
 - - :whitelist
   - BSD
-  - :who: 
+  - :who: Connor Shea
     :why: https://opensource.org/licenses/BSD-2-Clause
     :versions: []
     :when: 2016-05-02 05:55:09.796363000 Z
+
+# LICENSE BLACKLIST
+- - :blacklist
+  - GPLv2
+  - :who: Connor Shea
+    :why: GPL-licensed libraries cannot be linked to from non-GPL projects.
+    :versions: []
+    :when: 2016-05-02 05:29:27.637336000 Z
+- - :blacklist
+  - GPLv3
+  - :who: Connor Shea
+    :why: GPL-licensed libraries cannot be linked to from non-GPL projects.
+    :versions: []
+    :when: 2016-05-02 05:29:43.904715000 Z
+
+# GEM LICENSES
+- - :license
+  - raphael-rails
+  - MIT
+  - :who: Connor Shea
+    :why: https://github.com/mockdeep/raphael-rails/blob/master/license.txt
+    :versions: []
+    :when: 2016-04-17 21:30:07.575392000 Z
+- - :license
+  - rouge
+  - MIT
+  - :who: Connor Shea
+    :why: https://github.com/jneen/rouge/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:31:29.490394000 Z
+- - :license
+  - pyu-ruby-sasl
+  - MIT
+  - :who: Connor Shea
+    :why: https://github.com/pyu10055/ruby-sasl/blob/master/MIT-LICENSE
+    :versions: []
+    :when: 2016-04-17 21:41:55.266420000 Z
+- - :license
+  - six
+  - MIT
+  - :who: Connor Shea
+    :why: https://github.com/randx/six/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:42:31.420186000 Z
+- - :license
+  - rdoc
+  - ruby
+  - :who: Connor Shea
+    :why: https://github.com/rdoc/rdoc/blob/master/LICENSE.rdoc
+    :versions: []
+    :when: 2016-04-17 21:43:30.480413000 Z
+- - :license
+  - expression_parser
+  - MIT
+  - :who: Connor Shea
+    :why: https://github.com/nricciar/expression_parser/blob/master/MIT-LICENSE
+    :versions: []
+    :when: 2016-04-17 21:45:41.829912000 Z
+- - :license
+  - creole
+  - ruby
+  - :who: Connor Shea
+    :why: https://github.com/minad/creole#license
+    :versions: []
+    :when: 2016-04-17 21:49:10.329759000 Z
+- - :license
+  - eventmachine
+  - ruby
+  - :who: Connor Shea
+    :why: https://github.com/eventmachine/eventmachine/blob/master/LICENSE
+    :versions: []
+    :when: 2016-04-17 21:49:10.329759001 Z
+- - :license
+  - unicorn
+  - ruby
+  - :who: Connor Shea
+    :why: http://unicorn.bogomips.org/LICENSE.html
+    :versions: []
+    :when: 2016-05-02 05:45:28.817510000 Z
+- - :license
+  - unicorn-worker-killer
+  - ruby
+  - :who: Connor Shea
+    :why: https://github.com/kzk/unicorn-worker-killer/blob/master/LICENSE
+    :versions: []
+    :when: 2016-05-02 05:45:38.323867000 Z
+- - :license
+  - json
+  - ruby
+  - :who: Connor Shea
+    :why: https://github.com/flori/json/tree/master#license
+    :versions: []
+    :when: 2016-05-02 05:50:07.826564000 Z
+- - :license
+  - unf
+  - BSD
+  - :who: Connor Shea
+    :why: https://github.com/knu/ruby-unf/blob/master/LICENSE
+    :versions: []
+    :when: 2016-05-02 05:51:46.886872000 Z
 - - :license
   - rubypants
-  - MIT
-  - :who: 
-    :why: 
+  - BSD
+  - :who: Connor Shea
+    :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc
     :versions: []
     :when: 2016-05-02 05:56:50.696858000 Z
-- - :ignore
-  - bundler
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-05-02 06:41:31.504230000 Z
-- - :heed
-  - bundler
-  - :who: 
-    :why: 
-    :versions: []
-    :when: 2016-05-02 06:41:38.703526000 Z
-- - :ignore
-  - bundler
-  - :who: 
-    :why: Bundler is MIT licensed but will sometimes fail in CI.
-    :versions: []
-    :when: 2016-05-02 06:42:08.045090000 Z

From 3c3234121575ce271f8b50f3dcf1880db328fed1 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 2 Jun 2016 12:04:19 -0600
Subject: [PATCH 1209/1431] Add Licensing information and guidelines to the
 Documentation.

---
 config/.decisions.yml        |  2 +-
 doc/development/README.md    |  2 ++
 doc/development/licensing.md | 57 ++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 doc/development/licensing.md

diff --git a/config/.decisions.yml b/config/.decisions.yml
index 2327b2d17a1..273796f3912 100644
--- a/config/.decisions.yml
+++ b/config/.decisions.yml
@@ -23,7 +23,7 @@
 - - :whitelist
   - MIT
   - :who: Connor Shea
-    :why: Compatible with itself.
+    :why: http://choosealicense.com/licenses/mit/
     :versions: []
     :when: 2016-04-17 21:12:24.558441000 Z
 - - :whitelist
diff --git a/doc/development/README.md b/doc/development/README.md
index aa7d54c01d0..cf1bd493a9f 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -7,9 +7,11 @@
 - [Gotchas](gotchas.md) to avoid
 - [How to dump production data to staging](db_dump.md)
 - [Instrumentation](instrumentation.md)
+- [Licensing](licensing.md) for ensuring license compliance
 - [Migration Style Guide](migration_style_guide.md) for creating safe migrations
 - [Performance guidelines](performance.md)
 - [Rake tasks](rake_tasks.md) for development
+- [SCSS Style Guide](scss_styleguide.md)
 - [Shell commands](shell_commands.md) in the GitLab codebase
 - [Sidekiq debugging](sidekiq_debugging.md)
 - [SQL guidelines](sql.md) for SQL guidelines
diff --git a/doc/development/licensing.md b/doc/development/licensing.md
new file mode 100644
index 00000000000..87841f8c39b
--- /dev/null
+++ b/doc/development/licensing.md
@@ -0,0 +1,57 @@
+# GitLab Licensing and Compatibility
+
+GitLab CE is licensed under the terms of the MIT License. GitLab EE is licensed under "The GitLab Enterprise Edition (EE) license" wherein there are more restrictions. See their respective LICENSE files ([CE][CE], [EE][EE]) for more information.
+
+## Automated Testing
+
+In order to comply with the terms the libraries we use are licensed under, we have to make sure to check new gems for compatible licenses whenever they're added. To automate this process, we use the [license_finder][license_finder] gem by Pivotal. It runs every time a new commit is pushed and verifies that all gems in the bundle use a license that doesn't conflict with the licensing of either GitLab Community Edition or GitLab Enterprise Edition.
+
+There are some limitations with the automated testing, however. CSS and JavaScript libraries, as well as any Ruby libraries not included by way of Bundler, must be verified manually and independently. Take care whenever one such library is used, as automated tests won't catch problematic licenses from them.
+
+Some gems may not include their license information in their `gemspec` file. These won't be detected by License Finder, and will have to be verified manually. [License Finder's README][license_finder] includes information and guidance on manually adding a gem's license. Make sure to include a link to the library's license in the "why" section.
+
+## Acceptable Licenses
+
+The following are licenses which are acceptable to use:
+
+- [The MIT License][MIT] (the MIT Expat License specifically): The MIT License requires that the license itself is included with all copies of the source. It is a permissive (non-copyleft) license as defined by the Open Source Initiative.
+- [LGPL][LGPL] (version 2, version 3): GPL constraints regarding modification and redistribution under the same license are not required of projects using an LGPL library, only upon modification of the LGPL-licensed library itself.
+- [Apache 2.0 License][apache-2]: A permissive license that also provides an express grant of patent rights from contributors to users.
+- [Ruby 1.8 License][ruby-1.8]: Dual-licensed under either itself or the GPLv2, defer to the Ruby License itself. Acceptable because of point 3b: "You may distribute the software in object code or binary form, provided that you do at least ONE of the following: b) accompany the distribution with the machine-readable source of the software."
+- [Ruby 1.9 License][ruby-1.9]: Dual-licensed under either itself or the BSD 2-Clause License, defer to BSD 2-Clause.
+- [BSD 2-Clause License][BSD-2-Clause]: A permissive (non-copyleft) license as defined by the Open Source Initiative.
+- [BSD 3-Clause License][BSD-3-Clause] (also known as New BSD or Modified BSD): A permissive (non-copyleft) license as defined by the Open Source Initiative
+- [ISC License][ISC] (also known as the OpenBSD License): A permissive (non-copyleft) license as defined by the Open Source Initiative.
+
+## Unacceptable Licenses
+
+The following are licenses which are *not* acceptable to use:
+
+- [GNU GPL][GPL] (version 1, [version 2][GPLv2], [version 3][GPLv3], or any future versions): GPL-licensed libraries cannot be linked to from non-GPL projects.
+- [GNU AGPLv3][AGPLv3]: AGPL-licensed libraries cannot be linked to from non-GPL projects.
+
+## Notes
+
+If a gem uses a license which is not listed above, open an issue and ask. If a license is not included in the "acceptable" list, operate under the assumption that it is not acceptable.
+
+Keep in mind that each license has its own restrictions (typically defined in their body text). Please make sure to comply with those restrictions at all times whenever an external library is used.
+
+Gems which are included only in the "development" or "test" groups by Bundler are exempt from license requirements, as they're not distributed for use in production.
+
+**NOTE:** This document is **not** legal advice, nor is it comprehensive. It should not be taken as such.
+
+[CE]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/LICENSE
+[EE]: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/LICENSE
+[license_finder]: https://github.com/pivotal/LicenseFinder
+[MIT]: http://choosealicense.com/licenses/mit/
+[LGPL]: http://choosealicense.com/licenses/lgpl-3.0/
+[apache-2]: http://choosealicense.com/licenses/apache-2.0/
+[ruby-1.8]: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING
+[ruby-1.9]: https://www.ruby-lang.org/en/about/license.txt
+[BSD-2-Clause]: https://opensource.org/licenses/BSD-2-Clause
+[BSD-3-Clause]: https://opensource.org/licenses/BSD-3-Clause
+[ISC]: https://opensource.org/licenses/ISC
+[GPL]: http://choosealicense.com/licenses/gpl-3.0/
+[GPLv2]: http://www.gnu.org/licenses/gpl-2.0.txt
+[GPLv3]: http://www.gnu.org/licenses/gpl-3.0.txt
+[AGPLv3]: http://choosealicense.com/licenses/agpl-3.0/

From 7045b9e908a6ea4f76b5e6ae09c5ab1385685c5a Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 2 Jun 2016 12:27:42 -0600
Subject: [PATCH 1210/1431] Make sure to mention the GNU Project and
 OSI-provided information regarding the GPL so no one tries to disagree with
 that decision.

---
 doc/development/licensing.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/development/licensing.md b/doc/development/licensing.md
index 87841f8c39b..abfd9926522 100644
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -12,7 +12,7 @@ Some gems may not include their license information in their `gemspec` file. The
 
 ## Acceptable Licenses
 
-The following are licenses which are acceptable to use:
+Libraries with the following licenses are acceptable for use:
 
 - [The MIT License][MIT] (the MIT Expat License specifically): The MIT License requires that the license itself is included with all copies of the source. It is a permissive (non-copyleft) license as defined by the Open Source Initiative.
 - [LGPL][LGPL] (version 2, version 3): GPL constraints regarding modification and redistribution under the same license are not required of projects using an LGPL library, only upon modification of the LGPL-licensed library itself.
@@ -25,13 +25,15 @@ The following are licenses which are acceptable to use:
 
 ## Unacceptable Licenses
 
-The following are licenses which are *not* acceptable to use:
+Libraries with the following licenses are acceptable for use:
 
 - [GNU GPL][GPL] (version 1, [version 2][GPLv2], [version 3][GPLv3], or any future versions): GPL-licensed libraries cannot be linked to from non-GPL projects.
 - [GNU AGPLv3][AGPLv3]: AGPL-licensed libraries cannot be linked to from non-GPL projects.
 
 ## Notes
 
+Decisions regarding the GNU GPL licenses are based on information provided by [The GNU Project][GNU-GPL-FAQ], as well as [the Open Source Initiative][OSI-GPL], which both state that linking GPL libraries makes the program itself GPL.
+
 If a gem uses a license which is not listed above, open an issue and ask. If a license is not included in the "acceptable" list, operate under the assumption that it is not acceptable.
 
 Keep in mind that each license has its own restrictions (typically defined in their body text). Please make sure to comply with those restrictions at all times whenever an external library is used.
@@ -55,3 +57,5 @@ Gems which are included only in the "development" or "test" groups by Bundler ar
 [GPLv2]: http://www.gnu.org/licenses/gpl-2.0.txt
 [GPLv3]: http://www.gnu.org/licenses/gpl-3.0.txt
 [AGPLv3]: http://choosealicense.com/licenses/agpl-3.0/
+[GNU-GPL-FAQ]: http://www.gnu.org/licenses/gpl-faq.html#IfLibraryIsGPL
+[OSI-GPL]: https://opensource.org/faq#linking-proprietary-code

From b2e85b796835b024d9436aae43b3a7c65fab66de Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sat, 4 Jun 2016 21:32:59 -0600
Subject: [PATCH 1211/1431] Add relevant commands to the licensing document,
 resolve some feedback.

---
 doc/development/README.md    |  1 -
 doc/development/licensing.md | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/doc/development/README.md b/doc/development/README.md
index cf1bd493a9f..c5d5af43864 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -11,7 +11,6 @@
 - [Migration Style Guide](migration_style_guide.md) for creating safe migrations
 - [Performance guidelines](performance.md)
 - [Rake tasks](rake_tasks.md) for development
-- [SCSS Style Guide](scss_styleguide.md)
 - [Shell commands](shell_commands.md) in the GitLab codebase
 - [Sidekiq debugging](sidekiq_debugging.md)
 - [SQL guidelines](sql.md) for SQL guidelines
diff --git a/doc/development/licensing.md b/doc/development/licensing.md
index abfd9926522..8c8c7486fff 100644
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -8,7 +8,39 @@ In order to comply with the terms the libraries we use are licensed under, we ha
 
 There are some limitations with the automated testing, however. CSS and JavaScript libraries, as well as any Ruby libraries not included by way of Bundler, must be verified manually and independently. Take care whenever one such library is used, as automated tests won't catch problematic licenses from them.
 
-Some gems may not include their license information in their `gemspec` file. These won't be detected by License Finder, and will have to be verified manually. [License Finder's README][license_finder] includes information and guidance on manually adding a gem's license. Make sure to include a link to the library's license in the "why" section.
+Some gems may not include their license information in their `gemspec` file. These won't be detected by License Finder, and will have to be verified manually.
+
+### License Finder commands
+
+There are a few basic commands License Finder provides that you'll need in order to manage license detection.
+
+To verify that the checks are passing, and/or to see what dependencies are causing the checks to fail:
+
+```
+bundle exec license_finder
+```
+
+To whitelist a new license:
+
+```
+license_finder whitelist add MIT
+```
+
+To blacklist a new license:
+
+```
+license_finder blacklist add GPLv2
+```
+
+To tell License Finder about a dependency's license if it isn't auto-detected:
+
+```
+license_finder licenses add my_unknown_dependency MIT
+```
+
+For all of the above, please include `--why "Reason"` and `--who "My Name"` so the `decisions.yml` file can keep track of when, why, and who approved of a dependency.
+
+More detailed information on how the gem and its commands work is available in the [License Finder README][license_finder].
 
 ## Acceptable Licenses
 
@@ -25,7 +57,7 @@ Libraries with the following licenses are acceptable for use:
 
 ## Unacceptable Licenses
 
-Libraries with the following licenses are acceptable for use:
+Libraries with the following licenses are unacceptable for use:
 
 - [GNU GPL][GPL] (version 1, [version 2][GPLv2], [version 3][GPLv3], or any future versions): GPL-licensed libraries cannot be linked to from non-GPL projects.
 - [GNU AGPLv3][AGPLv3]: AGPL-licensed libraries cannot be linked to from non-GPL projects.

From 7900c035bf3f0cf96740227aebadbb3cad276ba0 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 6 Jun 2016 10:34:44 -0600
Subject: [PATCH 1212/1431] Resolve feedback.

---
 config/{.decisions.yml => dependency_decisions.yml} | 2 +-
 config/license_finder.yml                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename config/{.decisions.yml => dependency_decisions.yml} (98%)

diff --git a/config/.decisions.yml b/config/dependency_decisions.yml
similarity index 98%
rename from config/.decisions.yml
rename to config/dependency_decisions.yml
index 273796f3912..a49d805e4f9 100644
--- a/config/.decisions.yml
+++ b/config/dependency_decisions.yml
@@ -35,7 +35,7 @@
 - - :whitelist
   - ruby
   - :who: Connor Shea
-    :why: https://github.com/ruby/ruby/blob/ruby_1_8_6/COPYING
+    :why: https://github.com/ruby/ruby/blob/ruby_2_1/COPYING
     :versions: []
     :when: 2016-05-02 05:31:54.498490000 Z
 - - :whitelist
diff --git a/config/license_finder.yml b/config/license_finder.yml
index d641563719f..e01ebec3298 100644
--- a/config/license_finder.yml
+++ b/config/license_finder.yml
@@ -1,2 +1,2 @@
 ---
-decisions_file: './config/.decisions.yml'
+decisions_file: './config/dependency_decisions.yml'

From efb7da68e686e501abcfb8b0aea241c7b625fac5 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 6 Jun 2016 15:17:42 -0600
Subject: [PATCH 1213/1431] Fix missed colorize methods.

---
 db/fixtures/production/001_admin.rb | 12 ++++++------
 lib/tasks/gitlab/setup.rake         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb
index 78746c83225..b37dc794015 100644
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
@@ -16,21 +16,21 @@ user = User.new(user_args)
 user.skip_confirmation!
 
 if user.save
-  puts "Administrator account created:".green
+  puts "Administrator account created:".color(:green)
   puts
-  puts "login:    root".green
+  puts "login:    root".color(:green)
 
   if user_args.key?(:password)
-    puts "password: #{user_args[:password]}".green
+    puts "password: #{user_args[:password]}".color(:green)
   else
-    puts "password: You'll be prompted to create one on your first visit.".green
+    puts "password: You'll be prompted to create one on your first visit.".color(:green)
   end
   puts
 else
-  puts "Could not create the default administrator account:".red
+  puts "Could not create the default administrator account:".color(:red)
   puts
   user.errors.full_messages.map do |message|
-    puts "--> #{message}".red
+    puts "--> #{message}".color(:red)
   end
   puts
 
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index 48baecfd2a2..05fcb8e3da5 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -19,7 +19,7 @@ namespace :gitlab do
     Rake::Task["setup_postgresql"].invoke
     Rake::Task["db:seed_fu"].invoke
   rescue Gitlab::TaskAbortedByUserError
-    puts "Quitting...".red
+    puts "Quitting...".color(:red)
     exit 1
   end
 end

From fbd2169f9948ee039efe96f48229f4c9ced8c412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Mon, 6 Jun 2016 18:27:26 -0400
Subject: [PATCH 1214/1431] Use better_errors editor links in sherlock

Remember to configure your `better_errors` editor to point to your program of preference
---
 app/views/sherlock/queries/_backtrace.html.haml | 6 +++++-
 app/views/sherlock/queries/_general.html.haml   | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/views/sherlock/queries/_backtrace.html.haml b/app/views/sherlock/queries/_backtrace.html.haml
index 5c9294c0ab5..30e956e5f40 100644
--- a/app/views/sherlock/queries/_backtrace.html.haml
+++ b/app/views/sherlock/queries/_backtrace.html.haml
@@ -6,7 +6,11 @@
     %ul.well-list
       - @query.application_backtrace.each do |location|
         %li
-          = location.path
+          %strong
+            - if defined?(BetterErrors)
+              = link_to(location.path, BetterErrors.editor[location.path, location.line])
+            - else
+              = location.path
           %small.light
             = t('sherlock.line')
             = location.line
diff --git a/app/views/sherlock/queries/_general.html.haml b/app/views/sherlock/queries/_general.html.haml
index 549b47430e6..7073c0f4d90 100644
--- a/app/views/sherlock/queries/_general.html.haml
+++ b/app/views/sherlock/queries/_general.html.haml
@@ -11,13 +11,17 @@
           = @query.duration.round(4)
           = t('sherlock.milliseconds')
       %li
+        - frame = @query.last_application_frame
         %span.light
           #{t('sherlock.origin')}:
         %strong
-          = @query.last_application_frame.path
+          - if defined?(BetterErrors)
+            = link_to(frame.path, BetterErrors.editor[frame.path, frame.line])
+          - else
+            = frame.path
         %small.light
           = t('sherlock.line')
-          = @query.last_application_frame.line
+          = frame.line
 
   .panel.panel-default
     .panel-heading

From 7038440e342a521807b1e5ffb6d47d4c0b13048d Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 6 Jun 2016 18:47:49 -0500
Subject: [PATCH 1215/1431] Adjust the SAML control flow to allow LDAP
 identities to be added to an existing SAML user.

---
 lib/gitlab/o_auth/user.rb         |  2 +-
 lib/gitlab/saml/user.rb           | 28 ++++++++++++++++++++++++++--
 spec/lib/gitlab/saml/user_spec.rb | 19 +++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 356e96fcbab..268ee115028 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -96,7 +96,7 @@ module Gitlab
         # Look for a corresponding person with same uid in any of the configured LDAP providers
         Gitlab::LDAP::Config.providers.each do |provider|
           adapter = Gitlab::LDAP::Adapter.new(provider)
-          @ldap_person = Gitlab::LDAP::Person.find_by_uid(auth_hash.uid, adapter)
+          @ldap_person = Gitlab::LDAP::Person.find_by_dn(auth_hash.uid, adapter)
           break if @ldap_person
         end
         @ldap_person
diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb
index dba4bbfc899..6f7d4825ae5 100644
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -12,12 +12,12 @@ module Gitlab
       end
 
       def gl_user
-        @user ||= find_by_uid_and_provider
-
         if auto_link_ldap_user?
           @user ||= find_or_create_ldap_user
         end
 
+        @user ||= find_by_uid_and_provider
+
         if auto_link_saml_user?
           @user ||= find_by_email
         end
@@ -62,6 +62,30 @@ module Gitlab
         !Gitlab::Saml::Config.external_groups.nil?
       end
 
+      def find_or_create_ldap_user
+        return unless ldap_person
+
+        # If a corresponding person exists with same uid in a LDAP server,
+        # check if the user already has a GitLab account
+        user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider)
+        if user
+          # Case when a LDAP user already exists in Gitlab. Add the SAML identity to existing account.
+          user.identities.build(extern_uid: auth_hash.uid, provider: auth_hash.provider)
+        else
+          # No account found using LDAP in Gitlab yet: check if there is a SAML account with
+          # the passed uid and provider
+          user = find_by_uid_and_provider
+          if user.nil?
+            # No SAML account found, build a new user.
+            user = build_new_user
+          end
+          # Correct account is present, add the LDAP Identity to the user.
+          user.identities.new(provider: ldap_person.provider, extern_uid: ldap_person.dn)
+        end
+
+        user
+      end
+
       def auth_hash=(auth_hash)
         @auth_hash = Gitlab::Saml::AuthHash.new(auth_hash)
       end
diff --git a/spec/lib/gitlab/saml/user_spec.rb b/spec/lib/gitlab/saml/user_spec.rb
index c2a51d9249c..f0a17244ff6 100644
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
@@ -145,6 +145,7 @@ describe Gitlab::Saml::User, lib: true do
               allow(ldap_user).to receive(:email) { %w(john@mail.com john2@example.com) }
               allow(ldap_user).to receive(:dn) { 'uid=user1,ou=People,dc=example' }
               allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user)
+              allow(Gitlab::LDAP::Person).to receive(:find_by_dn).and_return(ldap_user)
             end
 
             context 'and no account for the LDAP user' do
@@ -177,6 +178,24 @@ describe Gitlab::Saml::User, lib: true do
                                                           ])
               end
             end
+
+            context 'user has SAML user, and wants to add their LDAP identity' do
+              it 'adds the LDAP identity to the existing SAML user' do
+                create(:omniauth_user, email: 'john@mail.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'saml', username: 'john')
+                local_hash = OmniAuth::AuthHash.new(uid: 'uid=user1,ou=People,dc=example', provider: provider, info: info_hash, extra: { raw_info: OneLogin::RubySaml::Attributes.new({ 'groups' => %w(Developers Freelancers Designers) }) })
+                local_saml_user = described_class.new(local_hash)
+
+                local_saml_user.save
+                local_gl_user = local_saml_user.gl_user
+                expect(local_gl_user).to be_valid
+                expect(local_gl_user.identities.length).to eql 2
+                identities_as_hash = local_gl_user.identities.map { |id| { provider: id.provider, extern_uid: id.extern_uid } }
+                expect(identities_as_hash).to match_array([ { provider: 'ldapmain', extern_uid: 'uid=user1,ou=People,dc=example' },
+                                                            { provider: 'saml', extern_uid: 'uid=user1,ou=People,dc=example' }
+                                                          ])
+              end
+
+            end
           end
         end
       end

From 8f28dc950ac21feba4c187bf96fed5615943ad76 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 6 Jun 2016 11:55:23 -0700
Subject: [PATCH 1216/1431] Bump rouge to 1.11.0

---
 CHANGELOG    | 1 +
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bee1a824974..7809fef1706 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Bulk assign/unassign labels to issues.
   - Allow enabling wiki page events from Webhook management UI
+  - Bump rouge to 1.11.0
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
diff --git a/Gemfile b/Gemfile
index 38ff536fd71..fe02b2a65d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -111,7 +111,7 @@ gem 'org-ruby',      '~> 0.9.12'
 gem 'creole',        '~> 0.5.0'
 gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
-gem 'rouge',         '~> 1.10.1'
+gem 'rouge',         '~> 1.11'
 
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f1dbd431e4..21d8f345cd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -569,7 +569,7 @@ GEM
       railties (>= 4.2.0, < 5.1)
     rinku (1.7.3)
     rotp (2.1.2)
-    rouge (1.10.1)
+    rouge (1.11.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -926,7 +926,7 @@ DEPENDENCIES
   request_store (~> 1.3.0)
   rerun (~> 0.11.0)
   responders (~> 2.0)
-  rouge (~> 1.10.1)
+  rouge (~> 1.11)
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.4.0)
   rspec-retry

From dbf235f514cc919a10fee1d9ab8dc1c75bc25238 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 10:25:57 +0200
Subject: [PATCH 1217/1431] Fix tests failures

---
 app/services/ci/create_builds_service.rb      |  2 +-
 .../merge_requests/created_from_fork_spec.rb  |  4 +-
 spec/features/projects/commit/builds_spec.rb  |  4 +-
 spec/lib/gitlab/badge/build_spec.rb           |  4 +-
 spec/models/build_spec.rb                     |  2 +-
 spec/models/project_spec.rb                   |  2 +-
 .../create_commit_builds_service_spec.rb      | 70 +++++++++----------
 7 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb
index 41ce6982cbe..64bcdac5c65 100644
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
@@ -5,7 +5,7 @@ module Ci
     end
 
     def execute(stage, user, status, trigger_request = nil)
-      builds_attrs = config_processor.builds_for_stage_and_ref(stage, @commit.ref, @commit.tag, trigger_request)
+      builds_attrs = config_processor.builds_for_stage_and_ref(stage, @pipeline.ref, @pipeline.tag, trigger_request)
 
       # check when to create next build
       builds_attrs = builds_attrs.select do |build_attrs|
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index 12d7e52629e..b4d2201c729 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -30,8 +30,8 @@ feature 'Merge request created from fork' do
 
     given(:pipeline) do
       create(:ci_pipeline_with_two_job, project: fork_project,
-                                       sha: merge_request.last_commit.id,
-                                       ref: merge_request.source_branch)
+                                        sha: merge_request.last_commit.id,
+                                        ref: merge_request.source_branch)
     end
 
     background { pipeline.create_builds(user) }
diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index 73dd568929a..15c381c0f5a 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -12,8 +12,8 @@ feature 'project commit builds' do
   context 'when no builds triggered yet' do
     background do
       create(:ci_pipeline, project: project,
-                         sha: project.commit.sha,
-                         ref: 'master')
+                           sha: project.commit.sha,
+                           ref: 'master')
     end
 
     scenario 'user views commit builds page' do
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index aec5a5bc3b2..2034445a197 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -110,8 +110,8 @@ describe Gitlab::Badge::Build do
 
   def create_build(project, sha, branch)
     pipeline = create(:ci_pipeline, project: project,
-                                        sha: sha,
-                                        ref: branch)
+                                    sha: sha,
+                                    ref: branch)
 
     create(:ci_build, pipeline: pipeline)
   end
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 2beb6cc598d..7660ea2659c 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
 
         context 'and trigger variables' do
           let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: pipeline, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 89f66092b15..3431d0435b4 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -401,7 +401,7 @@ describe Project, models: true do
 
   describe :pipeline do
     let(:project) { create :project }
-    let(:pipeline) { create :pipeline, project: project, ref: 'master' }
+    let(:pipeline) { create :ci_pipeline, project: project, ref: 'master' }
 
     subject { project.pipeline(pipeline.sha, 'master') }
 
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 706319b63ed..77247a1d5a5 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -70,11 +70,11 @@ describe CreateCommitBuildsService, services: true do
       stub_ci_pipeline_yaml_file('invalid: file: file')
       commits = [{ message: message }]
       pipeline = service.execute(project, user,
-                               ref: 'refs/tags/0_1',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.any?).to be false
       expect(pipeline.status).to eq('failed')
@@ -91,11 +91,11 @@ describe CreateCommitBuildsService, services: true do
       it "skips builds creation if there is [ci skip] tag in commit message" do
         commits = [{ message: message }]
         pipeline = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-                                )
+                                   ref: 'refs/tags/0_1',
+                                   before: '00000000',
+                                   after: '31das312',
+                                   commits: commits
+                                   )
         expect(pipeline).to be_persisted
         expect(pipeline.builds.any?).to be false
         expect(pipeline.status).to eq("skipped")
@@ -106,11 +106,11 @@ describe CreateCommitBuildsService, services: true do
 
         commits = [{ message: "some message" }]
         pipeline = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-                                )
+                                   ref: 'refs/tags/0_1',
+                                   before: '00000000',
+                                   after: '31das312',
+                                   commits: commits
+                                   )
 
         expect(pipeline).to be_persisted
         expect(pipeline.builds.first.name).to eq("staging")
@@ -120,11 +120,11 @@ describe CreateCommitBuildsService, services: true do
         stub_ci_pipeline_yaml_file('invalid: file: fiile')
         commits = [{ message: message }]
         pipeline = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-                                )
+                                   ref: 'refs/tags/0_1',
+                                   before: '00000000',
+                                   after: '31das312',
+                                   commits: commits
+                                   )
         expect(pipeline).to be_persisted
         expect(pipeline.builds.any?).to be false
         expect(pipeline.status).to eq("skipped")
@@ -137,20 +137,20 @@ describe CreateCommitBuildsService, services: true do
 
       commits = [{ message: "message" }]
       pipeline = service.execute(project, user,
-                               ref: 'refs/heads/master',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/heads/master',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.count(:all)).to eq(2)
 
       pipeline = service.execute(project, user,
-                               ref: 'refs/heads/master',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/heads/master',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.count(:all)).to eq(2)
     end
@@ -161,11 +161,11 @@ describe CreateCommitBuildsService, services: true do
       commits = [{ message: "some message" }]
 
       pipeline = service.execute(project, user,
-                               ref: 'refs/tags/0_1',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
 
       expect(pipeline).to be_persisted
       expect(pipeline.status).to eq("failed")

From fa097c678cdfead0dc1344e6d32569266da53465 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 7 Jun 2016 10:26:38 +0200
Subject: [PATCH 1218/1431] Remove duplicated exception in Ci config

This is a temporary refactoring stub, that is planned to be removed
after removing legacy config processor.
---
 lib/ci/gitlab_ci_yaml_processor.rb | 2 +-
 lib/gitlab/ci/config.rb            | 5 -----
 spec/lib/gitlab/ci/config_spec.rb  | 3 ++-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 46a923161c8..130f5b0892e 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -18,7 +18,7 @@ module Ci
       initial_parsing
 
       validate!
-    rescue Gitlab::Ci::Config::LoaderError => e
+    rescue Gitlab::Ci::Config::Loader::FormatError => e
       raise ValidationError, e.message
     end
 
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 5fc4894311f..b6ce791c0ff 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -5,11 +5,6 @@ module Gitlab
 
       def initialize(config)
         loader = Loader.new(config)
-
-        unless loader.valid?
-          raise LoaderError, 'Invalid configuration format!'
-        end
-
         @config = loader.load
       end
 
diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb
index 52aafbcaaa6..4d46abe520f 100644
--- a/spec/lib/gitlab/ci/config_spec.rb
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -37,7 +37,8 @@ describe Gitlab::Ci::Config do
       describe '.new' do
         it 'raises error' do
           expect { config }.to raise_error(
-            Gitlab::Ci::Config::LoaderError, /Invalid configuration format/
+            Gitlab::Ci::Config::Loader::FormatError,
+            /Invalid configuration format/
           )
         end
       end

From b09a329fd8b314fc48114ce15d451a18d3fcb70f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 10:31:02 +0200
Subject: [PATCH 1219/1431] Use ruby:2.1 and ruby:2.2 images

---
 .gitlab-ci.yml           |  4 ++--
 scripts/prepare_build.sh | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 172fbaf52b6..23bc2c2f837 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1
+image: "ruby:2.1"
 
 services:
   - mysql:latest
@@ -116,7 +116,7 @@ spinach 9 10: *knapsack
 
 .knapsack-ruby22: &knapsack-ruby22
   <<: *knapsack
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.2
+  image: "ruby:2.2"
   only:
     - master
   cache:
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 9540d7d128f..247383aa46c 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -12,6 +12,20 @@ retry() {
 }
 
 if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
+    mkdir -p vendor
+
+    # Install phantomjs package
+    pushd vendor
+    if [ ! -e 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
+    fi
+    dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
+    popd
+
+    # Try to install packages
+    retry 'apt-get update -yqqq; 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
     sed -i 's/username:.*/username: root/g' config/database.yml
     sed -i 's/password:.*/password:/g' config/database.yml

From 0f97357145fa951e206536f11ca1d52efabe4675 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 10:45:02 +0200
Subject: [PATCH 1220/1431] Install knapsack

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23bc2c2f837..53184f8f906 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ before_script:
   - cp config/gitlab.yml.example config/gitlab.yml
   - bundle --version
   - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"'
+  - retry gem install knapsack
   - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
 
 stages:
@@ -74,7 +75,6 @@ update-knapsack:
     - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
     - export KNAPSACK_GENERATE_REPORT=true
     - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
-    - bundle exec gem install bundler
     - knapsack ${JOB_NAME[0]}
   artifacts:
     paths:

From 498f8d13d003b1d9a50babfd45911ef55e905ba5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 11:23:53 +0200
Subject: [PATCH 1221/1431] Fix license_finder

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53184f8f906..476815de71b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,7 +170,7 @@ rake brakeman: *exec
 rake flog: *exec
 rake flay: *exec
 rake db:migrate:reset: *exec
-license-finder: *exec
+license_finder: *exec
 
 bundler:audit:
   stage: test

From 5ef104df59211b022ed42e38e1cdbe950ff54388 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 7 Jun 2016 12:53:46 +0200
Subject: [PATCH 1222/1431] Improve Ci config loader by changing method
 signature

---
 lib/gitlab/ci/config.rb                  | 2 +-
 lib/gitlab/ci/config/loader.rb           | 2 +-
 spec/lib/gitlab/ci/config/loader_spec.rb | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index b6ce791c0ff..ffe633d4b63 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -5,7 +5,7 @@ module Gitlab
 
       def initialize(config)
         loader = Loader.new(config)
-        @config = loader.load
+        @config = loader.load!
       end
 
       def to_hash
diff --git a/lib/gitlab/ci/config/loader.rb b/lib/gitlab/ci/config/loader.rb
index ed9cc16702c..dbf6eb0edbe 100644
--- a/lib/gitlab/ci/config/loader.rb
+++ b/lib/gitlab/ci/config/loader.rb
@@ -12,7 +12,7 @@ module Gitlab
           @config.is_a?(Hash)
         end
 
-        def load
+        def load!
           unless valid?
             raise FormatError, 'Invalid configuration format'
           end
diff --git a/spec/lib/gitlab/ci/config/loader_spec.rb b/spec/lib/gitlab/ci/config/loader_spec.rb
index 6f1a10085dd..2d44b1f60f1 100644
--- a/spec/lib/gitlab/ci/config/loader_spec.rb
+++ b/spec/lib/gitlab/ci/config/loader_spec.rb
@@ -12,9 +12,9 @@ describe Gitlab::Ci::Config::Loader do
       end
     end
 
-    describe '#load' do
+    describe '#load!' do
       it 'returns a valid hash' do
-        expect(loader.load).to eq(image: 'ruby:2.2')
+        expect(loader.load!).to eq(image: 'ruby:2.2')
       end
     end
   end
@@ -28,9 +28,9 @@ describe Gitlab::Ci::Config::Loader do
       end
     end
 
-    describe '#load' do
+    describe '#load!' do
       it 'raises error' do
-        expect { loader.load }.to raise_error(
+        expect { loader.load! }.to raise_error(
           Gitlab::Ci::Config::Loader::FormatError,
           'Invalid configuration format'
         )

From 03a7569ea6952b47c3f25294e94cb3abf1877d5d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 13:06:24 +0200
Subject: [PATCH 1223/1431] Rerun failed spinach tests

---
 .gitlab-ci.yml           | 160 ++++++++++++++++++++++-----------------
 scripts/prepare_build.sh |  10 ++-
 2 files changed, 99 insertions(+), 71 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 476815de71b..095c9005d1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ stages:
     - knapsack/
 
 knapsack:
-  <<: *knapsack_state
+  <<: *rspec-knapsack_state
   stage: prepare
   script:
     - mkdir -p knapsack/
@@ -56,7 +56,7 @@ knapsack:
     - '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
 
 update-knapsack:
-  <<: *knapsack_state
+  <<: *rspec-knapsack_state
   stage: post-test
   script:
     - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
@@ -65,57 +65,73 @@ update-knapsack:
 
 # Execute all testing suites
 
-.knapsack: &knapsack
+.rspec-knapsack: &knapsack
   stage: test
   script:
     - bundle exec rake assets:precompile 2>/dev/null
     - JOB_NAME=( $CI_BUILD_NAME )
     - export CI_NODE_INDEX=${JOB_NAME[1]}
     - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - export KNAPSACK_REPORT_PATH=knapsack/rspec_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
     - export KNAPSACK_GENERATE_REPORT=true
-    - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
-    - knapsack ${JOB_NAME[0]}
+    - cp knapsack/rspec_report.json ${KNAPSACK_REPORT_PATH}
+    - knapsack rspec
   artifacts:
     paths:
     - knapsack/
 
-rspec 0 20: *knapsack
-rspec 1 20: *knapsack
-rspec 2 20: *knapsack
-rspec 3 20: *knapsack
-rspec 4 20: *knapsack
-rspec 5 20: *knapsack
-rspec 6 20: *knapsack
-rspec 7 20: *knapsack
-rspec 8 20: *knapsack
-rspec 9 20: *knapsack
-rspec 10 20: *knapsack
-rspec 11 20: *knapsack
-rspec 12 20: *knapsack
-rspec 13 20: *knapsack
-rspec 14 20: *knapsack
-rspec 15 20: *knapsack
-rspec 16 20: *knapsack
-rspec 17 20: *knapsack
-rspec 18 20: *knapsack
-rspec 19 20: *knapsack
+.spinach-knapsack: &knapsack
+  stage: test
+  script:
+    - bundle exec rake assets:precompile 2>/dev/null
+    - JOB_NAME=( $CI_BUILD_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[1]}
+    - export CI_NODE_TOTAL=${JOB_NAME[2]}
+    - export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - export KNAPSACK_GENERATE_REPORT=true
+    - cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
+    - knapsack spinach[-r rerun]
+    # retry failed tests 3 times
+    - retry '[ ! -e tmp/spinach-rerun.txt ] || bin/spinach -r rerun $(cat tmp/spinach-rerun.txt)'
+  artifacts:
+    paths:
+    - knapsack/
 
-spinach 0 10: *knapsack
-spinach 1 10: *knapsack
-spinach 2 10: *knapsack
-spinach 3 10: *knapsack
-spinach 4 10: *knapsack
-spinach 5 10: *knapsack
-spinach 6 10: *knapsack
-spinach 7 10: *knapsack
-spinach 8 10: *knapsack
-spinach 9 10: *knapsack
+rspec 0 20: *rspec-knapsack
+rspec 1 20: *rspec-knapsack
+rspec 2 20: *rspec-knapsack
+rspec 3 20: *rspec-knapsack
+rspec 4 20: *rspec-knapsack
+rspec 5 20: *rspec-knapsack
+rspec 6 20: *rspec-knapsack
+rspec 7 20: *rspec-knapsack
+rspec 8 20: *rspec-knapsack
+rspec 9 20: *rspec-knapsack
+rspec 10 20: *rspec-knapsack
+rspec 11 20: *rspec-knapsack
+rspec 12 20: *rspec-knapsack
+rspec 13 20: *rspec-knapsack
+rspec 14 20: *rspec-knapsack
+rspec 15 20: *rspec-knapsack
+rspec 16 20: *rspec-knapsack
+rspec 17 20: *rspec-knapsack
+rspec 18 20: *rspec-knapsack
+rspec 19 20: *rspec-knapsack
+
+spinach 0 10: *spinach-knapsack
+spinach 1 10: *spinach-knapsack
+spinach 2 10: *spinach-knapsack
+spinach 3 10: *spinach-knapsack
+spinach 4 10: *spinach-knapsack
+spinach 5 10: *spinach-knapsack
+spinach 6 10: *spinach-knapsack
+spinach 7 10: *spinach-knapsack
+spinach 8 10: *spinach-knapsack
+spinach 9 10: *spinach-knapsack
 
 # Execute all testing suites against Ruby 2.2
 
-.knapsack-ruby22: &knapsack-ruby22
-  <<: *knapsack
+.ruby-22: &ruby22
   image: "ruby:2.2"
   only:
     - master
@@ -124,37 +140,45 @@ spinach 9 10: *knapsack
     paths:
     - vendor
 
-rspec 0 20 ruby22: *knapsack-ruby22
-rspec 1 20 ruby22: *knapsack-ruby22
-rspec 2 20 ruby22: *knapsack-ruby22
-rspec 3 20 ruby22: *knapsack-ruby22
-rspec 4 20 ruby22: *knapsack-ruby22
-rspec 5 20 ruby22: *knapsack-ruby22
-rspec 6 20 ruby22: *knapsack-ruby22
-rspec 7 20 ruby22: *knapsack-ruby22
-rspec 8 20 ruby22: *knapsack-ruby22
-rspec 9 20 ruby22: *knapsack-ruby22
-rspec 10 20 ruby22: *knapsack-ruby22
-rspec 11 20 ruby22: *knapsack-ruby22
-rspec 12 20 ruby22: *knapsack-ruby22
-rspec 13 20 ruby22: *knapsack-ruby22
-rspec 14 20 ruby22: *knapsack-ruby22
-rspec 15 20 ruby22: *knapsack-ruby22
-rspec 16 20 ruby22: *knapsack-ruby22
-rspec 17 20 ruby22: *knapsack-ruby22
-rspec 18 20 ruby22: *knapsack-ruby22
-rspec 19 20 ruby22: *knapsack-ruby22
+.rspec-knapsack-ruby22: &rspec-knapsack-ruby22
+  <<: *rspec-knapsack
+  <<: *ruby-22
 
-spinach 0 10 ruby22: *knapsack-ruby22
-spinach 1 10 ruby22: *knapsack-ruby22
-spinach 2 10 ruby22: *knapsack-ruby22
-spinach 3 10 ruby22: *knapsack-ruby22
-spinach 4 10 ruby22: *knapsack-ruby22
-spinach 5 10 ruby22: *knapsack-ruby22
-spinach 6 10 ruby22: *knapsack-ruby22
-spinach 7 10 ruby22: *knapsack-ruby22
-spinach 8 10 ruby22: *knapsack-ruby22
-spinach 9 10 ruby22: *knapsack-ruby22
+.spinach-knapsack-ruby22: &spinach-knapsack-ruby22
+  <<: *rspec-knapsack
+  <<: *ruby-22
+  
+rspec 0 20 ruby22: *rspec-knapsack-ruby22
+rspec 1 20 ruby22: *rspec-knapsack-ruby22
+rspec 2 20 ruby22: *rspec-knapsack-ruby22
+rspec 3 20 ruby22: *rspec-knapsack-ruby22
+rspec 4 20 ruby22: *rspec-knapsack-ruby22
+rspec 5 20 ruby22: *rspec-knapsack-ruby22
+rspec 6 20 ruby22: *rspec-knapsack-ruby22
+rspec 7 20 ruby22: *rspec-knapsack-ruby22
+rspec 8 20 ruby22: *rspec-knapsack-ruby22
+rspec 9 20 ruby22: *rspec-knapsack-ruby22
+rspec 10 20 ruby22: *rspec-knapsack-ruby22
+rspec 11 20 ruby22: *rspec-knapsack-ruby22
+rspec 12 20 ruby22: *rspec-knapsack-ruby22
+rspec 13 20 ruby22: *rspec-knapsack-ruby22
+rspec 14 20 ruby22: *rspec-knapsack-ruby22
+rspec 15 20 ruby22: *rspec-knapsack-ruby22
+rspec 16 20 ruby22: *rspec-knapsack-ruby22
+rspec 17 20 ruby22: *rspec-knapsack-ruby22
+rspec 18 20 ruby22: *rspec-knapsack-ruby22
+rspec 19 20 ruby22: *rspec-knapsack-ruby22
+
+spinach 0 10 ruby22: *spinach-knapsack-ruby22
+spinach 1 10 ruby22: *spinach-knapsack-ruby22
+spinach 2 10 ruby22: *spinach-knapsack-ruby22
+spinach 3 10 ruby22: *spinach-knapsack-ruby22
+spinach 4 10 ruby22: *spinach-knapsack-ruby22
+spinach 5 10 ruby22: *spinach-knapsack-ruby22
+spinach 6 10 ruby22: *spinach-knapsack-ruby22
+spinach 7 10 ruby22: *spinach-knapsack-ruby22
+spinach 8 10 ruby22: *spinach-knapsack-ruby22
+spinach 9 10 ruby22: *spinach-knapsack-ruby22
 
 # Other generic tests
 
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 247383aa46c..d6fb1a34e8c 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -1,12 +1,16 @@
 #!/bin/bash
 
 retry() {
-    for i in $(seq 1 3); do
+    if eval "$@"; then
+        return 0
+    fi
+
+    for i in 2 1; do
+        sleep 3s
+        echo "Retrying $i..."
         if eval "$@"; then
             return 0
         fi
-        sleep 3s
-        echo "Retrying..."
     done
     return 1
 }

From 9b76bb30e834d2fc78f628cd16b00f2e77f305fe Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 13:10:40 +0200
Subject: [PATCH 1224/1431] Fix .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 095c9005d1f..764b82889ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ stages:
 
 # Prepare and merge knapsack tests
 
-.knapsack_state: &knapsack_state
+.knapsack-state: &knapsack-state
   services: []
   variables:
     USE_DB: "false"
@@ -48,7 +48,7 @@ stages:
     - knapsack/
 
 knapsack:
-  <<: *rspec-knapsack_state
+  <<: *knapsack-state
   stage: prepare
   script:
     - mkdir -p knapsack/
@@ -56,7 +56,7 @@ knapsack:
     - '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
 
 update-knapsack:
-  <<: *rspec-knapsack_state
+  <<: *knapsack-state
   stage: post-test
   script:
     - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
@@ -65,7 +65,7 @@ update-knapsack:
 
 # Execute all testing suites
 
-.rspec-knapsack: &knapsack
+.rspec-knapsack: &rspec-knapsack
   stage: test
   script:
     - bundle exec rake assets:precompile 2>/dev/null
@@ -80,7 +80,7 @@ update-knapsack:
     paths:
     - knapsack/
 
-.spinach-knapsack: &knapsack
+.spinach-knapsack: &spinach-knapsack
   stage: test
   script:
     - bundle exec rake assets:precompile 2>/dev/null
@@ -131,7 +131,7 @@ spinach 9 10: *spinach-knapsack
 
 # Execute all testing suites against Ruby 2.2
 
-.ruby-22: &ruby22
+.ruby-22: &ruby-22
   image: "ruby:2.2"
   only:
     - master

From 8988c8743d2f74b7939a39fbd1c6ebcaa5ac6647 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 13:14:37 +0200
Subject: [PATCH 1225/1431] Fix remaining test offenses

---
 spec/models/project_spec.rb                        |  2 +-
 spec/services/create_commit_builds_service_spec.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 3431d0435b4..553556ed326 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -408,7 +408,7 @@ describe Project, models: true do
     it { is_expected.to eq(pipeline) }
 
     context 'return latest' do
-      let(:pipeline2) { create :pipeline, project: project, ref: 'master' }
+      let(:pipeline2) { create :ci_pipeline, project: project, ref: 'master' }
 
       before do
         pipeline
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 77247a1d5a5..a5b4d9f05de 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -74,7 +74,7 @@ describe CreateCommitBuildsService, services: true do
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
-                                 )
+                                )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.any?).to be false
       expect(pipeline.status).to eq('failed')
@@ -95,7 +95,7 @@ describe CreateCommitBuildsService, services: true do
                                    before: '00000000',
                                    after: '31das312',
                                    commits: commits
-                                   )
+                                  )
         expect(pipeline).to be_persisted
         expect(pipeline.builds.any?).to be false
         expect(pipeline.status).to eq("skipped")
@@ -110,7 +110,7 @@ describe CreateCommitBuildsService, services: true do
                                    before: '00000000',
                                    after: '31das312',
                                    commits: commits
-                                   )
+                                  )
 
         expect(pipeline).to be_persisted
         expect(pipeline.builds.first.name).to eq("staging")
@@ -124,7 +124,7 @@ describe CreateCommitBuildsService, services: true do
                                    before: '00000000',
                                    after: '31das312',
                                    commits: commits
-                                   )
+                                  )
         expect(pipeline).to be_persisted
         expect(pipeline.builds.any?).to be false
         expect(pipeline.status).to eq("skipped")
@@ -141,7 +141,7 @@ describe CreateCommitBuildsService, services: true do
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
-                                 )
+                                )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.count(:all)).to eq(2)
 
@@ -150,7 +150,7 @@ describe CreateCommitBuildsService, services: true do
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
-                                 )
+                                )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.count(:all)).to eq(2)
     end
@@ -165,7 +165,7 @@ describe CreateCommitBuildsService, services: true do
                                  before: '00000000',
                                  after: '31das312',
                                  commits: commits
-                                 )
+                                )
 
       expect(pipeline).to be_persisted
       expect(pipeline.status).to eq("failed")

From b0eb4cb4a73d78b45cc86b3714d7493484b2b5e7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 13:19:15 +0200
Subject: [PATCH 1226/1431] Rename @ci_commit to @pipeline in
 MergeRequestController

---
 app/controllers/projects/merge_requests_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e96e816bcd7..0de34420883 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -317,8 +317,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @merge_request_diff = @merge_request.merge_request_diff
 
-    @ci_commit = @merge_request.pipeline
-    @statuses = @ci_commit.statuses if @ci_commit
+    @pipeline = @merge_request.pipeline
+    @statuses = @pipeline.statuses if @pipeline
 
     if @merge_request.locked_long_ago?
       @merge_request.unlock_mr
@@ -327,8 +327,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def define_widget_vars
-    @ci_commit = @merge_request.pipeline
-    @ci_commits = [@ci_commit].compact
+    @pipeline = @merge_request.pipeline
+    @pipelines = [@pipeline].compact
     closes_issues
   end
 

From f4cedacc7bf8209aa43c6d1407acf999ec64475d Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 6 Jun 2016 15:14:36 +0100
Subject: [PATCH 1227/1431] Optimise email CSS for speed with Premailer

Remove all descendant selectors from the push email styling, to
drastically reduce CPU time when inlining the CSS for syntax-highlighted
diffs.

Background:

Premailer is a Ruby gem that inlines CSS styles from an external
stylesheet before emails are sent, so that they are compatible with
Gmail. At a high level, it parses the CSS files it finds, and parses the
email body with Nokogiri. It then loops through the selectors in the
CSS, using Nokogiri to find matching elements, and adds inline
styles. (It does more than this, like merging styles applied to the same
element, but that's not relevant to this issue.)

Nokogiri converts CSS selectors to XPath first, like so:
    Nokogiri::CSS.xpath_for('foo bar')
    # => ["//foo//bar"]

On documents with high node counts (say, a syntax-highlighted copy of
jQuery), having both descendant selectors is very expensive. Both
`//foo/bar` and `//bar` will be much more efficient, although neither
are directly equivalent.

An example, on a document containing two syntax-highlighted copies of
jQuery:
    Benchmark.realtime { p doc.search('.o').count }
    # 9476
    # => 0.3462457580026239
    Benchmark.realtime { p doc.search('.code.white .o').count }
    # 9476
    # => 85.51952634402551

The performance is similar for selectors which _don't_ match any
elements, and as Premailer loops through all the available selectors, we
want to avoid all descendant selectors in push emails.

Because of the theming support in the web UI, all syntax highlighting
selectors are descendant selectors of classes like `.code.white` or
`.code.monokai`. There are over 60 CSS classes for syntax highlighting
styles alone, all of which are expressed in the inefficient form above.

In emails we always use the white theme, and were reusing the same CSS
file. But in emails, we don't need to descend from `.code.white` as that
will always be the theme, and we can also remove some other selectors
that are only applicable to the web UI. For the remaining descendant
selectors, we can convert them to child selectors, type selectors, or
class selectors as appropriate.

As in the example above, having no descendant selectors at all in the
push email CSS can provide a drastic (and surprising) performance
improvement.
---
 .../mailers/repository_push_email.scss        | 183 +++++++++++++++---
 app/assets/stylesheets/notify.scss            |  16 +-
 2 files changed, 169 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss
index 001994db97b..7f645d3089d 100644
--- a/app/assets/stylesheets/mailers/repository_push_email.scss
+++ b/app/assets/stylesheets/mailers/repository_push_email.scss
@@ -1,5 +1,15 @@
 @import "framework/variables";
 
+// This file is largely copied from `highlight/white.scss`, but modified to
+// avoid all descendant selectors (`table td`). This is because the CSS inlining
+// we use performs dramatically worse on descendant selectors than the
+// alternatives.
+// <https://gitlab.com/gitlab-org/gitlab-ee/issues/490#note_12283632>
+//
+// DO NOT ADD ANY DESCENDANT SELECTORS TO THIS FILE. Instead, use (in order of
+// preference): plain class selectors, type (element name) selectors, or
+// explicit child selectors.
+
 table.code {
   width: 100%;
   font-family: monospace;
@@ -11,33 +21,162 @@ table.code {
   -premailer-cellspacing: 0;
   -premailer-width: 100%;
 
-  td {
+  > tr > td {
     line-height: $code_line_height;
     font-family: monospace;
     font-size: $code_font_size;
-  }
 
-  td.diff-line-num {
-    margin: 0;
-    padding: 0;
-    border: none;
-    background: $background-color;
-    color: rgba(0, 0, 0, 0.3);
-    padding: 0 5px;
-    border-right: 1px solid $border-color;
-    text-align: right;
-    min-width: 35px;
-    max-width: 50px;
-    width: 35px;
-  }
+    &.diff-line-num {
+      margin: 0;
+      padding: 0;
+      border: none;
+      padding: 0 5px;
+      border-right: 1px solid;
+      text-align: right;
+      min-width: 35px;
+      max-width: 50px;
+      width: 35px;
+    }
 
-  td.line_content {
-    display: block;
-    margin: 0;
-    padding: 0 0.5em;
-    border: none;
-    white-space: pre;
+    &.line_content {
+      display: block;
+      margin: 0;
+      padding: 0 0.5em;
+      border: none;
+      white-space: pre;
+    }
   }
 }
 
-@import "highlight/white";
+.line-numbers, .diff-line-num {
+  background-color: $background-color;
+}
+
+.diff-line-num, .diff-line-num a {
+  color: $black-transparent;
+}
+
+pre.code, .diff-line-num {
+  border-color: $table-border-gray;
+}
+
+.code.white, pre.code, .line_content {
+  background-color: #fff;
+  color: #333;
+}
+
+.diff-line-num {
+  &.old {
+    background-color: $line-number-old;
+    border-color: $line-removed-dark;
+  }
+
+  &.new {
+    background-color: $line-number-new;
+    border-color: $line-added-dark;
+  }
+
+  &.hll:not(.empty-cell) {
+    background-color: $line-number-select;
+    border-color: $line-select-yellow-dark;
+  }
+}
+
+.line_content {
+  &.old {
+    background-color: $line-removed;
+
+    > .line > span.idiff, > .line > span > span.idiff {
+      background-color: $line-removed-dark;
+    }
+  }
+
+  &.new {
+    background-color: $line-added;
+
+    > .line > span.idiff, > .line > span > span.idiff {
+      background-color: $line-added-dark;
+    }
+  }
+
+  &.match {
+    color: $black-transparent;
+    background-color: $match-line;
+  }
+
+  &.hll:not(.empty-cell) {
+    background-color: $line-select-yellow;
+  }
+}
+
+pre > .hll {
+  background-color: #f8eec7 !important;
+}
+
+span.highlight_word {
+  background-color: #fafe3d !important;
+}
+
+.hll { background-color: #f8f8f8 }
+.c { color: #998; font-style: italic; }
+.err { color: #a61717; background-color: #e3d2d2; }
+.k { font-weight: bold; }
+.o { font-weight: bold; }
+.cm { color: #998; font-style: italic; }
+.cp { color: #999; font-weight: bold; }
+.c1 { color: #998; font-style: italic; }
+.cs { color: #999; font-weight: bold; font-style: italic; }
+.gd { color: #000; background-color: #fdd; }
+.gd .x { color: #000; background-color: #faa; }
+.ge { font-style: italic; }
+.gr { color: #a00; }
+.gh { color: #999; }
+.gi { color: #000; background-color: #dfd; }
+.gi .x { color: #000; background-color: #afa; }
+.go { color: #888; }
+.gp { color: #555; }
+.gs { font-weight: bold; }
+.gu { color: #800080; font-weight: bold; }
+.gt { color: #a00; }
+.kc { font-weight: bold; }
+.kd { font-weight: bold; }
+.kn { font-weight: bold; }
+.kp { font-weight: bold; }
+.kr { font-weight: bold; }
+.kt { color: #458; font-weight: bold; }
+.m { color: #099; }
+.s { color: #d14; }
+.n { color: #333; }
+.na { color: teal; }
+.nb { color: #0086b3; }
+.nc { color: #458; font-weight: bold; }
+.no { color: teal; }
+.ni { color: purple; }
+.ne { color: #900; font-weight: bold; }
+.nf { color: #900; font-weight: bold; }
+.nn { color: #555; }
+.nt { color: navy; }
+.nv { color: teal; }
+.ow { font-weight: bold; }
+.w { color: #bbb; }
+.mf { color: #099; }
+.mh { color: #099; }
+.mi { color: #099; }
+.mo { color: #099; }
+.sb { color: #d14; }
+.sc { color: #d14; }
+.sd { color: #d14; }
+.s2 { color: #d14; }
+.se { color: #d14; }
+.sh { color: #d14; }
+.si { color: #d14; }
+.sx { color: #d14; }
+.sr { color: #009926; }
+.s1 { color: #d14; }
+.ss { color: #990073; }
+.bp { color: #999; }
+.vc { color: teal; }
+.vg { color: teal; }
+.vi { color: teal; }
+.il { color: #099; }
+.gc { color: #999; background-color: #eaf2f5; }
diff --git a/app/assets/stylesheets/notify.scss b/app/assets/stylesheets/notify.scss
index 0a13a7e0b54..fc12964872d 100644
--- a/app/assets/stylesheets/notify.scss
+++ b/app/assets/stylesheets/notify.scss
@@ -6,19 +6,19 @@ p.details {
   font-style: italic;
   color: #777
 }
-.footer p {
+.footer > p {
   font-size: small;
   color: #777
 }
 pre.commit-message {
   white-space: pre-wrap;
 }
-.file-stats a {
+.file-stats > a {
   text-decoration: none;
-}
-.file-stats .new-file {
-  color: #090;
-}
-.file-stats .deleted-file {
-  color: #b00;
+  > .new-file {
+    color: #090;
+  }
+  > .deleted-file {
+    color: #b00;
+  }
 }

From 59376bb3604924fd9e91311eab24ab6454363cfa Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 14:35:17 +0200
Subject: [PATCH 1228/1431] Fix knapsack spinach execution

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 764b82889ef..d098bf73ff8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,7 +90,7 @@ update-knapsack:
     - export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
     - export KNAPSACK_GENERATE_REPORT=true
     - cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
-    - knapsack spinach[-r rerun]
+    - knapsack spinach "-r rerun"
     # retry failed tests 3 times
     - retry '[ ! -e tmp/spinach-rerun.txt ] || bin/spinach -r rerun $(cat tmp/spinach-rerun.txt)'
   artifacts:

From ee26c3cab4651c8876efc45b6a63539727e6a42e Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 7 Jun 2016 11:57:09 +0100
Subject: [PATCH 1229/1431] Fix label order by priority on labels page

---
 app/models/label.rb                           |  4 +-
 .../projects/labels_controller_spec.rb        | 53 +++++++++++++++++++
 .../labels/update_prioritization_spec.rb      |  9 +++-
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 spec/controllers/projects/labels_controller_spec.rb

diff --git a/app/models/label.rb b/app/models/label.rb
index 9760f1aefa9..49c352cc239 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -33,11 +33,11 @@ class Label < ActiveRecord::Base
   scope :templates, ->  { where(template: true) }
 
   def self.prioritized
-    where.not(priority: nil).reorder(:title)
+    where.not(priority: nil).reorder(:priority, :title)
   end
 
   def self.unprioritized
-    where(priority: nil).reorder(:title)
+    where(priority: nil)
   end
 
   alias_attribute :name, :title
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
new file mode 100644
index 00000000000..ab1dd34ed57
--- /dev/null
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Projects::LabelsController do
+  let(:project) { create(:project) }
+  let(:user)    { create(:user) }
+
+  before do
+    project.team << [user, :master]
+    sign_in(user)
+  end
+
+  describe 'GET #index' do
+    def create_label(attributes)
+      create(:label, attributes.merge(project: project))
+    end
+
+    before do
+      15.times { |i| create_label(priority: (i % 3) + 1, title: "label #{15 - i}") }
+      5.times { |i| create_label(title: "label #{100 - i}") }
+
+
+      get :index, namespace_id: project.namespace.to_param, project_id: project.to_param
+    end
+
+    context '@prioritized_labels' do
+      let(:prioritized_labels) { assigns(:prioritized_labels) }
+
+      it 'contains only prioritized labels' do
+        expect(prioritized_labels).to all(have_attributes(priority: a_value > 0))
+      end
+
+      it 'is sorted by priority, then label title' do
+        priorities_and_titles = prioritized_labels.pluck(:priority, :title)
+
+        expect(priorities_and_titles.sort).to eq(priorities_and_titles)
+      end
+    end
+
+    context '@labels' do
+      let(:labels) { assigns(:labels) }
+
+      it 'contains only unprioritized labels' do
+        expect(labels).to all(have_attributes(priority: nil))
+      end
+
+      it 'is sorted by label title' do
+        titles = labels.pluck(:title)
+
+        expect(titles.sort).to eq(titles)
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
index 2a0bf6548db..8550d279d09 100644
--- a/spec/features/projects/labels/update_prioritization_spec.rb
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -55,7 +55,7 @@ feature 'Prioritize labels', feature: true do
       end
     end
 
-    scenario 'user can sort prioritized labels', js: true do
+    scenario 'user can sort prioritized labels and persist across reloads', js: true do
       bug     = create(:label, title: 'bug', priority: 1)
       wontfix = create(:label, title: 'wontfix', priority: 2)
 
@@ -75,6 +75,13 @@ feature 'Prioritize labels', feature: true do
         expect(first('li')).to have_content('wontfix')
         expect(page.all('li').last).to have_content('bug')
       end
+
+      visit current_url
+
+      page.within('.prioritized-labels') do
+        expect(first('li')).to have_content('wontfix')
+        expect(page.all('li').last).to have_content('bug')
+      end
     end
   end
 

From ca05ea6b732cad9d7b9d809f6b66ba4fca904857 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 15:15:32 +0200
Subject: [PATCH 1230/1431] Remove knapsack_merger since we don't use it anyway

---
 spec/knapsack_merger.rb | 41 -----------------------------------------
 spec/spec_helper.rb     |  1 -
 2 files changed, 42 deletions(-)
 delete mode 100644 spec/knapsack_merger.rb

diff --git a/spec/knapsack_merger.rb b/spec/knapsack_merger.rb
deleted file mode 100644
index c6bcefe8464..00000000000
--- a/spec/knapsack_merger.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-begin
-  class Knapsack::Report
-    alias_method :save_without_leading_existing_report, :save
-
-    def load_existing_report
-      Knapsack::Presenter.existing_report = open
-    rescue
-      false
-    end
-
-    def save
-      load_existing_report
-      save_without_leading_existing_report
-    end
-  end
-
-  class << Knapsack::Presenter
-    attr_accessor :existing_report
-
-    def initialize
-      @existing_report = []
-    end
-
-    def report_hash
-      return current_report_hash unless existing_report
-      existing_report.merge(current_report_hash).sort.to_h
-    end
-
-    def current_report_hash
-      Knapsack.tracker.test_files_with_time
-    end
-
-    def report_yml
-      report_hash.to_yaml
-    end
-
-    def report_json
-      JSON.pretty_generate(report_hash)
-    end
-  end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 84b9ee75f6a..a20f4c05971 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,7 +16,6 @@ require 'shoulda/matchers'
 require 'sidekiq/testing/inline'
 require 'rspec/retry'
 require 'knapsack'
-require_relative 'knapsack_merger'
 
 Knapsack::Adapters::RSpecAdapter.bind
 

From b5464726aae70f8b3344afe6eaf3970589bf9e9a Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 7 Jun 2016 15:19:15 +0200
Subject: [PATCH 1231/1431] Added 8.9 install/update guides

[ci skip]
---
 doc/install/installation.md |   6 +-
 doc/update/8.8-to-8.9.md    | 162 ++++++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+), 3 deletions(-)
 create mode 100644 doc/update/8.8-to-8.9.md

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 1318b3d1fa5..d9290b1fa76 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -269,9 +269,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-8-stable gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-9-stable gitlab
 
-**Note:** You can change `8-8-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `8-9-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ### Configure It
 
@@ -394,7 +394,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 v0.7.4
+    sudo -u git -H git checkout v0.7.5
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features
diff --git a/doc/update/8.8-to-8.9.md b/doc/update/8.8-to-8.9.md
new file mode 100644
index 00000000000..67a986ead57
--- /dev/null
+++ b/doc/update/8.8-to-8.9.md
@@ -0,0 +1,162 @@
+# From 8.8 to 8.9
+
+Make sure you view this update guide from the tag (version) of GitLab you would
+like to install. In most cases this should be the highest numbered production
+tag (without rc in it). You can select the tag in the version dropdown at the
+top left corner of GitLab (below the menu bar).
+
+If the highest number stable branch is unclear please check the
+[GitLab Blog](https://about.gitlab.com/blog/archives.html) for installation
+guide links by version.
+
+### 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-9-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 8-9-stable-ee
+```
+
+### 4. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch --all --tags
+sudo -u git -H git checkout v3.0.0
+```
+
+### 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 v0.7.5
+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
+
+# Optional: clean up old gems
+sudo -u git -H bundle clean
+
+# 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. 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-8-stable:config/gitlab.yml.example origin/8-9-stable:config/gitlab.yml.example
+```
+
+#### Git configuration
+
+Disable `git gc --auto` because GitLab runs `git gc` for us already.
+
+```sh
+sudo -u git -H git config --global gc.auto 0
+```
+
+#### Nginx configuration
+
+Ensure you're still up-to-date with the latest NGINX configuration changes:
+
+```sh
+# For HTTPS configurations
+git diff origin/8-8-stable:lib/support/nginx/gitlab-ssl origin/8-9-stable:lib/support/nginx/gitlab-ssl
+
+# For HTTP configurations
+git diff origin/8-8-stable:lib/support/nginx/gitlab origin/8-9-stable:lib/support/nginx/gitlab
+```
+
+If you are using Apache instead of NGINX please see the updated [Apache templates].
+Also note that because Apache does not support upstreams behind Unix sockets you
+will need to let gitlab-workhorse listen on a TCP port. You can do this
+via [/etc/default/gitlab].
+
+[Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
+[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/lib/support/init.d/gitlab.default.example#L37
+
+#### Init script
+
+Ensure you're still up-to-date with the latest init script changes:
+
+    sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+
+### 8. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 9. 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.7)
+
+### 1. Revert the code to the previous version
+
+Follow the [upgrade guide from 8.7 to 8.8](8.7-to-8.8.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 12dd7bd7e59c8ce95c29f4ab2f08a6d9c513b734 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 15:42:03 +0200
Subject: [PATCH 1232/1431] Remove stage notifications [ci skip]

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d098bf73ff8..fc1e43fcd44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,6 @@ stages:
 - prepare
 - test
 - post-test
-- notifications
 
 # Prepare and merge knapsack tests
 

From 59e5f4705b37014a2b3cc12959c3ac7e65328ec3 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 7 Jun 2016 10:57:58 -0300
Subject: [PATCH 1233/1431] Check if GitHub rate limite API was reached before
 update Webhooks

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

diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 442b4c389fe..5ef9d66ba68 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -146,6 +146,7 @@ module Gitlab
 
       def update_webhooks(hooks, options)
         hooks.each do |hook|
+          sleep rate_limit_sleep_time if rate_limit_exceed?
           client.edit_hook(repo, hook.id, hook.name, hook.config, options)
         end
       end

From 664afebbe9e62f13074c999d84674a0e37fa8cc2 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 3 Jun 2016 09:53:04 -0600
Subject: [PATCH 1234/1431] Start styling sub nav

---
 app/assets/stylesheets/framework/nav.scss  | 21 +++++++++
 app/views/projects/commits/_head.html.haml | 39 ++++++++--------
 app/views/projects/commits/show.html.haml  | 53 ++++++++++++----------
 app/views/projects/tree/show.html.haml     | 19 ++++----
 4 files changed, 80 insertions(+), 52 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 7eb7a8e4544..6d44ee6c269 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -67,6 +67,27 @@
       color: #78a;
     }
   }
+
+  &.sub-nav {
+    background-color: $background-color;
+
+    .container-fluid {
+      background-color: $background-color;
+    }
+
+    li {
+
+      a {
+        margin: 0;
+        padding: 11px 10px 9px;
+      }
+
+      &.active a {
+        border-bottom: none;
+        color: $link-underline-blue;
+      }
+    }
+  }
 }
 
 .top-area {
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 1c136133ab0..73af27a8a37 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,24 +1,25 @@
-%ul.nav-links
-  = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
-    = link_to project_files_path(@project) do
-      Files
+%ul.nav-links.sub-nav
+  %div{ class: (container_class) }
+    = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+      = link_to project_files_path(@project) do
+        Files
 
-  = nav_link(controller: [:commit, :commits]) do
-    = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-      Commits
+    = nav_link(controller: [:commit, :commits]) do
+      = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
+        Commits
 
-  = nav_link(controller: %w(network)) do
-    = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
-      Network
+    = nav_link(controller: %w(network)) do
+      = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
+        Network
 
-  = nav_link(controller: :compare) do
-    = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
-      Compare
+    = nav_link(controller: :compare) do
+      = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
+        Compare
 
-  = nav_link(html_options: {class: branches_tab_class}) do
-    = link_to namespace_project_branches_path(@project.namespace, @project) do
-      Branches
+    = nav_link(html_options: {class: branches_tab_class}) do
+      = link_to namespace_project_branches_path(@project.namespace, @project) do
+        Branches
 
-  = nav_link(controller: [:tags, :releases]) do
-    = link_to namespace_project_tags_path(@project.namespace, @project) do
-      Tags
+    = nav_link(controller: [:tags, :releases]) do
+      = link_to namespace_project_tags_path(@project.namespace, @project) do
+        Tags
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 2c21923ed4f..288a912f409 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -1,3 +1,5 @@
+- @no_container = true
+
 - page_title "Commits", @ref
 = content_for :meta_tags do
   - if current_user
@@ -5,37 +7,38 @@
 
 = render "head"
 
-.row-content-block.second-block
-  .tree-ref-holder
-    = render 'shared/ref_switcher', destination: 'commits'
+%div{ class: (container_class) }
+  .row-content-block.second-block
+    .tree-ref-holder
+      = render 'shared/ref_switcher', destination: 'commits'
+
+    .block-controls.hidden-xs.hidden-sm
+      - if @merge_request.present?
+        .control
+          = 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
+            = icon('plus')
+            Create Merge Request
 
-  .block-controls.hidden-xs.hidden-sm
-    - if @merge_request.present?
       .control
-        = 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
-          = icon('plus')
-          Create Merge Request
+        = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'pull-left commits-search-form') do
+          = search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input', spellcheck: false }
 
-    .control
-      = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'pull-left commits-search-form') do
-        = search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input', spellcheck: false }
-
-    - if current_user && current_user.private_token
-      .control
-        = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'btn' do
-          = icon("rss")
+      - if current_user && current_user.private_token
+        .control
+          = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'btn' do
+            = icon("rss")
 
 
-  %ul.breadcrumb.repo-breadcrumb
-    = commits_breadcrumbs
+    %ul.breadcrumb.repo-breadcrumb
+      = commits_breadcrumbs
 
-%div{id: dom_id(@project)}
-  #commits-list.content_list= render "commits", project: @project
-.clear
-= spinner
+  %div{id: dom_id(@project)}
+    #commits-list.content_list= render "commits", project: @project
+  .clear
+  = spinner
 
 :javascript
   CommitsList.init(#{@limit});
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 59f60c4687c..2abcfcdd7b2 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,3 +1,5 @@
+- @no_container = true
+
 - page_title @path.presence || "Files", @ref
 = content_for :meta_tags do
   - if current_user
@@ -5,13 +7,14 @@
 = render 'projects/last_push'
 = render "projects/commits/head"
 
-.tree-controls
-  = render 'projects/find_file_link'
-  - if can? current_user, :download_code, @project
-    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped', split_button: true
+%div{ class: (container_class) }
+  .tree-controls
+    = render 'projects/find_file_link'
+    - if can? current_user, :download_code, @project
+      = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped', split_button: true
 
-#tree-holder.tree-holder.clearfix
-  .nav-block
-    = render 'projects/tree/tree_header', tree: @tree
+  #tree-holder.tree-holder.clearfix
+    .nav-block
+      = render 'projects/tree/tree_header', tree: @tree
 
-  = render 'projects/tree/tree_content', tree: @tree
+    = render 'projects/tree/tree_content', tree: @tree

From e141a1c6f14df7b83cbb24190f9786b6fc36cd49 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 27 May 2016 15:56:43 +0100
Subject: [PATCH 1235/1431] Notifications dropdown on project page now has
 descriptions

This is part of #12758
---
 .../stylesheets/framework/dropdowns.scss      | 26 +++++++++++++++----
 app/helpers/notifications_helper.rb           | 22 +++++++++++++---
 app/models/notification_setting.rb            |  2 +-
 .../projects/buttons/_notifications.html.haml |  4 +--
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 28634d0c59f..cf664627f81 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -122,10 +122,8 @@
   a {
     display: block;
     position: relative;
-    padding-left: 10px;
-    padding-right: 10px;
+    padding: 5px 10px;
     color: $dropdown-link-color;
-    line-height: 34px;
     text-overflow: ellipsis;
     border-radius: 2px;
     white-space: nowrap;
@@ -162,6 +160,16 @@
   }
 }
 
+.dropdown-menu-large {
+  width: 340px;
+}
+
+.dropdown-menu-no-wrap {
+  a {
+    white-space: normal;
+  }
+}
+
 .dropdown-menu-full-width {
   width: 100%;
 }
@@ -236,8 +244,7 @@
       &::before {
         position: absolute;
         left: 5px;
-        top: 50%;
-        margin-top: -7px;
+        top: 8px;
         font: normal normal normal 14px/1 FontAwesome;
         font-size: inherit;
         text-rendering: auto;
@@ -532,3 +539,12 @@
     background-color: $calendar-unselectable-bg;
   }
 }
+
+.dropdown-menu-inner-title {
+  display: block;
+  font-weight: 600;
+}
+
+.dropdown-menu-inner-content {
+  display: block;
+}
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 54ab9179efc..b8e64b3890a 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -31,6 +31,21 @@ module NotificationsHelper
     end
   end
 
+  def notification_description(level)
+    case level.to_sym
+    when :participating
+      'You will only receive notifications from related resources'
+    when :mention
+      'You will receive notifications only for comments in which you were @mentioned'
+    when :watch
+      'You will receive notifications for any activity'
+    when :disabled
+      'You will not get any notifications via email'
+    when :global
+      'Use your global notification setting'
+    end
+  end
+
   def notification_list_item(level, setting)
     title = notification_title(level)
 
@@ -39,9 +54,10 @@ module NotificationsHelper
       notification_title: title
     }
 
-    content_tag(:li, class: ('active' if setting.level == level)) do
-      link_to '#', class: 'update-notification', data: data do
-        notification_icon(level, title)
+    content_tag(:li, role: "menuitem") do
+      link_to '#', class: "update-notification #{('is-active' if setting.level == level)}", data: data do
+        link_output = content_tag(:strong, title, class: 'dropdown-menu-inner-title')
+        link_output << content_tag(:span, notification_description(level), class: 'dropdown-menu-inner-content')
       end
     end
   end
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 5001738f411..17fb15b08df 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -1,5 +1,5 @@
 class NotificationSetting < ActiveRecord::Base
-  enum level: { disabled: 0,  participating: 1,  watch: 2,  global: 3, mention: 4 }
+  enum level: { global: 3, watch: 2, mention: 4, participating: 1, disabled: 0 }
 
   default_value_for :level, NotificationSetting.levels[:global]
 
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index 1d05da50581..2348ceaa92b 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -2,10 +2,10 @@
   = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), method: :patch, remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
     = f.hidden_field :level
     .dropdown
-      %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
+      %button.btn.notifications-btn#notifications-button{ data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } }
         = icon('bell')
         = notification_title(@notification_setting.level)
         = icon('caret-down')
-      %ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
+      %ul.dropdown-menu.dropdown-menu-no-wrap.dropdown-menu-align-right.dropdown-menu-selectable.dropdown-menu-large{ role: "menu" }
         - NotificationSetting.levels.each do |level|
           = notification_list_item(level.first, @notification_setting)

From 8fa8cba02ecdeecbbe020a049f5923afeceb6a1b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 31 May 2016 09:36:59 +0100
Subject: [PATCH 1236/1431] CHANGELOG item

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

diff --git a/CHANGELOG b/CHANGELOG
index ce8f2823c25..c55eb09ef8a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ v 8.8.4 (unreleased)
   - Import GitHub repositories respecting the API rate limit
   - Fix importer for GitHub comments on diff
   - Disable Webhooks before proceeding with the GitHub import
+  - Added descriptions to notification settings dropdown
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 51a62fce040a307955d6e66d0a22f1bbfa068b38 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 31 May 2016 11:38:54 +0100
Subject: [PATCH 1237/1431] Fixed failing tests

---
 app/views/projects/buttons/_notifications.html.haml | 2 +-
 features/steps/project/project.rb                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index 2348ceaa92b..3b97dc9328f 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -2,7 +2,7 @@
   = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), method: :patch, remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
     = f.hidden_field :level
     .dropdown
-      %button.btn.notifications-btn#notifications-button{ data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } }
+      %button.btn.btn-default.notifications-btn#notifications-button{ data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } }
         = icon('bell')
         = notification_title(@notification_setting.level)
         = icon('caret-down')
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index a1785311c2b..2a1a8e776f0 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -126,7 +126,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   end
 
   step 'I click notifications drop down button' do
-    click_link 'notifications-button'
+    find('#notifications-button').click
   end
 
   step 'I choose Mention setting' do

From f62df363b5daa83b5ba81d75c63816976648446d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 6 Jun 2016 08:39:05 +0100
Subject: [PATCH 1238/1431] Updated colors

---
 app/assets/stylesheets/framework/dropdowns.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index cf664627f81..1ce7c57ebcd 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -542,9 +542,11 @@
 
 .dropdown-menu-inner-title {
   display: block;
+  color: $gl-title-color;
   font-weight: 600;
 }
 
 .dropdown-menu-inner-content {
   display: block;
+  color: $gl-placeholder-color;
 }

From 5db95f5e6991f61193b57aa22447479ff5dede93 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 3 Jun 2016 12:09:45 -0600
Subject: [PATCH 1239/1431] Finish styling sub nav

---
 app/assets/stylesheets/framework/blocks.scss |   5 +
 app/assets/stylesheets/pages/projects.scss   |   8 +-
 app/views/projects/branches/index.html.haml  |  61 +++++------
 app/views/projects/builds/index.html.haml    | 102 ++++++++++---------
 app/views/projects/commits/show.html.haml    |   2 +-
 app/views/projects/compare/index.html.haml   |  26 ++---
 app/views/projects/network/_head.html.haml   |  13 ++-
 app/views/projects/network/show.html.haml    |  27 ++---
 app/views/projects/pipelines/_head.html.haml |  27 ++---
 app/views/projects/pipelines/index.html.haml |  96 ++++++++---------
 app/views/projects/tags/index.html.haml      |  44 ++++----
 11 files changed, 217 insertions(+), 194 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 6981f834d30..fab96404a6c 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -61,6 +61,11 @@
     margin-bottom: -$gl-padding;
   }
 
+  &.content-component-block {
+    padding: 11px 0;
+    background-color: $white-light;
+  }
+
   .title {
     color: $gl-text-color;
   }
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index edef336481d..ad78eb65769 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -489,9 +489,11 @@ pre.light-well {
   margin: 0;
 }
 
-.project-show-activity {
-  .activity-filter-block {
-    margin-top: -1px;
+
+.activity-filter-block {
+  .controls {
+    padding-bottom: 10px;
+    border-bottom: 1px solid $border-color;
   }
 }
 
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 08148b1a18b..0d59c3884cd 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,32 +1,35 @@
+- @no_container = true
 - page_title "Branches"
 = render "projects/commits/head"
-.row-content-block
-  .pull-right
-    - if can? current_user, :push_code, @project
-      = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
-        = icon('plus')
-        New branch
-      &nbsp;
-    .dropdown.inline
-      %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.light
-        - if @sort.present?
-          = @sort.humanize
-        - else
-          Name
-        %b.caret
-      %ul.dropdown-menu.dropdown-menu-align-right
-        %li
-          = link_to namespace_project_branches_path(sort: nil) do
+
+%div{ class: (container_class) }
+  .row-content-block.second-block.content-component-block
+    .pull-right
+      - if can? current_user, :push_code, @project
+        = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
+          = icon('plus')
+          New branch
+        &nbsp;
+      .dropdown.inline
+        %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+          %span.light
+          - if @sort.present?
+            = @sort.humanize
+          - else
             Name
-          = link_to namespace_project_branches_path(sort: 'recently_updated') do
-            = sort_title_recently_updated
-          = link_to namespace_project_branches_path(sort: 'last_updated') do
-            = sort_title_oldest_updated
-  .oneline
-    Protected branches can be managed in project settings
-- unless @branches.empty?
-  %ul.content-list.all-branches
-    - @branches.each do |branch|
-      = render "projects/branches/branch", branch: branch
-  = paginate @branches, theme: 'gitlab'
+          %b.caret
+        %ul.dropdown-menu.dropdown-menu-align-right
+          %li
+            = link_to namespace_project_branches_path(sort: nil) do
+              Name
+            = link_to namespace_project_branches_path(sort: 'recently_updated') do
+              = sort_title_recently_updated
+            = link_to namespace_project_branches_path(sort: 'last_updated') do
+              = sort_title_oldest_updated
+    .oneline
+      Protected branches can be managed in project settings
+  - unless @branches.empty?
+    %ul.content-list.all-branches
+      - @branches.each do |branch|
+        = render "projects/branches/branch", branch: branch
+    = paginate @branches, theme: 'gitlab'
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 818d5d28f04..55d2ac89ebc 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -1,62 +1,64 @@
+- @no_container = true
 - page_title "Builds"
 = render "projects/pipelines/head"
 
-.top-area
-  %ul.nav-links
-    %li{class: ('active' if @scope.nil?)}
-      = link_to project_builds_path(@project) do
-        All
-        %span.badge.js-totalbuilds-count
-          = number_with_delimiter(@all_builds.count(:id))
+%div{ class: (container_class) }
+  .top-area
+    %ul.nav-links
+      %li{class: ('active' if @scope.nil?)}
+        = link_to project_builds_path(@project) do
+          All
+          %span.badge.js-totalbuilds-count
+            = number_with_delimiter(@all_builds.count(:id))
 
 
-    %li{class: ('active' if @scope == 'running')}
-      = link_to project_builds_path(@project, scope: :running) do
-        Running
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_builds.running_or_pending.count(:id))
+      %li{class: ('active' if @scope == 'running')}
+        = link_to project_builds_path(@project, scope: :running) do
+          Running
+          %span.badge.js-running-count
+            = number_with_delimiter(@all_builds.running_or_pending.count(:id))
 
-    %li{class: ('active' if @scope == 'finished')}
-      = link_to project_builds_path(@project, scope: :finished) do
-        Finished
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_builds.finished.count(:id))
+      %li{class: ('active' if @scope == 'finished')}
+        = link_to project_builds_path(@project, scope: :finished) do
+          Finished
+          %span.badge.js-running-count
+            = number_with_delimiter(@all_builds.finished.count(:id))
 
-  .nav-controls
-    - if can?(current_user, :update_build, @project)
-      - if @all_builds.running_or_pending.any?
-        = link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project),
-          data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+    .nav-controls
+      - if can?(current_user, :update_build, @project)
+        - if @all_builds.running_or_pending.any?
+          = link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project),
+            data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
 
-      - unless @repository.gitlab_ci_yml
-        = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+        - unless @repository.gitlab_ci_yml
+          = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
 
-      = link_to ci_lint_path, class: 'btn btn-default' do
-        = icon('wrench')
-        %span CI Lint
+        = link_to ci_lint_path, class: 'btn btn-default' do
+          = icon('wrench')
+          %span CI Lint
 
-%ul.content-list
-  - if @builds.blank?
-    %li
-      .nothing-here-block No builds to show
-  - else
-    .table-holder
-      %table.table.builds
-        %thead
-          %tr
-            %th Status
-            %th Build ID
-            %th Commit
-            %th Ref
-            %th Stage
-            %th Name
-            %th Tags
-            %th Duration
-            %th Finished at
-            - if @project.build_coverage_enabled?
-              %th Coverage
-            %th
+  %ul.content-list
+    - if @builds.blank?
+      %li
+        .nothing-here-block No builds to show
+    - else
+      .table-holder
+        %table.table.builds
+          %thead
+            %tr
+              %th Status
+              %th Build ID
+              %th Commit
+              %th Ref
+              %th Stage
+              %th Name
+              %th Tags
+              %th Duration
+              %th Finished at
+              - if @project.build_coverage_enabled?
+                %th Coverage
+              %th
 
-        = render @builds, commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: @project.build_coverage_enabled?
+          = render @builds, commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: @project.build_coverage_enabled?
 
-    = paginate @builds, theme: 'gitlab'
+      = paginate @builds, theme: 'gitlab'
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 288a912f409..76ba0bea36d 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -8,7 +8,7 @@
 = render "head"
 
 %div{ class: (container_class) }
-  .row-content-block.second-block
+  .row-content-block.second-block.content-component-block
     .tree-ref-holder
       = render 'shared/ref_switcher', destination: 'commits'
 
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 0b8ed23b305..c322942aeba 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,16 +1,18 @@
+- @no_container = true
 - page_title "Compare"
 = render "projects/commits/head"
 
-.row-content-block
-  Compare branches, tags or commit ranges.
-  %br
-  Fill input field with commit id like
-  %code.label-branch 4eedf23
-  or branch/tag name like
-  %code.label-branch master
-  and press compare button for the commits list and a code diff.
-  %br
-  Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field.
+%div{ class: (container_class) }
+  .row-content-block.second-block.content-component-block
+    Compare branches, tags or commit ranges.
+    %br
+    Fill input field with commit id like
+    %code.label-branch 4eedf23
+    or branch/tag name like
+    %code.label-branch master
+    and press compare button for the commits list and a code diff.
+    %br
+    Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field.
 
-.prepend-top-20
-  = render "form"
+  .prepend-top-20
+    = render "form"
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index c609c505def..86295a3d011 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,6 +1,9 @@
-.row-content-block.append-bottom-default
-  .tree-ref-holder
-    = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
+- @no_container = true
 
-  .oneline
-    You can move around the graph by using the arrow keys.
+%div{ class: (container_class) }
+  .row-content-block.second-block.content-component-block
+    .tree-ref-holder
+      = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
+
+    .oneline
+      You can move around the graph by using the arrow keys.
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 326180ebe4e..bf9baaea889 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,20 +1,21 @@
 - page_title "Network", @ref
 = render "projects/commits/head"
 = render "head"
-.project-network
-  .controls
-    = form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f|
-      = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha'
-      = button_tag class: 'btn btn-success' do
-        = icon('search')
-      .inline.prepend-left-20
-        .checkbox.light
-          = label_tag :filter_ref do
-            = check_box_tag :filter_ref, 1, @options[:filter_ref]
-            %span Begin with the selected commit
+%div{ class: (container_class) }
+  .project-network
+    .controls
+      = form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f|
+        = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha'
+        = button_tag class: 'btn btn-success' do
+          = icon('search')
+        .inline.prepend-left-20
+          .checkbox.light
+            = label_tag :filter_ref do
+              = check_box_tag :filter_ref, 1, @options[:filter_ref]
+              %span Begin with the selected commit
 
-  .network-graph
-    = spinner nil, true
+    .network-graph
+      = spinner nil, true
 
 :javascript
   network_graph = new Network({
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index d284694efb7..f278d4e0538 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -1,14 +1,15 @@
-%ul.nav-links
-  - if project_nav_tab? :pipelines
-    = nav_link(controller: :pipelines) do
-      = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
-        %span
-          Pipelines
-          %span.badge.count.ci_counter= number_with_delimiter(@project.pipelines.running_or_pending.count)
+%ul.nav-links.sub-nav
+  %div{ class: (container_class) }
+    - if project_nav_tab? :pipelines
+      = nav_link(controller: :pipelines) do
+        = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
+          %span
+            Pipelines
+            %span.badge.count.ci_counter= number_with_delimiter(@project.pipelines.running_or_pending.count)
 
-  - if project_nav_tab? :builds
-    = nav_link(controller: %w(builds)) do
-      = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
-        %span
-          Builds
-          %span.badge.count.builds_counter= number_with_delimiter(@project.running_or_pending_build_count)
+    - if project_nav_tab? :builds
+      = nav_link(controller: %w(builds)) do
+        = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+          %span
+            Builds
+            %span.badge.count.builds_counter= number_with_delimiter(@project.running_or_pending_build_count)
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 453767920b5..a78450e09d4 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -1,58 +1,60 @@
+- @no_container = true
 - page_title "Pipelines"
 = render "projects/pipelines/head"
 
-.top-area
-  %ul.nav-links
-    %li{class: ('active' if @scope.nil?)}
-      = link_to project_pipelines_path(@project) do
-        All
-        %span.badge.js-totalbuilds-count
-          = number_with_delimiter(@pipelines_count)
+%div{ class: (container_class) }
+  .top-area
+    %ul.nav-links
+      %li{class: ('active' if @scope.nil?)}
+        = link_to project_pipelines_path(@project) do
+          All
+          %span.badge.js-totalbuilds-count
+            = number_with_delimiter(@pipelines_count)
 
-    %li{class: ('active' if @scope == 'running')}
-      = link_to project_pipelines_path(@project, scope: :running) do
-        Running
-        %span.badge.js-running-count
-          = number_with_delimiter(@running_or_pending_count)
+      %li{class: ('active' if @scope == 'running')}
+        = link_to project_pipelines_path(@project, scope: :running) do
+          Running
+          %span.badge.js-running-count
+            = number_with_delimiter(@running_or_pending_count)
 
-    %li{class: ('active' if @scope == 'branches')}
-      = link_to project_pipelines_path(@project, scope: :branches) do
-        Branches
+      %li{class: ('active' if @scope == 'branches')}
+        = link_to project_pipelines_path(@project, scope: :branches) do
+          Branches
 
-    %li{class: ('active' if @scope == 'tags')}
-      = link_to project_pipelines_path(@project, scope: :tags) do
-        Tags
+      %li{class: ('active' if @scope == 'tags')}
+        = link_to project_pipelines_path(@project, scope: :tags) do
+          Tags
 
-  .nav-controls
-    - if can? current_user, :create_pipeline, @project
-      = link_to new_namespace_project_pipeline_path(@project.namespace, @project), class: 'btn btn-create' do
-        = icon('plus')
-        New pipeline
+    .nav-controls
+      - if can? current_user, :create_pipeline, @project
+        = link_to new_namespace_project_pipeline_path(@project.namespace, @project), class: 'btn btn-create' do
+          = icon('plus')
+          New pipeline
 
-      - unless @repository.gitlab_ci_yml
-        = link_to 'Get started with Pipelines', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+        - unless @repository.gitlab_ci_yml
+          = link_to 'Get started with Pipelines', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
 
-      = link_to ci_lint_path, class: 'btn btn-default' do
-        = icon('wrench')
-        %span CI Lint
+        = link_to ci_lint_path, class: 'btn btn-default' do
+          = icon('wrench')
+          %span CI Lint
 
-%ul.content-list.pipelines
-  - stages = @pipelines.stages
-  - if @pipelines.blank?
-    %li
-      .nothing-here-block No pipelines to show
-  - else
-    .table-holder
-      %table.table.builds
-        %tbody
-          %th ID
-          %th Commit
-          - stages.each do |stage|
-            %th.stage
-              %span.has-tooltip{ title: "#{stage.titleize}" }
-                = stage.titleize.pluralize
-          %th Duration
-          %th
-        = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
+  %ul.content-list.pipelines
+    - stages = @pipelines.stages
+    - if @pipelines.blank?
+      %li
+        .nothing-here-block No pipelines to show
+    - else
+      .table-holder
+        %table.table.builds
+          %tbody
+            %th ID
+            %th Commit
+            - stages.each do |stage|
+              %th.stage
+                %span.has-tooltip{ title: "#{stage.titleize}" }
+                  = stage.titleize.pluralize
+            %th Duration
+            %th
+          = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
 
-    = paginate @pipelines, theme: 'gitlab'
+      = paginate @pipelines, theme: 'gitlab'
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 8f381663e6e..9ff805a8989 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,28 +1,30 @@
+- @no_container = true
 - page_title "Tags"
 = render "projects/commits/head"
 
-.row-content-block
-  - if can? current_user, :push_code, @project
-    .pull-right
-      = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
-        = icon('plus')
-        New tag
-  .oneline
-    Tags give the ability to mark specific points in history as being important
+%div{ class: (container_class) }
+  .row-content-block.second-block.content-component-block
+    - if can? current_user, :push_code, @project
+      .pull-right
+        = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
+          = icon('plus')
+          New tag
+    .oneline
+      Tags give the ability to mark specific points in history as being important
 
-.tags
-  - unless @tags.empty?
-    %ul.content-list
-      - @tags.each do |tag|
-        = render 'tag', tag: @repository.find_tag(tag)
+  .tags
+    - unless @tags.empty?
+      %ul.content-list
+        - @tags.each do |tag|
+          = render 'tag', tag: @repository.find_tag(tag)
 
-    = paginate @tags, theme: 'gitlab'
+      = paginate @tags, theme: 'gitlab'
 
-  - else
-    .nothing-here-block
-      Repository has no tags yet.
-      %br
-      %small
-        Use git tag command to add a new one:
+    - else
+      .nothing-here-block
+        Repository has no tags yet.
         %br
-        %span.monospace git tag -a v1.4 -m 'version 1.4'
+        %small
+          Use git tag command to add a new one:
+          %br
+          %span.monospace git tag -a v1.4 -m 'version 1.4'

From a528b649bfaec17acc7ecef60e5850eae6be5870 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 3 Jun 2016 12:39:04 -0600
Subject: [PATCH 1240/1431] Add scrolling tabs to code subnav

---
 app/assets/stylesheets/framework/nav.scss  | 18 +++++++++
 app/views/projects/commits/_head.html.haml | 43 ++++++++++++----------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 6d44ee6c269..2c158b813cf 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -342,6 +342,24 @@
   }
 }
 
+.scrolling-tabs-container {
+  position: relative;
+
+  .nav-links {
+    @include scrolling-links();
+
+    .fade-right {
+      @include fade(left, rgba(255, 255, 255, 0.4), $background-color);
+      right: 0;
+    }
+
+    .fade-left {
+      @include fade(right, rgba(255, 255, 255, 0.4), $background-color);
+      left: 0;
+    }
+  }
+}
+
 .nav-block {
   position: relative;
 
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 73af27a8a37..a72e8ba73ad 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,25 +1,28 @@
-%ul.nav-links.sub-nav
-  %div{ class: (container_class) }
-    = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
-      = link_to project_files_path(@project) do
-        Files
+.scrolling-tabs-container
+  %ul.nav-links.sub-nav.scrolling-tabs
+    %div{ class: (container_class) }
+      .fade-left
+      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+        = link_to project_files_path(@project) do
+          Files
 
-    = nav_link(controller: [:commit, :commits]) do
-      = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-        Commits
+      = nav_link(controller: [:commit, :commits]) do
+        = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
+          Commits
 
-    = nav_link(controller: %w(network)) do
-      = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
-        Network
+      = nav_link(controller: %w(network)) do
+        = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
+          Network
 
-    = nav_link(controller: :compare) do
-      = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
-        Compare
+      = nav_link(controller: :compare) do
+        = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
+          Compare
 
-    = nav_link(html_options: {class: branches_tab_class}) do
-      = link_to namespace_project_branches_path(@project.namespace, @project) do
-        Branches
+      = nav_link(html_options: {class: branches_tab_class}) do
+        = link_to namespace_project_branches_path(@project.namespace, @project) do
+          Branches
 
-    = nav_link(controller: [:tags, :releases]) do
-      = link_to namespace_project_tags_path(@project.namespace, @project) do
-        Tags
+      = nav_link(controller: [:tags, :releases]) do
+        = link_to namespace_project_tags_path(@project.namespace, @project) do
+          Tags
+      .fade-right

From 04dba0e5f80659c28010f3eb1de1aa970f6a1bae Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 6 Jun 2016 17:01:16 -0500
Subject: [PATCH 1241/1431] Align links and tabs

---
 app/assets/stylesheets/framework/nav.scss | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 2c158b813cf..1b22c88070b 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -41,8 +41,7 @@
 
     a {
       display: inline-block;
-      padding: 14px;
-      padding-top: $gl-padding;
+      padding: $gl-btn-padding;
       padding-bottom: 11px;
       margin-bottom: -1px;
       font-size: 15px;
@@ -125,6 +124,10 @@
     margin-bottom: 0;
     border-bottom: none;
 
+    li a {
+      padding: 16px 10px 11px;
+    }
+
     /* Small devices (phones, tablets, 768px and lower) */
     @media (max-width: $screen-sm-max) {
       width: 100%;
@@ -330,8 +333,8 @@
   }
 
   .nav-control {
-    .fade-right {
 
+    .fade-right {
       @media (min-width: $screen-xs-max) {
         right: 67px;
       }

From 8cb00a97ec481aa652d94fcc9e3d61f4215a6298 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 16:16:16 +0200
Subject: [PATCH 1242/1431] Fix knapsack for master

---
 .gitlab-ci.yml | 2 +-
 CHANGELOG      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc1e43fcd44..5ef3081395a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,7 +144,7 @@ spinach 9 10: *spinach-knapsack
   <<: *ruby-22
 
 .spinach-knapsack-ruby22: &spinach-knapsack-ruby22
-  <<: *rspec-knapsack
+  <<: *spinach-knapsack
   <<: *ruby-22
   
 rspec 0 20 ruby22: *rspec-knapsack-ruby22
diff --git a/CHANGELOG b/CHANGELOG
index 7809fef1706..2067017f25c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
   - Use gitlab-shell v3.0.0
+  - Use Knapsack to evenly distribute tests across multiple nodes
   - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
   - Don't allow MRs to be merged when commits were added since the last review / page load
   - Add DB index on users.state

From 7c501895a33e2771097e14ddf7171164ccc27d01 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 2 Jun 2016 15:24:34 -0600
Subject: [PATCH 1243/1431] Implement compact side nav

---
 app/assets/stylesheets/framework/header.scss  |  36 ++----
 app/assets/stylesheets/framework/sidebar.scss | 114 +++---------------
 .../stylesheets/framework/variables.scss      |   2 +-
 app/views/layouts/_page.html.haml             |  14 +--
 app/views/layouts/nav/_dashboard.html.haml    |  24 ++--
 5 files changed, 47 insertions(+), 143 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 0da96c4017d..3be83b0fc65 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -79,13 +79,17 @@ header {
 
     &.header-collapsed {
       padding: 0 16px;
+
+      .side-nav-toggle {
+        display: block;
+      }
     }
 
     .side-nav-toggle {
       display: none;
       position: absolute;
       left: -10px;
-      margin: 6px 0;
+      margin: 8px 0;
       padding: 6px 10px;
       border: none;
       background-color: $background-color;
@@ -97,10 +101,6 @@ header {
       &:focus {
         outline: none;
       }
-
-      @media (max-width: $screen-xs-min) {
-        display: block;
-      }
     }
   }
 
@@ -171,31 +171,21 @@ header {
   }
 }
 
-@mixin collapsed-header {
-  margin-left: $sidebar_collapsed_width;
-}
-
 .header-collapsed {
-  margin-left: $sidebar_collapsed_width;
+  margin-left: 0;
 
-  @media (min-width: $screen-md-min) {
-    @include collapsed-header;
-  }
-
-  @media (max-width: $screen-xs-min) {
-    margin-left: 0;
+  .header-content {
+    padding-left: 30px;
+    transition-duration: .3s;
   }
 }
 
 .header-expanded {
-  margin-left: $sidebar_collapsed_width;
+  margin-left: 0;
 
-  @media (min-width: $screen-md-min) {
-    margin-left: $sidebar_width;
-  }
-
-  @media (max-width: $screen-xs-min) {
-    margin-left: 0;
+  .header-content {
+    padding-left: $sidebar_width;
+    transition-duration: .3s;
   }
 }
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 67f491b6d9c..0acb010b239 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -1,9 +1,7 @@
 #logo {
   z-index: 2;
-  position: absolute;
-  width: 58px;
+  position: relative;
   cursor: pointer;
-  margin-top: 8px;
 }
 
 .page-with-sidebar {
@@ -20,12 +18,6 @@
     height: 100%;
     transition-duration: .3s;
   }
-
-  .gitlab-text-container-link {
-    z-index: 1;
-    position: absolute;
-    left: 0;
-  }
 }
 
 .sidebar-wrapper {
@@ -50,47 +42,8 @@
 
 .sidebar-wrapper {
   .header-logo {
-    border-bottom: 1px solid transparent;
-    float: left;
     height: $header-height;
-    width: $sidebar_width;
-    position: fixed;
-    z-index: 999;
-    overflow: hidden;
-    transition-duration: .3s;
-
-    a {
-      float: left;
-      height: $header-height;
-      width: 100%;
-      padding-left: 22px;
-      overflow: hidden;
-      outline: none;
-      transition-duration: .3s;
-
-      img {
-        width: 36px;
-        height: 36px;
-      }
-
-      #tanuki-logo, img {
-        float: left;
-      }
-
-      .gitlab-text-container {
-        width: 230px;
-
-        h3 {
-          width: 158px;
-          float: left;
-          margin: 0;
-          margin-left: 50px;
-          font-size: 19px;
-          line-height: 50px;
-          font-weight: normal;
-        }
-      }
-    }
+    padding: 8px 26px;
 
     &:hover {
       background-color: #eee;
@@ -98,7 +51,7 @@
   }
 
   .sidebar-user {
-    padding: 7px 22px;
+    padding: 15px 22px;
     position: fixed;
     bottom: 40px;
     width: $sidebar_width;
@@ -126,8 +79,7 @@
 
 
 .nav-sidebar {
-  margin-top: 14 + $header-height;
-  margin-bottom: 100px;
+  margin: 22px 0;
   transition-duration: .3s;
   list-style: none;
   overflow: hidden;
@@ -145,13 +97,13 @@
     }
 
     a {
-      padding: 7px 15px;
+      text-align: center;
+      padding: 8px 0;
       font-size: $gl-font-size;
       line-height: 24px;
       color: $gray;
       display: block;
       text-decoration: none;
-      padding-left: 23px;
       font-weight: normal;
       outline: none;
 
@@ -166,7 +118,6 @@
       i {
         width: 16px;
         color: $gray-light;
-        margin-right: 13px;
       }
 
       .count {
@@ -217,25 +168,13 @@
 }
 
 .page-sidebar-collapsed {
-  padding-left: $sidebar_collapsed_width;
-
-  @media (max-width: $screen-xs-min) {
-    padding-left: 0;
-  }
+  padding-left: 0;
 
   .sidebar-wrapper {
-    width: $sidebar_collapsed_width;
-
-    @media (max-width: $screen-xs-min) {
-      width: 0;
-    }
+    width: 0;
 
     .header-logo {
-      width: $sidebar_collapsed_width;
-
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-      }
+      width: 0;
 
       a {
         padding-left: ($sidebar_collapsed_width - 36) / 2;
@@ -246,6 +185,10 @@
       }
     }
 
+    #logo {
+      display: none;
+    }
+
     .nav-sidebar {
       width: $sidebar_collapsed_width;
 
@@ -261,44 +204,23 @@
     }
 
     .collapse-nav a {
-      width: $sidebar_collapsed_width;
-
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-      }
+      width: 0;
     }
 
     .sidebar-user {
-      padding-left: ($sidebar_collapsed_width - 36) / 2;
-      width: $sidebar_collapsed_width;
-
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-        padding-left: 0;
-        padding-right: 0;
-      }
+      width: 0;
+      padding-left: 0;
+      padding-right: 0;
 
       .username {
         display: none;
       }
     }
   }
-
-  .layout-nav {
-    padding-right: $sidebar_collapsed_width;
-
-    @media (max-width: $screen-xs-min) {
-      padding-right: 0;;
-    }
-  }
 }
 
 .page-sidebar-expanded {
-  padding-left: $sidebar_collapsed_width;
-
-  @media (min-width: $screen-md-min) {
-    padding-left: $sidebar_width;
-  }
+  padding-left: $sidebar_width;
 
   @media (max-width: $screen-xs-min) {
     padding-left: 0;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index f253da814bc..60207ecf1d6 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -2,7 +2,7 @@
  * Layout
  */
 $sidebar_collapsed_width: 62px;
-$sidebar_width: 220px;
+$sidebar_width: 90px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
 $gutter_inner_width: 258px;
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 1e961853c70..f0ba62fa68d 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,11 +1,9 @@
 .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
-    .header-logo
-      %a#logo
-        = brand_header_logo
-      = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
-        .gitlab-text-container
-          %h3 GitLab
+    = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
+      .header-logo
+        #logo
+          = brand_header_logo
 
     - if defined?(sidebar) && sidebar
       = render "layouts/nav/#{sidebar}"
@@ -18,9 +16,7 @@
       = render partial: 'layouts/collapse_button'
     - if current_user
       = link_to current_user, class: 'sidebar-user', title: "Profile" do
-        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
-        .username
-          = current_user.username
+        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s46'
   - if defined?(nav) && nav
     .layout-nav
       .container-fluid
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 306ebd5fcf7..1d5c243b181 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -2,54 +2,50 @@
   = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
     = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
       = icon('bookmark fw')
-      %span
+      %div
         Projects
   = nav_link(controller: :todos) do
     = link_to dashboard_todos_path, title: 'Todos' do
       = icon('bell fw')
-      %span
+      %div
         Todos
-        %span.count.todos-pending-count= number_with_delimiter(todos_pending_count)
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
       = icon('dashboard fw')
-      %span
+      %div
         Activity
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
-      %span
+      %div
         Groups
   = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
-      %span
+      %div
         Milestones
   = nav_link(path: 'dashboard#issues') do
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = icon('exclamation-circle fw')
-      %span
+      %div
         Issues
-        %span.count= number_with_delimiter(current_user.assigned_open_issues_count)
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = icon('tasks fw')
-      %span
+      %div
         Merge Requests
-        %span.count= number_with_delimiter(current_user.assigned_open_merge_request_count)
   = nav_link(controller: :snippets) do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')
-      %span
+      %div
         Snippets
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
       = icon('question-circle fw')
-      %span
+      %div
         Help
-
   = nav_link(html_options: {class: profile_tab_class}) do
     = link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
       = icon('user fw')
-      %span
+      %div
         Profile Settings

From ffbd9cd02d701442b5304e84ad75d657eeb4e23f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 2 Jun 2016 17:31:26 -0600
Subject: [PATCH 1244/1431] Test impersonation using img data attribute instead
 of username

---
 app/views/layouts/_page.html.haml       | 2 +-
 spec/features/admin/admin_users_spec.rb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index f0ba62fa68d..261038ef940 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -15,7 +15,7 @@
     .collapse-nav
       = render partial: 'layouts/collapse_button'
     - if current_user
-      = link_to current_user, class: 'sidebar-user', title: "Profile" do
+      = link_to current_user, class: 'sidebar-user', title: "Profile", data: {user: current_user.username} do
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s46'
   - if defined?(nav) && nav
     .layout-nav
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index b72ad405479..1cb709c1de3 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -144,8 +144,8 @@ describe "Admin::Users", feature: true  do
         before { click_link 'Impersonate' }
 
         it 'logs in as the user when impersonate is clicked' do
-          page.within '.sidebar-user .username' do
-            expect(page).to have_content(another_user.username)
+          page.within '.sidebar-wrapper' do
+            expect(page.find('.sidebar-user')['data-user']).to eql(another_user.username)
           end
         end
 
@@ -158,8 +158,8 @@ describe "Admin::Users", feature: true  do
         it 'can log out of impersonated user back to original user' do
           find(:css, 'li.impersonation a').click
 
-          page.within '.sidebar-user .username' do
-            expect(page).to have_content(@user.username)
+          page.within '.sidebar-wrapper' do
+            expect(page.find('.sidebar-user')['data-user']).to eql(@user.username)
           end
         end
 

From ca985283b40783e498c181ac4612ddf23c421ff4 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 2 Jun 2016 17:37:37 -0600
Subject: [PATCH 1245/1431] Remove todos count tests in nav

---
 features/steps/dashboard/todos.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index bd8a270202e..19fedfbfcdf 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -26,7 +26,6 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
   end
 
   step 'I should see todos assigned to me' do
-    page.within('.nav-sidebar') { expect(page).to have_content 'Todos 4' }
     expect(page).to have_content 'To do 4'
     expect(page).to have_content 'Done 0'
 
@@ -42,7 +41,6 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
       click_link 'Done'
     end
 
-    page.within('.nav-sidebar') { expect(page).to have_content 'Todos 3' }
     expect(page).to have_content 'To do 3'
     expect(page).to have_content 'Done 1'
     should_not_see_todo "John Doe assigned you merge request #{merge_request.to_reference}"

From e8a0cafc7d9e8ee44b37a8e282f4a679bf48cac3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 3 Jun 2016 08:05:32 -0600
Subject: [PATCH 1246/1431] Fix control btn position

---
 app/assets/stylesheets/framework/sidebar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 0acb010b239..ed12cc4f223 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -250,7 +250,7 @@
     }
 
     @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
-      padding-right: 62px;
+      padding-right: 90px;
     }
 
     @media (min-width: $screen-md-min) {

From 2293100d95f587049b7ce7fee923c4b3fbbf6f56 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 3 Jun 2016 16:50:27 -0600
Subject: [PATCH 1247/1431] Update nav link font size and spacing; fix
 hamburger icon

---
 app/assets/stylesheets/framework/header.scss  |  3 ++-
 app/assets/stylesheets/framework/sidebar.scss | 18 +++++------------
 app/views/layouts/nav/_dashboard.html.haml    | 20 +++++++++----------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 3be83b0fc65..c46d6b14782 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -89,7 +89,8 @@ header {
       display: none;
       position: absolute;
       left: -10px;
-      margin: 8px 0;
+      margin: 6px 0;
+      font-size: 18px;
       padding: 6px 10px;
       border: none;
       background-color: $background-color;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index ed12cc4f223..46d46368d25 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -1,9 +1,3 @@
-#logo {
-  z-index: 2;
-  position: relative;
-  cursor: pointer;
-}
-
 .page-with-sidebar {
   padding-top: $header-height;
   transition-duration: .3s;
@@ -98,9 +92,8 @@
 
     a {
       text-align: center;
-      padding: 8px 0;
+      padding: 8px;
       font-size: $gl-font-size;
-      line-height: 24px;
       color: $gray;
       display: block;
       text-decoration: none;
@@ -120,11 +113,10 @@
         color: $gray-light;
       }
 
-      .count {
-        float: right;
-        background: #eee;
-        padding: 0 8px;
-        @include border-radius(6px);
+      .nav-link-text {
+        margin-top: 3px;
+        font-size: 13px;
+        line-height: 18px;
       }
 
       &.back-link i {
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 1d5c243b181..df77d9cf83e 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -2,50 +2,50 @@
   = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
     = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
       = icon('bookmark fw')
-      %div
+      .nav-link-text
         Projects
   = nav_link(controller: :todos) do
     = link_to dashboard_todos_path, title: 'Todos' do
       = icon('bell fw')
-      %div
+      .nav-link-text
         Todos
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
       = icon('dashboard fw')
-      %div
+      .nav-link-text
         Activity
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
-      %div
+      .nav-link-text
         Groups
   = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
-      %div
+      .nav-link-text
         Milestones
   = nav_link(path: 'dashboard#issues') do
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = icon('exclamation-circle fw')
-      %div
+      .nav-link-text
         Issues
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = icon('tasks fw')
-      %div
+      .nav-link-text
         Merge Requests
   = nav_link(controller: :snippets) do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')
-      %div
+      .nav-link-text
         Snippets
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
       = icon('question-circle fw')
-      %div
+      .nav-link-text
         Help
   = nav_link(html_options: {class: profile_tab_class}) do
     = link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
       = icon('user fw')
-      %div
+      .nav-link-text
         Profile Settings

From ef37b57f1f5089420997c6092921e1d9516b03b4 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 6 Jun 2016 21:31:28 -0500
Subject: [PATCH 1248/1431] Update charcoal theme colors

---
 app/assets/stylesheets/framework/gitlab-theme.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 16cf394c426..cd2eba59f90 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -89,8 +89,11 @@
   }
 }
 
-$theme-blue: #2980b9;
 $theme-charcoal: #3d454d;
+$theme-charcoal-dark: #383f45;
+$theme-charcoal-text: #b9bbbe;
+
+$theme-blue: #2980b9;
 $theme-graphite: #666;
 $theme-gray: #373737;
 $theme-green: #019875;
@@ -102,7 +105,7 @@ body {
   }
 
   &.ui_charcoal {
-    @include gitlab-theme(#d6d7d9, #485157, $theme-charcoal, #353b41);
+    @include gitlab-theme($theme-charcoal-text, #485157, $theme-charcoal, $theme-charcoal-dark);
   }
 
   &.ui_graphite {

From e8cf89fa0693df95954339bd7593cd13cbbe2e72 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 1 Jun 2016 21:00:56 +0800
Subject: [PATCH 1249/1431] Add a test for User#ci_authorized_runners

---
 spec/models/user_spec.rb | 57 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 6ea8bf9bbe1..2802c7e70bd 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -845,6 +845,63 @@ describe User, models: true do
     it { is_expected.to eq([private_project]) }
   end
 
+  describe '#ci_authorized_runners' do
+    let(:user) { create(:user) }
+    let(:runner) { create(:ci_runner) }
+
+    before { project.runners << runner }
+
+    context 'without any projects' do
+      let(:project) { create(:project) }
+
+      it 'does not load' do
+        expect(user.ci_authorized_runners).to eq([])
+      end
+    end
+
+    context 'with personal projects runners' do
+      let(:namespace) { create(:namespace, owner: user) }
+      let(:project) { create(:project, namespace: namespace) }
+
+      it 'loads' do
+        expect(user.ci_authorized_runners).to eq([runner])
+      end
+    end
+
+    shared_examples :member do
+      it 'loads when the user is a master' do
+        add_user(Gitlab::Access::MASTER)
+        expect(user.ci_authorized_runners).to eq([runner])
+      end
+
+      it 'does not load when the user is a developer' do
+        add_user(Gitlab::Access::DEVELOPER)
+        expect(user.ci_authorized_runners).to eq([])
+      end
+    end
+
+    context 'with groups projects runners' do
+      let(:group) { create(:group) }
+      let(:project) { create(:project, group: group) }
+
+      def add_user access
+        group.add_user(user, access)
+      end
+
+      it_behaves_like :member
+    end
+
+    context 'with other projects runners' do
+      let(:project) { create(:project) }
+
+      def add_user access
+        Member.add_user(project.project_members, user, access)
+      end
+
+      it_behaves_like :member
+    end
+  end
+
   describe '#viewable_starred_projects' do
     let(:user) { create(:user) }
     let(:public_project) { create(:empty_project, :public) }

From 5360ef2c5bbdd2706361a59310dba84ed11305bb Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 2 Jun 2016 05:03:00 +0000
Subject: [PATCH 1250/1431] This is easier to write:

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194471
---
 spec/models/user_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2802c7e70bd..6f7d5a3c14d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -895,7 +895,7 @@ describe User, models: true do
       let(:project) { create(:project) }
 
       def add_user access
-        Member.add_user(project.project_members, user, access)
+        project.team << [user, access]
       end
 
       it_behaves_like :member

From 0c2962eb86c4f6e938ad817372498e6600a19a1c Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 2 Jun 2016 05:10:59 +0000
Subject: [PATCH 1251/1431] Use subject for more consistent testing style:

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194489
---
 spec/models/user_spec.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 6f7d5a3c14d..d9e65586a8e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -848,6 +848,7 @@ describe User, models: true do
   describe '#ci_authorized_runners' do
     let(:user) { create(:user) }
     let(:runner) { create(:ci_runner) }
+    subject { user.ci_authorized_runners }
 
     before { project.runners << runner }
 
@@ -855,7 +856,7 @@ describe User, models: true do
       let(:project) { create(:project) }
 
       it 'does not load' do
-        expect(user.ci_authorized_runners).to eq([])
+        is_expected.to eq([])
       end
     end
 
@@ -864,19 +865,19 @@ describe User, models: true do
       let(:project) { create(:project, namespace: namespace) }
 
       it 'loads' do
-        expect(user.ci_authorized_runners).to eq([runner])
+        is_expected.to eq([runner])
       end
     end
 
     shared_examples :member do
       it 'loads when the user is a master' do
         add_user(Gitlab::Access::MASTER)
-        expect(user.ci_authorized_runners).to eq([runner])
+        is_expected.to eq([runner])
       end
 
       it 'does not load when the user is a developer' do
         add_user(Gitlab::Access::DEVELOPER)
-        expect(user.ci_authorized_runners).to eq([])
+        is_expected.to eq([])
       end
     end
 

From 2dd60b9b3f400e7709000eb1b4b7b7ab21326d5f Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 2 Jun 2016 05:15:45 +0000
Subject: [PATCH 1252/1431] Use rspec's matchers and update style:

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194552
---
 spec/models/user_spec.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d9e65586a8e..4c213f633de 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -856,7 +856,7 @@ describe User, models: true do
       let(:project) { create(:project) }
 
       it 'does not load' do
-        is_expected.to eq([])
+        is_expected.to be_empty
       end
     end
 
@@ -865,19 +865,21 @@ describe User, models: true do
       let(:project) { create(:project, namespace: namespace) }
 
       it 'loads' do
-        is_expected.to eq([runner])
+        is_expected.to contain_exactly(runner)
       end
     end
 
     shared_examples :member do
-      it 'loads when the user is a master' do
-        add_user(Gitlab::Access::MASTER)
-        is_expected.to eq([runner])
+      context 'when the user is a master' do
+        before { add_user(Gitlab::Access::MASTER) }
+
+        it { is_expected.to contain_exactly(runner) }
       end
 
-      it 'does not load when the user is a developer' do
-        add_user(Gitlab::Access::DEVELOPER)
-        is_expected.to eq([])
+      context 'when the user is a developer' do
+        before { add_user(Gitlab::Access::DEVELOPER) }
+
+        it { is_expected.to be_empty }
       end
     end
 

From db95704fb484e546ae8cbbb24aa7582a4137b90f Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 2 Jun 2016 05:27:44 +0000
Subject: [PATCH 1253/1431] Fix method definition style

---
 spec/models/user_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 4c213f633de..f8c2555d07a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -887,7 +887,7 @@ describe User, models: true do
       let(:group) { create(:group) }
       let(:project) { create(:project, group: group) }
 
-      def add_user access
+      def add_user(access)
         group.add_user(user, access)
       end
 
@@ -897,7 +897,7 @@ describe User, models: true do
     context 'with other projects runners' do
       let(:project) { create(:project) }
 
-      def add_user access
+      def add_user(access)
         project.team << [user, access]
       end
 

From 5f3e647330041cdf588c2def9cba517dd546d365 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 2 Jun 2016 23:30:27 +0800
Subject: [PATCH 1254/1431] Prefer do and end for before/after:

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12217415
---
 spec/models/user_spec.rb | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f8c2555d07a..84c93dfeb24 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -68,7 +68,9 @@ describe User, models: true do
 
     describe 'email' do
       context 'when no signup domains listed' do
-        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return([]) }
+        before do
+          allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return([])
+        end
         it 'accepts any email' do
           user = build(:user, email: "info@example.com")
           expect(user).to be_valid
@@ -76,7 +78,9 @@ describe User, models: true do
       end
 
       context 'when a signup domain is listed and subdomains are allowed' do
-        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com']) }
+        before do
+          allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com'])
+        end
         it 'accepts info@example.com' do
           user = build(:user, email: "info@example.com")
           expect(user).to be_valid
@@ -94,7 +98,9 @@ describe User, models: true do
       end
 
       context 'when a signup domain is listed and subdomains are not allowed' do
-        before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com']) }
+        before do
+          allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com'])
+        end
 
         it 'accepts info@example.com' do
           user = build(:user, email: "info@example.com")
@@ -202,7 +208,9 @@ describe User, models: true do
   end
 
   describe '#confirm' do
-    before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
+    before do
+      allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true)
+    end
     let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') }
 
     it 'returns unconfirmed' do
@@ -850,7 +858,9 @@ describe User, models: true do
     let(:runner) { create(:ci_runner) }
     subject { user.ci_authorized_runners }
 
-    before { project.runners << runner }
+    before do
+      project.runners << runner
+    end
 
     context 'without any projects' do
       let(:project) { create(:project) }
@@ -871,13 +881,17 @@ describe User, models: true do
 
     shared_examples :member do
       context 'when the user is a master' do
-        before { add_user(Gitlab::Access::MASTER) }
+        before do
+          add_user(Gitlab::Access::MASTER)
+        end
 
         it { is_expected.to contain_exactly(runner) }
       end
 
       context 'when the user is a developer' do
-        before { add_user(Gitlab::Access::DEVELOPER) }
+        before do
+          add_user(Gitlab::Access::DEVELOPER)
+        end
 
         it { is_expected.to be_empty }
       end

From 4fcdcc36f168bc3791536c20a6168eb7428f623d Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Mon, 6 Jun 2016 14:55:18 +0800
Subject: [PATCH 1255/1431] Avoid using subject and is_expected.to:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12274602
---
 spec/models/user_spec.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 84c93dfeb24..f727611f7ce 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -856,7 +856,6 @@ describe User, models: true do
   describe '#ci_authorized_runners' do
     let(:user) { create(:user) }
     let(:runner) { create(:ci_runner) }
-    subject { user.ci_authorized_runners }
 
     before do
       project.runners << runner
@@ -866,7 +865,7 @@ describe User, models: true do
       let(:project) { create(:project) }
 
       it 'does not load' do
-        is_expected.to be_empty
+        expect(user.ci_authorized_runners).to be_empty
       end
     end
 
@@ -875,7 +874,7 @@ describe User, models: true do
       let(:project) { create(:project, namespace: namespace) }
 
       it 'loads' do
-        is_expected.to contain_exactly(runner)
+        expect(user.ci_authorized_runners).to contain_exactly(runner)
       end
     end
 
@@ -885,7 +884,9 @@ describe User, models: true do
           add_user(Gitlab::Access::MASTER)
         end
 
-        it { is_expected.to contain_exactly(runner) }
+        it 'loads' do
+          expect(user.ci_authorized_runners).to contain_exactly(runner)
+        end
       end
 
       context 'when the user is a developer' do
@@ -893,7 +894,9 @@ describe User, models: true do
           add_user(Gitlab::Access::DEVELOPER)
         end
 
-        it { is_expected.to be_empty }
+        it 'does not load' do
+          expect(user.ci_authorized_runners).to be_empty
+        end
       end
     end
 

From 4f34cf3241fc7ef53d260dace3da20da8cd89c9e Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 7 Jun 2016 20:32:48 +0800
Subject: [PATCH 1256/1431] Add a blank line between before and it:

Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12301563
---
 spec/models/user_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f727611f7ce..73bee535fe3 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -71,6 +71,7 @@ describe User, models: true do
         before do
           allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return([])
         end
+
         it 'accepts any email' do
           user = build(:user, email: "info@example.com")
           expect(user).to be_valid
@@ -81,6 +82,7 @@ describe User, models: true do
         before do
           allow_any_instance_of(ApplicationSetting).to receive(:restricted_signup_domains).and_return(['example.com', '*.example.com'])
         end
+
         it 'accepts info@example.com' do
           user = build(:user, email: "info@example.com")
           expect(user).to be_valid
@@ -211,6 +213,7 @@ describe User, models: true do
     before do
       allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true)
     end
+
     let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') }
 
     it 'returns unconfirmed' do

From ae6591081a0a16112adcd36304fc80b037228854 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 7 Jun 2016 10:05:10 -0500
Subject: [PATCH 1257/1431] Fix alignment of wiki top area

---
 app/assets/stylesheets/framework/nav.scss | 4 ++++
 app/views/projects/wikis/edit.html.haml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 1b22c88070b..a811778df70 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -101,6 +101,10 @@
     width: 50%;
     line-height: 28px;
 
+    &.wiki-page {
+      padding: 16px 10px 11px;
+    }
+
     /* Small devices (phones, tablets, 768px and lower) */
     @media (max-width: $screen-sm-min) {
       width: 100%;
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index aaa15dd3bbe..cbd69ee1a73 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -2,7 +2,7 @@
 = render 'nav'
 
 .top-area
-  .nav-text
+  .nav-text.wiki-page
     %strong
       - if @page.persisted?
         = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)

From 8e41b21db187c6f6cfe5c0c70e986f63c11d0c25 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 6 Jun 2016 21:34:08 -0700
Subject: [PATCH 1258/1431] Bump nokogiri to 1.6.8

Number of important security and bug fixes. See:
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06
---
 CHANGELOG    | 1 +
 Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ef4bd5fe295..9d631b56b5c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
   - Redesign navigation for project pages
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
+  - Bump nokogiri to 1.6.8
   - Use gitlab-shell v3.0.0
   - Use Knapsack to evenly distribute tests across multiple nodes
   - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
diff --git a/Gemfile.lock b/Gemfile.lock
index c85f9be7783..489c7e7b44d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.99.1)
     mimemagic (0.3.0)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
     multi_json (1.11.2)
@@ -401,8 +401,9 @@ GEM
     net-ldap (0.12.1)
     net-ssh (3.0.1)
     newrelic_rpm (3.14.1.311)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     oauth (0.4.7)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -474,6 +475,7 @@ GEM
     parser (2.3.1.0)
       ast (~> 2.2)
     pg (0.18.4)
+    pkg-config (1.1.7)
     poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)

From d485ec9f1c7bf00a3c87e3e91b6a306f234a5232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Thu, 2 Jun 2016 16:47:39 -0400
Subject: [PATCH 1259/1431] Instrument
 `RepositoryCheck::SingleRepositoryWorker` manually

This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware.
---
 CHANGELOG                      | 1 +
 config/initializers/metrics.rb | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ce8f2823c25..196556328de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,6 +41,7 @@ v 8.9.0 (unreleased)
   - Put project Files and Commits tabs under Code tab
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
   - An indicator is now displayed at the top of the comment field for confidential issues.
+  - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 0c788714714..2673093b96a 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -121,6 +121,13 @@ if Gitlab::Metrics.enabled?
     config.instrument_instance_methods(Gitlab::GitAccessWiki)
 
     config.instrument_instance_methods(API::Helpers)
+
+    config.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker)
+    # Iterate over each non-super private instance method to keep up to date if
+    # internals change
+    RepositoryCheck::SingleRepositoryWorker.private_instance_methods(false).each do |method|
+      config.instrument_instance_method(RepositoryCheck::SingleRepositoryWorker, method)
+    end
   end
 
   GC::Profiler.enable

From c593154cb4f0215851fbbae1dde753dacbaa6713 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Tue, 7 Jun 2016 11:19:19 -0500
Subject: [PATCH 1260/1431] Moved `find_or_create_ldap_user` method to parent
 class and added logging.

---
 lib/gitlab/o_auth/user.rb         | 18 ++++++++++++------
 lib/gitlab/saml/user.rb           | 24 ------------------------
 spec/lib/gitlab/saml/user_spec.rb |  2 +-
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 268ee115028..5e52979093d 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -69,13 +69,19 @@ module Gitlab
         return unless ldap_person
 
         # If a corresponding person exists with same uid in a LDAP server,
-        # set up a Gitlab user with dual LDAP and Omniauth identities.
-        if user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider)
-          # Case when a LDAP user already exists in Gitlab. Add the Omniauth identity to existing account.
+        # check if the user already has a GitLab account.
+        if (user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider))
+          # Case when a LDAP user already exists in Gitlab. Add the OAuth identity to existing account.
+          log.info "LDAP account found for user #{user.username}. Building new identity."
           user.identities.build(extern_uid: auth_hash.uid, provider: auth_hash.provider)
         else
-          # No account in Gitlab yet: create it and add the LDAP identity
-          user = build_new_user
+          log.info 'No existing LDAP account was found in GitLab. Checking for OAuth account.'
+          user = find_by_uid_and_provider
+          if user.nil?
+            log.info 'No user found with the specified OAuth provider. Creating a new one.'
+            user = build_new_user
+          end
+          log.info "Correct account has been found. Adding LDAP identity to user: #{user.username}."
           user.identities.new(provider: ldap_person.provider, extern_uid: ldap_person.dn)
         end
 
@@ -96,7 +102,7 @@ module Gitlab
         # Look for a corresponding person with same uid in any of the configured LDAP providers
         Gitlab::LDAP::Config.providers.each do |provider|
           adapter = Gitlab::LDAP::Adapter.new(provider)
-          @ldap_person = Gitlab::LDAP::Person.find_by_dn(auth_hash.uid, adapter)
+          @ldap_person = Gitlab::LDAP::Person.find_by_uid(auth_hash.uid, adapter)
           break if @ldap_person
         end
         @ldap_person
diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb
index 6f7d4825ae5..8943022612c 100644
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -62,30 +62,6 @@ module Gitlab
         !Gitlab::Saml::Config.external_groups.nil?
       end
 
-      def find_or_create_ldap_user
-        return unless ldap_person
-
-        # If a corresponding person exists with same uid in a LDAP server,
-        # check if the user already has a GitLab account
-        user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider)
-        if user
-          # Case when a LDAP user already exists in Gitlab. Add the SAML identity to existing account.
-          user.identities.build(extern_uid: auth_hash.uid, provider: auth_hash.provider)
-        else
-          # No account found using LDAP in Gitlab yet: check if there is a SAML account with
-          # the passed uid and provider
-          user = find_by_uid_and_provider
-          if user.nil?
-            # No SAML account found, build a new user.
-            user = build_new_user
-          end
-          # Correct account is present, add the LDAP Identity to the user.
-          user.identities.new(provider: ldap_person.provider, extern_uid: ldap_person.dn)
-        end
-
-        user
-      end
-
       def auth_hash=(auth_hash)
         @auth_hash = Gitlab::Saml::AuthHash.new(auth_hash)
       end
diff --git a/spec/lib/gitlab/saml/user_spec.rb b/spec/lib/gitlab/saml/user_spec.rb
index f0a17244ff6..5957998e0f3 100644
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
@@ -182,7 +182,7 @@ describe Gitlab::Saml::User, lib: true do
             context 'user has SAML user, and wants to add their LDAP identity' do
               it 'adds the LDAP identity to the existing SAML user' do
                 create(:omniauth_user, email: 'john@mail.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'saml', username: 'john')
-                local_hash = OmniAuth::AuthHash.new(uid: 'uid=user1,ou=People,dc=example', provider: provider, info: info_hash, extra: { raw_info: OneLogin::RubySaml::Attributes.new({ 'groups' => %w(Developers Freelancers Designers) }) })
+                local_hash = OmniAuth::AuthHash.new(uid: 'uid=user1,ou=People,dc=example', provider: provider, info: info_hash)
                 local_saml_user = described_class.new(local_hash)
 
                 local_saml_user.save

From 5bb3e1934c2a059c8e7cdc4ecbe597781f502a3e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 7 Jun 2016 10:14:18 -0700
Subject: [PATCH 1261/1431] Add LGPLv2 to license whiltelist

---
 config/dependency_decisions.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index a49d805e4f9..436a2c5e17a 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -175,3 +175,9 @@
     :why: https://github.com/jmcnevin/rubypants/blob/master/LICENSE.rdoc
     :versions: []
     :when: 2016-05-02 05:56:50.696858000 Z
+- - :whitelist
+  - LGPLv2+
+  - :who: Stan Hu
+    :why: Equivalent to LGPLv2
+    :versions: []
+    :when: 2016-06-07 17:14:10.907682000 Z

From 629b4e68e8f9f46ff81fabc2f439264e681dabcc Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 7 Jun 2016 11:23:26 -0600
Subject: [PATCH 1262/1431] Add License Finder information to contribution
 acceptance criteria.

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 18270d9598f..f4472214778 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -405,6 +405,7 @@ description area. Copy-paste it to retain the markdown format.
       entire line to follow it. This prevents linting tools from generating warnings.
     - Don't touch neighbouring lines. As an exception, automatic mass
       refactoring modifications may leave style non-compliant.
+1. If the merge request adds any new libraries (gems, JavaScript libraries, etc.), they should conform to our [Licensing guidelines][license-finder-doc]. See the instructions in that document for help if your MR fails the "license-finder" test with a "Dependencies that need approval" error.
 
 ## Changes for Stable Releases
 
@@ -531,3 +532,4 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
 [gitlab-design]: https://gitlab.com/gitlab-org/gitlab-design
 [free Antetype viewer (Mac OSX only)]: https://itunes.apple.com/us/app/antetype-viewer/id824152298?mt=12
 [`gitlab8.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/current/
+[license-finder-doc]: doc/development/licensing.md

From 1558876ac0c7e521dabfc2b1efe3418d34fe531f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 7 Jun 2016 12:37:44 -0500
Subject: [PATCH 1263/1431] Side nav scrolls if content height taller than
 screen

---
 app/assets/stylesheets/framework/sidebar.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 46d46368d25..83d64679686 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -38,6 +38,11 @@
   .header-logo {
     height: $header-height;
     padding: 8px 26px;
+    width: $sidebar_width;
+    position: fixed;
+    z-index: 999;
+    overflow: hidden;
+    transition-duration: .3s;
 
     &:hover {
       background-color: #eee;
@@ -73,7 +78,8 @@
 
 
 .nav-sidebar {
-  margin: 22px 0;
+  margin-top: 22 + $header-height;
+  margin-bottom: 116px;
   transition-duration: .3s;
   list-style: none;
   overflow: hidden;
@@ -167,6 +173,7 @@
 
     .header-logo {
       width: 0;
+      padding: 8px 0;
 
       a {
         padding-left: ($sidebar_collapsed_width - 36) / 2;

From 76d618404ee8a47a34b45dfe41d268eaaf52f00d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 19:45:44 +0200
Subject: [PATCH 1264/1431] Fix markdown_spec to not use `before(:all)` in
 order to properly cleanup database after testing

---
 CHANGELOG                      | 1 +
 spec/features/markdown_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ef4bd5fe295..0eb82b9299a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 8.9.0 (unreleased)
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
   - Cache assigned issue and merge request counts in sidebar nav
   - Cache project build count in sidebar nav
+  - Fix markdown_spec to use before instead of before(:all) to properly cleanup database after testing
   - Reduce number of queries needed to render issue labels in the sidebar
   - Improve error handling importing projects
   - Remove duplicated notification settings
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 1d892fe1a55..7663d193354 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -180,7 +180,7 @@ describe 'GitLab Markdown', feature: true do
     end
   end
 
-  before(:all) do
+  before do
     @feat = MarkdownFeature.new
 
     # `markdown` helper expects a `@project` variable
@@ -188,7 +188,7 @@ describe 'GitLab Markdown', feature: true do
   end
 
   context 'default pipeline' do
-    before(:all) do
+    before do
       @html = markdown(@feat.raw_markdown)
     end
 

From 88b0a9efc44a792a7fd9f2263a1c85b9ef552504 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 19:29:33 +0200
Subject: [PATCH 1265/1431] Load knapsack in Rakefile only when is bundled

---
 Gemfile  | 2 +-
 Rakefile | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 482a6c18dd7..08592607c03 100644
--- a/Gemfile
+++ b/Gemfile
@@ -308,6 +308,7 @@ group :development, :test do
   gem 'benchmark-ips', require: false
 
   gem "license_finder", require: false
+  gem 'knapsack'
 end
 
 group :test do
@@ -316,7 +317,6 @@ group :test do
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit', '~> 0.4.2'
   gem 'sham_rack'
-  gem 'knapsack'
 end
 
 group :production do
diff --git a/Rakefile b/Rakefile
index 16261bf8ae2..85fff2d51eb 100755
--- a/Rakefile
+++ b/Rakefile
@@ -3,11 +3,10 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'knapsack'
 
 relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
 
 Gitlab::Application.load_tasks
 
-Knapsack.load_tasks
+Knapsack.load_tasks if defined?(Knapsack)

From f872f58738e27dff1d9a1b88ab6661239f6943cf Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 7 Jun 2016 14:16:34 -0500
Subject: [PATCH 1266/1431] Update admin sidebar

---
 app/views/layouts/nav/_admin.html.haml | 42 ++++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index f292730fe45..de2276e75e4 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -2,106 +2,102 @@
   = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
     = link_to admin_root_path, title: 'Overview' do
       = icon('dashboard fw')
-      %span
+      .nav-link-text
         Overview
   = nav_link(controller: [:admin, :projects]) do
     = link_to admin_namespaces_projects_path, title: 'Projects' do
       = icon('cube fw')
-      %span
+      .nav-link-text
         Projects
   = nav_link(controller: :users) do
     = link_to admin_users_path, title: 'Users' do
       = icon('user fw')
-      %span
+      .nav-link-text
         Users
   = nav_link(controller: :groups) do
     = link_to admin_groups_path, title: 'Groups' do
       = icon('group fw')
-      %span
+      .nav-link-text
         Groups
   = nav_link(controller: :deploy_keys) do
     = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
       = icon('key fw')
-      %span
+      .nav-link-text
         Deploy Keys
   = nav_link path: ['runners#index', 'runners#show'] do
     = link_to admin_runners_path, title: 'Runners' do
       = icon('cog fw')
-      %span
+      .nav-link-text
         Runners
-        %span.count= number_with_delimiter(Ci::Runner.count(:all))
   = nav_link path: 'builds#index' do
     = link_to admin_builds_path, title: 'Builds' do
       = icon('link fw')
-      %span
+      .nav-link-text
         Builds
-        %span.count= number_with_delimiter(Ci::Build.count(:all))
   = nav_link(controller: :logs) do
     = link_to admin_logs_path, title: 'Logs' do
       = icon('file-text fw')
-      %span
+      .nav-link-text
         Logs
   = nav_link(controller: :health_check) do
     = link_to admin_health_check_path, title: 'Health Check' do
       = icon('medkit fw')
-      %span
+      .nav-link-text
         Health Check
   = nav_link(controller: :broadcast_messages) do
     = link_to admin_broadcast_messages_path, title: 'Messages' do
       = icon('bullhorn fw')
-      %span
+      .nav-link-text
         Messages
   = nav_link(controller: :hooks) do
     = link_to admin_hooks_path, title: 'Hooks' do
       = icon('external-link fw')
-      %span
+      .nav-link-text
         Hooks
   = nav_link(controller: :background_jobs) do
     = link_to admin_background_jobs_path, title: 'Background Jobs' do
       = icon('cog fw')
-      %span
+      .nav-link-text
         Background Jobs
   = nav_link(controller: :appearances) do
     = link_to admin_appearances_path, title: 'Appearances' do
       = icon('image')
-      %span
+      .nav-link-text
         Appearance
 
   = nav_link(controller: :applications) do
     = link_to admin_applications_path, title: 'Applications' do
       = icon('cloud fw')
-      %span
+      .nav-link-text
         Applications
 
   = nav_link(controller: :services) do
     = link_to admin_application_settings_services_path, title: 'Service Templates' do
       = icon('copy fw')
-      %span
+      .nav-link-text
         Service Templates
 
   = nav_link(controller: :labels) do
     = link_to admin_labels_path, title: 'Labels' do
       = icon('tags fw')
-      %span
+      .nav-link-text
         Labels
 
   = nav_link(controller: :abuse_reports) do
     = link_to admin_abuse_reports_path, title: "Abuse Reports" do
       = icon('exclamation-circle fw')
-      %span
+      .nav-link-text
         Abuse Reports
-        %span.count= number_with_delimiter(AbuseReport.count(:all))
 
   - if askimet_enabled?
     = nav_link(controller: :spam_logs) do
       = link_to admin_spam_logs_path, title: "Spam Logs" do
         = icon('exclamation-triangle fw')
-        %span
+        .nav-link-text
           Spam Logs
-          %span.count= number_with_delimiter(SpamLog.count(:all))
 
   = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to admin_application_settings_path, title: 'Settings' do
       = icon('cogs fw')
-      %span
+      .nav-link-text
         Settings

From 2ffc459f34f2c259a7435121d0f18d3b1ff1a770 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 7 Jun 2016 14:17:12 -0500
Subject: [PATCH 1267/1431] Update explore sidebar

---
 app/views/layouts/nav/_explore.html.haml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml
index 3b40006a0cc..46fcf1545f2 100644
--- a/app/views/layouts/nav/_explore.html.haml
+++ b/app/views/layouts/nav/_explore.html.haml
@@ -2,20 +2,20 @@
   = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
     = link_to explore_root_path, title: 'Projects' do
       = icon('bookmark fw')
-      %span
+      .nav-link-text
         Projects
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to explore_groups_path, title: 'Groups' do
       = icon('group fw')
-      %span
+      .nav-link-text
         Groups
   = nav_link(controller: :snippets) do
     = link_to explore_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')
-      %span
+      .nav-link-text
         Snippets
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
       = icon('question-circle fw')
-      %span
+      .nav-link-text
         Help

From 405d752b9b68d0c0c01cc4aae76d6f5acd21dc27 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 6 Jun 2016 00:31:26 -0700
Subject: [PATCH 1268/1431] Bump recaptcha gem to 3.0.0 to remove deprecated
 stoken support

Closes #18210
---
 CHANGELOG    | 1 +
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index de3aeab0d46..720fb554c59 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.9.0 (unreleased)
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
+  - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
   - Reduce number of fog gem dependencies
diff --git a/Gemfile b/Gemfile
index 08592607c03..f2ac70831f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem 'rack-oauth2',            '~> 1.2.1'
 gem 'jwt'
 
 # Spam and anti-bot protection
-gem 'recaptcha', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
 
 # Two-factor authentication
diff --git a/Gemfile.lock b/Gemfile.lock
index c85f9be7783..fd5852c5495 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -549,7 +549,7 @@ GEM
       debugger-ruby_core_source (~> 1.3)
     rdoc (3.12.2)
       json (~> 1.4)
-    recaptcha (1.0.2)
+    recaptcha (3.0.0)
       json
     redcarpet (3.3.3)
     redis (3.3.0)
@@ -932,7 +932,7 @@ DEPENDENCIES
   raphael-rails (~> 2.1.2)
   rblineprof
   rdoc (~> 3.6)
-  recaptcha
+  recaptcha (~> 3.0)
   redcarpet (~> 3.3.3)
   redis (~> 3.2)
   redis-namespace

From f4beec8a9043fbb9782e7b354b46ec1a7af7887e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 2 Jun 2016 11:44:38 -0700
Subject: [PATCH 1269/1431] Add Azure to supported backup list (left out
 accidentally)

---
 Gemfile      |  1 +
 Gemfile.lock | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Gemfile b/Gemfile
index 08592607c03..8c671696665 100644
--- a/Gemfile
+++ b/Gemfile
@@ -86,6 +86,7 @@ gem 'dropzonejs-rails', '~> 0.7.1'
 
 # for backups
 gem 'fog-aws', '~> 0.9'
+gem 'fog-azure', '~> 0.0'
 gem 'fog-core', '~> 1.40'
 gem 'fog-local', '~> 0.3'
 gem 'fog-google', '~> 0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index c85f9be7783..28d358b6673 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,6 +70,21 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    azure (0.7.5)
+      addressable (~> 2.3)
+      azure-core (~> 0.1)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      json (~> 1.8)
+      mime-types (>= 1, < 3.0)
+      nokogiri (~> 1.6)
+      systemu (~> 2.6)
+      thor (~> 0.19)
+      uuid (~> 2.0)
+    azure-core (0.1.2)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      nokogiri (~> 1.6)
     babosa (1.0.2)
     base32 (0.3.2)
     bcrypt (3.1.11)
@@ -213,6 +228,11 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
+    fog-azure (0.0.2)
+      azure (~> 0.6)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
     fog-core (1.40.0)
       builder
       excon (~> 0.49)
@@ -854,6 +874,7 @@ DEPENDENCIES
   flay
   flog
   fog-aws (~> 0.9)
+  fog-azure (~> 0.0)
   fog-core (~> 1.40)
   fog-google (~> 0.3)
   fog-local (~> 0.3)

From ae736d81e1f64fe9439ac0675538d359cfdb5be9 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Tue, 17 May 2016 17:04:01 +0100
Subject: [PATCH 1270/1431] Added a line to find the currently saved text and
 replace the markdown textarea text when cancelling

Updated CHANGELOG

Corrected the changes to store the markdown in a hidden input when edit starts and retrieve the original from that input when edit is cancelled

Replaced hidden input with form attribute
---
 CHANGELOG                              |  1 +
 app/assets/javascripts/notes.js.coffee | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b9189b80889..ff5a7c22e60 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,7 @@ v 8.8.4 (unreleased)
   - Fix importer for GitHub comments on diff
   - Disable Webhooks before proceeding with the GitHub import
   - Added descriptions to notification settings dropdown
+  - Markdown editor now correctly resets the input value on edit cancellation !4175
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 8e33e915ba5..ad216910c8d 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -354,8 +354,7 @@ class @Notes
   Called in response to clicking the edit note link
 
   Replaces the note text with the note edit form
-  Adds a hidden div with the original content of the note to fill the edit note form with
-  if the user cancels
+  Adds a data attribute to the form with the original content of the note for cancellations
   ###
   showEditForm: (e, scrollTo, myLastNote) ->
     e.preventDefault()
@@ -371,6 +370,8 @@ class @Notes
     done = ($noteText) ->
       # Neat little trick to put the cursor at the end
       noteTextVal = $noteText.val()
+      # Store the original note text in a data attribute to retrieve if a user cancels edit.
+      form.find('form.edit-note').data 'original-note', noteTextVal
       $noteText.val('').val(noteTextVal);
 
     new GLForm form
@@ -393,14 +394,16 @@ class @Notes
   ###
   Called in response to clicking the edit note link
 
-  Hides edit form
+  Hides edit form and restores the original note text to the editor textarea.
   ###
   cancelEdit: (e) ->
     e.preventDefault()
     note = $(this).closest(".note")
+    form = note.find(".current-note-edit-form")
     note.removeClass "is-editting"
-    note.find(".current-note-edit-form")
-      .removeClass("current-note-edit-form")
+    form.removeClass("current-note-edit-form")
+    # Replace markdown textarea text with original note text.
+    form.find(".js-note-text").val(form.find('form.edit-note').data('original-note'))
 
   ###
   Called in response to deleting a note of any kind.

From d9422aef859334de737341ed4acf1933439c5693 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 7 Jun 2016 13:13:10 -0600
Subject: [PATCH 1271/1431] Only load Chart.js when necessary.

---
 app/assets/javascripts/application.js.coffee        | 1 -
 app/assets/javascripts/graphs/application.js.coffee | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index ebf425550e9..2bb11b11d5d 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -35,7 +35,6 @@
 #= require raphael
 #= require g.raphael
 #= require g.bar
-#= require Chart
 #= require branch-graph
 #= require ace/ace
 #= require ace/ext-searchbox
diff --git a/app/assets/javascripts/graphs/application.js.coffee b/app/assets/javascripts/graphs/application.js.coffee
index e0f681acf0b..91f81a5d249 100644
--- a/app/assets/javascripts/graphs/application.js.coffee
+++ b/app/assets/javascripts/graphs/application.js.coffee
@@ -4,4 +4,5 @@
 # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 # the compiled file.
 #
+#= require Chart
 #= require_tree .

From 200bbbcb6a0d599b033f542c50182356a5eaa933 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Mon, 16 May 2016 23:01:48 +0100
Subject: [PATCH 1272/1431] Fixes issue search form hiding when current_user is
 nil (guest user)

Fixes the bottom margin of .nav-controls > form (issues list search/filter form) so when a guest views on the field on mobile it is not squished against the issues list

Updated CHANGELOG

navigation tabs and navigation filter search will now stay on the same row until there is no space to

Removed unneeded media queries
---
 CHANGELOG                                 |  1 +
 app/assets/stylesheets/framework/nav.scss | 13 ++-----------
 app/views/projects/issues/index.html.haml |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b9189b80889..d4c5ef63e07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -168,6 +168,7 @@ v 8.8.0
   - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
   - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
   - When creating a .gitignore file a dropdown with templates will be provided
+  - Shows the issue/MR list search/filter form and corrects the mobile styling for guest users. #17562
 
 v 8.7.7
   - Fix import by `Any Git URL` broken if the URL contains a space
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a811778df70..294c4e3569c 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -171,6 +171,7 @@
     > form {
       display: inline-block;
       margin-top: -1px;
+      margin-bottom: 12px;
     }
 
     .icon-label {
@@ -207,7 +208,7 @@
 
     @media (max-width: $screen-xs-max) {
       padding-bottom: 0;
-
+      width: 100%;
       .btn, form, .dropdown, .dropdown-menu-toggle, .form-control {
         margin: 0 0 10px;
         display: block;
@@ -238,16 +239,6 @@
         margin: 0;
       }
     }
-
-    /* Small devices (tablets, 768px and lower) */
-    @media (max-width: $screen-sm-max) {
-      width: 100%;
-      text-align: left;
-
-      input {
-        width: 300px;
-      }
-    }
   }
 }
 
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 19a6f4a91f6..95b5dcf0e04 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -12,7 +12,7 @@
         = icon('rss')
         %span.icon-label
           Subscribe
-      = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project)
+    = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project)
     - if can? current_user, :create_issue, @project
       = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
         = icon('plus')

From 9f554aadd585e357c77a22733c82f381967cac1d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 6 Jun 2016 16:29:52 -0400
Subject: [PATCH 1273/1431] Fix 2FA-based login for LDAP users

The OTP input form is shared by both LDAP and standard logins, but when
coming from an LDAP-based form, the form parameters aren't nested in a
Hash based on the `resource_name` value.

Now we check for a nested `remember_me` parameter and use that if it
exists, or fall back to the non-nested parameters if it doesn't.

Somewhat confusingly, the OTP input form _does_ nest parameters under
the `resource_name`, regardless of what type of login we're coming from,
so that allows everything else to work as normal.
---
 app/views/devise/sessions/two_factor.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index 9d04db2c45e..a373f61bd3c 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -6,7 +6,8 @@
       - if @user.two_factor_otp_enabled?
         %h5 Authenticate via Two-Factor App
         = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
-          = f.hidden_field :remember_me, value: params[resource_name][:remember_me]
+          - resource_params = params[resource_name].presence || params
+          = f.hidden_field :remember_me, value: resource_params.fetch(:remember_me, 0)
           = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-Factor Authentication code', required: true, autofocus: true, autocomplete: 'off'
           %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.
           .prepend-top-20

From df62cbd917f85f85d2e3371da2eccf724d5d94e0 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 8 Jun 2016 11:42:25 +0200
Subject: [PATCH 1274/1431] Add parentheses

---
 spec/requests/git_http_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 14d126480a3..594a60a4340 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -287,20 +287,20 @@ describe 'Git HTTP requests', lib: true do
   def download(project, user: nil, password: nil)
     args = [project, { user: user, password: password }]
 
-    clone_get *args
+    clone_get(*args)
     yield response
 
-    clone_post *args
+    clone_post(*args)
     yield response
   end
 
   def upload(project, user: nil, password: nil)
     args = [project, { user: user, password: password }]
 
-    push_get *args
+    push_get(*args)
     yield response
 
-    push_post *args
+    push_post(*args)
     yield response
   end
 

From eb95019178a002e0c016e60c7b8ef3eb49f7997e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 8 Jun 2016 11:43:13 +0200
Subject: [PATCH 1275/1431] Enable Knapsack only in CI environment

---
 CHANGELOG               | 1 +
 features/support/env.rb | 6 ++++--
 spec/spec_helper.rb     | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5136756079d..59c71699421 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@ v 8.9.0 (unreleased)
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
   - Cache assigned issue and merge request counts in sidebar nav
+  - Use Knapsack only in CI environment
   - Cache project build count in sidebar nav
   - Reduce number of queries needed to render issue labels in the sidebar
   - Improve error handling importing projects
diff --git a/features/support/env.rb b/features/support/env.rb
index 4552db8ad77..edc08cf0986 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,13 +11,15 @@ ENV['RAILS_ENV'] = 'test'
 require './config/environment'
 require 'rspec/expectations'
 require 'sidekiq/testing/inline'
-require 'knapsack'
 
 require_relative 'capybara'
 require_relative 'db_cleaner'
 require_relative 'rerun'
 
-Knapsack::Adapters::SpinachAdapter.bind
+if ENV['CI']
+  require 'knapsack'
+  Knapsack::Adapters::RSpecAdapter.bind
+end
 
 %w(select2_helper test_env repo_helpers).each do |f|
   require Rails.root.join('spec', 'support', f)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a20f4c05971..b43f38ef202 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,9 +15,11 @@ require 'rspec/rails'
 require 'shoulda/matchers'
 require 'sidekiq/testing/inline'
 require 'rspec/retry'
-require 'knapsack'
 
-Knapsack::Adapters::RSpecAdapter.bind
+if ENV['CI']
+  require 'knapsack'
+  Knapsack::Adapters::RSpecAdapter.bind
+end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

From 519c758fa9fabe9b73f784a9f5b80579b2d84325 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 17 May 2016 12:07:11 +0100
Subject: [PATCH 1276/1431] Removable labels from filtered issuables label bar
 When filtering by labels, a remove button appears next to each label. This
 then removes that label & refreshes the issuable filter form

Closes #15474
---
 app/assets/javascripts/issuable.js.coffee     | 24 ++++++++++++++++++-
 app/views/shared/_labels_row.html.haml        |  4 +++-
 spec/features/issues/filter_by_labels_spec.rb | 10 ++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 6504e481102..9801e61dabb 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -6,12 +6,20 @@ issuable_created = false
       Issuable.initTemplates()
       Issuable.initSearch()
       Issuable.initChecks()
+      Issuable.initLabelFilterRemove()
 
   initTemplates: ->
     Issuable.labelRow = _.template(
       '<% _.each(labels, function(label){ %>
         <span class="label-row">
-          <a href="#"><span class="label color-label has-tooltip" style="background-color: <%= label.color %>; color: <%= label.text_color %>" title="<%= _.escape(label.description) %>" data-container="body"><%= _.escape(label.title) %></span></a>
+          <a href="#">
+            <span class="label color-label has-tooltip" style="background-color: <%= label.color %>; color: <%= label.text_color %>" title="<%= _.escape(label.description) %>" data-container="body">
+              <%= _.escape(label.title) %>
+            </span>
+          </a>
+          <button type="button" class="btn btn-sm btn-transparent append-right-5 js-label-filter-remove" data-label="<%= _.escape(label.title) %>">
+            <i class="fa fa-times"></i>
+          </button>
         </span>
       <% }); %>'
     )
@@ -35,6 +43,20 @@ issuable_created = false
           Issuable.filterResults $form
         , 500)
 
+  initLabelFilterRemove: ->
+    $(document)
+      .off 'click', '.js-label-filter-remove'
+      .on 'click', '.js-label-filter-remove', (e) ->
+        $button = $(@)
+
+        # Remove the label input box
+        $('input[name="label_name[]"]')
+          .filter -> @value is $button.data('label')
+          .remove()
+
+        # Submit the form to get new data
+        Issuable.filterResults $('.filter-form')
+
   toggleLabelFilters: ->
     $filteredLabels = $('.filtered-labels')
     if $filteredLabels.find('.label-row').length > 0
diff --git a/app/views/shared/_labels_row.html.haml b/app/views/shared/_labels_row.html.haml
index dc89e36419c..2bea183334e 100644
--- a/app/views/shared/_labels_row.html.haml
+++ b/app/views/shared/_labels_row.html.haml
@@ -1,3 +1,5 @@
 - labels.each do |label|
   %span.label-row
-    = link_to_label(label, tooltip: false)
+    = link_to_label(label, tooltip: true)
+    %button.btn.btn-sm.btn-transparent.append-right-5.js-label-filter-remove{ type: "button", data: { label: label.title } }
+      = icon("times")
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb
index 7f654684143..2015b0434fb 100644
--- a/spec/features/issues/filter_by_labels_spec.rb
+++ b/spec/features/issues/filter_by_labels_spec.rb
@@ -54,6 +54,11 @@ feature 'Issue filtering by Labels', feature: true do
       expect(find('.filtered-labels')).not_to have_content "feature"
       expect(find('.filtered-labels')).not_to have_content "enhancement"
     end
+
+    it 'should remove label "bug"' do
+      first('.js-label-filter-remove').click
+      expect(find('.filtered-labels')).to have_no_content "bug"
+    end
   end
 
   context 'filter by label feature', js: true do
@@ -135,6 +140,11 @@ feature 'Issue filtering by Labels', feature: true do
     it 'should not show label "bug" in filtered-labels' do
       expect(find('.filtered-labels')).not_to have_content "bug"
     end
+
+    it 'should remove label "enhancement"' do
+      first('.js-label-filter-remove').click
+      expect(find('.filtered-labels')).to have_no_content "enhancement"
+    end
   end
 
   context 'filter by label enhancement and bug in issues list', js: true do

From cba0321f9640f3dd8ff0e2e1d8a3f489a4daf0ca Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 18:54:07 +0100
Subject: [PATCH 1277/1431] Updated design

---
 app/assets/javascripts/issuable.js.coffee | 10 ++++------
 app/assets/stylesheets/pages/labels.scss  | 17 +++++++++++++++++
 app/views/shared/_labels_row.html.haml    | 11 ++++++++---
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 9801e61dabb..ef0d35d0dd3 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -11,13 +11,11 @@ issuable_created = false
   initTemplates: ->
     Issuable.labelRow = _.template(
       '<% _.each(labels, function(label){ %>
-        <span class="label-row">
-          <a href="#">
-            <span class="label color-label has-tooltip" style="background-color: <%= label.color %>; color: <%= label.text_color %>" title="<%= _.escape(label.description) %>" data-container="body">
-              <%= _.escape(label.title) %>
-            </span>
+        <span class="label-row btn-group" role="group" aria-label="<%= _.escape(label.title) %>" style="color: <%= label.text_color %>;">
+          <a href="#" class="btn btn-transparent has-tooltip" style="background-color: <%= label.color %>;" title="<%= _.escape(label.description) %>" data-container="body">
+            <%= _.escape(label.title) %>
           </a>
-          <button type="button" class="btn btn-sm btn-transparent append-right-5 js-label-filter-remove" data-label="<%= _.escape(label.title) %>">
+          <button type="button" class="btn btn-transparent label-remove js-label-filter-remove" style="background-color: <%= label.color %>;" data-label="<%= _.escape(label.title) %>">
             <i class="fa fa-times"></i>
           </button>
         </span>
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 2cd9d74b2de..d010b752dda 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -169,3 +169,20 @@
     }
   }
 }
+
+.filtered-labels {
+  .label-row {
+    &:not(:last-child) {
+      margin-right: 5px;
+    }
+  }
+
+  .label-remove {
+    border-left: 1px solid;
+    z-index: 3;
+  }
+
+  .btn {
+    color: inherit;
+  }
+}
diff --git a/app/views/shared/_labels_row.html.haml b/app/views/shared/_labels_row.html.haml
index 2bea183334e..87028ececd4 100644
--- a/app/views/shared/_labels_row.html.haml
+++ b/app/views/shared/_labels_row.html.haml
@@ -1,5 +1,10 @@
 - labels.each do |label|
-  %span.label-row
-    = link_to_label(label, tooltip: true)
-    %button.btn.btn-sm.btn-transparent.append-right-5.js-label-filter-remove{ type: "button", data: { label: label.title } }
+  %span.label-row.btn-group{ role: "group", aria: { label: escape_once(label.name) }, style: "color: #{text_color_for_bg(label.color)}" }
+    = link_to namespace_project_label_path(@project.namespace, @project, label),
+      class: "btn btn-transparent has-tooltip",
+      style: "background-color: #{label.color};",
+      title: escape_once(label.description),
+      data: { container: "body" } do
+      = escape_once label.name
+    %button.btn.btn-transparent.label-remove.js-label-filter-remove{ type: "button", style: "background-color: #{label.color};", data: { label: label.title } }
       = icon("times")

From f4eb55724f9eef401283f11fb617261a390e42a5 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 1 Jun 2016 11:05:46 +0100
Subject: [PATCH 1278/1431] Darken the border between remove label and label
 name

---
 app/assets/stylesheets/pages/labels.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index d010b752dda..26128fcea85 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -178,7 +178,7 @@
   }
 
   .label-remove {
-    border-left: 1px solid;
+    border-left: 1px solid rgba(0, 0, 0, .1);
     z-index: 3;
   }
 

From d3ff691d768fcb40171c11cade8a659a62534160 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 2 Jun 2016 10:40:42 +0100
Subject: [PATCH 1279/1431] Fixed issue with dropdown toggle not updating Added
 tests

---
 app/assets/javascripts/gl_dropdown.js.coffee  |  8 ++++--
 app/assets/javascripts/issuable.js.coffee     |  1 +
 spec/features/issues/filter_by_labels_spec.rb | 25 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 7c7334e9e40..b49bd4565a7 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -211,6 +211,7 @@ class GitLabDropdown
 
     @dropdown.on "shown.bs.dropdown", @opened
     @dropdown.on "hidden.bs.dropdown", @hidden
+    $(@el).on "update.label", @updateLabel
     @dropdown.on "click", ".dropdown-menu, .dropdown-menu-close", @shouldPropagate
     @dropdown.on 'keyup', (e) =>
       if e.which is 27 # Escape key
@@ -453,7 +454,7 @@ class GitLabDropdown
 
       # Toggle the dropdown label
       if @options.toggleLabel
-        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel
+        @updateLabel()
       else
         selectedObject
     else if el.hasClass(INDETERMINATE_CLASS)
@@ -480,7 +481,7 @@ class GitLabDropdown
 
       # Toggle the dropdown label
       if @options.toggleLabel
-        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selectedObject, el)
+        @updateLabel(selectedObject, el)
       if value?
         if !field.length and fieldName
           @addInput(fieldName, value)
@@ -579,6 +580,9 @@ class GitLabDropdown
       # Scroll the dropdown content up
       $dropdownContent.scrollTop(listItemTop - dropdownContentTop)
 
+  updateLabel: (selected = null, el = null) =>
+    $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selected, el)
+
 $.fn.glDropdown = (opts) ->
   return @.each ->
     if (!$.data @, 'glDropdown')
diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index ef0d35d0dd3..c2447120033 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -54,6 +54,7 @@ issuable_created = false
 
         # Submit the form to get new data
         Issuable.filterResults $('.filter-form')
+        $('.js-label-select').trigger('update.label')
 
   toggleLabelFilters: ->
     $filteredLabels = $('.filtered-labels')
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb
index 2015b0434fb..0ec8b6b180a 100644
--- a/spec/features/issues/filter_by_labels_spec.rb
+++ b/spec/features/issues/filter_by_labels_spec.rb
@@ -174,4 +174,29 @@ feature 'Issue filtering by Labels', feature: true do
       expect(find('.filtered-labels')).not_to have_content "feature"
     end
   end
+
+  context 'remove filtered labels', js: true do
+    before do
+      page.within '.labels-filter' do
+        click_button 'Label'
+        click_link 'bug'
+        find('.dropdown-menu-close').click
+      end
+
+      page.within '.filtered-labels' do
+        expect(page).to have_content 'bug'
+      end
+    end
+
+    it 'should allow user to remove filtered labels' do
+      page.within '.filtered-labels' do
+        first('.js-label-filter-remove').click
+        expect(page).not_to have_content 'bug'
+      end
+
+      page.within '.labels-filter' do
+        expect(page).not_to have_content 'bug'
+      end
+    end
+  end
 end

From 8cd17f748bb564d6aeaa4fa8339b2d5431a10697 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 8 Jun 2016 12:24:10 +0100
Subject: [PATCH 1280/1431] Fixed dropdown line-height Most noticable on the
 commit header

---
 app/assets/stylesheets/framework/dropdowns.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 1ce7c57ebcd..d4d579a083d 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -124,6 +124,7 @@
     position: relative;
     padding: 5px 10px;
     color: $dropdown-link-color;
+    line-height: initial;
     text-overflow: ellipsis;
     border-radius: 2px;
     white-space: nowrap;

From 1611c57c6c7d533ae9d0aaabf72cc058fc3cec08 Mon Sep 17 00:00:00 2001
From: Bartholomew <mackintosh02@gmail.com>
Date: Wed, 8 Jun 2016 12:43:43 +0000
Subject: [PATCH 1281/1431] fix empty user projects snippets list

---
 app/views/users/show.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 8268380dafc..92305594a81 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -79,10 +79,10 @@
       %li.js-contributed-tab
         = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
           Contributed projects
-      %li.projects-tab
+      %li.js-projects-tab
         = link_to user_projects_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
           Personal projects
-      %li.snippets-tab
+      %li.js-snippets-tab
         = link_to user_snippets_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
           Snippets
 

From 3b50d96b8aaa7e18efded9a80c7641d1364de5c9 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 7 Jun 2016 23:15:45 -0700
Subject: [PATCH 1282/1431] Fix endless redirections when accessing user OAuth
 applications when they are disabled

Also hides the "Applications" nav button if OAuth applications are disabled by the admin.

Closes #14770
---
 CHANGELOG                                     |  1 +
 .../oauth/applications_controller.rb          |  2 +-
 app/views/layouts/nav/_profile.html.haml      | 11 +++----
 .../oauth/applications_controller_spec.rb     | 29 +++++++++++++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 spec/controllers/oauth/applications_controller_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 5136756079d..f46ef823cb3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Bulk assign/unassign labels to issues.
   - Ability to prioritize labels !4009 / !3205 (Thijs Wouters)
+  - Fix endless redirections when accessing user OAuth applications when they are disabled
   - Allow enabling wiki page events from Webhook management UI
   - Bump rouge to 1.11.0
   - Make EmailsOnPushWorker use Sidekiq mailers queue
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index c6bdd0602c1..0f54dfa4efc 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -32,7 +32,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   def verify_user_oauth_applications_enabled
     return if current_application_settings.user_oauth_applications?
 
-    redirect_to applications_profile_url
+    redirect_to profile_path
   end
 
   def set_index_vars
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 2efc6c48a48..09d9f0184be 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -10,11 +10,12 @@
       = icon('gear fw')
       %span
         Account
-  = nav_link(controller: 'oauth/applications') do
-    = link_to applications_profile_path, title: 'Applications' do
-      = icon('cloud fw')
-      %span
-        Applications
+  - if current_application_settings.user_oauth_applications?
+    = nav_link(controller: 'oauth/applications') do
+      = link_to applications_profile_path, title: 'Applications' do
+        = icon('cloud fw')
+        %span
+          Applications
   = nav_link(controller: :emails) do
     = link_to profile_emails_path, title: 'Emails' do
       = icon('envelope-o fw')
diff --git a/spec/controllers/oauth/applications_controller_spec.rb b/spec/controllers/oauth/applications_controller_spec.rb
new file mode 100644
index 00000000000..af378304893
--- /dev/null
+++ b/spec/controllers/oauth/applications_controller_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Oauth::ApplicationsController do
+  let(:user) { create(:user) }
+
+  context 'project members' do
+    before do
+      sign_in(user)
+    end
+
+    describe 'GET #index' do
+      it 'shows list of applications' do
+        get :index
+
+        expect(response.status).to eq(200)
+      end
+
+      it 'redirects back to profile page if OAuth applications are disabled' do
+        settings = double(user_oauth_applications?: false)
+        allow_any_instance_of(Gitlab::CurrentSettings).to receive(:current_application_settings).and_return(settings)
+
+        get :index
+
+        expect(response.status).to eq(302)
+        expect(response).to redirect_to(profile_path)
+      end
+    end
+  end
+end

From c3024affb3d10b20928b0cce347a4dc6913a507c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 16:29:40 +0300
Subject: [PATCH 1283/1431] Use hex value instead of rgba for gray border color

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 60207ecf1d6..35a75b96c52 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -121,7 +121,7 @@ $border-white-normal: #d6dae2;
 $border-white-dark: #c6cacf;
 
 $border-gray-light: #dcdcdc;
-$border-gray-normal: rgba(0, 0, 0, 0.10);
+$border-gray-normal: #d7d7d7;
 $border-gray-dark: #c6cacf;
 
 $border-green-light: #2faa60;

From e533890bf19f6d0898ab6050f5f5ae7d061f3781 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 16:38:18 +0300
Subject: [PATCH 1284/1431] Improve button color for issue and mr pages

* make sidebar button white
* make header button gray if not primary

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/issues/show.html.haml                  | 8 ++++----
 .../projects/merge_requests/show/_mr_title.html.haml      | 6 +++---
 app/views/shared/issuable/_sidebar.html.haml              | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index b2f14a54073..0577f4faee4 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -38,13 +38,13 @@
               %li
                 = link_to 'Edit', edit_namespace_project_issue_path(@project.namespace, @project, @issue)
         - if can?(current_user, :create_issue, @project)
-          = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'hidden-xs hidden-sm btn btn-nr btn-grouped new-issue-link btn-success', title: 'New issue', id: 'new_issue_link' do
+          = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'hidden-xs hidden-sm btn btn-grouped new-issue-link btn-success', title: 'New issue', id: 'new_issue_link' do
             = icon('plus')
             New issue
         - if can?(current_user, :update_issue, @issue)
-          = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
-          = link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
-          = link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit' do
+          = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-gray btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
+          = link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-grouped btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
+          = link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'hidden-xs hidden-sm btn btn-gray btn-grouped issuable-edit' do
             = icon('pencil-square-o')
             Edit
 
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 36c275e8be1..065fabd410f 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -25,8 +25,8 @@
               = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
             %li
               = link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit'
-        = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{issue_button_visibility(@merge_request, true)}", title: 'Close merge request'
-        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen reopen-mr-link #{issue_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
-        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit" do
+        = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-close #{issue_button_visibility(@merge_request, true)}", title: 'Close merge request'
+        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-gray btn-grouped btn-reopen reopen-mr-link #{issue_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
+        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-gray btn-grouped issuable-edit" do
           = icon('pencil-square-o')
           Edit
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 1ec2436c835..c7991d53a09 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -133,7 +133,7 @@
           .title.hide-collapsed
             Notifications
           - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed'
-          %button.btn.btn-block.btn-gray.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" }
+          %button.btn.btn-block.btn-default.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" }
             %span= subscribed ? 'Unsubscribe' : 'Subscribe'
           .subscription-status.hide-collapsed{data: {status: subscribtion_status}}
             .unsubscribed{class: ( 'hidden' if subscribed )}

From 366ad9ff72b44df384bffe562ac66f85aff24c65 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 17:11:43 +0300
Subject: [PATCH 1285/1431] Reject idea of using white/gray button depends on
 bg color

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 doc/development/ui_guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/development/ui_guide.md b/doc/development/ui_guide.md
index 23760a14b39..5893b7c219e 100644
--- a/doc/development/ui_guide.md
+++ b/doc/development/ui_guide.md
@@ -49,8 +49,8 @@ information from database or file system
 ## Buttons
 
 * Button should contain icon or text. Exceptions should be approved by UX designer.
-* Use gray button on white background or white button on gray background.
 * Use red button for destructive actions (not revertable). For example removing issue.
 * Use green or blue button for primary action. Primary button should be only one. 
 Do not use both green and blue button in one form. 
+* For all other cases use default white button 
 

From 1dc001730b7d08100c0af8c210b5768c7dfbdd32 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 17:20:07 +0300
Subject: [PATCH 1286/1431] Cleanup and imrpove issue/mr buttons

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/buttons.scss     | 15 +++++++++++++--
 app/assets/stylesheets/framework/variables.scss   |  3 +++
 app/views/projects/issues/_new_branch.html.haml   | 12 ++++++------
 app/views/projects/issues/index.html.haml         |  1 -
 app/views/projects/issues/show.html.haml          |  6 ++----
 app/views/projects/merge_requests/_show.html.haml |  4 +---
 app/views/projects/merge_requests/index.html.haml |  1 -
 .../merge_requests/show/_mr_title.html.haml       |  5 ++---
 8 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 467f3b35d74..625200cbcad 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -142,15 +142,26 @@
   }
 
   &.btn-grouped {
-    margin-right: 7px;
+    margin-right: $btn-side-margin;
     float: left;
+
+    &.inline {
+      float: none;
+    }
+
     &:last-child {
       margin-right: 0;
     }
+
+    &.btn-sm {
+      margin-right: $btn-sm-side-margin;
+    }
+
     &.btn-xs {
-      margin-right: 3px;
+      margin-right: $btn-xs-side-margin;
     }
   }
+
   &.disabled {
     pointer-events: auto !important;
   }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 35a75b96c52..d8ea07559ab 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -79,6 +79,9 @@ $provider-btn-not-active-color: #4688f1;
 $link-underline-blue: #4a8bee;
 $layout-link-gray: #7e7c7c;
 $todo-alert-blue: #428bca;
+$btn-side-margin: 7px;
+$btn-sm-side-margin: 5px;
+$btn-xs-side-margin: 5px;
 
 /*
  * Color schema
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index 469429ccf3c..e93b7e0d66d 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -1,13 +1,13 @@
 - if can?(current_user, :push_code, @project)
   .pull-right
     #new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)}
-      = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_iid: @issue.iid), method: :post, class: 'btn has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do
+      = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_iid: @issue.iid),
+        method: :post, class: 'btn has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do
         .checking
-          %i.fa.fa-spinner.fa-spin
+          = icon('spinner spin')
           Checking branches
-        .available(style="display: none")
-          %i.fa.fa-code-fork
+        .available.hide
           New branch
-        .unavailable(style="display: none")
-          %i.fa.fa-exclamation-triangle
+        .unavailable.hide
+          = icon('exclamation-triangle')
           New branch unavailable
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 19a6f4a91f6..2a4027a6ecb 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -15,7 +15,6 @@
       = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project)
     - if can? current_user, :create_issue, @project
       = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
-        = icon('plus')
         New Issue
 
 = render 'shared/issuable/filter', type: :issues
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 0577f4faee4..9b6a97c0959 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -39,13 +39,11 @@
                 = link_to 'Edit', edit_namespace_project_issue_path(@project.namespace, @project, @issue)
         - if can?(current_user, :create_issue, @project)
           = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'hidden-xs hidden-sm btn btn-grouped new-issue-link btn-success', title: 'New issue', id: 'new_issue_link' do
-            = icon('plus')
             New issue
         - if can?(current_user, :update_issue, @issue)
-          = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-gray btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
+          = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-grouped btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
           = link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, status_only: true, format: 'json'), data: {no_turbolink: true}, class: "hidden-xs hidden-sm btn btn-grouped btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
-          = link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'hidden-xs hidden-sm btn btn-gray btn-grouped issuable-edit' do
-            = icon('pencil-square-o')
+          = link_to edit_namespace_project_issue_path(@project.namespace, @project, @issue), class: 'hidden-xs hidden-sm btn btn-grouped issuable-edit' do
             Edit
 
 
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index c30459ae566..c4df8bd504f 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -14,13 +14,11 @@
       - if @merge_request.open?
         .pull-right
           - if @merge_request.source_branch_exists?
-            = link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do
-              = icon('cloud-download fw')
+            = link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do
               Check out branch
 
           %span.dropdown
             %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
-              = icon('download')
               Download as
               %span.caret
             %ul.dropdown-menu
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index b517e874b0f..c8653cb0c30 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -10,7 +10,6 @@
     - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
     - if merge_project
       = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
-        = icon('plus')
         New Merge Request
 
 = render 'shared/issuable/filter', type: :merge_requests
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 065fabd410f..5bf5210aeab 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -26,7 +26,6 @@
             %li
               = link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit'
         = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-close #{issue_button_visibility(@merge_request, true)}", title: 'Close merge request'
-        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-gray btn-grouped btn-reopen reopen-mr-link #{issue_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
-        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-gray btn-grouped issuable-edit" do
-          = icon('pencil-square-o')
+        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-reopen reopen-mr-link #{issue_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
+        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-grouped issuable-edit" do
           Edit

From 3883bc05d26d930689115c6b5d8750c594420615 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 8 Jun 2016 12:27:31 +0200
Subject: [PATCH 1287/1431] Remove notification settings in batches

This improves performance of the duplicate notification settings
migration by removing duplicates in batches instead of using one big
"DELETE FROM" query.

The previous query would locally run over 45 minutes without even
finishing. This new setup finished in a matter of seconds.

Fixes #18289
---
 ...remove_duplicated_notification_settings.rb | 31 +++++++++++++++++--
 db/schema.rb                                  |  4 ++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/db/migrate/20160603180330_remove_duplicated_notification_settings.rb b/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
index c2fcac4c53d..fe1c863b5b9 100644
--- a/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
+++ b/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
@@ -1,7 +1,32 @@
 class RemoveDuplicatedNotificationSettings < ActiveRecord::Migration
   def up
-    execute <<-SQL
-      DELETE FROM notification_settings WHERE id NOT IN ( SELECT min_id from (SELECT MIN(id) as min_id FROM notification_settings GROUP BY user_id, source_type, source_id) as dups )
-    SQL
+    duplicates = exec_query(%Q{
+      SELECT user_id, source_type, source_id
+      FROM notification_settings
+      GROUP BY user_id, source_type, source_id
+      HAVING COUNT(*) > 1
+    })
+
+    duplicates.each do |row|
+      uid = row['user_id']
+      stype = connection.quote(row['source_type'])
+      sid = row['source_id']
+
+      execute(%Q{
+        DELETE FROM notification_settings
+        WHERE user_id = #{uid}
+        AND source_type = #{stype}
+        AND source_id = #{sid}
+        AND id != (
+          SELECT id FROM (
+            SELECT min(id) AS id
+            FROM notification_settings
+            WHERE user_id = #{uid}
+            AND source_type = #{stype}
+            AND source_id = #{sid}
+          ) min_ids
+        )
+      })
+    end
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 69e37470de0..00829d63b66 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160530150109) do
+ActiveRecord::Schema.define(version: 20160603182247) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"
@@ -676,6 +677,7 @@ ActiveRecord::Schema.define(version: 20160530150109) do
   end
 
   add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree
+  add_index "notification_settings", ["user_id", "source_id", "source_type"], name: "index_notifications_on_user_id_and_source_id_and_source_type", unique: true, using: :btree
   add_index "notification_settings", ["user_id"], name: "index_notification_settings_on_user_id", using: :btree
 
   create_table "oauth_access_grants", force: :cascade do |t|

From ad83c3085513dd248b979d445e545e88a17c6ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Fri, 3 Jun 2016 14:47:09 -0400
Subject: [PATCH 1288/1431] Remove `projects` inclusion in
 `notes_with_associations` to skip some unnecessary queries

`notes_with_associations` are used for `participant` declarations, but `Participable`
only really cares about the target entity project, and not the participants
projects.

`notes_with_associations` are also used in `Commit::has_been_reverted?` which
employs the reference extractor of the commit, so no references to the notes
projects are made there (`Mentionable::all_references` cares only about the
`author` and other `attr_mentionable`). A paralel situation occurs on
`Issue::referenced_merge_requests`.
---
 app/models/commit.rb            | 2 +-
 app/models/concerns/issuable.rb | 2 +-
 app/models/snippet.rb           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index b5637bc4fbc..d69d518fadd 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -198,7 +198,7 @@ class Commit
   end
 
   def notes_with_associations
-    notes.includes(:author, :project)
+    notes.includes(:author)
   end
 
   def method_missing(m, *args, &block)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 92526a99147..58e7557fdc6 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -239,7 +239,7 @@ module Issuable
   end
 
   def notes_with_associations
-    notes.includes(:author, :project)
+    notes.includes(:author)
   end
 
   def updated_tasks
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 407697b745c..f8034cb5e6b 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -102,7 +102,7 @@ class Snippet < ActiveRecord::Base
   end
 
   def notes_with_associations
-    notes.includes(:author, :project)
+    notes.includes(:author)
   end
 
   class << self

From fade1a4cdebb4124048e9764486812627333ff95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Mon, 6 Jun 2016 16:19:39 -0400
Subject: [PATCH 1289/1431] Fix pseudo n+1 queries with Note and Note Authors
 in issuables APIs

This was not a clear cut n+1 query, given that if you're directly subscribed to all issues
that the API is returning you never really need to check for the notes. However, if you're
subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and
once to `users` (for the authors). By preemtively loading notes and authors, at worst you have
1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading
of notes when counting user notes.
---
 app/models/concerns/issuable.rb       | 24 +++++++++++++++++++++---
 lib/api/issues.rb                     |  4 ++--
 lib/api/merge_requests.rb             |  2 +-
 spec/models/concerns/issuable_spec.rb | 26 ++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 58e7557fdc6..0ccd3474b81 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -17,7 +17,12 @@ module Issuable
     belongs_to :assignee, class_name: "User"
     belongs_to :updated_by, class_name: "User"
     belongs_to :milestone
-    has_many :notes, as: :noteable, dependent: :destroy
+    has_many :notes, as: :noteable, dependent: :destroy do
+      def authors_loaded?
+        # We check first if we're loaded to not load unnecesarily.
+        loaded? && to_a.all? { |note| note.association(:author).loaded? }
+      end
+    end
     has_many :label_links, as: :target, dependent: :destroy
     has_many :labels, through: :label_links
     has_many :todos, as: :target, dependent: :destroy
@@ -44,6 +49,7 @@ module Issuable
 
     scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
     scope :join_project, -> { joins(:project) }
+    scope :inc_notes_with_associations, -> { includes(notes: :author) }
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
 
@@ -179,7 +185,13 @@ module Issuable
   end
 
   def user_notes_count
-    notes.user.count
+    if notes.loaded?
+      # Use the in-memory association to select and count to avoid hitting the db
+      notes.to_a.count { |note| !note.system? }
+    else
+      # do the count query
+      notes.user.count
+    end
   end
 
   def subscribed_without_subscriptions?(user)
@@ -239,7 +251,13 @@ module Issuable
   end
 
   def notes_with_associations
-    notes.includes(:author)
+    # If A has_many Bs, and B has_many Cs, and you do
+    # `A.includes(b: :c).each { |a| a.b.includes(:c) }`, sadly ActiveRecord
+    # will do the inclusion again. So, we check if all notes in the relation
+    # already have their authors loaded (possibly because the scope
+    # `inc_notes_with_associations` was used) and skip the inclusion if that's
+    # the case.
+    notes.authors_loaded? ? notes : notes.includes(:author)
   end
 
   def updated_tasks
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index f59a4d6c012..4c43257c48a 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -51,7 +51,7 @@ module API
       #   GET /issues?labels=foo,bar
       #   GET /issues?labels=foo,bar&state=opened
       get do
-        issues = current_user.issues
+        issues = current_user.issues.inc_notes_with_associations
         issues = filter_issues_state(issues, params[:state]) unless params[:state].nil?
         issues = filter_issues_labels(issues, params[:labels]) unless params[:labels].nil?
         issues.reorder(issuable_order_by => issuable_sort)
@@ -82,7 +82,7 @@ module API
       #   GET /projects/:id/issues?milestone=1.0.0&state=closed
       #   GET /issues?iid=42
       get ":id/issues" do
-        issues = user_project.issues.visible_to_user(current_user)
+        issues = user_project.issues.inc_notes_with_associations.visible_to_user(current_user)
         issues = filter_issues_state(issues, params[:state]) unless params[:state].nil?
         issues = filter_issues_labels(issues, params[:labels]) unless params[:labels].nil?
         issues = filter_by_iid(issues, params[:iid]) unless params[:iid].nil?
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 2e7836dc8fb..43221d5622a 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -41,7 +41,7 @@ module API
       #
       get ":id/merge_requests" do
         authorize! :read_merge_request, user_project
-        merge_requests = user_project.merge_requests
+        merge_requests = user_project.merge_requests.inc_notes_with_associations
 
         unless params[:iid].nil?
           merge_requests = filter_by_iid(merge_requests, params[:iid])
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index dd03d64f750..efbcbf72f76 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -10,6 +10,16 @@ describe Issue, "Issuable" do
     it { is_expected.to belong_to(:assignee) }
     it { is_expected.to have_many(:notes).dependent(:destroy) }
     it { is_expected.to have_many(:todos).dependent(:destroy) }
+
+    context 'Notes' do
+      let!(:note) { create(:note, noteable: issue, project: issue.project) }
+      let(:scoped_issue) { Issue.includes(notes: :author).find(issue.id) }
+
+      it 'indicates if the notes have their authors loaded' do
+        expect(issue.notes).not_to be_authors_loaded
+        expect(scoped_issue.notes).to be_authors_loaded
+      end
+    end
   end
 
   describe 'Included modules' do
@@ -245,6 +255,22 @@ describe Issue, "Issuable" do
     end
   end
 
+  describe '#user_notes_count' do
+    let(:project) { create(:project) }
+    let(:issue1) { create(:issue, project: project) }
+    let(:issue2) { create(:issue, project: project) }
+
+    before do
+      create_list(:note, 3, noteable: issue1, project: project)
+      create_list(:note, 6, noteable: issue2, project: project)
+    end
+
+    it 'counts the user notes' do
+      expect(issue1.user_notes_count).to be(3)
+      expect(issue2.user_notes_count).to be(6)
+    end
+  end
+
   describe "votes" do
     let(:project) { issue.project }
 

From e7bf943127c9798d55bf59552c55e8400e47b56e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 8 Jun 2016 16:29:09 +0200
Subject: [PATCH 1290/1431] Update Knapsack report only on master

---
 .gitlab-ci.yml | 2 ++
 db/schema.rb   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ef3081395a..3dc48a89463 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,8 @@ update-knapsack:
     - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
     - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
     - rm -f knapsack/*_node_*.json
+  only:
+    - master
 
 # Execute all testing suites
 
diff --git a/db/schema.rb b/db/schema.rb
index 69e37470de0..00829d63b66 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160530150109) do
+ActiveRecord::Schema.define(version: 20160603182247) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"
@@ -676,6 +677,7 @@ ActiveRecord::Schema.define(version: 20160530150109) do
   end
 
   add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree
+  add_index "notification_settings", ["user_id", "source_id", "source_type"], name: "index_notifications_on_user_id_and_source_id_and_source_type", unique: true, using: :btree
   add_index "notification_settings", ["user_id"], name: "index_notification_settings_on_user_id", using: :btree
 
   create_table "oauth_access_grants", force: :cascade do |t|

From bf9e482695481f5a3ec32f7c36d7ec051ec96fa5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 17:32:49 +0300
Subject: [PATCH 1291/1431] Remove unnecessary icons from buttons

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/dashboard/_groups_head.html.haml                   | 1 -
 app/views/dashboard/_projects_head.html.haml                 | 1 -
 app/views/groups/group_members/_group_member.html.haml       | 4 ++--
 app/views/groups/show.html.haml                              | 1 -
 app/views/projects/branches/_branch.html.haml                | 2 --
 app/views/projects/labels/index.html.haml                    | 1 -
 app/views/projects/project_members/_group_members.html.haml  | 1 -
 app/views/projects/project_members/_project_member.html.haml | 4 ++--
 app/views/shared/_new_project_item_select.html.haml          | 3 +--
 9 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml
index 3d17f74b709..23c145ebbb4 100644
--- a/app/views/dashboard/_groups_head.html.haml
+++ b/app/views/dashboard/_groups_head.html.haml
@@ -9,5 +9,4 @@
   - if current_user.can_create_group?
     .nav-controls
       = link_to new_group_path, class: "btn btn-new" do
-        = icon('plus')
         New Group
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 9da3fcbd986..d35f332e1e0 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -18,5 +18,4 @@
     = render 'shared/projects/dropdown'
     - if current_user.can_create_project?
       = link_to new_project_path, class: 'btn btn-new' do
-        = icon('plus')
         New Project
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index 60234be8f83..271700e6db4 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -36,7 +36,7 @@
         - if can?(current_user, :update_group_member, member)
           = button_tag class: "btn-xs btn js-toggle-button",
                        title: 'Edit access level', type: 'button' do
-            %i.fa.fa-pencil-square-o
+            = icon('pencil')
 
         - if can?(current_user, :destroy_group_member, member)
           &nbsp;
@@ -46,7 +46,7 @@
               Leave
           - else
             = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
-              %i.fa.fa-minus.fa-inverse
+              = icon('trash')
 
     .edit-member.hide.js-toggle-content
       %br
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 77c297255b8..54e89a0191f 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -35,7 +35,6 @@
       = render 'shared/projects/dropdown'
       - if can? current_user, :create_projects, @group
         = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do
-          = icon('plus')
           New Project
 
   .tab-content
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 57e507e68c8..87c732626a6 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -21,12 +21,10 @@
     .controls.hidden-xs
       - if create_mr_button?(@repository.root_ref, branch.name)
         = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-grouped btn-xs' do
-          = icon('plus')
           Merge Request
 
       - if branch.name != @repository.root_ref
         = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-xs', method: :post, title: "Compare" do
-          = icon("exchange")
           Compare
 
       - if can_remove_branch?(@project, branch.name)
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index c72eddba37f..93583c92609 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -7,7 +7,6 @@
   .nav-controls
     - if can?(current_user, :admin_label, @project)
       = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do
-        = icon('plus')
         New label
 
 .labels
diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml
index c53033e367c..6671ee2c6d6 100644
--- a/app/views/projects/project_members/_group_members.html.haml
+++ b/app/views/projects/project_members/_group_members.html.haml
@@ -7,7 +7,6 @@
     - if can?(current_user, :admin_group_member, @group)
       .controls
         = link_to group_group_members_path(@group), class: 'btn' do
-          = icon('pencil-square-o')
           Manage group members
   %ul.content-list
     - members.limit(20).each do |member|
diff --git a/app/views/projects/project_members/_project_member.html.haml b/app/views/projects/project_members/_project_member.html.haml
index 05bf3a7ef6a..1e53b8e37da 100644
--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
@@ -34,7 +34,7 @@
       - if can?(current_user, :update_project_member, member)
         = button_tag class: "btn-xs btn js-toggle-button",
                      title: 'Edit access level', type: 'button' do
-          %i.fa.fa-pencil-square-o
+          = icon('pencil')
 
       - if can?(current_user, :destroy_project_member, member)
         &nbsp;
@@ -44,7 +44,7 @@
             Leave
         - else
           = link_to namespace_project_project_member_path(@project.namespace, @project, member), data: { confirm: remove_from_project_team_message(@project, member) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from team' do
-            %i.fa.fa-minus.fa-inverse
+            = icon('trash')
 
     .edit-member.hide.js-toggle-content
       %br
diff --git a/app/views/shared/_new_project_item_select.html.haml b/app/views/shared/_new_project_item_select.html.haml
index 1c58345278a..51622931e24 100644
--- a/app/views/shared/_new_project_item_select.html.haml
+++ b/app/views/shared/_new_project_item_select.html.haml
@@ -1,8 +1,7 @@
 - if @projects.any?
-  .prepend-left-10.project-item-select-holder
+  .project-item-select-holder
     = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at' }
     %a.btn.btn-new.new-project-item-select-button
-      = icon('plus')
       = local_assigns[:label]
       %b.caret
 

From 13d941e185c3ca1e9ad54c97f878e9cfdd32e5aa Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 8 Jun 2016 16:49:01 +0200
Subject: [PATCH 1292/1431] Make Omniauth providers specs to not modify global
 configuration

---
 CHANGELOG                                         | 1 +
 spec/controllers/import/import_spec_helper.rb     | 2 +-
 spec/lib/gitlab/bitbucket_import/client_spec.rb   | 4 +++-
 spec/lib/gitlab/bitbucket_import/importer_spec.rb | 4 +++-
 spec/lib/gitlab/gitlab_import/client_spec.rb      | 4 +++-
 spec/services/projects/import_service_spec.rb     | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0506854599f..ca312a111fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.9.0 (unreleased)
   - Use downcased path to container repository as this is expected path by Docker
   - Projects pending deletion will render a 404 page
   - Measure queue duration between gitlab-workhorse and Rails
+  - Make Omniauth providers specs to not modify global configuration
   - Make authentication service for Container Registry to be compatible with < Docker 1.11
   - Add Application Setting to configure Container Registry token expire delay (default 5min)
   - Cache assigned issue and merge request counts in sidebar nav
diff --git a/spec/controllers/import/import_spec_helper.rb b/spec/controllers/import/import_spec_helper.rb
index 9d7648e25a7..6710962f082 100644
--- a/spec/controllers/import/import_spec_helper.rb
+++ b/spec/controllers/import/import_spec_helper.rb
@@ -28,6 +28,6 @@ module ImportSpecHelper
       app_id: 'asd123',
       app_secret: 'asd123'
     )
-    Gitlab.config.omniauth.providers << provider
+    allow(Gitlab.config.omniauth).to receive(:providers).and_return([provider])
   end
 end
diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb
index 7718689e6d4..760d66a1488 100644
--- a/spec/lib/gitlab/bitbucket_import/client_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb
@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe Gitlab::BitbucketImport::Client, lib: true do
+  include ImportSpecHelper
+
   let(:token) { '123456' }
   let(:secret) { 'secret' }
   let(:client) { Gitlab::BitbucketImport::Client.new(token, secret) }
 
   before do
-    Gitlab.config.omniauth.providers << OpenStruct.new(app_id: "asd123", app_secret: "asd123", name: "bitbucket")
+    stub_omniauth_provider('bitbucket')
   end
 
   it 'all OAuth client options are symbols' do
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
index 1a833f255a5..aa00f32becb 100644
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 describe Gitlab::BitbucketImport::Importer, lib: true do
+  include ImportSpecHelper
+
   before do
-    Gitlab.config.omniauth.providers << OpenStruct.new(app_id: "asd123", app_secret: "asd123", name: "bitbucket")
+    stub_omniauth_provider('bitbucket')
   end
 
   let(:statuses) do
diff --git a/spec/lib/gitlab/gitlab_import/client_spec.rb b/spec/lib/gitlab/gitlab_import/client_spec.rb
index e6831e7c383..cd8e805466a 100644
--- a/spec/lib/gitlab/gitlab_import/client_spec.rb
+++ b/spec/lib/gitlab/gitlab_import/client_spec.rb
@@ -1,11 +1,13 @@
 require 'spec_helper'
 
 describe Gitlab::GitlabImport::Client, lib: true do
+  include ImportSpecHelper
+
   let(:token) { '123456' }
   let(:client) { Gitlab::GitlabImport::Client.new(token) }
 
   before do
-    Gitlab.config.omniauth.providers << OpenStruct.new(app_id: "asd123", app_secret: "asd123", name: "gitlab")
+    stub_omniauth_provider('gitlab')
   end
 
   it 'all OAuth2 client options are symbols' do
diff --git a/spec/services/projects/import_service_spec.rb b/spec/services/projects/import_service_spec.rb
index 9d90bfceb73..068c9a1219c 100644
--- a/spec/services/projects/import_service_spec.rb
+++ b/spec/services/projects/import_service_spec.rb
@@ -124,7 +124,7 @@ describe Projects::ImportService, services: true do
         }
       )
 
-      Gitlab.config.omniauth.providers << provider
+      allow(Gitlab.config.omniauth).to receive(:providers).and_return([provider])
     end
   end
 end

From cd36f293991e05323fe90cfdfb31f8315d0d7445 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 18:06:28 +0300
Subject: [PATCH 1293/1431] Improve button margin for btn-grouped css class

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/buttons.scss | 42 +++++++++----------
 .../group_members/_group_member.html.haml     |  2 +-
 .../project_members/_project_member.html.haml |  2 +-
 .../shared/milestones/_milestone.html.haml    |  8 ++--
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 625200cbcad..1e3083cce55 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -79,6 +79,23 @@
   @include btn-color($white-light, $border-color, $white-normal, $border-white-normal, $white-dark, $border-white-dark, $btn-white-active);
 }
 
+@mixin btn-with-margin {
+  margin-left: $btn-side-margin;
+  float: left;
+
+  &.inline {
+    float: none;
+  }
+
+  &.btn-sm {
+    margin-left: $btn-sm-side-margin;
+  }
+
+  &.btn-xs {
+    margin-left: $btn-xs-side-margin;
+  }
+}
+
 .btn {
   @include btn-default;
   @include btn-white;
@@ -142,24 +159,7 @@
   }
 
   &.btn-grouped {
-    margin-right: $btn-side-margin;
-    float: left;
-
-    &.inline {
-      float: none;
-    }
-
-    &:last-child {
-      margin-right: 0;
-    }
-
-    &.btn-sm {
-      margin-right: $btn-sm-side-margin;
-    }
-
-    &.btn-xs {
-      margin-right: $btn-xs-side-margin;
-    }
+    @include btn-with-margin;
   }
 
   &.disabled {
@@ -203,11 +203,7 @@
 
 .btn-group {
   &.btn-grouped {
-    margin-right: 7px;
-    float: left;
-    &:last-child {
-      margin-right: 0;
-    }
+    @include btn-with-margin;
   }
 }
 
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index 271700e6db4..6bb542e658d 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -34,7 +34,7 @@
       %strong.member-access-level= member.human_access
       - if show_controls
         - if can?(current_user, :update_group_member, member)
-          = button_tag class: "btn-xs btn js-toggle-button",
+          = button_tag class: "btn-xs btn btn-grouped inline js-toggle-button",
                        title: 'Edit access level', type: 'button' do
             = icon('pencil')
 
diff --git a/app/views/projects/project_members/_project_member.html.haml b/app/views/projects/project_members/_project_member.html.haml
index 1e53b8e37da..268f140d7db 100644
--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
@@ -32,7 +32,7 @@
     .pull-right
       %strong= member.human_access
       - if can?(current_user, :update_project_member, member)
-        = button_tag class: "btn-xs btn js-toggle-button",
+        = button_tag class: "btn-xs btn-grouped inline btn js-toggle-button",
                      title: 'Edit access level', type: 'button' do
           = icon('pencil')
 
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 6b25745c554..acc3ccf4dcf 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -35,11 +35,9 @@
       .col-sm-6= render('shared/milestone_expired', milestone: milestone)
       .col-sm-6
         - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
-          = link_to edit_namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), class: "btn btn-xs" do
-            = icon('pencil-square-o')
+          = link_to edit_namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), class: "btn btn-xs btn-grouped" do
             Edit
           \
-          = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close"
-          = link_to namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-xs btn-remove" do
-            = icon('trash-o')
+          = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close btn-grouped"
+          = link_to namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-xs btn-remove btn-grouped" do
             Delete

From 81dfabad393fbd22417e649a87820623d0284bbe Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 18 May 2016 15:28:46 -0500
Subject: [PATCH 1294/1431] Added when to artifacts

---
 CHANGELOG                                    |  1 +
 lib/ci/gitlab_ci_yaml_processor.rb           | 24 ++++++++++++++++++++
 spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 23 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0506854599f..da9f561208e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ v 8.9.0 (unreleased)
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Fix issues filter when ordering by milestone
+  - Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels
   - Add support for using Yubikeys (U2F) for two-factor authentication
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 130f5b0892e..15d57a46eb0 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -8,6 +8,8 @@ module Ci
     ALLOWED_JOB_KEYS = [:tags, :script, :only, :except, :type, :image, :services,
                         :allow_failure, :type, :stage, :when, :artifacts, :cache,
                         :dependencies, :before_script, :after_script, :variables]
+    ALLOWED_CACHE_KEYS = [:key, :untracked, :paths]
+    ALLOWED_ARTIFACTS_KEYS = [:name, :untracked, :paths, :when]
 
     attr_reader :before_script, :after_script, :image, :services, :path, :cache
 
@@ -135,6 +137,12 @@ module Ci
     end
 
     def validate_global_cache!
+      @cache.keys.each do |key|
+        unless ALLOWED_CACHE_KEYS.include? key
+          raise ValidationError, "#{name} cache unknown parameter #{key}"
+        end
+      end
+
       if @cache[:key] && !validate_string(@cache[:key])
         raise ValidationError, "cache:key parameter should be a string"
       end
@@ -233,6 +241,12 @@ module Ci
     end
 
     def validate_job_cache!(name, job)
+      job[:cache].keys.each do |key|
+        unless ALLOWED_CACHE_KEYS.include? key
+          raise ValidationError, "#{name} job: cache unknown parameter #{key}"
+        end
+      end
+
       if job[:cache][:key] && !validate_string(job[:cache][:key])
         raise ValidationError, "#{name} job: cache:key parameter should be a string"
       end
@@ -247,6 +261,12 @@ module Ci
     end
 
     def validate_job_artifacts!(name, job)
+      job[:artifacts].keys.each do |key|
+        unless ALLOWED_ARTIFACTS_KEYS.include? key
+          raise ValidationError, "#{name} job: artifacts unknown parameter #{key}"
+        end
+      end
+
       if job[:artifacts][:name] && !validate_string(job[:artifacts][:name])
         raise ValidationError, "#{name} job: artifacts:name parameter should be a string"
       end
@@ -258,6 +278,10 @@ module Ci
       if job[:artifacts][:paths] && !validate_array_of_strings(job[:artifacts][:paths])
         raise ValidationError, "#{name} job: artifacts:paths parameter should be an array of strings"
       end
+
+      if job[:artifacts][:when] && !job[:artifacts][:when].in?(%w(on_success on_failure always))
+        raise ValidationError, "#{name} job: artifacts:when parameter should be on_success, on_failure or always"
+      end
     end
 
     def validate_job_dependencies!(name, job)
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 7375539cf17..3d3715f0ef0 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -601,6 +601,22 @@ module Ci
           allow_failure: false
         })
       end
+
+      %w(on_success on_failure always).each do |when_state|
+        it "returns artifacts for when #{when_state}  defined" do
+          config = YAML.dump({
+                               rspec: {
+                                 script: "rspec",
+                                 artifacts: { paths: ["logs/", "binaries/"], when: when_state }
+                               }
+                             })
+
+          config_processor = GitlabCiYamlProcessor.new(config, path)
+          builds = config_processor.builds_for_stage_and_ref("test", "master")
+          expect(builds.size).to eq(1)
+          expect(builds.first[:options][:artifacts][:when]).to eq(when_state)
+        end
+      end
     end
 
     describe "Dependencies" do
@@ -967,6 +983,13 @@ EOT
         end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: artifacts:name parameter should be a string")
       end
 
+      it "returns errors if job artifacts:when is not an a predefined value" do
+        config = YAML.dump({ types: ["build", "test"], rspec: { script: "test", artifacts: { when: 1 } } })
+        expect do
+          GitlabCiYamlProcessor.new(config)
+        end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: artifacts:when parameter should be on_success, on_failure or always")
+      end
+
       it "returns errors if job artifacts:untracked is not an array of strings" do
         config = YAML.dump({ types: ["build", "test"], rspec: { script: "test", artifacts: { untracked: "string" } } })
         expect do

From c5e6292e5f9cdb71b785b00a0140e82528e095c7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 18:14:20 +0300
Subject: [PATCH 1295/1431] Use default button size in the content list
 controls

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/lists.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 96e7aa4fb15..dec327669ec 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -138,7 +138,9 @@ ul.content-list {
       float: right;
 
       .btn {
-        padding: 10px 14px;
+        padding: $gl-vert-padding $gl-btn-padding;
+        margin-top: 4px;
+        margin-bottom: 4px;
       }
     }
 

From 480d74685dff61fdbcf3034224fa201d60181445 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 8 Jun 2016 18:18:54 +0300
Subject: [PATCH 1296/1431] Use title attribute instead of data-original-title.

---
 app/assets/javascripts/milestone_select.js.coffee | 4 ++--
 app/views/shared/issuable/_sidebar.html.haml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index a5c5a349f10..df6ba3167db 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -25,7 +25,7 @@ class @MilestoneSelect
       if issueUpdateURL
         milestoneLinkTemplate = _.template(
           '<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
-            <span class="has-tooltip" data-container="body" data-original-title="<%= remaining %>">
+            <span class="has-tooltip" data-container="body" data-title="<%= remaining %>">
               <%= _.escape(title) %>
             </span>
           </a>'
@@ -34,7 +34,7 @@ class @MilestoneSelect
         milestoneLinkNoneTemplate = '<div class="light">None</div>'
 
         collapsedSidebarLabelTemplate = _.template(
-          '<span class="has-tooltip" data-container="body" data-original-title="<%= remaining %>" data-placement="left">
+          '<span class="has-tooltip" data-container="body" data-title="<%= remaining %>" data-placement="left">
             <%= _.escape(title) %>
           </span>'
         )
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index dafd11b90da..8cfda130836 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -56,7 +56,7 @@
           = icon('clock-o')
           %span
             - if issuable.milestone
-              %span.has-tooltip{"data-container" => "body", "data-placement" => "left", "data-original-title" => milestone_remaining_days(issuable.milestone, false)}
+              %span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1, placement: 'left'}}
                 = issuable.milestone.title
             - else
               None
@@ -68,7 +68,7 @@
         .value.bold.hide-collapsed
           - if issuable.milestone
             = link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do
-              %span.has-tooltip{"data-container" => "body", "data-original-title" => milestone_remaining_days(issuable.milestone, false)}
+              %span.has-tooltip{ "title" => milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1 } }
                 = issuable.milestone.title
           - else
             .light None

From b868b814167564176bc6a08d01170e6a43c97fc4 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 8 Jun 2016 18:19:04 +0300
Subject: [PATCH 1297/1431] Revert milestone_remaining_days helper.

---
 app/helpers/milestones_helper.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index f6a8ae3fd63..87fc2db6901 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -54,18 +54,13 @@ module MilestonesHelper
     end
   end
 
-  def milestone_remaining_days(milestone, withContentTag = true)
+  def milestone_remaining_days(milestone)
     if milestone.expired?
-      withContentTag ? content_tag(:strong, 'expired') : 'expired'
+      content_tag(:strong, 'expired')
     elsif milestone.due_date
-      days = milestone.remaining_days
-
-      if withContentTag
-        content = content_tag(:strong, days)
-        content << " #{'day'.pluralize(days)} remaining"
-      else
-        "#{days} #{'day'.pluralize(days)} remaining"
-      end
+      days    = milestone.remaining_days
+      content = content_tag(:strong, days)
+      content << " #{'day'.pluralize(days)} remaining"
     end
   end
 end

From 9560639e817147064e3929243668e49336a4f3f5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 8 Jun 2016 17:21:08 +0200
Subject: [PATCH 1298/1431] Move ImportSpecHelper to spec/support/

---
 spec/{controllers/import => support}/import_spec_helper.rb | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/{controllers/import => support}/import_spec_helper.rb (100%)

diff --git a/spec/controllers/import/import_spec_helper.rb b/spec/support/import_spec_helper.rb
similarity index 100%
rename from spec/controllers/import/import_spec_helper.rb
rename to spec/support/import_spec_helper.rb

From 7d3dae2309025c796bdbdcec9ab2b0f5965ff166 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 18:23:45 +0300
Subject: [PATCH 1299/1431] Use responsive top-area on project branches and
 tags pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/branches/index.html.haml | 47 ++++++++++-----------
 app/views/projects/tags/index.html.haml     | 14 +++---
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 0d59c3884cd..e0367c40272 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -3,31 +3,30 @@
 = render "projects/commits/head"
 
 %div{ class: (container_class) }
-  .row-content-block.second-block.content-component-block
-    .pull-right
-      - if can? current_user, :push_code, @project
-        = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
-          = icon('plus')
-          New branch
-        &nbsp;
-      .dropdown.inline
-        %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
-          %span.light
-          - if @sort.present?
-            = @sort.humanize
-          - else
-            Name
-          %b.caret
-        %ul.dropdown-menu.dropdown-menu-align-right
-          %li
-            = link_to namespace_project_branches_path(sort: nil) do
-              Name
-            = link_to namespace_project_branches_path(sort: 'recently_updated') do
-              = sort_title_recently_updated
-            = link_to namespace_project_branches_path(sort: 'last_updated') do
-              = sort_title_oldest_updated
-    .oneline
+  .top-area
+    .nav-text
       Protected branches can be managed in project settings
+
+    - if can? current_user, :push_code, @project
+      .nav-controls
+        = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
+          New branch
+        .dropdown.inline
+          %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+            %span.light
+            - if @sort.present?
+              = @sort.humanize
+            - else
+              Name
+            %b.caret
+          %ul.dropdown-menu.dropdown-menu-align-right
+            %li
+              = link_to namespace_project_branches_path(sort: nil) do
+                Name
+              = link_to namespace_project_branches_path(sort: 'recently_updated') do
+                = sort_title_recently_updated
+              = link_to namespace_project_branches_path(sort: 'last_updated') do
+                = sort_title_oldest_updated
   - unless @branches.empty?
     %ul.content-list.all-branches
       - @branches.each do |branch|
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 9ff805a8989..2779084fe38 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -3,15 +3,15 @@
 = render "projects/commits/head"
 
 %div{ class: (container_class) }
-  .row-content-block.second-block.content-component-block
-    - if can? current_user, :push_code, @project
-      .pull-right
-        = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
-          = icon('plus')
-          New tag
-    .oneline
+  .top-area
+    .nav-text
       Tags give the ability to mark specific points in history as being important
 
+    - if can? current_user, :push_code, @project
+      .nav-controls
+        = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
+          New tag
+
   .tags
     - unless @tags.empty?
       %ul.content-list

From 4f5ee68f09672d08a4e3997a771e062f56665dab Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 8 Jun 2016 18:41:03 +0300
Subject: [PATCH 1300/1431] Copy changes for milestone due dates.

---
 app/assets/javascripts/lib/common_utils.js.coffee | 2 +-
 app/helpers/milestones_helper.rb                  | 2 +-
 app/views/projects/milestones/show.html.haml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee
index a7cc07608ab..0000e99a650 100644
--- a/app/assets/javascripts/lib/common_utils.js.coffee
+++ b/app/assets/javascripts/lib/common_utils.js.coffee
@@ -5,7 +5,7 @@
     return '' unless time
 
     suffix       or= 'remaining'
-    expiredLabel or= 'expired'
+    expiredLabel or= 'Past due'
 
     jQuery.timeago.settings.allowFuture = yes
 
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 87fc2db6901..e28ca13ec23 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -56,7 +56,7 @@ module MilestonesHelper
 
   def milestone_remaining_days(milestone)
     if milestone.expired?
-      content_tag(:strong, 'expired')
+      content_tag(:strong, 'Past Due')
     elsif milestone.due_date
       days    = milestone.remaining_days
       content = content_tag(:strong, days)
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 19944e3e023..58b1f8f664f 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -6,7 +6,7 @@
     - if @milestone.closed?
       Closed
     - elsif @milestone.expired?
-      Expired
+      Past Due
     - else
       Open
   %span.identifier

From 83e1274145792fbfb09557a2a202843129edf483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Wed, 8 Jun 2016 12:05:23 -0400
Subject: [PATCH 1301/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 0506854599f..657c6f48334 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,7 @@ v 8.9.0 (unreleased)
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
   - An indicator is now displayed at the top of the comment field for confidential issues.
   - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
+  - Improve issuables APIs performance when accessing notes !4471
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds

From a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 8 Jun 2016 18:18:49 +0200
Subject: [PATCH 1302/1431] Remove require_relative 'import_spec_helper'

---
 spec/controllers/import/bitbucket_controller_spec.rb   | 1 -
 spec/controllers/import/fogbugz_controller_spec.rb     | 1 -
 spec/controllers/import/github_controller_spec.rb      | 1 -
 spec/controllers/import/gitlab_controller_spec.rb      | 1 -
 spec/controllers/import/gitorious_controller_spec.rb   | 1 -
 spec/controllers/import/google_code_controller_spec.rb | 1 -
 6 files changed, 6 deletions(-)

diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb
index 81c03c9059b..07bf8d2d1c3 100644
--- a/spec/controllers/import/bitbucket_controller_spec.rb
+++ b/spec/controllers/import/bitbucket_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require_relative 'import_spec_helper'
 
 describe Import::BitbucketController do
   include ImportSpecHelper
diff --git a/spec/controllers/import/fogbugz_controller_spec.rb b/spec/controllers/import/fogbugz_controller_spec.rb
index 27b11267d2a..5f0f6dea821 100644
--- a/spec/controllers/import/fogbugz_controller_spec.rb
+++ b/spec/controllers/import/fogbugz_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require_relative 'import_spec_helper'
 
 describe Import::FogbugzController do
   include ImportSpecHelper
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb
index bcc713dce2a..c55a3c28208 100644
--- a/spec/controllers/import/github_controller_spec.rb
+++ b/spec/controllers/import/github_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require_relative 'import_spec_helper'
 
 describe Import::GithubController do
   include ImportSpecHelper
diff --git a/spec/controllers/import/gitlab_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb
index 198d006af76..e8cf6aa7767 100644
--- a/spec/controllers/import/gitlab_controller_spec.rb
+++ b/spec/controllers/import/gitlab_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require_relative 'import_spec_helper'
 
 describe Import::GitlabController do
   include ImportSpecHelper
diff --git a/spec/controllers/import/gitorious_controller_spec.rb b/spec/controllers/import/gitorious_controller_spec.rb
index 7cb1b85a46d..4ae2b78e11c 100644
--- a/spec/controllers/import/gitorious_controller_spec.rb
+++ b/spec/controllers/import/gitorious_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require_relative 'import_spec_helper'
 
 describe Import::GitoriousController do
   include ImportSpecHelper
diff --git a/spec/controllers/import/google_code_controller_spec.rb b/spec/controllers/import/google_code_controller_spec.rb
index 66088139a69..4241db6e771 100644
--- a/spec/controllers/import/google_code_controller_spec.rb
+++ b/spec/controllers/import/google_code_controller_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-require_relative 'import_spec_helper'
 
 describe Import::GoogleCodeController do
   include ImportSpecHelper

From 477c113c47717535365f7c22027234a20833a760 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 20:44:39 +0300
Subject: [PATCH 1303/1431] Improve buttons size and paddings in the lists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/lists.scss     | 10 ++++++++--
 app/assets/stylesheets/framework/variables.scss |  4 ++--
 app/views/projects/tags/_download.html.haml     |  7 ++-----
 app/views/projects/tags/_tag.html.haml          |  4 ++--
 app/views/shared/groups/_group.html.haml        |  6 +++---
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index dec327669ec..b34ec16cdba 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -137,10 +137,16 @@ ul.content-list {
       padding-top: 1px;
       float: right;
 
-      .btn {
-        padding: $gl-vert-padding $gl-btn-padding;
+      > .btn,
+      > .btn-group {
+        margin-right: $gl-padding-top;
+        display: inline-block;
         margin-top: 4px;
         margin-bottom: 4px;
+
+        &:last-child {
+          margin-right: 0;
+        }
       }
     }
 
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index d8ea07559ab..9a85dedc090 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -79,8 +79,8 @@ $provider-btn-not-active-color: #4688f1;
 $link-underline-blue: #4a8bee;
 $layout-link-gray: #7e7c7c;
 $todo-alert-blue: #428bca;
-$btn-side-margin: 7px;
-$btn-sm-side-margin: 5px;
+$btn-side-margin: 10px;
+$btn-sm-side-margin: 7px;
 $btn-xs-side-margin: 5px;
 
 /*
diff --git a/app/views/projects/tags/_download.html.haml b/app/views/projects/tags/_download.html.haml
index 093d1d1bb0f..8a11dbfa9f4 100644
--- a/app/views/projects/tags/_download.html.haml
+++ b/app/views/projects/tags/_download.html.haml
@@ -1,7 +1,6 @@
-%span.btn-group.btn-grouped
+%span.btn-group
   = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), class: 'btn btn-default', rel: 'nofollow' do
-    %i.fa.fa-download
-    %span source code
+    %span Source code
   %a.btn.btn-default.dropdown-toggle{ 'data-toggle' => 'dropdown' }
     %span.caret
     %span.sr-only
@@ -9,9 +8,7 @@
   %ul.dropdown-menu.dropdown-menu-align-right{ role: 'menu' }
     %li
       = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow' do
-        %i.fa.fa-download
         %span Download zip
     %li
       = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
-        %i.fa.fa-download
         %span Download tar.gz
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index dbc35c16feb..844e1055810 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -15,11 +15,11 @@
         = render 'projects/tags/download', ref: tag.name, project: @project
 
       - if can?(current_user, :push_code, @project)
-        = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, tag.name), class: 'btn-grouped btn has-tooltip', title: "Edit release notes" do
+        = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, tag.name), class: 'btn has-tooltip', title: "Edit release notes" do
           = icon("pencil")
 
       - if can?(current_user, :admin_project, @project)
-        = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'btn btn-grouped btn-xs btn-remove remove-row has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{tag.name}' tag cannot be undone. Are you sure?", container: 'body' }, remote: true do
+        = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'btn btn-remove remove-row has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{tag.name}' tag cannot be undone. Are you sure?", container: 'body' }, remote: true do
           = icon("trash-o")
 
   - if commit
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index 40c6eb9be45..a25365a94f2 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -6,10 +6,10 @@
   - if group_member
     .controls.hidden-xs
       - if can?(current_user, :admin_group, group)
-        = link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
-          %i.fa.fa-cogs
+        = link_to edit_group_path(group), class: "btn" do
+          = icon('cogs')
 
-      = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do
+      = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn", title: 'Leave this group' do
         = icon('sign-out')
 
   .stats

From f3637ed782dace291473f56967c26bde42dd9bf9 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 5 May 2016 12:00:40 -0500
Subject: [PATCH 1304/1431] Start adding SVG icons

---
 app/assets/stylesheets/framework/sidebar.scss |  8 ++++
 app/helpers/appearances_helper.rb             |  4 ++
 app/views/layouts/nav/_dashboard.html.haml    | 20 ++++++++
 app/views/shared/icons/_activity.svg          | 18 +++++++
 .../shared/icons/_contributionanalytics.svg   | 27 +++++++++++
 app/views/shared/icons/_group.svg             | 42 ++++++++++++++++
 app/views/shared/icons/_issues.svg            | 38 +++++++++++++++
 app/views/shared/icons/_members.svg           | 17 +++++++
 app/views/shared/icons/_milestones.svg        | 48 +++++++++++++++++++
 app/views/shared/icons/_mr.svg                | 47 ++++++++++++++++++
 10 files changed, 269 insertions(+)
 create mode 100644 app/views/shared/icons/_activity.svg
 create mode 100644 app/views/shared/icons/_contributionanalytics.svg
 create mode 100644 app/views/shared/icons/_group.svg
 create mode 100644 app/views/shared/icons/_issues.svg
 create mode 100644 app/views/shared/icons/_members.svg
 create mode 100644 app/views/shared/icons/_milestones.svg
 create mode 100644 app/views/shared/icons/_mr.svg

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 46d46368d25..fa9cddef0ad 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -113,6 +113,14 @@
         color: $gray-light;
       }
 
+      path {
+        fill: $gray-light;
+      }
+
+      svg {
+        margin-right: 13px;
+      }
+
       .nav-link-text {
         margin-top: 3px;
         font-size: 13px;
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index e0abc3a2869..f240584ccbf 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -30,4 +30,8 @@ module AppearancesHelper
       render 'shared/logo.svg'
     end
   end
+
+  def navbar_icon(icon_name)
+    render "shared/icons/#{icon_name}.svg"
+  end
 end
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index df77d9cf83e..30729810687 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -11,6 +11,7 @@
         Todos
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
+<<<<<<< e6daf1f899b412ded9a16674865b09f31fc7c75a
       = icon('dashboard fw')
       .nav-link-text
         Activity
@@ -28,6 +29,25 @@
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = icon('exclamation-circle fw')
       .nav-link-text
+=======
+      = navbar_icon('activity')
+      %span
+        Activity
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
+    = link_to dashboard_groups_path, title: 'Groups' do
+      = navbar_icon('group')
+      %span
+        Groups
+  = nav_link(controller: 'dashboard/milestones') do
+    = link_to dashboard_milestones_path, title: 'Milestones' do
+      = navbar_icon('milestones')
+      %span
+        Milestones
+  = nav_link(path: 'dashboard#issues') do
+    = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
+      = navbar_icon('issues')
+      %span
+>>>>>>> Start adding SVG icons
         Issues
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
diff --git a/app/views/shared/icons/_activity.svg b/app/views/shared/icons/_activity.svg
new file mode 100644
index 00000000000..69e5afd3a4c
--- /dev/null
+++ b/app/views/shared/icons/_activity.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Group 5</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M5,0 C4.448,0 4,0.448 4,1 L4,3 L1,3 C0.448,3 0,3.448 0,4 L0,9 C0,9.552 0.448,10 1,10 L5,10 L5,8 L11,8 L11,10 L15,10 C15.552,10 16,9.552 16,9 L16,4 C16,3.448 15.552,3 15,3 L12,3 L12,1 C12,0.448 11.552,0 11,0 L5,0 L5,0 Z M6,2.5 C6,2.224 6.224,2 6.5,2 L9.5,2 C9.776,2 10,2.224 10,2.5 C10,2.776 9.776,3 9.5,3 L6.5,3 C6.224,3 6,2.776 6,2.5 L6,2.5 Z M6,11 L10.001,11 L10.001,9 L6,9 L6,11 L6,11 Z M11,11 L11,12 L5,12 L5,11 L1,11 C0.448,11 0,11.448 0,12 L0,15 C0,15.552 0.448,16 1,16 L15,16 C15.552,16 16,15.552 16,15 L16,12 C16,11.448 15.552,11 15,11 L11,11 L11,11 Z" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-5">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <g id="Clip-4"></g>
+            <polygon id="Fill-3" fill="#7E7C7C" mask="url(#mask-2)" points="-5 21 21 21 21 -5 -5 -5"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_contributionanalytics.svg b/app/views/shared/icons/_contributionanalytics.svg
new file mode 100644
index 00000000000..33edf0f9320
--- /dev/null
+++ b/app/views/shared/icons/_contributionanalytics.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 234</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 C3.581,0 0,3.581 0,8 L0,8 Z M2,8 C2,4.692 4.692,2 8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 L2,8 Z" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-234">
+            <path d="M8,0 C3.581,0 0,3.581 0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 M8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 C2,4.692 4.692,2 8,2" id="Fill-1" fill="#7E7C7C"></path>
+            <g id="Group-5">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="Clip-4"></g>
+            </g>
+            <g id="Group-16" transform="translate(1.000000, 5.000000)">
+                <polyline id="Stroke-6" stroke="#7E7C7C" points="0.7188 4.4688 5.1558 1.1248 8.8958 5.0838 13.6878 0.6878"></polyline>
+                <path d="M6.0313,1.3928 C6.0313,1.9448 5.5833,2.3928 5.0313,2.3928 C4.4793,2.3928 4.0313,1.9448 4.0313,1.3928 C4.0313,0.8408 4.4793,0.3928 5.0313,0.3928 C5.5833,0.3928 6.0313,0.8408 6.0313,1.3928" id="Fill-8" fill="#FEFEFE"></path>
+                <path d="M6.0313,1.3928 C6.0313,1.9448 5.5833,2.3928 5.0313,2.3928 C4.4793,2.3928 4.0313,1.9448 4.0313,1.3928 C4.0313,0.8408 4.4793,0.3928 5.0313,0.3928 C5.5833,0.3928 6.0313,0.8408 6.0313,1.3928 L6.0313,1.3928 Z" id="Stroke-10" stroke="#7E7C7C"></path>
+                <path d="M9.8854,4.8715 C9.8854,5.4235 9.4374,5.8715 8.8854,5.8715 C8.3334,5.8715 7.8854,5.4235 7.8854,4.8715 C7.8854,4.3195 8.3334,3.8715 8.8854,3.8715 C9.4374,3.8715 9.8854,4.3195 9.8854,4.8715" id="Fill-12" fill="#FEFEFE"></path>
+                <path d="M9.8854,4.8715 C9.8854,5.4235 9.4374,5.8715 8.8854,5.8715 C8.3334,5.8715 7.8854,5.4235 7.8854,4.8715 C7.8854,4.3195 8.3334,3.8715 8.8854,3.8715 C9.4374,3.8715 9.8854,4.3195 9.8854,4.8715 L9.8854,4.8715 Z" id="Stroke-14" stroke="#7E7C7C"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_group.svg b/app/views/shared/icons/_group.svg
new file mode 100644
index 00000000000..6f2c530c9ba
--- /dev/null
+++ b/app/views/shared/icons/_group.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 232</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <polygon id="path-1" points="5.9997 6 0 6 0 0.0221 5.9997 0.0221 5.9997 6"></polygon>
+        <polygon id="path-3" points="-0.0003 6 5.9997 6 5.9997 0.0221 -0.0003 0.0221"></polygon>
+        <polygon id="path-5" points="7.9997 0.012 -0.0003 0.012 -0.0003 6.9896 7.9997 6.9896 7.9997 0.012"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-232" transform="translate(0.000000, -1.000000)">
+            <path d="M12.5,9.5834 L3.5,9.5834" id="Stroke-1" stroke="#303030" stroke-width="2"></path>
+            <path d="M8,10.0834 L8,6.0834" id="Stroke-3" stroke="#303030" stroke-width="2"></path>
+            <g id="Group-17" transform="translate(0.000000, 0.988400)">
+                <path d="M3,11.095 L3,7.595" id="Stroke-4" stroke="#303030" stroke-width="2"></path>
+                <path d="M13,11.095 L13,7.595" id="Stroke-6" stroke="#303030" stroke-width="2"></path>
+                <g id="Group-10" transform="translate(0.000000, 10.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Clip-9"></g>
+                    <path d="M5.6667,0.0221 L0.3337,0.0221 C0.1497,0.0221 -0.0003,0.1891 -0.0003,0.3961 L-0.0003,5.6261 C-0.0003,5.8331 0.1497,6.0001 0.3337,6.0001 L5.6667,6.0001 C5.8507,6.0001 5.9997,5.8331 5.9997,5.6261 L5.9997,0.3961 C5.9997,0.1891 5.8507,0.0221 5.6667,0.0221 L5.6667,0.0221 Z M1.9997,4.0221 L3.9997,4.0221 L3.9997,2.0221 L1.9997,2.0221 L1.9997,4.0221 Z" id="Fill-8" fill="#303030" mask="url(#mask-2)"></path>
+                </g>
+                <g id="Group-13" transform="translate(10.000000, 10.000000)">
+                    <mask id="mask-4" fill="white">
+                        <use xlink:href="#path-3"></use>
+                    </mask>
+                    <g id="Clip-12"></g>
+                    <path d="M5.6667,0.0221 L0.3337,0.0221 C0.1497,0.0221 -0.0003,0.1891 -0.0003,0.3961 L-0.0003,5.6261 C-0.0003,5.8331 0.1497,6.0001 0.3337,6.0001 L5.6667,6.0001 C5.8507,6.0001 5.9997,5.8331 5.9997,5.6261 L5.9997,0.3961 C5.9997,0.1891 5.8507,0.0221 5.6667,0.0221 L5.6667,0.0221 Z M1.9997,4.0221 L3.9997,4.0221 L3.9997,2.0221 L1.9997,2.0221 L1.9997,4.0221 Z" id="Fill-11" fill="#303030" mask="url(#mask-4)"></path>
+                </g>
+                <g id="Group-16" transform="translate(4.000000, 0.000000)">
+                    <mask id="mask-6" fill="white">
+                        <use xlink:href="#path-5"></use>
+                    </mask>
+                    <g id="Clip-15"></g>
+                    <path d="M7.6667,0.0116 L0.3337,0.0116 C0.1497,0.0116 -0.0003,0.1786 -0.0003,0.3856 L-0.0003,6.6156 C-0.0003,6.8226 0.1497,6.9896 0.3337,6.9896 L7.6667,6.9896 C7.8507,6.9896 7.9997,6.8226 7.9997,6.6156 L7.9997,0.3856 C7.9997,0.1786 7.8507,0.0116 7.6667,0.0116 L7.6667,0.0116 Z M1.9997,5.0116 L5.9997,5.0116 L5.9997,2.0116 L1.9997,2.0116 L1.9997,5.0116 Z" id="Fill-14" fill="#303030" mask="url(#mask-6)"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_issues.svg b/app/views/shared/icons/_issues.svg
new file mode 100644
index 00000000000..92f48b897b2
--- /dev/null
+++ b/app/views/shared/icons/_issues.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 227</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 C3.581,0 0,3.581 0,8 L0,8 Z M2,8 C2,4.692 4.692,2 8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 L2,8 Z" id="path-1"></path>
+        <polygon id="path-3" points="0.16 0 0.11 4 1.889 4 1.889 0"></polygon>
+        <polygon id="path-5" points="0.16 0.666 0.11 2.445 1.889 2.445 1.889 0.666"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-227">
+            <path d="M8,0 C3.581,0 0,3.581 0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 M8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 C2,4.692 4.692,2 8,2" id="Fill-1" fill="#7E7C7C"></path>
+            <g id="Group-5">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="Clip-4"></g>
+            </g>
+            <polygon id="Fill-6" fill="#7E7C7C" points="7.1597 4 8.8887 4 8.8887 8 7.1107 8"></polygon>
+            <g id="Group-10" transform="translate(7.000000, 4.000000)">
+                <mask id="mask-4" fill="white">
+                    <use xlink:href="#path-3"></use>
+                </mask>
+                <g id="Clip-9"></g>
+                <polygon id="Fill-8" fill="#7E7C7C" mask="url(#mask-4)" points="-4.889 9 6.889 9 6.889 -5 -4.889 -5"></polygon>
+            </g>
+            <polygon id="Fill-11" fill="#7E7C7C" points="7.1597 9.6667 8.8887 9.6667 8.8887 11.4447 7.1107 11.4447"></polygon>
+            <g id="Group-15" transform="translate(7.000000, 9.000000)">
+                <mask id="mask-6" fill="white">
+                    <use xlink:href="#path-5"></use>
+                </mask>
+                <g id="Clip-14"></g>
+                <polygon id="Fill-13" fill="#7E7C7C" mask="url(#mask-6)" points="-4.889 7.445 6.889 7.445 6.889 -4.333 -4.889 -4.333"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_members.svg b/app/views/shared/icons/_members.svg
new file mode 100644
index 00000000000..98635108d0f
--- /dev/null
+++ b/app/views/shared/icons/_members.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="22px" height="16px" viewBox="0 0 22 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 233</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-233" fill="#7E7C7C">
+            <g id="Group-3" transform="translate(0.000000, 2.000000)">
+                <path d="M6.4357,9.8588 C7.1487,9.2798 7.8797,8.7808 8.5357,8.3708 C8.5837,8.3008 8.6187,8.2338 8.6187,8.1768 L8.6187,6.8088 C8.9197,6.5218 9.0927,6.1248 9.0927,5.7028 L9.0927,3.3748 C9.0927,1.9478 7.9187,0.7858 6.4757,0.7858 L5.9687,0.7858 C4.5247,0.7858 3.3507,1.9478 3.3507,3.3748 L3.3507,5.7028 C3.3507,6.1248 3.5247,6.5218 3.8247,6.8088 L3.8247,8.5838 C3.2537,8.8738 1.8797,9.6198 0.5967,10.6618 C0.2177,10.9698 -0.0003,11.4258 -0.0003,11.9138 L-0.0003,13.5088 C-0.0003,13.5438 0.0857,13.7668 0.3467,13.7778 C1.3257,13.8198 3.8417,13.8328 5.9617,13.9038 C5.8337,13.8148 5.7447,13.6748 5.7447,13.5088 L5.7447,11.5498 C5.7447,10.9848 5.9967,10.2158 6.4357,9.8588" id="Fill-1"></path>
+            </g>
+            <g id="Group-6" transform="translate(6.000000, 0.000000)">
+                <path d="M15.3092,12.1 C13.6932,10.787 11.9592,9.86 11.3042,9.53 L11.3042,7.235 C11.6722,6.9 11.8862,6.428 11.8862,5.925 L11.8862,3.066 C11.8862,1.376 10.4952,0 8.7852,0 L8.1632,0 C6.4532,0 5.0622,1.376 5.0622,3.066 L5.0622,5.925 C5.0622,6.428 5.2752,6.9 5.6442,7.235 L5.6442,9.53 C4.9892,9.86 3.2542,10.787 1.6392,12.1 C1.2002,12.457 0.9482,12.985 0.9482,13.55 L0.9482,15.509 C0.9482,15.78 1.1702,16 1.4442,16 L8.1172,16 L8.1172,11.704 C6.6812,11.595 5.5652,10.853 5.5652,9.945 C5.5652,9.804 5.5982,9.669 5.6482,9.538 C5.9502,10.326 7.0982,10.913 8.4762,10.913 C9.8532,10.913 11.0012,10.326 11.3032,9.538 C11.3532,9.669 11.3862,9.804 11.3862,9.945 C11.3862,10.793 10.4152,11.5 9.1172,11.679 L9.1172,16 L15.5032,16 C15.7772,16 16.0002,15.78 16.0002,15.509 L16.0002,13.55 C16.0002,12.985 15.7482,12.457 15.3092,12.1" id="Fill-4"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_milestones.svg b/app/views/shared/icons/_milestones.svg
new file mode 100644
index 00000000000..f4f5b0c8671
--- /dev/null
+++ b/app/views/shared/icons/_milestones.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="17px" viewBox="0 0 16 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 226</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0.889,0.059 C0.398,0.059 0,0.505 0,1.055 L0,15.003 C0,15.553 0.398,16 0.889,16 L15.111,16 C15.602,16 16,15.553 16,15.003 L16,1.055 C16,0.505 15.602,0.059 15.111,0.059 L0.889,0.059 L0.889,0.059 Z M2,14.007 L14,14.007 L14,2.051 L2,2.051 L2,14.007 L2,14.007 Z" id="path-1"></path>
+        <polygon id="path-3" points="0 2.059 14.222 2.059 14.222 0.058 0 0.058"></polygon>
+        <polygon id="path-5" points="0 2.059 2 2.059 2 0.059 0 0.059"></polygon>
+        <polygon id="path-7" points="0 2.059 2 2.059 2 0.059 0 0.059"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-226" transform="translate(0.000000, -1.000000)">
+            <path d="M15.1111,2 L0.8891,2 C0.3981,2 0.0001,2.446 0.0001,2.996 L0.0001,16.945 C0.0001,17.495 0.3981,17.941 0.8891,17.941 L15.1111,17.941 C15.6021,17.941 16.0001,17.495 16.0001,16.945 L16.0001,2.996 C16.0001,2.446 15.6021,2 15.1111,2 L15.1111,2 Z M2.0001,15.949 L14.0001,15.949 L14.0001,3.993 L2.0001,3.993 L2.0001,15.949 Z" id="Fill-1" fill="#7E7C7C"></path>
+            <g id="Group-5" transform="translate(0.000000, 1.941200)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="Clip-4"></g>
+            </g>
+            <polygon id="Fill-6" fill="#7E7C7C" points="1 7.0002 15.222 7.0002 15.222 5.0002 1 5.0002"></polygon>
+            <g id="Group-10" transform="translate(1.000000, 4.941200)">
+                <mask id="mask-4" fill="white">
+                    <use xlink:href="#path-3"></use>
+                </mask>
+                <g id="Clip-9"></g>
+                <polygon id="Fill-8" fill="#7E7C7C" mask="url(#mask-4)" points="-5 7.059 19.222 7.059 19.222 -4.941 -5 -4.941"></polygon>
+            </g>
+            <polygon id="Fill-11" fill="#7E7C7C" points="3 3.0002 5 3.0002 5 1.0002 3 1.0002"></polygon>
+            <g id="Group-15" transform="translate(3.000000, 0.941200)">
+                <mask id="mask-6" fill="white">
+                    <use xlink:href="#path-5"></use>
+                </mask>
+                <g id="Clip-14"></g>
+                <polygon id="Fill-13" fill="#7E7C7C" mask="url(#mask-6)" points="-5 7.059 7 7.059 7 -4.941 -5 -4.941"></polygon>
+            </g>
+            <polygon id="Fill-16" fill="#7E7C7C" points="11 3.0002 13 3.0002 13 1.0002 11 1.0002"></polygon>
+            <g id="Group-20" transform="translate(11.000000, 0.941200)">
+                <mask id="mask-8" fill="white">
+                    <use xlink:href="#path-7"></use>
+                </mask>
+                <g id="Clip-19"></g>
+                <polygon id="Fill-18" fill="#7E7C7C" mask="url(#mask-8)" points="-5 7.059 7 7.059 7 -4.941 -5 -4.941"></polygon>
+            </g>
+            <polyline id="Stroke-21" stroke="#7E7C7C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="6 11.7689 7.546 12.9999 10 9.9999"></polyline>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_mr.svg b/app/views/shared/icons/_mr.svg
new file mode 100644
index 00000000000..c14a5c28163
--- /dev/null
+++ b/app/views/shared/icons/_mr.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 228</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0.889,0.059 C0.398,0.059 0,0.505 0,1.055 L0,15.003 C0,15.553 0.398,16 0.889,16 L15.111,16 C15.602,16 16,15.553 16,15.003 L16,1.055 C16,0.505 15.602,0.059 15.111,0.059 L0.889,0.059 L0.889,0.059 Z M2,14.007 L14,14.007 L14,2.051 L2,2.051 L2,14.007 L2,14.007 Z" id="path-1"></path>
+        <polygon id="path-3" points="0 2.059 12 2.059 12 0.058 0 0.058"></polygon>
+        <polygon id="path-5" points="0.547 2.059 4 2.059 4 0.059 0.547 0.059"></polygon>
+        <polygon id="path-7" points="0 1.24 1.203 2.56 0 3.926 1.203 5.059 3.453 2.558 1.203 0.059"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-228" transform="translate(0.000000, -1.000000)">
+            <path d="M15.1111,1 L0.8891,1 C0.3981,1 0.0001,1.446 0.0001,1.996 L0.0001,15.945 C0.0001,16.495 0.3981,16.941 0.8891,16.941 L15.1111,16.941 C15.6021,16.941 16.0001,16.495 16.0001,15.945 L16.0001,1.996 C16.0001,1.446 15.6021,1 15.1111,1 L15.1111,1 Z M2.0001,14.949 L14.0001,14.949 L14.0001,2.993 L2.0001,2.993 L2.0001,14.949 Z" id="Fill-1" fill="#7E7C7C"></path>
+            <g id="Group-5" transform="translate(0.000000, 0.941200)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="Clip-4"></g>
+            </g>
+            <polygon id="Fill-6" fill="#7E7C7C" points="2 6.0002 14 6.0002 14 4.0002 2 4.0002"></polygon>
+            <g id="Group-10" transform="translate(2.000000, 3.941200)">
+                <mask id="mask-4" fill="white">
+                    <use xlink:href="#path-3"></use>
+                </mask>
+                <g id="Clip-9"></g>
+                <polygon id="Fill-8" fill="#7E7C7C" mask="url(#mask-4)" points="-5 7.059 17 7.059 17 -4.941 -5 -4.941"></polygon>
+            </g>
+            <polygon id="Fill-11" fill="#7E7C7C" points="8.547 13.0002 12 13.0002 12 11.0002 8.547 11.0002"></polygon>
+            <g id="Group-15" transform="translate(8.000000, 10.941200)">
+                <mask id="mask-6" fill="white">
+                    <use xlink:href="#path-5"></use>
+                </mask>
+                <g id="Clip-14"></g>
+                <polygon id="Fill-13" fill="#7E7C7C" mask="url(#mask-6)" points="-4.453 7.059 9 7.059 9 -4.941 -4.453 -4.941"></polygon>
+            </g>
+            <polygon id="Fill-16" fill="#7E7C7C" points="5.2029 13 3.9999 11.867 5.2029 10.501 3.9999 9.181 5.2029 8 7.4529 10.499"></polygon>
+            <g id="Group-20" transform="translate(4.000000, 7.941200)">
+                <mask id="mask-8" fill="white">
+                    <use xlink:href="#path-7"></use>
+                </mask>
+                <g id="Clip-19"></g>
+                <polygon id="Fill-18" fill="#7E7C7C" mask="url(#mask-8)" points="-5 10.059 8.453 10.059 8.453 -4.941 -5 -4.941"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

From 5e9e9a1e8284a8d87780725f765a6c04ab100117 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 23 May 2016 18:35:18 -0500
Subject: [PATCH 1305/1431] Add SVG icons to side bar

---
 .../stylesheets/framework/gitlab-theme.scss   | 27 ++++++++---
 app/assets/stylesheets/framework/sidebar.scss |  4 --
 .../shared/icons/_contributionanalytics.svg   | 26 ++++------
 app/views/shared/icons/_group.svg             | 44 ++++-------------
 app/views/shared/icons/_issues.svg            | 35 ++------------
 app/views/shared/icons/_members.svg           | 12 ++---
 app/views/shared/icons/_milestones.svg        | 47 +++----------------
 app/views/shared/icons/_mr.svg                | 44 ++---------------
 8 files changed, 60 insertions(+), 179 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index cd2eba59f90..2540ff497f2 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -22,17 +22,17 @@
       &:hover {
         background-color: $color-dark;
         a {
-          color: #fff;
+          color: $white-light;
 
           h3 {
-            color: #fff;
+            color: $white-light;
           }
         }
       }
     }
 
     .collapse-nav a {
-      color: #fff;
+      color: $white-light;
       background: $color;
     }
 
@@ -45,7 +45,7 @@
 
         &:hover {
           background-color: $color-dark;
-          color: #fff;
+          color: $white-light;
           text-decoration: none;
         }
       }
@@ -63,10 +63,20 @@
           color: $color-light;
         }
 
+        path,
+        polygon {
+          fill: $color-light;
+        }
+
         .count {
           color: $color-light;
           background: $color-dark;
         }
+
+        svg {
+          position: relative;
+          top: 3px;
+        }
       }
 
       &.separate-item {
@@ -74,7 +84,7 @@
       }
 
       &.active a {
-        color: #fff;
+        color: $white-light;
         background: $color-dark;
 
         &.no-highlight {
@@ -82,7 +92,12 @@
         }
 
         i {
-          color: #fff
+          color: $white-light
+        }
+
+        path,
+        polygon {
+          fill: $white-light;
         }
       }
     }
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index fa9cddef0ad..12a342bf0b3 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -113,10 +113,6 @@
         color: $gray-light;
       }
 
-      path {
-        fill: $gray-light;
-      }
-
       svg {
         margin-right: 13px;
       }
diff --git a/app/views/shared/icons/_contributionanalytics.svg b/app/views/shared/icons/_contributionanalytics.svg
index 33edf0f9320..adf09a14964 100644
--- a/app/views/shared/icons/_contributionanalytics.svg
+++ b/app/views/shared/icons/_contributionanalytics.svg
@@ -1,27 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Pasted Image 234</title>
+    <title>Group</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 C3.581,0 0,3.581 0,8 L0,8 Z M2,8 C2,4.692 4.692,2 8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 L2,8 Z" id="path-1"></path>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Pasted-Image-234">
+        <g id="Group">
             <path d="M8,0 C3.581,0 0,3.581 0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 M8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 C2,4.692 4.692,2 8,2" id="Fill-1" fill="#7E7C7C"></path>
-            <g id="Group-5">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Clip-4"></g>
-            </g>
-            <g id="Group-16" transform="translate(1.000000, 5.000000)">
-                <polyline id="Stroke-6" stroke="#7E7C7C" points="0.7188 4.4688 5.1558 1.1248 8.8958 5.0838 13.6878 0.6878"></polyline>
-                <path d="M6.0313,1.3928 C6.0313,1.9448 5.5833,2.3928 5.0313,2.3928 C4.4793,2.3928 4.0313,1.9448 4.0313,1.3928 C4.0313,0.8408 4.4793,0.3928 5.0313,0.3928 C5.5833,0.3928 6.0313,0.8408 6.0313,1.3928" id="Fill-8" fill="#FEFEFE"></path>
-                <path d="M6.0313,1.3928 C6.0313,1.9448 5.5833,2.3928 5.0313,2.3928 C4.4793,2.3928 4.0313,1.9448 4.0313,1.3928 C4.0313,0.8408 4.4793,0.3928 5.0313,0.3928 C5.5833,0.3928 6.0313,0.8408 6.0313,1.3928 L6.0313,1.3928 Z" id="Stroke-10" stroke="#7E7C7C"></path>
-                <path d="M9.8854,4.8715 C9.8854,5.4235 9.4374,5.8715 8.8854,5.8715 C8.3334,5.8715 7.8854,5.4235 7.8854,4.8715 C7.8854,4.3195 8.3334,3.8715 8.8854,3.8715 C9.4374,3.8715 9.8854,4.3195 9.8854,4.8715" id="Fill-12" fill="#FEFEFE"></path>
-                <path d="M9.8854,4.8715 C9.8854,5.4235 9.4374,5.8715 8.8854,5.8715 C8.3334,5.8715 7.8854,5.4235 7.8854,4.8715 C7.8854,4.3195 8.3334,3.8715 8.8854,3.8715 C9.4374,3.8715 9.8854,4.3195 9.8854,4.8715 L9.8854,4.8715 Z" id="Stroke-14" stroke="#7E7C7C"></path>
-            </g>
+            <polygon id="Stroke-6" fill="#7E7C7C" points="2.0197351 9.86809696 6.4567351 6.52409696 5.79233671 6.46815759 9.53233671 10.4271576 9.87070552 10.78534 10.2338016 10.4522494 15.0258016 6.05624938 14.3497984 5.31935062 9.55779844 9.71535062 10.2592633 9.74044241 6.51926329 5.78144241 6.21208651 5.45627854 5.8548649 5.72550304 1.4178649 9.06950304"></polygon>
+            <path d="M7.0313,6.3928 C7.0313,6.9448 6.5833,7.3928 6.0313,7.3928 C5.4793,7.3928 5.0313,6.9448 5.0313,6.3928 C5.0313,5.8408 5.4793,5.3928 6.0313,5.3928 C6.5833,5.3928 7.0313,5.8408 7.0313,6.3928" id="Fill-8" fill="#FEFEFE"></path>
+            <path d="M6.5313,6.3928 C6.5313,6.66865763 6.30715763,6.8928 6.0313,6.8928 C5.75544237,6.8928 5.5313,6.66865763 5.5313,6.3928 C5.5313,6.11694237 5.75544237,5.8928 6.0313,5.8928 C6.30715763,5.8928 6.5313,6.11694237 6.5313,6.3928 L6.5313,6.3928 Z M7.5313,6.3928 C7.5313,5.56465763 6.85944237,4.8928 6.0313,4.8928 C5.20315763,4.8928 4.5313,5.56465763 4.5313,6.3928 C4.5313,7.22094237 5.20315763,7.8928 6.0313,7.8928 C6.85944237,7.8928 7.5313,7.22094237 7.5313,6.3928 L7.5313,6.3928 Z" id="Stroke-10" fill="#7E7C7C"></path>
+            <path d="M10.8854,9.8715 C10.8854,10.4235 10.4374,10.8715 9.8854,10.8715 C9.3334,10.8715 8.8854,10.4235 8.8854,9.8715 C8.8854,9.3195 9.3334,8.8715 9.8854,8.8715 C10.4374,8.8715 10.8854,9.3195 10.8854,9.8715" id="Fill-12" fill="#FEFEFE"></path>
+            <path d="M10.3854,9.8715 C10.3854,10.1473576 10.1612576,10.3715 9.8854,10.3715 C9.60954237,10.3715 9.3854,10.1473576 9.3854,9.8715 C9.3854,9.59564237 9.60954237,9.3715 9.8854,9.3715 C10.1612576,9.3715 10.3854,9.59564237 10.3854,9.8715 L10.3854,9.8715 Z M11.3854,9.8715 C11.3854,9.04335763 10.7135424,8.3715 9.8854,8.3715 C9.05725763,8.3715 8.3854,9.04335763 8.3854,9.8715 C8.3854,10.6996424 9.05725763,11.3715 9.8854,11.3715 C10.7135424,11.3715 11.3854,10.6996424 11.3854,9.8715 L11.3854,9.8715 Z" id="Stroke-14" fill="#7E7C7C"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_group.svg b/app/views/shared/icons/_group.svg
index 6f2c530c9ba..75cae0d16c8 100644
--- a/app/views/shared/icons/_group.svg
+++ b/app/views/shared/icons/_group.svg
@@ -1,42 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Pasted Image 232</title>
+    <title>Group</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <polygon id="path-1" points="5.9997 6 0 6 0 0.0221 5.9997 0.0221 5.9997 6"></polygon>
-        <polygon id="path-3" points="-0.0003 6 5.9997 6 5.9997 0.0221 -0.0003 0.0221"></polygon>
-        <polygon id="path-5" points="7.9997 0.012 -0.0003 0.012 -0.0003 6.9896 7.9997 6.9896 7.9997 0.012"></polygon>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Pasted-Image-232" transform="translate(0.000000, -1.000000)">
-            <path d="M12.5,9.5834 L3.5,9.5834" id="Stroke-1" stroke="#303030" stroke-width="2"></path>
-            <path d="M8,10.0834 L8,6.0834" id="Stroke-3" stroke="#303030" stroke-width="2"></path>
-            <g id="Group-17" transform="translate(0.000000, 0.988400)">
-                <path d="M3,11.095 L3,7.595" id="Stroke-4" stroke="#303030" stroke-width="2"></path>
-                <path d="M13,11.095 L13,7.595" id="Stroke-6" stroke="#303030" stroke-width="2"></path>
-                <g id="Group-10" transform="translate(0.000000, 10.000000)">
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <g id="Clip-9"></g>
-                    <path d="M5.6667,0.0221 L0.3337,0.0221 C0.1497,0.0221 -0.0003,0.1891 -0.0003,0.3961 L-0.0003,5.6261 C-0.0003,5.8331 0.1497,6.0001 0.3337,6.0001 L5.6667,6.0001 C5.8507,6.0001 5.9997,5.8331 5.9997,5.6261 L5.9997,0.3961 C5.9997,0.1891 5.8507,0.0221 5.6667,0.0221 L5.6667,0.0221 Z M1.9997,4.0221 L3.9997,4.0221 L3.9997,2.0221 L1.9997,2.0221 L1.9997,4.0221 Z" id="Fill-8" fill="#303030" mask="url(#mask-2)"></path>
-                </g>
-                <g id="Group-13" transform="translate(10.000000, 10.000000)">
-                    <mask id="mask-4" fill="white">
-                        <use xlink:href="#path-3"></use>
-                    </mask>
-                    <g id="Clip-12"></g>
-                    <path d="M5.6667,0.0221 L0.3337,0.0221 C0.1497,0.0221 -0.0003,0.1891 -0.0003,0.3961 L-0.0003,5.6261 C-0.0003,5.8331 0.1497,6.0001 0.3337,6.0001 L5.6667,6.0001 C5.8507,6.0001 5.9997,5.8331 5.9997,5.6261 L5.9997,0.3961 C5.9997,0.1891 5.8507,0.0221 5.6667,0.0221 L5.6667,0.0221 Z M1.9997,4.0221 L3.9997,4.0221 L3.9997,2.0221 L1.9997,2.0221 L1.9997,4.0221 Z" id="Fill-11" fill="#303030" mask="url(#mask-4)"></path>
-                </g>
-                <g id="Group-16" transform="translate(4.000000, 0.000000)">
-                    <mask id="mask-6" fill="white">
-                        <use xlink:href="#path-5"></use>
-                    </mask>
-                    <g id="Clip-15"></g>
-                    <path d="M7.6667,0.0116 L0.3337,0.0116 C0.1497,0.0116 -0.0003,0.1786 -0.0003,0.3856 L-0.0003,6.6156 C-0.0003,6.8226 0.1497,6.9896 0.3337,6.9896 L7.6667,6.9896 C7.8507,6.9896 7.9997,6.8226 7.9997,6.6156 L7.9997,0.3856 C7.9997,0.1786 7.8507,0.0116 7.6667,0.0116 L7.6667,0.0116 Z M1.9997,5.0116 L5.9997,5.0116 L5.9997,2.0116 L1.9997,2.0116 L1.9997,5.0116 Z" id="Fill-14" fill="#303030" mask="url(#mask-6)"></path>
-                </g>
-            </g>
+        <g id="Group" fill="#303030">
+            <path d="M15.6667,10.0105 L10.3337,10.0105 C10.1497,10.0105 9.9997,10.1775 9.9997,10.3845 L9.9997,15.6145 C9.9997,15.8215 10.1497,15.9885 10.3337,15.9885 L15.6667,15.9885 C15.8507,15.9885 15.9997,15.8215 15.9997,15.6145 L15.9997,10.3845 C15.9997,10.1775 15.8507,10.0105 15.6667,10.0105 L15.6667,10.0105 L15.6667,10.0105 Z M11.9997,14.0105 L13.9997,14.0105 L13.9997,12.0105 L11.9997,12.0105 L11.9997,14.0105 L11.9997,14.0105 Z" id="Fill-11"></path>
+            <path d="M5.6667,10.0105 L0.3337,10.0105 C0.1497,10.0105 -0.0003,10.1775 -0.0003,10.3845 L-0.0003,15.6145 C-0.0003,15.8215 0.1497,15.9885 0.3337,15.9885 L5.6667,15.9885 C5.8507,15.9885 5.9997,15.8215 5.9997,15.6145 L5.9997,10.3845 C5.9997,10.1775 5.8507,10.0105 5.6667,10.0105 L5.6667,10.0105 L5.6667,10.0105 Z M1.9997,14.0105 L3.9997,14.0105 L3.9997,12.0105 L1.9997,12.0105 L1.9997,14.0105 L1.9997,14.0105 Z" id="Fill-8"></path>
+            <polygon id="Stroke-1" points="12.5 7.5834 3.5 7.5834 3.5 9.5834 12.5 9.5834"></polygon>
+            <polygon id="Stroke-3" points="9 9.0834 9 5.0834 7 5.0834 7 9.0834"></polygon>
+            <polygon id="Stroke-4" points="4 11.0834 4 7.5834 2 7.5834 2 11.0834"></polygon>
+            <polygon id="Stroke-6" points="14 11.0834 14 7.5834 12 7.5834 12 11.0834"></polygon>
+            <path d="M11.6667,6.21724894e-15 L4.3337,6.21724894e-15 C4.1497,6.21724894e-15 3.9997,0.167 3.9997,0.374 L3.9997,6.604 C3.9997,6.811 4.1497,6.978 4.3337,6.978 L11.6667,6.978 C11.8507,6.978 11.9997,6.811 11.9997,6.604 L11.9997,0.374 C11.9997,0.167 11.8507,6.21724894e-15 11.6667,6.21724894e-15 L11.6667,6.21724894e-15 L11.6667,6.21724894e-15 Z M5.9997,5 L9.9997,5 L9.9997,2 L5.9997,2 L5.9997,5 L5.9997,5 Z" id="Fill-14"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_issues.svg b/app/views/shared/icons/_issues.svg
index 92f48b897b2..2682c27ade9 100644
--- a/app/views/shared/icons/_issues.svg
+++ b/app/views/shared/icons/_issues.svg
@@ -1,38 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Pasted Image 227</title>
+    <title>Group</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 C3.581,0 0,3.581 0,8 L0,8 Z M2,8 C2,4.692 4.692,2 8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 L2,8 Z" id="path-1"></path>
-        <polygon id="path-3" points="0.16 0 0.11 4 1.889 4 1.889 0"></polygon>
-        <polygon id="path-5" points="0.16 0.666 0.11 2.445 1.889 2.445 1.889 0.666"></polygon>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Pasted-Image-227">
-            <path d="M8,0 C3.581,0 0,3.581 0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 M8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 C2,4.692 4.692,2 8,2" id="Fill-1" fill="#7E7C7C"></path>
-            <g id="Group-5">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Clip-4"></g>
-            </g>
-            <polygon id="Fill-6" fill="#7E7C7C" points="7.1597 4 8.8887 4 8.8887 8 7.1107 8"></polygon>
-            <g id="Group-10" transform="translate(7.000000, 4.000000)">
-                <mask id="mask-4" fill="white">
-                    <use xlink:href="#path-3"></use>
-                </mask>
-                <g id="Clip-9"></g>
-                <polygon id="Fill-8" fill="#7E7C7C" mask="url(#mask-4)" points="-4.889 9 6.889 9 6.889 -5 -4.889 -5"></polygon>
-            </g>
-            <polygon id="Fill-11" fill="#7E7C7C" points="7.1597 9.6667 8.8887 9.6667 8.8887 11.4447 7.1107 11.4447"></polygon>
-            <g id="Group-15" transform="translate(7.000000, 9.000000)">
-                <mask id="mask-6" fill="white">
-                    <use xlink:href="#path-5"></use>
-                </mask>
-                <g id="Clip-14"></g>
-                <polygon id="Fill-13" fill="#7E7C7C" mask="url(#mask-6)" points="-4.889 7.445 6.889 7.445 6.889 -4.333 -4.889 -4.333"></polygon>
-            </g>
+        <g id="Group" fill="#7E7C7C">
+            <path d="M8,0 C3.581,0 0,3.581 0,8 C0,12.419 3.581,16 8,16 C12.419,16 16,12.419 16,8 C16,3.581 12.419,0 8,0 M8,2 C11.308,2 14,4.692 14,8 C14,11.308 11.308,14 8,14 C4.692,14 2,11.308 2,8 C2,4.692 4.692,2 8,2" id="Fill-1"></path>
+            <path d="M7.1597,4 L8.8887,4 L8.8887,8 L7.1107,8 L7.1597,4 Z M7.1597,9.6667 L8.8887,9.6667 L8.8887,11.4447 L7.1107,11.4447 L7.1597,9.6667 Z" id="Combined-Shape"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_members.svg b/app/views/shared/icons/_members.svg
index 98635108d0f..f8043b31fe8 100644
--- a/app/views/shared/icons/_members.svg
+++ b/app/views/shared/icons/_members.svg
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="22px" height="16px" viewBox="0 0 22 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Pasted Image 233</title>
+    <title>Group</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Pasted-Image-233" fill="#7E7C7C">
-            <g id="Group-3" transform="translate(0.000000, 2.000000)">
-                <path d="M6.4357,9.8588 C7.1487,9.2798 7.8797,8.7808 8.5357,8.3708 C8.5837,8.3008 8.6187,8.2338 8.6187,8.1768 L8.6187,6.8088 C8.9197,6.5218 9.0927,6.1248 9.0927,5.7028 L9.0927,3.3748 C9.0927,1.9478 7.9187,0.7858 6.4757,0.7858 L5.9687,0.7858 C4.5247,0.7858 3.3507,1.9478 3.3507,3.3748 L3.3507,5.7028 C3.3507,6.1248 3.5247,6.5218 3.8247,6.8088 L3.8247,8.5838 C3.2537,8.8738 1.8797,9.6198 0.5967,10.6618 C0.2177,10.9698 -0.0003,11.4258 -0.0003,11.9138 L-0.0003,13.5088 C-0.0003,13.5438 0.0857,13.7668 0.3467,13.7778 C1.3257,13.8198 3.8417,13.8328 5.9617,13.9038 C5.8337,13.8148 5.7447,13.6748 5.7447,13.5088 L5.7447,11.5498 C5.7447,10.9848 5.9967,10.2158 6.4357,9.8588" id="Fill-1"></path>
-            </g>
-            <g id="Group-6" transform="translate(6.000000, 0.000000)">
-                <path d="M15.3092,12.1 C13.6932,10.787 11.9592,9.86 11.3042,9.53 L11.3042,7.235 C11.6722,6.9 11.8862,6.428 11.8862,5.925 L11.8862,3.066 C11.8862,1.376 10.4952,0 8.7852,0 L8.1632,0 C6.4532,0 5.0622,1.376 5.0622,3.066 L5.0622,5.925 C5.0622,6.428 5.2752,6.9 5.6442,7.235 L5.6442,9.53 C4.9892,9.86 3.2542,10.787 1.6392,12.1 C1.2002,12.457 0.9482,12.985 0.9482,13.55 L0.9482,15.509 C0.9482,15.78 1.1702,16 1.4442,16 L8.1172,16 L8.1172,11.704 C6.6812,11.595 5.5652,10.853 5.5652,9.945 C5.5652,9.804 5.5982,9.669 5.6482,9.538 C5.9502,10.326 7.0982,10.913 8.4762,10.913 C9.8532,10.913 11.0012,10.326 11.3032,9.538 C11.3532,9.669 11.3862,9.804 11.3862,9.945 C11.3862,10.793 10.4152,11.5 9.1172,11.679 L9.1172,16 L15.5032,16 C15.7772,16 16.0002,15.78 16.0002,15.509 L16.0002,13.55 C16.0002,12.985 15.7482,12.457 15.3092,12.1" id="Fill-4"></path>
-            </g>
+        <g id="Group" fill="#7E7C7C">
+            <path d="M6.4357,11.8588 C7.1487,11.2798 7.8797,10.7808 8.5357,10.3708 C8.5837,10.3008 8.6187,10.2338 8.6187,10.1768 L8.6187,8.8088 C8.9197,8.5218 9.0927,8.1248 9.0927,7.7028 L9.0927,5.3748 C9.0927,3.9478 7.9187,2.7858 6.4757,2.7858 L5.9687,2.7858 C4.5247,2.7858 3.3507,3.9478 3.3507,5.3748 L3.3507,7.7028 C3.3507,8.1248 3.5247,8.5218 3.8247,8.8088 L3.8247,10.5838 C3.2537,10.8738 1.8797,11.6198 0.5967,12.6618 C0.2177,12.9698 -0.0003,13.4258 -0.0003,13.9138 L-0.0003,15.5088 C-0.0003,15.5438 0.0857,15.7668 0.3467,15.7778 C1.3257,15.8198 3.8417,15.8328 5.9617,15.9038 C5.8337,15.8148 5.7447,15.6748 5.7447,15.5088 L5.7447,13.5498 C5.7447,12.9848 5.9967,12.2158 6.4357,11.8588" id="Fill-1"></path>
+            <path d="M21.3092,12.1 C19.6932,10.787 17.9592,9.86 17.3042,9.53 L17.3042,7.235 C17.6722,6.9 17.8862,6.428 17.8862,5.925 L17.8862,3.066 C17.8862,1.376 16.4952,0 14.7852,0 L14.1632,0 C12.4532,0 11.0622,1.376 11.0622,3.066 L11.0622,5.925 C11.0622,6.428 11.2752,6.9 11.6442,7.235 L11.6442,9.53 C10.9892,9.86 9.2542,10.787 7.6392,12.1 C7.2002,12.457 6.9482,12.985 6.9482,13.55 L6.9482,15.509 C6.9482,15.78 7.1702,16 7.4442,16 L14.1172,16 L14.1172,11.704 C12.6812,11.595 11.5652,10.853 11.5652,9.945 C11.5652,9.804 11.5982,9.669 11.6482,9.538 C11.9502,10.326 13.0982,10.913 14.4762,10.913 C15.8532,10.913 17.0012,10.326 17.3032,9.538 C17.3532,9.669 17.3862,9.804 17.3862,9.945 C17.3862,10.793 16.4152,11.5 15.1172,11.679 L15.1172,16 L21.5032,16 C21.7772,16 22.0002,15.78 22.0002,15.509 L22.0002,13.55 C22.0002,12.985 21.7482,12.457 21.3092,12.1" id="Fill-4"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_milestones.svg b/app/views/shared/icons/_milestones.svg
index f4f5b0c8671..3d62ecc0631 100644
--- a/app/views/shared/icons/_milestones.svg
+++ b/app/views/shared/icons/_milestones.svg
@@ -1,48 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="17px" viewBox="0 0 16 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Pasted Image 226</title>
+    <title>Group</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M0.889,0.059 C0.398,0.059 0,0.505 0,1.055 L0,15.003 C0,15.553 0.398,16 0.889,16 L15.111,16 C15.602,16 16,15.553 16,15.003 L16,1.055 C16,0.505 15.602,0.059 15.111,0.059 L0.889,0.059 L0.889,0.059 Z M2,14.007 L14,14.007 L14,2.051 L2,2.051 L2,14.007 L2,14.007 Z" id="path-1"></path>
-        <polygon id="path-3" points="0 2.059 14.222 2.059 14.222 0.058 0 0.058"></polygon>
-        <polygon id="path-5" points="0 2.059 2 2.059 2 0.059 0 0.059"></polygon>
-        <polygon id="path-7" points="0 2.059 2 2.059 2 0.059 0 0.059"></polygon>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Pasted-Image-226" transform="translate(0.000000, -1.000000)">
-            <path d="M15.1111,2 L0.8891,2 C0.3981,2 0.0001,2.446 0.0001,2.996 L0.0001,16.945 C0.0001,17.495 0.3981,17.941 0.8891,17.941 L15.1111,17.941 C15.6021,17.941 16.0001,17.495 16.0001,16.945 L16.0001,2.996 C16.0001,2.446 15.6021,2 15.1111,2 L15.1111,2 Z M2.0001,15.949 L14.0001,15.949 L14.0001,3.993 L2.0001,3.993 L2.0001,15.949 Z" id="Fill-1" fill="#7E7C7C"></path>
-            <g id="Group-5" transform="translate(0.000000, 1.941200)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Clip-4"></g>
-            </g>
-            <polygon id="Fill-6" fill="#7E7C7C" points="1 7.0002 15.222 7.0002 15.222 5.0002 1 5.0002"></polygon>
-            <g id="Group-10" transform="translate(1.000000, 4.941200)">
-                <mask id="mask-4" fill="white">
-                    <use xlink:href="#path-3"></use>
-                </mask>
-                <g id="Clip-9"></g>
-                <polygon id="Fill-8" fill="#7E7C7C" mask="url(#mask-4)" points="-5 7.059 19.222 7.059 19.222 -4.941 -5 -4.941"></polygon>
-            </g>
-            <polygon id="Fill-11" fill="#7E7C7C" points="3 3.0002 5 3.0002 5 1.0002 3 1.0002"></polygon>
-            <g id="Group-15" transform="translate(3.000000, 0.941200)">
-                <mask id="mask-6" fill="white">
-                    <use xlink:href="#path-5"></use>
-                </mask>
-                <g id="Clip-14"></g>
-                <polygon id="Fill-13" fill="#7E7C7C" mask="url(#mask-6)" points="-5 7.059 7 7.059 7 -4.941 -5 -4.941"></polygon>
-            </g>
-            <polygon id="Fill-16" fill="#7E7C7C" points="11 3.0002 13 3.0002 13 1.0002 11 1.0002"></polygon>
-            <g id="Group-20" transform="translate(11.000000, 0.941200)">
-                <mask id="mask-8" fill="white">
-                    <use xlink:href="#path-7"></use>
-                </mask>
-                <g id="Clip-19"></g>
-                <polygon id="Fill-18" fill="#7E7C7C" mask="url(#mask-8)" points="-5 7.059 7 7.059 7 -4.941 -5 -4.941"></polygon>
-            </g>
-            <polyline id="Stroke-21" stroke="#7E7C7C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="6 11.7689 7.546 12.9999 10 9.9999"></polyline>
+        <g id="Group" fill="#7E7C7C">
+            <path d="M15.1111,1 L0.8891,1 C0.3981,1 0.0001,1.446 0.0001,1.996 L0.0001,15.945 C0.0001,16.495 0.3981,16.941 0.8891,16.941 L15.1111,16.941 C15.6021,16.941 16.0001,16.495 16.0001,15.945 L16.0001,1.996 C16.0001,1.446 15.6021,1 15.1111,1 L15.1111,1 L15.1111,1 Z M14.0001,6.0002 L14.0001,14.949 L2.0001,14.949 L2.0001,6.0002 L14.0001,6.0002 Z M14.0001,4.0002 L14.0001,2.993 L2.0001,2.993 L2.0001,4.0002 L14.0001,4.0002 Z" id="Combined-Shape"></path>
+            <polygon id="Fill-11" points="3 2.0002 5 2.0002 5 0.0002 3 0.0002"></polygon>
+            <polygon id="Fill-16" points="11 2.0002 13 2.0002 13 0.0002 11 0.0002"></polygon>
+            <path d="M5.37709616,11.5511984 L6.92309616,12.7821984 C7.35112915,13.123019 7.97359761,13.0565604 8.32002627,12.6330535 L10.7740263,9.63305349 C11.1237073,9.20557058 11.0606364,8.57555475 10.6331535,8.22587373 C10.2056706,7.87619272 9.57565475,7.93926361 9.22597373,8.36674651 L6.77197373,11.3667465 L8.16890384,11.2176016 L6.62290384,9.98660159 C6.19085236,9.6425813 5.56172188,9.71394467 5.21770159,10.1459962 C4.8736813,10.5780476 4.94504467,11.2071781 5.37709616,11.5511984 L5.37709616,11.5511984 Z" id="Stroke-21"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_mr.svg b/app/views/shared/icons/_mr.svg
index c14a5c28163..dd3dbcc4473 100644
--- a/app/views/shared/icons/_mr.svg
+++ b/app/views/shared/icons/_mr.svg
@@ -1,47 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Pasted Image 228</title>
+    <title>Group</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M0.889,0.059 C0.398,0.059 0,0.505 0,1.055 L0,15.003 C0,15.553 0.398,16 0.889,16 L15.111,16 C15.602,16 16,15.553 16,15.003 L16,1.055 C16,0.505 15.602,0.059 15.111,0.059 L0.889,0.059 L0.889,0.059 Z M2,14.007 L14,14.007 L14,2.051 L2,2.051 L2,14.007 L2,14.007 Z" id="path-1"></path>
-        <polygon id="path-3" points="0 2.059 12 2.059 12 0.058 0 0.058"></polygon>
-        <polygon id="path-5" points="0.547 2.059 4 2.059 4 0.059 0.547 0.059"></polygon>
-        <polygon id="path-7" points="0 1.24 1.203 2.56 0 3.926 1.203 5.059 3.453 2.558 1.203 0.059"></polygon>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Pasted-Image-228" transform="translate(0.000000, -1.000000)">
-            <path d="M15.1111,1 L0.8891,1 C0.3981,1 0.0001,1.446 0.0001,1.996 L0.0001,15.945 C0.0001,16.495 0.3981,16.941 0.8891,16.941 L15.1111,16.941 C15.6021,16.941 16.0001,16.495 16.0001,15.945 L16.0001,1.996 C16.0001,1.446 15.6021,1 15.1111,1 L15.1111,1 Z M2.0001,14.949 L14.0001,14.949 L14.0001,2.993 L2.0001,2.993 L2.0001,14.949 Z" id="Fill-1" fill="#7E7C7C"></path>
-            <g id="Group-5" transform="translate(0.000000, 0.941200)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Clip-4"></g>
-            </g>
-            <polygon id="Fill-6" fill="#7E7C7C" points="2 6.0002 14 6.0002 14 4.0002 2 4.0002"></polygon>
-            <g id="Group-10" transform="translate(2.000000, 3.941200)">
-                <mask id="mask-4" fill="white">
-                    <use xlink:href="#path-3"></use>
-                </mask>
-                <g id="Clip-9"></g>
-                <polygon id="Fill-8" fill="#7E7C7C" mask="url(#mask-4)" points="-5 7.059 17 7.059 17 -4.941 -5 -4.941"></polygon>
-            </g>
-            <polygon id="Fill-11" fill="#7E7C7C" points="8.547 13.0002 12 13.0002 12 11.0002 8.547 11.0002"></polygon>
-            <g id="Group-15" transform="translate(8.000000, 10.941200)">
-                <mask id="mask-6" fill="white">
-                    <use xlink:href="#path-5"></use>
-                </mask>
-                <g id="Clip-14"></g>
-                <polygon id="Fill-13" fill="#7E7C7C" mask="url(#mask-6)" points="-4.453 7.059 9 7.059 9 -4.941 -4.453 -4.941"></polygon>
-            </g>
-            <polygon id="Fill-16" fill="#7E7C7C" points="5.2029 13 3.9999 11.867 5.2029 10.501 3.9999 9.181 5.2029 8 7.4529 10.499"></polygon>
-            <g id="Group-20" transform="translate(4.000000, 7.941200)">
-                <mask id="mask-8" fill="white">
-                    <use xlink:href="#path-7"></use>
-                </mask>
-                <g id="Clip-19"></g>
-                <polygon id="Fill-18" fill="#7E7C7C" mask="url(#mask-8)" points="-5 10.059 8.453 10.059 8.453 -4.941 -5 -4.941"></polygon>
-            </g>
+        <g id="Group" fill="#7E7C7C">
+            <path d="M15.1111,0 L0.8891,0 C0.3981,0 0.0001,0.446 0.0001,0.996 L0.0001,14.945 C0.0001,15.495 0.3981,15.941 0.8891,15.941 L15.1111,15.941 C15.6021,15.941 16.0001,15.495 16.0001,14.945 L16.0001,0.996 C16.0001,0.446 15.6021,0 15.1111,0 L15.1111,0 L15.1111,0 Z M2.0001,13.949 L14.0001,13.949 L14.0001,1.993 L2.0001,1.993 L2.0001,13.949 Z M2,5.0002 L14,5.0002 L14,3.0002 L2,3.0002 L2,5.0002 Z" id="Combined-Shape"></path>
+            <path d="M8.547,12.0002 L12,12.0002 L12,10.0002 L8.547,10.0002 L8.547,12.0002 Z M5.2029,12 L3.9999,10.867 L5.2029,9.501 L3.9999,8.181 L5.2029,7 L7.4529,9.499 L5.2029,12 Z" id="Combined-Shape"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file

From 52080f74d42a62298654b8550e6dfbcd06de65a7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 1 Jun 2016 16:54:04 -0600
Subject: [PATCH 1306/1431] Add new icons to group page layout nav

---
 app/assets/stylesheets/framework/nav.scss  | 21 +++++++++++++++++++++
 app/views/layouts/nav/_dashboard.html.haml | 12 +++---------
 app/views/layouts/nav/_group.html.haml     | 12 ++++++------
 app/views/layouts/nav/_project.html.haml   | 18 ++++++++++--------
 app/views/shared/icons/_commits.svg        | 10 ++++++++++
 app/views/shared/icons/_files.svg          | 17 +++++++++++++++++
 app/views/shared/icons/_pipelines.svg      | 10 ++++++++++
 app/views/shared/icons/_project.svg        | 10 ++++++++++
 app/views/shared/icons/_wiki.svg           | 10 ++++++++++
 9 files changed, 97 insertions(+), 23 deletions(-)
 create mode 100644 app/views/shared/icons/_commits.svg
 create mode 100644 app/views/shared/icons/_files.svg
 create mode 100644 app/views/shared/icons/_pipelines.svg
 create mode 100644 app/views/shared/icons/_project.svg
 create mode 100644 app/views/shared/icons/_wiki.svg

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a811778df70..0918f673607 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -304,6 +304,19 @@
     border-bottom: none;
     height: 51px;
 
+    svg {
+      position: relative;
+      top: 2px;
+      margin-right: 2px;
+      height: 15px;
+      width: auto;
+
+      path,
+      polygon {
+        fill: $layout-link-gray;
+      }
+    }
+
     .fade-right {
       @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
       right: 0;
@@ -325,9 +338,17 @@
       }
 
       &.active {
+
         a, i {
           color: $black;
         }
+
+        svg {
+          path,
+          polygon {
+            fill: $black;
+          }
+        }
       }
 
       .badge {
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 30729810687..2f956dbbd77 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,7 +1,7 @@
 %ul.nav.nav-sidebar
   = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
     = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
-      = icon('bookmark fw')
+      = navbar_icon('project')
       .nav-link-text
         Projects
   = nav_link(controller: :todos) do
@@ -11,7 +11,6 @@
         Todos
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
-<<<<<<< e6daf1f899b412ded9a16674865b09f31fc7c75a
       = icon('dashboard fw')
       .nav-link-text
         Activity
@@ -27,11 +26,8 @@
         Milestones
   = nav_link(path: 'dashboard#issues') do
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
-      = icon('exclamation-circle fw')
-      .nav-link-text
-=======
       = navbar_icon('activity')
-      %span
+      .nav-link-text
         Activity
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
@@ -46,12 +42,10 @@
   = nav_link(path: 'dashboard#issues') do
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = navbar_icon('issues')
-      %span
->>>>>>> Start adding SVG icons
         Issues
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
-      = icon('tasks fw')
+      = navbar_icon('mr')
       .nav-link-text
         Merge Requests
   = nav_link(controller: :snippets) do
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index de15add3617..9cbee0aa363 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -5,36 +5,36 @@
     .fade-left
     = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
       = link_to group_path(@group), title: 'Home' do
-        = icon('group fw')
+        = navbar_icon('group')
         %span
           Group
     = nav_link(path: 'groups#activity') do
       = link_to activity_group_path(@group), title: 'Activity' do
-        = icon('dashboard fw')
+        = navbar_icon('activity')
         %span
           Activity
     = nav_link(controller: [:group, :milestones]) do
       = link_to group_milestones_path(@group), title: 'Milestones' do
-        = icon('clock-o fw')
+        = navbar_icon('milestones')
         %span
           Milestones
     = nav_link(path: 'groups#issues') do
       = link_to issues_group_path(@group), title: 'Issues' do
-        = icon('exclamation-circle fw')
+        = navbar_icon('issues')
         %span
           Issues
           - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
           %span.badge.count= number_with_delimiter(issues.count)
     = nav_link(path: 'groups#merge_requests') do
       = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
-        = icon('tasks fw')
+        = navbar_icon('mr')
         %span
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
           %span.badge.count= number_with_delimiter(merge_requests.count)
     = nav_link(controller: [:group_members]) do
       = link_to group_group_members_path(@group), title: 'Members' do
-        = icon('users fw')
+        = navbar_icon('members')
         %span
           Members
     .fade-right
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 03c9fa0a94d..2a58ef224b3 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -24,17 +24,19 @@
     .fade-left
     = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
       = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
-        = icon('bookmark fw')
+        = navbar_icon('project')
         %span
           Project
+
     = nav_link(path: 'projects#activity') do
       = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-        = icon('dashboard fw')
+        = navbar_icon('activity')
         %span
           Activity
+          
     - if project_nav_tab? :files
       = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do
-        = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
+        = link_to project_files_path(@project), title: 'Code',  class: 'shortcuts-tree' do
           = icon('code fw')
           %span
             Code
@@ -42,7 +44,7 @@
     - if project_nav_tab? :pipelines
       = nav_link(controller: :pipelines) do
         = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
-          = icon('ship fw')
+          = navbar_icon('pipelines')
           %span
             Pipelines
 
@@ -63,14 +65,14 @@
     - if project_nav_tab? :milestones
       = nav_link(controller: :milestones) do
         = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-          = icon('clock-o fw')
+          = navbar_icon('milestones')
           %span
             Milestones
 
     - if project_nav_tab? :issues
       = nav_link(controller: :issues) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
-          = icon('exclamation-circle fw')
+          = navbar_icon('issues')
           %span
             Issues
             - if @project.default_issues_tracker?
@@ -79,7 +81,7 @@
     - if project_nav_tab? :merge_requests
       = nav_link(controller: :merge_requests) do
         = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
-          = icon('tasks fw')
+          = navbar_icon('mr')
           %span
             Merge Requests
             %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
@@ -94,7 +96,7 @@
     - if project_nav_tab? :wiki
       = nav_link(controller: :wikis) do
         = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
-          = icon('book fw')
+          = navbar_icon('wiki')
           %span
             Wiki
 
diff --git a/app/views/shared/icons/_commits.svg b/app/views/shared/icons/_commits.svg
new file mode 100644
index 00000000000..ba9bb89935e
--- /dev/null
+++ b/app/views/shared/icons/_commits.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 240</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M3,8 C3,5.951 4.236,4.194 6,3.422 L6,0 L1,0 C0.448,0 0,0.448 0,1 L0,15 C0,15.552 0.448,16 1,16 L6,16 L6,12.578 C4.236,11.806 3,10.049 3,8 M7,12.899 L7,16 L9,16 L9,12.899 C8.677,12.965 8.343,13 8,13 C7.657,13 7.323,12.965 7,12.899 M15,0 L10,0 L10,3.422 C11.764,4.194 13,5.951 13,8 C13,10.049 11.764,11.806 10,12.578 L10,16 L15,16 C15.552,16 16,15.552 16,15 L16,1 C16,0.448 15.552,0 15,0 M10,8 C10,9.105 9.105,10 8,10 C6.895,10 6,9.105 6,8 C6,6.895 6.895,6 8,6 C9.105,6 10,6.895 10,8 M4,8 C4,10.209 5.791,12 8,12 C10.209,12 12,10.209 12,8 C12,5.791 10.209,4 8,4 C5.791,4 4,5.791 4,8 M9,3.101 L9,0 L7,0 L7,3.101 C7.323,3.035 7.657,3 8,3 C8.343,3 8.677,3.035 9,3.101" id="Pasted-Image-240" fill="#7E7D7D"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_files.svg b/app/views/shared/icons/_files.svg
new file mode 100644
index 00000000000..fc378d81e40
--- /dev/null
+++ b/app/views/shared/icons/_files.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 237</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Pasted-Image-237">
+            <path d="M15.1111,16 C15.6021,16 16.0001,15.602 16.0001,15.111 L16.0001,4.444 C15.5341,3.983 12.0671,0.378 11.5551,0 L0.8891,0 C0.3981,0 0.0001,0.398 0.0001,0.889 L0.0001,15.111 C0.0001,15.602 0.3981,16 0.8891,16 L15.1111,16 M14.0001,14.111 L1.8891,14.111 L1.8891,2 L10.8131,2 C11.4451,2.42 13.5811,4.555 14.0001,5.187 L14.0001,14.111" id="Fill-1" fill="#7E7D7D"></path>
+            <path d="M0.889,0 C0.398,0 0,0.398 0,0.889 L0,15.111 C0,15.602 0.398,16 0.889,16 L15.111,16 C15.602,16 16,15.602 16,15.111 L16,4.445 C15.534,3.983 12.068,0.377 11.555,0 L0.889,0 L0.889,0 Z M1.889,2 L10.813,2 C11.446,2.42 13.581,4.554 14,5.187 L14,14.111 L1.889,14.111 L1.889,2 L1.889,2 Z" id="Clip-4"></path>
+            <polygon id="Fill-6" fill="#7E7D7D" points="9 7 11 7 11 2 9 2"></polygon>
+            <polygon id="Clip-9" points="9 7 11 7 11 2.001 9 2.001"></polygon>
+            <polygon id="Fill-11" fill="#7E7D7D" points="10 7 15.444 7 15.444 5 10 5"></polygon>
+            <polygon id="Clip-14" points="10 7 15.444 7 15.444 5 10 5"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_pipelines.svg b/app/views/shared/icons/_pipelines.svg
new file mode 100644
index 00000000000..794e8a27025
--- /dev/null
+++ b/app/views/shared/icons/_pipelines.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 246</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.5,14 C11.672,14 11,13.328 11,12.5 C11,11.672 11.672,11 12.5,11 C13.328,11 14,11.672 14,12.5 C14,13.328 13.328,14 12.5,14 M12.5,9 L3.5,9 C1.567,9 0,10.567 0,12.5 C0,14.433 1.567,16 3.5,16 L12.5,16 C14.433,16 16,14.433 16,12.5 C16,10.567 14.433,9 12.5,9 M3.5,2 C4.328,2 5,2.672 5,3.5 C5,4.328 4.328,5 3.5,5 C2.672,5 2,4.328 2,3.5 C2,2.672 2.672,2 3.5,2 M3.5,7 L12.5,7 C14.433,7 16,5.433 16,3.5 C16,1.567 14.433,0 12.5,0 L3.5,0 C1.567,0 0,1.567 0,3.5 C0,5.433 1.567,7 3.5,7" id="Pasted-Image-246" fill="#303030"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_project.svg b/app/views/shared/icons/_project.svg
new file mode 100644
index 00000000000..1e8b43f8c6b
--- /dev/null
+++ b/app/views/shared/icons/_project.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>Page 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M6,6 L12,6 L12,5 L6,5 L6,6 Z M6,8 L12,8 L12,7 L6,7 L6,8 Z M6,10 L12,10 L12,9 L6,9 L6,10 Z M6,12 L12,12 L12,11 L6,11 L6,12 Z M4,6 L5,6 L5,5 L4,5 L4,6 Z M4,8 L5,8 L5,7 L4,7 L4,8 Z M4,10 L5,10 L5,9 L4,9 L4,10 Z M4,12 L5,12 L5,11 L4,11 L4,12 Z M13,3 L10,3 L10,4 L6,4 L6,3 L3,3 L3,13 L13,13 L13,3 Z M2,14 L14,14 L14,2 L2,2 L2,14 Z M1,0 C0.448,0 0,0.448 0,1 L0,15 C0,15.552 0.448,16 1,16 L15,16 C15.552,16 16,15.552 16,15 L16,1 C16,0.448 15.552,0 15,0 L1,0 Z" fill="#7F7E7E"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/views/shared/icons/_wiki.svg b/app/views/shared/icons/_wiki.svg
new file mode 100644
index 00000000000..182d91e23aa
--- /dev/null
+++ b/app/views/shared/icons/_wiki.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>Pasted Image 241</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M2.004,12.9999459 L3.939,12.9999459 L3.939,4.99994585 L2.004,4.99994585 L2.004,12.9999459 Z M7.017,9.99994585 L13.018,9.99994585 L13.018,8.99994585 L7.017,8.99994585 L7.017,9.99994585 Z M7.017,7.99994585 L13.018,7.99994585 L13.018,6.99994585 L7.017,6.99994585 L7.017,7.99994585 Z M7.017,5.99994585 L13.018,5.99994585 L13.018,4.99994585 L7.017,4.99994585 L7.017,5.99994585 Z M14.754,-5.41499267e-05 L4.938,-5.41499267e-05 C4.386,-5.41499267e-05 3.938,0.44794585 3.938,0.99994585 L3.938,2.99994585 L1,2.99994585 C0.448,2.99994585 0,3.44794585 0,3.99994585 L0,12.9999459 C0.037,13.4999459 -0.25,16.0509459 3.938,15.9999459 L12.408,15.9999459 C12.408,15.9999459 15.754,15.9169459 15.754,13.9999459 L15.754,0.99994585 C15.754,0.44794585 15.306,-5.41499267e-05 14.754,-5.41499267e-05 L14.754,-5.41499267e-05 Z" id="Pasted-Image-241" fill="#7E7D7D"></path>
+    </g>
+</svg>
\ No newline at end of file

From cdcca06b143c85e48196993a29ee73f746463dc9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Jun 2016 21:01:53 +0300
Subject: [PATCH 1307/1431] Remove icons from button on wiki pages. Also
 consistent padding between buttons there

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/builds/index.html.haml      | 1 -
 app/views/projects/milestones/index.html.haml  | 1 -
 app/views/projects/milestones/show.html.haml   | 2 --
 app/views/projects/pipelines/index.html.haml   | 2 --
 app/views/projects/wikis/_main_links.html.haml | 6 ++----
 app/views/projects/wikis/_nav.html.haml        | 1 -
 6 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 55d2ac89ebc..181547316aa 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -34,7 +34,6 @@
           = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
 
         = link_to ci_lint_path, class: 'btn btn-default' do
-          = icon('wrench')
           %span CI Lint
 
   %ul.content-list
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index e6133b22f96..60a5b83434e 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -6,7 +6,6 @@
   .nav-controls
     - if can?(current_user, :admin_milestone, @project)
       = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: "btn btn-new", title: "New Milestone" do
-        = icon('plus')
         New Milestone
 
 .milestones
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 19944e3e023..0b0e2bd6868 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -23,11 +23,9 @@
         = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped"
 
       = link_to edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-grouped btn-nr" do
-        = icon('pencil-square-o')
         Edit
 
       = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-danger" do
-        = icon('trash-o')
         Delete
 
 .detail-page-description.milestone-detail
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index a78450e09d4..b70693eeb62 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -28,14 +28,12 @@
     .nav-controls
       - if can? current_user, :create_pipeline, @project
         = link_to new_namespace_project_pipeline_path(@project.namespace, @project), class: 'btn btn-create' do
-          = icon('plus')
           New pipeline
 
         - unless @repository.gitlab_ci_yml
           = link_to 'Get started with Pipelines', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
 
         = link_to ci_lint_path, class: 'btn btn-default' do
-          = icon('wrench')
           %span CI Lint
 
   %ul.content-list.pipelines
diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml
index 2b91b7e8f65..4faa547769b 100644
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
@@ -1,11 +1,9 @@
 - if (@page && @page.persisted?)
-  = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
+  = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do
     Page History
   - if can?(current_user, :create_wiki, @project)
-    = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn btn-grouped" do
-      %i.fa.fa-pencil-square-o
+    = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn" do
       Edit
   - if can?(current_user, :admin_wiki, @project)
     = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-remove" do
-      = icon('trash')
       Delete
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index a722fbc5352..988fe024e28 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -13,7 +13,6 @@
   .nav-controls
     - if can?(current_user, :create_wiki, @project)
       = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-        = icon('plus')
         New Page
 
 = render 'projects/wikis/new'

From 7be19db42fd51da23b1ef658263897213b624500 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 8 Jun 2016 02:02:55 -0500
Subject: [PATCH 1308/1431] Set target="_blank" for external links

---
 lib/banzai/filter/external_link_filter.rb |  3 +++
 spec/features/markdown_spec.rb            | 10 ++++++++++
 spec/fixtures/markdown.md.erb             |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/banzai/filter/external_link_filter.rb b/lib/banzai/filter/external_link_filter.rb
index 38c4219518e..27ca38e6d4a 100644
--- a/lib/banzai/filter/external_link_filter.rb
+++ b/lib/banzai/filter/external_link_filter.rb
@@ -15,6 +15,9 @@ module Banzai
           next if link.start_with?(internal_url)
 
           node.set_attribute('rel', 'nofollow noreferrer')
+
+          # Open external links on a new tab
+          node.set_attribute('target', '_blank')
         end
 
         doc
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 7663d193354..cabccdacf87 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -173,10 +173,20 @@ describe 'GitLab Markdown', feature: true do
         expect(link.attr('rel')).to include('noreferrer')
       end
 
+      it 'adds _blank to target attribute for external links' do
+        link = doc.at_css('a:contains("Google")')
+        expect(link.attr('target')).to match('_blank')
+      end
+
       it 'ignores internal link' do
         link = doc.at_css('a:contains("GitLab Root")')
         expect(link.attr('rel')).not_to match 'nofollow'
       end
+
+      it 'does not set _blank to target attribute for internal links' do
+        link = doc.at_css('a:contains("GitLab Root")')
+        expect(link.attr('target')).not_to match '_blank'
+      end
     end
   end
 
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 34ce7c4f033..c75d28d9801 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -136,7 +136,7 @@ But it shouldn't autolink text inside certain tags:
 
 ### ExternalLinkFilter
 
-External links get a `rel="nofollow"` attribute:
+External links get a `rel="nofollow noreferrer"` and `target="_blank"` attributes:
 
 - [Google](https://google.com/)
 - [GitLab Root](<%= Gitlab.config.gitlab.url %>)

From 064cff13fd7d02672695b4ac1722bbd6df35f1d4 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 8 Jun 2016 12:14:56 -0500
Subject: [PATCH 1309/1431] Remove obvious comment and extra line

---
 lib/banzai/filter/external_link_filter.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/banzai/filter/external_link_filter.rb b/lib/banzai/filter/external_link_filter.rb
index 27ca38e6d4a..f73ecfc9418 100644
--- a/lib/banzai/filter/external_link_filter.rb
+++ b/lib/banzai/filter/external_link_filter.rb
@@ -15,8 +15,6 @@ module Banzai
           next if link.start_with?(internal_url)
 
           node.set_attribute('rel', 'nofollow noreferrer')
-
-          # Open external links on a new tab
           node.set_attribute('target', '_blank')
         end
 

From 27ada5aa4690affd04ada606d15a44a598184c57 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 8 Jun 2016 12:20:24 -0500
Subject: [PATCH 1310/1431] Combine tests for internal links

---
 spec/features/markdown_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index cabccdacf87..1193cae5a2f 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -165,26 +165,26 @@ describe 'GitLab Markdown', feature: true do
     describe 'ExternalLinkFilter' do
       it 'adds nofollow to external link' do
         link = doc.at_css('a:contains("Google")')
+
         expect(link.attr('rel')).to include('nofollow')
       end
 
       it 'adds noreferrer to external link' do
         link = doc.at_css('a:contains("Google")')
+
         expect(link.attr('rel')).to include('noreferrer')
       end
 
       it 'adds _blank to target attribute for external links' do
         link = doc.at_css('a:contains("Google")')
+
         expect(link.attr('target')).to match('_blank')
       end
 
       it 'ignores internal link' do
         link = doc.at_css('a:contains("GitLab Root")')
-        expect(link.attr('rel')).not_to match 'nofollow'
-      end
 
-      it 'does not set _blank to target attribute for internal links' do
-        link = doc.at_css('a:contains("GitLab Root")')
+        expect(link.attr('rel')).not_to match 'nofollow'
         expect(link.attr('target')).not_to match '_blank'
       end
     end

From 26d4e633413d359c278262c9d9b2d3b94b0792e2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 8 Jun 2016 13:02:32 -0500
Subject: [PATCH 1311/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 657c6f48334..3ae881da362 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,7 @@ v 8.9.0 (unreleased)
   - An indicator is now displayed at the top of the comment field for confidential issues.
   - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
   - Improve issuables APIs performance when accessing notes !4471
+  - External links now open in a new tab
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds

From 40b6d9064a2ab6c89cb54b62536fe2952c6cbca6 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 9 May 2016 16:12:53 +0100
Subject: [PATCH 1312/1431] Allow custom text on 'almost there' page

Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
---
 CHANGELOG                                              |  1 +
 app/assets/stylesheets/pages/confirmation.scss         | 10 +++++++++-
 .../admin/application_settings_controller.rb           |  1 +
 app/helpers/application_settings_helper.rb             |  4 ++++
 app/models/application_setting.rb                      |  5 ++++-
 app/views/admin/application_settings/_form.html.haml   |  5 +++++
 app/views/devise/confirmations/almost_there.haml       |  3 +++
 ...2_add_after_sign_up_text_to_application_settings.rb |  5 +++++
 db/schema.rb                                           |  3 ++-
 lib/api/entities.rb                                    |  1 +
 lib/gitlab/current_settings.rb                         |  5 ++++-
 11 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb

diff --git a/CHANGELOG b/CHANGELOG
index 657c6f48334..0593ce2308f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.9.0 (unreleased)
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
+  - Allow customisable text on the 'nearly there' page after a user signs up
   - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
   - Allow forking projects with restricted visibility level
   - Improve note validation to prevent errors when creating invalid note via API
diff --git a/app/assets/stylesheets/pages/confirmation.scss b/app/assets/stylesheets/pages/confirmation.scss
index 125f495d6d4..292225c5261 100644
--- a/app/assets/stylesheets/pages/confirmation.scss
+++ b/app/assets/stylesheets/pages/confirmation.scss
@@ -2,13 +2,21 @@
   margin-bottom: 20px;
   border-bottom: 1px solid #eee;
 
-  > h1 {
+  > h1, h2, h3, h4, h5, h6 {
     font-weight: 400;
   }
 
   .lead {
     margin-bottom: 20px;
   }
+
+  ul, ol {
+    padding-left: 0;
+  }
+
+  li {
+    list-style-type: none;
+  }
 }
 
 .confirmation-content {
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 0a34a12e2a7..f4eda864aac 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -74,6 +74,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :two_factor_grace_period,
       :gravatar_enabled,
       :sign_in_text,
+      :after_sign_up_text,
       :help_page_text,
       :home_page_url,
       :after_sign_out_path,
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 03080d25931..55313fd8357 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -15,6 +15,10 @@ module ApplicationSettingsHelper
     current_application_settings.sign_in_text
   end
 
+  def after_sign_up_text
+    current_application_settings.after_sign_up_text
+  end
+
   def shared_runners_text
     current_application_settings.shared_runners_text
   end
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 42f908aa344..a744f937918 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -113,7 +113,10 @@ class ApplicationSetting < ActiveRecord::Base
       signup_enabled: Settings.gitlab['signup_enabled'],
       signin_enabled: Settings.gitlab['signin_enabled'],
       gravatar_enabled: Settings.gravatar['enabled'],
-      sign_in_text: Settings.extra['sign_in_text'],
+      sign_in_text: nil,
+      after_sign_up_text: nil,
+      help_page_text: nil,
+      shared_runners_text: nil,
       restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
       max_attachment_size: Settings.gitlab['max_attachment_size'],
       session_expire_delay: Settings.gitlab['session_expire_delay'],
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index f149f9eb431..c883e8f97da 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -154,6 +154,11 @@
       .col-sm-10
         = f.text_area :sign_in_text, class: 'form-control', rows: 4
         .help-block Markdown enabled
+    .form-group
+      = f.label :after_sign_up_text, class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
+        .help-block Markdown enabled
     .form-group
       = f.label :help_page_text, class: 'control-label col-sm-2'
       .col-sm-10
diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml
index 3c3830a3f10..73c3a3dd2eb 100644
--- a/app/views/devise/confirmations/almost_there.haml
+++ b/app/views/devise/confirmations/almost_there.haml
@@ -3,6 +3,9 @@
     Almost there...
   %p.lead
     Please check your email to confirm your account
+- if after_sign_up_text.present?
+  .well-confirmation.text-center
+    = markdown(after_sign_up_text)
 %p.confirmation-content.text-center
   No confirmation email received? Please check your spam folder or
 .append-bottom-20.prepend-top-20.text-center
diff --git a/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb b/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb
new file mode 100644
index 00000000000..89826fb96cb
--- /dev/null
+++ b/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb
@@ -0,0 +1,5 @@
+class AddAfterSignUpTextToApplicationSettings < ActiveRecord::Migration
+  def change
+    add_column :application_settings, :after_sign_up_text, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 00829d63b66..b7adf48fdb4 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: 20160603182247) do
+ActiveRecord::Schema.define(version: 20160608155312) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -84,6 +84,7 @@ ActiveRecord::Schema.define(version: 20160603182247) do
     t.string   "health_check_access_token"
     t.boolean  "send_user_confirmation_email",          default: false
     t.integer  "container_registry_token_expire_delay", default: 5
+    t.text     "after_sign_up_text"
   end
 
   create_table "audit_events", force: :cascade do |t|
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 66c138eb902..50d69274b2e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -351,6 +351,7 @@ module API
       expose :signin_enabled
       expose :gravatar_enabled
       expose :sign_in_text
+      expose :after_sign_up_text
       expose :created_at
       expose :updated_at
       expose :home_page_url
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 92c7e8b9d88..5e7532f57ae 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -26,7 +26,10 @@ module Gitlab
         signup_enabled: Settings.gitlab['signup_enabled'],
         signin_enabled: Settings.gitlab['signin_enabled'],
         gravatar_enabled: Settings.gravatar['enabled'],
-        sign_in_text: Settings.extra['sign_in_text'],
+        sign_in_text: nil,
+        after_sign_up_text: nil,
+        help_page_text: nil,
+        shared_runners_text: nil,
         restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
         max_attachment_size: Settings.gitlab['max_attachment_size'],
         session_expire_delay: Settings.gitlab['session_expire_delay'],

From 0cfa368bf8cae4f9a54186241b06ef588688cfb2 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 8 Jun 2016 14:17:03 -0400
Subject: [PATCH 1313/1431] Fix version references in 8.8 to 8.9 update guide

[ci skip]
---
 doc/update/8.8-to-8.9.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/update/8.8-to-8.9.md b/doc/update/8.8-to-8.9.md
index 67a986ead57..f14046bb4be 100644
--- a/doc/update/8.8-to-8.9.md
+++ b/doc/update/8.8-to-8.9.md
@@ -120,7 +120,7 @@ will need to let gitlab-workhorse listen on a TCP port. You can do this
 via [/etc/default/gitlab].
 
 [Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
-[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/lib/support/init.d/gitlab.default.example#L37
+[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-9-stable/lib/support/init.d/gitlab.default.example#L37
 
 #### Init script
 
@@ -145,7 +145,7 @@ To make sure you didn't miss anything run a more thorough check:
 
 If all items are green, then congratulations, the upgrade is complete!
 
-## Things went south? Revert to previous version (8.7)
+## Things went south? Revert to previous version (8.8)
 
 ### 1. Revert the code to the previous version
 

From 59e47e67ea426df14dc0eb5c25073883a7d6d99c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 8 Jun 2016 13:50:44 -0500
Subject: [PATCH 1314/1431] Fix merge conflicts from removing links from
 sidebar

---
 app/assets/stylesheets/framework/sidebar.scss |  6 +-----
 app/views/layouts/nav/_dashboard.html.haml    | 20 +++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 12a342bf0b3..f438acfa4bf 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -109,12 +109,8 @@
       }
 
       i {
-        width: 16px;
         color: $gray-light;
-      }
-
-      svg {
-        margin-right: 13px;
+        font-size: 16px;
       }
 
       .nav-link-text {
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 2f956dbbd77..b73fde7797f 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -11,37 +11,23 @@
         Todos
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
-      = icon('dashboard fw')
-      .nav-link-text
-        Activity
-  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
-    = link_to dashboard_groups_path, title: 'Groups' do
-      = icon('group fw')
-      .nav-link-text
-        Groups
-  = nav_link(controller: 'dashboard/milestones') do
-    = link_to dashboard_milestones_path, title: 'Milestones' do
-      = icon('clock-o fw')
-      .nav-link-text
-        Milestones
-  = nav_link(path: 'dashboard#issues') do
-    = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = navbar_icon('activity')
       .nav-link-text
         Activity
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = navbar_icon('group')
-      %span
+      .nav-link-text
         Groups
   = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = navbar_icon('milestones')
-      %span
+      .nav-link-text
         Milestones
   = nav_link(path: 'dashboard#issues') do
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = navbar_icon('issues')
+      .nav-link-text
         Issues
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do

From f367582ffe275dde4a0bd5ef281fd9e93e7586e5 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 8 Jun 2016 14:03:01 -0500
Subject: [PATCH 1315/1431] Use container helper instead of hard coded
 container

---
 app/views/groups/show.html.haml          | 2 +-
 app/views/projects/_home_panel.html.haml | 2 +-
 app/views/projects/show.html.haml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 77c297255b8..dbc3d1b07f6 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,7 +5,7 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 .cover-block.groups-cover-block
-  .container-fluid.container-limited
+  %div{ class: (container_class) }
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s70"
     .group-info
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index f0e04a0235d..f5bc1b4e409 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,6 +1,6 @@
 - empty_repo = @project.empty_repo?
 .project-home-panel.cover-block.clearfix{:class => ("empty-project" if empty_repo)}
-  .container-fluid.container-limited
+  %div{ class: (container_class) }
     .row
       .project-image-container
         = project_icon(@project, alt: '', class: 'project-avatar avatar s70')
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index a19c7c406a0..4afa902b4eb 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -13,7 +13,7 @@
 = render "home_panel"
 
 .project-stats.row-content-block.second-block
-  .container-fluid.container-limited
+  %div{ class: (container_class) }
     %ul.nav
       %li
         = link_to project_files_path(@project) do

From cba32b71bd27b747f5a667ec6ba11ff5e21362ef Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 8 Jun 2016 11:34:24 +0100
Subject: [PATCH 1316/1431] Allow clones from /namespace/project

Redirect /namespace/project/info/refs to
/namespace/project.git/info/refs, so `git clone` works on either
namespace/project.git or namespace/project.
---
 CHANGELOG        |  1 +
 config/routes.rb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5136756079d..419ea3d1b50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.9.0 (unreleased)
   - Redesign navigation for project pages
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
+  - `git clone https://host/namespace/project` now works, in addition to using the `.git` suffix
   - Bump nokogiri to 1.6.8
   - Use gitlab-shell v3.0.0
   - Use Knapsack to evenly distribute tests across multiple nodes
diff --git a/config/routes.rb b/config/routes.rb
index 240dcc74b06..f1a43cbbd26 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -441,6 +441,23 @@ Rails.application.routes.draw do
   resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
     resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, except:
               [:new, :create, :index], path: "/") do
+
+      # Allow /info/refs, /info/refs?service=git-upload-pack, and
+      # /info/refs?service=git-receive-pack, but nothing else.
+      #
+      git_http_handshake = lambda do |request|
+        request.query_string.blank? ||
+          request.query_string.match(/\Aservice=git-(upload|receive)-pack\z/)
+      end
+
+      ref_redirect = redirect do |params, request|
+        path = "#{params[:namespace_id]}/#{params[:project_id]}.git/info/refs"
+        path << "?#{request.query_string}" unless request.query_string.blank?
+        path
+      end
+
+      get '/info/refs', constraints: git_http_handshake, to: ref_redirect
+
       member do
         put :transfer
         delete :remove_fork

From 63ed80321b00b96b79e064d1932528b8617d1625 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 8 Jun 2016 18:36:43 +0200
Subject: [PATCH 1317/1431] Skip authenticity token checks for Git HTTP

---
 app/controllers/projects/git_http_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 380139a9c30..348d6cf4d96 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -1,6 +1,8 @@
 class Projects::GitHttpController < Projects::ApplicationController
   attr_reader :user
 
+  # Git clients will not know what authenticity token to send along
+  skip_before_action :verify_authenticity_token
   skip_before_action :repository
   before_action :authenticate_user
   before_action :ensure_project_found!

From 58456e26f5149eb60a401f7f400effe994c59360 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 8 Jun 2016 19:40:32 +0300
Subject: [PATCH 1318/1431] Fixes for MR comments.

---
 app/assets/javascripts/milestone_select.js.coffee | 4 ++--
 app/helpers/milestones_helper.rb                  | 2 +-
 app/views/projects/milestones/show.html.haml      | 2 +-
 app/views/shared/issuable/_sidebar.html.haml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index df6ba3167db..648e1f3bde0 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -25,7 +25,7 @@ class @MilestoneSelect
       if issueUpdateURL
         milestoneLinkTemplate = _.template(
           '<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
-            <span class="has-tooltip" data-container="body" data-title="<%= remaining %>">
+            <span class="has-tooltip" data-container="body" title="<%= remaining %>">
               <%= _.escape(title) %>
             </span>
           </a>'
@@ -34,7 +34,7 @@ class @MilestoneSelect
         milestoneLinkNoneTemplate = '<div class="light">None</div>'
 
         collapsedSidebarLabelTemplate = _.template(
-          '<span class="has-tooltip" data-container="body" data-title="<%= remaining %>" data-placement="left">
+          '<span class="has-tooltip" data-container="body" title="<%= remaining %>" data-placement="left">
             <%= _.escape(title) %>
           </span>'
         )
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index e28ca13ec23..b3e6e468ecd 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -56,7 +56,7 @@ module MilestonesHelper
 
   def milestone_remaining_days(milestone)
     if milestone.expired?
-      content_tag(:strong, 'Past Due')
+      content_tag(:strong, 'Past due')
     elsif milestone.due_date
       days    = milestone.remaining_days
       content = content_tag(:strong, days)
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 58b1f8f664f..fe3dde8b251 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -6,7 +6,7 @@
     - if @milestone.closed?
       Closed
     - elsif @milestone.expired?
-      Past Due
+      Past due
     - else
       Open
   %span.identifier
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 8993261d22a..d2b0d956d07 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -53,7 +53,7 @@
         .value.bold.hide-collapsed
           - if issuable.milestone
             = link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do
-              %span.has-tooltip{ "title" => milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1 } }
+              %span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1}}
                 = issuable.milestone.title
           - else
             .light None

From a280116a058bb74f3fa29f40caf2ac962b662f49 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 8 Jun 2016 16:15:30 -0500
Subject: [PATCH 1319/1431] Fix activity SVG

---
 app/assets/stylesheets/framework/sidebar.scss |  1 -
 app/views/shared/icons/_activity.svg          | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f438acfa4bf..a1202374a09 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -109,7 +109,6 @@
       }
 
       i {
-        color: $gray-light;
         font-size: 16px;
       }
 
diff --git a/app/views/shared/icons/_activity.svg b/app/views/shared/icons/_activity.svg
index 69e5afd3a4c..c87794b9062 100644
--- a/app/views/shared/icons/_activity.svg
+++ b/app/views/shared/icons/_activity.svg
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>Group 5</title>
+    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>path-1</title>
     <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M5,0 C4.448,0 4,0.448 4,1 L4,3 L1,3 C0.448,3 0,3.448 0,4 L0,9 C0,9.552 0.448,10 1,10 L5,10 L5,8 L11,8 L11,10 L15,10 C15.552,10 16,9.552 16,9 L16,4 C16,3.448 15.552,3 15,3 L12,3 L12,1 C12,0.448 11.552,0 11,0 L5,0 L5,0 Z M6,2.5 C6,2.224 6.224,2 6.5,2 L9.5,2 C9.776,2 10,2.224 10,2.5 C10,2.776 9.776,3 9.5,3 L6.5,3 C6.224,3 6,2.776 6,2.5 L6,2.5 Z M6,11 L10.001,11 L10.001,9 L6,9 L6,11 L6,11 Z M11,11 L11,12 L5,12 L5,11 L1,11 C0.448,11 0,11.448 0,12 L0,15 C0,15.552 0.448,16 1,16 L15,16 C15.552,16 16,15.552 16,15 L16,12 C16,11.448 15.552,11 15,11 L11,11 L11,11 Z" id="path-1"></path>
+        <path d="M5,0 C4.448,0 4,0.448 4,1 L4,3 L1,3 C0.448,3 0,3.448 0,4 L0,9 C0,9.552 0.448,10 1,10 L5,10 L5,8 L11,8 L11,10 L15,10 C15.552,10 16,9.552 16,9 L16,4 C16,3.448 15.552,3 15,3 L12,3 L12,1 C12,0.448 11.552,0 11,0 L5,0 L5,0 L5,0 Z M6,2.5 C6,2.224 6.224,2 6.5,2 L9.5,2 C9.776,2 10,2.224 10,2.5 C10,2.776 9.776,3 9.5,3 L6.5,3 C6.224,3 6,2.776 6,2.5 L6,2.5 L6,2.5 Z M6,11 L10.001,11 L10.001,9 L6,9 L6,11 L6,11 L6,11 Z M11,11 L11,12 L5,12 L5,11 L1,11 C0.448,11 0,11.448 0,12 L0,15 C0,15.552 0.448,16 1,16 L15,16 C15.552,16 16,15.552 16,15 L16,12 C16,11.448 15.552,11 15,11 L11,11 L11,11 L11,11 Z" id="path-1"></path>
     </defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-5">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Clip-4"></g>
-            <polygon id="Fill-3" fill="#7E7C7C" mask="url(#mask-2)" points="-5 21 21 21 21 -5 -5 -5"></polygon>
-        </g>
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="path-1" fill="#D8D8D8" xlink:href="#path-1"></use>
     </g>
 </svg>
\ No newline at end of file

From 9282810fb7b6102657a0ddb2a02f71b6da22067f Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Wed, 8 Jun 2016 18:09:43 -0500
Subject: [PATCH 1320/1431] Syntax fixes and better logging around the
 `ldap_person` method.

---
 lib/gitlab/o_auth/user.rb         | 9 +++++----
 spec/lib/gitlab/saml/user_spec.rb | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 5e52979093d..78f3ecb4cb4 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -70,15 +70,16 @@ module Gitlab
 
         # If a corresponding person exists with same uid in a LDAP server,
         # check if the user already has a GitLab account.
-        if (user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider))
+        user = Gitlab::LDAP::User.find_by_uid_and_provider(ldap_person.dn, ldap_person.provider)
+        if user
           # Case when a LDAP user already exists in Gitlab. Add the OAuth identity to existing account.
-          log.info "LDAP account found for user #{user.username}. Building new identity."
+          log.info "LDAP account found for user #{user.username}. Building new #{auth_hash.provider} identity."
           user.identities.build(extern_uid: auth_hash.uid, provider: auth_hash.provider)
         else
-          log.info 'No existing LDAP account was found in GitLab. Checking for OAuth account.'
+          log.info "No existing LDAP account was found in GitLab. Checking for #{auth_hash.provider} account."
           user = find_by_uid_and_provider
           if user.nil?
-            log.info 'No user found with the specified OAuth provider. Creating a new one.'
+            log.info "No user found using #{auth_hash.provider} provider. Creating a new one."
             user = build_new_user
           end
           log.info "Correct account has been found. Adding LDAP identity to user: #{user.username}."
diff --git a/spec/lib/gitlab/saml/user_spec.rb b/spec/lib/gitlab/saml/user_spec.rb
index 5957998e0f3..84c21ceefd9 100644
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
@@ -184,9 +184,9 @@ describe Gitlab::Saml::User, lib: true do
                 create(:omniauth_user, email: 'john@mail.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'saml', username: 'john')
                 local_hash = OmniAuth::AuthHash.new(uid: 'uid=user1,ou=People,dc=example', provider: provider, info: info_hash)
                 local_saml_user = described_class.new(local_hash)
-
                 local_saml_user.save
                 local_gl_user = local_saml_user.gl_user
+
                 expect(local_gl_user).to be_valid
                 expect(local_gl_user.identities.length).to eql 2
                 identities_as_hash = local_gl_user.identities.map { |id| { provider: id.provider, extern_uid: id.extern_uid } }
@@ -194,7 +194,6 @@ describe Gitlab::Saml::User, lib: true do
                                                             { provider: 'saml', extern_uid: 'uid=user1,ou=People,dc=example' }
                                                           ])
               end
-
             end
           end
         end

From bdc995bf00794f96af46d92f61a940896c1404d0 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 8 Jun 2016 17:09:48 -0600
Subject: [PATCH 1321/1431] Shows award emoji for comments to all users who are
 logged in.

---
 app/views/projects/notes/_note.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 5ddd0ecc4c1..bcdbff08011 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -20,10 +20,11 @@
           - access = note.project.team.human_max_access(note.author.id)
           - if access
             %span.note-role.hidden-xs= access
-          - if note_editable
+          - if current_user
             = link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
               = icon('spinner spin')
               = icon('smile-o')
+          - if note_editable
             = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
               = icon('pencil')
             = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do

From 091e0300708e72049d4ee27b995d0f17c360d167 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 9 Jun 2016 02:56:07 +0300
Subject: [PATCH 1322/1431] Instantiate awardsHandler in application main
 script.

---
 app/assets/javascripts/application.js.coffee | 1 +
 app/assets/javascripts/dispatcher.js.coffee  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index ebf425550e9..c300370f40c 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -268,5 +268,6 @@ $ ->
     .on "resize", (e) ->
       fitSidebarForSize()
 
+  gl.awardsHandler = new AwardsHandler()
   checkInitialSidebarSize()
   new Aside()
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 5d6ac6e757e..29ac0f70b30 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -23,7 +23,6 @@ class Dispatcher
         new Issue()
         shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
-        gl.awardsHandler = new AwardsHandler()
       when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
         new Milestone()
       when 'dashboard:todos:index'
@@ -54,7 +53,6 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
-        gl.awardsHandler = new AwardsHandler()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()

From 52525dc4c28750a61697375900830589bb79eaa9 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 9 Jun 2016 03:02:49 +0300
Subject: [PATCH 1323/1431] Render frequent emoji block once.

---
 app/assets/javascripts/awards_handler.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index efa8f6cd010..0e5dcdc4643 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -65,7 +65,7 @@ class @AwardsHandler
         $addBtn.removeClass 'is-loading'
         $menu = $('.emoji-menu')
         @positionMenu($menu, $addBtn)
-        @renderFrequentlyUsedBlock()
+        @renderFrequentlyUsedBlock() unless @frequentEmojiBlockRendered
 
         setTimeout =>
           $menu.addClass 'is-visible'
@@ -343,6 +343,8 @@ class @AwardsHandler
 
       $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
 
+    @frequentEmojiBlockRendered = yes
+
 
   setupSearch: ->
 

From 92af60c2449cae5cbe2a8ef8ea65e973017053c2 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 9 Jun 2016 03:27:52 +0300
Subject: [PATCH 1324/1431] Move award_menu_url variable into gon object.

---
 app/assets/javascripts/awards_handler.coffee   |  2 +-
 app/views/award_emoji/_awards_block.html.haml  |  3 ---
 lib/gitlab/gon_helper.rb                       |  1 +
 spec/javascripts/awards_handler_spec.js.coffee | 13 ++++++-------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 0e5dcdc4643..58fd8f05902 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -282,7 +282,7 @@ class @AwardsHandler
     @createEmojiMenu @getAwardMenuUrl(), => @createEmoji_ votesBlock, emoji
 
 
-  getAwardMenuUrl: -> return gl.awardMenuUrl
+  getAwardMenuUrl: -> return gon.award_menu_url
 
 
   resolveNameToCssClass: (emoji) ->
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index 84fd146a26b..02efcecc889 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -7,9 +7,6 @@
         = awards.count
 
   - if current_user
-    :javascript
-      gl.awardMenuUrl = "#{emojis_path}"
-
     .award-menu-holder.js-award-holder
       %button.btn.award-control.js-add-award{ type: "button" }
         = icon('smile-o', class: "award-control-icon award-control-icon-normal")
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index ab900b641c4..f751a3a12fd 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -8,6 +8,7 @@ module Gitlab
       gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
       gon.shortcuts_path         = help_shortcuts_path
       gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class
+      gon.award_menu_url         = emojis_path
 
       if current_user
         gon.current_user_id = current_user.id
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee
index 0bd6d696387..ba191199dc7 100644
--- a/spec/javascripts/awards_handler_spec.js.coffee
+++ b/spec/javascripts/awards_handler_spec.js.coffee
@@ -3,10 +3,11 @@
 #= require jquery.cookie
 #= require ./fixtures/emoji_menu
 
-awardsHandler   = null
-window.gl     or= {}
-gl.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
-gl.awardMenuUrl = '/emojis'
+awardsHandler      = null
+window.gl        or= {}
+window.gon       or= {}
+gl.emojiAliases    = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
+gon.award_menu_url = '/emojis'
 
 
 lazyAssert = (done, assertFn) ->
@@ -25,9 +26,7 @@ describe 'AwardsHandler', ->
     fixture.load 'awards_handler.html'
     awardsHandler = new AwardsHandler
     spyOn(awardsHandler, 'postEmoji').and.callFake (url, emoji, cb) => cb()
-    spyOn(jQuery, 'get').and.callFake (req, cb) ->
-      expect(req).toBe '/emojis'
-      cb window.emojiMenu
+    spyOn(jQuery, 'get').and.callFake (req, cb) -> cb window.emojiMenu
 
 
   describe '::showEmojiMenu', ->

From 8e71c19a6940b8d82c70ee9b2550b62b5169eb54 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Wed, 8 Jun 2016 10:29:20 +0530
Subject: [PATCH 1325/1431] Implement the correct linking behaviour in
 `WikiLinkFilter`.

Original Comments
=================

- Linking behaves as per rules documented here:
  https://gitlab.com/gitlab-org/gitlab-ce/blob/16568-document-wiki-linking-behavior/doc/markdown/wiki.md
- All links (to other wiki pages) are rewritten to be at the level of
  the app root. We can't use links relative to the current
  page ('./foo', 'foo', '../foo'), because they won't work in the
  markdown preview, where the current page is suffixed with `/edit`
- Move existing `WikiLinkFilter` specs to `WikiPipeline` spec. It makes
  sense to run these tests on the combined output of the pipeline,
  rather than a single filter, since we can catch issues with
  conflicting filters.
- Add more tests to cover the new linking

@rymai's Review
===============

- Classes nested under `WikiLinkFilter` should declare `WikiLinkFilter`'s
  inherit, so nothing changes if the nested class is loaded first.
- Add a blank line after a guard clause
- Use keyword arguments for the `Rewriter` constructor
- Invert a condition - use `if` instead of `unless`
- Inline a `let` in `WikiPipeline` spec - it was only used in a single place
- Change out of date spec names
- Add a comment for every rewrite rule in `Rewriter`
---
 lib/banzai/filter/wiki_link_filter.rb         |  32 +-----
 .../filter/wiki_link_filter/rewriter.rb       |  40 +++++++
 spec/factories/wiki_pages.rb                  |   2 +-
 .../banzai/filter/wiki_link_filter_spec.rb    |  85 --------------
 .../lib/banzai/pipeline/wiki_pipeline_spec.rb | 108 ++++++++++++++++++
 5 files changed, 155 insertions(+), 112 deletions(-)
 create mode 100644 lib/banzai/filter/wiki_link_filter/rewriter.rb
 delete mode 100644 spec/lib/banzai/filter/wiki_link_filter_spec.rb

diff --git a/lib/banzai/filter/wiki_link_filter.rb b/lib/banzai/filter/wiki_link_filter.rb
index 7dc771afd71..37a2779d453 100644
--- a/lib/banzai/filter/wiki_link_filter.rb
+++ b/lib/banzai/filter/wiki_link_filter.rb
@@ -2,7 +2,8 @@ require 'uri'
 
 module Banzai
   module Filter
-    # HTML filter that "fixes" relative links to files in a repository.
+    # HTML filter that "fixes" links to pages/files in a wiki.
+    # Rewrite rules are documented in the `WikiPipeline` spec.
     #
     # Context options:
     #   :project_wiki
@@ -25,36 +26,15 @@ module Banzai
       end
 
       def process_link_attr(html_attr)
-        return if html_attr.blank? || file_reference?(html_attr) || hierarchical_link?(html_attr)
+        return if html_attr.blank?
 
-        uri = URI(html_attr.value)
-        if uri.relative? && uri.path.present?
-          html_attr.value = rebuild_wiki_uri(uri).to_s
-        end
+        html_attr.value = apply_rewrite_rules(html_attr.value)
       rescue URI::Error
         # noop
       end
 
-      def rebuild_wiki_uri(uri)
-        uri.path = ::File.join(project_wiki_base_path, uri.path)
-        uri
-      end
-
-      def project_wiki
-        context[:project_wiki]
-      end
-
-      def file_reference?(html_attr)
-        !File.extname(html_attr.value).blank?
-      end
-
-      # Of the form `./link`, `../link`, or similar
-      def hierarchical_link?(html_attr)
-        html_attr.value[0] == '.'
-      end
-
-      def project_wiki_base_path
-        project_wiki && project_wiki.wiki_base_path
+      def apply_rewrite_rules(link_string)
+        Rewriter.new(link_string, wiki: context[:project_wiki], slug: context[:page_slug]).apply_rules
       end
     end
   end
diff --git a/lib/banzai/filter/wiki_link_filter/rewriter.rb b/lib/banzai/filter/wiki_link_filter/rewriter.rb
new file mode 100644
index 00000000000..2e2c8da311e
--- /dev/null
+++ b/lib/banzai/filter/wiki_link_filter/rewriter.rb
@@ -0,0 +1,40 @@
+module Banzai
+  module Filter
+    class WikiLinkFilter < HTML::Pipeline::Filter
+      class Rewriter
+        def initialize(link_string, wiki:, slug:)
+          @uri = Addressable::URI.parse(link_string)
+          @wiki_base_path = wiki && wiki.wiki_base_path
+          @slug = slug
+        end
+
+        def apply_rules
+          apply_file_link_rules!
+          apply_hierarchical_link_rules!
+          apply_relative_link_rules!
+          @uri.to_s
+        end
+
+        private
+
+        # Of the form 'file.md'
+        def apply_file_link_rules!
+          @uri = Addressable::URI.join(@slug, @uri) if @uri.extname.present?
+        end
+
+        # Of the form `./link`, `../link`, or similar
+        def apply_hierarchical_link_rules!
+          @uri = Addressable::URI.join(@slug, @uri) if @uri.to_s[0] == '.'
+        end
+
+        # Any link _not_ of the form `http://example.com/`
+        def apply_relative_link_rules!
+          if @uri.relative? && @uri.path.present?
+            link = ::File.join(@wiki_base_path, @uri.path)
+            @uri = Addressable::URI.parse(link)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/factories/wiki_pages.rb b/spec/factories/wiki_pages.rb
index 938ccf2306b..efa6cbe5bb1 100644
--- a/spec/factories/wiki_pages.rb
+++ b/spec/factories/wiki_pages.rb
@@ -2,7 +2,7 @@ require 'ostruct'
 
 FactoryGirl.define do
   factory :wiki_page do
-    page = OpenStruct.new(url_path: 'some-name')
+    page { OpenStruct.new(url_path: 'some-name') }
     association :wiki, factory: :project_wiki, strategy: :build
     initialize_with { new(wiki, page, true) }
   end
diff --git a/spec/lib/banzai/filter/wiki_link_filter_spec.rb b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
deleted file mode 100644
index 185abbb2108..00000000000
--- a/spec/lib/banzai/filter/wiki_link_filter_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe Banzai::Filter::WikiLinkFilter, lib: true do
-  include FilterSpecHelper
-
-  let(:namespace) { build_stubbed(:namespace, name: "wiki_link_ns") }
-  let(:project)   { build_stubbed(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
-  let(:user) { double }
-  let(:project_wiki) { ProjectWiki.new(project, user) }
-
-  describe "links within the wiki (relative)" do
-    describe "hierarchical links to the current directory" do
-      it "doesn't rewrite non-file links" do
-        link = "<a href='./page'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('./page')
-      end
-
-      it "doesn't rewrite file links" do
-        link = "<a href='./page.md'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('./page.md')
-      end
-    end
-
-    describe "hierarchical links to the parent directory" do
-      it "doesn't rewrite non-file links" do
-        link = "<a href='../page'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('../page')
-      end
-
-      it "doesn't rewrite file links" do
-        link = "<a href='../page.md'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('../page.md')
-      end
-    end
-
-    describe "hierarchical links to a sub-directory" do
-      it "doesn't rewrite non-file links" do
-        link = "<a href='./subdirectory/page'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('./subdirectory/page')
-      end
-
-      it "doesn't rewrite file links" do
-        link = "<a href='./subdirectory/page.md'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('./subdirectory/page.md')
-      end
-    end
-
-    describe "non-hierarchical links" do
-      it 'rewrites non-file links to be at the scope of the wiki root' do
-        link = "<a href='page'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to match('/wiki_link_ns/wiki_link_project/wikis/page')
-      end
-
-      it "doesn't rewrite file links" do
-        link = "<a href='page.md'>Link to Page</a>"
-        filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-        expect(filtered_link.attribute('href').value).to eq('page.md')
-      end
-    end
-  end
-
-  describe "links outside the wiki (absolute)" do
-    it "doesn't rewrite links" do
-      link = "<a href='http://example.com/page'>Link to Page</a>"
-      filtered_link = filter(link, project_wiki: project_wiki).children[0]
-
-      expect(filtered_link.attribute('href').value).to eq('http://example.com/page')
-    end
-  end
-end
diff --git a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
index 7aa1b4a3bf6..ea4ab2c852e 100644
--- a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
@@ -50,4 +50,112 @@ describe Banzai::Pipeline::WikiPipeline do
       end
     end
   end
+
+  describe "Links" do
+    let(:namespace) { build_stubbed(:namespace, name: "wiki_link_ns") }
+    let(:project)   { build_stubbed(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
+    let(:project_wiki) { ProjectWiki.new(project, double(:user)) }
+    let(:page) { build(:wiki_page, wiki: project_wiki, page: OpenStruct.new(url_path: 'nested/twice/start-page')) }
+
+    { "when GitLab is hosted at a root URL" => '/',
+      "when GitLab is hosted at a relative URL" => '/nested/relative/gitlab' }.each do |test_name, relative_url_root|
+
+      context test_name do
+        before do
+          allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return(relative_url_root)
+        end
+
+        describe "linking to pages within the wiki" do
+          context "when creating hierarchical links to the current directory" do
+            it "rewrites non-file links to be at the scope of the current directory" do
+              markdown = "[Page](./page)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/page\"")
+            end
+
+            it "rewrites file links to be at the scope of the current directory" do
+              markdown = "[Link to Page](./page.md)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/page.md\"")
+            end
+          end
+
+          context "when creating hierarchical links to the parent directory" do
+            it "rewrites non-file links to be at the scope of the parent directory" do
+              markdown = "[Link to Page](../page)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/page\"")
+            end
+
+            it "rewrites file links to be at the scope of the parent directory" do
+              markdown = "[Link to Page](../page.md)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/page.md\"")
+            end
+          end
+
+          context "when creating hierarchical links to a sub-directory" do
+            it "rewrites non-file links to be at the scope of the sub-directory" do
+              markdown = "[Link to Page](./subdirectory/page)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/subdirectory/page\"")
+            end
+
+            it "rewrites file links to be at the scope of the sub-directory" do
+              markdown = "[Link to Page](./subdirectory/page.md)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/subdirectory/page.md\"")
+            end
+          end
+
+          describe "when creating non-hierarchical links" do
+            it 'rewrites non-file links to be at the scope of the wiki root' do
+              markdown = "[Link to Page](page)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page\"")
+            end
+
+            it "rewrites file links to be at the scope of the current directory" do
+              markdown = "[Link to Page](page.md)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/page.md\"")
+            end
+          end
+
+          describe "when creating root links" do
+            it 'rewrites non-file links to be at the scope of the wiki root' do
+              markdown = "[Link to Page](/page)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page\"")
+            end
+
+            it 'rewrites file links to be at the scope of the wiki root' do
+              markdown = "[Link to Page](/page.md)"
+              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page.md\"")
+            end
+          end
+        end
+
+        describe "linking to pages outside the wiki (absolute)" do
+          it "doesn't rewrite links" do
+            markdown = "[Link to Page](http://example.com/page)"
+            output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+
+            expect(output).to include('href="http://example.com/page"')
+          end
+        end
+      end
+    end
+  end
 end

From e6b1d1669b362ad4cea27ac44e89e73f4d6e92fd Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Wed, 8 Jun 2016 10:32:50 +0530
Subject: [PATCH 1326/1431] Hook up the updated `WikiLinkFilter` to the wiki
 controllers.

- Need to pass in a `page_slug` to the filter, so it can rewrite based
  on the current page (all links are rewritten to the level of the app root).
- The earlier `markdown_preview` endpoint was at the level of the wiki.
  We need to know the current page (for rewriting, as above), so this
  commit moves the endpoint to the level of a wiki page.
- Fix all tests
---
 app/controllers/projects/wikis_controller.rb | 2 +-
 app/helpers/gitlab_markdown_helper.rb        | 2 +-
 app/views/layouts/project.html.haml          | 4 ++--
 config/routes.rb                             | 2 +-
 features/steps/project/wiki.rb               | 4 ++--
 spec/features/markdown_spec.rb               | 3 ++-
 spec/helpers/gitlab_markdown_helper_spec.rb  | 3 ++-
 spec/support/markdown_feature.rb             | 4 ++++
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 4b404eb03fa..2aa6bed0724 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -95,7 +95,7 @@ class Projects::WikisController < Projects::ApplicationController
     ext.analyze(text, author: current_user)
 
     render json: {
-      body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki),
+      body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki, page_slug: params[:id]),
       references: {
         users: ext.users.map(&:username)
       }
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 0a1b48af219..067a00660aa 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -108,7 +108,7 @@ module GitlabMarkdownHelper
   def render_wiki_content(wiki_page)
     case wiki_page.format
     when :markdown
-      markdown(wiki_page.content, pipeline: :wiki, project_wiki: @project_wiki)
+      markdown(wiki_page.content, pipeline: :wiki, project_wiki: @project_wiki, page_slug: wiki_page.slug)
     when :asciidoc
       asciidoc(wiki_page.content)
     else
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 20d6cdf7246..2049b204956 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -5,8 +5,8 @@
 
 - content_for :scripts_body_top do
   - project = @target_project || @project
-  - if @project_wiki
-    - markdown_preview_path = namespace_project_wikis_markdown_preview_path(project.namespace, project)
+  - if @project_wiki && @page
+    - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, params[:id])
   - else
     - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project)
   - if current_user
diff --git a/config/routes.rb b/config/routes.rb
index 428302d0fd7..34126bbe913 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -591,7 +591,6 @@ Rails.application.routes.draw do
           # Order matters to give priority to these matches
           get '/wikis/git_access', to: 'wikis#git_access'
           get '/wikis/pages', to: 'wikis#pages', as: 'wiki_pages'
-          post '/wikis/markdown_preview', to:'wikis#markdown_preview'
           post '/wikis', to: 'wikis#create'
 
           get '/wikis/*id/history', to: 'wikis#history', as: 'wiki_history', constraints: WIKI_SLUG_ID
@@ -600,6 +599,7 @@ Rails.application.routes.draw do
           get '/wikis/*id', to: 'wikis#show', as: 'wiki', constraints: WIKI_SLUG_ID
           delete '/wikis/*id', to: 'wikis#destroy', constraints: WIKI_SLUG_ID
           put '/wikis/*id', to: 'wikis#update', constraints: WIKI_SLUG_ID
+          post '/wikis/*id/markdown_preview', to:'wikis#markdown_preview', constraints: WIKI_SLUG_ID, as: 'wiki_markdown_preview'
         end
 
         resource :repository, only: [:show, :create] do
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb
index 9f6aed1c5b9..3cbf832c728 100644
--- a/features/steps/project/wiki.rb
+++ b/features/steps/project/wiki.rb
@@ -97,7 +97,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     file = Gollum::File.new(wiki.wiki)
     Gollum::Wiki.any_instance.stub(:file).with("image.jpg", "master", true).and_return(file)
     Gollum::File.any_instance.stub(:mime_type).and_return("image/jpeg")
-    expect(page).to have_link('image', href: "image.jpg")
+    expect(page).to have_link('image', href: "#{wiki.wiki_base_path}/image.jpg")
     click_on "image"
   end
 
@@ -113,7 +113,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   end
 
   step 'I click on image link' do
-    expect(page).to have_link('image', href: "image.jpg")
+    expect(page).to have_link('image', href: "#{wiki.wiki_base_path}/image.jpg")
     click_on "image"
   end
 
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 1d892fe1a55..07275bfb3d8 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -231,13 +231,14 @@ describe 'GitLab Markdown', feature: true do
   context 'wiki pipeline' do
     before do
       @project_wiki = @feat.project_wiki
+      @project_wiki_page = @feat.project_wiki_page
 
       file = Gollum::File.new(@project_wiki.wiki)
       expect(file).to receive(:path).and_return('images/example.jpg')
       expect(@project_wiki).to receive(:find_file).with('images/example.jpg').and_return(file)
       allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }
 
-      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki })
+      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki, page_slug: @project_wiki_page.slug })
     end
 
     it_behaves_like 'all pipelines'
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 13de88e2f21..ade5c3b02d9 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -121,13 +121,14 @@ describe GitlabMarkdownHelper do
     before do
       @wiki = double('WikiPage')
       allow(@wiki).to receive(:content).and_return('wiki content')
+      allow(@wiki).to receive(:slug).and_return('nested/page')
       helper.instance_variable_set(:@project_wiki, @wiki)
     end
 
     it "should use Wiki pipeline for markdown files" do
       allow(@wiki).to receive(:format).and_return(:markdown)
 
-      expect(helper).to receive(:markdown).with('wiki content', pipeline: :wiki, project_wiki: @wiki)
+      expect(helper).to receive(:markdown).with('wiki content', pipeline: :wiki, project_wiki: @wiki, page_slug: "nested/page")
 
       helper.render_wiki_content(@wiki)
     end
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index 7fc6d6fcc5e..a79386b5db9 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -32,6 +32,10 @@ class MarkdownFeature
     @project_wiki ||= ProjectWiki.new(project, user)
   end
 
+  def project_wiki_page
+    @project_wiki_page ||= build(:wiki_page, wiki: project_wiki)
+  end
+
   def issue
     @issue ||= create(:issue, project: project)
   end

From 19b91e749a6320d12fb299d33f1f6440777e0e26 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Thu, 9 Jun 2016 10:16:46 +0530
Subject: [PATCH 1327/1431] Add #18019 to the CHANGELOG.

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

diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..1e51bbff4e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
   - Add DB index on users.state
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
+  - Links from a wiki page to other wiki pages should be rewritten as expected
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels

From df5fb28a3a7f3bae496805716211eb47936ecc81 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 9 Jun 2016 11:53:11 +0100
Subject: [PATCH 1328/1431] Ensure only IDs ending in .git perform git actions

It doesn't seem possible to set constraints based on format for project
IDs ending in .git, so set the constraint on the ID and ensure the
format is nil to avoid the case where the project ID is something like
project.git.foo.
---
 config/routes.rb               | 34 ++++++++++-----------
 spec/requests/git_http_spec.rb | 55 +++++++++++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 417289829db..4d122549633 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -442,22 +442,6 @@ Rails.application.routes.draw do
     resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, except:
               [:new, :create, :index], path: "/") do
 
-      # Allow /info/refs, /info/refs?service=git-upload-pack, and
-      # /info/refs?service=git-receive-pack, but nothing else.
-      #
-      git_http_handshake = lambda do |request|
-        request.query_string.blank? ||
-          request.query_string.match(/\Aservice=git-(upload|receive)-pack\z/)
-      end
-
-      ref_redirect = redirect do |params, request|
-        path = "#{params[:namespace_id]}/#{params[:project_id]}.git/info/refs"
-        path << "?#{request.query_string}" unless request.query_string.blank?
-        path
-      end
-
-      get '/info/refs', constraints: git_http_handshake, to: ref_redirect
-
       member do
         put :transfer
         delete :remove_fork
@@ -472,12 +456,28 @@ Rails.application.routes.draw do
 
       scope module: :projects do
         # Git HTTP clients ('git clone' etc.)
-        scope constraints: { format: /(git|wiki\.git)/ } do
+        scope constraints: { id: /.+\.git/, format: nil } do
           get '/info/refs', to: 'git_http#info_refs'
           post '/git-upload-pack', to: 'git_http#git_upload_pack'
           post '/git-receive-pack', to: 'git_http#git_receive_pack'
         end
 
+        # Allow /info/refs, /info/refs?service=git-upload-pack, and
+        # /info/refs?service=git-receive-pack, but nothing else.
+        #
+        git_http_handshake = lambda do |request|
+          request.query_string.blank? ||
+            request.query_string.match(/\Aservice=git-(upload|receive)-pack\z/)
+        end
+
+        ref_redirect = redirect do |params, request|
+          path = "#{params[:namespace_id]}/#{params[:project_id]}.git/info/refs"
+          path << "?#{request.query_string}" unless request.query_string.blank?
+          path
+        end
+
+        get '/info/refs', constraints: git_http_handshake, to: ref_redirect
+
         # Blob routes:
         get '/new/*id', to: 'blob#new', constraints: { id: /.+/ }, as: 'new_blob'
         post '/create/*id', to: 'blob#create', constraints: { id: /.+/ }, as: 'create_blob'
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 594a60a4340..df6a6d5da7c 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe 'Git HTTP requests', lib: true do
   let(:user)    { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, path: 'project.git-project') }
 
   it "gives WWW-Authenticate hints" do
     clone_get('doesnt/exist.git')
@@ -268,6 +268,59 @@ describe 'Git HTTP requests', lib: true do
     end
   end
 
+  context "when the project path doesn't end in .git" do
+    context "GET info/refs" do
+      let(:path) { "/#{project.path_with_namespace}/info/refs" }
+
+      context "when no params are added" do
+        before { get path }
+
+        it "redirects to the .git suffix version" do
+          expect(response).to redirect_to("/#{project.path_with_namespace}.git/info/refs")
+        end
+      end
+
+      context "when the upload-pack service is requested" do
+        let(:params) { { service: 'git-upload-pack' } }
+        before { get path, params }
+
+        it "redirects to the .git suffix version" do
+          expect(response).to redirect_to("/#{project.path_with_namespace}.git/info/refs?service=#{params[:service]}")
+        end
+      end
+
+      context "when the receive-pack service is requested" do
+        let(:params) { { service: 'git-receive-pack' } }
+        before { get path, params }
+
+        it "redirects to the .git suffix version" do
+          expect(response).to redirect_to("/#{project.path_with_namespace}.git/info/refs?service=#{params[:service]}")
+        end
+      end
+
+      context "when the params are anything else" do
+        let(:params) { { service: 'git-implode-pack' } }
+        before { get path, params }
+
+        it "redirects to the sign-in page" do
+          expect(response).to redirect_to(new_user_session_path)
+        end
+      end
+    end
+
+    context "POST git-upload-pack" do
+      it "fails to find a route" do
+        expect { clone_post(project.path_with_namespace) }.to raise_error(ActionController::RoutingError)
+      end
+    end
+
+    context "POST git-receive-pack" do
+      it "failes to find a route" do
+        expect { push_post(project.path_with_namespace) }.to raise_error(ActionController::RoutingError)
+      end
+    end
+  end
+
   def clone_get(project, options={})
     get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password))
   end

From bf63964b4d1f42f7f091e25c81b87a1ddb110cba Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 9 Jun 2016 14:26:52 +0100
Subject: [PATCH 1329/1431] Add test for getting info/refs from repo

---
 spec/requests/git_http_spec.rb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index df6a6d5da7c..c44a4a7a1fc 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -321,6 +321,34 @@ describe 'Git HTTP requests', lib: true do
     end
   end
 
+  context "retrieving an info/refs file" do
+    before { project.update_attribute(:visibility_level, Project::PUBLIC) }
+
+    context "when the file exists" do
+      before do
+        # Provide a dummy file in its place
+        allow_any_instance_of(Repository).to receive(:blob_at).and_call_original
+        allow_any_instance_of(Repository).to receive(:blob_at).with('5937ac0a7beb003549fc5fd26fc247adbce4a52e', 'info/refs') do
+          Gitlab::Git::Blob.find(project.repository, 'master', '.gitignore')
+        end
+
+        get "/#{project.path_with_namespace}/blob/master/info/refs"
+      end
+
+      it "returns the file" do
+        expect(response.status).to eq(200)
+      end
+    end
+
+    context "when the file exists" do
+      before { get "/#{project.path_with_namespace}/blob/master/info/refs" }
+
+      it "returns not found" do
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
   def clone_get(project, options={})
     get "/#{project}/info/refs", { service: 'git-upload-pack' }, auth_env(*options.values_at(:user, :password))
   end

From 98bb435f4266719b1e0fca57472a0f4e50d30371 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 9 Jun 2016 13:39:16 +0100
Subject: [PATCH 1330/1431] Enable RuboCop for migrations

Migrations shouldn't fail RuboCop checks - especially lint checks, such
as the nested method check. To avoid changing code in existing
migrations, add the magic comment to the top of each of them to skip
that file.
---
 .rubocop.yml                                                   | 3 ++-
 db/migrate/20121220064453_init_schema.rb                       | 1 +
 .../20130102143055_rename_owner_to_creator_for_project.rb      | 1 +
 db/migrate/20130110172407_add_public_to_project.rb             | 1 +
 db/migrate/20130123114545_add_issues_tracker_to_project.rb     | 1 +
 db/migrate/20130125090214_add_user_permissions.rb              | 1 +
 db/migrate/20130131070232_remove_private_flag_from_project.rb  | 1 +
 db/migrate/20130206084024_add_description_to_namsespace.rb     | 1 +
 db/migrate/20130207104426_add_description_to_teams.rb          | 1 +
 db/migrate/20130211085435_add_issues_tracker_id_to_project.rb  | 1 +
 ...20130214154045_rename_state_to_merge_status_in_milestone.rb | 1 +
 db/migrate/20130218140952_add_state_to_issue.rb                | 1 +
 db/migrate/20130218141038_add_state_to_merge_request.rb        | 1 +
 db/migrate/20130218141117_add_state_to_milestone.rb            | 1 +
 db/migrate/20130218141258_convert_closed_to_state_in_issue.rb  | 1 +
 .../20130218141327_convert_closed_to_state_in_merge_request.rb | 1 +
 .../20130218141344_convert_closed_to_state_in_milestone.rb     | 1 +
 db/migrate/20130218141444_remove_merged_from_merge_request.rb  | 1 +
 db/migrate/20130218141507_remove_closed_from_issue.rb          | 1 +
 db/migrate/20130218141536_remove_closed_from_merge_request.rb  | 1 +
 db/migrate/20130218141554_remove_closed_from_milestone.rb      | 1 +
 .../20130220124204_add_new_merge_status_to_merge_request.rb    | 1 +
 .../20130220125544_convert_merge_status_in_merge_request.rb    | 1 +
 .../20130220125545_remove_merge_status_from_merge_request.rb   | 1 +
 ...245_rename_new_merge_status_to_merge_status_in_milestone.rb | 1 +
 db/migrate/20130304104623_add_state_to_user.rb                 | 1 +
 db/migrate/20130304104740_convert_blocked_to_state.rb          | 1 +
 db/migrate/20130304105317_remove_blocked_from_user.rb          | 1 +
 db/migrate/20130315124931_user_color_scheme.rb                 | 1 +
 db/migrate/20130318212250_add_snippets_to_features.rb          | 1 +
 db/migrate/20130319214458_create_forked_project_links.rb       | 1 +
 db/migrate/20130323174317_add_private_to_snippets.rb           | 1 +
 db/migrate/20130324151736_add_type_to_snippets.rb              | 1 +
 .../20130324172327_change_project_id_to_null_in_snipepts.rb    | 1 +
 db/migrate/20130324203535_add_type_value_for_snippets.rb       | 1 +
 db/migrate/20130325173941_add_notification_level_to_user.rb    | 1 +
 .../20130326142630_add_index_to_users_authentication_token.rb  | 1 +
 .../20130403003950_add_last_activity_column_into_project.rb    | 1 +
 .../20130404164628_add_notification_level_to_user_project.rb   | 1 +
 db/migrate/20130410175022_remove_wiki_table.rb                 | 1 +
 db/migrate/20130419190306_allow_merges_for_forks.rb            | 1 +
 db/migrate/20130506085413_add_type_to_key.rb                   | 1 +
 db/migrate/20130506090604_create_deploy_keys_projects.rb       | 1 +
 db/migrate/20130506095501_remove_project_id_from_key.rb        | 1 +
 db/migrate/20130522141856_add_more_fields_to_service.rb        | 1 +
 db/migrate/20130528184641_add_system_to_notes.rb               | 1 +
 db/migrate/20130611210815_increase_snippet_text_column_size.rb | 1 +
 db/migrate/20130613165816_add_password_expires_at_to_users.rb  | 1 +
 db/migrate/20130613173246_add_created_by_id_to_user.rb         | 1 +
 db/migrate/20130614132337_add_improted_to_project.rb           | 1 +
 db/migrate/20130617095603_create_users_groups.rb               | 1 +
 .../20130621195223_add_notification_level_to_user_group.rb     | 1 +
 db/migrate/20130622115340_add_more_db_index.rb                 | 1 +
 db/migrate/20130624162710_add_fingerprint_to_key.rb            | 1 +
 db/migrate/20130711063759_create_project_group_links.rb        | 1 +
 db/migrate/20130804151314_add_st_diff_to_note.rb               | 1 +
 db/migrate/20130809124851_add_permission_check_to_user.rb      | 1 +
 db/migrate/20130812143708_add_import_url_to_project.rb         | 1 +
 db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb | 1 +
 db/migrate/20130820102832_add_access_to_project_group_link.rb  | 1 +
 db/migrate/20130821090530_remove_deprecated_tables.rb          | 1 +
 db/migrate/20130821090531_add_internal_ids_to_milestones.rb    | 1 +
 db/migrate/20130909132950_add_description_to_merge_request.rb  | 1 +
 db/migrate/20130926081215_change_owner_id_for_group.rb         | 1 +
 db/migrate/20131005191208_add_avatar_to_users.rb               | 1 +
 db/migrate/20131009115346_add_confirmable_to_users.rb          | 1 +
 db/migrate/20131106151520_remove_default_branch.rb             | 1 +
 db/migrate/20131112114325_create_broadcast_messages.rb         | 1 +
 db/migrate/20131112220935_add_visibility_level_to_projects.rb  | 1 +
 db/migrate/20131129154016_add_archived_to_projects.rb          | 1 +
 .../20131130165425_add_color_and_font_to_broadcast_messages.rb | 1 +
 db/migrate/20131202192556_add_event_fields_for_web_hook.rb     | 1 +
 db/migrate/20131214224427_add_hide_no_ssh_key_to_users.rb      | 1 +
 db/migrate/20131217102743_add_recipients_to_service.rb         | 1 +
 db/migrate/20140116231608_add_website_url_to_users.rb          | 1 +
 db/migrate/20140122112253_create_merge_request_diffs.rb        | 1 +
 db/migrate/20140122114406_migrate_mr_diffs.rb                  | 1 +
 db/migrate/20140122122549_remove_m_rdiff_fields.rb             | 1 +
 db/migrate/20140125162722_add_avatar_to_projects.rb            | 1 +
 db/migrate/20140127170938_add_group_avatars.rb                 | 1 +
 db/migrate/20140209025651_create_emails.rb                     | 1 +
 db/migrate/20140214102325_add_api_key_to_services.rb           | 1 +
 ...005354_add_index_merge_request_diffs_on_merge_request_id.rb | 1 +
 .../20140305193308_add_tag_push_hooks_to_project_hook.rb       | 1 +
 db/migrate/20140312145357_add_import_status_to_project.rb      | 1 +
 db/migrate/20140313092127_migrate_already_imported_projects.rb | 1 +
 db/migrate/20140407135544_fix_namespaces.rb                    | 1 +
 ...14131055_change_state_to_allow_empty_merge_request_diffs.rb | 1 +
 db/migrate/20140415124820_limits_to_mysql.rb                   | 1 +
 db/migrate/20140416074002_add_index_on_iid.rb                  | 1 +
 db/migrate/20140416185734_index_on_current_sign_in_at.rb       | 1 +
 db/migrate/20140428105831_add_notes_index_updated_at.rb        | 1 +
 db/migrate/20140502115131_add_repo_size_to_db.rb               | 1 +
 db/migrate/20140502125220_migrate_repo_size.rb                 | 1 +
 db/migrate/20140611135229_add_position_to_merge_request.rb     | 1 +
 db/migrate/20140625115202_create_users_star_projects.rb        | 1 +
 db/migrate/20140729134820_create_labels.rb                     | 1 +
 db/migrate/20140729140420_create_label_links.rb                | 1 +
 db/migrate/20140729145339_migrate_project_tags.rb              | 1 +
 db/migrate/20140729152420_migrate_taggable_labels.rb           | 1 +
 db/migrate/20140730111702_add_index_to_labels.rb               | 1 +
 db/migrate/20140903115954_migrate_to_new_shell.rb              | 1 +
 db/migrate/20140907220153_serialize_service_properties.rb      | 1 +
 db/migrate/20140914113604_add_members_table.rb                 | 1 +
 db/migrate/20140914145549_migrate_to_new_members_model.rb      | 1 +
 db/migrate/20140914173417_remove_old_member_tables.rb          | 1 +
 db/migrate/20141006143943_move_slack_service_to_webhook.rb     | 1 +
 db/migrate/20141007100818_add_visibility_level_to_snippet.rb   | 1 +
 db/migrate/20141118150935_add_audit_event.rb                   | 1 +
 db/migrate/20141121133009_add_timestamps_to_members.rb         | 1 +
 db/migrate/20141121161704_add_identity_table.rb                | 1 +
 db/migrate/20141205134006_add_locked_at_to_merge_request.rb    | 1 +
 db/migrate/20141216155758_create_doorkeeper_tables.rb          | 1 +
 db/migrate/20141217125223_add_owner_to_application.rb          | 1 +
 db/migrate/20141223135007_add_import_data_to_project_table.rb  | 1 +
 ...1226080412_add_developers_can_push_to_protected_branches.rb | 1 +
 db/migrate/20150108073740_create_application_settings.rb       | 1 +
 ...0150116234544_add_home_page_url_for_application_settings.rb | 1 +
 db/migrate/20150116234545_add_gitlab_access_token_to_user.rb   | 1 +
 .../20150125163100_add_default_branch_protection_setting.rb    | 1 +
 db/migrate/20150205211843_add_timestamps_to_identities.rb      | 1 +
 db/migrate/20150206181414_add_index_to_created_at.rb           | 1 +
 db/migrate/20150206222854_add_notification_email_to_user.rb    | 1 +
 db/migrate/20150209222013_add_missing_index.rb                 | 1 +
 db/migrate/20150211172122_add_template_to_service.rb           | 1 +
 db/migrate/20150211174341_allow_null_in_services_project_id.rb | 1 +
 ...4043_add_twitter_sharing_enabled_to_application_settings.rb | 1 +
 db/migrate/20150213114800_add_hide_no_password_to_user.rb      | 1 +
 .../20150213121042_add_password_automatically_set_to_user.rb   | 1 +
 ...0217123345_add_bitbucket_access_token_and_secret_to_user.rb | 1 +
 db/migrate/20150219004514_add_events_to_services.rb            | 1 +
 db/migrate/20150223022001_set_missing_last_activity_at.rb      | 1 +
 db/migrate/20150225065047_add_note_events_to_services.rb       | 1 +
 ...add_restricted_visibility_levels_to_application_settings.rb | 1 +
 db/migrate/20150306023106_fix_namespace_duplication.rb         | 1 +
 db/migrate/20150306023112_add_unique_index_to_namespace.rb     | 1 +
 ...20150310194358_add_version_check_to_application_settings.rb | 1 +
 db/migrate/20150313012111_create_subscriptions_table.rb        | 1 +
 db/migrate/20150320234437_add_location_to_user.rb              | 1 +
 db/migrate/20150324155957_set_incorrect_assignee_id_to_null.rb | 1 +
 db/migrate/20150327122227_add_public_to_key.rb                 | 1 +
 db/migrate/20150327150017_add_import_data_to_project.rb        | 1 +
 db/migrate/20150327223628_add_devise_two_factor_to_users.rb    | 1 +
 ...28132231_add_max_attachment_size_to_application_settings.rb | 1 +
 ...20150331183602_add_devise_two_factor_backupable_to_users.rb | 1 +
 db/migrate/20150406133311_add_invite_data_to_member.rb         | 1 +
 db/migrate/20150411000035_fix_identities.rb                    | 1 +
 db/migrate/20150411180045_rename_buildbox_service.rb           | 1 +
 db/migrate/20150413192223_add_public_email_to_users.rb         | 1 +
 db/migrate/20150417121913_create_project_import_data.rb        | 1 +
 db/migrate/20150417122318_remove_import_data_from_project.rb   | 1 +
 .../20150421120000_remove_periods_at_ends_of_usernames.rb      | 1 +
 ..._add_default_project_visibililty_to_application_settings.rb | 1 +
 ...hange_collation_for_tag_names.acts_as_taggable_on_engine.rb | 1 +
 db/migrate/20150425164647_remove_duplicate_tags.rb             | 1 +
 ...48_add_missing_unique_indices.acts_as_taggable_on_engine.rb | 1 +
 ...aggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb | 1 +
 ...50_add_missing_taggable_index.acts_as_taggable_on_engine.rb | 1 +
 ...hange_collation_for_tag_names.acts_as_taggable_on_engine.rb | 1 +
 ...425173433_add_default_snippet_visibility_to_app_settings.rb | 1 +
 .../20150429002313_remove_abandoned_group_members_records.rb   | 1 +
 ...22_add_restricted_signup_domains_to_application_settings.rb | 1 +
 db/migrate/20150509180749_convert_legacy_reference_notes.rb    | 1 +
 db/migrate/20150516060434_add_note_events_to_web_hooks.rb      | 1 +
 ...1607_add_user_oauth_applications_to_application_settings.rb | 1 +
 ...9150354_add_after_sign_out_path_for_application_settings.rb | 1 +
 ...141121_add_session_expire_delay_for_application_settings.rb | 1 +
 db/migrate/20150610065936_add_dashboard_to_users.rb            | 1 +
 .../20150620233230_add_default_otp_required_for_login_value.rb | 1 +
 db/migrate/20150713160110_add_project_view_to_users.rb         | 1 +
 db/migrate/20150717130904_add_commits_count_to_project.rb      | 1 +
 .../20150730122406_add_updated_by_to_issuables_and_notes.rb    | 1 +
 db/migrate/20150806104937_create_abuse_reports.rb              | 1 +
 db/migrate/20150812080800_add_settings_import_sources.rb       | 1 +
 db/migrate/20150814065925_remove_oauth_tokens_from_users.rb    | 1 +
 db/migrate/20150817163600_deduplicate_user_identities.rb       | 1 +
 db/migrate/20150818213832_add_sent_notifications.rb            | 1 +
 db/migrate/20150824002011_add_enable_ssl_verification.rb       | 1 +
 db/migrate/20150826001931_add_ci_tables.rb                     | 1 +
 db/migrate/20150902001023_add_template_to_label.rb             | 1 +
 db/migrate/20150914215247_add_ci_tags.rb                       | 1 +
 .../20150915001905_enable_ssl_verification_by_default.rb       | 1 +
 .../20150916000405_enable_ssl_verification_for_web_hooks.rb    | 1 +
 ...0150916114643_add_help_page_text_to_application_settings.rb | 1 +
 db/migrate/20150916145038_add_index_for_committed_at_and_id.rb | 1 +
 .../20150918084513_add_ci_enabled_to_application_settings.rb   | 1 +
 ...0918161719_remove_invalid_milestones_from_merge_requests.rb | 1 +
 db/migrate/20150920010715_add_consumed_timestep_to_users.rb    | 1 +
 .../20150920161119_add_line_code_to_sent_notification.rb       | 1 +
 db/migrate/20150924125150_add_project_id_to_ci_commit.rb       | 1 +
 db/migrate/20150924125436_migrate_project_id_for_ci_commits.rb | 1 +
 db/migrate/20150930001110_merge_request_error_field.rb         | 1 +
 db/migrate/20150930095736_add_null_to_name_for_ci_projects.rb  | 1 +
 db/migrate/20150930110012_add_group_share_lock.rb              | 1 +
 db/migrate/20151002112914_add_stage_idx_to_builds.rb           | 1 +
 db/migrate/20151002121400_add_index_for_builds.rb              | 1 +
 db/migrate/20151002122929_add_ref_and_tag_to_builds.rb         | 1 +
 db/migrate/20151002122943_migrate_ref_and_tag_to_build.rb      | 1 +
 db/migrate/20151005075649_add_user_id_to_build.rb              | 1 +
 db/migrate/20151005150751_add_layout_option_for_users.rb       | 1 +
 ...151005162154_remove_ci_enabled_from_application_settings.rb | 1 +
 .../20151007120511_namespaces_projects_path_lower_indexes.rb   | 1 +
 .../20151008110232_add_users_lower_username_email_indexes.rb   | 1 +
 .../20151008123042_add_type_and_description_to_builds.rb       | 1 +
 .../20151008130321_migrate_name_to_description_for_builds.rb   | 1 +
 .../20151008143519_add_admin_notification_email_setting.rb     | 1 +
 db/migrate/20151012173029_set_jira_service_api_url.rb          | 1 +
 db/migrate/20151013092124_add_artifacts_file_to_builds.rb      | 1 +
 .../20151016131433_add_ci_projects_gl_project_id_index.rb      | 1 +
 .../20151016195451_add_ci_builds_and_projects_indexes.rb       | 1 +
 db/migrate/20151016195706_add_notes_line_code_index.rb         | 1 +
 db/migrate/20151019111551_fix_build_tags.rb                    | 1 +
 db/migrate/20151019111703_fail_build_without_names.rb          | 1 +
 db/migrate/20151020145526_add_services_template_index.rb       | 1 +
 db/migrate/20151020173516_ci_limits_to_mysql.rb                | 1 +
 db/migrate/20151020173906_add_ci_builds_index_for_status.rb    | 1 +
 db/migrate/20151023112551_fail_build_with_empty_name.rb        | 1 +
 db/migrate/20151023144219_remove_satellites.rb                 | 1 +
 db/migrate/20151026182941_add_project_path_index.rb            | 1 +
 ...028152939_add_merge_when_build_succeeds_to_merge_request.rb | 1 +
 db/migrate/20151103001141_add_public_to_group.rb               | 1 +
 db/migrate/20151103133339_add_shared_runners_setting.rb        | 1 +
 db/migrate/20151103134857_create_lfs_objects.rb                | 1 +
 db/migrate/20151103134958_create_lfs_objects_projects.rb       | 1 +
 db/migrate/20151104105513_add_file_to_lfs_objects.rb           | 1 +
 db/migrate/20151105094515_create_releases.rb                   | 1 +
 db/migrate/20151106000015_add_is_award_to_notes.rb             | 1 +
 ...109100728_add_max_artifacts_size_to_application_settings.rb | 1 +
 db/migrate/20151109134526_add_issues_state_index.rb            | 1 +
 .../20151109134916_add_projects_visibility_level_index.rb      | 1 +
 db/migrate/20151110125604_add_import_error_to_project.rb       | 1 +
 db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb    | 1 +
 db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb      | 1 +
 db/migrate/20151118162244_add_projects_public_index.rb         | 1 +
 db/migrate/20151201203948_raise_hook_url_limit.rb              | 1 +
 db/migrate/20151203162133_add_hide_project_limit_to_users.rb   | 1 +
 db/migrate/20151203162134_add_build_events_to_services.rb      | 1 +
 db/migrate/20151209144329_migrate_ci_web_hooks.rb              | 1 +
 db/migrate/20151209145909_migrate_ci_emails.rb                 | 1 +
 db/migrate/20151210030143_add_unlock_token_to_user.rb          | 1 +
 ...3_add_runners_registration_token_to_application_settings.rb | 1 +
 db/migrate/20151210125232_migrate_ci_slack_service.rb          | 1 +
 db/migrate/20151210125927_migrate_ci_hip_chat_service.rb       | 1 +
 db/migrate/20151210125928_add_ci_to_project.rb                 | 1 +
 db/migrate/20151210125929_add_project_id_to_ci.rb              | 1 +
 db/migrate/20151210125930_migrate_ci_to_project.rb             | 1 +
 db/migrate/20151210125931_add_index_to_ci_tables.rb            | 1 +
 db/migrate/20151210125932_drop_null_for_ci_tables.rb           | 1 +
 db/migrate/20151218154042_add_tfa_to_application_settings.rb   | 1 +
 db/migrate/20151221234414_add_tfa_additional_fields.rb         | 1 +
 db/migrate/20151224123230_rename_emojis.rb                     | 1 +
 db/migrate/20151228111122_remove_public_from_namespace.rb      | 1 +
 db/migrate/20151228150906_influxdb_settings.rb                 | 1 +
 .../20151228175719_add_recaptcha_to_application_settings.rb    | 1 +
 db/migrate/20151229102248_influxdb_udp_port_setting.rb         | 1 +
 db/migrate/20151229112614_influxdb_remote_database_setting.rb  | 1 +
 .../20151230132518_add_artifacts_metadata_to_ci_build.rb       | 1 +
 .../20151231152326_add_akismet_to_application_settings.rb      | 1 +
 ...20151231202530_remove_alert_type_from_broadcast_messages.rb | 1 +
 db/migrate/20160106162223_add_index_milestones_title.rb        | 1 +
 db/migrate/20160106164438_remove_influxdb_credentials.rb       | 1 +
 db/migrate/20160109054846_create_spam_logs.rb                  | 1 +
 db/migrate/20160113111034_add_metrics_sample_interval.rb       | 1 +
 .../20160118155830_add_sentry_to_application_settings.rb       | 1 +
 ...8232755_add_ip_blocking_settings_to_application_settings.rb | 1 +
 db/migrate/20160119111158_add_services_category.rb             | 1 +
 db/migrate/20160119112418_add_services_default.rb              | 1 +
 db/migrate/20160119145451_add_ldap_email_to_users.rb           | 1 +
 ...0160120172143_add_base_commit_sha_to_merge_request_diffs.rb | 1 +
 ...1030729_add_email_author_in_body_to_application_settings.rb | 1 +
 db/migrate/20160122185421_add_pending_delete_to_project.rb     | 1 +
 ...47_remove_ip_blocking_settings_from_application_settings.rb | 1 +
 db/migrate/20160128233227_change_lfs_objects_size_column.rb    | 1 +
 .../20160129135155_remove_dot_atom_path_ending_of_projects.rb  | 1 +
 .../20160129155512_add_merge_commit_sha_to_merge_requests.rb   | 1 +
 db/migrate/20160202091601_add_erasable_to_ci_build.rb          | 1 +
 .../20160202164642_add_allow_guest_to_access_builds_project.rb | 1 +
 .../20160204144558_add_real_size_to_merge_request_diffs.rb     | 1 +
 db/migrate/20160209130428_add_index_to_snippet.rb              | 1 +
 db/migrate/20160212123307_create_tasks.rb                      | 1 +
 db/migrate/20160217100506_add_description_to_label.rb          | 1 +
 db/migrate/20160217174422_add_note_to_tasks.rb                 | 1 +
 db/migrate/20160220123949_rename_tasks_to_todos.rb             | 1 +
 db/migrate/20160222153918_create_appearances_ce.rb             | 1 +
 db/migrate/20160223192159_add_confidential_to_issues.rb        | 1 +
 db/migrate/20160225090018_add_delete_at_to_issues.rb           | 1 +
 db/migrate/20160225101956_add_delete_at_to_merge_requests.rb   | 1 +
 db/migrate/20160226114608_add_trigram_indexes_for_searching.rb | 1 +
 db/migrate/20160227120001_add_event_field_for_web_hook.rb      | 1 +
 db/migrate/20160227120047_add_event_to_services.rb             | 1 +
 db/migrate/20160229193553_add_main_language_to_repository.rb   | 1 +
 db/migrate/20160301124843_add_visibility_level_to_groups.rb    | 1 +
 ...0302151724_add_import_credentials_to_project_import_data.rb | 1 +
 .../20160302152808_remove_wrong_import_url_from_projects.rb    | 1 +
 db/migrate/20160305220806_remove_expires_at_from_snippets.rb   | 1 +
 db/migrate/20160307221555_disallow_blank_line_code_on_note.rb  | 1 +
 ...903_add_default_group_visibility_to_application_settings.rb | 1 +
 db/migrate/20160309140734_fix_todos.rb                         | 1 +
 db/migrate/20160310124959_add_due_date_to_issues.rb            | 1 +
 db/migrate/20160310185910_add_external_flag_to_users.rb        | 1 +
 db/migrate/20160314094147_add_priority_to_label.rb             | 1 +
 db/migrate/20160314143402_projects_add_pushes_since_gc.rb      | 1 +
 db/migrate/20160315135439_project_add_repository_check.rb      | 1 +
 db/migrate/20160316123110_ci_runners_token_index.rb            | 1 +
 db/migrate/20160316192622_change_target_id_to_null_on_todos.rb | 1 +
 db/migrate/20160316204731_add_commit_id_to_todos.rb            | 1 +
 db/migrate/20160317092222_add_moved_to_to_issue.rb             | 1 +
 .../20160320204112_index_namespaces_on_visibility_level.rb     | 1 +
 db/migrate/20160324020319_remove_todos_for_deleted_issues.rb   | 1 +
 db/migrate/20160328112808_create_notification_settings.rb      | 1 +
 db/migrate/20160328115649_migrate_new_notification_setting.rb  | 1 +
 db/migrate/20160328121138_add_notification_setting_index.rb    | 1 +
 .../20160329144452_add_index_on_pending_delete_projects.rb     | 1 +
 .../20160331133914_remove_todos_for_deleted_merge_requests.rb  | 1 +
 ...remove_twitter_sharing_enabled_from_application_settings.rb | 1 +
 db/migrate/20160407120251_add_images_enabled_for_project.rb    | 1 +
 .../20160412140240_add_repository_checks_enabled_setting.rb    | 1 +
 db/migrate/20160412173416_add_fields_to_ci_commit.rb           | 1 +
 db/migrate/20160412173417_update_ci_commit.rb                  | 1 +
 db/migrate/20160412173418_add_ci_commit_indexes.rb             | 1 +
 db/migrate/20160413115152_add_token_to_web_hooks.rb            | 1 +
 ...15133440_add_shared_runners_text_to_application_settings.rb | 1 +
 db/migrate/20160416180807_add_award_emoji.rb                   | 1 +
 db/migrate/20160416182152_convert_award_note_to_emoji_award.rb | 1 +
 db/migrate/20160416190505_remove_note_is_award.rb              | 1 +
 db/migrate/20160419120017_add_metrics_packet_size.rb           | 1 +
 db/migrate/20160421130527_disable_repository_checks.rb         | 1 +
 db/migrate/20160425045124_create_u2f_registrations.rb          | 1 +
 ...d_disabled_oauth_sign_in_sources_to_application_settings.rb | 1 +
 db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb     | 1 +
 db/migrate/20160508194200_remove_wall_enabled_from_projects.rb | 1 +
 db/migrate/20160508215820_add_type_to_notes.rb                 | 1 +
 db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb     | 1 +
 ...28_add_health_check_access_token_to_application_settings.rb | 1 +
 ...add_send_user_confirmation_email_to_application_settings.rb | 1 +
 .../20160525205328_remove_main_language_from_projects.rb       | 1 +
 ...020117_remove_notification_settings_for_deleted_projects.rb | 1 +
 db/migrate/20160528043124_add_users_state_index.rb             | 1 +
 ...iner_registry_token_expire_delay_to_application_settings.rb | 1 +
 .../20160603180330_remove_duplicated_notification_settings.rb  | 1 +
 .../20160603182247_add_index_to_notification_settings.rb       | 1 +
 ...608155312_add_after_sign_up_text_to_application_settings.rb | 1 +
 db/migrate/limits_to_mysql.rb                                  | 1 +
 343 files changed, 344 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 678f7db025b..c637f5e12f5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,7 +13,8 @@ AllCops:
   # Exclude some GitLab files
   Exclude:
     - 'vendor/**/*'
-    - 'db/**/*'
+    - 'db/*'
+    - 'db/fixtures/**/*'
     - 'tmp/**/*'
     - 'bin/**/*'
     - 'lib/backup/**/*'
diff --git a/db/migrate/20121220064453_init_schema.rb b/db/migrate/20121220064453_init_schema.rb
index d7644b6847a..f93dc92b70f 100644
--- a/db/migrate/20121220064453_init_schema.rb
+++ b/db/migrate/20121220064453_init_schema.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class InitSchema < ActiveRecord::Migration
   def up
 
diff --git a/db/migrate/20130102143055_rename_owner_to_creator_for_project.rb b/db/migrate/20130102143055_rename_owner_to_creator_for_project.rb
index d0fca269871..84fd2060770 100644
--- a/db/migrate/20130102143055_rename_owner_to_creator_for_project.rb
+++ b/db/migrate/20130102143055_rename_owner_to_creator_for_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RenameOwnerToCreatorForProject < ActiveRecord::Migration
   def change
     rename_column :projects, :owner_id, :creator_id
diff --git a/db/migrate/20130110172407_add_public_to_project.rb b/db/migrate/20130110172407_add_public_to_project.rb
index 45edba48152..4362aadcc1d 100644
--- a/db/migrate/20130110172407_add_public_to_project.rb
+++ b/db/migrate/20130110172407_add_public_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPublicToProject < ActiveRecord::Migration
   def change
     add_column :projects, :public, :boolean, default: false, null: false
diff --git a/db/migrate/20130123114545_add_issues_tracker_to_project.rb b/db/migrate/20130123114545_add_issues_tracker_to_project.rb
index 288d0f07c9a..ba8c50b53e2 100644
--- a/db/migrate/20130123114545_add_issues_tracker_to_project.rb
+++ b/db/migrate/20130123114545_add_issues_tracker_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIssuesTrackerToProject < ActiveRecord::Migration
   def change
     add_column :projects, :issues_tracker, :string, default: :gitlab, null: false
diff --git a/db/migrate/20130125090214_add_user_permissions.rb b/db/migrate/20130125090214_add_user_permissions.rb
index 38b5f439a2d..1350eadb60e 100644
--- a/db/migrate/20130125090214_add_user_permissions.rb
+++ b/db/migrate/20130125090214_add_user_permissions.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUserPermissions < ActiveRecord::Migration
   def up
     add_column :users, :can_create_group, :boolean, default: true, null: false
diff --git a/db/migrate/20130131070232_remove_private_flag_from_project.rb b/db/migrate/20130131070232_remove_private_flag_from_project.rb
index 5754db11558..f0273ba448e 100644
--- a/db/migrate/20130131070232_remove_private_flag_from_project.rb
+++ b/db/migrate/20130131070232_remove_private_flag_from_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemovePrivateFlagFromProject < ActiveRecord::Migration
   def up
     remove_column :projects, :private_flag
diff --git a/db/migrate/20130206084024_add_description_to_namsespace.rb b/db/migrate/20130206084024_add_description_to_namsespace.rb
index ef02e489d03..62676ce8914 100644
--- a/db/migrate/20130206084024_add_description_to_namsespace.rb
+++ b/db/migrate/20130206084024_add_description_to_namsespace.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDescriptionToNamsespace < ActiveRecord::Migration
   def change
     add_column :namespaces, :description, :string, default: '', null: false
diff --git a/db/migrate/20130207104426_add_description_to_teams.rb b/db/migrate/20130207104426_add_description_to_teams.rb
index 6d03777901c..bd9a4767b69 100644
--- a/db/migrate/20130207104426_add_description_to_teams.rb
+++ b/db/migrate/20130207104426_add_description_to_teams.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDescriptionToTeams < ActiveRecord::Migration
   def change
     add_column :user_teams, :description, :string, default: '', null: false
diff --git a/db/migrate/20130211085435_add_issues_tracker_id_to_project.rb b/db/migrate/20130211085435_add_issues_tracker_id_to_project.rb
index 71763d18aee..56b01cbf892 100644
--- a/db/migrate/20130211085435_add_issues_tracker_id_to_project.rb
+++ b/db/migrate/20130211085435_add_issues_tracker_id_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIssuesTrackerIdToProject < ActiveRecord::Migration
   def change
     add_column :projects, :issues_tracker_id, :string
diff --git a/db/migrate/20130214154045_rename_state_to_merge_status_in_milestone.rb b/db/migrate/20130214154045_rename_state_to_merge_status_in_milestone.rb
index 23797fe1894..4722cc13d4b 100644
--- a/db/migrate/20130214154045_rename_state_to_merge_status_in_milestone.rb
+++ b/db/migrate/20130214154045_rename_state_to_merge_status_in_milestone.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RenameStateToMergeStatusInMilestone < ActiveRecord::Migration
   def change
     rename_column :merge_requests, :state, :merge_status
diff --git a/db/migrate/20130218140952_add_state_to_issue.rb b/db/migrate/20130218140952_add_state_to_issue.rb
index 062103d0e33..3a5e978a182 100644
--- a/db/migrate/20130218140952_add_state_to_issue.rb
+++ b/db/migrate/20130218140952_add_state_to_issue.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddStateToIssue < ActiveRecord::Migration
   def change
     add_column :issues, :state, :string
diff --git a/db/migrate/20130218141038_add_state_to_merge_request.rb b/db/migrate/20130218141038_add_state_to_merge_request.rb
index ac4108ee311..e0180c755e2 100644
--- a/db/migrate/20130218141038_add_state_to_merge_request.rb
+++ b/db/migrate/20130218141038_add_state_to_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddStateToMergeRequest < ActiveRecord::Migration
   def change
     add_column :merge_requests, :state, :string
diff --git a/db/migrate/20130218141117_add_state_to_milestone.rb b/db/migrate/20130218141117_add_state_to_milestone.rb
index c84039106bd..5f71608692c 100644
--- a/db/migrate/20130218141117_add_state_to_milestone.rb
+++ b/db/migrate/20130218141117_add_state_to_milestone.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddStateToMilestone < ActiveRecord::Migration
   def change
     add_column :milestones, :state, :string
diff --git a/db/migrate/20130218141258_convert_closed_to_state_in_issue.rb b/db/migrate/20130218141258_convert_closed_to_state_in_issue.rb
index 99289166e81..94c0a6845d5 100644
--- a/db/migrate/20130218141258_convert_closed_to_state_in_issue.rb
+++ b/db/migrate/20130218141258_convert_closed_to_state_in_issue.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ConvertClosedToStateInIssue < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20130218141327_convert_closed_to_state_in_merge_request.rb b/db/migrate/20130218141327_convert_closed_to_state_in_merge_request.rb
index bd1e016d679..64a9c761352 100644
--- a/db/migrate/20130218141327_convert_closed_to_state_in_merge_request.rb
+++ b/db/migrate/20130218141327_convert_closed_to_state_in_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ConvertClosedToStateInMergeRequest < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20130218141344_convert_closed_to_state_in_milestone.rb b/db/migrate/20130218141344_convert_closed_to_state_in_milestone.rb
index d1174bc3d98..41508c2dc95 100644
--- a/db/migrate/20130218141344_convert_closed_to_state_in_milestone.rb
+++ b/db/migrate/20130218141344_convert_closed_to_state_in_milestone.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ConvertClosedToStateInMilestone < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20130218141444_remove_merged_from_merge_request.rb b/db/migrate/20130218141444_remove_merged_from_merge_request.rb
index a7bd82f5000..afa5137061e 100644
--- a/db/migrate/20130218141444_remove_merged_from_merge_request.rb
+++ b/db/migrate/20130218141444_remove_merged_from_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveMergedFromMergeRequest < ActiveRecord::Migration
   def up
     remove_column :merge_requests, :merged
diff --git a/db/migrate/20130218141507_remove_closed_from_issue.rb b/db/migrate/20130218141507_remove_closed_from_issue.rb
index 95cc064252b..f250288bc3b 100644
--- a/db/migrate/20130218141507_remove_closed_from_issue.rb
+++ b/db/migrate/20130218141507_remove_closed_from_issue.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveClosedFromIssue < ActiveRecord::Migration
   def up
     remove_column :issues, :closed
diff --git a/db/migrate/20130218141536_remove_closed_from_merge_request.rb b/db/migrate/20130218141536_remove_closed_from_merge_request.rb
index 371835938b2..efa12e32636 100644
--- a/db/migrate/20130218141536_remove_closed_from_merge_request.rb
+++ b/db/migrate/20130218141536_remove_closed_from_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveClosedFromMergeRequest < ActiveRecord::Migration
   def up
     remove_column :merge_requests, :closed
diff --git a/db/migrate/20130218141554_remove_closed_from_milestone.rb b/db/migrate/20130218141554_remove_closed_from_milestone.rb
index e8dae4a19b1..75ac14e43be 100644
--- a/db/migrate/20130218141554_remove_closed_from_milestone.rb
+++ b/db/migrate/20130218141554_remove_closed_from_milestone.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveClosedFromMilestone < ActiveRecord::Migration
   def up
     remove_column :milestones, :closed
diff --git a/db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb b/db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb
index d78bd0ae923..97615e47c89 100644
--- a/db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb
+++ b/db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNewMergeStatusToMergeRequest < ActiveRecord::Migration
   def change
     add_column :merge_requests, :new_merge_status, :string
diff --git a/db/migrate/20130220125544_convert_merge_status_in_merge_request.rb b/db/migrate/20130220125544_convert_merge_status_in_merge_request.rb
index 1c758c56ffe..3b8c3686c55 100644
--- a/db/migrate/20130220125544_convert_merge_status_in_merge_request.rb
+++ b/db/migrate/20130220125544_convert_merge_status_in_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ConvertMergeStatusInMergeRequest < ActiveRecord::Migration
   def up
     execute "UPDATE #{table_name} SET new_merge_status = 'unchecked' WHERE merge_status = 1"
diff --git a/db/migrate/20130220125545_remove_merge_status_from_merge_request.rb b/db/migrate/20130220125545_remove_merge_status_from_merge_request.rb
index 9083183beb0..bd25ffbfc99 100644
--- a/db/migrate/20130220125545_remove_merge_status_from_merge_request.rb
+++ b/db/migrate/20130220125545_remove_merge_status_from_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveMergeStatusFromMergeRequest < ActiveRecord::Migration
   def up
     remove_column :merge_requests, :merge_status
diff --git a/db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb b/db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb
index 3f8f38dc979..f0595720a39 100644
--- a/db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb
+++ b/db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RenameNewMergeStatusToMergeStatusInMilestone < ActiveRecord::Migration
   def change
     rename_column :merge_requests, :new_merge_status, :merge_status
diff --git a/db/migrate/20130304104623_add_state_to_user.rb b/db/migrate/20130304104623_add_state_to_user.rb
index 8154c21065f..4456d022e3f 100644
--- a/db/migrate/20130304104623_add_state_to_user.rb
+++ b/db/migrate/20130304104623_add_state_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddStateToUser < ActiveRecord::Migration
   def change
     add_column :users, :state, :string
diff --git a/db/migrate/20130304104740_convert_blocked_to_state.rb b/db/migrate/20130304104740_convert_blocked_to_state.rb
index e8d5257ac96..9afd1093645 100644
--- a/db/migrate/20130304104740_convert_blocked_to_state.rb
+++ b/db/migrate/20130304104740_convert_blocked_to_state.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ConvertBlockedToState < ActiveRecord::Migration
   def up
     User.transaction do
diff --git a/db/migrate/20130304105317_remove_blocked_from_user.rb b/db/migrate/20130304105317_remove_blocked_from_user.rb
index e010474538c..8f5b2c59b43 100644
--- a/db/migrate/20130304105317_remove_blocked_from_user.rb
+++ b/db/migrate/20130304105317_remove_blocked_from_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveBlockedFromUser < ActiveRecord::Migration
   def up
     remove_column :users, :blocked
diff --git a/db/migrate/20130315124931_user_color_scheme.rb b/db/migrate/20130315124931_user_color_scheme.rb
index 56c9a31ee3c..06e28a49d9d 100644
--- a/db/migrate/20130315124931_user_color_scheme.rb
+++ b/db/migrate/20130315124931_user_color_scheme.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class UserColorScheme < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20130318212250_add_snippets_to_features.rb b/db/migrate/20130318212250_add_snippets_to_features.rb
index ad0b4434c43..9860b85f504 100644
--- a/db/migrate/20130318212250_add_snippets_to_features.rb
+++ b/db/migrate/20130318212250_add_snippets_to_features.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSnippetsToFeatures < ActiveRecord::Migration
   def change
     add_column :projects, :snippets_enabled, :boolean, null: false, default: true
diff --git a/db/migrate/20130319214458_create_forked_project_links.rb b/db/migrate/20130319214458_create_forked_project_links.rb
index f91afc26e77..66eb11a4b2b 100644
--- a/db/migrate/20130319214458_create_forked_project_links.rb
+++ b/db/migrate/20130319214458_create_forked_project_links.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateForkedProjectLinks < ActiveRecord::Migration
   def change
     create_table :forked_project_links do |t|
diff --git a/db/migrate/20130323174317_add_private_to_snippets.rb b/db/migrate/20130323174317_add_private_to_snippets.rb
index 92f3a5c7011..376f4618d41 100644
--- a/db/migrate/20130323174317_add_private_to_snippets.rb
+++ b/db/migrate/20130323174317_add_private_to_snippets.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPrivateToSnippets < ActiveRecord::Migration
   def change
     add_column :snippets, :private, :boolean, null: false, default: true
diff --git a/db/migrate/20130324151736_add_type_to_snippets.rb b/db/migrate/20130324151736_add_type_to_snippets.rb
index 276aab2ca15..097cb9bc7cb 100644
--- a/db/migrate/20130324151736_add_type_to_snippets.rb
+++ b/db/migrate/20130324151736_add_type_to_snippets.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTypeToSnippets < ActiveRecord::Migration
   def change
     add_column :snippets, :type, :string
diff --git a/db/migrate/20130324172327_change_project_id_to_null_in_snipepts.rb b/db/migrate/20130324172327_change_project_id_to_null_in_snipepts.rb
index 4c992bac4d1..9256e62086e 100644
--- a/db/migrate/20130324172327_change_project_id_to_null_in_snipepts.rb
+++ b/db/migrate/20130324172327_change_project_id_to_null_in_snipepts.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ChangeProjectIdToNullInSnipepts < ActiveRecord::Migration
   def up
     change_column :snippets, :project_id, :integer, :null => true
diff --git a/db/migrate/20130324203535_add_type_value_for_snippets.rb b/db/migrate/20130324203535_add_type_value_for_snippets.rb
index 8c05dd2cc71..6e910fd74c7 100644
--- a/db/migrate/20130324203535_add_type_value_for_snippets.rb
+++ b/db/migrate/20130324203535_add_type_value_for_snippets.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTypeValueForSnippets < ActiveRecord::Migration
   def up
     Snippet.where("project_id IS NOT NULL").update_all(type: 'ProjectSnippet')
diff --git a/db/migrate/20130325173941_add_notification_level_to_user.rb b/db/migrate/20130325173941_add_notification_level_to_user.rb
index 9f466e38c13..1dc58d4bcc8 100644
--- a/db/migrate/20130325173941_add_notification_level_to_user.rb
+++ b/db/migrate/20130325173941_add_notification_level_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotificationLevelToUser < ActiveRecord::Migration
   def change
     add_column :users, :notification_level, :integer, null: false, default: 1
diff --git a/db/migrate/20130326142630_add_index_to_users_authentication_token.rb b/db/migrate/20130326142630_add_index_to_users_authentication_token.rb
index d42ef113738..0592181927e 100644
--- a/db/migrate/20130326142630_add_index_to_users_authentication_token.rb
+++ b/db/migrate/20130326142630_add_index_to_users_authentication_token.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexToUsersAuthenticationToken < ActiveRecord::Migration
   def change
     add_index :users, :authentication_token, unique: true
diff --git a/db/migrate/20130403003950_add_last_activity_column_into_project.rb b/db/migrate/20130403003950_add_last_activity_column_into_project.rb
index 85e31608d79..04a01612c6f 100644
--- a/db/migrate/20130403003950_add_last_activity_column_into_project.rb
+++ b/db/migrate/20130403003950_add_last_activity_column_into_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddLastActivityColumnIntoProject < ActiveRecord::Migration
   def up
     add_column :projects, :last_activity_at, :datetime
diff --git a/db/migrate/20130404164628_add_notification_level_to_user_project.rb b/db/migrate/20130404164628_add_notification_level_to_user_project.rb
index 27de5d6bf55..1e072d9c6e1 100644
--- a/db/migrate/20130404164628_add_notification_level_to_user_project.rb
+++ b/db/migrate/20130404164628_add_notification_level_to_user_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotificationLevelToUserProject < ActiveRecord::Migration
   def change
     add_column :users_projects, :notification_level, :integer, null: false, default: 3
diff --git a/db/migrate/20130410175022_remove_wiki_table.rb b/db/migrate/20130410175022_remove_wiki_table.rb
index 9077aa2473c..5885b1cc375 100644
--- a/db/migrate/20130410175022_remove_wiki_table.rb
+++ b/db/migrate/20130410175022_remove_wiki_table.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveWikiTable < ActiveRecord::Migration
   def up
     drop_table :wikis
diff --git a/db/migrate/20130419190306_allow_merges_for_forks.rb b/db/migrate/20130419190306_allow_merges_for_forks.rb
index 56ea97e8561..ec953986c6a 100644
--- a/db/migrate/20130419190306_allow_merges_for_forks.rb
+++ b/db/migrate/20130419190306_allow_merges_for_forks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AllowMergesForForks < ActiveRecord::Migration
   def self.up
     add_column :merge_requests, :target_project_id, :integer, :null => true
diff --git a/db/migrate/20130506085413_add_type_to_key.rb b/db/migrate/20130506085413_add_type_to_key.rb
index 315e7ca77b3..c9f1ee4e389 100644
--- a/db/migrate/20130506085413_add_type_to_key.rb
+++ b/db/migrate/20130506085413_add_type_to_key.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTypeToKey < ActiveRecord::Migration
   def change
     add_column :keys, :type, :string
diff --git a/db/migrate/20130506090604_create_deploy_keys_projects.rb b/db/migrate/20130506090604_create_deploy_keys_projects.rb
index 0dc8cdeb07d..7d6662d358a 100644
--- a/db/migrate/20130506090604_create_deploy_keys_projects.rb
+++ b/db/migrate/20130506090604_create_deploy_keys_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateDeployKeysProjects < ActiveRecord::Migration
   def change
     create_table :deploy_keys_projects do |t|
diff --git a/db/migrate/20130506095501_remove_project_id_from_key.rb b/db/migrate/20130506095501_remove_project_id_from_key.rb
index 6b794cfb5c1..53abc4e7b52 100644
--- a/db/migrate/20130506095501_remove_project_id_from_key.rb
+++ b/db/migrate/20130506095501_remove_project_id_from_key.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveProjectIdFromKey < ActiveRecord::Migration
   def up
     puts 'Migrate deploy keys: '
diff --git a/db/migrate/20130522141856_add_more_fields_to_service.rb b/db/migrate/20130522141856_add_more_fields_to_service.rb
index 298e902df2f..9f764a1d050 100644
--- a/db/migrate/20130522141856_add_more_fields_to_service.rb
+++ b/db/migrate/20130522141856_add_more_fields_to_service.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMoreFieldsToService < ActiveRecord::Migration
   def change
     add_column :services, :subdomain, :string
diff --git a/db/migrate/20130528184641_add_system_to_notes.rb b/db/migrate/20130528184641_add_system_to_notes.rb
index 1b22a4934f9..27fbf8983ac 100644
--- a/db/migrate/20130528184641_add_system_to_notes.rb
+++ b/db/migrate/20130528184641_add_system_to_notes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSystemToNotes < ActiveRecord::Migration
   class Note < ActiveRecord::Base
   end
diff --git a/db/migrate/20130611210815_increase_snippet_text_column_size.rb b/db/migrate/20130611210815_increase_snippet_text_column_size.rb
index f7b4447e43e..f710c79a9a5 100644
--- a/db/migrate/20130611210815_increase_snippet_text_column_size.rb
+++ b/db/migrate/20130611210815_increase_snippet_text_column_size.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class IncreaseSnippetTextColumnSize < ActiveRecord::Migration
   def up
     # MYSQL LARGETEXT for snippet
diff --git a/db/migrate/20130613165816_add_password_expires_at_to_users.rb b/db/migrate/20130613165816_add_password_expires_at_to_users.rb
index 3479c8e64d0..47306a370a8 100644
--- a/db/migrate/20130613165816_add_password_expires_at_to_users.rb
+++ b/db/migrate/20130613165816_add_password_expires_at_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPasswordExpiresAtToUsers < ActiveRecord::Migration
   def change
     add_column :users, :password_expires_at, :datetime
diff --git a/db/migrate/20130613173246_add_created_by_id_to_user.rb b/db/migrate/20130613173246_add_created_by_id_to_user.rb
index 615e96eb156..3138c0f40a7 100644
--- a/db/migrate/20130613173246_add_created_by_id_to_user.rb
+++ b/db/migrate/20130613173246_add_created_by_id_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCreatedByIdToUser < ActiveRecord::Migration
   def change
     add_column :users, :created_by_id, :integer
diff --git a/db/migrate/20130614132337_add_improted_to_project.rb b/db/migrate/20130614132337_add_improted_to_project.rb
index cc882c3f10a..26dc16e3b43 100644
--- a/db/migrate/20130614132337_add_improted_to_project.rb
+++ b/db/migrate/20130614132337_add_improted_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImprotedToProject < ActiveRecord::Migration
   def change
     add_column :projects, :imported, :boolean, default: false, null: false
diff --git a/db/migrate/20130617095603_create_users_groups.rb b/db/migrate/20130617095603_create_users_groups.rb
index 2efc04f1151..45cff93fe4a 100644
--- a/db/migrate/20130617095603_create_users_groups.rb
+++ b/db/migrate/20130617095603_create_users_groups.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateUsersGroups < ActiveRecord::Migration
   def change
     create_table :users_groups do |t|
diff --git a/db/migrate/20130621195223_add_notification_level_to_user_group.rb b/db/migrate/20130621195223_add_notification_level_to_user_group.rb
index 8c2e3dfcaca..6fd4941f615 100644
--- a/db/migrate/20130621195223_add_notification_level_to_user_group.rb
+++ b/db/migrate/20130621195223_add_notification_level_to_user_group.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotificationLevelToUserGroup < ActiveRecord::Migration
   def change
     add_column :users_groups, :notification_level, :integer, null: false, default: 3
diff --git a/db/migrate/20130622115340_add_more_db_index.rb b/db/migrate/20130622115340_add_more_db_index.rb
index 9570a7a3f1e..4113217de59 100644
--- a/db/migrate/20130622115340_add_more_db_index.rb
+++ b/db/migrate/20130622115340_add_more_db_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMoreDbIndex < ActiveRecord::Migration
   def change
     add_index :deploy_keys_projects, :project_id
diff --git a/db/migrate/20130624162710_add_fingerprint_to_key.rb b/db/migrate/20130624162710_add_fingerprint_to_key.rb
index 544a8366727..3e574ea81b9 100644
--- a/db/migrate/20130624162710_add_fingerprint_to_key.rb
+++ b/db/migrate/20130624162710_add_fingerprint_to_key.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddFingerprintToKey < ActiveRecord::Migration
   def change
     add_column :keys, :fingerprint, :string
diff --git a/db/migrate/20130711063759_create_project_group_links.rb b/db/migrate/20130711063759_create_project_group_links.rb
index 395083f2a03..bd9d40a50db 100644
--- a/db/migrate/20130711063759_create_project_group_links.rb
+++ b/db/migrate/20130711063759_create_project_group_links.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateProjectGroupLinks < ActiveRecord::Migration
   def change
     create_table :project_group_links do |t|
diff --git a/db/migrate/20130804151314_add_st_diff_to_note.rb b/db/migrate/20130804151314_add_st_diff_to_note.rb
index 3f9abb975c3..9e2da73b695 100644
--- a/db/migrate/20130804151314_add_st_diff_to_note.rb
+++ b/db/migrate/20130804151314_add_st_diff_to_note.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddStDiffToNote < ActiveRecord::Migration
   def change
     add_column :notes, :st_diff, :text, :null => true
diff --git a/db/migrate/20130809124851_add_permission_check_to_user.rb b/db/migrate/20130809124851_add_permission_check_to_user.rb
index c26157904c7..9f9dea36101 100644
--- a/db/migrate/20130809124851_add_permission_check_to_user.rb
+++ b/db/migrate/20130809124851_add_permission_check_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPermissionCheckToUser < ActiveRecord::Migration
   def change
     add_column :users, :last_credential_check_at, :datetime
diff --git a/db/migrate/20130812143708_add_import_url_to_project.rb b/db/migrate/20130812143708_add_import_url_to_project.rb
index 023a48741b2..d2bdfe1894e 100644
--- a/db/migrate/20130812143708_add_import_url_to_project.rb
+++ b/db/migrate/20130812143708_add_import_url_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImportUrlToProject < ActiveRecord::Migration
   def change
     add_column :projects, :import_url, :string
diff --git a/db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb b/db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb
index e55ae38f144..0e0e78b0f0d 100644
--- a/db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb
+++ b/db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddInternalIdsToIssuesAndMr < ActiveRecord::Migration
   def change
     add_column :issues, :iid, :integer
diff --git a/db/migrate/20130820102832_add_access_to_project_group_link.rb b/db/migrate/20130820102832_add_access_to_project_group_link.rb
index 00e3947a6bb..98f3fa87523 100644
--- a/db/migrate/20130820102832_add_access_to_project_group_link.rb
+++ b/db/migrate/20130820102832_add_access_to_project_group_link.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAccessToProjectGroupLink < ActiveRecord::Migration
   def change
     add_column :project_group_links, :group_access, :integer, null: false, default: ProjectGroupLink.default_access
diff --git a/db/migrate/20130821090530_remove_deprecated_tables.rb b/db/migrate/20130821090530_remove_deprecated_tables.rb
index 539c0617eeb..d22e713a7a1 100644
--- a/db/migrate/20130821090530_remove_deprecated_tables.rb
+++ b/db/migrate/20130821090530_remove_deprecated_tables.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveDeprecatedTables < ActiveRecord::Migration
   def up
     drop_table :user_teams
diff --git a/db/migrate/20130821090531_add_internal_ids_to_milestones.rb b/db/migrate/20130821090531_add_internal_ids_to_milestones.rb
index 33e5bae5805..e25b8f91662 100644
--- a/db/migrate/20130821090531_add_internal_ids_to_milestones.rb
+++ b/db/migrate/20130821090531_add_internal_ids_to_milestones.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddInternalIdsToMilestones < ActiveRecord::Migration
   def change
     add_column :milestones, :iid, :integer
diff --git a/db/migrate/20130909132950_add_description_to_merge_request.rb b/db/migrate/20130909132950_add_description_to_merge_request.rb
index 9bcd0c7ee06..fbac50c8216 100644
--- a/db/migrate/20130909132950_add_description_to_merge_request.rb
+++ b/db/migrate/20130909132950_add_description_to_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDescriptionToMergeRequest < ActiveRecord::Migration
   def change
     add_column :merge_requests, :description, :text, null: true
diff --git a/db/migrate/20130926081215_change_owner_id_for_group.rb b/db/migrate/20130926081215_change_owner_id_for_group.rb
index 8f1992c37ab..2bdd22d5a04 100644
--- a/db/migrate/20130926081215_change_owner_id_for_group.rb
+++ b/db/migrate/20130926081215_change_owner_id_for_group.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ChangeOwnerIdForGroup < ActiveRecord::Migration
   def up
     change_column :namespaces, :owner_id, :integer, null: true
diff --git a/db/migrate/20131005191208_add_avatar_to_users.rb b/db/migrate/20131005191208_add_avatar_to_users.rb
index 7b4de37ad72..df9057b81d6 100644
--- a/db/migrate/20131005191208_add_avatar_to_users.rb
+++ b/db/migrate/20131005191208_add_avatar_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAvatarToUsers < ActiveRecord::Migration
   def change
     add_column :users, :avatar, :string
diff --git a/db/migrate/20131009115346_add_confirmable_to_users.rb b/db/migrate/20131009115346_add_confirmable_to_users.rb
index 249cbe704ed..d714dd98e85 100644
--- a/db/migrate/20131009115346_add_confirmable_to_users.rb
+++ b/db/migrate/20131009115346_add_confirmable_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddConfirmableToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :confirmation_token, :string
diff --git a/db/migrate/20131106151520_remove_default_branch.rb b/db/migrate/20131106151520_remove_default_branch.rb
index 88a890eb3eb..fd3d1ed7ab3 100644
--- a/db/migrate/20131106151520_remove_default_branch.rb
+++ b/db/migrate/20131106151520_remove_default_branch.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveDefaultBranch < ActiveRecord::Migration
   def up
     remove_column :projects, :default_branch
diff --git a/db/migrate/20131112114325_create_broadcast_messages.rb b/db/migrate/20131112114325_create_broadcast_messages.rb
index 147178e9dcf..ce37a8e2708 100644
--- a/db/migrate/20131112114325_create_broadcast_messages.rb
+++ b/db/migrate/20131112114325_create_broadcast_messages.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateBroadcastMessages < ActiveRecord::Migration
   def change
     create_table :broadcast_messages do |t|
diff --git a/db/migrate/20131112220935_add_visibility_level_to_projects.rb b/db/migrate/20131112220935_add_visibility_level_to_projects.rb
index 89421cbedad..5efc17b228e 100644
--- a/db/migrate/20131112220935_add_visibility_level_to_projects.rb
+++ b/db/migrate/20131112220935_add_visibility_level_to_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddVisibilityLevelToProjects < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20131129154016_add_archived_to_projects.rb b/db/migrate/20131129154016_add_archived_to_projects.rb
index 917e690ba47..e8e6908d137 100644
--- a/db/migrate/20131129154016_add_archived_to_projects.rb
+++ b/db/migrate/20131129154016_add_archived_to_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddArchivedToProjects < ActiveRecord::Migration
   def change
     add_column :projects, :archived, :boolean, default: false, null: false
diff --git a/db/migrate/20131130165425_add_color_and_font_to_broadcast_messages.rb b/db/migrate/20131130165425_add_color_and_font_to_broadcast_messages.rb
index 473f355eceb..348a284a53e 100644
--- a/db/migrate/20131130165425_add_color_and_font_to_broadcast_messages.rb
+++ b/db/migrate/20131130165425_add_color_and_font_to_broadcast_messages.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddColorAndFontToBroadcastMessages < ActiveRecord::Migration
   def change
     add_column :broadcast_messages, :color, :string
diff --git a/db/migrate/20131202192556_add_event_fields_for_web_hook.rb b/db/migrate/20131202192556_add_event_fields_for_web_hook.rb
index d29e996852e..99d76611524 100644
--- a/db/migrate/20131202192556_add_event_fields_for_web_hook.rb
+++ b/db/migrate/20131202192556_add_event_fields_for_web_hook.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddEventFieldsForWebHook < ActiveRecord::Migration
   def change
     add_column :web_hooks, :push_events, :boolean, default: true, null: false
diff --git a/db/migrate/20131214224427_add_hide_no_ssh_key_to_users.rb b/db/migrate/20131214224427_add_hide_no_ssh_key_to_users.rb
index 7cec79e7ee8..4333dc59323 100644
--- a/db/migrate/20131214224427_add_hide_no_ssh_key_to_users.rb
+++ b/db/migrate/20131214224427_add_hide_no_ssh_key_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddHideNoSshKeyToUsers < ActiveRecord::Migration
   def change
     add_column :users, :hide_no_ssh_key, :boolean, :default => false
diff --git a/db/migrate/20131217102743_add_recipients_to_service.rb b/db/migrate/20131217102743_add_recipients_to_service.rb
index 9695c251352..3c76be0f68d 100644
--- a/db/migrate/20131217102743_add_recipients_to_service.rb
+++ b/db/migrate/20131217102743_add_recipients_to_service.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRecipientsToService < ActiveRecord::Migration
   def change
     add_column :services, :recipients, :text
diff --git a/db/migrate/20140116231608_add_website_url_to_users.rb b/db/migrate/20140116231608_add_website_url_to_users.rb
index 0996fdcad73..1c39423562e 100644
--- a/db/migrate/20140116231608_add_website_url_to_users.rb
+++ b/db/migrate/20140116231608_add_website_url_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddWebsiteUrlToUsers < ActiveRecord::Migration
   def change
     add_column :users, :website_url, :string, {:null => false, :default => ''}
diff --git a/db/migrate/20140122112253_create_merge_request_diffs.rb b/db/migrate/20140122112253_create_merge_request_diffs.rb
index f34e30925df..395c3edfc79 100644
--- a/db/migrate/20140122112253_create_merge_request_diffs.rb
+++ b/db/migrate/20140122112253_create_merge_request_diffs.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateMergeRequestDiffs < ActiveRecord::Migration
   def up
     create_table :merge_request_diffs do |t|
diff --git a/db/migrate/20140122114406_migrate_mr_diffs.rb b/db/migrate/20140122114406_migrate_mr_diffs.rb
index 1595e2b6472..429aeb2293f 100644
--- a/db/migrate/20140122114406_migrate_mr_diffs.rb
+++ b/db/migrate/20140122114406_migrate_mr_diffs.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateMrDiffs < ActiveRecord::Migration
   def self.up
     execute "INSERT INTO merge_request_diffs ( merge_request_id, st_commits, st_diffs ) SELECT id, st_commits, st_diffs FROM merge_requests"
diff --git a/db/migrate/20140122122549_remove_m_rdiff_fields.rb b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
index 8f863d85a68..bbf35811b61 100644
--- a/db/migrate/20140122122549_remove_m_rdiff_fields.rb
+++ b/db/migrate/20140122122549_remove_m_rdiff_fields.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveMRdiffFields < ActiveRecord::Migration
   def up
     remove_column :merge_requests, :st_commits
diff --git a/db/migrate/20140125162722_add_avatar_to_projects.rb b/db/migrate/20140125162722_add_avatar_to_projects.rb
index 9523ac722f2..888341b7535 100644
--- a/db/migrate/20140125162722_add_avatar_to_projects.rb
+++ b/db/migrate/20140125162722_add_avatar_to_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAvatarToProjects < ActiveRecord::Migration
   def change
     add_column :projects, :avatar, :string
diff --git a/db/migrate/20140127170938_add_group_avatars.rb b/db/migrate/20140127170938_add_group_avatars.rb
index 2911096dd5d..95d1c1c6b27 100644
--- a/db/migrate/20140127170938_add_group_avatars.rb
+++ b/db/migrate/20140127170938_add_group_avatars.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddGroupAvatars < ActiveRecord::Migration
   def change
     add_column :namespaces, :avatar, :string
diff --git a/db/migrate/20140209025651_create_emails.rb b/db/migrate/20140209025651_create_emails.rb
index cb78c4af11b..571beb19cdd 100644
--- a/db/migrate/20140209025651_create_emails.rb
+++ b/db/migrate/20140209025651_create_emails.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateEmails < ActiveRecord::Migration
   def change
     create_table :emails do |t|
diff --git a/db/migrate/20140214102325_add_api_key_to_services.rb b/db/migrate/20140214102325_add_api_key_to_services.rb
index 30eeca2c1f6..b58c36c0a30 100644
--- a/db/migrate/20140214102325_add_api_key_to_services.rb
+++ b/db/migrate/20140214102325_add_api_key_to_services.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddApiKeyToServices < ActiveRecord::Migration
   def change
     add_column :services, :api_key, :string
diff --git a/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb b/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb
index 65d28e8cb01..aab8a41c2c3 100644
--- a/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb
+++ b/db/migrate/20140304005354_add_index_merge_request_diffs_on_merge_request_id.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexMergeRequestDiffsOnMergeRequestId < ActiveRecord::Migration
   def change
     add_index :merge_request_diffs, :merge_request_id, unique: true
diff --git a/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb b/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb
index 7017148702a..ec163bb843c 100644
--- a/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb
+++ b/db/migrate/20140305193308_add_tag_push_hooks_to_project_hook.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTagPushHooksToProjectHook < ActiveRecord::Migration
   def change
     add_column :web_hooks, :tag_push_events, :boolean, default: false
diff --git a/db/migrate/20140312145357_add_import_status_to_project.rb b/db/migrate/20140312145357_add_import_status_to_project.rb
index ef972e8342a..9947cd8c6f9 100644
--- a/db/migrate/20140312145357_add_import_status_to_project.rb
+++ b/db/migrate/20140312145357_add_import_status_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImportStatusToProject < ActiveRecord::Migration
   def change
     add_column :projects, :import_status, :string
diff --git a/db/migrate/20140313092127_migrate_already_imported_projects.rb b/db/migrate/20140313092127_migrate_already_imported_projects.rb
index 0a9f73a5758..f2e91fe1b40 100644
--- a/db/migrate/20140313092127_migrate_already_imported_projects.rb
+++ b/db/migrate/20140313092127_migrate_already_imported_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateAlreadyImportedProjects < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20140407135544_fix_namespaces.rb b/db/migrate/20140407135544_fix_namespaces.rb
index 59665d538f0..91374966698 100644
--- a/db/migrate/20140407135544_fix_namespaces.rb
+++ b/db/migrate/20140407135544_fix_namespaces.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FixNamespaces < ActiveRecord::Migration
   def up
     Namespace.where('name <> path and type is null').each do |namespace|
diff --git a/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
index 1f6d85d5f66..fb9c7a6636e 100644
--- a/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
+++ b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ChangeStateToAllowEmptyMergeRequestDiffs < ActiveRecord::Migration
   def up
     change_column :merge_request_diffs, :state, :string, null: true,
diff --git a/db/migrate/20140415124820_limits_to_mysql.rb b/db/migrate/20140415124820_limits_to_mysql.rb
index 3f6e62617c5..c712423bcd1 100644
--- a/db/migrate/20140415124820_limits_to_mysql.rb
+++ b/db/migrate/20140415124820_limits_to_mysql.rb
@@ -1 +1,2 @@
+# rubocop:disable all
 require_relative 'limits_to_mysql'
diff --git a/db/migrate/20140416074002_add_index_on_iid.rb b/db/migrate/20140416074002_add_index_on_iid.rb
index 85269e2a03b..6cdaa5a3c08 100644
--- a/db/migrate/20140416074002_add_index_on_iid.rb
+++ b/db/migrate/20140416074002_add_index_on_iid.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexOnIid < ActiveRecord::Migration
   def change
     RemoveDuplicateIid.clean(Issue)
diff --git a/db/migrate/20140416185734_index_on_current_sign_in_at.rb b/db/migrate/20140416185734_index_on_current_sign_in_at.rb
index 0bf80ce154a..8c620b545bd 100644
--- a/db/migrate/20140416185734_index_on_current_sign_in_at.rb
+++ b/db/migrate/20140416185734_index_on_current_sign_in_at.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class IndexOnCurrentSignInAt < ActiveRecord::Migration
   def change
     add_index :users, :current_sign_in_at
diff --git a/db/migrate/20140428105831_add_notes_index_updated_at.rb b/db/migrate/20140428105831_add_notes_index_updated_at.rb
index 6c25570f128..0589101af93 100644
--- a/db/migrate/20140428105831_add_notes_index_updated_at.rb
+++ b/db/migrate/20140428105831_add_notes_index_updated_at.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotesIndexUpdatedAt < ActiveRecord::Migration
   def change
     add_index :notes, :updated_at
diff --git a/db/migrate/20140502115131_add_repo_size_to_db.rb b/db/migrate/20140502115131_add_repo_size_to_db.rb
index 7361d1a9440..090b30a4f26 100644
--- a/db/migrate/20140502115131_add_repo_size_to_db.rb
+++ b/db/migrate/20140502115131_add_repo_size_to_db.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRepoSizeToDb < ActiveRecord::Migration
   def change
     add_column :projects, :repository_size, :float, default: 0
diff --git a/db/migrate/20140502125220_migrate_repo_size.rb b/db/migrate/20140502125220_migrate_repo_size.rb
index efdf53112fd..84463727b3b 100644
--- a/db/migrate/20140502125220_migrate_repo_size.rb
+++ b/db/migrate/20140502125220_migrate_repo_size.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateRepoSize < ActiveRecord::Migration
   def up
     project_data = execute('SELECT projects.id, namespaces.path AS namespace_path, projects.path AS project_path FROM projects LEFT JOIN namespaces ON projects.namespace_id = namespaces.id')
diff --git a/db/migrate/20140611135229_add_position_to_merge_request.rb b/db/migrate/20140611135229_add_position_to_merge_request.rb
index d5fdecd0c39..3a7d2f7c359 100644
--- a/db/migrate/20140611135229_add_position_to_merge_request.rb
+++ b/db/migrate/20140611135229_add_position_to_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPositionToMergeRequest < ActiveRecord::Migration
   def change
     add_column :merge_requests, :position, :integer, default: 0
diff --git a/db/migrate/20140625115202_create_users_star_projects.rb b/db/migrate/20140625115202_create_users_star_projects.rb
index 412f0f6f34b..32dd99e83be 100644
--- a/db/migrate/20140625115202_create_users_star_projects.rb
+++ b/db/migrate/20140625115202_create_users_star_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateUsersStarProjects < ActiveRecord::Migration
   def change
     create_table :users_star_projects do |t|
diff --git a/db/migrate/20140729134820_create_labels.rb b/db/migrate/20140729134820_create_labels.rb
index 3a4b6a152dc..df0f8cb9f03 100644
--- a/db/migrate/20140729134820_create_labels.rb
+++ b/db/migrate/20140729134820_create_labels.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateLabels < ActiveRecord::Migration
   def change
     create_table :labels do |t|
diff --git a/db/migrate/20140729140420_create_label_links.rb b/db/migrate/20140729140420_create_label_links.rb
index 2bfc4ae2094..fa5992605f8 100644
--- a/db/migrate/20140729140420_create_label_links.rb
+++ b/db/migrate/20140729140420_create_label_links.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateLabelLinks < ActiveRecord::Migration
   def change
     create_table :label_links do |t|
diff --git a/db/migrate/20140729145339_migrate_project_tags.rb b/db/migrate/20140729145339_migrate_project_tags.rb
index 5760e4bfeaa..ac46847f3e6 100644
--- a/db/migrate/20140729145339_migrate_project_tags.rb
+++ b/db/migrate/20140729145339_migrate_project_tags.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateProjectTags < ActiveRecord::Migration
   def up
     ActsAsTaggableOn::Tagging.where(taggable_type: 'Project', context: 'labels').update_all(context: 'tags')
diff --git a/db/migrate/20140729152420_migrate_taggable_labels.rb b/db/migrate/20140729152420_migrate_taggable_labels.rb
index dc28d727d9a..04cdc6beadd 100644
--- a/db/migrate/20140729152420_migrate_taggable_labels.rb
+++ b/db/migrate/20140729152420_migrate_taggable_labels.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateTaggableLabels < ActiveRecord::Migration
   def up
     taggings = ActsAsTaggableOn::Tagging.where(taggable_type: ['Issue', 'MergeRequest'], context: 'labels')
diff --git a/db/migrate/20140730111702_add_index_to_labels.rb b/db/migrate/20140730111702_add_index_to_labels.rb
index 494241c873c..cc7ac1fc449 100644
--- a/db/migrate/20140730111702_add_index_to_labels.rb
+++ b/db/migrate/20140730111702_add_index_to_labels.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexToLabels < ActiveRecord::Migration
   def change
     add_index "labels", :project_id
diff --git a/db/migrate/20140903115954_migrate_to_new_shell.rb b/db/migrate/20140903115954_migrate_to_new_shell.rb
index 54cbe48960a..04acf24284b 100644
--- a/db/migrate/20140903115954_migrate_to_new_shell.rb
+++ b/db/migrate/20140903115954_migrate_to_new_shell.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateToNewShell < ActiveRecord::Migration
   def change
     return if Rails.env.test?
diff --git a/db/migrate/20140907220153_serialize_service_properties.rb b/db/migrate/20140907220153_serialize_service_properties.rb
index d45a10465be..c2d67fad0ab 100644
--- a/db/migrate/20140907220153_serialize_service_properties.rb
+++ b/db/migrate/20140907220153_serialize_service_properties.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class SerializeServiceProperties < ActiveRecord::Migration
   def change
     unless column_exists?(:services, :properties)
diff --git a/db/migrate/20140914113604_add_members_table.rb b/db/migrate/20140914113604_add_members_table.rb
index d311f3033ee..bc3c1bb61e4 100644
--- a/db/migrate/20140914113604_add_members_table.rb
+++ b/db/migrate/20140914113604_add_members_table.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMembersTable < ActiveRecord::Migration
   def change
     create_table :members do |t|
diff --git a/db/migrate/20140914145549_migrate_to_new_members_model.rb b/db/migrate/20140914145549_migrate_to_new_members_model.rb
index 2a5a49c724a..b4c98f016d0 100644
--- a/db/migrate/20140914145549_migrate_to_new_members_model.rb
+++ b/db/migrate/20140914145549_migrate_to_new_members_model.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateToNewMembersModel < ActiveRecord::Migration
   def up
     execute "INSERT INTO members ( user_id, source_id, source_type, access_level, notification_level, type ) SELECT user_id, group_id, 'Namespace', group_access, notification_level, 'GroupMember' FROM users_groups"
diff --git a/db/migrate/20140914173417_remove_old_member_tables.rb b/db/migrate/20140914173417_remove_old_member_tables.rb
index 408b9551dbb..aff8e94e5be 100644
--- a/db/migrate/20140914173417_remove_old_member_tables.rb
+++ b/db/migrate/20140914173417_remove_old_member_tables.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveOldMemberTables < ActiveRecord::Migration
   def up
     drop_table :users_groups
diff --git a/db/migrate/20141006143943_move_slack_service_to_webhook.rb b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
index 5836cd6b8db..8cb120f7007 100644
--- a/db/migrate/20141006143943_move_slack_service_to_webhook.rb
+++ b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MoveSlackServiceToWebhook < ActiveRecord::Migration
   def change
     SlackService.all.each do |slack_service|
diff --git a/db/migrate/20141007100818_add_visibility_level_to_snippet.rb b/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
index 93826185e8b..688d8578478 100644
--- a/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
+++ b/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddVisibilityLevelToSnippet < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20141118150935_add_audit_event.rb b/db/migrate/20141118150935_add_audit_event.rb
index 07383c6bbc7..3884228456f 100644
--- a/db/migrate/20141118150935_add_audit_event.rb
+++ b/db/migrate/20141118150935_add_audit_event.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAuditEvent < ActiveRecord::Migration
   def change
     create_table :audit_events do |t|
diff --git a/db/migrate/20141121133009_add_timestamps_to_members.rb b/db/migrate/20141121133009_add_timestamps_to_members.rb
index ef6d4dedf32..68f164cd35d 100644
--- a/db/migrate/20141121133009_add_timestamps_to_members.rb
+++ b/db/migrate/20141121133009_add_timestamps_to_members.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # In 20140914145549_migrate_to_new_members_model.rb we forgot to set the
 # created_at and updated_at times for new records in the 'members' table. This
 # became a problem after commit c8e78d972a5a628870eefca0f2ccea0199c55bda which
diff --git a/db/migrate/20141121161704_add_identity_table.rb b/db/migrate/20141121161704_add_identity_table.rb
index a85b0426cec..5a399f0d325 100644
--- a/db/migrate/20141121161704_add_identity_table.rb
+++ b/db/migrate/20141121161704_add_identity_table.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIdentityTable < ActiveRecord::Migration
   def up
     create_table :identities do |t|
diff --git a/db/migrate/20141205134006_add_locked_at_to_merge_request.rb b/db/migrate/20141205134006_add_locked_at_to_merge_request.rb
index 49651c44a82..5aa91c7587a 100644
--- a/db/migrate/20141205134006_add_locked_at_to_merge_request.rb
+++ b/db/migrate/20141205134006_add_locked_at_to_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddLockedAtToMergeRequest < ActiveRecord::Migration
   def change
     add_column :merge_requests, :locked_at, :datetime
diff --git a/db/migrate/20141216155758_create_doorkeeper_tables.rb b/db/migrate/20141216155758_create_doorkeeper_tables.rb
index af5aa7d8b73..b323ffe96f5 100644
--- a/db/migrate/20141216155758_create_doorkeeper_tables.rb
+++ b/db/migrate/20141216155758_create_doorkeeper_tables.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateDoorkeeperTables < ActiveRecord::Migration
   def change
     create_table :oauth_applications do |t|
diff --git a/db/migrate/20141217125223_add_owner_to_application.rb b/db/migrate/20141217125223_add_owner_to_application.rb
index 7d5e6d07d0f..e5a669ab4d8 100644
--- a/db/migrate/20141217125223_add_owner_to_application.rb
+++ b/db/migrate/20141217125223_add_owner_to_application.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddOwnerToApplication < ActiveRecord::Migration
   def change
     add_column :oauth_applications, :owner_id, :integer, null: true
diff --git a/db/migrate/20141223135007_add_import_data_to_project_table.rb b/db/migrate/20141223135007_add_import_data_to_project_table.rb
index 5db78f94cc9..9c8a483e4d5 100644
--- a/db/migrate/20141223135007_add_import_data_to_project_table.rb
+++ b/db/migrate/20141223135007_add_import_data_to_project_table.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImportDataToProjectTable < ActiveRecord::Migration
   def change
     add_column :projects, :import_type, :string
diff --git a/db/migrate/20141226080412_add_developers_can_push_to_protected_branches.rb b/db/migrate/20141226080412_add_developers_can_push_to_protected_branches.rb
index 70e7272f7f3..a18b2f4974d 100644
--- a/db/migrate/20141226080412_add_developers_can_push_to_protected_branches.rb
+++ b/db/migrate/20141226080412_add_developers_can_push_to_protected_branches.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDevelopersCanPushToProtectedBranches < ActiveRecord::Migration
   def change
     add_column :protected_branches, :developers_can_push, :boolean, default: false, null: false
diff --git a/db/migrate/20150108073740_create_application_settings.rb b/db/migrate/20150108073740_create_application_settings.rb
index 651e35fdf7a..dfa2f765357 100644
--- a/db/migrate/20150108073740_create_application_settings.rb
+++ b/db/migrate/20150108073740_create_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateApplicationSettings < ActiveRecord::Migration
   def change
     create_table :application_settings do |t|
diff --git a/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb b/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
index aa179ce3a4d..10e6549c729 100644
--- a/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
+++ b/db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddHomePageUrlForApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :home_page_url, :string
diff --git a/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb b/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb
index c28ba3197ac..e083973615a 100644
--- a/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb
+++ b/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddGitlabAccessTokenToUser < ActiveRecord::Migration
   def change
     add_column :users, :gitlab_access_token, :string
diff --git a/db/migrate/20150125163100_add_default_branch_protection_setting.rb b/db/migrate/20150125163100_add_default_branch_protection_setting.rb
index 5020daf55f3..7ca3116d354 100644
--- a/db/migrate/20150125163100_add_default_branch_protection_setting.rb
+++ b/db/migrate/20150125163100_add_default_branch_protection_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDefaultBranchProtectionSetting < ActiveRecord::Migration
   def change
     add_column :application_settings, :default_branch_protection, :integer, :default => 2
diff --git a/db/migrate/20150205211843_add_timestamps_to_identities.rb b/db/migrate/20150205211843_add_timestamps_to_identities.rb
index 77cddbfec3b..a78e28eb4eb 100644
--- a/db/migrate/20150205211843_add_timestamps_to_identities.rb
+++ b/db/migrate/20150205211843_add_timestamps_to_identities.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTimestampsToIdentities < ActiveRecord::Migration
   def change
     add_timestamps(:identities)
diff --git a/db/migrate/20150206181414_add_index_to_created_at.rb b/db/migrate/20150206181414_add_index_to_created_at.rb
index fc624fca60d..a161fad79dc 100644
--- a/db/migrate/20150206181414_add_index_to_created_at.rb
+++ b/db/migrate/20150206181414_add_index_to_created_at.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexToCreatedAt < ActiveRecord::Migration
   def change
     add_index "users", [:created_at, :id]
diff --git a/db/migrate/20150206222854_add_notification_email_to_user.rb b/db/migrate/20150206222854_add_notification_email_to_user.rb
index ab80f7e582f..ebae092cac8 100644
--- a/db/migrate/20150206222854_add_notification_email_to_user.rb
+++ b/db/migrate/20150206222854_add_notification_email_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotificationEmailToUser < ActiveRecord::Migration
   def up
     add_column :users, :notification_email, :string
diff --git a/db/migrate/20150209222013_add_missing_index.rb b/db/migrate/20150209222013_add_missing_index.rb
index a816c2e9e8c..18e3ac2cbbb 100644
--- a/db/migrate/20150209222013_add_missing_index.rb
+++ b/db/migrate/20150209222013_add_missing_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMissingIndex < ActiveRecord::Migration
   def change
     add_index "services", [:created_at, :id]
diff --git a/db/migrate/20150211172122_add_template_to_service.rb b/db/migrate/20150211172122_add_template_to_service.rb
index b1bfbc45ee9..a3e96b25c56 100644
--- a/db/migrate/20150211172122_add_template_to_service.rb
+++ b/db/migrate/20150211172122_add_template_to_service.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTemplateToService < ActiveRecord::Migration
   def change
     add_column :services, :template, :boolean, default: false
diff --git a/db/migrate/20150211174341_allow_null_in_services_project_id.rb b/db/migrate/20150211174341_allow_null_in_services_project_id.rb
index 68f02812791..fea95c79adf 100644
--- a/db/migrate/20150211174341_allow_null_in_services_project_id.rb
+++ b/db/migrate/20150211174341_allow_null_in_services_project_id.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AllowNullInServicesProjectId < ActiveRecord::Migration
   def change
     change_column :services, :project_id, :integer, null: true
diff --git a/db/migrate/20150213104043_add_twitter_sharing_enabled_to_application_settings.rb b/db/migrate/20150213104043_add_twitter_sharing_enabled_to_application_settings.rb
index a0439172391..334020376e4 100644
--- a/db/migrate/20150213104043_add_twitter_sharing_enabled_to_application_settings.rb
+++ b/db/migrate/20150213104043_add_twitter_sharing_enabled_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTwitterSharingEnabledToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :twitter_sharing_enabled, :boolean, default: true
diff --git a/db/migrate/20150213114800_add_hide_no_password_to_user.rb b/db/migrate/20150213114800_add_hide_no_password_to_user.rb
index 685f0844276..a2af3510b9c 100644
--- a/db/migrate/20150213114800_add_hide_no_password_to_user.rb
+++ b/db/migrate/20150213114800_add_hide_no_password_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddHideNoPasswordToUser < ActiveRecord::Migration
   def change
     add_column :users, :hide_no_password, :boolean, default: false
diff --git a/db/migrate/20150213121042_add_password_automatically_set_to_user.rb b/db/migrate/20150213121042_add_password_automatically_set_to_user.rb
index c3c7c1ffc77..4e84a13f0d2 100644
--- a/db/migrate/20150213121042_add_password_automatically_set_to_user.rb
+++ b/db/migrate/20150213121042_add_password_automatically_set_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPasswordAutomaticallySetToUser < ActiveRecord::Migration
   def change
     add_column :users, :password_automatically_set, :boolean, default: false
diff --git a/db/migrate/20150217123345_add_bitbucket_access_token_and_secret_to_user.rb b/db/migrate/20150217123345_add_bitbucket_access_token_and_secret_to_user.rb
index 23ac1b399ec..78e9fd0c3a9 100644
--- a/db/migrate/20150217123345_add_bitbucket_access_token_and_secret_to_user.rb
+++ b/db/migrate/20150217123345_add_bitbucket_access_token_and_secret_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddBitbucketAccessTokenAndSecretToUser < ActiveRecord::Migration
   def change
     add_column :users, :bitbucket_access_token, :string
diff --git a/db/migrate/20150219004514_add_events_to_services.rb b/db/migrate/20150219004514_add_events_to_services.rb
index cf73a0174f4..560382c3fa1 100644
--- a/db/migrate/20150219004514_add_events_to_services.rb
+++ b/db/migrate/20150219004514_add_events_to_services.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddEventsToServices < ActiveRecord::Migration
   def change
     add_column :services, :push_events, :boolean, :default => true
diff --git a/db/migrate/20150223022001_set_missing_last_activity_at.rb b/db/migrate/20150223022001_set_missing_last_activity_at.rb
index 3f6d4d83474..300381ad65b 100644
--- a/db/migrate/20150223022001_set_missing_last_activity_at.rb
+++ b/db/migrate/20150223022001_set_missing_last_activity_at.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class SetMissingLastActivityAt < ActiveRecord::Migration
   def up
     execute "UPDATE projects SET last_activity_at = updated_at WHERE last_activity_at IS NULL"
diff --git a/db/migrate/20150225065047_add_note_events_to_services.rb b/db/migrate/20150225065047_add_note_events_to_services.rb
index d54ba9e482f..7843cabc43b 100644
--- a/db/migrate/20150225065047_add_note_events_to_services.rb
+++ b/db/migrate/20150225065047_add_note_events_to_services.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNoteEventsToServices < ActiveRecord::Migration
   def change
     add_column :services, :note_events, :boolean, default: true, null: false
diff --git a/db/migrate/20150301014758_add_restricted_visibility_levels_to_application_settings.rb b/db/migrate/20150301014758_add_restricted_visibility_levels_to_application_settings.rb
index 494c3033bff..7d8d65ef2ee 100644
--- a/db/migrate/20150301014758_add_restricted_visibility_levels_to_application_settings.rb
+++ b/db/migrate/20150301014758_add_restricted_visibility_levels_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRestrictedVisibilityLevelsToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :restricted_visibility_levels, :text
diff --git a/db/migrate/20150306023106_fix_namespace_duplication.rb b/db/migrate/20150306023106_fix_namespace_duplication.rb
index 334e5574559..ea53a9d71f2 100644
--- a/db/migrate/20150306023106_fix_namespace_duplication.rb
+++ b/db/migrate/20150306023106_fix_namespace_duplication.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FixNamespaceDuplication < ActiveRecord::Migration
   def up
     #fixes path duplication
diff --git a/db/migrate/20150306023112_add_unique_index_to_namespace.rb b/db/migrate/20150306023112_add_unique_index_to_namespace.rb
index 6472138e3ef..f293a9b643f 100644
--- a/db/migrate/20150306023112_add_unique_index_to_namespace.rb
+++ b/db/migrate/20150306023112_add_unique_index_to_namespace.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUniqueIndexToNamespace < ActiveRecord::Migration
   def change
     remove_index :namespaces, column: :name if index_exists?(:namespaces, :name)
diff --git a/db/migrate/20150310194358_add_version_check_to_application_settings.rb b/db/migrate/20150310194358_add_version_check_to_application_settings.rb
index e9d42c1e749..5d3dae6e7d8 100644
--- a/db/migrate/20150310194358_add_version_check_to_application_settings.rb
+++ b/db/migrate/20150310194358_add_version_check_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddVersionCheckToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :version_check_enabled, :boolean, default: true
diff --git a/db/migrate/20150313012111_create_subscriptions_table.rb b/db/migrate/20150313012111_create_subscriptions_table.rb
index a1d4d9dedc5..8adb193b27f 100644
--- a/db/migrate/20150313012111_create_subscriptions_table.rb
+++ b/db/migrate/20150313012111_create_subscriptions_table.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateSubscriptionsTable < ActiveRecord::Migration
   def change
     create_table :subscriptions do |t|
diff --git a/db/migrate/20150320234437_add_location_to_user.rb b/db/migrate/20150320234437_add_location_to_user.rb
index 32731d37d75..df046570361 100644
--- a/db/migrate/20150320234437_add_location_to_user.rb
+++ b/db/migrate/20150320234437_add_location_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddLocationToUser < ActiveRecord::Migration
   def change
     add_column :users, :location, :string
diff --git a/db/migrate/20150324155957_set_incorrect_assignee_id_to_null.rb b/db/migrate/20150324155957_set_incorrect_assignee_id_to_null.rb
index 42dc8173e46..9f8b6f4bd59 100644
--- a/db/migrate/20150324155957_set_incorrect_assignee_id_to_null.rb
+++ b/db/migrate/20150324155957_set_incorrect_assignee_id_to_null.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class SetIncorrectAssigneeIdToNull < ActiveRecord::Migration
   def up
     execute "UPDATE issues SET assignee_id = NULL WHERE assignee_id = -1"
diff --git a/db/migrate/20150327122227_add_public_to_key.rb b/db/migrate/20150327122227_add_public_to_key.rb
index 6ffbf4cda19..33c20d65e03 100644
--- a/db/migrate/20150327122227_add_public_to_key.rb
+++ b/db/migrate/20150327122227_add_public_to_key.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPublicToKey < ActiveRecord::Migration
   def change
     add_column :keys, :public, :boolean, default: false, null: false
diff --git a/db/migrate/20150327150017_add_import_data_to_project.rb b/db/migrate/20150327150017_add_import_data_to_project.rb
index 12c00339eec..67b1554dfd1 100644
--- a/db/migrate/20150327150017_add_import_data_to_project.rb
+++ b/db/migrate/20150327150017_add_import_data_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImportDataToProject < ActiveRecord::Migration
   def change
     add_column :projects, :import_data, :text
diff --git a/db/migrate/20150327223628_add_devise_two_factor_to_users.rb b/db/migrate/20150327223628_add_devise_two_factor_to_users.rb
index 11b026ee8f3..eccb0123e77 100644
--- a/db/migrate/20150327223628_add_devise_two_factor_to_users.rb
+++ b/db/migrate/20150327223628_add_devise_two_factor_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDeviseTwoFactorToUsers < ActiveRecord::Migration
   def change
     add_column :users, :encrypted_otp_secret, :string
diff --git a/db/migrate/20150328132231_add_max_attachment_size_to_application_settings.rb b/db/migrate/20150328132231_add_max_attachment_size_to_application_settings.rb
index 1d161674a9a..4c56a2fb78b 100644
--- a/db/migrate/20150328132231_add_max_attachment_size_to_application_settings.rb
+++ b/db/migrate/20150328132231_add_max_attachment_size_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMaxAttachmentSizeToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :max_attachment_size, :integer, default: 10, null: false
diff --git a/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb b/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb
index 913958db7c5..fdb6d72917e 100644
--- a/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb
+++ b/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDeviseTwoFactorBackupableToUsers < ActiveRecord::Migration
   def change
     add_column :users, :otp_backup_codes, :text
diff --git a/db/migrate/20150406133311_add_invite_data_to_member.rb b/db/migrate/20150406133311_add_invite_data_to_member.rb
index 5d3e856ddce..63d0f184f32 100644
--- a/db/migrate/20150406133311_add_invite_data_to_member.rb
+++ b/db/migrate/20150406133311_add_invite_data_to_member.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddInviteDataToMember < ActiveRecord::Migration
   def up
     add_column :members, :created_by_id, :integer
diff --git a/db/migrate/20150411000035_fix_identities.rb b/db/migrate/20150411000035_fix_identities.rb
index d9051f9fffd..a10fcc001f4 100644
--- a/db/migrate/20150411000035_fix_identities.rb
+++ b/db/migrate/20150411000035_fix_identities.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FixIdentities < ActiveRecord::Migration
   def up
     # Up until now, legacy 'ldap' references in the database were charitably
diff --git a/db/migrate/20150411180045_rename_buildbox_service.rb b/db/migrate/20150411180045_rename_buildbox_service.rb
index 5a0b5d07e50..9f3b25c3971 100644
--- a/db/migrate/20150411180045_rename_buildbox_service.rb
+++ b/db/migrate/20150411180045_rename_buildbox_service.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RenameBuildboxService < ActiveRecord::Migration
   def up
     execute "UPDATE services SET type = 'BuildkiteService' WHERE type = 'BuildboxService';"
diff --git a/db/migrate/20150413192223_add_public_email_to_users.rb b/db/migrate/20150413192223_add_public_email_to_users.rb
index 700e9f343a6..0fed5eaf461 100644
--- a/db/migrate/20150413192223_add_public_email_to_users.rb
+++ b/db/migrate/20150413192223_add_public_email_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPublicEmailToUsers < ActiveRecord::Migration
   def change
     add_column :users, :public_email, :string, default: "", null: false
diff --git a/db/migrate/20150417121913_create_project_import_data.rb b/db/migrate/20150417121913_create_project_import_data.rb
index c78f5fde85e..fc357cbacc8 100644
--- a/db/migrate/20150417121913_create_project_import_data.rb
+++ b/db/migrate/20150417121913_create_project_import_data.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateProjectImportData < ActiveRecord::Migration
   def change
     create_table :project_import_data do |t|
diff --git a/db/migrate/20150417122318_remove_import_data_from_project.rb b/db/migrate/20150417122318_remove_import_data_from_project.rb
index 46cf63593c9..5a008218fa5 100644
--- a/db/migrate/20150417122318_remove_import_data_from_project.rb
+++ b/db/migrate/20150417122318_remove_import_data_from_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveImportDataFromProject < ActiveRecord::Migration
   def up
     remove_column :projects, :import_data
diff --git a/db/migrate/20150421120000_remove_periods_at_ends_of_usernames.rb b/db/migrate/20150421120000_remove_periods_at_ends_of_usernames.rb
index 3057ea3c68c..3445e9ce59e 100644
--- a/db/migrate/20150421120000_remove_periods_at_ends_of_usernames.rb
+++ b/db/migrate/20150421120000_remove_periods_at_ends_of_usernames.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemovePeriodsAtEndsOfUsernames < ActiveRecord::Migration
   include Gitlab::ShellAdapter
 
diff --git a/db/migrate/20150423033240_add_default_project_visibililty_to_application_settings.rb b/db/migrate/20150423033240_add_default_project_visibililty_to_application_settings.rb
index 50a9b2439e0..129ce4d04af 100644
--- a/db/migrate/20150423033240_add_default_project_visibililty_to_application_settings.rb
+++ b/db/migrate/20150423033240_add_default_project_visibililty_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDefaultProjectVisibililtyToApplicationSettings < ActiveRecord::Migration
   def up
     add_column :application_settings, :default_project_visibility, :integer
diff --git a/db/migrate/20150425164646_gitlab_change_collation_for_tag_names.acts_as_taggable_on_engine.rb b/db/migrate/20150425164646_gitlab_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
index 281c88d2a7d..8f352414ffd 100644
--- a/db/migrate/20150425164646_gitlab_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20150425164646_gitlab_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This migration is a duplicate of 20150425164651_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
 # It shold be applied before the index additions to ensure that `name` is case sensitive.
 
diff --git a/db/migrate/20150425164647_remove_duplicate_tags.rb b/db/migrate/20150425164647_remove_duplicate_tags.rb
index 13e5038db9c..e77623bf507 100644
--- a/db/migrate/20150425164647_remove_duplicate_tags.rb
+++ b/db/migrate/20150425164647_remove_duplicate_tags.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveDuplicateTags < ActiveRecord::Migration
   def up
     select_all("SELECT name, COUNT(id) as cnt FROM tags GROUP BY name HAVING COUNT(id) > 1").each do |tag|
diff --git a/db/migrate/20150425164648_add_missing_unique_indices.acts_as_taggable_on_engine.rb b/db/migrate/20150425164648_add_missing_unique_indices.acts_as_taggable_on_engine.rb
index c1b78681519..cbff98cdbc4 100644
--- a/db/migrate/20150425164648_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20150425164648_add_missing_unique_indices.acts_as_taggable_on_engine.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This migration comes from acts_as_taggable_on_engine (originally 2)
 class AddMissingUniqueIndices < ActiveRecord::Migration
   def self.up
diff --git a/db/migrate/20150425164649_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb b/db/migrate/20150425164649_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
index 8edb5080781..1568d2dd4ce 100644
--- a/db/migrate/20150425164649_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20150425164649_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This migration comes from acts_as_taggable_on_engine (originally 3)
 class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
   def self.up
diff --git a/db/migrate/20150425164650_add_missing_taggable_index.acts_as_taggable_on_engine.rb b/db/migrate/20150425164650_add_missing_taggable_index.acts_as_taggable_on_engine.rb
index 71f2d7f4330..88829b87711 100644
--- a/db/migrate/20150425164650_add_missing_taggable_index.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20150425164650_add_missing_taggable_index.acts_as_taggable_on_engine.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This migration comes from acts_as_taggable_on_engine (originally 4)
 class AddMissingTaggableIndex < ActiveRecord::Migration
   def self.up
diff --git a/db/migrate/20150425164651_change_collation_for_tag_names.acts_as_taggable_on_engine.rb b/db/migrate/20150425164651_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
index bfb06bc7cda..642c4745321 100644
--- a/db/migrate/20150425164651_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20150425164651_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This migration comes from acts_as_taggable_on_engine (originally 5)
 # This migration is added to circumvent issue #623 and have special characters
 # work properly
diff --git a/db/migrate/20150425173433_add_default_snippet_visibility_to_app_settings.rb b/db/migrate/20150425173433_add_default_snippet_visibility_to_app_settings.rb
index 8f1b0cc8935..dd13def4176 100644
--- a/db/migrate/20150425173433_add_default_snippet_visibility_to_app_settings.rb
+++ b/db/migrate/20150425173433_add_default_snippet_visibility_to_app_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDefaultSnippetVisibilityToAppSettings < ActiveRecord::Migration
   def up
     add_column :application_settings, :default_snippet_visibility, :integer
diff --git a/db/migrate/20150429002313_remove_abandoned_group_members_records.rb b/db/migrate/20150429002313_remove_abandoned_group_members_records.rb
index 244637e1c4a..d2c7f3c442e 100644
--- a/db/migrate/20150429002313_remove_abandoned_group_members_records.rb
+++ b/db/migrate/20150429002313_remove_abandoned_group_members_records.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveAbandonedGroupMembersRecords < ActiveRecord::Migration
   def up
     execute("DELETE FROM members WHERE type = 'GroupMember' AND source_id NOT IN(\
diff --git a/db/migrate/20150502064022_add_restricted_signup_domains_to_application_settings.rb b/db/migrate/20150502064022_add_restricted_signup_domains_to_application_settings.rb
index 184e2653610..b63ea9aec7a 100644
--- a/db/migrate/20150502064022_add_restricted_signup_domains_to_application_settings.rb
+++ b/db/migrate/20150502064022_add_restricted_signup_domains_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRestrictedSignupDomainsToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :restricted_signup_domains, :text
diff --git a/db/migrate/20150509180749_convert_legacy_reference_notes.rb b/db/migrate/20150509180749_convert_legacy_reference_notes.rb
index b02605489be..cd8bf90108d 100644
--- a/db/migrate/20150509180749_convert_legacy_reference_notes.rb
+++ b/db/migrate/20150509180749_convert_legacy_reference_notes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # Convert legacy Markdown-emphasized notes to the current, non-emphasized format
 #
 #   _mentioned in 54f7727c850972f0401c1312a7c4a6a380de5666_
diff --git a/db/migrate/20150516060434_add_note_events_to_web_hooks.rb b/db/migrate/20150516060434_add_note_events_to_web_hooks.rb
index 0097587b4f6..bf72e5e2e3a 100644
--- a/db/migrate/20150516060434_add_note_events_to_web_hooks.rb
+++ b/db/migrate/20150516060434_add_note_events_to_web_hooks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNoteEventsToWebHooks < ActiveRecord::Migration
   def up
     add_column :web_hooks, :note_events, :boolean, default: false, null: false
diff --git a/db/migrate/20150529111607_add_user_oauth_applications_to_application_settings.rb b/db/migrate/20150529111607_add_user_oauth_applications_to_application_settings.rb
index 6a78294f0b2..9b02eda56ab 100644
--- a/db/migrate/20150529111607_add_user_oauth_applications_to_application_settings.rb
+++ b/db/migrate/20150529111607_add_user_oauth_applications_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUserOauthApplicationsToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :user_oauth_applications, :bool, default: true
diff --git a/db/migrate/20150529150354_add_after_sign_out_path_for_application_settings.rb b/db/migrate/20150529150354_add_after_sign_out_path_for_application_settings.rb
index 83e08101407..833c36de52d 100644
--- a/db/migrate/20150529150354_add_after_sign_out_path_for_application_settings.rb
+++ b/db/migrate/20150529150354_add_after_sign_out_path_for_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAfterSignOutPathForApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :after_sign_out_path, :string
diff --git a/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb b/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
index 61ff0af41f4..1f5cf1fe5f1 100644
--- a/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
+++ b/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSessionExpireDelayForApplicationSettings < ActiveRecord::Migration
   def change
     unless column_exists?(:application_settings, :session_expire_delay)
diff --git a/db/migrate/20150610065936_add_dashboard_to_users.rb b/db/migrate/20150610065936_add_dashboard_to_users.rb
index 2628e450722..df38472f893 100644
--- a/db/migrate/20150610065936_add_dashboard_to_users.rb
+++ b/db/migrate/20150610065936_add_dashboard_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDashboardToUsers < ActiveRecord::Migration
   def up
     add_column :users, :dashboard, :integer, default: 0
diff --git a/db/migrate/20150620233230_add_default_otp_required_for_login_value.rb b/db/migrate/20150620233230_add_default_otp_required_for_login_value.rb
index 8eed8678b2f..da0fd457a34 100644
--- a/db/migrate/20150620233230_add_default_otp_required_for_login_value.rb
+++ b/db/migrate/20150620233230_add_default_otp_required_for_login_value.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDefaultOtpRequiredForLoginValue < ActiveRecord::Migration
   def up
     execute %q{UPDATE users SET otp_required_for_login = FALSE WHERE otp_required_for_login IS NULL}
diff --git a/db/migrate/20150713160110_add_project_view_to_users.rb b/db/migrate/20150713160110_add_project_view_to_users.rb
index fe3d206df89..0de5a93035c 100644
--- a/db/migrate/20150713160110_add_project_view_to_users.rb
+++ b/db/migrate/20150713160110_add_project_view_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddProjectViewToUsers < ActiveRecord::Migration
   def change
     add_column :users, :project_view, :integer, default: 0
diff --git a/db/migrate/20150717130904_add_commits_count_to_project.rb b/db/migrate/20150717130904_add_commits_count_to_project.rb
index 9b46daa5933..5799e068c69 100644
--- a/db/migrate/20150717130904_add_commits_count_to_project.rb
+++ b/db/migrate/20150717130904_add_commits_count_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCommitsCountToProject < ActiveRecord::Migration
   def change
     add_column :projects, :commit_count, :integer, default: 0
diff --git a/db/migrate/20150730122406_add_updated_by_to_issuables_and_notes.rb b/db/migrate/20150730122406_add_updated_by_to_issuables_and_notes.rb
index 78d45c7f96b..be30e881c74 100644
--- a/db/migrate/20150730122406_add_updated_by_to_issuables_and_notes.rb
+++ b/db/migrate/20150730122406_add_updated_by_to_issuables_and_notes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUpdatedByToIssuablesAndNotes < ActiveRecord::Migration
   def change
     add_column :notes, :updated_by_id, :integer
diff --git a/db/migrate/20150806104937_create_abuse_reports.rb b/db/migrate/20150806104937_create_abuse_reports.rb
index e97dc4cf04c..3c749b5d9a9 100644
--- a/db/migrate/20150806104937_create_abuse_reports.rb
+++ b/db/migrate/20150806104937_create_abuse_reports.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateAbuseReports < ActiveRecord::Migration
   def change
     create_table :abuse_reports do |t|
diff --git a/db/migrate/20150812080800_add_settings_import_sources.rb b/db/migrate/20150812080800_add_settings_import_sources.rb
index 276d2fdb2b1..07f417fa3e3 100644
--- a/db/migrate/20150812080800_add_settings_import_sources.rb
+++ b/db/migrate/20150812080800_add_settings_import_sources.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 require 'yaml'
 
 class AddSettingsImportSources < ActiveRecord::Migration
diff --git a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
index de2078a9268..7eaa7eda311 100644
--- a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
+++ b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveOauthTokensFromUsers < ActiveRecord::Migration
   def change
     remove_column :users, :github_access_token, :string
diff --git a/db/migrate/20150817163600_deduplicate_user_identities.rb b/db/migrate/20150817163600_deduplicate_user_identities.rb
index fceffc48018..b0cfad7d20f 100644
--- a/db/migrate/20150817163600_deduplicate_user_identities.rb
+++ b/db/migrate/20150817163600_deduplicate_user_identities.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class DeduplicateUserIdentities < ActiveRecord::Migration
   def change
     execute 'DROP TABLE IF EXISTS tt_migration_DeduplicateUserIdentities;'
diff --git a/db/migrate/20150818213832_add_sent_notifications.rb b/db/migrate/20150818213832_add_sent_notifications.rb
index 43e8d6a1a82..fa0c3ce0acf 100644
--- a/db/migrate/20150818213832_add_sent_notifications.rb
+++ b/db/migrate/20150818213832_add_sent_notifications.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSentNotifications < ActiveRecord::Migration
   def change
     create_table :sent_notifications do |t|
diff --git a/db/migrate/20150824002011_add_enable_ssl_verification.rb b/db/migrate/20150824002011_add_enable_ssl_verification.rb
index 093c068fbde..6e992f08834 100644
--- a/db/migrate/20150824002011_add_enable_ssl_verification.rb
+++ b/db/migrate/20150824002011_add_enable_ssl_verification.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddEnableSslVerification < ActiveRecord::Migration
   def change
     add_column :web_hooks, :enable_ssl_verification, :boolean, default: false
diff --git a/db/migrate/20150826001931_add_ci_tables.rb b/db/migrate/20150826001931_add_ci_tables.rb
index c4f51363e57..d1f8506d1fe 100644
--- a/db/migrate/20150826001931_add_ci_tables.rb
+++ b/db/migrate/20150826001931_add_ci_tables.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiTables < ActiveRecord::Migration
   def change
     create_table "ci_application_settings", force: true do |t|
diff --git a/db/migrate/20150902001023_add_template_to_label.rb b/db/migrate/20150902001023_add_template_to_label.rb
index bd381a97b69..0f6ae8d6cc3 100644
--- a/db/migrate/20150902001023_add_template_to_label.rb
+++ b/db/migrate/20150902001023_add_template_to_label.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTemplateToLabel < ActiveRecord::Migration
   def change
     add_column :labels, :template, :boolean, default: false
diff --git a/db/migrate/20150914215247_add_ci_tags.rb b/db/migrate/20150914215247_add_ci_tags.rb
index df3390e8a82..b647bc9c8a2 100644
--- a/db/migrate/20150914215247_add_ci_tags.rb
+++ b/db/migrate/20150914215247_add_ci_tags.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiTags < ActiveRecord::Migration
   def change
     create_table "ci_taggings", force: true do |t|
diff --git a/db/migrate/20150915001905_enable_ssl_verification_by_default.rb b/db/migrate/20150915001905_enable_ssl_verification_by_default.rb
index 6e924262a13..3f070139418 100644
--- a/db/migrate/20150915001905_enable_ssl_verification_by_default.rb
+++ b/db/migrate/20150915001905_enable_ssl_verification_by_default.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class EnableSslVerificationByDefault < ActiveRecord::Migration
   def change
     change_column :web_hooks, :enable_ssl_verification, :boolean, default: true
diff --git a/db/migrate/20150916000405_enable_ssl_verification_for_web_hooks.rb b/db/migrate/20150916000405_enable_ssl_verification_for_web_hooks.rb
index 90ce6c2db3d..ea2ab6e4093 100644
--- a/db/migrate/20150916000405_enable_ssl_verification_for_web_hooks.rb
+++ b/db/migrate/20150916000405_enable_ssl_verification_for_web_hooks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class EnableSslVerificationForWebHooks < ActiveRecord::Migration
   def up
     execute("UPDATE web_hooks SET enable_ssl_verification = true")
diff --git a/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb b/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb
index 37a27f11935..a504f25b1be 100644
--- a/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb
+++ b/db/migrate/20150916114643_add_help_page_text_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddHelpPageTextToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :help_page_text, :text
diff --git a/db/migrate/20150916145038_add_index_for_committed_at_and_id.rb b/db/migrate/20150916145038_add_index_for_committed_at_and_id.rb
index 78d9e5f61a1..a18ed93cf37 100644
--- a/db/migrate/20150916145038_add_index_for_committed_at_and_id.rb
+++ b/db/migrate/20150916145038_add_index_for_committed_at_and_id.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexForCommittedAtAndId < ActiveRecord::Migration
   def change
     add_index :ci_commits, [:project_id, :committed_at, :id]
diff --git a/db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb b/db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb
index 6cf668a170e..c9b6e035122 100644
--- a/db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb
+++ b/db/migrate/20150918084513_add_ci_enabled_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiEnabledToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :ci_enabled, :boolean, null: false, default: true
diff --git a/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb b/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb
index 0aad6fe5e6e..e1818b566d7 100644
--- a/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb
+++ b/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveInvalidMilestonesFromMergeRequests < ActiveRecord::Migration
   def up
     execute("UPDATE merge_requests SET milestone_id = NULL where milestone_id NOT IN (SELECT id FROM milestones)")
diff --git a/db/migrate/20150920010715_add_consumed_timestep_to_users.rb b/db/migrate/20150920010715_add_consumed_timestep_to_users.rb
index c8438b3f6aa..e6975f5b9fe 100644
--- a/db/migrate/20150920010715_add_consumed_timestep_to_users.rb
+++ b/db/migrate/20150920010715_add_consumed_timestep_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddConsumedTimestepToUsers < ActiveRecord::Migration
   def change
     add_column :users, :consumed_timestep, :integer
diff --git a/db/migrate/20150920161119_add_line_code_to_sent_notification.rb b/db/migrate/20150920161119_add_line_code_to_sent_notification.rb
index d9af4e71751..1bcb06e4bda 100644
--- a/db/migrate/20150920161119_add_line_code_to_sent_notification.rb
+++ b/db/migrate/20150920161119_add_line_code_to_sent_notification.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddLineCodeToSentNotification < ActiveRecord::Migration
   def change
     add_column :sent_notifications, :line_code, :string
diff --git a/db/migrate/20150924125150_add_project_id_to_ci_commit.rb b/db/migrate/20150924125150_add_project_id_to_ci_commit.rb
index 1a761fe0f86..905332b7dc7 100644
--- a/db/migrate/20150924125150_add_project_id_to_ci_commit.rb
+++ b/db/migrate/20150924125150_add_project_id_to_ci_commit.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddProjectIdToCiCommit < ActiveRecord::Migration
   def up
     add_column :ci_commits, :gl_project_id, :integer
diff --git a/db/migrate/20150924125436_migrate_project_id_for_ci_commits.rb b/db/migrate/20150924125436_migrate_project_id_for_ci_commits.rb
index 2be57b6062e..fb0e0ba1fa5 100644
--- a/db/migrate/20150924125436_migrate_project_id_for_ci_commits.rb
+++ b/db/migrate/20150924125436_migrate_project_id_for_ci_commits.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateProjectIdForCiCommits < ActiveRecord::Migration
   def up
     subquery = 'SELECT gitlab_id FROM ci_projects WHERE ci_projects.id = ci_commits.project_id'
diff --git a/db/migrate/20150930001110_merge_request_error_field.rb b/db/migrate/20150930001110_merge_request_error_field.rb
index c2ee498ef3f..71a8ae3938a 100644
--- a/db/migrate/20150930001110_merge_request_error_field.rb
+++ b/db/migrate/20150930001110_merge_request_error_field.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MergeRequestErrorField < ActiveRecord::Migration
   def up
     add_column :merge_requests, :merge_error, :string
diff --git a/db/migrate/20150930095736_add_null_to_name_for_ci_projects.rb b/db/migrate/20150930095736_add_null_to_name_for_ci_projects.rb
index 8d47dac6441..229c9942b50 100644
--- a/db/migrate/20150930095736_add_null_to_name_for_ci_projects.rb
+++ b/db/migrate/20150930095736_add_null_to_name_for_ci_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNullToNameForCiProjects < ActiveRecord::Migration
   def up
     change_column_null :ci_projects, :name, true
diff --git a/db/migrate/20150930110012_add_group_share_lock.rb b/db/migrate/20150930110012_add_group_share_lock.rb
index 78d1a4538f2..96938bf9ab6 100644
--- a/db/migrate/20150930110012_add_group_share_lock.rb
+++ b/db/migrate/20150930110012_add_group_share_lock.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddGroupShareLock < ActiveRecord::Migration
   def change
     add_column :namespaces, :share_with_group_lock, :boolean, default: false
diff --git a/db/migrate/20151002112914_add_stage_idx_to_builds.rb b/db/migrate/20151002112914_add_stage_idx_to_builds.rb
index 68a745ffef4..4297ba0e7c8 100644
--- a/db/migrate/20151002112914_add_stage_idx_to_builds.rb
+++ b/db/migrate/20151002112914_add_stage_idx_to_builds.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddStageIdxToBuilds < ActiveRecord::Migration
   def change
     add_column :ci_builds, :stage_idx, :integer
diff --git a/db/migrate/20151002121400_add_index_for_builds.rb b/db/migrate/20151002121400_add_index_for_builds.rb
index 4ffc1363910..bd945c54540 100644
--- a/db/migrate/20151002121400_add_index_for_builds.rb
+++ b/db/migrate/20151002121400_add_index_for_builds.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexForBuilds < ActiveRecord::Migration
   def up
     add_index :ci_builds, [:commit_id, :stage_idx, :created_at]
diff --git a/db/migrate/20151002122929_add_ref_and_tag_to_builds.rb b/db/migrate/20151002122929_add_ref_and_tag_to_builds.rb
index e3d2ac1cea5..3c0fcf6c45d 100644
--- a/db/migrate/20151002122929_add_ref_and_tag_to_builds.rb
+++ b/db/migrate/20151002122929_add_ref_and_tag_to_builds.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRefAndTagToBuilds < ActiveRecord::Migration
   def change
     add_column :ci_builds, :tag, :boolean
diff --git a/db/migrate/20151002122943_migrate_ref_and_tag_to_build.rb b/db/migrate/20151002122943_migrate_ref_and_tag_to_build.rb
index 01d7b3f6773..52217ce5af2 100644
--- a/db/migrate/20151002122943_migrate_ref_and_tag_to_build.rb
+++ b/db/migrate/20151002122943_migrate_ref_and_tag_to_build.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateRefAndTagToBuild < ActiveRecord::Migration
   def change
     execute('UPDATE ci_builds SET ref=(SELECT ref FROM ci_commits WHERE ci_commits.id = ci_builds.commit_id) WHERE ref IS NULL')
diff --git a/db/migrate/20151005075649_add_user_id_to_build.rb b/db/migrate/20151005075649_add_user_id_to_build.rb
index 0f4b92b8b79..be9d403e002 100644
--- a/db/migrate/20151005075649_add_user_id_to_build.rb
+++ b/db/migrate/20151005075649_add_user_id_to_build.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUserIdToBuild < ActiveRecord::Migration
   def change
     add_column :ci_builds, :user_id, :integer
diff --git a/db/migrate/20151005150751_add_layout_option_for_users.rb b/db/migrate/20151005150751_add_layout_option_for_users.rb
index ead9b1f8977..7e68606969f 100644
--- a/db/migrate/20151005150751_add_layout_option_for_users.rb
+++ b/db/migrate/20151005150751_add_layout_option_for_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddLayoutOptionForUsers < ActiveRecord::Migration
   def change
     add_column :users, :layout, :integer, default: 0
diff --git a/db/migrate/20151005162154_remove_ci_enabled_from_application_settings.rb b/db/migrate/20151005162154_remove_ci_enabled_from_application_settings.rb
index be6aa810bb5..07dba598749 100644
--- a/db/migrate/20151005162154_remove_ci_enabled_from_application_settings.rb
+++ b/db/migrate/20151005162154_remove_ci_enabled_from_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveCiEnabledFromApplicationSettings < ActiveRecord::Migration
   def change
     remove_column :application_settings, :ci_enabled, :boolean, null: false, default: true
diff --git a/db/migrate/20151007120511_namespaces_projects_path_lower_indexes.rb b/db/migrate/20151007120511_namespaces_projects_path_lower_indexes.rb
index 7f6cd6d5a78..38208e59804 100644
--- a/db/migrate/20151007120511_namespaces_projects_path_lower_indexes.rb
+++ b/db/migrate/20151007120511_namespaces_projects_path_lower_indexes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class NamespacesProjectsPathLowerIndexes < ActiveRecord::Migration
   disable_ddl_transaction!
 
diff --git a/db/migrate/20151008110232_add_users_lower_username_email_indexes.rb b/db/migrate/20151008110232_add_users_lower_username_email_indexes.rb
index 2f2dc776785..6080d2a0fcf 100644
--- a/db/migrate/20151008110232_add_users_lower_username_email_indexes.rb
+++ b/db/migrate/20151008110232_add_users_lower_username_email_indexes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUsersLowerUsernameEmailIndexes < ActiveRecord::Migration
   disable_ddl_transaction!
 
diff --git a/db/migrate/20151008123042_add_type_and_description_to_builds.rb b/db/migrate/20151008123042_add_type_and_description_to_builds.rb
index c72b1c611c6..a19eb6c6c49 100644
--- a/db/migrate/20151008123042_add_type_and_description_to_builds.rb
+++ b/db/migrate/20151008123042_add_type_and_description_to_builds.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTypeAndDescriptionToBuilds < ActiveRecord::Migration
   def change
     add_column :ci_builds, :type, :string
diff --git a/db/migrate/20151008130321_migrate_name_to_description_for_builds.rb b/db/migrate/20151008130321_migrate_name_to_description_for_builds.rb
index f5c44babd84..306fa7092ea 100644
--- a/db/migrate/20151008130321_migrate_name_to_description_for_builds.rb
+++ b/db/migrate/20151008130321_migrate_name_to_description_for_builds.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateNameToDescriptionForBuilds < ActiveRecord::Migration
   def change
     execute("UPDATE ci_builds SET type='Ci::Build' WHERE type IS NULL")
diff --git a/db/migrate/20151008143519_add_admin_notification_email_setting.rb b/db/migrate/20151008143519_add_admin_notification_email_setting.rb
index 0bb581efe2c..f48ec9aa4a6 100644
--- a/db/migrate/20151008143519_add_admin_notification_email_setting.rb
+++ b/db/migrate/20151008143519_add_admin_notification_email_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAdminNotificationEmailSetting < ActiveRecord::Migration
   def change
     add_column :application_settings, :admin_notification_email, :string
diff --git a/db/migrate/20151012173029_set_jira_service_api_url.rb b/db/migrate/20151012173029_set_jira_service_api_url.rb
index 2af99e0db0b..2b6f61428c0 100644
--- a/db/migrate/20151012173029_set_jira_service_api_url.rb
+++ b/db/migrate/20151012173029_set_jira_service_api_url.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class SetJiraServiceApiUrl < ActiveRecord::Migration
   # This migration can be performed online without errors, but some Jira API calls may be missed
   # when doing so because api_url is not yet available.
diff --git a/db/migrate/20151013092124_add_artifacts_file_to_builds.rb b/db/migrate/20151013092124_add_artifacts_file_to_builds.rb
index 5a299f7b26d..a54ac9d57a4 100644
--- a/db/migrate/20151013092124_add_artifacts_file_to_builds.rb
+++ b/db/migrate/20151013092124_add_artifacts_file_to_builds.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddArtifactsFileToBuilds < ActiveRecord::Migration
   def change
     add_column :ci_builds, :artifacts_file, :text
diff --git a/db/migrate/20151016131433_add_ci_projects_gl_project_id_index.rb b/db/migrate/20151016131433_add_ci_projects_gl_project_id_index.rb
index 52a47aa9c54..eb3351eb767 100644
--- a/db/migrate/20151016131433_add_ci_projects_gl_project_id_index.rb
+++ b/db/migrate/20151016131433_add_ci_projects_gl_project_id_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiProjectsGlProjectIdIndex < ActiveRecord::Migration
   def change
     add_index :ci_commits, :gl_project_id
diff --git a/db/migrate/20151016195451_add_ci_builds_and_projects_indexes.rb b/db/migrate/20151016195451_add_ci_builds_and_projects_indexes.rb
index 7f1af1c7583..899e004d610 100644
--- a/db/migrate/20151016195451_add_ci_builds_and_projects_indexes.rb
+++ b/db/migrate/20151016195451_add_ci_builds_and_projects_indexes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiBuildsAndProjectsIndexes < ActiveRecord::Migration
   def change
     add_index :ci_projects, :gitlab_id
diff --git a/db/migrate/20151016195706_add_notes_line_code_index.rb b/db/migrate/20151016195706_add_notes_line_code_index.rb
index aeeb1a759fa..3298630c1e8 100644
--- a/db/migrate/20151016195706_add_notes_line_code_index.rb
+++ b/db/migrate/20151016195706_add_notes_line_code_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotesLineCodeIndex < ActiveRecord::Migration
   def change
     add_index :notes, :line_code
diff --git a/db/migrate/20151019111551_fix_build_tags.rb b/db/migrate/20151019111551_fix_build_tags.rb
index 299a24b0a7c..8c05acfc190 100644
--- a/db/migrate/20151019111551_fix_build_tags.rb
+++ b/db/migrate/20151019111551_fix_build_tags.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FixBuildTags < ActiveRecord::Migration
   def up
     execute("UPDATE taggings SET taggable_type='CommitStatus' WHERE taggable_type='Ci::Build'")
diff --git a/db/migrate/20151019111703_fail_build_without_names.rb b/db/migrate/20151019111703_fail_build_without_names.rb
index dcdb5d1b25d..362e31eb435 100644
--- a/db/migrate/20151019111703_fail_build_without_names.rb
+++ b/db/migrate/20151019111703_fail_build_without_names.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FailBuildWithoutNames < ActiveRecord::Migration
   def up
     execute("UPDATE ci_builds SET status='failed' WHERE name IS NULL AND status='pending'")
diff --git a/db/migrate/20151020145526_add_services_template_index.rb b/db/migrate/20151020145526_add_services_template_index.rb
index 1b04f313565..14ff07bd726 100644
--- a/db/migrate/20151020145526_add_services_template_index.rb
+++ b/db/migrate/20151020145526_add_services_template_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddServicesTemplateIndex < ActiveRecord::Migration
   def change
     add_index :services, :template
diff --git a/db/migrate/20151020173516_ci_limits_to_mysql.rb b/db/migrate/20151020173516_ci_limits_to_mysql.rb
index 9bb960082f5..5314611cbcd 100644
--- a/db/migrate/20151020173516_ci_limits_to_mysql.rb
+++ b/db/migrate/20151020173516_ci_limits_to_mysql.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CiLimitsToMysql < ActiveRecord::Migration
   def change
     return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/
diff --git a/db/migrate/20151020173906_add_ci_builds_index_for_status.rb b/db/migrate/20151020173906_add_ci_builds_index_for_status.rb
index c3f0e0606da..81a31e46ff8 100644
--- a/db/migrate/20151020173906_add_ci_builds_index_for_status.rb
+++ b/db/migrate/20151020173906_add_ci_builds_index_for_status.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiBuildsIndexForStatus < ActiveRecord::Migration
   def change
     add_index :ci_builds, [:commit_id, :status, :type]
diff --git a/db/migrate/20151023112551_fail_build_with_empty_name.rb b/db/migrate/20151023112551_fail_build_with_empty_name.rb
index 41c0f0649cd..0666dfeaef4 100644
--- a/db/migrate/20151023112551_fail_build_with_empty_name.rb
+++ b/db/migrate/20151023112551_fail_build_with_empty_name.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FailBuildWithEmptyName < ActiveRecord::Migration
   def up
     execute("UPDATE ci_builds SET status='failed' WHERE (name IS NULL OR name='') AND status='pending'")
diff --git a/db/migrate/20151023144219_remove_satellites.rb b/db/migrate/20151023144219_remove_satellites.rb
index e73f300028a..98fe0bd7d1d 100644
--- a/db/migrate/20151023144219_remove_satellites.rb
+++ b/db/migrate/20151023144219_remove_satellites.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 require 'fileutils'
 
 class RemoveSatellites < ActiveRecord::Migration
diff --git a/db/migrate/20151026182941_add_project_path_index.rb b/db/migrate/20151026182941_add_project_path_index.rb
index a62fe199d70..117f65c1a1b 100644
--- a/db/migrate/20151026182941_add_project_path_index.rb
+++ b/db/migrate/20151026182941_add_project_path_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddProjectPathIndex < ActiveRecord::Migration
   def up
     add_index :projects, :path
diff --git a/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb b/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
index ceb52f0c222..4a989669464 100644
--- a/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
+++ b/db/migrate/20151028152939_add_merge_when_build_succeeds_to_merge_request.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMergeWhenBuildSucceedsToMergeRequest < ActiveRecord::Migration
   def change
     add_column :merge_requests, :merge_params, :text
diff --git a/db/migrate/20151103001141_add_public_to_group.rb b/db/migrate/20151103001141_add_public_to_group.rb
index 635346300c2..ba1f7c27832 100644
--- a/db/migrate/20151103001141_add_public_to_group.rb
+++ b/db/migrate/20151103001141_add_public_to_group.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPublicToGroup < ActiveRecord::Migration
   def change
     add_column :namespaces, :public, :boolean, default: false
diff --git a/db/migrate/20151103133339_add_shared_runners_setting.rb b/db/migrate/20151103133339_add_shared_runners_setting.rb
index 4231dfd5c2e..b5b34d4ca61 100644
--- a/db/migrate/20151103133339_add_shared_runners_setting.rb
+++ b/db/migrate/20151103133339_add_shared_runners_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSharedRunnersSetting < ActiveRecord::Migration
   def up
     add_column :application_settings, :shared_runners_enabled, :boolean, default: true, null: false
diff --git a/db/migrate/20151103134857_create_lfs_objects.rb b/db/migrate/20151103134857_create_lfs_objects.rb
index 2d04c170a88..745b52e2b24 100644
--- a/db/migrate/20151103134857_create_lfs_objects.rb
+++ b/db/migrate/20151103134857_create_lfs_objects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateLfsObjects < ActiveRecord::Migration
   def change
     create_table :lfs_objects do |t|
diff --git a/db/migrate/20151103134958_create_lfs_objects_projects.rb b/db/migrate/20151103134958_create_lfs_objects_projects.rb
index f3f58b931ec..3178e85b899 100644
--- a/db/migrate/20151103134958_create_lfs_objects_projects.rb
+++ b/db/migrate/20151103134958_create_lfs_objects_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateLfsObjectsProjects < ActiveRecord::Migration
   def change
     create_table :lfs_objects_projects do |t|
diff --git a/db/migrate/20151104105513_add_file_to_lfs_objects.rb b/db/migrate/20151104105513_add_file_to_lfs_objects.rb
index 7c57f3f0df6..4e46ae8101c 100644
--- a/db/migrate/20151104105513_add_file_to_lfs_objects.rb
+++ b/db/migrate/20151104105513_add_file_to_lfs_objects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddFileToLfsObjects < ActiveRecord::Migration
   def change
     add_column :lfs_objects, :file, :string
diff --git a/db/migrate/20151105094515_create_releases.rb b/db/migrate/20151105094515_create_releases.rb
index fe4608c6662..145b8db1486 100644
--- a/db/migrate/20151105094515_create_releases.rb
+++ b/db/migrate/20151105094515_create_releases.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateReleases < ActiveRecord::Migration
   def change
     create_table :releases do |t|
diff --git a/db/migrate/20151106000015_add_is_award_to_notes.rb b/db/migrate/20151106000015_add_is_award_to_notes.rb
index 02b271637e9..b463d939b78 100644
--- a/db/migrate/20151106000015_add_is_award_to_notes.rb
+++ b/db/migrate/20151106000015_add_is_award_to_notes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIsAwardToNotes < ActiveRecord::Migration
   def change
     add_column :notes, :is_award, :boolean, default: false, null: false
diff --git a/db/migrate/20151109100728_add_max_artifacts_size_to_application_settings.rb b/db/migrate/20151109100728_add_max_artifacts_size_to_application_settings.rb
index 01d8c0f043e..25106ace7e9 100644
--- a/db/migrate/20151109100728_add_max_artifacts_size_to_application_settings.rb
+++ b/db/migrate/20151109100728_add_max_artifacts_size_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMaxArtifactsSizeToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :max_artifacts_size, :integer, default: 100, null: false
diff --git a/db/migrate/20151109134526_add_issues_state_index.rb b/db/migrate/20151109134526_add_issues_state_index.rb
index 1c4d2e30171..7a9970e8591 100644
--- a/db/migrate/20151109134526_add_issues_state_index.rb
+++ b/db/migrate/20151109134526_add_issues_state_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIssuesStateIndex < ActiveRecord::Migration
   def change
     add_index :issues, :state
diff --git a/db/migrate/20151109134916_add_projects_visibility_level_index.rb b/db/migrate/20151109134916_add_projects_visibility_level_index.rb
index 600b4bafd98..471db437b11 100644
--- a/db/migrate/20151109134916_add_projects_visibility_level_index.rb
+++ b/db/migrate/20151109134916_add_projects_visibility_level_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddProjectsVisibilityLevelIndex < ActiveRecord::Migration
   def change
     add_index :projects, :visibility_level
diff --git a/db/migrate/20151110125604_add_import_error_to_project.rb b/db/migrate/20151110125604_add_import_error_to_project.rb
index 7fc990f8d0a..793358c305e 100644
--- a/db/migrate/20151110125604_add_import_error_to_project.rb
+++ b/db/migrate/20151110125604_add_import_error_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImportErrorToProject < ActiveRecord::Migration
   def change
     add_column :projects, :import_error, :text
diff --git a/db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb b/db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb
index d10f1f6e605..00a4c74ffbc 100644
--- a/db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb
+++ b/db/migrate/20151114113410_add_index_for_lfs_oid_and_size.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexForLfsOidAndSize < ActiveRecord::Migration
   def change
     add_index :lfs_objects, :oid
diff --git a/db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb b/db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb
index 41b93da0a86..1f192544ea1 100644
--- a/db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb
+++ b/db/migrate/20151116144118_add_unique_for_lfs_oid_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUniqueForLfsOidIndex < ActiveRecord::Migration
   def change
     remove_index :lfs_objects, :oid
diff --git a/db/migrate/20151118162244_add_projects_public_index.rb b/db/migrate/20151118162244_add_projects_public_index.rb
index fded70e3c0c..589f124c21e 100644
--- a/db/migrate/20151118162244_add_projects_public_index.rb
+++ b/db/migrate/20151118162244_add_projects_public_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddProjectsPublicIndex < ActiveRecord::Migration
   def change
     add_index :namespaces, :public
diff --git a/db/migrate/20151201203948_raise_hook_url_limit.rb b/db/migrate/20151201203948_raise_hook_url_limit.rb
index 98a7fca6f6f..c490b7ace0f 100644
--- a/db/migrate/20151201203948_raise_hook_url_limit.rb
+++ b/db/migrate/20151201203948_raise_hook_url_limit.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RaiseHookUrlLimit < ActiveRecord::Migration
   def change
     change_column :web_hooks, :url, :string, limit: 2000
diff --git a/db/migrate/20151203162133_add_hide_project_limit_to_users.rb b/db/migrate/20151203162133_add_hide_project_limit_to_users.rb
index 6ffadfa1894..5dc6d8bf445 100644
--- a/db/migrate/20151203162133_add_hide_project_limit_to_users.rb
+++ b/db/migrate/20151203162133_add_hide_project_limit_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddHideProjectLimitToUsers < ActiveRecord::Migration
   def change
     add_column :users, :hide_project_limit, :boolean, default: false
diff --git a/db/migrate/20151203162134_add_build_events_to_services.rb b/db/migrate/20151203162134_add_build_events_to_services.rb
index c5542cb864d..455882e5ec0 100644
--- a/db/migrate/20151203162134_add_build_events_to_services.rb
+++ b/db/migrate/20151203162134_add_build_events_to_services.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddBuildEventsToServices < ActiveRecord::Migration
   def change
     add_column :services, :build_events, :boolean, default: false, null: false
diff --git a/db/migrate/20151209144329_migrate_ci_web_hooks.rb b/db/migrate/20151209144329_migrate_ci_web_hooks.rb
index d7e196e6763..cb1e556623a 100644
--- a/db/migrate/20151209144329_migrate_ci_web_hooks.rb
+++ b/db/migrate/20151209144329_migrate_ci_web_hooks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateCiWebHooks < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20151209145909_migrate_ci_emails.rb b/db/migrate/20151209145909_migrate_ci_emails.rb
index 7f330a2cf0a..6b7a106814d 100644
--- a/db/migrate/20151209145909_migrate_ci_emails.rb
+++ b/db/migrate/20151209145909_migrate_ci_emails.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateCiEmails < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20151210030143_add_unlock_token_to_user.rb b/db/migrate/20151210030143_add_unlock_token_to_user.rb
index 0ea66ba65df..d23c648f782 100644
--- a/db/migrate/20151210030143_add_unlock_token_to_user.rb
+++ b/db/migrate/20151210030143_add_unlock_token_to_user.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUnlockTokenToUser < ActiveRecord::Migration
   def change
     add_column :users, :unlock_token, :string
diff --git a/db/migrate/20151210072243_add_runners_registration_token_to_application_settings.rb b/db/migrate/20151210072243_add_runners_registration_token_to_application_settings.rb
index 00f88180e46..92c7b5befd2 100644
--- a/db/migrate/20151210072243_add_runners_registration_token_to_application_settings.rb
+++ b/db/migrate/20151210072243_add_runners_registration_token_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRunnersRegistrationTokenToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :runners_registration_token, :string
diff --git a/db/migrate/20151210125232_migrate_ci_slack_service.rb b/db/migrate/20151210125232_migrate_ci_slack_service.rb
index f14efa3e95d..633d5148d97 100644
--- a/db/migrate/20151210125232_migrate_ci_slack_service.rb
+++ b/db/migrate/20151210125232_migrate_ci_slack_service.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateCiSlackService < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20151210125927_migrate_ci_hip_chat_service.rb b/db/migrate/20151210125927_migrate_ci_hip_chat_service.rb
index b9e04323576..dae084ce180 100644
--- a/db/migrate/20151210125927_migrate_ci_hip_chat_service.rb
+++ b/db/migrate/20151210125927_migrate_ci_hip_chat_service.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateCiHipChatService < ActiveRecord::Migration
   include Gitlab::Database
 
diff --git a/db/migrate/20151210125928_add_ci_to_project.rb b/db/migrate/20151210125928_add_ci_to_project.rb
index 8c167f64a2b..a9ff49a3f7e 100644
--- a/db/migrate/20151210125928_add_ci_to_project.rb
+++ b/db/migrate/20151210125928_add_ci_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiToProject < ActiveRecord::Migration
   def change
     add_column :projects, :ci_id, :integer
diff --git a/db/migrate/20151210125929_add_project_id_to_ci.rb b/db/migrate/20151210125929_add_project_id_to_ci.rb
index 84273591fa2..b5de64b82ca 100644
--- a/db/migrate/20151210125929_add_project_id_to_ci.rb
+++ b/db/migrate/20151210125929_add_project_id_to_ci.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddProjectIdToCi < ActiveRecord::Migration
   def change
     add_column :ci_builds, :gl_project_id, :integer
diff --git a/db/migrate/20151210125930_migrate_ci_to_project.rb b/db/migrate/20151210125930_migrate_ci_to_project.rb
index c32c7feb193..bb6d74ae212 100644
--- a/db/migrate/20151210125930_migrate_ci_to_project.rb
+++ b/db/migrate/20151210125930_migrate_ci_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class MigrateCiToProject < ActiveRecord::Migration
   def up
     migrate_project_id_for_table('ci_runner_projects')
diff --git a/db/migrate/20151210125931_add_index_to_ci_tables.rb b/db/migrate/20151210125931_add_index_to_ci_tables.rb
index 5e129c9303d..d87d335cf6b 100644
--- a/db/migrate/20151210125931_add_index_to_ci_tables.rb
+++ b/db/migrate/20151210125931_add_index_to_ci_tables.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexToCiTables < ActiveRecord::Migration
   def change
     add_index :ci_builds, :gl_project_id
diff --git a/db/migrate/20151210125932_drop_null_for_ci_tables.rb b/db/migrate/20151210125932_drop_null_for_ci_tables.rb
index c520c2ed56f..e1a0a964589 100644
--- a/db/migrate/20151210125932_drop_null_for_ci_tables.rb
+++ b/db/migrate/20151210125932_drop_null_for_ci_tables.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class DropNullForCiTables < ActiveRecord::Migration
   def change
     remove_index :ci_variables, :project_id
diff --git a/db/migrate/20151218154042_add_tfa_to_application_settings.rb b/db/migrate/20151218154042_add_tfa_to_application_settings.rb
index dd95db775c5..afdaf76b917 100644
--- a/db/migrate/20151218154042_add_tfa_to_application_settings.rb
+++ b/db/migrate/20151218154042_add_tfa_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTfaToApplicationSettings < ActiveRecord::Migration
   def change
     change_table :application_settings do |t|
diff --git a/db/migrate/20151221234414_add_tfa_additional_fields.rb b/db/migrate/20151221234414_add_tfa_additional_fields.rb
index c16df47932f..c3e4aaa606a 100644
--- a/db/migrate/20151221234414_add_tfa_additional_fields.rb
+++ b/db/migrate/20151221234414_add_tfa_additional_fields.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTfaAdditionalFields < ActiveRecord::Migration
   def change
     change_table :users do |t|
diff --git a/db/migrate/20151224123230_rename_emojis.rb b/db/migrate/20151224123230_rename_emojis.rb
index 62d921dfdcc..2c24f3beeea 100644
--- a/db/migrate/20151224123230_rename_emojis.rb
+++ b/db/migrate/20151224123230_rename_emojis.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # Migration type: online without errors (works on previous version and new one)
 class RenameEmojis < ActiveRecord::Migration
   def up
diff --git a/db/migrate/20151228111122_remove_public_from_namespace.rb b/db/migrate/20151228111122_remove_public_from_namespace.rb
index f4c848bbf47..bcb322d9cba 100644
--- a/db/migrate/20151228111122_remove_public_from_namespace.rb
+++ b/db/migrate/20151228111122_remove_public_from_namespace.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # Migration type: online
 class RemovePublicFromNamespace < ActiveRecord::Migration
   def change
diff --git a/db/migrate/20151228150906_influxdb_settings.rb b/db/migrate/20151228150906_influxdb_settings.rb
index 3012bd52cfd..2e080a02e6a 100644
--- a/db/migrate/20151228150906_influxdb_settings.rb
+++ b/db/migrate/20151228150906_influxdb_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class InfluxdbSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :metrics_enabled, :boolean, default: false
diff --git a/db/migrate/20151228175719_add_recaptcha_to_application_settings.rb b/db/migrate/20151228175719_add_recaptcha_to_application_settings.rb
index 259fd0248d2..e0dd19b2b06 100644
--- a/db/migrate/20151228175719_add_recaptcha_to_application_settings.rb
+++ b/db/migrate/20151228175719_add_recaptcha_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRecaptchaToApplicationSettings < ActiveRecord::Migration
   def change
     change_table :application_settings do |t|
diff --git a/db/migrate/20151229102248_influxdb_udp_port_setting.rb b/db/migrate/20151229102248_influxdb_udp_port_setting.rb
index ae0499f936d..3e1bfd43899 100644
--- a/db/migrate/20151229102248_influxdb_udp_port_setting.rb
+++ b/db/migrate/20151229102248_influxdb_udp_port_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class InfluxdbUdpPortSetting < ActiveRecord::Migration
   def change
     add_column :application_settings, :metrics_port, :integer, default: 8089
diff --git a/db/migrate/20151229112614_influxdb_remote_database_setting.rb b/db/migrate/20151229112614_influxdb_remote_database_setting.rb
index f0e1ee1e7a7..d2ac906ead3 100644
--- a/db/migrate/20151229112614_influxdb_remote_database_setting.rb
+++ b/db/migrate/20151229112614_influxdb_remote_database_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class InfluxdbRemoteDatabaseSetting < ActiveRecord::Migration
   def change
     remove_column :application_settings, :metrics_database
diff --git a/db/migrate/20151230132518_add_artifacts_metadata_to_ci_build.rb b/db/migrate/20151230132518_add_artifacts_metadata_to_ci_build.rb
index 6c282fc5039..4fcca06d905 100644
--- a/db/migrate/20151230132518_add_artifacts_metadata_to_ci_build.rb
+++ b/db/migrate/20151230132518_add_artifacts_metadata_to_ci_build.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddArtifactsMetadataToCiBuild < ActiveRecord::Migration
   def change
     add_column :ci_builds, :artifacts_metadata, :text
diff --git a/db/migrate/20151231152326_add_akismet_to_application_settings.rb b/db/migrate/20151231152326_add_akismet_to_application_settings.rb
index 3f52c758f9a..7b0fab6f557 100644
--- a/db/migrate/20151231152326_add_akismet_to_application_settings.rb
+++ b/db/migrate/20151231152326_add_akismet_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAkismetToApplicationSettings < ActiveRecord::Migration
   def change
     change_table :application_settings do |t|
diff --git a/db/migrate/20151231202530_remove_alert_type_from_broadcast_messages.rb b/db/migrate/20151231202530_remove_alert_type_from_broadcast_messages.rb
index 78fdfeaf5cf..0bdd639eb21 100644
--- a/db/migrate/20151231202530_remove_alert_type_from_broadcast_messages.rb
+++ b/db/migrate/20151231202530_remove_alert_type_from_broadcast_messages.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveAlertTypeFromBroadcastMessages < ActiveRecord::Migration
   def change
     remove_column :broadcast_messages, :alert_type, :integer
diff --git a/db/migrate/20160106162223_add_index_milestones_title.rb b/db/migrate/20160106162223_add_index_milestones_title.rb
index 767885e2aac..9b9b6445a08 100644
--- a/db/migrate/20160106162223_add_index_milestones_title.rb
+++ b/db/migrate/20160106162223_add_index_milestones_title.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexMilestonesTitle < ActiveRecord::Migration
   def change
     add_index :milestones, :title
diff --git a/db/migrate/20160106164438_remove_influxdb_credentials.rb b/db/migrate/20160106164438_remove_influxdb_credentials.rb
index 47e74400b97..987d75d6fda 100644
--- a/db/migrate/20160106164438_remove_influxdb_credentials.rb
+++ b/db/migrate/20160106164438_remove_influxdb_credentials.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveInfluxdbCredentials < ActiveRecord::Migration
   def change
     remove_column :application_settings, :metrics_username, :string
diff --git a/db/migrate/20160109054846_create_spam_logs.rb b/db/migrate/20160109054846_create_spam_logs.rb
index f12fe9f8f78..f7103276639 100644
--- a/db/migrate/20160109054846_create_spam_logs.rb
+++ b/db/migrate/20160109054846_create_spam_logs.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateSpamLogs < ActiveRecord::Migration
   def change
     create_table :spam_logs do |t|
diff --git a/db/migrate/20160113111034_add_metrics_sample_interval.rb b/db/migrate/20160113111034_add_metrics_sample_interval.rb
index b741f5d2c75..c1041da818c 100644
--- a/db/migrate/20160113111034_add_metrics_sample_interval.rb
+++ b/db/migrate/20160113111034_add_metrics_sample_interval.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMetricsSampleInterval < ActiveRecord::Migration
   def change
     add_column :application_settings, :metrics_sample_interval, :integer,
diff --git a/db/migrate/20160118155830_add_sentry_to_application_settings.rb b/db/migrate/20160118155830_add_sentry_to_application_settings.rb
index fa7ff9d9228..a6f715263ef 100644
--- a/db/migrate/20160118155830_add_sentry_to_application_settings.rb
+++ b/db/migrate/20160118155830_add_sentry_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSentryToApplicationSettings < ActiveRecord::Migration
   def change
     change_table :application_settings do |t|
diff --git a/db/migrate/20160118232755_add_ip_blocking_settings_to_application_settings.rb b/db/migrate/20160118232755_add_ip_blocking_settings_to_application_settings.rb
index 26606b10b54..19ea40b5547 100644
--- a/db/migrate/20160118232755_add_ip_blocking_settings_to_application_settings.rb
+++ b/db/migrate/20160118232755_add_ip_blocking_settings_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIpBlockingSettingsToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :ip_blocking_enabled, :boolean, default: false
diff --git a/db/migrate/20160119111158_add_services_category.rb b/db/migrate/20160119111158_add_services_category.rb
index a9110a8418b..f77484b2f96 100644
--- a/db/migrate/20160119111158_add_services_category.rb
+++ b/db/migrate/20160119111158_add_services_category.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddServicesCategory < ActiveRecord::Migration
   def up
     add_column :services, :category, :string, default: 'common', null: false
diff --git a/db/migrate/20160119112418_add_services_default.rb b/db/migrate/20160119112418_add_services_default.rb
index 69a42d7b873..7fa531899fe 100644
--- a/db/migrate/20160119112418_add_services_default.rb
+++ b/db/migrate/20160119112418_add_services_default.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddServicesDefault < ActiveRecord::Migration
   def up
     add_column :services, :default, :boolean, default: false
diff --git a/db/migrate/20160119145451_add_ldap_email_to_users.rb b/db/migrate/20160119145451_add_ldap_email_to_users.rb
index 654d31ab15a..5b2b0bd31ca 100644
--- a/db/migrate/20160119145451_add_ldap_email_to_users.rb
+++ b/db/migrate/20160119145451_add_ldap_email_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddLdapEmailToUsers < ActiveRecord::Migration
   def up
     add_column :users, :ldap_email, :boolean, default: false, null: false
diff --git a/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb b/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb
index d6c6aa4a4e8..3837208f81e 100644
--- a/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb
+++ b/db/migrate/20160120172143_add_base_commit_sha_to_merge_request_diffs.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddBaseCommitShaToMergeRequestDiffs < ActiveRecord::Migration
   def change
     add_column :merge_request_diffs, :base_commit_sha, :string
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
index d50791410f9..9a2570ae544 100644
--- 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
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddEmailAuthorInBodyToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :email_author_in_body, :boolean, default: false
diff --git a/db/migrate/20160122185421_add_pending_delete_to_project.rb b/db/migrate/20160122185421_add_pending_delete_to_project.rb
index 046a5d8fc32..61db852843f 100644
--- a/db/migrate/20160122185421_add_pending_delete_to_project.rb
+++ b/db/migrate/20160122185421_add_pending_delete_to_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPendingDeleteToProject < ActiveRecord::Migration
   def change
     add_column :projects, :pending_delete, :boolean, default: false
diff --git a/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb b/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb
index 41821cdcc42..60ecda998dd 100644
--- a/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb
+++ b/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveIpBlockingSettingsFromApplicationSettings < ActiveRecord::Migration
   def change
     remove_column :application_settings, :ip_blocking_enabled, :boolean, default: false
diff --git a/db/migrate/20160128233227_change_lfs_objects_size_column.rb b/db/migrate/20160128233227_change_lfs_objects_size_column.rb
index e7fd1f71777..645c0cdb192 100644
--- a/db/migrate/20160128233227_change_lfs_objects_size_column.rb
+++ b/db/migrate/20160128233227_change_lfs_objects_size_column.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ChangeLfsObjectsSizeColumn < ActiveRecord::Migration
   def change
     change_column :lfs_objects, :size, :integer, limit: 8
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 d3ea956952e..b10c0602e24 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
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveDotAtomPathEndingOfProjects < ActiveRecord::Migration
   include Gitlab::ShellAdapter
 
diff --git a/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb b/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb
index f0d94226514..332b5a756e8 100644
--- a/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb
+++ b/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMergeCommitShaToMergeRequests < ActiveRecord::Migration
   def change
     add_column :merge_requests, :merge_commit_sha, :string
diff --git a/db/migrate/20160202091601_add_erasable_to_ci_build.rb b/db/migrate/20160202091601_add_erasable_to_ci_build.rb
index f9912f2274e..767ae160d08 100644
--- a/db/migrate/20160202091601_add_erasable_to_ci_build.rb
+++ b/db/migrate/20160202091601_add_erasable_to_ci_build.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddErasableToCiBuild < ActiveRecord::Migration
   def change
     add_reference :ci_builds, :erased_by, references: :users, index: true
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 793984343b4..2c5cb307fad 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,3 +1,4 @@
+# rubocop:disable all
 class AddAllowGuestToAccessBuildsProject < ActiveRecord::Migration
   def change
     add_column :projects, :public_builds, :boolean, default: true, null: false
diff --git a/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb b/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb
index f996ae74dca..11b6ff31000 100644
--- a/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb
+++ b/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRealSizeToMergeRequestDiffs < ActiveRecord::Migration
   def change
     add_column :merge_request_diffs, :real_size, :string
diff --git a/db/migrate/20160209130428_add_index_to_snippet.rb b/db/migrate/20160209130428_add_index_to_snippet.rb
index 95d5719be59..4d17c3a2917 100644
--- a/db/migrate/20160209130428_add_index_to_snippet.rb
+++ b/db/migrate/20160209130428_add_index_to_snippet.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexToSnippet < ActiveRecord::Migration
   def change
     add_index :snippets, :updated_at
diff --git a/db/migrate/20160212123307_create_tasks.rb b/db/migrate/20160212123307_create_tasks.rb
index c3f6f3abc26..20573b01351 100644
--- a/db/migrate/20160212123307_create_tasks.rb
+++ b/db/migrate/20160212123307_create_tasks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateTasks < ActiveRecord::Migration
   def change
     create_table :tasks do |t|
diff --git a/db/migrate/20160217100506_add_description_to_label.rb b/db/migrate/20160217100506_add_description_to_label.rb
index eed6d1f236a..af5af167470 100644
--- a/db/migrate/20160217100506_add_description_to_label.rb
+++ b/db/migrate/20160217100506_add_description_to_label.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDescriptionToLabel < ActiveRecord::Migration
   def change
     add_column :labels, :description, :string
diff --git a/db/migrate/20160217174422_add_note_to_tasks.rb b/db/migrate/20160217174422_add_note_to_tasks.rb
index da5cb2e05db..a9a2b77e423 100644
--- a/db/migrate/20160217174422_add_note_to_tasks.rb
+++ b/db/migrate/20160217174422_add_note_to_tasks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNoteToTasks < ActiveRecord::Migration
   def change
     add_reference :tasks, :note, index: true
diff --git a/db/migrate/20160220123949_rename_tasks_to_todos.rb b/db/migrate/20160220123949_rename_tasks_to_todos.rb
index 30c10d27146..f16b37537f3 100644
--- a/db/migrate/20160220123949_rename_tasks_to_todos.rb
+++ b/db/migrate/20160220123949_rename_tasks_to_todos.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RenameTasksToTodos < ActiveRecord::Migration
   def change
     rename_table :tasks, :todos
diff --git a/db/migrate/20160222153918_create_appearances_ce.rb b/db/migrate/20160222153918_create_appearances_ce.rb
index bec66bcc71e..b2d5949b23f 100644
--- a/db/migrate/20160222153918_create_appearances_ce.rb
+++ b/db/migrate/20160222153918_create_appearances_ce.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateAppearancesCe < ActiveRecord::Migration
   def change
     unless table_exists?(:appearances)
diff --git a/db/migrate/20160223192159_add_confidential_to_issues.rb b/db/migrate/20160223192159_add_confidential_to_issues.rb
index e9d47fd589a..5b99ce30e9f 100644
--- a/db/migrate/20160223192159_add_confidential_to_issues.rb
+++ b/db/migrate/20160223192159_add_confidential_to_issues.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddConfidentialToIssues < ActiveRecord::Migration
   def change
     add_column :issues, :confidential, :boolean, default: false
diff --git a/db/migrate/20160225090018_add_delete_at_to_issues.rb b/db/migrate/20160225090018_add_delete_at_to_issues.rb
index 3ddbef92978..139f911e1c9 100644
--- a/db/migrate/20160225090018_add_delete_at_to_issues.rb
+++ b/db/migrate/20160225090018_add_delete_at_to_issues.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDeleteAtToIssues < ActiveRecord::Migration
   def change
     add_column :issues, :deleted_at, :datetime
diff --git a/db/migrate/20160225101956_add_delete_at_to_merge_requests.rb b/db/migrate/20160225101956_add_delete_at_to_merge_requests.rb
index 9d09105f17d..4ca3f0dcdc5 100644
--- a/db/migrate/20160225101956_add_delete_at_to_merge_requests.rb
+++ b/db/migrate/20160225101956_add_delete_at_to_merge_requests.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDeleteAtToMergeRequests < ActiveRecord::Migration
   def change
     add_column :merge_requests, :deleted_at, :datetime
diff --git a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
index d7b00e3d6ed..375e389e07a 100644
--- a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
+++ b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTrigramIndexesForSearching < ActiveRecord::Migration
   disable_ddl_transaction!
 
diff --git a/db/migrate/20160227120001_add_event_field_for_web_hook.rb b/db/migrate/20160227120001_add_event_field_for_web_hook.rb
index 65f2a47bb3c..89910893ee1 100644
--- a/db/migrate/20160227120001_add_event_field_for_web_hook.rb
+++ b/db/migrate/20160227120001_add_event_field_for_web_hook.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddEventFieldForWebHook < ActiveRecord::Migration
   def change
     add_column :web_hooks, :wiki_page_events, :boolean, default: false, null: false
diff --git a/db/migrate/20160227120047_add_event_to_services.rb b/db/migrate/20160227120047_add_event_to_services.rb
index f5040d770de..fe7c54ca4eb 100644
--- a/db/migrate/20160227120047_add_event_to_services.rb
+++ b/db/migrate/20160227120047_add_event_to_services.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddEventToServices < ActiveRecord::Migration
   def change
     add_column :services, :wiki_page_events, :boolean, default: true
diff --git a/db/migrate/20160229193553_add_main_language_to_repository.rb b/db/migrate/20160229193553_add_main_language_to_repository.rb
index b5446c6a447..ad5167b4c93 100644
--- a/db/migrate/20160229193553_add_main_language_to_repository.rb
+++ b/db/migrate/20160229193553_add_main_language_to_repository.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMainLanguageToRepository < ActiveRecord::Migration
   def change
     add_column :projects, :main_language, :string
diff --git a/db/migrate/20160301124843_add_visibility_level_to_groups.rb b/db/migrate/20160301124843_add_visibility_level_to_groups.rb
index d1b921bb208..a874e6758dd 100644
--- a/db/migrate/20160301124843_add_visibility_level_to_groups.rb
+++ b/db/migrate/20160301124843_add_visibility_level_to_groups.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddVisibilityLevelToGroups < ActiveRecord::Migration
   def up
     add_column :namespaces, :visibility_level, :integer, null: false, default: Gitlab::VisibilityLevel::PUBLIC
diff --git a/db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb b/db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb
index ffcd64266e3..1f400566f9f 100644
--- a/db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb
+++ b/db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImportCredentialsToProjectImportData < ActiveRecord::Migration
   def change
     add_column :project_import_data, :encrypted_credentials, :text
diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
index 6aed0fe03d2..ac7eac0ea7c 100644
--- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
+++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # Loops through old importer projects that kept a token/password in the import URL
 # and encrypts the credentials into a separate field in project#import_data
 # #down method not supported
diff --git a/db/migrate/20160305220806_remove_expires_at_from_snippets.rb b/db/migrate/20160305220806_remove_expires_at_from_snippets.rb
index fc12b5b09e6..cac78703bc2 100644
--- a/db/migrate/20160305220806_remove_expires_at_from_snippets.rb
+++ b/db/migrate/20160305220806_remove_expires_at_from_snippets.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveExpiresAtFromSnippets < ActiveRecord::Migration
   def change
     remove_column :snippets, :expires_at, :datetime
diff --git a/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb b/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb
index 49e787d9a9a..10f2b8cc56a 100644
--- a/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb
+++ b/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class DisallowBlankLineCodeOnNote < ActiveRecord::Migration
   def up
     execute("UPDATE notes SET line_code = NULL WHERE line_code = ''")
diff --git a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb b/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
index 72b862d67d2..92c0a1e088e 100644
--- a/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
+++ b/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # Create visibility level field on DB
 # Sets default_visibility_level to value on settings if not restricted
 # If value is restricted takes higher visibility level allowed
diff --git a/db/migrate/20160309140734_fix_todos.rb b/db/migrate/20160309140734_fix_todos.rb
index ebe0fc82305..94fe1e4fdc3 100644
--- a/db/migrate/20160309140734_fix_todos.rb
+++ b/db/migrate/20160309140734_fix_todos.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class FixTodos < ActiveRecord::Migration
  def up
     execute <<-SQL
diff --git a/db/migrate/20160310124959_add_due_date_to_issues.rb b/db/migrate/20160310124959_add_due_date_to_issues.rb
index ec08bd9fdfa..a4eb6aaee63 100644
--- a/db/migrate/20160310124959_add_due_date_to_issues.rb
+++ b/db/migrate/20160310124959_add_due_date_to_issues.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDueDateToIssues < ActiveRecord::Migration
   def change
     add_column :issues, :due_date, :date
diff --git a/db/migrate/20160310185910_add_external_flag_to_users.rb b/db/migrate/20160310185910_add_external_flag_to_users.rb
index 54937f1eb71..209496dc786 100644
--- a/db/migrate/20160310185910_add_external_flag_to_users.rb
+++ b/db/migrate/20160310185910_add_external_flag_to_users.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddExternalFlagToUsers < ActiveRecord::Migration
   def change
     add_column :users, :external, :boolean, default: false
diff --git a/db/migrate/20160314094147_add_priority_to_label.rb b/db/migrate/20160314094147_add_priority_to_label.rb
index 8ddf7782972..7fb23cba4c9 100644
--- a/db/migrate/20160314094147_add_priority_to_label.rb
+++ b/db/migrate/20160314094147_add_priority_to_label.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddPriorityToLabel < ActiveRecord::Migration
   def change
     add_column :labels, :priority, :integer
diff --git a/db/migrate/20160314143402_projects_add_pushes_since_gc.rb b/db/migrate/20160314143402_projects_add_pushes_since_gc.rb
index 5d30a38bc99..9f8ffe073a3 100644
--- a/db/migrate/20160314143402_projects_add_pushes_since_gc.rb
+++ b/db/migrate/20160314143402_projects_add_pushes_since_gc.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ProjectsAddPushesSinceGc < ActiveRecord::Migration
   def change
     add_column :projects, :pushes_since_gc, :integer, default: 0
diff --git a/db/migrate/20160315135439_project_add_repository_check.rb b/db/migrate/20160315135439_project_add_repository_check.rb
index 8687d5d6296..8fe649246c7 100644
--- a/db/migrate/20160315135439_project_add_repository_check.rb
+++ b/db/migrate/20160315135439_project_add_repository_check.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ProjectAddRepositoryCheck < ActiveRecord::Migration
   def change
     add_column :projects, :last_repository_check_failed, :boolean
diff --git a/db/migrate/20160316123110_ci_runners_token_index.rb b/db/migrate/20160316123110_ci_runners_token_index.rb
index 67bf5b4f978..ff3d36d68ee 100644
--- a/db/migrate/20160316123110_ci_runners_token_index.rb
+++ b/db/migrate/20160316123110_ci_runners_token_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CiRunnersTokenIndex < ActiveRecord::Migration
   disable_ddl_transaction!
 
diff --git a/db/migrate/20160316192622_change_target_id_to_null_on_todos.rb b/db/migrate/20160316192622_change_target_id_to_null_on_todos.rb
index 6871b3920df..65e0e61c78f 100644
--- a/db/migrate/20160316192622_change_target_id_to_null_on_todos.rb
+++ b/db/migrate/20160316192622_change_target_id_to_null_on_todos.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ChangeTargetIdToNullOnTodos < ActiveRecord::Migration
   def change
     change_column_null :todos, :target_id, true
diff --git a/db/migrate/20160316204731_add_commit_id_to_todos.rb b/db/migrate/20160316204731_add_commit_id_to_todos.rb
index ae19fdd1abd..d79858fc920 100644
--- a/db/migrate/20160316204731_add_commit_id_to_todos.rb
+++ b/db/migrate/20160316204731_add_commit_id_to_todos.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCommitIdToTodos < ActiveRecord::Migration
   def change
     add_column :todos, :commit_id, :string
diff --git a/db/migrate/20160317092222_add_moved_to_to_issue.rb b/db/migrate/20160317092222_add_moved_to_to_issue.rb
index 461e7fb3a9b..9dde668ddff 100644
--- a/db/migrate/20160317092222_add_moved_to_to_issue.rb
+++ b/db/migrate/20160317092222_add_moved_to_to_issue.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMovedToToIssue < ActiveRecord::Migration
   def change
     add_reference :issues, :moved_to, references: :issues
diff --git a/db/migrate/20160320204112_index_namespaces_on_visibility_level.rb b/db/migrate/20160320204112_index_namespaces_on_visibility_level.rb
index 370b339d45c..07ae7c95477 100644
--- a/db/migrate/20160320204112_index_namespaces_on_visibility_level.rb
+++ b/db/migrate/20160320204112_index_namespaces_on_visibility_level.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class IndexNamespacesOnVisibilityLevel < ActiveRecord::Migration
   def change
     unless index_exists?(:namespaces, :visibility_level)
diff --git a/db/migrate/20160324020319_remove_todos_for_deleted_issues.rb b/db/migrate/20160324020319_remove_todos_for_deleted_issues.rb
index 1fff9759d1e..a9a851cfe63 100644
--- a/db/migrate/20160324020319_remove_todos_for_deleted_issues.rb
+++ b/db/migrate/20160324020319_remove_todos_for_deleted_issues.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveTodosForDeletedIssues < ActiveRecord::Migration
   def up
     execute <<-SQL
diff --git a/db/migrate/20160328112808_create_notification_settings.rb b/db/migrate/20160328112808_create_notification_settings.rb
index 4755da8b806..7d77e8004ba 100644
--- a/db/migrate/20160328112808_create_notification_settings.rb
+++ b/db/migrate/20160328112808_create_notification_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateNotificationSettings < ActiveRecord::Migration
   def change
     create_table :notification_settings do |t|
diff --git a/db/migrate/20160328115649_migrate_new_notification_setting.rb b/db/migrate/20160328115649_migrate_new_notification_setting.rb
index 3c81b2c37bf..eb6b7d07219 100644
--- a/db/migrate/20160328115649_migrate_new_notification_setting.rb
+++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This migration will create one row of NotificationSetting for each Member row
 # It can take long time on big instances.
 #
diff --git a/db/migrate/20160328121138_add_notification_setting_index.rb b/db/migrate/20160328121138_add_notification_setting_index.rb
index 8aebce0244d..667270d6b04 100644
--- a/db/migrate/20160328121138_add_notification_setting_index.rb
+++ b/db/migrate/20160328121138_add_notification_setting_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddNotificationSettingIndex < ActiveRecord::Migration
   def change
     add_index :notification_settings, :user_id
diff --git a/db/migrate/20160329144452_add_index_on_pending_delete_projects.rb b/db/migrate/20160329144452_add_index_on_pending_delete_projects.rb
index 275554e736e..a3df8fb4e2e 100644
--- a/db/migrate/20160329144452_add_index_on_pending_delete_projects.rb
+++ b/db/migrate/20160329144452_add_index_on_pending_delete_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexOnPendingDeleteProjects < ActiveRecord::Migration
   def change
     add_index :projects, :pending_delete
diff --git a/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb b/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb
index 54cea964ff2..b15af79b9b5 100644
--- a/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb
+++ b/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveTodosForDeletedMergeRequests < ActiveRecord::Migration
   def up
     execute <<-SQL
diff --git a/db/migrate/20160331223143_remove_twitter_sharing_enabled_from_application_settings.rb b/db/migrate/20160331223143_remove_twitter_sharing_enabled_from_application_settings.rb
index 0d736e323b6..dec80497fb3 100644
--- a/db/migrate/20160331223143_remove_twitter_sharing_enabled_from_application_settings.rb
+++ b/db/migrate/20160331223143_remove_twitter_sharing_enabled_from_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveTwitterSharingEnabledFromApplicationSettings < ActiveRecord::Migration
   def change
     remove_column :application_settings, :twitter_sharing_enabled, :boolean
diff --git a/db/migrate/20160407120251_add_images_enabled_for_project.rb b/db/migrate/20160407120251_add_images_enabled_for_project.rb
index 47f0ca8e8de..fcffc98b47a 100644
--- a/db/migrate/20160407120251_add_images_enabled_for_project.rb
+++ b/db/migrate/20160407120251_add_images_enabled_for_project.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddImagesEnabledForProject < ActiveRecord::Migration
   def change
     add_column :projects, :container_registry_enabled, :boolean
diff --git a/db/migrate/20160412140240_add_repository_checks_enabled_setting.rb b/db/migrate/20160412140240_add_repository_checks_enabled_setting.rb
index ebfa4bcbc7b..920d4d41110 100644
--- a/db/migrate/20160412140240_add_repository_checks_enabled_setting.rb
+++ b/db/migrate/20160412140240_add_repository_checks_enabled_setting.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRepositoryChecksEnabledSetting < ActiveRecord::Migration
   def change
     add_column :application_settings, :repository_checks_enabled, :boolean, default: true
diff --git a/db/migrate/20160412173416_add_fields_to_ci_commit.rb b/db/migrate/20160412173416_add_fields_to_ci_commit.rb
index 125956a3ddd..00162af5cda 100644
--- a/db/migrate/20160412173416_add_fields_to_ci_commit.rb
+++ b/db/migrate/20160412173416_add_fields_to_ci_commit.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddFieldsToCiCommit < ActiveRecord::Migration
   def change
     add_column :ci_commits, :status, :string
diff --git a/db/migrate/20160412173417_update_ci_commit.rb b/db/migrate/20160412173417_update_ci_commit.rb
index fd92444dbac..858faeb060e 100644
--- a/db/migrate/20160412173417_update_ci_commit.rb
+++ b/db/migrate/20160412173417_update_ci_commit.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class UpdateCiCommit < ActiveRecord::Migration
   # This migration can be run online, but needs to be executed for the second time after restarting Unicorn workers
   # Otherwise Offline migration should be used.
diff --git a/db/migrate/20160412173418_add_ci_commit_indexes.rb b/db/migrate/20160412173418_add_ci_commit_indexes.rb
index 603d4a41610..414f1f8279f 100644
--- a/db/migrate/20160412173418_add_ci_commit_indexes.rb
+++ b/db/migrate/20160412173418_add_ci_commit_indexes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddCiCommitIndexes < ActiveRecord::Migration
   disable_ddl_transaction!
 
diff --git a/db/migrate/20160413115152_add_token_to_web_hooks.rb b/db/migrate/20160413115152_add_token_to_web_hooks.rb
index f04225068cd..628b1d51b30 100644
--- a/db/migrate/20160413115152_add_token_to_web_hooks.rb
+++ b/db/migrate/20160413115152_add_token_to_web_hooks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTokenToWebHooks < ActiveRecord::Migration
   def change
     add_column :web_hooks, :token, :string
diff --git a/db/migrate/20160415133440_add_shared_runners_text_to_application_settings.rb b/db/migrate/20160415133440_add_shared_runners_text_to_application_settings.rb
index d493044c67b..b53b9bc6c3d 100644
--- a/db/migrate/20160415133440_add_shared_runners_text_to_application_settings.rb
+++ b/db/migrate/20160415133440_add_shared_runners_text_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSharedRunnersTextToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :shared_runners_text, :text
diff --git a/db/migrate/20160416180807_add_award_emoji.rb b/db/migrate/20160416180807_add_award_emoji.rb
index 2ead181921b..a3bee9b1bc6 100644
--- a/db/migrate/20160416180807_add_award_emoji.rb
+++ b/db/migrate/20160416180807_add_award_emoji.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAwardEmoji < ActiveRecord::Migration
   def change
     create_table :award_emoji do |t|
diff --git a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
index 073bbc0fc2a..c226bc11f6c 100644
--- a/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
+++ b/db/migrate/20160416182152_convert_award_note_to_emoji_award.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class ConvertAwardNoteToEmojiAward < ActiveRecord::Migration
   def change
     def up
diff --git a/db/migrate/20160416190505_remove_note_is_award.rb b/db/migrate/20160416190505_remove_note_is_award.rb
index da16372a297..dd24917feb9 100644
--- a/db/migrate/20160416190505_remove_note_is_award.rb
+++ b/db/migrate/20160416190505_remove_note_is_award.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveNoteIsAward < ActiveRecord::Migration
   def change
     remove_column :notes, :is_award, :boolean
diff --git a/db/migrate/20160419120017_add_metrics_packet_size.rb b/db/migrate/20160419120017_add_metrics_packet_size.rb
index 78c163d62ac..c759427c590 100644
--- a/db/migrate/20160419120017_add_metrics_packet_size.rb
+++ b/db/migrate/20160419120017_add_metrics_packet_size.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddMetricsPacketSize < ActiveRecord::Migration
   def change
     add_column :application_settings, :metrics_packet_size, :integer, default: 1
diff --git a/db/migrate/20160421130527_disable_repository_checks.rb b/db/migrate/20160421130527_disable_repository_checks.rb
index 808a4b93c7c..7e65ddc45e7 100644
--- a/db/migrate/20160421130527_disable_repository_checks.rb
+++ b/db/migrate/20160421130527_disable_repository_checks.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class DisableRepositoryChecks < ActiveRecord::Migration
   def up
     change_column_default :application_settings, :repository_checks_enabled, false 
diff --git a/db/migrate/20160425045124_create_u2f_registrations.rb b/db/migrate/20160425045124_create_u2f_registrations.rb
index 93bdd9de2eb..72cbe98ebba 100644
--- a/db/migrate/20160425045124_create_u2f_registrations.rb
+++ b/db/migrate/20160425045124_create_u2f_registrations.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class CreateU2fRegistrations < ActiveRecord::Migration
   def change
     create_table :u2f_registrations do |t|
diff --git a/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb b/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb
index facd33875ba..bf50616656c 100644
--- a/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb
+++ b/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddDisabledOauthSignInSourcesToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :disabled_oauth_sign_in_sources, :text
diff --git a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
index 84e5e4eabe2..c60892a6279 100644
--- a/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
+++ b/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddRunUntaggedToCiRunner < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
   disable_ddl_transaction!
diff --git a/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb
index aa560bc0f0c..6792ffc957a 100644
--- a/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb
+++ b/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveWallEnabledFromProjects < ActiveRecord::Migration
   def change
     remove_column :projects, :wall_enabled, :boolean, default: true, null: false
diff --git a/db/migrate/20160508215820_add_type_to_notes.rb b/db/migrate/20160508215820_add_type_to_notes.rb
index 58944d4e651..c1d07c9363f 100644
--- a/db/migrate/20160508215820_add_type_to_notes.rb
+++ b/db/migrate/20160508215820_add_type_to_notes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddTypeToNotes < ActiveRecord::Migration
   def change
     add_column :notes, :type, :string
diff --git a/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb b/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb
index c3f23d89d5a..6dd958ff4a0 100644
--- a/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb
+++ b/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class SetTypeOnLegacyDiffNotes < ActiveRecord::Migration
   def change
     execute "UPDATE notes SET type = 'LegacyDiffNote' WHERE line_code IS NOT NULL"
diff --git a/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb b/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb
index 9d729fec189..b6a5bea79b6 100644
--- a/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb
+++ b/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddHealthCheckAccessTokenToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :health_check_access_token, :string
diff --git a/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb b/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
index c34e7ba5409..8c96353b850 100644
--- a/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
+++ b/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddSendUserConfirmationEmailToApplicationSettings < ActiveRecord::Migration
   def up
     add_column :application_settings, :send_user_confirmation_email, :boolean, default: false
diff --git a/db/migrate/20160525205328_remove_main_language_from_projects.rb b/db/migrate/20160525205328_remove_main_language_from_projects.rb
index 0f9d60c385f..dc4ceacddb1 100644
--- a/db/migrate/20160525205328_remove_main_language_from_projects.rb
+++ b/db/migrate/20160525205328_remove_main_language_from_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # See http://doc.gitlab.com/ce/development/migration_style_guide.html
 # for more information on how to write migrations for GitLab.
 
diff --git a/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb b/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb
index 7910120b4e0..3e26be7c09c 100644
--- a/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb
+++ b/db/migrate/20160527020117_remove_notification_settings_for_deleted_projects.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveNotificationSettingsForDeletedProjects < ActiveRecord::Migration
   def up
     execute <<-SQL
diff --git a/db/migrate/20160528043124_add_users_state_index.rb b/db/migrate/20160528043124_add_users_state_index.rb
index e77a5460737..6419d2ae71d 100644
--- a/db/migrate/20160528043124_add_users_state_index.rb
+++ b/db/migrate/20160528043124_add_users_state_index.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddUsersStateIndex < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
index e21376bd571..d811fd5271e 100644
--- a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
+++ b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 # This is ONLINE migration
 
 class AddContainerRegistryTokenExpireDelayToApplicationSettings < ActiveRecord::Migration
diff --git a/db/migrate/20160603180330_remove_duplicated_notification_settings.rb b/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
index fe1c863b5b9..4f4f58b1619 100644
--- a/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
+++ b/db/migrate/20160603180330_remove_duplicated_notification_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class RemoveDuplicatedNotificationSettings < ActiveRecord::Migration
   def up
     duplicates = exec_query(%Q{
diff --git a/db/migrate/20160603182247_add_index_to_notification_settings.rb b/db/migrate/20160603182247_add_index_to_notification_settings.rb
index 06462042b09..f6ae26d555f 100644
--- a/db/migrate/20160603182247_add_index_to_notification_settings.rb
+++ b/db/migrate/20160603182247_add_index_to_notification_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddIndexToNotificationSettings < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb b/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb
index 89826fb96cb..3c5d2ad910e 100644
--- a/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb
+++ b/db/migrate/20160608155312_add_after_sign_up_text_to_application_settings.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class AddAfterSignUpTextToApplicationSettings < ActiveRecord::Migration
   def change
     add_column :application_settings, :after_sign_up_text, :text
diff --git a/db/migrate/limits_to_mysql.rb b/db/migrate/limits_to_mysql.rb
index 14d7e84d856..be3501c4c2e 100644
--- a/db/migrate/limits_to_mysql.rb
+++ b/db/migrate/limits_to_mysql.rb
@@ -1,3 +1,4 @@
+# rubocop:disable all
 class LimitsToMysql < ActiveRecord::Migration
   def up
     return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/

From cef3fd28996edd07b1a9bf00f8a6f1d9bc01c1ac Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 8 Jun 2016 22:48:44 -0300
Subject: [PATCH 1331/1431] Wrap all rate limiting logic inside GitHub API
 client

---
 lib/gitlab/github_import/client.rb   | 35 +++++++++++++++-
 lib/gitlab/github_import/importer.rb | 62 ++++------------------------
 2 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb
index 67988ea3460..d325eca6d99 100644
--- a/lib/gitlab/github_import/client.rb
+++ b/lib/gitlab/github_import/client.rb
@@ -1,6 +1,9 @@
 module Gitlab
   module GithubImport
     class Client
+      GITHUB_SAFE_REMAINING_REQUESTS = 100
+      GITHUB_SAFE_SLEEP_TIME = 500
+
       attr_reader :client, :api
 
       def initialize(access_token)
@@ -11,7 +14,7 @@ module Gitlab
         )
 
         if access_token
-          ::Octokit.auto_paginate = true
+          ::Octokit.auto_paginate = false
 
           @api = ::Octokit::Client.new(
             access_token: access_token,
@@ -36,7 +39,7 @@ module Gitlab
 
       def method_missing(method, *args, &block)
         if api.respond_to?(method)
-          api.send(method, *args, &block)
+          request { api.send(method, *args, &block) }
         else
           super(method, *args, &block)
         end
@@ -55,6 +58,34 @@ module Gitlab
       def github_options
         config["args"]["client_options"].deep_symbolize_keys
       end
+
+      def rate_limit
+        api.rate_limit!
+      end
+
+      def rate_limit_exceed?
+        rate_limit.remaining <= GITHUB_SAFE_REMAINING_REQUESTS
+      end
+
+      def rate_limit_sleep_time
+        rate_limit.resets_in + GITHUB_SAFE_SLEEP_TIME
+      end
+
+      def request
+        sleep rate_limit_sleep_time if rate_limit_exceed?
+
+        data = yield
+
+        last_response = api.last_response
+
+        while last_response.rels[:next]
+          sleep rate_limit_sleep_time if rate_limit_exceed?
+          last_response = last_response.rels[:next].get
+          data.concat(last_response.data) if last_response.data.is_a?(Array)
+        end
+
+        data
+      end
     end
   end
 end
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 5ef9d66ba68..e5cf66a0371 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -3,9 +3,6 @@ module Gitlab
     class Importer
       include Gitlab::ShellAdapter
 
-      GITHUB_SAFE_REMAINING_REQUESTS = 100
-      GITHUB_SAFE_SLEEP_TIME = 500
-
       attr_reader :client, :project, :repo, :repo_url
 
       def initialize(project)
@@ -28,52 +25,12 @@ module Gitlab
 
       private
 
-      def turn_auto_pagination_off!
-        client.auto_paginate = false
-      end
-
-      def turn_auto_pagination_on!
-        client.auto_paginate = true
-      end
-
-      def rate_limit
-        client.rate_limit!
-      end
-
-      def rate_limit_exceed?
-        rate_limit.remaining <= GITHUB_SAFE_REMAINING_REQUESTS
-      end
-
-      def rate_limit_sleep_time
-        rate_limit.resets_in + GITHUB_SAFE_SLEEP_TIME
-      end
-
-      def paginate
-        turn_auto_pagination_off!
-
-        sleep rate_limit_sleep_time if rate_limit_exceed?
-
-        data = yield
-
-        last_response = client.last_response
-
-        while last_response.rels[:next]
-          sleep rate_limit_sleep_time if rate_limit_exceed?
-          last_response = last_response.rels[:next].get
-          data.concat(last_response.data) if last_response.data.is_a?(Array)
-        end
-
-        turn_auto_pagination_on!
-
-        data
-      end
-
       def credentials
         @credentials ||= project.import_data.credentials if project.import_data
       end
 
       def import_labels
-        labels = paginate { client.labels(repo, per_page: 100) }
+        labels = client.labels(repo, per_page: 100)
         labels.each { |raw| LabelFormatter.new(project, raw).create! }
 
         true
@@ -82,7 +39,7 @@ module Gitlab
       end
 
       def import_milestones
-        milestones = paginate { client.milestones(repo, state: :all, per_page: 100) }
+        milestones = client.milestones(repo, state: :all, per_page: 100)
         milestones.each { |raw| MilestoneFormatter.new(project, raw).create! }
 
         true
@@ -91,9 +48,9 @@ module Gitlab
       end
 
       def import_issues
-        data = paginate { client.issues(repo, state: :all, sort: :created, direction: :asc, per_page: 100) }
+        issues = client.issues(repo, state: :all, sort: :created, direction: :asc, per_page: 100)
 
-        data.each do |raw|
+        issues.each do |raw|
           gh_issue = IssueFormatter.new(project, raw)
 
           if gh_issue.valid?
@@ -112,7 +69,7 @@ module Gitlab
         hooks = client.hooks(repo).map { |raw| HookFormatter.new(raw) }.select(&:valid?)
         disable_webhooks(hooks)
 
-        pull_requests = paginate { client.pull_requests(repo, state: :all, sort: :created, direction: :asc, per_page: 100) }
+        pull_requests = client.pull_requests(repo, state: :all, sort: :created, direction: :asc, per_page: 100)
         pull_requests = pull_requests.map { |raw| PullRequestFormatter.new(project, raw) }.select(&:valid?)
 
         source_branches_removed = pull_requests.reject(&:source_branch_exists?).map { |pr| [pr.source_branch_name, pr.source_branch_sha] }
@@ -146,14 +103,12 @@ module Gitlab
 
       def update_webhooks(hooks, options)
         hooks.each do |hook|
-          sleep rate_limit_sleep_time if rate_limit_exceed?
           client.edit_hook(repo, hook.id, hook.name, hook.config, options)
         end
       end
 
       def restore_branches(branches)
         branches.each do |name, sha|
-          sleep rate_limit_sleep_time if rate_limit_exceed?
           client.create_ref(repo, "refs/heads/#{name}", sha)
         end
 
@@ -162,15 +117,12 @@ module Gitlab
 
       def clean_up_restored_branches(branches)
         branches.each do |name, _|
-          sleep rate_limit_sleep_time if rate_limit_exceed?
           client.delete_ref(repo, "heads/#{name}")
           project.repository.rm_branch(project.creator, name)
         end
       end
 
       def apply_labels(issuable)
-        sleep rate_limit_sleep_time if rate_limit_exceed?
-
         issue = client.issue(repo, issuable.iid)
 
         if issue.labels.count > 0
@@ -183,12 +135,12 @@ module Gitlab
       end
 
       def import_comments(issuable)
-        comments = paginate { client.issue_comments(repo, issuable.iid, per_page: 100) }
+        comments = client.issue_comments(repo, issuable.iid, per_page: 100)
         create_comments(issuable, comments)
       end
 
       def import_comments_on_diff(merge_request)
-        comments = paginate { client.pull_request_comments(repo, merge_request.iid, per_page: 100) }
+        comments = client.pull_request_comments(repo, merge_request.iid, per_page: 100)
         create_comments(merge_request, comments)
       end
 

From 921c356b5e776abc072724dd4238029c1bf13961 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 14:51:00 +0200
Subject: [PATCH 1332/1431] Rename commit to pipeline in TriggerRequest

---
 app/models/ci/trigger_request.rb                  | 2 +-
 app/services/ci/create_trigger_request_service.rb | 2 +-
 spec/models/build_spec.rb                         | 2 +-
 spec/requests/ci/api/builds_spec.rb               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb
index 59fc9951d11..b69ae37668c 100644
--- a/app/models/ci/trigger_request.rb
+++ b/app/models/ci/trigger_request.rb
@@ -3,7 +3,7 @@ module Ci
     extend Ci::Model
     
     belongs_to :trigger, class_name: 'Ci::Trigger'
-    belongs_to :commit, class_name: 'Ci::Pipeline', foreign_key: :commit_id
+    belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id
     has_many :builds, class_name: 'Ci::Build'
 
     serialize :variables
diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb
index c3194f45b10..1e629cf119a 100644
--- a/app/services/ci/create_trigger_request_service.rb
+++ b/app/services/ci/create_trigger_request_service.rb
@@ -11,7 +11,7 @@ module Ci
 
       trigger_request = trigger.trigger_requests.create!(
         variables: variables,
-        commit: pipeline,
+        pipeline: pipeline,
       )
 
       if pipeline.create_builds(nil, trigger_request)
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 7660ea2659c..2beb6cc598d 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
 
         context 'and trigger variables' do
           let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: pipeline, trigger: trigger) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 88271642532..e8508f8f950 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -85,7 +85,7 @@ describe Ci::API::API do
         trigger = FactoryGirl.create(:ci_trigger, project: project)
         pipeline = FactoryGirl.create(:ci_pipeline, project: project, ref: 'master')
 
-        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: pipeline, trigger: trigger)
+        trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger)
         pipeline.create_builds(nil, trigger_request)
         project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
 

From 4663ae064d64c6acd488ef4c28afcf60b843bb85 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 8 Jun 2016 12:50:49 +0200
Subject: [PATCH 1333/1431] Fix CI TriggerRequest entity

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

diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index b25e0e573a8..255217b1a7c 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -56,7 +56,7 @@ module Ci
 
       class TriggerRequest < Grape::Entity
         expose :id, :variables
-        expose :commit, using: Commit
+        expose :trigger, using: Commit, as: :commit
       end
     end
   end

From e796555bdb9884a34a5dcef595815594484aac41 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 09:59:34 +0100
Subject: [PATCH 1334/1431] Fixed issue where label filtering didnt work

Closes #18375
---
 app/assets/javascripts/labels_select.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index ec74dfaae1a..6b86b51589c 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -254,7 +254,7 @@ class @LabelsSelect
         search:
           fields: ['title']
         selectable: true
-
+        filterable: true
         toggleLabel: (selected, el) ->
           selected_labels = $('.js-label-select').siblings('.dropdown-menu-labels').find('.is-active')
 

From d301791c2aa101b68f9b5abda24f20dc24a85830 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 10:44:17 +0100
Subject: [PATCH 1335/1431] Added tests

---
 app/helpers/dropdowns_helper.rb                   |  4 ++--
 .../shared/issuable/_label_page_default.html.haml |  2 +-
 spec/features/issues/filter_by_labels_spec.rb     | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb
index 14697f774cc..6b617e1730a 100644
--- a/app/helpers/dropdowns_helper.rb
+++ b/app/helpers/dropdowns_helper.rb
@@ -67,9 +67,9 @@ module DropdownsHelper
     end
   end
 
-  def dropdown_filter(placeholder)
+  def dropdown_filter(placeholder, search_id: nil)
     content_tag :div, class: "dropdown-input" do
-      filter_output = search_field_tag nil, nil, class: "dropdown-input-field", placeholder: placeholder
+      filter_output = search_field_tag search_id, nil, class: "dropdown-input-field", placeholder: placeholder
       filter_output << icon('search', class: "dropdown-input-search")
       filter_output << icon('times', class: "dropdown-input-clear js-dropdown-input-clear", role: "button")
 
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index 4e280c371ac..0acb8253139 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -4,7 +4,7 @@
 - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels')
 .dropdown-page-one
   = dropdown_title(title)
-  = dropdown_filter(filter_placeholder)
+  = dropdown_filter(filter_placeholder, search_id: "label-name")
   = dropdown_content
   - if @project && show_footer
     = dropdown_footer do
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb
index 0ec8b6b180a..16c619c9288 100644
--- a/spec/features/issues/filter_by_labels_spec.rb
+++ b/spec/features/issues/filter_by_labels_spec.rb
@@ -199,4 +199,19 @@ feature 'Issue filtering by Labels', feature: true do
       end
     end
   end
+
+  context 'dropdown filtering', js: true do
+    it 'should filter by label name' do
+      page.within '.labels-filter' do
+        click_button 'Label'
+        wait_for_ajax
+        fill_in 'label-name', with: 'bug'
+
+        page.within '.dropdown-content' do
+          expect(page).not_to have_content 'enhancement'
+          expect(page).to have_content 'bug'
+        end
+      end
+    end
+  end
 end

From e7ca709a9249236a3894833af67471ade4eb1d07 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 24 May 2016 10:29:26 +0100
Subject: [PATCH 1336/1431] Updated labels UI

Closes #14227
---
 app/assets/stylesheets/pages/labels.scss   | 98 +++++++++-------------
 app/helpers/labels_helper.rb               |  6 +-
 app/views/projects/labels/_label.html.haml | 54 ++++++++----
 app/views/shared/_label_row.html.haml      |  5 +-
 4 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 26128fcea85..335bdda13d7 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -50,11 +50,26 @@
 
 .label-row {
   .label-name {
-    display: inline-block;
-    width: 170px;
+    display: block;
+    margin-bottom: 10px;
 
-    @media (max-width: $screen-xs-min) {
-      display: block;
+    @media (min-width: $screen-sm-min) {
+      display: inline-block;
+      width: 200px;
+      margin-bottom: 0;
+    }
+  }
+
+  .label-description {
+    display: block;
+    margin-bottom: 10px;
+
+    @media (min-width: $screen-sm-min) {
+      display: inline-block;
+      width: 40%;
+      margin-left: 10px;
+      margin-bottom: 0;
+      vertical-align: middle;
     }
   }
 
@@ -68,10 +83,6 @@
   padding: 3px 4px;
 }
 
-.label-subscription {
-  display: inline-block;
-}
-
 .dropdown-labels-error {
   padding: 5px 10px;
   margin-bottom: 10px;
@@ -79,62 +90,27 @@
   color: $white-light;
 }
 
-@mixin labels-mobile {
-  @media (max-width: $screen-xs-min) {
-    display: block;
-    width: 100%;
-    margin-left: 0;
-    padding: 10px 0;
-  }
-}
-
-
 .manage-labels-list {
+  .btn-action {
+    color: $gl-dark-link-color;
 
-  .prepend-left-10, .prepend-description-left {
-    display: inline-block;
-    width: 40%;
-    vertical-align: middle;
+    .fa {
+      font-size: 18px;
+      vertical-align: middle;
+    }
 
-    @include labels-mobile;
+    &:hover {
+      color: $gl-link-color;
+
+      &.remove-row {
+        color: $gl-danger;
+      }
+    }
   }
 
-  .prepend-description-left {
-    width: 57%;
-
-    @include labels-mobile;
-  }
-
-  .pull-info-right {
-    float: right;
-
-    @media (max-width: $screen-xs-min) {
-      float: none;
-    }
-
-    .action-buttons {
-      border-color: transparent;
-      padding: 6px;
-      color: $gl-text-color;
-
-      &.label-subscribe-button {
-        padding-left: 0;
-      }
-    }
-
-    i {
-      color: $gl-text-color;
-    }
-
-    .append-right-20 {
-      a {
-        color: $gl-text-color;
-      }
-
-      @media (max-width: $screen-xs-min) {
-        display: block;
-        margin-bottom: 10px;
-      }
+  .dropdown {
+    @media (min-width: $screen-sm-min) {
+      float: right;
     }
   }
 }
@@ -186,3 +162,7 @@
     color: inherit;
   }
 }
+
+.label-options-toggle {
+  width: 100%;
+}
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index c99b137cdaa..76e000ef01f 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -32,7 +32,7 @@ module LabelsHelper
   #   link_to_label(label) { "My Custom Label Text" }
   #
   # Returns a String
-  def link_to_label(label, project: nil, type: :issue, tooltip: true, &block)
+  def link_to_label(label, project: nil, type: :issue, tooltip: true, css_class: '', &block)
     project ||= @project || label.project
     link = send("namespace_project_#{type.to_s.pluralize}_path",
                 project.namespace,
@@ -40,9 +40,9 @@ module LabelsHelper
                 label_name: [label.name])
 
     if block_given?
-      link_to link, &block
+      link_to link, class: css_class, &block
     else
-      link_to render_colored_label(label, tooltip: tooltip), link
+      link_to render_colored_label(label, tooltip: tooltip), link, class: css_class
     end
   end
 
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 1c51ea676c7..9fdebe82f74 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,28 +1,48 @@
 - label_css_id = dom_id(label)
 %li{id: label_css_id, data: { id: label.id } }
   = render "shared/label_row", label: label
-  .pull-info-right
-    %span.append-right-20
-      = link_to_label(label, type: :merge_request) do
-        = pluralize label.open_merge_requests_count, 'merge request'
 
-    %span.append-right-20
-      = link_to_label(label) do
-        = pluralize label.open_issues_count(current_user), 'open issue'
+  .visible-xs.visible-sm-inline-block.visible-md-inline-block.dropdown
+    %button.btn.btn-default.label-options-toggle{ data: { toggle: "dropdown" } }
+      Options
+      %span.caret
+    .dropdown-menu.dropdown-menu-align-right
+      %ul
+        %li
+          = link_to_label(label, type: :merge_request) do
+            = pluralize label.open_merge_requests_count, 'merge request'
+        %li
+          = link_to_label(label) do
+            = pluralize label.open_issues_count(current_user), 'open issue'
+        - if current_user
+          %li.label-subscription{ data: { url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } }
+            %a.js-subscribe-button.label-subscribe-button.subscription-status{ role: "button", href: "#", data: { toggle: "tooltip", status: label_subscription_status(label) } }
+              %span= label_subscription_toggle_button_text(label)
+        - if can? current_user, :admin_label, @project
+          %li
+            = link_to "Edit", edit_namespace_project_label_path(@project.namespace, @project, label)
+          %li
+            = link_to "Delete", namespace_project_label_path(@project.namespace, @project, label), title: "Delete", method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"}
+
+  .pull-right.hidden-xs.hidden-sm.hidden-md
+    = link_to_label(label, type: :merge_request, css_class: 'btn btn-transparent btn-action') do
+      = pluralize label.open_merge_requests_count, 'merge request'
+    = link_to_label(label, css_class: 'btn btn-transparent btn-action') do
+      = pluralize label.open_issues_count(current_user), 'open issue'
 
     - if current_user
-      .label-subscription{ data: { url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } }
-        .subscription-status{ data: { status: label_subscription_status(label) } }
-
-        %button.js-subscribe-button.label-subscribe-button.btn.action-buttons{ type: "button", data: { toggle: "tooltip" } }
+      .label-subscription.inline{ data: { url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } }
+        %button.js-subscribe-button.label-subscribe-button.btn.btn-transparent.btn-action.subscription-status{ type: "button", data: { toggle: "tooltip", status: label_subscription_status(label) } }
           %span= label_subscription_toggle_button_text(label)
 
-    - if can?(current_user, :admin_label, @project)
-      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn action-buttons', data: { toggle: 'tooltip' } do
+    - if can? current_user, :admin_label, @project
+      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do
+        %span.sr-only Edit
         %i.fa.fa-pencil-square-o
-      = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn action-buttons remove-row', method: :delete, remote: true, data: { confirm: 'Remove this label? Are you sure?', toggle: 'tooltip' } do
+      = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip"} do
+        %span.sr-only Delete
         %i.fa.fa-trash-o
 
-- if current_user
-  :javascript
-    new Subscription('##{label_css_id} .label-subscription');
+  - if current_user
+    :javascript
+      new Subscription('##{dom_id(label)} .label-subscription');
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index d315a3fe93b..478c04318c6 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -8,5 +8,6 @@
         = icon('star')
   %span.label-name
     = link_to_label(label, tooltip: false)
-  %span.prepend-left-10
-    = markdown(label.description, pipeline: :single_line)
+  - if label.description
+    %span.label-description
+      = markdown(label.description, pipeline: :single_line)

From 051dc1d263b6be305c30e928238f4f7389200433 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 24 May 2016 14:16:22 +0100
Subject: [PATCH 1337/1431] Fixed failing tests

---
 app/helpers/labels_helper.rb            | 2 +-
 features/steps/project/issues/labels.rb | 2 +-
 features/steps/project/labels.rb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 76e000ef01f..5074e645769 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -32,7 +32,7 @@ module LabelsHelper
   #   link_to_label(label) { "My Custom Label Text" }
   #
   # Returns a String
-  def link_to_label(label, project: nil, type: :issue, tooltip: true, css_class: '', &block)
+  def link_to_label(label, project: nil, type: :issue, tooltip: true, css_class: nil, &block)
     project ||= @project || label.project
     link = send("namespace_project_#{type.to_s.pluralize}_path",
                 project.namespace,
diff --git a/features/steps/project/issues/labels.rb b/features/steps/project/issues/labels.rb
index e02b57bbf84..2937d5d7ca8 100644
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -9,7 +9,7 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
 
   step 'I remove label \'bug\'' do
     page.within "#label_#{bug_label.id}" do
-      click_link 'Delete'
+      first(:link, 'Delete').click
     end
   end
 
diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb
index 5bb02189021..eff05783bcf 100644
--- a/features/steps/project/labels.rb
+++ b/features/steps/project/labels.rb
@@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
   private
 
   def subscribe_button
-    first('.label-subscribe-button span')
+    first('.label-subscribe-button span', visible: true)
   end
 end

From 9830f9a23b8b212132b624b5d687c3cb815fd50d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 25 May 2016 09:43:03 +0100
Subject: [PATCH 1338/1431] Updated subscribe icon

---
 app/assets/javascripts/subscription.js.coffee |  5 +++++
 app/assets/stylesheets/pages/labels.scss      | 16 ++++++++++++++++
 app/views/projects/labels/_label.html.haml    | 10 ++++++----
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/subscription.js.coffee b/app/assets/javascripts/subscription.js.coffee
index 1a430f3aa47..08d494aba9f 100644
--- a/app/assets/javascripts/subscription.js.coffee
+++ b/app/assets/javascripts/subscription.js.coffee
@@ -19,3 +19,8 @@ class @Subscription
       action = if status == 'subscribed' then 'Unsubscribe' else 'Subscribe'
       btn.find('span').text(action)
       @subscription_status.find('>div').toggleClass('hidden')
+
+      if btn.attr('data-original-title')
+        btn.tooltip('hide')
+          .attr('data-original-title', action)
+          .tooltip('fixTitle')
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 335bdda13d7..bc65404a741 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -166,3 +166,19 @@
 .label-options-toggle {
   width: 100%;
 }
+
+.label-subscribe-button {
+  .label-subscribe-button-loading {
+    display: none;
+  }
+
+  &.disabled {
+    .label-subscribe-button-icon {
+      display: none;
+    }
+
+    .label-subscribe-button-loading {
+      display: block;
+    }
+  }
+}
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 9fdebe82f74..73c6f2a046c 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -32,16 +32,18 @@
 
     - if current_user
       .label-subscription.inline{ data: { url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } }
-        %button.js-subscribe-button.label-subscribe-button.btn.btn-transparent.btn-action.subscription-status{ type: "button", data: { toggle: "tooltip", status: label_subscription_status(label) } }
-          %span= label_subscription_toggle_button_text(label)
+        %button.js-subscribe-button.label-subscribe-button.btn.btn-transparent.btn-action.subscription-status{ type: "button", title: label_subscription_toggle_button_text(label), data: { toggle: "tooltip", status: label_subscription_status(label) } }
+          %span.sr-only= label_subscription_toggle_button_text(label)
+          = icon('eye', class: 'label-subscribe-button-icon')
+          = icon('spinner spin', class: 'label-subscribe-button-loading')
 
     - if can? current_user, :admin_label, @project
       = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do
         %span.sr-only Edit
-        %i.fa.fa-pencil-square-o
+        = icon('pencil-square-o')
       = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip"} do
         %span.sr-only Delete
-        %i.fa.fa-trash-o
+        = icon('trash-o')
 
   - if current_user
     :javascript

From 8e8ec82d35a1e905d95b96dfb476e00eff2f9bc0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 25 May 2016 15:08:00 +0100
Subject: [PATCH 1339/1431] Tests update

---
 features/steps/project/labels.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb
index eff05783bcf..59a780073c3 100644
--- a/features/steps/project/labels.rb
+++ b/features/steps/project/labels.rb
@@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
   private
 
   def subscribe_button
-    first('.label-subscribe-button span', visible: true)
+    first('.js-subscribe-button span', visible: true)
   end
 end

From b0a80f69e3f96b4f259a8b4ee9cedc7e6b64745a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 May 2016 09:37:54 +0100
Subject: [PATCH 1340/1431] Fixed failing label subscribe test

---
 features/steps/project/labels.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb
index 59a780073c3..118ffef4774 100644
--- a/features/steps/project/labels.rb
+++ b/features/steps/project/labels.rb
@@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
   private
 
   def subscribe_button
-    first('.js-subscribe-button span', visible: true)
+    first('.js-subscribe-button', visible: true)
   end
 end

From d1506ebeeca6e9bf9d524b0b4174bd81ae5c57a4 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 27 May 2016 10:46:06 -0600
Subject: [PATCH 1341/1431] Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md
 to point contributors toward the GitLab.com repository.

This adds templates for Issues/Pull Requests in a `.github` directory. These only effect issues/PRs opened in the GitHub mirror of the GitLab project. As we're shutting these down, I thought it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.
---
 .github/ISSUE_TEMPLATE.md        | 3 +++
 .github/PULL_REQUEST_TEMPLATE.md | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..9231f809146
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,3 @@
+We’re closing our issue tracker on GitHub so we can focus on the GitLab.com issue tracker and respond to issues more quickly.
+
+We encourage you to open an issue on the [GitLab.com issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues). You can login on GitLab using your GitHub account if you'd like to contribute an issue.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..0a7ed80a81c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,3 @@
+Thank you for taking the time to contribute back to GitLab! Due to the high number of contributions we get, we’re unable to review requests on GitHub right now.
+
+We encourage you to open a merge request [on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests). You can login on GitLab.com using your GitHub account.

From 7722caf9d5be1ca419d9c672187fb62c6d21caed Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 9 Jun 2016 11:25:47 -0600
Subject: [PATCH 1342/1431] Address feedback about wording.

---
 .github/ISSUE_TEMPLATE.md        | 4 ++--
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9231f809146..2e88b7aa0a9 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,3 @@
-We’re closing our issue tracker on GitHub so we can focus on the GitLab.com issue tracker and respond to issues more quickly.
+We’re closing our issue tracker on GitHub so we can focus on the GitLab.com project and respond to issues more quickly.
 
-We encourage you to open an issue on the [GitLab.com issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues). You can login on GitLab using your GitHub account if you'd like to contribute an issue.
+We encourage you to open an issue on the [GitLab.com issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues). You can log into GitLab.com using your GitHub account.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0a7ed80a81c..c3b04026440 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,3 @@
-Thank you for taking the time to contribute back to GitLab! Due to the high number of contributions we get, we’re unable to review requests on GitHub right now.
+Thank you for taking the time to contribute back to GitLab!
 
-We encourage you to open a merge request [on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests). You can login on GitLab.com using your GitHub account.
+Please open a merge request [on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests), we look forward to reviewing your contribution! You can log into GitLab.com using your GitHub account.

From cda68e926c663eb007d2d6ce13f7340eb35af4af Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 8 Jun 2016 18:41:50 -0500
Subject: [PATCH 1343/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 4b75030db92..d81a31f8b40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -55,6 +55,7 @@ v 8.9.0 (unreleased)
   - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
   - Improve issuables APIs performance when accessing notes !4471
   - External links now open in a new tab
+  - Markdown editor now correctly resets the input value on edit cancellation !4175
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
@@ -67,7 +68,6 @@ v 8.8.4 (unreleased)
   - Fix importer for GitHub comments on diff
   - Disable Webhooks before proceeding with the GitHub import
   - Added descriptions to notification settings dropdown
-  - Markdown editor now correctly resets the input value on edit cancellation !4175
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From aff3c6999bfcbaea613e64c9bb95d42a3b5b3695 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 9 Jun 2016 14:07:58 -0300
Subject: [PATCH 1344/1431] Toggling a task in a description with mentions
 doesn't creates a Todo

---
 app/services/todo_service.rb       | 11 +++++++++--
 spec/services/todo_service_spec.rb | 30 ++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index d8365124175..8e03ff8ddde 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -20,7 +20,7 @@ class TodoService
   #  * mark all pending todos related to the issue for the current user as done
   #
   def update_issue(issue, current_user)
-    create_mention_todos(issue.project, issue, current_user)
+    update_issuable(issue, current_user)
   end
 
   # When close an issue we should:
@@ -53,7 +53,7 @@ class TodoService
   #  * create a todo for each mentioned user on merge request
   #
   def update_merge_request(merge_request, current_user)
-    create_mention_todos(merge_request.project, merge_request, current_user)
+    update_issuable(merge_request, current_user)
   end
 
   # When close a merge request we should:
@@ -153,6 +153,13 @@ class TodoService
     create_mention_todos(issuable.project, issuable, author)
   end
 
+  def update_issuable(issuable, author)
+    # Skip toggling a task list item in a description
+    return if issuable.tasks? && issuable.updated_tasks.any?
+
+    create_mention_todos(issuable.project, issuable, author)
+  end
+
   def handle_note(note, author)
     # Skip system notes, and notes on project snippet
     return if note.system? || note.for_snippet?
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 6e7ecbd39ba..489c920f19f 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -18,7 +18,7 @@ describe TodoService, services: true do
   end
 
   describe 'Issues' do
-    let(:issue) { create(:issue, project: project, assignee: john_doe, author: author, description: mentions) }
+    let(:issue) { create(:issue, project: project, assignee: john_doe, author: author, description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
     let(:unassigned_issue) { create(:issue, project: project, assignee: nil) }
     let(:confidential_issue) { create(:issue, :confidential, project: project, author: author, assignee: assignee, description: mentions) }
 
@@ -101,6 +101,19 @@ describe TodoService, services: true do
         should_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
         should_not_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
       end
+
+      it 'does not create todo when when tasks are marked as completed' do
+        issue.update(description: "- [x] Task 1\n- [X] Task 2 #{mentions}")
+
+        service.update_issue(issue, author)
+
+        should_not_create_todo(user: admin, target: issue, action: Todo::MENTIONED)
+        should_not_create_todo(user: assignee, target: issue, action: Todo::MENTIONED)
+        should_not_create_todo(user: author, target: issue, action: Todo::MENTIONED)
+        should_not_create_todo(user: john_doe, target: issue, action: Todo::MENTIONED)
+        should_not_create_todo(user: member, target: issue, action: Todo::MENTIONED)
+        should_not_create_todo(user: non_member, target: issue, action: Todo::MENTIONED)
+      end
     end
 
     describe '#close_issue' do
@@ -210,7 +223,7 @@ describe TodoService, services: true do
   end
 
   describe 'Merge Requests' do
-    let(:mr_assigned) { create(:merge_request, source_project: project, author: author, assignee: john_doe, description: mentions) }
+    let(:mr_assigned) { create(:merge_request, source_project: project, author: author, assignee: john_doe, description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
     let(:mr_unassigned) { create(:merge_request, source_project: project, author: author, assignee: nil) }
 
     describe '#new_merge_request' do
@@ -253,6 +266,19 @@ describe TodoService, services: true do
 
         expect { service.update_merge_request(mr_assigned, author) }.not_to change(member.todos, :count)
       end
+
+      it 'does not create todo when when tasks are marked as completed' do
+        mr_assigned.update(description: "- [x] Task 1\n- [X] Task 2 #{mentions}")
+
+        service.update_merge_request(mr_assigned, author)
+
+        should_not_create_todo(user: admin, target: mr_assigned, action: Todo::MENTIONED)
+        should_not_create_todo(user: assignee, target: mr_assigned, action: Todo::MENTIONED)
+        should_not_create_todo(user: author, target: mr_assigned, action: Todo::MENTIONED)
+        should_not_create_todo(user: john_doe, target: mr_assigned, action: Todo::MENTIONED)
+        should_not_create_todo(user: member, target: mr_assigned, action: Todo::MENTIONED)
+        should_not_create_todo(user: non_member, target: mr_assigned, action: Todo::MENTIONED)
+      end
     end
 
     describe '#close_merge_request' do

From 0098468dfb5927b4034d38c7faac44ac238b9385 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 9 Jun 2016 14:08:30 -0300
Subject: [PATCH 1345/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 17fc4801a6e..2be7f1568a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -56,6 +56,7 @@ v 8.9.0 (unreleased)
   - Improve issuables APIs performance when accessing notes !4471
   - External links now open in a new tab
   - Markdown editor now correctly resets the input value on edit cancellation !4175
+  - Toggling a task list item in a issue/mr description does not creates a Todo for mentions
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds

From 6ae82d57075cc8c6eff613877781ac14a09a2040 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 24 May 2016 18:40:27 -0500
Subject: [PATCH 1346/1431] Fix local timeago on user dashboard

---
 app/assets/javascripts/activities.js.coffee           | 5 ++++-
 app/assets/javascripts/lib/datetime_utility.js.coffee | 9 ++++++++-
 app/assets/javascripts/pager.js.coffee                | 3 ++-
 app/assets/javascripts/user_tabs.js.coffee            | 3 +++
 app/assets/stylesheets/framework/tw_bootstrap.scss    | 5 +++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee
index 5092e824e65..eae985e21ad 100644
--- a/app/assets/javascripts/activities.js.coffee
+++ b/app/assets/javascripts/activities.js.coffee
@@ -1,11 +1,14 @@
 class @Activities
   constructor: ->
-    Pager.init 20, true
+    Pager.init 20, true, false, @fixTooltips
     $(".event-filter-link").on "click", (event) =>
       event.preventDefault()
       @toggleFilter($(event.currentTarget))
       @reloadActivities()
 
+  fixTooltips: ->
+    gl.utils.localTimeAgo($('.js-timeago', '#activity'))
+
   reloadActivities: ->
     $(".content_list").html ''
     Pager.init 20, true
diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/datetime_utility.js.coffee
index ad1d1c70481..948d6dbf07e 100644
--- a/app/assets/javascripts/lib/datetime_utility.js.coffee
+++ b/app/assets/javascripts/lib/datetime_utility.js.coffee
@@ -12,6 +12,13 @@
           $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
     )
 
-    $timeagoEls.timeago() if setTimeago
+    if setTimeago
+      $timeagoEls.timeago()
+      $timeagoEls.tooltip('destroy')
+
+      # Recreate with custom template
+      $timeagoEls.tooltip(
+        template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+      )
 
 ) window
diff --git a/app/assets/javascripts/pager.js.coffee b/app/assets/javascripts/pager.js.coffee
index 0ff83b7f0c8..8049c5c30e2 100644
--- a/app/assets/javascripts/pager.js.coffee
+++ b/app/assets/javascripts/pager.js.coffee
@@ -1,5 +1,5 @@
 @Pager =
-  init: (@limit = 0, preload, @disable = false) ->
+  init: (@limit = 0, preload, @disable = false, @callback = $.noop) ->
     @loading = $('.loading').first()
 
     if preload
@@ -19,6 +19,7 @@
         @loading.hide()
       success: (data) ->
         Pager.append(data.count, data.html)
+        Pager.callback()
       dataType: "json"
 
   append: (count, html) ->
diff --git a/app/assets/javascripts/user_tabs.js.coffee b/app/assets/javascripts/user_tabs.js.coffee
index 70614396a4e..29dad21faed 100644
--- a/app/assets/javascripts/user_tabs.js.coffee
+++ b/app/assets/javascripts/user_tabs.js.coffee
@@ -122,6 +122,9 @@ class @UserTabs
         @parentEl.find(tabSelector).html(data.html)
         @loaded[action] = true
 
+        # Fix tooltips
+        gl.utils.localTimeAgo($('.js-timeago', tabSelector))
+
   loadActivities: (source) ->
     return if @loaded['activity'] is true
 
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index 6a45c34ccbb..e3154657c54 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -192,3 +192,8 @@
 .text-info:hover {
   color: $brand-info;
 }
+
+// Prevent datetimes on tooltips to break into two lines
+.local-timeago {
+  white-space: nowrap;
+}

From 340aa444b709291958f2ab3a21352d9e182705d8 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 25 May 2016 14:32:37 -0500
Subject: [PATCH 1347/1431] Add tests for dates on tooltips

---
 app/views/users/show.html.haml                |  4 +-
 .../dashboard/datetime_on_tooltips_spec.rb    | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/dashboard/datetime_on_tooltips_spec.rb

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 8268380dafc..92305594a81 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -79,10 +79,10 @@
       %li.js-contributed-tab
         = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
           Contributed projects
-      %li.projects-tab
+      %li.js-projects-tab
         = link_to user_projects_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do
           Personal projects
-      %li.snippets-tab
+      %li.js-snippets-tab
         = link_to user_snippets_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do
           Snippets
 
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb
new file mode 100644
index 00000000000..e77db0dd2a2
--- /dev/null
+++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb
@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+feature 'Tooltips on .timeago dates', feature: true, js: true do
+  include WaitForAjax
+
+  let(:user)            { create(:user) }
+  let(:project)         { create(:project, name: 'test', namespace: user.namespace) }
+  let(:created_date)    { Date.yesterday.to_time }
+  let(:expected_format) { created_date.strftime('%b %d, %Y %l:%M%P UTC') }
+
+  context 'on the activity tab' do
+    before do
+      project.team << [user, :master]
+
+      Event.create( project: project, author_id: user.id, action: Event::JOINED,
+                    updated_at: created_date, created_at: created_date)
+
+      login_as user
+      visit user_path(user)
+      wait_for_ajax()
+
+      page.find('.js-timeago').hover
+    end
+
+    it 'has the datetime formated correctly' do
+      expect(page).to have_selector('.local-timeago', text: expected_format)
+    end
+  end
+
+  context 'on the snippets tab' do
+    before do
+      project.team << [user, :master]
+      create(:snippet, author: user, updated_at: created_date, created_at: created_date)
+
+      login_as user
+      visit user_snippets_path(user)
+      wait_for_ajax()
+
+      page.find('.js-timeago').hover
+    end
+
+    it 'has the datetime formated correctly' do
+      expect(page).to have_selector('.local-timeago', text: expected_format)
+    end
+  end
+end

From 89523396ba3e0af1a0b3a90cdae5b28d06219816 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 9 Jun 2016 12:31:18 -0500
Subject: [PATCH 1348/1431] Update method name for better understanding

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

diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee
index eae985e21ad..ed5a5d0260c 100644
--- a/app/assets/javascripts/activities.js.coffee
+++ b/app/assets/javascripts/activities.js.coffee
@@ -1,12 +1,12 @@
 class @Activities
   constructor: ->
-    Pager.init 20, true, false, @fixTooltips
+    Pager.init 20, true, false, @updateTooltips
     $(".event-filter-link").on "click", (event) =>
       event.preventDefault()
       @toggleFilter($(event.currentTarget))
       @reloadActivities()
 
-  fixTooltips: ->
+  updateTooltips: ->
     gl.utils.localTimeAgo($('.js-timeago', '#activity'))
 
   reloadActivities: ->

From 541e663c125f322cdbb680a9081f2e8470d9ef4e Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 9 Jun 2016 14:35:11 -0500
Subject: [PATCH 1349/1431] Change date format to be non zero padded in order
 to fix failing test

---
 spec/features/dashboard/datetime_on_tooltips_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb
index e77db0dd2a2..365cb445df1 100644
--- a/spec/features/dashboard/datetime_on_tooltips_spec.rb
+++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb
@@ -6,7 +6,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do
   let(:user)            { create(:user) }
   let(:project)         { create(:project, name: 'test', namespace: user.namespace) }
   let(:created_date)    { Date.yesterday.to_time }
-  let(:expected_format) { created_date.strftime('%b %d, %Y %l:%M%P UTC') }
+  let(:expected_format) { created_date.strftime('%b %-d, %Y %l:%M%P UTC') }
 
   context 'on the activity tab' do
     before do

From cc971f03096b8298567caf0b9e0ae738bead03a7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 6 Jun 2016 09:26:47 +0100
Subject: [PATCH 1350/1431] Improved the UX of issue & milestone date picker

Closes #18198
---
 app/assets/stylesheets/framework/jquery.scss  | 43 +++++++++++++------
 app/views/groups/milestones/new.html.haml     |  3 +-
 app/views/projects/milestones/_form.html.haml |  3 +-
 app/views/shared/issuable/_form.html.haml     |  4 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/framework/jquery.scss b/app/assets/stylesheets/framework/jquery.scss
index 525ed81b059..30a5b837d69 100644
--- a/app/assets/stylesheets/framework/jquery.scss
+++ b/app/assets/stylesheets/framework/jquery.scss
@@ -2,6 +2,7 @@
   font-family: $regular_font;
   font-size: $font-size-base;
 
+  &.ui-datepicker,
   &.ui-datepicker-inline {
     border: 1px solid #ddd;
     padding: 10px;
@@ -10,6 +11,25 @@
     .ui-datepicker-header {
       background: #fff;
       border-color: #ddd;
+
+      .ui-datepicker-prev,
+      .ui-datepicker-next {
+        top: 4px;
+      }
+
+      .ui-datepicker-prev {
+        left: 2px;
+      }
+
+      .ui-datepicker-next {
+        right: 2px;
+      }
+
+      .ui-state-hover {
+        background: transparent;
+        border: 0;
+        cursor: pointer;
+      }
     }
 
     .ui-datepicker-calendar td a {
@@ -36,21 +56,18 @@
   }
 
   .ui-state-highlight {
-    border: 1px solid #eee;
-    background: #eee;
+    border: 0;
+    background: transparent;
   }
 
-  .ui-state-active {
-    border: 1px solid $gl-primary;
-    background: $gl-primary;
-    color: #fff;
-  }
-
-  .ui-state-hover,
-  .ui-state-focus {
-    border: 1px solid $row-hover;
-    background: $row-hover;
-    color: #333;
+  .ui-datepicker-calendar {
+    .ui-state-active,
+    .ui-state-hover,
+    .ui-state-focus {
+      border: 1px solid $gl-primary;
+      background: $gl-primary;
+      color: #fff;
+    }
   }
 }
 
diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml
index 7d9d27ae1fc..ca6c4326d1c 100644
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
@@ -39,9 +39,8 @@
     .col-md-6
       .form-group
         = f.label :due_date, "Due Date", class: "control-label"
-        .col-sm-10= f.hidden_field :due_date
         .col-sm-10
-          .datepicker
+          = f.text_field :due_date, class: "datepicker form-control", placeholder: "Select due date"
 
   .form-actions
     = f.submit 'Create Milestone', class: "btn-create btn"
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 687222fa92f..f5e2b927da8 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -17,9 +17,8 @@
     .col-md-6
       .form-group
         = f.label :due_date, "Due Date", class: "control-label"
-        .col-sm-10= f.hidden_field :due_date
         .col-sm-10
-          .datepicker
+          = f.text_field :due_date, class: "datepicker form-control", placeholder: "Select due date"
 
   .form-actions
     - if @milestone.new_record?
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index b430251dbf6..17e2a7e9290 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -88,9 +88,9 @@
       .col-lg-6
         .form-group
           = f.label :due_date, "Due date", class: "control-label"
-          = f.hidden_field :due_date, id: "issuable-due-date"
           .col-sm-10
-            .datepicker
+            .issuable-form-select-holder
+              = f.text_field :due_date, id: "issuable-due-date", class: "datepicker form-control", placeholder: "Select due date"
 
 - if issuable.can_move?(current_user)
   %hr

From be7b67d2930ddafaa82ef1bb1df36f2af0ad4941 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 6 Jun 2016 09:29:55 +0100
Subject: [PATCH 1351/1431] CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 2be7f1568a0..618e7103fa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,6 +57,7 @@ v 8.9.0 (unreleased)
   - External links now open in a new tab
   - Markdown editor now correctly resets the input value on edit cancellation !4175
   - Toggling a task list item in a issue/mr description does not creates a Todo for mentions
+  - Improved UX of date pickers on issue & milestone forms
 
 v 8.8.4 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds

From 7c88141b958c372b8a787c1d724bd8e5bd66f024 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 6 Jun 2016 11:11:57 +0100
Subject: [PATCH 1352/1431] Fixed tests

---
 spec/features/issues_spec.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 460d7f82b36..f6fb6a72d22 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -75,12 +75,13 @@ describe 'Issues', feature: true do
 
         fill_in 'issue_title', with: 'bug 345'
         fill_in 'issue_description', with: 'bug description'
+        find('#issuable-due-date').click
 
-        page.within '.datepicker' do
+        page.within '.ui-datepicker' do
           click_link date.day
         end
 
-        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
+        expect(find('#issuable-due-date').value).to eq date.to_s
 
         click_button 'Submit issue'
 
@@ -100,18 +101,19 @@ describe 'Issues', feature: true do
       it 'should save with due date' do
         date = Date.today.at_beginning_of_month
 
-        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
+        expect(find('#issuable-due-date').value).to eq date.to_s
 
         date = date.tomorrow
 
         fill_in 'issue_title', with: 'bug 345'
         fill_in 'issue_description', with: 'bug description'
+        find('#issuable-due-date').click
 
-        page.within '.datepicker' do
+        page.within '.ui-datepicker' do
           click_link date.day
         end
 
-        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
+        expect(find('#issuable-due-date').value).to eq date.to_s
 
         click_button 'Save changes'
 

From e885c2fd314bf1d4bc5943f68170150e92d756f4 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 9 Jun 2016 23:15:50 +0300
Subject: [PATCH 1353/1431] Ignore frequent emojis in search.

---
 app/assets/javascripts/awards_handler.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 58fd8f05902..ddbce1f532c 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -336,7 +336,7 @@ class @AwardsHandler
     if $.cookie 'frequently_used_emojis'
       frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
 
-      ul = $("<ul class='clearfix emoji-menu-list'>")
+      ul = $("<ul class='clearfix emoji-menu-list frequent'>")
 
       for emoji in frequentlyUsedEmojis
         $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
@@ -367,4 +367,4 @@ class @AwardsHandler
 
   searchEmojis: (term) ->
 
-    $(".emoji-menu-content [data-emoji*='#{term}']").closest('li').clone()
+    $(".emoji-menu-list:not(.frequent) [data-emoji*='#{term}']").closest('li').clone()

From 4456b41b6a2355678d60dccb5982db518ea788ff Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 13:51:10 +0100
Subject: [PATCH 1354/1431] Checks for undefined when inserting autocomplete
 into textarea

---
 app/assets/javascripts/gfm_auto_complete.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index b13a431a52f..2c7a8fe2a3b 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -35,7 +35,7 @@ GitLab.GfmAutoComplete =
 
       $.fn.atwho.default.callbacks.filter(query, data, searchKey)
     beforeInsert: (value) ->
-      if value.indexOf('undefined')
+      if value.indexOf('undefined') is 1
         @at
       else
         value

From ef48dd01cfcd32ace716c716078d7ca5137cf0ca Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 14:01:24 +0100
Subject: [PATCH 1355/1431] Checks based on whether data is loaded not
 undefined

---
 app/assets/javascripts/gfm_auto_complete.js.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 2c7a8fe2a3b..76c3083232b 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -3,6 +3,7 @@
 window.GitLab ?= {}
 GitLab.GfmAutoComplete =
   dataLoading: false
+  dataLoaded: false
 
   dataSource: ''
 
@@ -35,7 +36,7 @@ GitLab.GfmAutoComplete =
 
       $.fn.atwho.default.callbacks.filter(query, data, searchKey)
     beforeInsert: (value) ->
-      if value.indexOf('undefined') is 1
+      if not GitLab.GfmAutoComplete.dataLoaded
         @at
       else
         value
@@ -182,6 +183,8 @@ GitLab.GfmAutoComplete =
     $.getJSON(dataSource)
 
   loadData: (data) ->
+    @dataLoaded = true
+
     # load members
     @input.atwho 'load', '@', data.members
     # load issues

From bf92ea687f7085d8ea0168f47507d0bc459b6d36 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 9 Jun 2016 14:51:57 -0700
Subject: [PATCH 1356/1431] Properly quote table name in Rake task for MySQL
 and PostgreSQL compatibility

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.

Closes #15259
---
 lib/tasks/gitlab/db.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index e3135532540..7230b9485be 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -34,7 +34,7 @@ namespace :gitlab do
       # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html
       # MySQL: http://dev.mysql.com/doc/refman/5.7/en/drop-table.html
       # Add `IF EXISTS` because cascade could have already deleted a table.
-      tables.each { |t| connection.execute("DROP TABLE IF EXISTS `#{t}` CASCADE") }
+      tables.each { |t| connection.execute("DROP TABLE IF EXISTS #{connection.quote_table_name(t)} CASCADE") }
     end
 
     desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'

From 12483e898b2dc94d03c4a633c199256be31a38fb Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 9 Jun 2016 08:42:50 -0500
Subject: [PATCH 1357/1431] Update activity SVG path

---
 app/views/layouts/nav/_project.html.haml |  1 -
 app/views/shared/icons/_activity.svg     | 15 ++++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 2a58ef224b3..ca99ba8def3 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -129,5 +129,4 @@
       %li.hidden
         = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
           Commits
-
     .fade-right
diff --git a/app/views/shared/icons/_activity.svg b/app/views/shared/icons/_activity.svg
index c87794b9062..d465504b154 100644
--- a/app/views/shared/icons/_activity.svg
+++ b/app/views/shared/icons/_activity.svg
@@ -3,13 +3,14 @@
     <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
     <title>path-1</title>
     <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M5,0 C4.448,0 4,0.448 4,1 L4,3 L1,3 C0.448,3 0,3.448 0,4 L0,9 C0,9.552 0.448,10 1,10 L5,10 L5,8 L11,8 L11,10 L15,10 C15.552,10 16,9.552 16,9 L16,4 C16,3.448 15.552,3 15,3 L12,3 L12,1 C12,0.448 11.552,0 11,0 L5,0 L5,0 L5,0 Z M6,2.5 C6,2.224 6.224,2 6.5,2 L9.5,2 C9.776,2 10,2.224 10,2.5 C10,2.776 9.776,3 9.5,3 L6.5,3 C6.224,3 6,2.776 6,2.5 L6,2.5 L6,2.5 Z M6,11 L10.001,11 L10.001,9 L6,9 L6,11 L6,11 L6,11 Z M11,11 L11,12 L5,12 L5,11 L1,11 C0.448,11 0,11.448 0,12 L0,15 C0,15.552 0.448,16 1,16 L15,16 C15.552,16 16,15.552 16,15 L16,12 C16,11.448 15.552,11 15,11 L11,11 L11,11 L11,11 Z" id="path-1"></path>
-    </defs>
+    <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="path-1" fill="#D8D8D8" xlink:href="#path-1"></use>
+        <g id="_activity" fill="#7E7D7D">
+            <g id="Page-1">
+                <g id="path-1">
+                    <path d="M5,0 C4.448,0 4,0.448 4,1 L4,3 L1,3 C0.448,3 0,3.448 0,4 L0,9 C0,9.552 0.448,10 1,10 L5,10 L5,8 L11,8 L11,10 L15,10 C15.552,10 16,9.552 16,9 L16,4 C16,3.448 15.552,3 15,3 L12,3 L12,1 C12,0.448 11.552,0 11,0 L5,0 L5,0 L5,0 L5,0 Z M6,2.5 C6,2.224 6.224,2 6.5,2 L9.5,2 C9.776,2 10,2.224 10,2.5 C10,2.776 9.776,3 9.5,3 L6.5,3 C6.224,3 6,2.776 6,2.5 L6,2.5 L6,2.5 L6,2.5 Z M6,11 L10.001,11 L10.001,9 L6,9 L6,11 L6,11 L6,11 L6,11 Z M11,11 L11,12 L5,12 L5,11 L1,11 C0.448,11 0,11.448 0,12 L0,15 C0,15.552 0.448,16 1,16 L15,16 C15.552,16 16,15.552 16,15 L16,12 C16,11.448 15.552,11 15,11 L11,11 L11,11 L11,11 L11,11 Z"></path>
+                </g>
+            </g>
+        </g>
     </g>
 </svg>
\ No newline at end of file

From e328eab0da46f1a5d4fbf2289911ce8f4093cfb6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 9 Jun 2016 18:32:10 -0400
Subject: [PATCH 1358/1431] Update CHANGELOG for 8.8.4 and 8.8.5

[ci skip]
---
 CHANGELOG | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 833a3c18489..b00c149a753 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.9.0 (unreleased)
   - Allow customisable text on the 'nearly there' page after a user signs up
   - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
   - Allow forking projects with restricted visibility level
+  - Added descriptions to notification settings dropdown
   - Improve note validation to prevent errors when creating invalid note via API
   - Reduce number of fog gem dependencies
   - Remove project notification settings associated with deleted projects
@@ -22,6 +23,7 @@ v 8.9.0 (unreleased)
   - `git clone https://host/namespace/project` now works, in addition to using the `.git` suffix
   - Bump nokogiri to 1.6.8
   - Use gitlab-shell v3.0.0
+  - Upgrade to jQuery 2
   - Use Knapsack to evenly distribute tests across multiple nodes
   - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
   - Don't allow MRs to be merged when commits were added since the last review / page load
@@ -60,17 +62,17 @@ v 8.9.0 (unreleased)
   - Toggling a task list item in a issue/mr description does not creates a Todo for mentions
   - Improved UX of date pickers on issue & milestone forms
 
-v 8.8.4 (unreleased)
+v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
   - Fix issue with arrow keys not working in search autocomplete dropdown
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
-  - Upgrade to jQuery 2
-  - Remove prev/next buttons on issues and merge requests
   - Import GitHub repositories respecting the API rate limit
   - Fix importer for GitHub comments on diff
   - Disable Webhooks before proceeding with the GitHub import
-  - Added descriptions to notification settings dropdown
+
+v 8.8.4
+  - Fix LDAP-based login for users with 2FA enabled. !4493
 
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312

From 94826d9abe13a20aae0868a096a03d2a4e706d82 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 10 Jun 2016 01:56:41 +0300
Subject: [PATCH 1359/1431] Minor MR comment fixes.

yes -> true
no -> false
. frequent -> .frequent-emojis
---
 app/assets/javascripts/awards_handler.coffee | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index ddbce1f532c..136db8ee14d 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -100,7 +100,7 @@ class @AwardsHandler
     $menu.css(css)
 
 
-  addAward: (votesBlock, awardUrl, emoji, checkMutuality = yes, callback) ->
+  addAward: (votesBlock, awardUrl, emoji, checkMutuality = true, callback) ->
 
     emoji = @normilizeEmojiName emoji
 
@@ -111,7 +111,7 @@ class @AwardsHandler
     $('.emoji-menu').removeClass 'is-visible'
 
 
-  addAwardToEmojiBar: (votesBlock, emoji, checkForMutuality = yes) ->
+  addAwardToEmojiBar: (votesBlock, emoji, checkForMutuality = true) ->
 
     @checkMutuality votesBlock, emoji  if checkForMutuality
     @addEmojiToFrequentlyUsedList emoji
@@ -153,7 +153,7 @@ class @AwardsHandler
 
       if isAlreadyVoted
         @showEmojiLoader $emojiButton
-        @addAward votesBlock, awardUrl, mutualVote, no, ->
+        @addAward votesBlock, awardUrl, mutualVote, false, ->
           $emojiButton.removeClass 'is-loading'
 
 
@@ -336,14 +336,14 @@ class @AwardsHandler
     if $.cookie 'frequently_used_emojis'
       frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
 
-      ul = $("<ul class='clearfix emoji-menu-list frequent'>")
+      ul = $("<ul class='clearfix emoji-menu-list frequent-emojis'>")
 
       for emoji in frequentlyUsedEmojis
         $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
 
       $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
 
-    @frequentEmojiBlockRendered = yes
+    @frequentEmojiBlockRendered = true
 
 
   setupSearch: ->
@@ -367,4 +367,4 @@ class @AwardsHandler
 
   searchEmojis: (term) ->
 
-    $(".emoji-menu-list:not(.frequent) [data-emoji*='#{term}']").closest('li').clone()
+    $(".emoji-menu-list:not(.frequent-emojis) [data-emoji*='#{term}']").closest('li').clone()

From 99d5a91d7a1942f092c87010cbf93279979822a1 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Fri, 10 Jun 2016 14:04:27 +0530
Subject: [PATCH 1360/1431] Fix failing `EmailOnPush` spec.

---
 spec/lib/disable_email_interceptor_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/disable_email_interceptor_spec.rb b/spec/lib/disable_email_interceptor_spec.rb
index c2a7b20b84d..309a88151cf 100644
--- a/spec/lib/disable_email_interceptor_spec.rb
+++ b/spec/lib/disable_email_interceptor_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DisableEmailInterceptor, lib: true do
   before do
-    ActionMailer::Base.register_interceptor(DisableEmailInterceptor)
+    Mail.register_interceptor(DisableEmailInterceptor)
   end
 
   it 'should not send emails' do
@@ -14,7 +14,7 @@ describe DisableEmailInterceptor, lib: true do
     # Removing interceptor from the list because unregister_interceptor is
     # implemented in later version of mail gem
     # See: https://github.com/mikel/mail/pull/705
-    Mail.class_variable_set(:@@delivery_interceptors, [])
+    Mail.unregister_interceptor(DisableEmailInterceptor)
   end
 
   def deliver_mail

From e0a90c467c4ffaf6fec03ad54afa5f18b71a6aa3 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 09:10:36 +0100
Subject: [PATCH 1361/1431] Made the awardable buttons prettier when active

Closes #18379
---
 app/assets/stylesheets/pages/awards.scss | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 05d1ee5b998..6211f3a52eb 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -101,13 +101,21 @@
   line-height: 20px;
   outline: 0;
 
+  &:hover,
   &.active,
   &:active {
-    background-color: $white-dark;
+    background-color: $row-hover;
+    border-color: $row-hover-border;
     box-shadow: none;
     outline: 0;
   }
 
+  &.btn {
+    &:focus {
+      outline: 0;
+    }
+  }
+
   &.is-loading {
     .award-control-icon-normal,
     .emoji-icon {

From b2b3fb6c0130af4d8b08ed2a92d76c269fb226eb Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 15:58:02 +0100
Subject: [PATCH 1362/1431] Revert change to search all users

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

diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index de0eae58bff..88246b0feb8 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -95,7 +95,7 @@ class @UsersSelect
         data: (term, callback) =>
           isAuthorFilter = $('.js-author-search')
 
-          @users term, term is '' and isAuthorFilter, (users) =>
+          @users term, (users) =>
             if term.length is 0
               showDivider = 0
 
@@ -221,7 +221,7 @@ class @UsersSelect
         multiple: $(select).hasClass('multiselect')
         minimumInputLength: 0
         query: (query) =>
-          @users query.term, @projectId?, (users) =>
+          @users query.term, (users) =>
             data = { results: users }
 
             if query.term.length == 0
@@ -304,7 +304,7 @@ class @UsersSelect
 
   # Return users list. Filtered by query
   # Only active users retrieved
-  users: (query, fromProject, callback) =>
+  users: (query, callback) =>
     url = @buildUrl(@usersPath)
 
     $.ajax(
@@ -313,7 +313,7 @@ class @UsersSelect
         search: query
         per_page: 20
         active: true
-        project_id: @projectId if fromProject
+        project_id: @projectId
         group_id: @groupId
         current_user: @showCurrentUser
         author_id: @authorId

From a4b3bdabd52494f46fee73271d7b343e6b7e08e9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 10 Jun 2016 08:52:08 +0100
Subject: [PATCH 1363/1431] removed tests needed for any author :poop:

---
 spec/features/issues/filter_issues_spec.rb | 36 ----------------------
 1 file changed, 36 deletions(-)

diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 7efbaaa048c..1f0594e6b02 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -294,40 +294,4 @@ describe 'Filter issues', feature: true do
       end
     end
   end
-
-  describe 'filter by any author', js: true do
-    before do
-      user2 = create(:user, name: "tester")
-      create(:issue, project: project, author: user)
-      create(:issue, project: project, author: user2)
-
-      visit namespace_project_issues_path(project.namespace, project)
-    end
-
-    it 'should show filter by any author link' do
-      click_button "Author"
-      fill_in "Search authors", with: "tester"
-
-      page.within ".dropdown-menu-author" do
-        expect(page).to have_content "tester"
-      end
-    end
-
-    it 'should show filter issues by any author' do
-      page.within '.issues-list' do
-        expect(page).to have_selector ".issue", count: 2
-      end
-
-      click_button "Author"
-      fill_in "Search authors", with: "tester"
-
-      page.within ".dropdown-menu-author" do
-        click_link "tester"
-      end
-
-      page.within '.issues-list' do
-        expect(page).to have_selector ".issue", count: 1
-      end
-    end
-  end
 end

From 1d95958ba06c7d42c76f8a1599f831ce5251acca Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 10 Jun 2016 08:28:03 +0100
Subject: [PATCH 1364/1431] Changelog fix for search dropdown arrow keys fix

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

diff --git a/CHANGELOG b/CHANGELOG
index b00c149a753..604007d822b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.9.0 (unreleased)
   - Fix endless redirections when accessing user OAuth applications when they are disabled
   - Allow enabling wiki page events from Webhook management UI
   - Bump rouge to 1.11.0
+  - Fix issue with arrow keys not working in search autocomplete dropdown
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
@@ -64,7 +65,6 @@ v 8.9.0 (unreleased)
 
 v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
-  - Fix issue with arrow keys not working in search autocomplete dropdown
   - Fix todos page throwing errors when you have a project pending deletion
   - Reduce number of SQL queries when rendering user references
   - Import GitHub repositories respecting the API rate limit

From 10f17c2fcd50d4e4b5bad59a5ae2fb4a13a037d8 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Jun 2016 09:00:57 +0100
Subject: [PATCH 1365/1431] Correctly shows label errors in dropdown Fixes
 #18344

---
 app/assets/javascripts/labels_select.js.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index ec74dfaae1a..439c3153392 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -95,8 +95,11 @@ class @LabelsSelect
             $newLabelCreateButton.enable()
 
             if label.message?
+              errors = _.map label.message, (value, key) ->
+                "#{key} #{value[0]}"
+
               $newLabelError
-                .text label.message
+                .html errors.join("<br/>")
                 .show()
             else
               $('.dropdown-menu-back', $dropdown.parent()).trigger 'click'

From 701e2df7e55113dafd48c570baad44bf7f24f863 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 10 Jun 2016 12:29:15 +0200
Subject: [PATCH 1366/1431] Satisfy Rubocop

---
 lib/api/helpers.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 0e47bb0b8ad..e1d3bbcc02d 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -412,11 +412,11 @@ module API
     def send_git_blob(repository, blob)
       env['api.format'] = :txt
       content_type 'text/plain'
-      header *Gitlab::Workhorse.send_git_blob(repository, blob)
+      header(*Gitlab::Workhorse.send_git_blob(repository, blob))
     end
 
     def send_git_archive(repository, ref:, format:)
-      header *Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format)
+      header(*Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format))
     end
   end
 end

From dc6ec2adf82c2b2fe1ab6ef076432fd741d3afbb Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 20 Apr 2016 10:11:22 +0100
Subject: [PATCH 1367/1431] CI build page UI update Added sidebar Removed
 elements not present in design

---
 app/assets/javascripts/application.js.coffee  |   4 +-
 app/assets/javascripts/ci/build.coffee        |  91 ++++++---
 app/assets/stylesheets/framework/sidebar.scss |   4 +-
 .../stylesheets/framework/variables.scss      |   3 +
 app/assets/stylesheets/pages/builds.scss      |  91 +++++++--
 app/assets/stylesheets/pages/issuable.scss    |   6 +-
 app/assets/stylesheets/pages/xterm.scss       |  19 +-
 app/controllers/projects/builds_controller.rb |   2 +-
 app/helpers/nav_helper.rb                     |   2 +
 app/views/projects/artifacts/browse.html.haml |   1 +
 app/views/projects/builds/_header.html.haml   |  16 ++
 app/views/projects/builds/_sidebar.html.haml  |  93 +++++++++
 app/views/projects/builds/_user.html.haml     |   4 +
 app/views/projects/builds/show.html.haml      | 189 ++----------------
 features/steps/project/builds/artifacts.rb    |   4 +-
 spec/features/builds_spec.rb                  |  27 +--
 16 files changed, 306 insertions(+), 250 deletions(-)
 create mode 100644 app/views/projects/builds/_header.html.haml
 create mode 100644 app/views/projects/builds/_sidebar.html.haml
 create mode 100644 app/views/projects/builds/_user.html.haml

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index b28327ce12d..e0ca546350b 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -267,8 +267,8 @@ $ ->
       $(document).trigger('breakpoint:change', [bootstrapBreakpoint])
 
   $(window)
-    .off "resize"
-    .on "resize", (e) ->
+    .off "resize.app"
+    .on "resize.app", (e) ->
       fitSidebarForSize()
 
   gl.awardsHandler = new AwardsHandler()
diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee
index 98d05e41273..f763ba96e33 100644
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -1,19 +1,31 @@
-class CiBuild
+class @CiBuild
   @interval: null
   @state: null
 
-  constructor: (build_url, build_status, build_state) ->
+  constructor: (@build_url, @build_status, @state) ->
     clearInterval(CiBuild.interval)
 
-    @state = build_state
+    # Init breakpoint checker
+    @bp = Breakpoints.get()
+    @hideSidebar()
+    $('.js-build-sidebar').niceScroll()
+    $(document)
+      .off 'click', '.js-sidebar-build-toggle'
+      .on 'click', '.js-sidebar-build-toggle', @toggleSidebar
 
-    @initScrollButtonAffix()
+    $(window)
+      .off 'resize.build'
+      .on 'resize.build', @hideSidebar
 
-    if build_status == "running" || build_status == "pending"
+    if $('#build-trace').length
+      @getInitialBuildTrace()
+      @initScrollButtonAffix()
+
+    if @build_status is "running" or @build_status is "pending"
       #
       # Bind autoscroll button to follow build output
       #
-      $("#autoscroll-button").bind "click", ->
+      $('#autoscroll-button').on 'click', ->
         state = $(this).data("state")
         if "enabled" is state
           $(this).data "state", "disabled"
@@ -27,26 +39,37 @@ class CiBuild
       # Only valid for runnig build when output changes during time
       #
       CiBuild.interval = setInterval =>
-        if window.location.href.split("#").first() is build_url
-          last_state = @state
-          $.ajax
-            url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
-            dataType: "json"
-            success: (log) =>
-              return unless last_state is @state
-
-              if log.state and log.status is "running"
-                @state = log.state
-                if log.append
-                  $('.fa-refresh').before log.html
-                else
-                  $('#build-trace code').html log.html
-                  $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
-                @checkAutoscroll()
-              else if log.status isnt build_status
-                Turbolinks.visit build_url
+        if window.location.href.split("#").first() is @build_url
+          @getBuildTrace()
       , 4000
 
+  getInitialBuildTrace: ->
+    $.ajax
+      url: @build_url
+      dataType: 'json'
+      success: (build_data) ->
+        $('.js-build-output').html build_data.trace_html
+
+        if build_data.status is 'success' or build_data.status is 'failed'
+          $('.js-build-refresh').remove()
+
+  getBuildTrace: ->
+    $.ajax
+      url: "#{@build_url}/trace.json?state=#{encodeURIComponent(@state)}"
+      dataType: "json"
+      success: (log) =>
+        if log.state
+          @state = log.state
+
+        if log.status is "running"
+          if log.append
+            $('.js-build-output').append log.html
+          else
+            $('.js-build-output').html log.html
+          @checkAutoscroll()
+        else if log.status isnt @build_status
+          Turbolinks.visit @build_url
+
   checkAutoscroll: ->
     $("html,body").scrollTop $("#build-trace").height()  if "enabled" is $("#autoscroll-button").data("state")
 
@@ -61,4 +84,22 @@ class CiBuild
           $body.outerHeight() - ($buildTrace.outerHeight() + $buildTrace.offset().top)
     )
 
-@CiBuild = CiBuild
+  shouldHideSidebar: ->
+    bootstrapBreakpoint = @bp.getBreakpointSize()
+
+    bootstrapBreakpoint is 'xs' or bootstrapBreakpoint is 'sm'
+
+  toggleSidebar: =>
+    if @shouldHideSidebar()
+      $('.js-build-sidebar')
+        .toggleClass 'right-sidebar-expanded right-sidebar-collapsed'
+
+  hideSidebar: =>
+    if @shouldHideSidebar()
+      $('.js-build-sidebar')
+        .removeClass 'right-sidebar-expanded'
+        .addClass 'right-sidebar-collapsed'
+    else
+      $('.js-build-sidebar')
+        .removeClass 'right-sidebar-collapsed'
+        .addClass 'right-sidebar-expanded'
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 94985413746..06a688690f8 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -273,7 +273,9 @@
   padding-right: 0;
 
   @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
-    padding-right: $sidebar_collapsed_width;
+    &:not(.build-sidebar) {
+      padding-right: $sidebar_collapsed_width;
+    }
   }
 
   @media (min-width: $screen-md-min) {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 99e3df119ed..847b2f80bdf 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -260,3 +260,6 @@ $calendar-header-color: #b8b8b8;
 $calendar-hover-bg: #ecf3fe;
 $calendar-border-color: rgba(#000, .1);
 $calendar-unselectable-bg: #faf9f9;
+
+$ci-output-bg: #1d1f21;
+$ci-text-color: #c5c8c6;
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 44222e8e8a4..e8f1935d239 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -53,37 +53,92 @@
       left: 70px;
     }
   }
+}
 
-  .build-widget {
-    padding: 10px;
-    background: $background-color;
-    margin-bottom: 20px;
-    border-radius: 4px;
+.build-header {
+  position: relative;
+  padding-right: 40px;
 
-    .title {
-      margin-top: 0;
-      color: #666;
-      line-height: 1.5;
-    }
-    .attr-name {
-      color: #777;
+  @media (min-width: $screen-sm-min) {
+    padding-right: 0;
+  }
+
+  a {
+    color: $gl-gray;
+
+    &:hover {
+      color: $gl-link-color;
+      text-decoration: none;
     }
   }
 
-  .alert-disabled {
-    background: $background-color;
+  code {
+    color: $code-color;
+  }
 
-    a {
-      color: #3084bb !important;
-    }
+  .avatar {
+    float: none;
+    margin-right: 2px;
+    margin-left: 2px;
   }
 }
 
 table.builds {
-
   .build-link {
     a {
       color: $gl-dark-link-color;
     }
   }
 }
+
+.build-trace {
+  background: $ci-output-bg;
+  color: $ci-text-color;
+  white-space: pre;
+  overflow-x: auto;
+  font-size: 12px;
+
+  .fa-refresh {
+    font-size: 24px;
+  }
+
+  .bash {
+    display: block;
+  }
+}
+
+.right-sidebar.build-sidebar {
+  padding-top: $gl-padding;
+  padding-bottom: $gl-padding;
+
+  &.right-sidebar-collapsed {
+    display: none;
+  }
+
+  .block {
+    width: 100%;
+  }
+
+  .build-sidebar-header {
+    padding-top: 0;
+
+    .gutter-toggle {
+      margin-top: 0;
+    }
+  }
+}
+
+.build-detail-row {
+  margin-bottom: 5px;
+}
+
+.build-light-text {
+  color: $gl-placeholder-color;
+}
+
+.build-gutter-toggle {
+  position: absolute;
+  top: 50%;
+  right: 0;
+  margin-top: -17px;
+}
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 787c387379e..ea453ce356a 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -29,7 +29,7 @@
   }
 }
 
-.issuable-sidebar {
+.right-sidebar {
   a {
     color: inherit;
   }
@@ -74,6 +74,10 @@
     }
   }
 
+  .block-first {
+    padding-top: 0;
+  }
+
   .title {
     color: $gl-text-color;
     margin-bottom: 10px;
diff --git a/app/assets/stylesheets/pages/xterm.scss b/app/assets/stylesheets/pages/xterm.scss
index 3f28e402929..8d855ce99b0 100644
--- a/app/assets/stylesheets/pages/xterm.scss
+++ b/app/assets/stylesheets/pages/xterm.scss
@@ -11,18 +11,15 @@
   $magenta: #cd00cd;
   $cyan: #00cdcd;
   $white: #e5e5e5;
-  $l-black: #7f7f7f;
-  $l-red: #f00;
-  $l-green: #0f0;
-  $l-yellow: #ff0;
-  $l-blue: #5c5cff;
-  $l-magenta: #f0f;
-  $l-cyan: #0ff;
-  $l-white: #fff;
+  $l-black: #373b41;
+  $l-red: #c66;
+  $l-green: #b5bd68;
+  $l-yellow: #f0c674;
+  $l-blue: #81a2be;
+  $l-magenta: #b294bb;
+  $l-cyan: #8abeb7;
+  $l-white: $ci-text-color;
 
-  .term-bold {
-    font-weight: bold;
-  }
   .term-italic {
     font-style: italic;
   }
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 9b80efa5f11..14c82826342 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -41,7 +41,7 @@ class Projects::BuildsController < Projects::ApplicationController
   def trace
     respond_to do |format|
       format.json do
-        render json: @build.trace_with_state(params[:state]).merge!(id: @build.id, status: @build.status)
+        render json: @build.trace_with_state(params[:state].presence).merge!(id: @build.id, status: @build.status)
       end
     end
   end
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index f685e547537..39831ce2e48 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -30,6 +30,8 @@ module NavHelper
       else
         "page-gutter right-sidebar-expanded"
       end
+    elsif current_path?('builds#show')
+      "page-gutter build-sidebar right-sidebar-expanded"
     end
   end
 
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml
index ede01dcc1aa..539d07d634a 100644
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@@ -1,4 +1,5 @@
 - page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
+- header_title project_title(@project, "Builds", project_builds_path(@project))
 
 .top-block.row-content-block.clearfix
   .pull-right
diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml
new file mode 100644
index 00000000000..46561249bb8
--- /dev/null
+++ b/app/views/projects/builds/_header.html.haml
@@ -0,0 +1,16 @@
+.content-block.build-header
+  = ci_status_with_icon(@build.status)
+  Build
+  %strong ##{@build.id}
+  for commit
+  = link_to ci_status_path(@build.commit) do
+    %strong= @build.pipeline.short_sha
+  from
+  = link_to namespace_project_commits_path(@project.namespace, @project, @build.ref) do
+    %code
+      = @build.ref
+  - if @build.user
+    = render "user"
+  = time_ago_with_tooltip(@build.created_at)
+  %button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
+    = icon('angle-double-left')
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
new file mode 100644
index 00000000000..5d931389dfb
--- /dev/null
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -0,0 +1,93 @@
+%aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar
+  .block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
+    Build
+    %strong ##{@build.id}
+    %a.gutter-toggle.pull-right.js-sidebar-build-toggle{ href: "#" }
+      = icon('angle-double-right')
+  - if @build.coverage
+    .block.block-first
+      .title
+        Test coverage
+      %p.build-detail-row
+        #{@build.coverage}%
+
+  - if can?(current_user, :read_build, @project) && @build.artifacts?
+    .block{ class: ("block-first" if !@build.coverage) }
+      .title
+        Build artifacts
+      .btn-group.btn-group-justified{ role: :group }
+        = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
+          Download
+
+        - if @build.artifacts_metadata?
+          = link_to browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
+            Browse
+
+  .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && @build.artifacts?)) }
+    .title
+      Build details
+      - if @build.retryable?
+        = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right', method: :post
+    - if @build.merge_request
+      %p.build-detail-row
+        %span.build-light-text Merge Request:
+        = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request)
+    - if @build.duration
+      %p.build-detail-row
+        %span.build-light-text Duration:
+        #{duration_in_words(@build.finished_at, @build.started_at)}
+    - if @build.finished_at
+      %p.build-detail-row
+        %span.build-light-text Finished:
+        #{time_ago_with_tooltip(@build.finished_at)}
+    - if @build.erased_at
+      %p.build-detail-row
+        %span.build-light-text Erased:
+        #{time_ago_with_tooltip(@build.erased_at)}
+    %p.build-detail-row
+      %span.build-light-text Runner:
+      - if @build.runner && current_user && current_user.admin
+        = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
+      - elsif @build.runner
+        \##{@build.runner.id}
+    .btn-group.btn-group-justified{ role: :group }
+      - if @build.has_trace?
+        = link_to 'Raw', raw_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default'
+      - if @build.active?
+        = link_to "Cancel", cancel_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post
+      - if can?(current_user, :update_build, @project) && @build.erasable?
+        = link_to erase_namespace_project_build_path(@project.namespace, @project, @build),
+                  class: "btn btn-sm btn-default", method: :post,
+                  data: { confirm: "Are you sure you want to erase this build?" } do
+          Erase
+
+  - if @build.trigger_request
+    .build-widget
+      %h4.title
+        Trigger
+
+      %p
+        %span.build-light-text Token:
+        #{@build.trigger_request.trigger.short_token}
+
+      - if @build.trigger_request.variables
+        %p
+          %span.build-light-text Variables:
+
+        %code
+          - @build.trigger_request.variables.each do |key, value|
+            #{key}=#{value}
+
+  .block
+    .title
+      Commit message
+    %p.build-light-text.append-bottom-0
+      #{@build.pipeline.git_commit_message}
+
+  - if @build.tags.any?
+    .block
+      .title
+        Tags
+      - @build.tag_list.each do |tag|
+        %span.label.label-primary
+          = tag
diff --git a/app/views/projects/builds/_user.html.haml b/app/views/projects/builds/_user.html.haml
new file mode 100644
index 00000000000..2642de8021d
--- /dev/null
+++ b/app/views/projects/builds/_user.html.haml
@@ -0,0 +1,4 @@
+by
+%a{ href: user_path(@build.user) }
+  = image_tag avatar_icon(@build.user, 24), class: "avatar s24"
+  %strong= @build.user.to_reference
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 5477fc65c2b..a26f8aeb315 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -1,18 +1,10 @@
 - page_title "#{@build.name} (##{@build.id})", "Builds"
 - trace_with_state = @build.trace_with_state
+- header_title project_title(@project, "Builds", project_builds_path(@project))
 
 .build-page
-  .row-content-block.top-block
-    Build ##{@build.id} for commit
-    %strong.monospace= link_to @build.pipeline.short_sha, ci_status_path(@build.pipeline)
-    from
-    = link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref)
-    - merge_request = @build.merge_request
-    - if merge_request
-      via
-      = link_to "merge request #{merge_request.to_reference}", merge_request_path(merge_request)
+  = render "header"
 
-  #up-build-trace
   - builds = @build.pipeline.builds.latest.to_a
   - if builds.size > 1
     %ul.nav-links.no-top.no-bottom
@@ -33,18 +25,6 @@
             &middot;
             %i.fa.fa-warning
             This build was retried.
-
-  .row-content-block.middle-block
-    .build-head
-      .clearfix
-        = ci_status_with_icon(@build.status)
-        - if @build.duration
-          %span
-            %i.fa.fa-time
-            #{duration_in_words(@build.finished_at, @build.started_at)}
-        .pull-right
-          #{time_ago_with_tooltip(@build.finished_at) if @build.finished_at}
-
   - if @build.stuck?
     - unless @build.any_runners_online?
       .bs-callout.bs-callout-warning
@@ -64,158 +44,27 @@
           = link_to namespace_project_runners_path(@build.project.namespace, @build.project) do
             Runners page
 
-  .row.prepend-top-default
-    .col-md-9
-      .clearfix
-        - if @build.active?
-          .autoscroll-container
-            %button.btn.btn-success.btn-sm#autoscroll-button{:type => "button", :data => {:state => 'disabled'}} enable autoscroll
-          .clearfix
+  .prepend-top-default
+    - if @build.active?
+      .autoscroll-container
+        %button.btn.btn-success.btn-sm#autoscroll-button{:type => "button", :data => {:state => 'disabled'}} enable autoscroll
       #js-build-scroll.scroll-controls
-        = link_to '#up-build-trace', class: 'btn' do
+        = link_to '#build-trace', class: 'btn' do
           %i.fa.fa-angle-up
         = link_to '#down-build-trace', class: 'btn' do
           %i.fa.fa-angle-down
+    - if @build.erased?
+      .erased.alert.alert-warning
+        - erased_by = "by #{link_to @build.erased_by.name, user_path(@build.erased_by)}" if @build.erased_by
+        Build has been erased #{erased_by.html_safe} #{time_ago_with_tooltip(@build.erased_at)}
+    - else
+      %pre.build-trace#build-trace
+        %code.bash.js-build-output
+        = icon("refresh spin", class: "js-build-refresh")
 
-      - if @build.erased?
-        .erased.alert.alert-warning
-          - erased_by = "by #{link_to @build.erased_by.name, user_path(@build.erased_by)}" if @build.erased_by
-          Build has been erased #{erased_by.html_safe} #{time_ago_with_tooltip(@build.erased_at)}
-      - else
-        %pre.trace#build-trace
-          %code.bash
-            = preserve do
-              = raw trace_with_state[:html]
-              - if @build.active?
-                %i{:class => "fa fa-refresh fa-spin"}
+    #down-build-trace
 
-      %div#down-build-trace
+= render "sidebar"
 
-    .col-md-3
-      - if @build.coverage
-        .build-widget
-          %h4.title
-            Test coverage
-          %h1 #{@build.coverage}%
-
-      - if can?(current_user, :read_build, @project) && @build.artifacts?
-        .build-widget.artifacts
-          %h4.title Build artifacts
-          .center
-            .btn-group{ role: :group }
-              = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-primary' do
-                = icon('download')
-                Download
-
-              - if @build.artifacts_metadata?
-                = link_to browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-primary' do
-                  = icon('folder-open')
-                  Browse
-
-      .build-widget.build-controls
-        %h4.title
-          Build ##{@build.id}
-          - if can?(current_user, :update_build, @project)
-            .center
-              .btn-group{ role: :group }
-                - if @build.active?
-                  = link_to "Cancel", cancel_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-danger', method: :post
-                - elsif @build.retryable?
-                  = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-primary', method: :post
-
-                - if @build.erasable?
-                  = link_to erase_namespace_project_build_path(@project.namespace, @project, @build),
-                            class: 'btn btn-sm btn-warning', method: :post,
-                            data: { confirm: 'Are you sure you want to erase this build?' } do
-                    = icon('eraser')
-                    Erase
-                - if @build.has_trace?
-                  = link_to 'Raw', raw_namespace_project_build_path(@project.namespace, @project, @build),
-                            class: 'btn btn-sm btn-success', target: '_blank'
-
-        .clearfix
-          - if @build.duration
-            %p
-              %span.attr-name Duration:
-              #{duration_in_words(@build.finished_at, @build.started_at)}
-          %p
-            %span.attr-name Created:
-            #{time_ago_with_tooltip(@build.created_at)}
-          - if @build.finished_at
-            %p
-              %span.attr-name Finished:
-              #{time_ago_with_tooltip(@build.finished_at)}
-          - if @build.erased_at
-            %p
-              %span.attr-name Erased:
-              #{time_ago_with_tooltip(@build.erased_at)}
-          %p
-            %span.attr-name Runner:
-            - if @build.runner && current_user && current_user.admin
-              = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
-            - elsif @build.runner
-              \##{@build.runner.id}
-
-      - if @build.trigger_request
-        .build-widget
-          %h4.title
-            Trigger
-
-          %p
-            %span.attr-name Token:
-            #{@build.trigger_request.trigger.short_token}
-
-          - if @build.trigger_request.variables
-            %p
-              %span.attr-name Variables:
-
-            %code
-              - @build.trigger_request.variables.each do |key, value|
-                #{key}=#{value}
-
-      .build-widget
-        %h4.title
-          Commit
-          .pull-right
-            %small
-              = link_to @build.pipeline.short_sha, ci_status_path(@build.pipeline), class: "monospace"
-        %p
-          %span.attr-name Branch:
-          = link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref)
-        %p
-          %span.attr-name Author:
-          #{@build.pipeline.git_author_name}
-        %p
-          %span.attr-name Message:
-          #{@build.pipeline.git_commit_message}
-
-      - if @build.tags.any?
-        .build-widget
-          %h4.title
-            Tags
-          - @build.tag_list.each do |tag|
-            %span.label.label-primary
-              = tag
-
-      - if @builds.present?
-        .build-widget
-          %h4.title #{pluralize(@builds.count(:id), "other build")} for
-          = succeed ":" do
-            = link_to @build.pipeline.short_sha, ci_status_path(@build.pipeline), class: "monospace"
-          %table.table.builds
-            - @builds.each_with_index do |build, i|
-              %tr.build
-                %td
-                  = ci_icon_for_status(build.status)
-                %td
-                  = link_to namespace_project_build_path(@project.namespace, @project, build) do
-                    - if build.name
-                      = build.name
-                    - else
-                      %span ##{build.id}
-
-                %td.status= build.status
-
-
-  :javascript
-    new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}", "#{trace_with_state[:state]}")
+:javascript
+  new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}", "#{trace_with_state[:state]}")
diff --git a/features/steps/project/builds/artifacts.rb b/features/steps/project/builds/artifacts.rb
index 1bdb57af9d1..2876e8812e9 100644
--- a/features/steps/project/builds/artifacts.rb
+++ b/features/steps/project/builds/artifacts.rb
@@ -5,11 +5,11 @@ class Spinach::Features::ProjectBuildsArtifacts < Spinach::FeatureSteps
   include RepoHelpers
 
   step 'I click artifacts download button' do
-    page.within('.artifacts') { click_link 'Download' }
+    click_link 'Download'
   end
 
   step 'I click artifacts browse button' do
-    page.within('.artifacts') { click_link 'Browse' }
+    click_link 'Browse'
   end
 
   step 'I should see content of artifacts archive' do
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index df221ab1f3b..cb94432dbd0 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -93,9 +93,7 @@ describe "Builds" do
       end
 
       it 'has button to download artifacts' do
-        page.within('.artifacts') do
-          expect(page).to have_content 'Download'
-        end
+        expect(page).to have_content 'Download'
       end
     end
 
@@ -107,9 +105,7 @@ describe "Builds" do
       end
 
       it do
-        page.within('.build-controls') do
-          expect(page).to have_link 'Raw'
-        end
+        expect(page).to have_link 'Raw'
       end
     end
   end
@@ -165,15 +161,10 @@ describe "Builds" do
   end
 
   describe "GET /:project/builds/:id/download" do
-    context "Build from project" do
-      before do
-        @build.update_attributes(artifacts_file: artifacts_file)
-        visit namespace_project_build_path(@project.namespace, @project, @build)
-        page.within('.artifacts') { click_link 'Download' }
-      end
-
-      it { expect(page.status_code).to eq(200) }
-      it { expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type) }
+    before do
+      @build.update_attributes(artifacts_file: artifacts_file)
+      visit namespace_project_build_path(@project.namespace, @project, @build)
+      click_link 'Download'
     end
 
     context "Build from other project" do
@@ -246,10 +237,8 @@ describe "Builds" do
       it { expect(page.status_code).to eq(200) }
     end
 
-    context "Build from other project" do
-      before do
-        visit status_namespace_project_build_path(@project.namespace, @project, @build2)
-      end
+    it 'sends the right headers' do
+      click_link 'Raw'
 
       it { expect(page.status_code).to eq(404) }
     end

From a6345c14011e9ffa8cca45f9058a1529c7be5b62 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 7 Jun 2016 12:02:37 +0100
Subject: [PATCH 1368/1431] Fixed failing tests

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

diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index cb94432dbd0..0c865e915cb 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -237,8 +237,10 @@ describe "Builds" do
       it { expect(page.status_code).to eq(200) }
     end
 
-    it 'sends the right headers' do
-      click_link 'Raw'
+    context "Build from other project" do
+      before do
+        visit status_namespace_project_build_path(@project.namespace, @project, @build2)
+      end
 
       it { expect(page.status_code).to eq(404) }
     end

From bd257c3d38a704e6fd2d020943d1a96bbfe97d6c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 8 Jun 2016 13:37:39 +0100
Subject: [PATCH 1369/1431] Fixed merge conflict that caused tests to fail with
 build

---
 app/views/projects/builds/_header.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml
index 46561249bb8..51b5bd9db42 100644
--- a/app/views/projects/builds/_header.html.haml
+++ b/app/views/projects/builds/_header.html.haml
@@ -3,7 +3,7 @@
   Build
   %strong ##{@build.id}
   for commit
-  = link_to ci_status_path(@build.commit) do
+  = link_to ci_status_path(@build.pipeline) do
     %strong= @build.pipeline.short_sha
   from
   = link_to namespace_project_commits_path(@project.namespace, @project, @build.ref) do

From e7950bd9429d104cc5ef7ca0e0195ecbace4b295 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 10 Jun 2016 10:38:31 +0100
Subject: [PATCH 1370/1431] Fixed project dropdown being overlapped by sidebar

Closes #18410
---
 app/assets/stylesheets/framework/header.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c46d6b14782..b8d4233537b 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -185,7 +185,7 @@ header {
   margin-left: 0;
 
   .header-content {
-    padding-left: $sidebar_width;
+    margin-left: $sidebar_width;
     transition-duration: .3s;
   }
 }

From 9dfb809c578735d807070d77ad567ab5c3de9b6c Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 8 Jun 2016 19:39:33 +0200
Subject: [PATCH 1371/1431] Fix UTF-8 handling in incremental trace update API

---
 app/models/ci/build.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index b8ada6361ac..6a64ca451f7 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -194,7 +194,7 @@ module Ci
 
     def trace_length
       if raw_trace
-        raw_trace.length
+        raw_trace.bytesize
       else
         0
       end
@@ -216,7 +216,7 @@ module Ci
       recreate_trace_dir
 
       File.truncate(path_to_trace, offset) if File.exist?(path_to_trace)
-      File.open(path_to_trace, 'a') do |f|
+      File.open(path_to_trace, 'ab') do |f|
         f.write(trace_part)
       end
     end

From e6209a407e2e8abee99bb61f089e262c3a5e51e8 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 10 Jun 2016 13:26:36 +0200
Subject: [PATCH 1372/1431] Added description of artifacts:when

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

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index a3481f58c6c..39fad549a04 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -30,6 +30,7 @@ If you want a quick introduction to GitLab CI, follow our
     - [when](#when)
     - [artifacts](#artifacts)
         - [artifacts:name](#artifacts-name)
+        - [artifacts:when](#artifacts-when)
     - [dependencies](#dependencies)
     - [before_script and after_script](#before_script-and-after_script)
 - [Hidden jobs](#hidden-jobs)
@@ -651,6 +652,32 @@ job:
     untracked: true
 ```
 
+#### artifacts:when
+
+>**Note:**
+Introduced in GitLab 8.9 and GitLab Runner v1.3.0.
+
+`artifacts:when` is used to upload artifacts on build failure or despite the
+failure.
+
+`artifacts:when` can be set to one of the following values:
+
+1. `on_success` - upload artifacts only when build succeeds. This is the default
+1. `on_failure` - upload artifacts only when build fails
+1. `always` - upload artifacts despite the build status
+
+---
+
+**Example configurations**
+
+To upload artifacts only when build fails
+
+```yaml
+job:
+  artifacts:
+    when: on_failure
+```
+
 ### dependencies
 
 >**Note:**

From 72647eda3121566c92941a1e98088c31a77cb9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 10 Jun 2016 13:44:45 +0200
Subject: [PATCH 1373/1431] Don't require Gitlab::Redis in mail_room.yml if
 it's already defined
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/mail_room.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mail_room.yml b/config/mail_room.yml
index 761a32adb9e..7cab24b295e 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -2,7 +2,7 @@
 <%
 require "yaml"
 require "json"
-require_relative "lib/gitlab/redis"
+require_relative "lib/gitlab/redis" unless defined?(Gitlab::Redis)
 
 rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
 

From c43279a8d9b22b063c1963aae3452f2fe96ea3f2 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 10 Jun 2016 13:58:33 +0200
Subject: [PATCH 1374/1431] Fix expose of TriggerRequest

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

diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index 255217b1a7c..a902ced35d7 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -56,7 +56,7 @@ module Ci
 
       class TriggerRequest < Grape::Entity
         expose :id, :variables
-        expose :trigger, using: Commit, as: :commit
+        expose :pipeline, using: Commit, as: :commit
       end
     end
   end

From 07dbd6b3884c4f188b2c3f29dd7419791f1051eb Mon Sep 17 00:00:00 2001
From: Rui Anderson <anderson.rui@gmail.com>
Date: Wed, 27 Apr 2016 15:34:42 -0300
Subject: [PATCH 1375/1431] Allow or not merge MR with failed build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                     |   1 +
 app/assets/javascripts/project_new.js.coffee  |  19 +--
 app/controllers/projects_controller.rb        |   2 +-
 app/models/merge_request.rb                   |   6 +-
 .../_merge_request_settings.html.haml         |  11 ++
 app/views/projects/edit.html.haml             |   2 +
 .../merge_requests/widget/_open.html.haml     |   2 +
 .../widget/open/_accept.html.haml             |  27 ++--
 .../widget/open/_build_failed.html.haml       |   6 +
 ...low_merge_if_build_succeeds_to_projects.rb |  15 +++
 db/schema.rb                                  |   1 +
 lib/api/merge_requests.rb                     |   2 +-
 .../only_allow_merge_if_build_succeeds.rb     | 105 ++++++++++++++++
 spec/models/merge_request_spec.rb             | 117 ++++++++++++++++++
 spec/requests/api/merge_requests_spec.rb      |   8 ++
 15 files changed, 301 insertions(+), 23 deletions(-)
 create mode 100644 app/views/projects/_merge_request_settings.html.haml
 create mode 100644 app/views/projects/merge_requests/widget/open/_build_failed.html.haml
 create mode 100644 db/migrate/20160419122101_add_only_allow_merge_if_build_succeeds_to_projects.rb
 create mode 100644 spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb

diff --git a/CHANGELOG b/CHANGELOG
index b00c149a753..176fc16943f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 8.9.0 (unreleased)
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
   - Links from a wiki page to other wiki pages should be rewritten as expected
+  - Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
   - Fix issues filter when ordering by milestone
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels
diff --git a/app/assets/javascripts/project_new.js.coffee b/app/assets/javascripts/project_new.js.coffee
index 63dee4ed5d7..e48343a19b5 100644
--- a/app/assets/javascripts/project_new.js.coffee
+++ b/app/assets/javascripts/project_new.js.coffee
@@ -7,12 +7,17 @@ class @ProjectNew
     @toggleSettingsOnclick()
 
 
-  toggleSettings: ->
-    checked = $("#project_builds_enabled").prop("checked")
-    if checked
-      $('.builds-feature').show()
-    else
-      $('.builds-feature').hide()
+  toggleSettings: =>
+    @_showOrHide('#project_builds_enabled', '.builds-feature')
+    @_showOrHide('#project_merge_requests_enabled', '.merge-requests-feature')
 
   toggleSettingsOnclick: ->
-    $("#project_builds_enabled").on 'click', @toggleSettings
+    $('#project_builds_enabled, #project_merge_requests_enabled').on 'click', @toggleSettings
+
+  _showOrHide: (checkElement, container) ->
+    $container = $(container)
+
+    if $(checkElement).prop('checked')
+      $container.show()
+    else
+      $container.hide()
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3af62c7696c..a6479c42d94 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -234,7 +234,7 @@ class ProjectsController < Projects::ApplicationController
       :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,
-      :public_builds,
+      :public_builds, :only_allow_merge_if_build_succeeds
     )
   end
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b0ed8182855..43c6bcb8715 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -260,7 +260,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def mergeable?
-    return false unless open? && !work_in_progress? && !broken?
+    return false if !open? || work_in_progress? || broken?  || cannot_be_merged_because_build_failed?
 
     check_if_can_be_merged
 
@@ -481,6 +481,10 @@ class MergeRequest < ActiveRecord::Base
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
 
+  def cannot_be_merged_because_build_failed?
+    project.only_allow_merge_if_build_succeeds? && ci_commit && ci_commit.failed?
+  end
+
   def state_human_name
     if merged?
       "Merged"
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml
new file mode 100644
index 00000000000..da522b53417
--- /dev/null
+++ b/app/views/projects/_merge_request_settings.html.haml
@@ -0,0 +1,11 @@
+%fieldset.builds-feature
+  %h5.prepend-top-0
+    Merge Requests
+  .form-group
+    .checkbox
+      = f.label :only_allow_merge_if_build_succeeds do
+        = f.check_box :only_allow_merge_if_build_succeeds
+        %strong Only allow merge requests to be merged if the build succeeds
+      .help-block
+        Builds need to be configured to enable this feature.
+        = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests#only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 18b125ff9d4..8449fe1e4e0 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -84,6 +84,8 @@
                   %br
                   %span.descr Enable Container Registry for this repository
         %hr
+        = render 'merge_request_settings', f: f
+        %hr
         = render 'builds_settings', f: f
         %hr
         %fieldset.features.append-bottom-default
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 13359abede7..8de587009e1 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -17,6 +17,8 @@
       = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
     - elsif !@merge_request.can_be_merged_by?(current_user)
       = render 'projects/merge_requests/widget/open/not_allowed'
+    - elsif @merge_request.cannot_be_merged_because_build_failed?
+      = render 'projects/merge_requests/widget/open/build_failed'
     - elsif @merge_request.can_be_merged?
       = render 'projects/merge_requests/widget/open/accept'
 
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 60d7d6ff1f5..941513febbd 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -10,19 +10,20 @@
           %span.btn-group
             = button_tag class: "btn btn-create js-merge-button merge_when_build_succeeds" do
               Merge When Build Succeeds
-            = button_tag class: "btn btn-success dropdown-toggle", 'data-toggle' => 'dropdown' do
-              %span.caret
-              %span.sr-only
-                Select Merge Moment
-            %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' }
-              %li
-                = link_to "#", class: "merge_when_build_succeeds" do
-                  = icon('check fw')
-                  Merge When Build Succeeds
-              %li
-                = link_to "#", class: "accept_merge_request" do
-                  = icon('warning fw')
-                  Merge Immediately
+            - unless @project.only_allow_merge_if_build_succeeds?
+              = button_tag class: "btn btn-success dropdown-toggle", 'data-toggle' => 'dropdown' do
+                %span.caret
+                %span.sr-only
+                  Select Merge Moment
+              %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' }
+                %li
+                  = link_to "#", class: "merge_when_build_succeeds" do
+                    = icon('check fw')
+                    Merge When Build Succeeds
+                %li
+                  = link_to "#", class: "accept_merge_request" do
+                    = icon('warning fw')
+                    Merge Immediately
         - else
           = f.button class: "btn btn-create btn-grouped js-merge-button accept_merge_request #{status_class}" do
             Accept Merge Request
diff --git a/app/views/projects/merge_requests/widget/open/_build_failed.html.haml b/app/views/projects/merge_requests/widget/open/_build_failed.html.haml
new file mode 100644
index 00000000000..14f51af5360
--- /dev/null
+++ b/app/views/projects/merge_requests/widget/open/_build_failed.html.haml
@@ -0,0 +1,6 @@
+%h4
+  = icon('exclamation-triangle')
+  The build for this merge request failed
+
+%p
+  Please retry the build or push a new commit to fix the failure.
diff --git a/db/migrate/20160419122101_add_only_allow_merge_if_build_succeeds_to_projects.rb b/db/migrate/20160419122101_add_only_allow_merge_if_build_succeeds_to_projects.rb
new file mode 100644
index 00000000000..69d64ccd006
--- /dev/null
+++ b/db/migrate/20160419122101_add_only_allow_merge_if_build_succeeds_to_projects.rb
@@ -0,0 +1,15 @@
+class AddOnlyAllowMergeIfBuildSucceedsToProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:projects,
+                            :only_allow_merge_if_build_succeeds,
+                            :boolean,
+                            default: false)
+  end
+
+  def down
+    remove_column(:projects, :only_allow_merge_if_build_succeeds)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b7adf48fdb4..03070f0d593 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -779,6 +779,7 @@ ActiveRecord::Schema.define(version: 20160608155312) do
     t.boolean  "last_repository_check_failed"
     t.datetime "last_repository_check_at"
     t.boolean  "container_registry_enabled"
+    t.boolean  "only_allow_merge_if_build_succeeds", default: 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/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 43221d5622a..5822e19cd44 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -228,7 +228,7 @@ module API
           # Merge request can not be merged
           # because user dont have permissions to push into target branch
           unauthorized! unless merge_request.can_be_merged_by?(current_user)
-          not_allowed! if !merge_request.open? || merge_request.work_in_progress?
+          not_allowed! if !merge_request.open? || merge_request.work_in_progress? || merge_request.cannot_be_merged_because_build_failed?
 
           merge_request.check_if_can_be_merged
 
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
new file mode 100644
index 00000000000..1627aa7287a
--- /dev/null
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+feature 'Only allow merge requests to be merged if the build succeeds', feature: true, js: true do
+  let(:user) { create(:user) }
+
+  let(:project)       { create(:project, :public) }
+  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
+
+  before do
+    login_as user
+
+    project.team << [user, :master]
+  end
+
+  context "project hasn't ci enabled" do
+    it "allows MR to be merged" do
+      visit_merge_request(merge_request)
+      expect(page).to have_button "Accept Merge Request"
+    end
+  end
+
+  context "when project has ci enabled" do
+    let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+    let!(:ci_build) { create(:ci_build, commit: ci_commit) }
+
+    before do
+      project.enable_ci
+    end
+
+    context "when merge requests can only be merged if the build succeeds" do
+      before do
+        project.update_attribute(:only_allow_merge_if_build_succeeds, true)
+      end
+
+      context "when ci is running" do
+        it "doesn't allow to merge immediately" do
+          ci_commit.statuses.update_all(status: :pending)
+          visit_merge_request(merge_request)
+
+          expect(page).to have_button "Merge When Build Succeeds"
+          expect(page).to_not have_button "Select Merge Moment"
+        end
+      end
+
+      context "when ci failed" do
+        it "doesn't allow MR to be merged" do
+          ci_commit.statuses.update_all(status: :failed)
+          visit_merge_request(merge_request)
+
+          expect(page).to_not have_button "Accept Merge Request"
+          expect(page).to have_content("Please retry the build or push code to fix the failure.")
+        end
+      end
+
+      context "when ci succeed" do
+        it "allows MR to be merged" do
+          ci_commit.statuses.update_all(status: :success)
+          visit_merge_request(merge_request)
+
+          expect(page).to have_button "Accept Merge Request"
+        end
+      end
+    end
+
+    context "when merge requests can be merged when the build failed" do
+      before do
+        project.update_attribute(:only_allow_merge_if_build_succeeds, false)
+      end
+
+      context "when ci is running" do
+        it "allows MR to be merged immediately" do
+          ci_commit.statuses.update_all(status: :pending)
+          visit_merge_request(merge_request)
+
+          expect(page).to have_button "Merge When Build Succeeds"
+
+          click_button "Select Merge Moment"
+          expect(page).to have_content "Merge Immediately"
+        end
+      end
+
+      context "when ci failed" do
+        it "allows MR to be merged" do
+          ci_commit.statuses.update_all(status: :failed)
+          visit_merge_request(merge_request)
+
+          expect(page).to have_button "Accept Merge Request"
+        end
+      end
+
+      context "when ci succeed" do
+        it "allows MR to be merged" do
+          ci_commit.statuses.update_all(status: :success)
+          visit_merge_request(merge_request)
+
+          expect(page).to have_button "Accept Merge Request"
+        end
+      end
+    end
+  end
+
+  def visit_merge_request(merge_request)
+    visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
+  end
+end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 1b7cbc3efda..76912eed834 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -455,4 +455,121 @@ describe MergeRequest, models: true do
       expect(user2.assigned_open_merge_request_count).to eq(1)
     end
   end
+
+  describe '#check_if_can_be_merged' do
+    let(:project) { create(:project, only_allow_merge_if_build_succeeds: true) }
+
+    subject { create(:merge_request, source_project: project, merge_status: :unchecked) }
+
+    context 'when it is not broken and has no conflicts' do
+      it 'is marked as mergeable' do
+        allow(subject).to receive(:broken?) { false }
+        allow(project).to receive_message_chain(:repository, :can_be_merged?) { true }
+
+        expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('can_be_merged')
+      end
+    end
+
+    context 'when broken' do
+      before { allow(subject).to receive(:broken?) { true } }
+
+      it 'becomes unmergeable' do
+        expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
+      end
+    end
+
+    context 'when it has conflicts' do
+      before do
+        allow(subject).to receive(:broken?) { false }
+        allow(project).to receive_message_chain(:repository, :can_be_merged?) { false }
+      end
+
+      it 'becomes unmergeable' do
+        expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
+      end
+    end
+  end
+
+  describe '#mergeable?' do
+    let(:project) { create(:project, only_allow_merge_if_build_succeeds: true) }
+
+    subject { create(:merge_request, source_project: project) }
+
+    it "checks if merge request can be merged" do
+      allow(subject).to receive(:cannot_be_merged_because_build_failed?) { false }
+      expect(subject).to receive(:check_if_can_be_merged)
+
+      subject.mergeable?
+    end
+
+    context 'when not open' do
+      before { subject.close }
+
+      it 'returns false' do
+        expect(subject.mergeable?).to be_falsey
+      end
+    end
+
+    context 'when working in progress' do
+      before { subject.title = 'WIP MR' }
+
+      it 'returns false' do
+        expect(subject.mergeable?).to be_falsey
+      end
+    end
+
+    context 'when broken' do
+      before { allow(subject).to receive(:broken?) { true } }
+
+      it 'returns false' do
+        expect(subject.mergeable?).to be_falsey
+      end
+    end
+
+    context 'when failed' do
+      before { allow(subject).to receive(:broken?) { false } }
+
+      context "when project settings restrict to merge only if build succeeds" do
+        before { allow(subject).to receive(:cannot_be_merged_because_build_failed?) { true } }
+        it 'returns false if project settings restrict to merge only if build succeeds' do
+          expect(subject.mergeable?).to be_falsey
+        end
+      end
+    end
+  end
+
+  describe '#cannot_be_merged_because_build_failed?' do
+    let(:project) { create(:empty_project, only_allow_merge_if_build_succeeds: true) }
+    let(:commit_status) { create(:commit_status, status: 'failed', project: project) }
+    let(:ci_commit) { create(:ci_empty_pipeline) }
+
+    subject { build(:merge_request, target_project: project) }
+
+    before do
+      ci_commit.statuses << commit_status
+      allow(subject).to receive(:ci_commit) { ci_commit }
+    end
+
+    it "returns true if it's only allowed to merge green build and build has been failed" do
+      expect(subject.cannot_be_merged_because_build_failed?).to be_truthy
+    end
+
+    context 'when no ci_commit is associated' do
+      before do
+        allow(subject).to receive(:ci_commit) { nil }
+      end
+
+      it 'returns false' do
+        expect(subject.cannot_be_merged_because_build_failed?).to be_falsey
+      end
+    end
+
+    context "when isn't only allowed to merge green build at project settings" do
+      subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_build_succeeds: false)) }
+
+      it 'returns false' do
+        expect(subject.cannot_be_merged_because_build_failed?).to be_falsey
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 9da69a913a8..91c25a0948f 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -419,6 +419,14 @@ describe API::API, api: true  do
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
+    it "should return 405 if merge_request build is failed it's restrict to merge only when susccess" do
+      allow_any_instance_of(MergeRequest).to receive(:cannot_be_merged_because_build_failed?).and_return(true)
+
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
+      expect(response.status).to eq(405)
+      expect(json_response['message']).to eq('405 Method Not Allowed')
+    end
+
     it "should return 401 if user has no permissions to merge" do
       user2 = create(:user)
       project.team << [user2, :reporter]

From 6dff7c1771e0cfeb6906244649b3683090bc2929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 7 Jun 2016 13:01:34 +0200
Subject: [PATCH 1376/1431] Improve initial implementation of the
 'only_allow_merge_if_build_succeeds.rb' feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on the feedback from reviewers.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/merge_request.rb                   | 19 +++-
 .../merge_requests/widget/_open.html.haml     |  2 +-
 lib/api/merge_requests.rb                     |  5 +-
 .../only_allow_merge_if_build_succeeds.rb     | 92 +++++++++----------
 spec/models/merge_request_spec.rb             | 63 +++++++++----
 spec/requests/api/merge_requests_spec.rb      |  5 +-
 6 files changed, 113 insertions(+), 73 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 43c6bcb8715..949cafc065f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -260,13 +260,20 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def mergeable?
-    return false if !open? || work_in_progress? || broken?  || cannot_be_merged_because_build_failed?
-
-    check_if_can_be_merged
+    mergeable_state? && check_if_can_be_merged
 
     can_be_merged?
   end
 
+  def mergeable_state?
+    return false unless open?
+    return false if work_in_progress?
+    return false if broken?
+    return false if cannot_be_merged_because_build_is_not_success?
+
+    true
+  end
+
   def gitlab_merge_status
     if work_in_progress?
       "work_in_progress"
@@ -481,8 +488,10 @@ class MergeRequest < ActiveRecord::Base
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
 
-  def cannot_be_merged_because_build_failed?
-    project.only_allow_merge_if_build_succeeds? && ci_commit && ci_commit.failed?
+  def cannot_be_merged_because_build_is_not_success?
+    return false unless project.only_allow_merge_if_build_succeeds?
+
+    ci_commit && !ci_commit.success?
   end
 
   def state_human_name
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 8de587009e1..9ea4df4357f 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -17,7 +17,7 @@
       = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
     - elsif !@merge_request.can_be_merged_by?(current_user)
       = render 'projects/merge_requests/widget/open/not_allowed'
-    - elsif @merge_request.cannot_be_merged_because_build_failed?
+    - elsif @merge_request.cannot_be_merged_because_build_is_not_success? && @ci_commit && @ci_commit.failed?
       = render 'projects/merge_requests/widget/open/build_failed'
     - elsif @merge_request.can_be_merged?
       = render 'projects/merge_requests/widget/open/accept'
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 5822e19cd44..24df3e397e0 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -228,11 +228,10 @@ module API
           # Merge request can not be merged
           # because user dont have permissions to push into target branch
           unauthorized! unless merge_request.can_be_merged_by?(current_user)
-          not_allowed! if !merge_request.open? || merge_request.work_in_progress? || merge_request.cannot_be_merged_because_build_failed?
 
-          merge_request.check_if_can_be_merged
+          not_allowed! unless merge_request.mergeable_state?
 
-          render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged?
+          render_api_error!('Branch cannot be merged', 406) unless merge_request.mergeable?
 
           if params[:sha] && merge_request.source_sha != params[:sha]
             render_api_error!("SHA does not match HEAD of source branch: #{merge_request.source_sha}", 409)
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
index 1627aa7287a..52612c91824 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
@@ -1,99 +1,99 @@
 require 'spec_helper'
 
-feature 'Only allow merge requests to be merged if the build succeeds', feature: true, js: true do
-  let(:user) { create(:user) }
-
+feature 'Only allow merge requests to be merged if the build succeeds', feature: true do
   let(:project)       { create(:project, :public) }
-  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
+  let(:merge_request) { create(:merge_request_with_diffs, source_project: project) }
 
   before do
-    login_as user
+    login_as merge_request.author
 
-    project.team << [user, :master]
+    project.team << [merge_request.author, :master]
   end
 
-  context "project hasn't ci enabled" do
-    it "allows MR to be merged" do
+  context 'project does not have CI enabled' do
+    it 'allows MR to be merged' do
       visit_merge_request(merge_request)
-      expect(page).to have_button "Accept Merge Request"
+
+      expect(page).to have_button 'Accept Merge Request'
     end
   end
 
-  context "when project has ci enabled" do
-    let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
-    let!(:ci_build) { create(:ci_build, commit: ci_commit) }
+  context 'when project has CI enabled' do
+    let(:ci_commit) { create(:ci_empty_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
 
-    before do
-      project.enable_ci
-    end
-
-    context "when merge requests can only be merged if the build succeeds" do
+    context 'when merge requests can only be merged if the build succeeds' do
       before do
         project.update_attribute(:only_allow_merge_if_build_succeeds, true)
       end
 
-      context "when ci is running" do
-        it "doesn't allow to merge immediately" do
-          ci_commit.statuses.update_all(status: :pending)
+      context 'when CI is running' do
+        before { ci_commit.update_column(:status, :running) }
+
+        it 'does not allow to merge immediately' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button "Merge When Build Succeeds"
-          expect(page).to_not have_button "Select Merge Moment"
+          expect(page).to have_button 'Merge When Build Succeeds'
+          expect(page).not_to have_button 'Select Merge Moment'
         end
       end
 
-      context "when ci failed" do
-        it "doesn't allow MR to be merged" do
-          ci_commit.statuses.update_all(status: :failed)
+      context 'when CI failed' do
+        before { ci_commit.update_column(:status, :failed) }
+
+        it 'does not allow MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to_not have_button "Accept Merge Request"
-          expect(page).to have_content("Please retry the build or push code to fix the failure.")
+          expect(page).not_to have_button 'Accept Merge Request'
+          expect(page).to have_content('Please retry the build or push a new commit to fix the failure.')
         end
       end
 
-      context "when ci succeed" do
-        it "allows MR to be merged" do
-          ci_commit.statuses.update_all(status: :success)
+      context 'when CI succeeded' do
+        before { ci_commit.update_column(:status, :success) }
+
+        it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button "Accept Merge Request"
+          expect(page).to have_button 'Accept Merge Request'
         end
       end
     end
 
-    context "when merge requests can be merged when the build failed" do
+    context 'when merge requests can be merged when the build failed' do
       before do
         project.update_attribute(:only_allow_merge_if_build_succeeds, false)
       end
 
-      context "when ci is running" do
-        it "allows MR to be merged immediately" do
-          ci_commit.statuses.update_all(status: :pending)
+      context 'when CI is running' do
+        before { ci_commit.update_column(:status, :running) }
+
+        it 'allows MR to be merged immediately', js: true do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button "Merge When Build Succeeds"
+          expect(page).to have_button 'Merge When Build Succeeds'
 
-          click_button "Select Merge Moment"
-          expect(page).to have_content "Merge Immediately"
+          click_button 'Select Merge Moment'
+          expect(page).to have_content 'Merge Immediately'
         end
       end
 
-      context "when ci failed" do
-        it "allows MR to be merged" do
-          ci_commit.statuses.update_all(status: :failed)
+      context 'when CI failed' do
+        before { ci_commit.update_column(:status, :failed) }
+
+        it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button "Accept Merge Request"
+          expect(page).to have_button 'Accept Merge Request'
         end
       end
 
-      context "when ci succeed" do
-        it "allows MR to be merged" do
-          ci_commit.statuses.update_all(status: :success)
+      context 'when CI succeeded' do
+        before { ci_commit.update_column(:status, :success) }
+
+        it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button "Accept Merge Request"
+          expect(page).to have_button 'Accept Merge Request'
         end
       end
     end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 76912eed834..f8f1bbf3036 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -491,12 +491,39 @@ describe MergeRequest, models: true do
   end
 
   describe '#mergeable?' do
-    let(:project) { create(:project, only_allow_merge_if_build_succeeds: true) }
+    let(:project) { create(:project) }
 
     subject { create(:merge_request, source_project: project) }
 
-    it "checks if merge request can be merged" do
-      allow(subject).to receive(:cannot_be_merged_because_build_failed?) { false }
+    it 'calls mergeable_state?' do
+      expect(subject).to receive(:mergeable_state?)
+
+      expect(subject.mergeable?).to be_truthy
+    end
+
+    it 'calls check_if_can_be_merged' do
+      allow(subject).to receive(:mergeable_state?) { true }
+      expect(subject).to receive(:check_if_can_be_merged)
+
+      expect(subject.mergeable?).to be_truthy
+    end
+
+    it 'calls can_be_merged?' do
+      allow(subject).to receive(:mergeable_state?) { true }
+      allow(subject).to receive(:can_be_merged?) { true }
+      expect(subject).to receive(:check_if_can_be_merged)
+
+      expect(subject.mergeable?).to be_truthy
+    end
+  end
+
+  describe '#mergeable_state?' do
+    let(:project) { create(:project) }
+
+    subject { create(:merge_request, source_project: project) }
+
+    it 'checks if merge request can be merged' do
+      allow(subject).to receive(:cannot_be_merged_because_build_is_not_success?) { false }
       expect(subject).to receive(:check_if_can_be_merged)
 
       subject.mergeable?
@@ -506,7 +533,7 @@ describe MergeRequest, models: true do
       before { subject.close }
 
       it 'returns false' do
-        expect(subject.mergeable?).to be_falsey
+        expect(subject.mergeable_state?).to be_falsey
       end
     end
 
@@ -514,7 +541,7 @@ describe MergeRequest, models: true do
       before { subject.title = 'WIP MR' }
 
       it 'returns false' do
-        expect(subject.mergeable?).to be_falsey
+        expect(subject.mergeable_state?).to be_falsey
       end
     end
 
@@ -522,23 +549,27 @@ describe MergeRequest, models: true do
       before { allow(subject).to receive(:broken?) { true } }
 
       it 'returns false' do
-        expect(subject.mergeable?).to be_falsey
+        expect(subject.mergeable_state?).to be_falsey
       end
     end
 
     context 'when failed' do
       before { allow(subject).to receive(:broken?) { false } }
 
-      context "when project settings restrict to merge only if build succeeds" do
-        before { allow(subject).to receive(:cannot_be_merged_because_build_failed?) { true } }
-        it 'returns false if project settings restrict to merge only if build succeeds' do
-          expect(subject.mergeable?).to be_falsey
+      context 'when project settings restrict to merge only if build succeeds and build failed' do
+        before do
+          project.only_allow_merge_if_build_succeeds = true
+          allow(subject).to receive(:cannot_be_merged_because_build_is_not_success?) { true }
+        end
+
+        it 'returns false' do
+          expect(subject.mergeable_state?).to be_falsey
         end
       end
     end
   end
 
-  describe '#cannot_be_merged_because_build_failed?' do
+  describe '#cannot_be_merged_because_build_is_not_success?' do
     let(:project) { create(:empty_project, only_allow_merge_if_build_succeeds: true) }
     let(:commit_status) { create(:commit_status, status: 'failed', project: project) }
     let(:ci_commit) { create(:ci_empty_pipeline) }
@@ -550,8 +581,8 @@ describe MergeRequest, models: true do
       allow(subject).to receive(:ci_commit) { ci_commit }
     end
 
-    it "returns true if it's only allowed to merge green build and build has been failed" do
-      expect(subject.cannot_be_merged_because_build_failed?).to be_truthy
+    it 'returns true if it is only allowed to merge green build and build has been failed' do
+      expect(subject.cannot_be_merged_because_build_is_not_success?).to be_truthy
     end
 
     context 'when no ci_commit is associated' do
@@ -560,15 +591,15 @@ describe MergeRequest, models: true do
       end
 
       it 'returns false' do
-        expect(subject.cannot_be_merged_because_build_failed?).to be_falsey
+        expect(subject.cannot_be_merged_because_build_is_not_success?).to be_falsey
       end
     end
 
-    context "when isn't only allowed to merge green build at project settings" do
+    context 'when is not only allowed to merge green build at project settings' do
       subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_build_succeeds: false)) }
 
       it 'returns false' do
-        expect(subject.cannot_be_merged_because_build_failed?).to be_falsey
+        expect(subject.cannot_be_merged_because_build_is_not_success?).to be_falsey
       end
     end
   end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 91c25a0948f..a52148e8b83 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -419,10 +419,11 @@ describe API::API, api: true  do
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
-    it "should return 405 if merge_request build is failed it's restrict to merge only when susccess" do
-      allow_any_instance_of(MergeRequest).to receive(:cannot_be_merged_because_build_failed?).and_return(true)
+    it 'returns 405 if the build failed for a merge request that requires success' do
+      allow_any_instance_of(MergeRequest).to receive(:cannot_be_merged_because_build_is_not_success?).and_return(true)
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
+
       expect(response.status).to eq(405)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end

From 282674c1108bdd761f4027910a32396fe253bc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 7 Jun 2016 13:02:55 +0200
Subject: [PATCH 1377/1431] Add documentation for the
 'only_allow_merge_if_build_succeeds.rb' feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 doc/workflow/merge_requests.md                  |  11 +++++++++++
 .../only_allow_merge_if_build_succeeds.png      | Bin 0 -> 17552 bytes
 2 files changed, 11 insertions(+)
 create mode 100644 doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png

diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
index 1b5718c91c1..d2ec56e6504 100644
--- a/doc/workflow/merge_requests.md
+++ b/doc/workflow/merge_requests.md
@@ -2,6 +2,17 @@
 
 Merge requests allow you to exchange changes you made to source code
 
+## Only allow merge requests to be merged if the build succeeds
+
+You can prevent merge requests from being merged if their build did not succeed
+in the project settings page.
+
+![only_allow_merge_if_build_succeeds](merge_requests/only_allow_merge_if_build_succeeds.png)
+
+Navigate to project settings page and select the `Only allow merge requests to be merged if the build succeeds` check box.
+
+Please note that you need to have builds configured to enable this feature.
+
 ## Checkout merge requests locally
 
 Locate the section for your GitLab remote in the `.git/config` file. It looks like this:
diff --git a/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png b/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png
new file mode 100644
index 0000000000000000000000000000000000000000..18bebf5fe9269fdb393b8c7bd1a548b57a876707
GIT binary patch
literal 17552
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
CFyu!7

literal 0
HcmV?d00001


From 5324c9364346f74ea73c6be27785704e8e2281f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 9 Jun 2016 16:08:38 +0200
Subject: [PATCH 1378/1431] Rename
 MergeRequest#cannot_be_merged_because_build_is_not_success? to
 #mergeable_ci_state?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The logic of the method was obviously inverted.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/merge_request.rb                   | 12 ++--
 .../merge_requests/widget/_open.html.haml     |  2 +-
 db/schema.rb                                  | 36 +++++-----
 spec/models/merge_request_spec.rb             | 69 ++++++++++---------
 spec/requests/api/merge_requests_spec.rb      |  2 +-
 5 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 949cafc065f..f919cfe697e 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -260,7 +260,9 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def mergeable?
-    mergeable_state? && check_if_can_be_merged
+    return false unless mergeable_state?
+
+    check_if_can_be_merged
 
     can_be_merged?
   end
@@ -269,7 +271,7 @@ class MergeRequest < ActiveRecord::Base
     return false unless open?
     return false if work_in_progress?
     return false if broken?
-    return false if cannot_be_merged_because_build_is_not_success?
+    return false unless mergeable_ci_state?
 
     true
   end
@@ -488,10 +490,10 @@ class MergeRequest < ActiveRecord::Base
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
 
-  def cannot_be_merged_because_build_is_not_success?
-    return false unless project.only_allow_merge_if_build_succeeds?
+  def mergeable_ci_state?
+    return true unless project.only_allow_merge_if_build_succeeds?
 
-    ci_commit && !ci_commit.success?
+    !ci_commit || ci_commit.success?
   end
 
   def state_human_name
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 9ea4df4357f..84fbf618ec6 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -17,7 +17,7 @@
       = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
     - elsif !@merge_request.can_be_merged_by?(current_user)
       = render 'projects/merge_requests/widget/open/not_allowed'
-    - elsif @merge_request.cannot_be_merged_because_build_is_not_success? && @ci_commit && @ci_commit.failed?
+    - elsif !@merge_request.mergeable_ci_state? && @ci_commit && @ci_commit.failed?
       = render 'projects/merge_requests/widget/open/build_failed'
     - elsif @merge_request.can_be_merged?
       = render 'projects/merge_requests/widget/open/accept'
diff --git a/db/schema.rb b/db/schema.rb
index 03070f0d593..09ff52ccc8e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -747,39 +747,39 @@ ActiveRecord::Schema.define(version: 20160608155312) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"
-    t.boolean  "issues_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  "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  "public_builds",                default: true,     null: false
-    t.integer  "pushes_since_gc",              default: 0
+    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
+    t.integer  "pushes_since_gc",                    default: 0
     t.boolean  "last_repository_check_failed"
     t.datetime "last_repository_check_at"
     t.boolean  "container_registry_enabled"
-    t.boolean  "only_allow_merge_if_build_succeeds", default: false
+    t.boolean  "only_allow_merge_if_build_succeeds", default: false,    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/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index f8f1bbf3036..c543cbcfabd 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -495,23 +495,16 @@ describe MergeRequest, models: true do
 
     subject { create(:merge_request, source_project: project) }
 
-    it 'calls mergeable_state?' do
-      expect(subject).to receive(:mergeable_state?)
+    it 'returns false if #mergeable_state? is false' do
+      expect(subject).to receive(:mergeable_state?) { false }
 
-      expect(subject.mergeable?).to be_truthy
+      expect(subject.mergeable?).to be_falsey
     end
 
-    it 'calls check_if_can_be_merged' do
+    it 'return true if #mergeable_state? is true and the MR #can_be_merged? is true' do
       allow(subject).to receive(:mergeable_state?) { true }
       expect(subject).to receive(:check_if_can_be_merged)
-
-      expect(subject.mergeable?).to be_truthy
-    end
-
-    it 'calls can_be_merged?' do
-      allow(subject).to receive(:mergeable_state?) { true }
-      allow(subject).to receive(:can_be_merged?) { true }
-      expect(subject).to receive(:check_if_can_be_merged)
+      expect(subject).to receive(:can_be_merged?) { true }
 
       expect(subject.mergeable?).to be_truthy
     end
@@ -523,7 +516,7 @@ describe MergeRequest, models: true do
     subject { create(:merge_request, source_project: project) }
 
     it 'checks if merge request can be merged' do
-      allow(subject).to receive(:cannot_be_merged_because_build_is_not_success?) { false }
+      allow(subject).to receive(:mergeable_ci_state?) { true }
       expect(subject).to receive(:check_if_can_be_merged)
 
       subject.mergeable?
@@ -559,7 +552,7 @@ describe MergeRequest, models: true do
       context 'when project settings restrict to merge only if build succeeds and build failed' do
         before do
           project.only_allow_merge_if_build_succeeds = true
-          allow(subject).to receive(:cannot_be_merged_because_build_is_not_success?) { true }
+          allow(subject).to receive(:mergeable_ci_state?) { false }
         end
 
         it 'returns false' do
@@ -569,37 +562,49 @@ describe MergeRequest, models: true do
     end
   end
 
-  describe '#cannot_be_merged_because_build_is_not_success?' do
+  describe '#mergeable_ci_state?' do
     let(:project) { create(:empty_project, only_allow_merge_if_build_succeeds: true) }
-    let(:commit_status) { create(:commit_status, status: 'failed', project: project) }
     let(:ci_commit) { create(:ci_empty_pipeline) }
 
     subject { build(:merge_request, target_project: project) }
 
-    before do
-      ci_commit.statuses << commit_status
-      allow(subject).to receive(:ci_commit) { ci_commit }
-    end
+    context 'when it is only allowed to merge when build is green' do
+      context 'and a failed ci_commit is associated' do
+        before do
+          ci_commit.statuses << create(:commit_status, status: 'failed', project: project)
+          allow(subject).to receive(:ci_commit) { ci_commit }
+        end
 
-    it 'returns true if it is only allowed to merge green build and build has been failed' do
-      expect(subject.cannot_be_merged_because_build_is_not_success?).to be_truthy
-    end
-
-    context 'when no ci_commit is associated' do
-      before do
-        allow(subject).to receive(:ci_commit) { nil }
+        it { expect(subject.mergeable_ci_state?).to be_falsey }
       end
 
-      it 'returns false' do
-        expect(subject.cannot_be_merged_because_build_is_not_success?).to be_falsey
+      context 'when no ci_commit is associated' do
+        before do
+          allow(subject).to receive(:ci_commit) { nil }
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
       end
     end
 
-    context 'when is not only allowed to merge green build at project settings' do
+    context 'when merges are not restricted to green builds' do
       subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_build_succeeds: false)) }
 
-      it 'returns false' do
-        expect(subject.cannot_be_merged_because_build_is_not_success?).to be_falsey
+      context 'and a failed ci_commit is associated' do
+        before do
+          ci_commit.statuses << create(:commit_status, status: 'failed', project: project)
+          allow(subject).to receive(:ci_commit) { ci_commit }
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
+      end
+
+      context 'when no ci_commit is associated' do
+        before do
+          allow(subject).to receive(:ci_commit) { nil }
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
       end
     end
   end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index a52148e8b83..1356f87b0e9 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -420,7 +420,7 @@ describe API::API, api: true  do
     end
 
     it 'returns 405 if the build failed for a merge request that requires success' do
-      allow_any_instance_of(MergeRequest).to receive(:cannot_be_merged_because_build_is_not_success?).and_return(true)
+      allow_any_instance_of(MergeRequest).to receive(:mergeable_ci_state?).and_return(false)
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 

From 34bef254644b4ecda4ac61a82447a23f081aeca0 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 8 Jun 2016 20:03:19 +0200
Subject: [PATCH 1379/1431] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index b00c149a753..c0918cfb9f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -70,6 +70,7 @@ v 8.8.5 (unreleased)
   - Import GitHub repositories respecting the API rate limit
   - Fix importer for GitHub comments on diff
   - Disable Webhooks before proceeding with the GitHub import
+  - Fix incremental trace upload API when using multi-byte UTF-8 chars in trace
 
 v 8.8.4
   - Fix LDAP-based login for users with 2FA enabled. !4493

From 3579edba1f0d27095502775c64bdd73a3927dca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 10 Jun 2016 14:41:38 +0200
Subject: [PATCH 1380/1431] Rename ci_commit -> pipeline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/merge_request.rb                   |  2 +-
 .../merge_requests/widget/_open.html.haml     |  2 +-
 .../only_allow_merge_if_build_succeeds.rb     | 14 ++++++------
 spec/models/merge_request_spec.rb             | 22 +++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index f919cfe697e..29f36570912 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -493,7 +493,7 @@ class MergeRequest < ActiveRecord::Base
   def mergeable_ci_state?
     return true unless project.only_allow_merge_if_build_succeeds?
 
-    !ci_commit || ci_commit.success?
+    !pipeline || pipeline.success?
   end
 
   def state_human_name
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 84fbf618ec6..0e0af57d76e 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -17,7 +17,7 @@
       = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
     - elsif !@merge_request.can_be_merged_by?(current_user)
       = render 'projects/merge_requests/widget/open/not_allowed'
-    - elsif !@merge_request.mergeable_ci_state? && @ci_commit && @ci_commit.failed?
+    - elsif !@merge_request.mergeable_ci_state? && @pipeline && @pipeline.failed?
       = render 'projects/merge_requests/widget/open/build_failed'
     - elsif @merge_request.can_be_merged?
       = render 'projects/merge_requests/widget/open/accept'
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
index 52612c91824..65e9185ec24 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
@@ -19,7 +19,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
   end
 
   context 'when project has CI enabled' do
-    let(:ci_commit) { create(:ci_empty_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+    let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
 
     context 'when merge requests can only be merged if the build succeeds' do
       before do
@@ -27,7 +27,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
       end
 
       context 'when CI is running' do
-        before { ci_commit.update_column(:status, :running) }
+        before { pipeline.update_column(:status, :running) }
 
         it 'does not allow to merge immediately' do
           visit_merge_request(merge_request)
@@ -38,7 +38,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
       end
 
       context 'when CI failed' do
-        before { ci_commit.update_column(:status, :failed) }
+        before { pipeline.update_column(:status, :failed) }
 
         it 'does not allow MR to be merged' do
           visit_merge_request(merge_request)
@@ -49,7 +49,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
       end
 
       context 'when CI succeeded' do
-        before { ci_commit.update_column(:status, :success) }
+        before { pipeline.update_column(:status, :success) }
 
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
@@ -65,7 +65,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
       end
 
       context 'when CI is running' do
-        before { ci_commit.update_column(:status, :running) }
+        before { pipeline.update_column(:status, :running) }
 
         it 'allows MR to be merged immediately', js: true do
           visit_merge_request(merge_request)
@@ -78,7 +78,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
       end
 
       context 'when CI failed' do
-        before { ci_commit.update_column(:status, :failed) }
+        before { pipeline.update_column(:status, :failed) }
 
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
@@ -88,7 +88,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
       end
 
       context 'when CI succeeded' do
-        before { ci_commit.update_column(:status, :success) }
+        before { pipeline.update_column(:status, :success) }
 
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index c543cbcfabd..3b199f4d98d 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -564,23 +564,23 @@ describe MergeRequest, models: true do
 
   describe '#mergeable_ci_state?' do
     let(:project) { create(:empty_project, only_allow_merge_if_build_succeeds: true) }
-    let(:ci_commit) { create(:ci_empty_pipeline) }
+    let(:pipeline) { create(:ci_empty_pipeline) }
 
     subject { build(:merge_request, target_project: project) }
 
     context 'when it is only allowed to merge when build is green' do
-      context 'and a failed ci_commit is associated' do
+      context 'and a failed pipeline is associated' do
         before do
-          ci_commit.statuses << create(:commit_status, status: 'failed', project: project)
-          allow(subject).to receive(:ci_commit) { ci_commit }
+          pipeline.statuses << create(:commit_status, status: 'failed', project: project)
+          allow(subject).to receive(:pipeline) { pipeline }
         end
 
         it { expect(subject.mergeable_ci_state?).to be_falsey }
       end
 
-      context 'when no ci_commit is associated' do
+      context 'when no pipeline is associated' do
         before do
-          allow(subject).to receive(:ci_commit) { nil }
+          allow(subject).to receive(:pipeline) { nil }
         end
 
         it { expect(subject.mergeable_ci_state?).to be_truthy }
@@ -590,18 +590,18 @@ describe MergeRequest, models: true do
     context 'when merges are not restricted to green builds' do
       subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_build_succeeds: false)) }
 
-      context 'and a failed ci_commit is associated' do
+      context 'and a failed pipeline is associated' do
         before do
-          ci_commit.statuses << create(:commit_status, status: 'failed', project: project)
-          allow(subject).to receive(:ci_commit) { ci_commit }
+          pipeline.statuses << create(:commit_status, status: 'failed', project: project)
+          allow(subject).to receive(:pipeline) { pipeline }
         end
 
         it { expect(subject.mergeable_ci_state?).to be_truthy }
       end
 
-      context 'when no ci_commit is associated' do
+      context 'when no pipeline is associated' do
         before do
-          allow(subject).to receive(:ci_commit) { nil }
+          allow(subject).to receive(:pipeline) { nil }
         end
 
         it { expect(subject.mergeable_ci_state?).to be_truthy }

From 0e896ffe4eebb8bcf04bc1327d498bb041faed56 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 10 Jun 2016 14:51:16 +0200
Subject: [PATCH 1381/1431] Improve Gitlab::Auth method names

Auth.find was a very generic name for a very specific method.
Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also
looks in Kerberos.
---
 app/controllers/jwt_controller.rb               |  2 +-
 app/controllers/projects/git_http_controller.rb |  2 +-
 config/initializers/doorkeeper.rb               |  2 +-
 lib/api/session.rb                              |  2 +-
 lib/gitlab/auth.rb                              |  6 +++---
 lib/gitlab/backend/grack_auth.rb                |  2 +-
 spec/lib/gitlab/auth_spec.rb                    | 16 ++++++++--------
 spec/requests/jwt_controller_spec.rb            |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 131a16dad9b..014b9b43ff2 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -42,7 +42,7 @@ class JwtController < ApplicationController
   end
 
   def authenticate_user(login, password)
-    user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
+    user = Gitlab::Auth.find_with_user_password(login, password)
     Gitlab::Auth.rate_limit!(request.ip, success: user.present?, login: login)
     user
   end
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 348d6cf4d96..f907d63258b 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -43,7 +43,7 @@ class Projects::GitHttpController < Projects::ApplicationController
     return if project && project.public? && upload_pack?
 
     authenticate_or_request_with_http_basic do |login, password|
-      auth_result = Gitlab::Auth.find(login, password, project: project, ip: request.ip)
+      auth_result = Gitlab::Auth.find_for_git_client(login, password, project: project, ip: request.ip)
 
       if auth_result.type == :ci && upload_pack?
         @ci = true
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 8dc8e270afc..618dba74151 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -12,7 +12,7 @@ Doorkeeper.configure do
   end
 
   resource_owner_from_credentials do |routes|
-    Gitlab::Auth.find_in_gitlab_or_ldap(params[:username], params[:password])
+    Gitlab::Auth.find_with_user_password(params[:username], params[:password])
   end
 
   # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
diff --git a/lib/api/session.rb b/lib/api/session.rb
index 56e69b2366f..56c202f1294 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,7 +11,7 @@ module API
     # Example Request:
     #  POST /session
     post "/session" do
-      user = Gitlab::Auth.find_in_gitlab_or_ldap(params[:email] || params[:login], params[:password])
+      user = Gitlab::Auth.find_with_user_password(params[:email] || params[:login], params[:password])
 
       return unauthorized! unless user
       present user, with: Entities::UserLogin
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 076e2af7d38..db1704af75e 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -3,14 +3,14 @@ module Gitlab
     Result = Struct.new(:user, :type)
 
     class << self
-      def find(login, password, project:, ip:)
+      def find_for_git_client(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?
 
         result = Result.new
 
         if valid_ci_request?(login, password, project)
           result.type = :ci
-        elsif result.user = find_in_gitlab_or_ldap(login, password)
+        elsif result.user = find_with_user_password(login, password)
           result.type = :gitlab_or_ldap
         elsif result.user = oauth_access_token_check(login, password)
           result.type = :oauth
@@ -20,7 +20,7 @@ module Gitlab
         result
       end
 
-      def find_in_gitlab_or_ldap(login, password)
+      def find_with_user_password(login, password)
         user = User.by_login(login)
 
         # If no user is found, or it's an LDAP server, try LDAP.
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index 9e09d2e118d..adbf5941a96 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -95,7 +95,7 @@ module Grack
     end
 
     def authenticate_user(login, password)
-      user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
+      user = Gitlab::Auth.find_with_user_password(login, password)
 
       unless user
         user = oauth_access_token_check(login, password)
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index a814ad2a4e7..f081d550ec8 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -41,7 +41,7 @@ describe Gitlab::Auth, lib: true do
     end
   end
 
-  describe 'find_in_gitlab_or_ldap' do
+  describe 'find_with_user_password' do
     let!(:user) do
       create(:user,
         username: username,
@@ -52,25 +52,25 @@ describe Gitlab::Auth, lib: true do
     let(:password) { 'my-secret' }
 
     it "should find user by valid login/password" do
-      expect( gl_auth.find_in_gitlab_or_ldap(username, password) ).to eql user
+      expect( gl_auth.find_with_user_password(username, password) ).to eql user
     end
 
     it 'should find user by valid email/password with case-insensitive email' do
-      expect(gl_auth.find_in_gitlab_or_ldap(user.email.upcase, password)).to eql user
+      expect(gl_auth.find_with_user_password(user.email.upcase, password)).to eql user
     end
 
     it 'should find user by valid username/password with case-insensitive username' do
-      expect(gl_auth.find_in_gitlab_or_ldap(username.upcase, password)).to eql user
+      expect(gl_auth.find_with_user_password(username.upcase, password)).to eql user
     end
 
     it "should not find user with invalid password" do
       password = 'wrong'
-      expect( gl_auth.find_in_gitlab_or_ldap(username, password) ).not_to eql user
+      expect( gl_auth.find_with_user_password(username, password) ).not_to eql user
     end
 
     it "should not find user with invalid login" do
       user = 'wrong'
-      expect( gl_auth.find_in_gitlab_or_ldap(username, password) ).not_to eql user
+      expect( gl_auth.find_with_user_password(username, password) ).not_to eql user
     end
 
     context "with ldap enabled" do
@@ -81,13 +81,13 @@ describe Gitlab::Auth, lib: true do
       it "tries to autheticate with db before ldap" do
         expect(Gitlab::LDAP::Authentication).not_to receive(:login)
 
-        gl_auth.find_in_gitlab_or_ldap(username, password)
+        gl_auth.find_with_user_password(username, password)
       end
 
       it "uses ldap as fallback to for authentication" do
         expect(Gitlab::LDAP::Authentication).to receive(:login)
 
-        gl_auth.find_in_gitlab_or_ldap('ldap_user', 'password')
+        gl_auth.find_with_user_password('ldap_user', 'password')
       end
     end
   end
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index c995993a853..d2d4a9eca18 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -44,7 +44,7 @@ describe JwtController do
       let(:user) { create(:user) }
       let(:headers) { { authorization: credentials('user', 'password') } }
 
-      before { expect(Gitlab::Auth).to receive(:find_in_gitlab_or_ldap).with('user', 'password').and_return(user) }
+      before { expect(Gitlab::Auth).to receive(:find_with_user_password).with('user', 'password').and_return(user) }
 
       subject! { get '/jwt/auth', parameters, headers }
 

From 16927e3fadfb5b9b2c3b12ffdf7ab217971b8cca Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 30 May 2016 11:05:17 +0200
Subject: [PATCH 1382/1431] Enable Style/MultilineBlockChain rubocop style cop

See #17478
---
 .rubocop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 678f7db025b..72db0342543 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -348,7 +348,7 @@ Style/MultilineArrayBraceLayout:
 
 # Avoid multi-line chains of blocks.
 Style/MultilineBlockChain:
-  Enabled: false
+  Enabled: true
 
 # Ensures newlines after multiline block do statements.
 Style/MultilineBlockLayout:

From 49c06ba39133ea3f3468729d661264f77219d251 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 10 Jun 2016 14:17:10 +0100
Subject: [PATCH 1383/1431] Only show issues closing MR when present

---
 app/views/projects/issues/_merge_requests.html.haml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index 75f36579b11..d8075371853 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -24,8 +24,6 @@
             MERGED
           - elsif merge_request.closed?
             CLOSED
-    %li
-      = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
     - if @closed_by_merge_requests.present?
       %li
         = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}

From 998c688699db68a6dd1fb5e6459b1a787deabcef Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 10 Jun 2016 12:07:37 +0100
Subject: [PATCH 1384/1431] Updated tests

---
 spec/features/builds_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 0c865e915cb..b8ecc356b4d 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -184,7 +184,7 @@ describe "Builds" do
         @build.run!
         @build.trace = 'BUILD TRACE'
         visit namespace_project_build_path(@project.namespace, @project, @build)
-        page.within('.build-controls') { click_link 'Raw' }
+        page.within('.js-build-sidebar') { click_link 'Raw' }
       end
 
       it 'sends the right headers' do

From c7941acd1e410fedb431efe13dc3b74dfa7f9f8a Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 10 Jun 2016 14:22:50 +0100
Subject: [PATCH 1385/1431] Don't try to count a relation with aliases

98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
---
 app/views/dashboard/issues.atom.builder      | 4 ++--
 app/views/groups/issues.atom.builder         | 4 ++--
 app/views/projects/issues/index.atom.builder | 4 ++--
 app/views/shared/_merge_requests.html.haml   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/dashboard/issues.atom.builder b/app/views/dashboard/issues.atom.builder
index 83c0c6da21b..0404d0728ea 100644
--- a/app/views/dashboard/issues.atom.builder
+++ b/app/views/dashboard/issues.atom.builder
@@ -4,7 +4,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.link    href: issues_dashboard_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
   xml.link    href: issues_dashboard_url, rel: "alternate", type: "text/html"
   xml.id      issues_dashboard_url
-  xml.updated @issues.first.created_at.xmlschema if @issues.any?
+  xml.updated @issues.first.created_at.xmlschema if @issues.reorder(nil).any?
 
-  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
 end
diff --git a/app/views/groups/issues.atom.builder b/app/views/groups/issues.atom.builder
index c19671295af..b1628040325 100644
--- a/app/views/groups/issues.atom.builder
+++ b/app/views/groups/issues.atom.builder
@@ -4,7 +4,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.link    href: issues_group_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
   xml.link    href: issues_group_url, rel: "alternate", type: "text/html"
   xml.id      issues_group_url
-  xml.updated @issues.first.created_at.xmlschema if @issues.any?
+  xml.updated @issues.first.created_at.xmlschema if @issues.reorder(nil).any?
 
-  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
 end
diff --git a/app/views/projects/issues/index.atom.builder b/app/views/projects/issues/index.atom.builder
index 7ad7c9c87e8..36957560de0 100644
--- a/app/views/projects/issues/index.atom.builder
+++ b/app/views/projects/issues/index.atom.builder
@@ -4,7 +4,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.link    href: namespace_project_issues_url(@project.namespace, @project, format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
   xml.link    href: namespace_project_issues_url(@project.namespace, @project), rel: "alternate", type: "text/html"
   xml.id      namespace_project_issues_url(@project.namespace, @project)
-  xml.updated @issues.first.created_at.xmlschema if @issues.any?
+  xml.updated @issues.first.created_at.xmlschema if @issues.reorder(nil).any?
 
-  xml << render(partial: 'issues/issue', collection: @issues) if @issues.any?
+  xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any?
 end
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index e74fc36c797..ca3178395c1 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -1,4 +1,4 @@
-- if @merge_requests.any?
+- if @merge_requests.reorder(nil).any?
   - @merge_requests.group_by(&:target_project).each do |group|
     .panel.panel-default.panel-small
       - project = group[0]

From 24920bc52a5658dd1d16d38ba3dc46f92dfe7675 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 8 Jun 2016 17:03:51 +0200
Subject: [PATCH 1386/1431] Add Project.where_paths_in

This method can be used to find multiple projects for multiple paths.
For example, take this snippet:

    Project.where_paths_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee})

This will return an ActiveRecord::Relation containing the GitLab CE and
GitLab EE projects.

This method takes care of matching rows both case-sensitively and
case-insensitively where needed.

Project.find_with_namespace in turn has been modified to use
Project.where_paths_in without nuking any scoping (instead it uses
reorder(nil)). This means that any default scopes (e.g. those used for
"pending_delete" stay intact).

The method Project.where_paths_in was added so the various Markdown
filters can use a single query to grab all the projects referenced in a
set of documents, something Project.find_with_namespace didn't allow.
---
 app/models/project.rb       | 71 +++++++++++++++++++++++++++++++------
 spec/models/project_spec.rb | 33 +++++++++++++++++
 2 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index f47ef8a81de..7bee7550d6c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -253,20 +253,69 @@ class Project < ActiveRecord::Base
       non_archived.where(table[:name].matches(pattern))
     end
 
-    def find_with_namespace(id)
-      namespace_path, project_path = id.split('/', 2)
+    # Finds a single project for the given path.
+    #
+    # path - The full project path (including namespace path).
+    #
+    # Returns a Project, or nil if no project could be found.
+    def find_with_namespace(path)
+      where_paths_in([path]).reorder(nil).take
+    end
 
-      return nil if !namespace_path || !project_path
+    # Builds a relation to find multiple projects by their full paths.
+    #
+    # Each path must be in the following format:
+    #
+    #     namespace_path/project_path
+    #
+    # For example:
+    #
+    #     gitlab-org/gitlab-ce
+    #
+    # Usage:
+    #
+    #     Project.where_paths_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee})
+    #
+    # This would return the projects with the full paths matching the values
+    # given.
+    #
+    # paths - An Array of full paths (namespace path + project path) for which
+    #         to find the projects.
+    #
+    # Returns an ActiveRecord::Relation.
+    def where_paths_in(paths)
+      wheres = []
+      cast_lower = Gitlab::Database.postgresql?
 
-      # Use of unscoped ensures we're not secretly adding any ORDER BYs, which
-      # have a negative impact on performance (and aren't needed for this
-      # query).
-      projects = unscoped.
-        joins(:namespace).
-        iwhere('namespaces.path' => namespace_path)
+      paths.each do |path|
+        namespace_path, project_path = path.split('/', 2)
 
-      projects.find_by('projects.path' => project_path) ||
-        projects.iwhere('projects.path' => project_path).take
+        next unless namespace_path && project_path
+
+        namespace_path = connection.quote(namespace_path)
+        project_path = connection.quote(project_path)
+
+        where = "(namespaces.path = #{namespace_path}
+          AND projects.path = #{project_path})"
+
+        if cast_lower
+          where = "(
+            #{where}
+            OR (
+              LOWER(namespaces.path) = LOWER(#{namespace_path})
+              AND LOWER(projects.path) = LOWER(#{project_path})
+            )
+          )"
+        end
+
+        wheres << where
+      end
+
+      if wheres.empty?
+        none
+      else
+        joins(:namespace).where(wheres.join(' OR '))
+      end
     end
 
     def visibility_levels
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 553556ed326..f687e3171a7 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -859,4 +859,37 @@ describe Project, models: true do
       it { is_expected.to be_falsey }
     end
   end
+
+  describe '.where_paths_in' do
+    context 'without any paths' do
+      it 'returns an empty relation' do
+        expect(Project.where_paths_in([])).to eq([])
+      end
+    end
+
+    context 'without any valid paths' do
+      it 'returns an empty relation' do
+        expect(Project.where_paths_in(%w[foo])).to eq([])
+      end
+    end
+
+    context 'with valid paths' do
+      let!(:project1) { create(:project) }
+      let!(:project2) { create(:project) }
+
+      it 'returns the projects matching the paths' do
+        projects = Project.where_paths_in([project1.path_with_namespace,
+                                           project2.path_with_namespace])
+
+        expect(projects).to contain_exactly(project1, project2)
+      end
+
+      it 'returns projects regardless of the casing of paths' do
+        projects = Project.where_paths_in([project1.path_with_namespace.upcase,
+                                           project2.path_with_namespace.upcase])
+
+        expect(projects).to contain_exactly(project1, project2)
+      end
+    end
+  end
 end

From 136a4ea39bb82d7e88b79a3bb7b2f3b4a5ec42ab Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Fri, 3 Jun 2016 10:21:18 +0200
Subject: [PATCH 1387/1431] Cache the presence of an issue_tracker at project
 level

Using update_column to store the boolean flag to avoid
any side effects with the current state of the project
instance
---
 CHANGELOG                                     |  1 +
 app/models/project.rb                         | 18 +++++-
 app/models/service.rb                         | 10 +++
 ..._has_external_issue_tracker_to_projects.rb | 10 +++
 db/schema.rb                                  |  1 +
 spec/models/project_spec.rb                   | 63 +++++++++++++++++++
 spec/models/service_spec.rb                   | 33 ++++++++++
 7 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20160603075128_add_has_external_issue_tracker_to_projects.rb

diff --git a/CHANGELOG b/CHANGELOG
index 1c64739f701..0c712b445a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -62,6 +62,7 @@ v 8.9.0 (unreleased)
   - Markdown editor now correctly resets the input value on edit cancellation !4175
   - Toggling a task list item in a issue/mr description does not creates a Todo for mentions
   - Improved UX of date pickers on issue & milestone forms
+  - Cache on the database if a project has an active external issue tracker.
 
 v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
diff --git a/app/models/project.rb b/app/models/project.rb
index f47ef8a81de..472e79cfcf8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -523,9 +523,21 @@ class Project < ActiveRecord::Base
   end
 
   def external_issue_tracker
-    return @external_issue_tracker if defined?(@external_issue_tracker)
-    @external_issue_tracker ||=
-      services.issue_trackers.active.without_defaults.first
+    if has_external_issue_tracker.nil? # To populate existing projects
+      cache_has_external_issue_tracker
+    end
+
+    if has_external_issue_tracker?
+      return @external_issue_tracker if defined?(@external_issue_tracker)
+
+      @external_issue_tracker = services.external_issue_trackers.first
+    else
+      nil
+    end
+  end
+
+  def cache_has_external_issue_tracker
+    update_column(:has_external_issue_tracker, services.external_issue_trackers.any?)
   end
 
   def can_have_issues_tracker_id?
diff --git a/app/models/service.rb b/app/models/service.rb
index de3fd24584a..bf352397509 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -16,6 +16,7 @@ class Service < ActiveRecord::Base
   after_initialize :initialize_properties
 
   after_commit :reset_updated_properties
+  after_commit :cache_project_has_external_issue_tracker
 
   belongs_to :project
   has_one :service_hook
@@ -34,6 +35,7 @@ class Service < ActiveRecord::Base
   scope :note_hooks, -> { where(note_events: true, active: true) }
   scope :build_hooks, -> { where(build_events: true, active: true) }
   scope :wiki_page_hooks, -> { where(wiki_page_events: true, active: true) }
+  scope :external_issue_trackers, -> { issue_trackers.active.without_defaults }
 
   default_value_for :category, 'common'
 
@@ -192,4 +194,12 @@ class Service < ActiveRecord::Base
     service.project_id = project_id
     service if service.save
   end
+
+  private
+
+  def cache_project_has_external_issue_tracker
+    if project && !project.destroyed?
+      project.cache_has_external_issue_tracker
+    end
+  end
 end
diff --git a/db/migrate/20160603075128_add_has_external_issue_tracker_to_projects.rb b/db/migrate/20160603075128_add_has_external_issue_tracker_to_projects.rb
new file mode 100644
index 00000000000..be295f0181d
--- /dev/null
+++ b/db/migrate/20160603075128_add_has_external_issue_tracker_to_projects.rb
@@ -0,0 +1,10 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddHasExternalIssueTrackerToProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  def change
+    add_column(:projects, :has_external_issue_tracker, :boolean)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 09ff52ccc8e..aac327797e7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -780,6 +780,7 @@ ActiveRecord::Schema.define(version: 20160608155312) do
     t.datetime "last_repository_check_at"
     t.boolean  "container_registry_enabled"
     t.boolean  "only_allow_merge_if_build_succeeds", default: false,    null: false
+    t.boolean  "has_external_issue_tracker"
   end
 
   add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 553556ed326..b6f36d3481e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -258,6 +258,69 @@ describe Project, models: true do
     end
   end
 
+  describe :external_issue_tracker do
+    let(:project) { create(:project) }
+    let(:ext_project) { create(:redmine_project) }
+
+    context 'on existing projects with no value for has_external_issue_tracker' do
+      before(:each) do
+        project.update_column(:has_external_issue_tracker, nil)
+        ext_project.update_column(:has_external_issue_tracker, nil)
+      end
+
+      it 'updates the has_external_issue_tracker boolean' do
+        expect do
+          project.external_issue_tracker
+        end.to change { project.reload.has_external_issue_tracker }.to(false)
+
+        expect do
+          ext_project.external_issue_tracker
+        end.to change { ext_project.reload.has_external_issue_tracker }.to(true)
+      end
+    end
+
+    it 'returns nil and does not query services when there is no external issue tracker' do
+      project.build_missing_services
+      project.reload
+
+      expect(project).not_to receive(:services)
+
+      expect(project.external_issue_tracker).to eq(nil)
+    end
+
+    it 'retrieves external_issue_tracker querying services and cache it when there is external issue tracker' do
+      ext_project.reload # Factory returns a project with changed attributes
+      ext_project.build_missing_services
+      ext_project.reload
+
+      expect(ext_project).to receive(:services).once.and_call_original
+
+      2.times { expect(ext_project.external_issue_tracker).to be_a_kind_of(RedmineService) }
+    end
+  end
+
+  describe :cache_has_external_issue_tracker do
+    let(:project) { create(:project) }
+
+    it 'stores true if there is any external_issue_tracker' do
+      services = double(:service, external_issue_trackers: [RedmineService.new])
+      expect(project).to receive(:services).and_return(services)
+
+      expect do
+        project.cache_has_external_issue_tracker
+      end.to change { project.has_external_issue_tracker}.to(true)
+    end
+
+    it 'stores false if there is no external_issue_tracker' do
+      services = double(:service, external_issue_trackers: [])
+      expect(project).to receive(:services).and_return(services)
+
+      expect do
+        project.cache_has_external_issue_tracker
+      end.to change { project.has_external_issue_tracker}.to(false)
+    end
+  end
+
   describe :can_have_issues_tracker_id? do
     let(:project) { create(:project) }
     let(:ext_project) { create(:redmine_project) }
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 8592e112c50..2f000dbc01a 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -204,4 +204,37 @@ describe Service, models: true do
       expect(service.bamboo_url_was).to be_nil
     end
   end
+
+  describe "callbacks" do
+    let(:project) { create(:project) }
+    let!(:service) do
+      RedmineService.new(
+        project: project,
+        active: true,
+        properties: {
+          project_url: 'http://redmine/projects/project_name_in_redmine',
+          issues_url: "http://redmine/#{project.id}/project_name_in_redmine/:id",
+          new_issue_url: 'http://redmine/projects/project_name_in_redmine/issues/new'
+        }
+      )
+    end
+
+    describe "on create" do
+      it "updates the has_external_issue_tracker boolean" do
+        expect do
+          service.save!
+        end.to change { service.project.has_external_issue_tracker }.from(nil).to(true)
+      end
+    end
+
+    describe "on update" do
+      it "updates the has_external_issue_tracker boolean" do
+        service.save!
+
+        expect do
+          service.update_attributes(active: false)
+        end.to change { service.project.has_external_issue_tracker }.from(true).to(false)
+      end
+    end
+  end
 end

From be98ee2586466b8f9f4e96e4b54490c412f6b43b Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Mon, 6 Jun 2016 10:06:37 +0200
Subject: [PATCH 1388/1431] Fixing specs stubbed objects cannot access database

---
 spec/lib/banzai/pipeline/wiki_pipeline_spec.rb        | 4 ++--
 spec/models/project_services/bamboo_service_spec.rb   | 2 +-
 spec/models/project_services/teamcity_service_spec.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
index ea4ab2c852e..72bc6a0b704 100644
--- a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
@@ -52,8 +52,8 @@ describe Banzai::Pipeline::WikiPipeline do
   end
 
   describe "Links" do
-    let(:namespace) { build_stubbed(:namespace, name: "wiki_link_ns") }
-    let(:project)   { build_stubbed(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
+    let(:namespace) { create(:namespace, name: "wiki_link_ns") }
+    let(:project)   { create(:empty_project, :public, name: "wiki_link_project", namespace: namespace) }
     let(:project_wiki) { ProjectWiki.new(project, double(:user)) }
     let(:page) { build(:wiki_page, wiki: project_wiki, page: OpenStruct.new(url_path: 'nested/twice/start-page')) }
 
diff --git a/spec/models/project_services/bamboo_service_spec.rb b/spec/models/project_services/bamboo_service_spec.rb
index e771f35811e..ec81f05fc7a 100644
--- a/spec/models/project_services/bamboo_service_spec.rb
+++ b/spec/models/project_services/bamboo_service_spec.rb
@@ -194,7 +194,7 @@ describe BambooService, models: true do
 
   def service(bamboo_url: 'http://gitlab.com')
     described_class.create(
-      project: build_stubbed(:empty_project),
+      project: create(:empty_project),
       properties: {
         bamboo_url: bamboo_url,
         username: 'mic',
diff --git a/spec/models/project_services/teamcity_service_spec.rb b/spec/models/project_services/teamcity_service_spec.rb
index ad24b895170..24a708ca849 100644
--- a/spec/models/project_services/teamcity_service_spec.rb
+++ b/spec/models/project_services/teamcity_service_spec.rb
@@ -182,7 +182,7 @@ describe TeamcityService, models: true do
 
   def service(teamcity_url: 'http://gitlab.com')
     described_class.create(
-      project: build_stubbed(:empty_project),
+      project: create(:empty_project),
       properties: {
         teamcity_url: teamcity_url,
         username: 'mic',

From 0e7abb4c2851131ccc5a81e1923824ac845bbe3f Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 10 Jun 2016 15:53:38 +0200
Subject: [PATCH 1389/1431] Fix incorrect registry key value

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18441
---
 config/gitlab.yml.example                | 2 +-
 doc/administration/container_registry.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0510e7df597..1048ef6e243 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -181,7 +181,7 @@ production: &base
     # host: registry.example.com
     # port: 5005
     # api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API
-    # key_path: config/registry.key
+    # key: config/registry.key
     # path: shared/registry
     # issuer: gitlab-issuer
 
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index caf9a5bef2c..7870669fa77 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -62,7 +62,7 @@ registry:
   host: registry.gitlab.example.com
   port: 5005
   api_url: http://localhost:5000/
-  key_path: config/registry.key
+  key: config/registry.key
   path: shared/registry
   issuer: gitlab-issuer
 ```
@@ -75,7 +75,7 @@ where:
 | `host`    | The host URL under which the Registry will run and the users will be able to use. |
 | `port`    | The port under which the external Registry domain will listen on. |
 | `api_url` | The internal API URL under which the Registry is exposed to. It defaults to `http://localhost:5000`. |
-| `key_path`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
+| `key`     | The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
 | `path`    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
 | `issuer`  | This should be the same value as configured in Registry's `issuer`. Read the [token auth configuration documentation][token-config]. |
 

From 8f6d43e0fea3ce62ec2e8e211755e557f19c51fd Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 6 Jun 2016 12:50:54 -0300
Subject: [PATCH 1390/1431] Remove notification level from user model

---
 CHANGELOG                                     |   1 +
 .../profiles/notifications_controller.rb      |  24 +-
 app/helpers/notifications_helper.rb           |  32 ++
 app/models/notification_setting.rb            |   1 -
 app/models/user.rb                            |  18 +-
 app/services/notification_service.rb          |  16 +-
 .../notifications/_group_settings.html.haml   |   2 +-
 .../notifications/_project_settings.html.haml |   2 +-
 .../profiles/notifications/show.html.haml     |  28 +-
 ...tification_setting_not_null_constraints.rb |   7 +
 ...201627_migrate_users_notification_level.rb |  24 ++
 spec/models/notification_setting_spec.rb      |   1 -
 spec/services/notification_service_spec.rb    | 296 +++++++++++++++++-
 13 files changed, 391 insertions(+), 61 deletions(-)
 create mode 100644 db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
 create mode 100644 db/migrate/20160607201627_migrate_users_notification_level.rb

diff --git a/CHANGELOG b/CHANGELOG
index 1c64739f701..bf437e267a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -54,6 +54,7 @@ v 8.9.0 (unreleased)
   - Improve error handling importing projects
   - Remove duplicated notification settings
   - Put project Files and Commits tabs under Code tab
+  - Decouple global notification level from user model
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
   - An indicator is now displayed at the top of the comment field for confidential issues.
   - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 18ee55c839a..1e9ceb87857 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -1,12 +1,13 @@
 class Profiles::NotificationsController < Profiles::ApplicationController
   def show
-    @user = current_user
-    @group_notifications = current_user.notification_settings.for_groups
-    @project_notifications = current_user.notification_settings.for_projects
+    @user                        = current_user
+    @group_notifications         = current_user.notification_settings.for_groups
+    @project_notifications       = current_user.notification_settings.for_projects
+    @global_notification_setting = current_user.global_notification_setting
   end
 
   def update
-    if current_user.update_attributes(user_params)
+    if current_user.update_attributes(user_params) && update_notification_settings
       flash[:notice] = "Notification settings saved"
     else
       flash[:alert] = "Failed to save new settings"
@@ -18,4 +19,19 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   def user_params
     params.require(:user).permit(:notification_email, :notification_level)
   end
+
+  def notification_params
+    params.require(:notification_level)
+  end
+
+  private
+
+  def update_notification_settings
+    return true unless notification_params
+
+    notification_setting = current_user.global_notification_setting
+    notification_setting.level = notification_params
+
+    notification_setting.save
+  end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index b8e64b3890a..9769458f79e 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -61,4 +61,36 @@ module NotificationsHelper
       end
     end
   end
+
+  def notification_level_radio_buttons
+    html = ""
+
+    NotificationSetting.levels.each_key do |level|
+      level = level.to_sym
+      next if level == :global
+
+      html << content_tag(:div, class: "radio") do
+        content_tag(:label, { value: level }) do
+          radio_button_tag(:notification_level, level, @global_notification_setting.level.to_sym == level) +
+          content_tag(:div, level.to_s.capitalize, class: "level-title") +
+          content_tag(:p, notification_level_description(level))
+        end
+      end
+    end
+
+    html.html_safe
+  end
+
+  def notification_level_description(level)
+    case level
+    when :disabled
+      "You will not get any notifications via email"
+    when :mention
+      "You will receive notifications only for comments in which you were @mentioned"
+    when :participating
+      "You will only receive notifications from related resources (e.g. from your commits or assigned issues)"
+    when :watch
+      "You will receive notifications for any activity"
+    end
+  end
 end
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 17fb15b08df..0ce87968e46 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -7,7 +7,6 @@ class NotificationSetting < ActiveRecord::Base
   belongs_to :source, polymorphic: true
 
   validates :user, presence: true
-  validates :source, presence: true
   validates :level, presence: true
   validates :user_id, uniqueness: { scope: [:source_type, :source_id],
                                     message: "already exists in source",
diff --git a/app/models/user.rb b/app/models/user.rb
index e0987e07e1f..d2da83ab4b3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -10,6 +10,8 @@ class User < ActiveRecord::Base
   include CaseSensitivity
   include TokenAuthenticatable
 
+  DEFAULT_NOTIFICATION_LEVEL = :participating
+
   add_authentication_token_field :authentication_token
 
   default_value_for :admin, false
@@ -99,7 +101,6 @@ class User < ActiveRecord::Base
     presence: true,
     uniqueness: { case_sensitive: false }
 
-  validates :notification_level, presence: true
   validate :namespace_uniq, if: ->(user) { user.username_changed? }
   validate :avatar_type, if: ->(user) { user.avatar.present? && user.avatar_changed? }
   validate :unique_email, if: ->(user) { user.email_changed? }
@@ -133,13 +134,6 @@ class User < ActiveRecord::Base
   # Note: When adding an option, it MUST go on the end of the array.
   enum project_view: [:readme, :activity, :files]
 
-  # Notification level
-  # Note: When adding an option, it MUST go on the end of the array.
-  #
-  # TODO: Add '_prefix: :notification' to enum when update to Rails 5. https://github.com/rails/rails/pull/19813
-  # Because user.notification_disabled? is much better than user.disabled?
-  enum notification_level: [:disabled, :participating, :watch, :global, :mention]
-
   alias_attribute :private_token, :authentication_token
 
   delegate :path, to: :namespace, allow_nil: true, prefix: true
@@ -800,6 +794,14 @@ class User < ActiveRecord::Base
     notification_settings.find_or_initialize_by(source: source)
   end
 
+  # Lazy load global notification setting
+  # Initializes User setting with Participating level if setting not persisted
+  def global_notification_setting
+    setting = notification_settings.find_or_initialize_by(source: nil)
+    setting.level = NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL] unless setting.persisted?
+    setting
+  end
+
   def assigned_open_merge_request_count(force: false)
     Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], force: force) do
       assigned_merge_requests.opened.count
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 91ca82ed3b7..af7bbe37439 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -279,10 +279,11 @@ class NotificationService
   end
 
   def users_with_global_level_watch(ids)
-    User.where(
-      id: ids,
-      notification_level: NotificationSetting.levels[:watch]
-    ).pluck(:id)
+    NotificationSetting.where(
+      user_id: ids,
+      source_type: nil,
+      level: NotificationSetting.levels[:watch]
+    ).pluck(:user_id)
   end
 
   # Build a list of users based on project notifcation settings
@@ -352,7 +353,7 @@ class NotificationService
     users = users.reject(&:blocked?)
 
     users.reject do |user|
-      next user.notification_level == level unless project
+      next user.global_notification_setting.level == level unless project
 
       setting = user.notification_settings_for(project)
 
@@ -361,13 +362,13 @@ class NotificationService
       end
 
       # reject users who globally set mention notification and has no setting per project/group
-      next user.notification_level == level unless setting
+      next user.global_notification_setting.level == level unless setting
 
       # reject users who set mention notification in project
       next true if setting.level == level
 
       # reject users who have mention level in project and disabled in global settings
-      setting.global? && user.notification_level == level
+      setting.global? && user.global_notification_setting.level == level
     end
   end
 
@@ -456,7 +457,6 @@ class NotificationService
 
   def build_recipients(target, project, current_user, action: nil, previous_assignee: nil)
     recipients = target.participants(current_user)
-
     recipients = add_project_watchers(recipients, project)
     recipients = reject_mention_users(recipients, project)
 
diff --git a/app/views/profiles/notifications/_group_settings.html.haml b/app/views/profiles/notifications/_group_settings.html.haml
index 89ae7ffda2b..f0cf82afe83 100644
--- a/app/views/profiles/notifications/_group_settings.html.haml
+++ b/app/views/profiles/notifications/_group_settings.html.haml
@@ -1,7 +1,7 @@
 %li.notification-list-item
   %span.notification.fa.fa-holder.append-right-5
     - if setting.global?
-      = notification_icon(current_user.notification_level)
+      = notification_icon(current_user.global_notification_setting.level)
     - else
       = notification_icon(setting.level)
 
diff --git a/app/views/profiles/notifications/_project_settings.html.haml b/app/views/profiles/notifications/_project_settings.html.haml
index 17c097154da..e0fad555c09 100644
--- a/app/views/profiles/notifications/_project_settings.html.haml
+++ b/app/views/profiles/notifications/_project_settings.html.haml
@@ -1,7 +1,7 @@
 %li.notification-list-item
   %span.notification.fa.fa-holder.append-right-5
     - if setting.global?
-      = notification_icon(current_user.notification_level)
+      = notification_icon(current_user.global_notification_setting.level)
     - else
       = notification_icon(setting.level)
 
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 7696f112bb3..f2659ac14b5 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -26,33 +26,7 @@
           = f.select :notification_email, @user.all_emails, { include_blank: false }, class: "select2"
         .form-group
           = f.label :notification_level, class: 'label-light'
-          .radio
-            = f.label :notification_level, value: :disabled do
-              = f.radio_button :notification_level, :disabled
-              .level-title
-                Disabled
-              %p You will not get any notifications via email
-
-          .radio
-            = f.label :notification_level, value: :mention do
-              = f.radio_button :notification_level, :mention
-              .level-title
-                On Mention
-              %p You will receive notifications only for comments in which you were @mentioned
-
-          .radio
-            = f.label :notification_level, value: :participating do
-              = f.radio_button :notification_level, :participating
-              .level-title
-                Participating
-              %p You will only receive notifications from related resources (e.g. from your commits or assigned issues)
-
-          .radio
-            = f.label :notification_level, value: :watch do
-              = f.radio_button :notification_level, :watch
-              .level-title
-                Watch
-              %p You will receive notifications for any activity
+          = notification_level_radio_buttons
 
         .prepend-top-default
           = f.submit 'Update settings', class: "btn btn-create"
diff --git a/db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb b/db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
new file mode 100644
index 00000000000..c20ac9acdc2
--- /dev/null
+++ b/db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
@@ -0,0 +1,7 @@
+class RemoveNotificationSettingNotNullConstraints < ActiveRecord::Migration
+  def up
+    change_column :notification_settings, :source_type, :string, null: true
+    change_column :notification_settings, :source_id, :integer, null: true
+    change_column :users, :notification_level, :integer, null: true
+  end
+end
diff --git a/db/migrate/20160607201627_migrate_users_notification_level.rb b/db/migrate/20160607201627_migrate_users_notification_level.rb
new file mode 100644
index 00000000000..7417d66fef7
--- /dev/null
+++ b/db/migrate/20160607201627_migrate_users_notification_level.rb
@@ -0,0 +1,24 @@
+class MigrateUsersNotificationLevel < ActiveRecord::Migration
+  # Migrates only users which changes theier default notification level :participating
+  # creating a new record on notification settins table
+
+  def up
+    changed_users = exec_query(%Q{
+      SELECT id, notification_level
+      FROM users
+      WHERE notification_level != 1
+    })
+
+    changed_users.each do |row|
+      uid = row['id']
+      u_notification_level = row['notification_level']
+
+      execute(%Q{
+        INSERT INTO notification_settings
+          (user_id, level, created_at, updated_at)
+        VALUES
+          (#{uid}, #{u_notification_level}, now(), now())
+      })
+    end
+  end
+end
diff --git a/spec/models/notification_setting_spec.rb b/spec/models/notification_setting_spec.rb
index 295081e9da1..4e24e89b008 100644
--- a/spec/models/notification_setting_spec.rb
+++ b/spec/models/notification_setting_spec.rb
@@ -10,7 +10,6 @@ RSpec.describe NotificationSetting, type: :model do
     subject { NotificationSetting.new(source_id: 1, source_type: 'Project') }
 
     it { is_expected.to validate_presence_of(:user) }
-    it { is_expected.to validate_presence_of(:source) }
     it { is_expected.to validate_presence_of(:level) }
     it { is_expected.to validate_uniqueness_of(:user_id).scoped_to([:source_id, :source_type]).with_message(/already exists in source/) }
   end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index cef5e0d8659..5a9a9d62a15 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -72,6 +72,7 @@ describe NotificationService, services: true do
           should_not_email(@u_disabled)
           should_not_email(@unsubscriber)
           should_not_email(@u_outsider_mentioned)
+          should_not_email(@u_lazy_participant)
         end
 
         it 'filters out "mentioned in" notes' do
@@ -80,6 +81,19 @@ describe NotificationService, services: true do
           expect(Notify).not_to receive(:note_issue_email)
           notification.new_note(mentioned_note)
         end
+
+        context 'participating' do
+          context 'by note' do
+            before do
+              note.author = @u_lazy_participant
+              note.save
+              notification.new_note(note)
+            end
+
+
+            it { should_email(@u_lazy_participant) }
+          end
+        end
       end
 
       describe 'new note on issue in project that belongs to a group' do
@@ -106,6 +120,7 @@ describe NotificationService, services: true do
           should_not_email(note.author)
           should_not_email(@u_participating)
           should_not_email(@u_disabled)
+          should_not_email(@u_lazy_participant)
         end
       end
     end
@@ -235,6 +250,7 @@ describe NotificationService, services: true do
           should_not_email(note.author)
           should_not_email(@u_participating)
           should_not_email(@u_disabled)
+          should_not_email(@u_lazy_participant)
         end
 
         it do
@@ -248,10 +264,11 @@ describe NotificationService, services: true do
           should_not_email(note.author)
           should_not_email(@u_participating)
           should_not_email(@u_disabled)
+          should_not_email(@u_lazy_participant)
         end
 
         it do
-          @u_committer.update_attributes(notification_level: :mention)
+          @u_committer = create_global_setting_for(@u_committer, :mention)
           notification.new_note(note)
           should_not_email(@u_committer)
         end
@@ -280,10 +297,11 @@ describe NotificationService, services: true do
         should_not_email(@u_mentioned)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
       end
 
       it do
-        issue.assignee.update_attributes(notification_level: :mention)
+        create_global_setting_for(issue.assignee, :mention)
         notification.new_issue(issue, @u_disabled)
 
         should_not_email(issue.assignee)
@@ -341,6 +359,7 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
       end
 
       it 'emails previous assignee even if he has the "on mention" notif level' do
@@ -356,6 +375,7 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
       end
 
       it 'emails new assignee even if he has the "on mention" notif level' do
@@ -371,6 +391,7 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
       end
 
       it 'emails new assignee' do
@@ -386,6 +407,7 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
       end
 
       it 'does not email new assignee if they are the current user' do
@@ -401,6 +423,35 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            issue.update_attribute(:assignee, @u_lazy_participant)
+            notification.reassigned_issue(issue, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.reassigned_issue(issue, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            issue.author = @u_lazy_participant
+            notification.reassigned_issue(issue, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
 
@@ -479,6 +530,35 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            issue.update_attribute(:assignee, @u_lazy_participant)
+            notification.close_issue(issue, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.close_issue(issue, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            issue.author = @u_lazy_participant
+            notification.close_issue(issue, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
 
@@ -495,6 +575,35 @@ describe NotificationService, services: true do
         should_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            issue.update_attribute(:assignee, @u_lazy_participant)
+            notification.reopen_issue(issue, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.reopen_issue(issue, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            issue.author = @u_lazy_participant
+            notification.reopen_issue(issue, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
   end
@@ -520,6 +629,7 @@ describe NotificationService, services: true do
         should_email(@u_guest_watcher)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
       end
 
       it "emails subscribers of the merge request's labels" do
@@ -530,6 +640,36 @@ describe NotificationService, services: true do
 
         should_email(subscriber)
       end
+
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            merge_request.update_attribute(:assignee, @u_lazy_participant)
+            notification.new_merge_request(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: merge_request, project_id: project.id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.new_merge_request(merge_request, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            merge_request.author = @u_lazy_participant
+            merge_request.save
+            notification.new_merge_request(merge_request, @u_disabled)
+          end
+
+          it { should_not_email(@u_lazy_participant) }
+        end
+      end
     end
 
     describe '#reassigned_merge_request' do
@@ -545,6 +685,36 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            merge_request.update_attribute(:assignee, @u_lazy_participant)
+            notification.reassigned_merge_request(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: merge_request, project_id: project.id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.reassigned_merge_request(merge_request, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            merge_request.author = @u_lazy_participant
+            merge_request.save
+            notification.reassigned_merge_request(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
 
@@ -572,6 +742,7 @@ describe NotificationService, services: true do
         should_not_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
+        should_not_email(@u_lazy_participant)
         should_not_email(subscriber_to_label)
         should_email(subscriber_to_label2)
       end
@@ -590,6 +761,36 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            merge_request.update_attribute(:assignee, @u_lazy_participant)
+            notification.close_mr(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: merge_request, project_id: project.id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.close_mr(merge_request, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            merge_request.author = @u_lazy_participant
+            merge_request.save
+            notification.close_mr(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
 
@@ -606,6 +807,36 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            merge_request.update_attribute(:assignee, @u_lazy_participant)
+            notification.merge_mr(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: merge_request, project_id: project.id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.merge_mr(merge_request, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            merge_request.author = @u_lazy_participant
+            merge_request.save
+            notification.merge_mr(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
 
@@ -622,6 +853,36 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_disabled)
+        should_not_email(@u_lazy_participant)
+      end
+
+      context 'participating' do
+        context 'by assignee' do
+          before do
+            merge_request.update_attribute(:assignee, @u_lazy_participant)
+            notification.reopen_mr(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by note' do
+          let!(:note) { create(:note_on_issue, noteable: merge_request, project_id: project.id, note: 'anything', author: @u_lazy_participant) }
+
+          before { notification.reopen_mr(merge_request, @u_disabled) }
+
+          it { should_email(@u_lazy_participant) }
+        end
+
+        context 'by author' do
+          before do
+            merge_request.author = @u_lazy_participant
+            merge_request.save
+            notification.reopen_mr(merge_request, @u_disabled)
+          end
+
+          it { should_email(@u_lazy_participant) }
+        end
       end
     end
   end
@@ -640,6 +901,7 @@ describe NotificationService, services: true do
 
         should_email(@u_watcher)
         should_email(@u_participating)
+        should_email(@u_lazy_participant)
         should_not_email(@u_guest_watcher)
         should_not_email(@u_disabled)
       end
@@ -647,14 +909,19 @@ describe NotificationService, services: true do
   end
 
   def build_team(project)
-    @u_watcher = create(:user, notification_level: :watch)
-    @u_participating = create(:user, notification_level: :participating)
-    @u_participant_mentioned = create(:user, username: 'participant', notification_level: :participating)
-    @u_disabled = create(:user, notification_level: :disabled)
-    @u_mentioned = create(:user, username: 'mention', notification_level: :mention)
-    @u_committer = create(:user, username: 'committer')
-    @u_not_mentioned = create(:user, username: 'regular', notification_level: :participating)
-    @u_outsider_mentioned = create(:user, username: 'outsider')
+    @u_watcher               = create_global_setting_for(create(:user), :watch)
+    @u_participating         = create_global_setting_for(create(:user), :participating)
+    @u_participant_mentioned = create_global_setting_for(create(:user, username: 'participant'), :participating)
+    @u_disabled              = create_global_setting_for(create(:user), :disabled)
+    @u_mentioned             = create_global_setting_for(create(:user, username: 'mention'), :mention)
+    @u_committer             = create(:user, username: 'committer')
+    @u_not_mentioned         = create_global_setting_for(create(:user, username: 'regular'), :participating)
+    @u_outsider_mentioned    = create(:user, username: 'outsider')
+
+    # User to be participant by default
+    # This user does not contain any record in notification settings table
+    # It should be treated with a :participating notification_level
+    @u_lazy_participant      = create(:user, username: 'lazy-participant')
 
     create_guest_watcher
 
@@ -665,6 +932,15 @@ describe NotificationService, services: true do
     project.team << [@u_mentioned, :master]
     project.team << [@u_committer, :master]
     project.team << [@u_not_mentioned, :master]
+    project.team << [@u_lazy_participant, :master]
+  end
+
+  def create_global_setting_for(user, level)
+    setting = user.global_notification_setting
+    setting.level = level
+    setting.save
+
+    user
   end
 
   def create_guest_watcher

From 39ead205de72461e86db07525922f2fab5fff2a9 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 9 Jun 2016 16:33:31 -0300
Subject: [PATCH 1391/1431] Remove notification level fild from users, improve
 migrations and specs

---
 .../profiles/notifications_controller.rb      | 13 ++++------
 app/helpers/notifications_helper.rb           | 17 ++-----------
 app/models/user.rb                            |  9 ++++---
 app/services/notification_service.rb          |  8 ++++---
 ...201627_migrate_users_notification_level.rb | 24 -------------------
 ...ification_setting_not_null_constraints.rb} |  6 ++++-
 ...201627_migrate_users_notification_level.rb | 21 ++++++++++++++++
 ...27_remove_notification_level_from_users.rb |  7 ++++++
 spec/services/notification_service_spec.rb    |  7 +++---
 9 files changed, 55 insertions(+), 57 deletions(-)
 delete mode 100644 db/migrate/20160607201627_migrate_users_notification_level.rb
 rename db/migrate/{20160606192159_remove_notification_setting_not_null_constraints.rb => 20160610140403_remove_notification_setting_not_null_constraints.rb} (58%)
 create mode 100644 db/migrate/20160610201627_migrate_users_notification_level.rb
 create mode 100644 db/migrate/20160610301627_remove_notification_level_from_users.rb

diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 1e9ceb87857..40d1906a53f 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -17,21 +17,18 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:notification_email, :notification_level)
+    params.require(:user).permit(:notification_email)
   end
 
-  def notification_params
-    params.require(:notification_level)
+  def global_notification_setting_params
+    params.require(:global_notification_setting).permit(:level)
   end
 
   private
 
   def update_notification_settings
-    return true unless notification_params
+    return true unless global_notification_setting_params
 
-    notification_setting = current_user.global_notification_setting
-    notification_setting.level = notification_params
-
-    notification_setting.save
+    current_user.global_notification_setting.update_attributes(global_notification_setting_params)
   end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 9769458f79e..50c21fc0d49 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -71,26 +71,13 @@ module NotificationsHelper
 
       html << content_tag(:div, class: "radio") do
         content_tag(:label, { value: level }) do
-          radio_button_tag(:notification_level, level, @global_notification_setting.level.to_sym == level) +
+          radio_button_tag(:"global_notification_setting[level]", level, @global_notification_setting.level.to_sym == level) +
           content_tag(:div, level.to_s.capitalize, class: "level-title") +
-          content_tag(:p, notification_level_description(level))
+          content_tag(:p, notification_description(level))
         end
       end
     end
 
     html.html_safe
   end
-
-  def notification_level_description(level)
-    case level
-    when :disabled
-      "You will not get any notifications via email"
-    when :mention
-      "You will receive notifications only for comments in which you were @mentioned"
-    when :participating
-      "You will only receive notifications from related resources (e.g. from your commits or assigned issues)"
-    when :watch
-      "You will receive notifications for any activity"
-    end
-  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index d2da83ab4b3..7afbfbf112a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -797,9 +797,12 @@ class User < ActiveRecord::Base
   # Lazy load global notification setting
   # Initializes User setting with Participating level if setting not persisted
   def global_notification_setting
-    setting = notification_settings.find_or_initialize_by(source: nil)
-    setting.level = NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL] unless setting.persisted?
-    setting
+    return @global_notification_setting if defined?(@global_notification_setting)
+
+    @global_notification_setting = notification_settings.find_or_initialize_by(source: nil)
+    @global_notification_setting.update_attributes(level: NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL]) unless @global_notification_setting.persisted?
+
+    @global_notification_setting
   end
 
   def assigned_open_merge_request_count(force: false)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index af7bbe37439..875a3f4fab6 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -353,7 +353,9 @@ class NotificationService
     users = users.reject(&:blocked?)
 
     users.reject do |user|
-      next user.global_notification_setting.level == level unless project
+      global_notification_setting = user.global_notification_setting
+
+      next global_notification_setting.level == level unless project
 
       setting = user.notification_settings_for(project)
 
@@ -362,13 +364,13 @@ class NotificationService
       end
 
       # reject users who globally set mention notification and has no setting per project/group
-      next user.global_notification_setting.level == level unless setting
+      next global_notification_setting.level == level unless setting
 
       # reject users who set mention notification in project
       next true if setting.level == level
 
       # reject users who have mention level in project and disabled in global settings
-      setting.global? && user.global_notification_setting.level == level
+      setting.global? && global_notification_setting.level == level
     end
   end
 
diff --git a/db/migrate/20160607201627_migrate_users_notification_level.rb b/db/migrate/20160607201627_migrate_users_notification_level.rb
deleted file mode 100644
index 7417d66fef7..00000000000
--- a/db/migrate/20160607201627_migrate_users_notification_level.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class MigrateUsersNotificationLevel < ActiveRecord::Migration
-  # Migrates only users which changes theier default notification level :participating
-  # creating a new record on notification settins table
-
-  def up
-    changed_users = exec_query(%Q{
-      SELECT id, notification_level
-      FROM users
-      WHERE notification_level != 1
-    })
-
-    changed_users.each do |row|
-      uid = row['id']
-      u_notification_level = row['notification_level']
-
-      execute(%Q{
-        INSERT INTO notification_settings
-          (user_id, level, created_at, updated_at)
-        VALUES
-          (#{uid}, #{u_notification_level}, now(), now())
-      })
-    end
-  end
-end
diff --git a/db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb b/db/migrate/20160610140403_remove_notification_setting_not_null_constraints.rb
similarity index 58%
rename from db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
rename to db/migrate/20160610140403_remove_notification_setting_not_null_constraints.rb
index c20ac9acdc2..259abb08e47 100644
--- a/db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
+++ b/db/migrate/20160610140403_remove_notification_setting_not_null_constraints.rb
@@ -2,6 +2,10 @@ class RemoveNotificationSettingNotNullConstraints < ActiveRecord::Migration
   def up
     change_column :notification_settings, :source_type, :string, null: true
     change_column :notification_settings, :source_id, :integer, null: true
-    change_column :users, :notification_level, :integer, null: true
+  end
+
+  def down
+    change_column :notification_settings, :source_type, :string, null: false
+    change_column :notification_settings, :source_id, :integer, null: false
   end
 end
diff --git a/db/migrate/20160610201627_migrate_users_notification_level.rb b/db/migrate/20160610201627_migrate_users_notification_level.rb
new file mode 100644
index 00000000000..760b766828e
--- /dev/null
+++ b/db/migrate/20160610201627_migrate_users_notification_level.rb
@@ -0,0 +1,21 @@
+class MigrateUsersNotificationLevel < ActiveRecord::Migration
+  # Migrates only users who changed their default notification level :participating
+  # creating a new record on notification settings table
+
+  def up
+    execute(%Q{
+      INSERT INTO notification_settings
+      (user_id, level, created_at, updated_at)
+      (SELECT id, notification_level, created_at, updated_at FROM users WHERE notification_level != 1)
+    })
+  end
+
+  # Migrates from notification settings back to user notification_level
+  # If no value is found the default level of 1 will be used
+  def down
+    execute(%Q{
+      UPDATE users u SET
+      notification_level = COALESCE((SELECT level FROM notification_settings WHERE user_id = u.id AND source_type IS NULL), 1)
+    })
+  end
+end
diff --git a/db/migrate/20160610301627_remove_notification_level_from_users.rb b/db/migrate/20160610301627_remove_notification_level_from_users.rb
new file mode 100644
index 00000000000..8afb14df2cf
--- /dev/null
+++ b/db/migrate/20160610301627_remove_notification_level_from_users.rb
@@ -0,0 +1,7 @@
+class RemoveNotificationLevelFromUsers < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  def change
+    remove_column :users, :notification_level, :integer
+  end
+end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 5a9a9d62a15..b99e02ba678 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -85,13 +85,14 @@ describe NotificationService, services: true do
         context 'participating' do
           context 'by note' do
             before do
+              ActionMailer::Base.deliveries.clear
               note.author = @u_lazy_participant
               note.save
               notification.new_note(note)
             end
 
 
-            it { should_email(@u_lazy_participant) }
+            it { should_not_email(@u_lazy_participant) }
           end
         end
       end
@@ -953,8 +954,8 @@ describe NotificationService, services: true do
   def add_users_with_subscription(project, issuable)
     @subscriber = create :user
     @unsubscriber = create :user
-    @subscribed_participant = create(:user, username: 'subscribed_participant', notification_level: :participating)
-    @watcher_and_subscriber = create(:user, notification_level: :watch)
+    @subscribed_participant = create_global_setting_for(create(:user, username: 'subscribed_participant'), :participating)
+    @watcher_and_subscriber = create_global_setting_for(create(:user), :watch)
 
     project.team << [@subscribed_participant, :master]
     project.team << [@subscriber, :master]

From 483e4571a638a62e5e69163f6a8a4303167cd115 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Fri, 10 Jun 2016 14:04:39 +0100
Subject: [PATCH 1392/1431] Fixed search form padding

Updated CHANGELOG

Removed CHANGELOG entry
---
 app/assets/stylesheets/framework/nav.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a036799e15a..47af3ab9acb 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -171,7 +171,6 @@
     > form {
       display: inline-block;
       margin-top: -1px;
-      margin-bottom: 12px;
     }
 
     .icon-label {

From 1976a44649edcac40058cf39600e134ec6112408 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 10 Jun 2016 16:17:28 +0300
Subject: [PATCH 1393/1431] Move Labels and Milestones as sub tab to Issues/MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_project.html.haml      | 16 +----
 app/views/projects/issues/_head.html.haml     | 25 ++++++++
 app/views/projects/issues/index.html.haml     | 33 +++++-----
 app/views/projects/labels/index.html.haml     | 63 ++++++++++---------
 .../projects/merge_requests/_head.html.haml   |  5 --
 .../projects/merge_requests/index.html.haml   | 26 ++++----
 app/views/projects/milestones/index.html.haml | 29 +++++----
 7 files changed, 107 insertions(+), 90 deletions(-)
 create mode 100644 app/views/projects/issues/_head.html.haml
 delete mode 100644 app/views/projects/merge_requests/_head.html.haml

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index ca99ba8def3..9dc76fce9e1 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -33,7 +33,7 @@
         = navbar_icon('activity')
         %span
           Activity
-          
+
     - if project_nav_tab? :files
       = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do
         = link_to project_files_path(@project), title: 'Code',  class: 'shortcuts-tree' do
@@ -62,13 +62,6 @@
           %span
             Graphs
 
-    - if project_nav_tab? :milestones
-      = nav_link(controller: :milestones) do
-        = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-          = navbar_icon('milestones')
-          %span
-            Milestones
-
     - if project_nav_tab? :issues
       = nav_link(controller: :issues) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
@@ -86,13 +79,6 @@
             Merge Requests
             %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
 
-    - if project_nav_tab? :labels
-      = nav_link(controller: :labels) do
-        = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
-          = icon('tags fw')
-          %span
-            Labels
-
     - if project_nav_tab? :wiki
       = nav_link(controller: :wikis) do
         = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
new file mode 100644
index 00000000000..d0481be9932
--- /dev/null
+++ b/app/views/projects/issues/_head.html.haml
@@ -0,0 +1,25 @@
+%ul.nav-links.sub-nav
+  %div{ class: (container_class) }
+    - if project_nav_tab?(:issues)
+      = nav_link(controller: :issues) do
+        = link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do
+          %span
+            Issues
+
+    - if project_nav_tab?(:merge_requests)
+      = nav_link(controller: :merge_requests) do
+        = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do
+          %span
+            Merge Requests
+
+    - if project_nav_tab? :labels
+      = nav_link(controller: :labels) do
+        = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+          %span
+            Labels
+
+    - if project_nav_tab? :milestones
+      = nav_link(controller: :milestones) do
+        = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+          %span
+            Milestones
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 7c1457553d9..cd876b5ea62 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,23 +1,26 @@
+- @no_container = true
 - page_title "Issues"
+= render "projects/issues/head"
 
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
 
-.top-area
-  = render 'shared/issuable/nav', type: :issues
-  .nav-controls
-    - if current_user
-      = link_to namespace_project_issues_path(@project.namespace, @project, :atom, { private_token: current_user.private_token }), class: 'btn append-right-10' do
-        = icon('rss')
-        %span.icon-label
-          Subscribe
-    = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project)
-    - if can? current_user, :create_issue, @project
-      = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
-        New Issue
+%div{ class: (container_class) }
+  .top-area
+    = render 'shared/issuable/nav', type: :issues
+    .nav-controls
+      - if current_user
+        = link_to namespace_project_issues_path(@project.namespace, @project, :atom, { private_token: current_user.private_token }), class: 'btn append-right-10' do
+          = icon('rss')
+          %span.icon-label
+            Subscribe
+      = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project)
+      - if can? current_user, :create_issue, @project
+        = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
+          New Issue
 
-= render 'shared/issuable/filter', type: :issues
+  = render 'shared/issuable/filter', type: :issues
 
-.issues-holder
-  = render "issues"
+  .issues-holder
+    = render "issues"
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 93583c92609..6e1baa46b05 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,35 +1,38 @@
+- @no_container = true
 - page_title "Labels"
 - hide_class = ''
+= render "projects/issues/head"
 
-.top-area
-  .nav-text
-    Labels can be applied to issues and merge requests.
-  .nav-controls
-    - if can?(current_user, :admin_label, @project)
-      = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do
-        New label
+%div{ class: (container_class) }
+  .top-area
+    .nav-text
+      Labels can be applied to issues and merge requests.
+    .nav-controls
+      - if can?(current_user, :admin_label, @project)
+        = link_to new_namespace_project_label_path(@project.namespace, @project), class: "btn btn-new" do
+          New label
 
-.labels
-  - if can?(current_user, :admin_label, @project)
-    -# Only show it in the first page
-    - hide = @project.labels.empty? || (params[:page].present? && params[:page] != '1')
-    .prioritized-labels{ class: ('hide' if hide) }
-      %h5 Prioritized Labels
-      %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }
-        - if @prioritized_labels.present?
-          = render @prioritized_labels
-        - else
-          %p.empty-message No prioritized labels yet
-  .other-labels
+  .labels
     - if can?(current_user, :admin_label, @project)
-      %h5{ class: ('hide' if hide) } Other Labels
-    - if @labels.present?
-      %ul.content-list.manage-labels-list.js-other-labels
-        = render @labels
-      = paginate @labels, theme: 'gitlab'
-    - else
-      .nothing-here-block
-        - if can?(current_user, :admin_label, @project)
-          Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
-        - else
-          No labels created
+      -# Only show it in the first page
+      - hide = @project.labels.empty? || (params[:page].present? && params[:page] != '1')
+      .prioritized-labels{ class: ('hide' if hide) }
+        %h5 Prioritized Labels
+        %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_namespace_project_labels_path(@project.namespace, @project) }
+          - if @prioritized_labels.present?
+            = render @prioritized_labels
+          - else
+            %p.empty-message No prioritized labels yet
+    .other-labels
+      - if can?(current_user, :admin_label, @project)
+        %h5{ class: ('hide' if hide) } Other Labels
+      - if @labels.present?
+        %ul.content-list.manage-labels-list.js-other-labels
+          = render @labels
+        = paginate @labels, theme: 'gitlab'
+      - else
+        .nothing-here-block
+          - if can?(current_user, :admin_label, @project)
+            Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
+          - else
+            No labels created
diff --git a/app/views/projects/merge_requests/_head.html.haml b/app/views/projects/merge_requests/_head.html.haml
deleted file mode 100644
index 19e4dab874b..00000000000
--- a/app/views/projects/merge_requests/_head.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-.top-tabs
-  = link_to namespace_project_merge_requests_path(@project.namespace, @project), class: "tab #{'active' if current_page?(namespace_project_merge_requests_path(@project.namespace, @project)) }" do
-    %span
-    Merge Requests
-
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index c8653cb0c30..9f948d41dda 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,18 +1,20 @@
+- @no_container = true
 - page_title "Merge Requests"
-
+= render "projects/issues/head"
 = render 'projects/last_push'
 
-.top-area
-  = render 'shared/issuable/nav', type: :merge_requests
-  .nav-controls
-    = render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
+%div{ class: (container_class) }
+  .top-area
+    = render 'shared/issuable/nav', type: :merge_requests
+    .nav-controls
+      = render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
 
-    - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
-    - if merge_project
-      = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
-        New Merge Request
+      - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
+      - if merge_project
+        = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
+          New Merge Request
 
-= render 'shared/issuable/filter', type: :merge_requests
+  = render 'shared/issuable/filter', type: :merge_requests
 
-.merge-requests-holder
-  = render 'merge_requests'
+  .merge-requests-holder
+    = render 'merge_requests'
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 60a5b83434e..b0e0bdfff5a 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,19 +1,22 @@
+- @no_container = true
 - page_title "Milestones"
+= render "projects/issues/head"
 
-.top-area
-  = render 'shared/milestones_filter'
+%div{ class: (container_class) }
+  .top-area
+    = render 'shared/milestones_filter'
 
-  .nav-controls
-    - if can?(current_user, :admin_milestone, @project)
-      = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: "btn btn-new", title: "New Milestone" do
-        New Milestone
+    .nav-controls
+      - if can?(current_user, :admin_milestone, @project)
+        = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: "btn btn-new", title: "New Milestone" do
+          New Milestone
 
-.milestones
-  %ul.content-list
-    = render @milestones
+  .milestones
+    %ul.content-list
+      = render @milestones
 
-    - if @milestones.blank?
-      %li
-        .nothing-here-block No milestones to show
+      - if @milestones.blank?
+        %li
+          .nothing-here-block No milestones to show
 
-  = paginate @milestones, theme: "gitlab"
+    = paginate @milestones, theme: "gitlab"

From d4b2f5d0f3baf4e3644c0e0f71ffb2995fb72a57 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 10 Jun 2016 18:33:44 +0300
Subject: [PATCH 1394/1431] Render only issues/mr in subnav depends on context

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_project.html.haml  |  2 +-
 app/views/projects/issues/_head.html.haml |  4 ++--
 features/project/active_tab.feature       | 12 ++++++++----
 features/steps/project/active_tab.rb      | 16 ++++++++--------
 features/steps/shared/active_tab.rb       |  4 ++--
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 9dc76fce9e1..79cc5c02888 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -63,7 +63,7 @@
             Graphs
 
     - if project_nav_tab? :issues
-      = nav_link(controller: :issues) do
+      = nav_link(controller: [:issues, :labels, :milestones]) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
           = navbar_icon('issues')
           %span
diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
index d0481be9932..583cc1b975b 100644
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
@@ -1,12 +1,12 @@
 %ul.nav-links.sub-nav
   %div{ class: (container_class) }
-    - if project_nav_tab?(:issues)
+    - if project_nav_tab?(:issues) && current_controller?(:issues)
       = nav_link(controller: :issues) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do
           %span
             Issues
 
-    - if project_nav_tab?(:merge_requests)
+    - if project_nav_tab?(:merge_requests) && current_controller?(:merge_requests)
       = nav_link(controller: :merge_requests) do
         = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do
           %span
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 26e67503021..c4f987a7923 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -107,12 +107,16 @@ Feature: Project Active Tab
 
   Scenario: On Project Issues/Milestones
     Given I visit my project's issues page
-    And I click the "Milestones" tab
-    Then the active main tab should be Milestones
+    And I click the "Milestones" sub tab
+    Then the active main tab should be Issues
+    Then the active sub tab should be Milestones
     And no other main tabs should be active
+    And no other sub tabs should be active
 
   Scenario: On Project Issues/Labels
     Given I visit my project's issues page
-    And I click the "Labels" tab
-    Then the active main tab should be Labels
+    And I click the "Labels" sub tab
+    Then the active main tab should be Issues
+    Then the active sub tab should be Labels
     And no other main tabs should be active
+    And no other sub tabs should be active
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 745fd3471c4..80043463188 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -77,14 +77,14 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
 
   # Sub Tabs: Issues
 
-  step 'I click the "Milestones" tab' do
-    page.within('.layout-nav') do
+  step 'I click the "Milestones" sub tab' do
+    page.within('.sub-nav') do
       click_link('Milestones')
     end
   end
 
-  step 'I click the "Labels" tab' do
-    page.within('.layout-nav') do
+  step 'I click the "Labels" sub tab' do
+    page.within('.sub-nav') do
       click_link('Labels')
     end
   end
@@ -93,11 +93,11 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     ensure_active_sub_tab('Issues')
   end
 
-  step 'the active main tab should be Milestones' do
-    ensure_active_main_tab('Milestones')
+  step 'the active sub tab should be Milestones' do
+    ensure_active_sub_tab('Milestones')
   end
 
-  step 'the active main tab should be Labels' do
-    ensure_active_main_tab('Labels')
+  step 'the active sub tab should be Labels' do
+    ensure_active_sub_tab('Labels')
   end
 end
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index ace717b9909..4eef7aff213 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -6,7 +6,7 @@ module SharedActiveTab
   end
 
   def ensure_active_sub_tab(content)
-    expect(find('div.content ul.nav-links li.active')).to have_content(content)
+    expect(find('.sub-nav li.active')).to have_content(content)
   end
 
   def ensure_active_sub_nav(content)
@@ -18,7 +18,7 @@ module SharedActiveTab
   end
 
   step 'no other sub tabs should be active' do
-    expect(page).to have_selector('div.content ul.nav-links li.active', count: 1)
+    expect(page).to have_selector('.sub-nav li.active', count: 1)
   end
 
   step 'no other sub navs should be active' do

From 95f15b14d19203e99cb1e25c8c40edb61bf914e5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 10 Jun 2016 19:05:55 +0300
Subject: [PATCH 1395/1431] Render issues link on issues subnav unless you
 visit merge request controller

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/issues/_head.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
index 583cc1b975b..166dae248b6 100644
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
@@ -1,6 +1,6 @@
 %ul.nav-links.sub-nav
   %div{ class: (container_class) }
-    - if project_nav_tab?(:issues) && current_controller?(:issues)
+    - if project_nav_tab?(:issues) && !current_controller?(:merge_requests)
       = nav_link(controller: :issues) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do
           %span

From 308bb56781554b9d6436de674ae0291505fd2686 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 10 Jun 2016 19:12:24 +0300
Subject: [PATCH 1396/1431] Add CHANGELOG item for labels/milestones navigation
 change

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0c712b445a4..6487d33d5e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,6 +63,7 @@ v 8.9.0 (unreleased)
   - Toggling a task list item in a issue/mr description does not creates a Todo for mentions
   - Improved UX of date pickers on issue & milestone forms
   - Cache on the database if a project has an active external issue tracker.
+  - Put project Labels and Milestones pages links under Issues and Merge Requests tabs as subnav
 
 v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds

From a1db70770ef16b60075ff9ca650eb34f0e002b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 10 Jun 2016 15:21:02 +0200
Subject: [PATCH 1397/1431] Remove unused MergeRequest#gitlab_merge_status
 method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/merge_request.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 29f36570912..7b8858b24d6 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -276,14 +276,6 @@ class MergeRequest < ActiveRecord::Base
     true
   end
 
-  def gitlab_merge_status
-    if work_in_progress?
-      "work_in_progress"
-    else
-      merge_status_name
-    end
-  end
-
   def can_cancel_merge_when_build_succeeds?(current_user)
     can_be_merged_by?(current_user) || self.author == current_user
   end

From a1fbdbb6b106bcf6a959eb8f9a2a89dec6a15c9c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 9 Jun 2016 12:37:47 -0500
Subject: [PATCH 1398/1431] Move tanuki icon to center of nav bar; keep nav
 closed by default; remove collapsed nav cookie

---
 app/assets/javascripts/application.js.coffee  |  7 +----
 app/assets/javascripts/sidebar.js.coffee      |  9 -------
 app/assets/stylesheets/framework/header.scss  | 18 +++++++++++++
 app/assets/stylesheets/framework/nav.scss     |  1 +
 app/assets/stylesheets/framework/sidebar.scss | 27 ++++++++++---------
 app/views/layouts/_collapse_button.html.haml  |  5 +---
 app/views/layouts/_page.html.haml             |  7 +++--
 app/views/layouts/header/_default.html.haml   |  6 ++++-
 8 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index e0ca546350b..35b7d4a044a 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -241,7 +241,6 @@ $ ->
       $this.attr 'value', $this.val()
 
   $sidebarGutterToggle = $('.js-sidebar-toggle')
-  $navIconToggle = $('.toggle-nav-collapse')
 
   $(document)
     .off 'breakpoint:change'
@@ -251,10 +250,6 @@ $ ->
         if $gutterIcon.hasClass('fa-angle-double-right')
           $sidebarGutterToggle.trigger('click')
 
-        $navIcon = $navIconToggle.find('.fa')
-        if $navIcon.hasClass('fa-angle-left')
-          $navIconToggle.trigger('click')
-
   fitSidebarForSize = ->
     oldBootstrapBreakpoint = bootstrapBreakpoint
     bootstrapBreakpoint = bp.getBreakpointSize()
@@ -263,7 +258,7 @@ $ ->
 
   checkInitialSidebarSize = ->
     bootstrapBreakpoint = bp.getBreakpointSize()
-    if bootstrapBreakpoint is "xs" or "sm"
+    if bootstrapBreakpoint is "xs"
       $(document).trigger('breakpoint:change', [bootstrapBreakpoint])
 
   $(window)
diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee
index ea4ac52da31..2ce63c16428 100644
--- a/app/assets/javascripts/sidebar.js.coffee
+++ b/app/assets/javascripts/sidebar.js.coffee
@@ -4,8 +4,6 @@ expanded = 'page-sidebar-expanded'
 toggleSidebar = ->
   $('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
   $('header').toggleClass("header-collapsed header-expanded")
-  $('.toggle-nav-collapse i').toggleClass("fa-angle-right fa-angle-left")
-  $.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' })
 
   setTimeout ( ->
     niceScrollBars = $('.nicescroll').niceScroll();
@@ -17,10 +15,3 @@ $(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
 
   toggleSidebar()
 )
-
-$ ->
-  size = bp.getBreakpointSize()
-
-  if size is "xs" or size is "sm"
-    if $('.page-with-sidebar').hasClass(expanded)
-      toggleSidebar()
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index b8d4233537b..f883ad1b8db 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -122,9 +122,18 @@ header {
       margin-top: -5px;
     }
 
+    .header-logo {
+      position: absolute;
+      left: 50%;
+      margin-left: -18px;
+      top: 7px;
+    }
+
     .title {
       margin: 0;
       font-size: 19px;
+      max-width: 250px;
+      display: inline-block;
       line-height: $header-height;
       font-weight: normal;
       color: $gl-text-color;
@@ -190,6 +199,15 @@ header {
   }
 }
 
+.tanuki-shape {
+  transition: all 0.8s;
+
+  &:hover, &.highlight {
+    fill: rgb(255, 255, 255);
+    transition: all 0.1s;
+  }
+}
+
 @media (max-width: $screen-xs-max) {
   header .container-fluid {
     font-size: 18px;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index a036799e15a..8982eaa6833 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,6 +1,7 @@
 @mixin fade($gradient-direction, $rgba, $gradient-color) {
   visibility: visible;
   opacity: 1;
+  z-index: 2;
   position: absolute;
   bottom: 12px;
   width: 43px;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 06a688690f8..05c87cf0d49 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -66,19 +66,8 @@
   }
 }
 
-
-.tanuki-shape {
-  transition: all 0.8s;
-
-  &:hover, &.highlight {
-    fill: rgb(255, 255, 255);
-    transition: all 0.1s;
-  }
-}
-
-
 .nav-sidebar {
-  margin-top: 22 + $header-height;
+  margin-top: 22px;
   margin-bottom: 116px;
   transition-duration: .3s;
   list-style: none;
@@ -217,6 +206,20 @@
   }
 }
 
+.gitlab-text-container {
+  height: 50px;
+  padding: 5px;
+  text-align: center;
+
+  h3 {
+    color: white;
+    margin: 0;
+    font-size: 19px;
+    line-height: 41px;
+    font-weight: normal;
+  }
+}
+
 .page-sidebar-expanded {
   padding-left: $sidebar_width;
 
diff --git a/app/views/layouts/_collapse_button.html.haml b/app/views/layouts/_collapse_button.html.haml
index 2ed51d87ca1..61c0e71f031 100644
--- a/app/views/layouts/_collapse_button.html.haml
+++ b/app/views/layouts/_collapse_button.html.haml
@@ -1,4 +1 @@
-- if nav_menu_collapsed?
-  = link_to icon('angle-right'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
-- else
-  = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
+= link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 261038ef940..def874008f4 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,9 +1,8 @@
-.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
+.page-with-sidebar.page-sidebar-collapsed{ class: "#{page_gutter_class}" }
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
     = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
-      .header-logo
-        #logo
-          = brand_header_logo
+      .gitlab-text-container
+        %h3 GitLab
 
     - if defined?(sidebar) && sidebar
       = render "layouts/nav/#{sidebar}"
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index c33740e23fa..184dac32e5a 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
+%header.navbar.navbar-fixed-top.navbar-gitlab.header-collapsed
   %div{ class: fluid_layout ? "container-fluid" : "container-fluid" }
     .header-content
       %button.side-nav-toggle{type: 'button'}
@@ -50,6 +50,10 @@
 
       %h1.title= title
 
+      .header-logo
+        #logo
+          = brand_header_logo
+
       = yield :header_content
 
 = render 'shared/outdated_browser'

From ade0a4af8b85c16f6b36bee7216a3d29c4b4be0c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 9 Jun 2016 17:23:27 -0500
Subject: [PATCH 1399/1431] Fix logo at all screen widths, update sidebar text

---
 app/assets/javascripts/application.js.coffee  |  3 +-
 .../stylesheets/framework/gitlab-theme.scss   |  3 +-
 app/assets/stylesheets/framework/header.scss  | 39 +++++++----
 app/assets/stylesheets/framework/nav.scss     | 19 ++++++
 app/assets/stylesheets/framework/sidebar.scss | 64 ++++++++-----------
 .../stylesheets/framework/variables.scss      |  2 +-
 app/views/layouts/_page.html.haml             |  4 +-
 7 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 35b7d4a044a..03bb7fc1f7b 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -207,6 +207,7 @@ $ ->
 
   $('.navbar-toggle').on 'click', ->
     $('.header-content .title').toggle()
+    $('.header-content .header-logo').toggle()
     $('.header-content .navbar-collapse').toggle()
     $('.navbar-toggle').toggleClass('active')
     $('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
@@ -258,7 +259,7 @@ $ ->
 
   checkInitialSidebarSize = ->
     bootstrapBreakpoint = bp.getBreakpointSize()
-    if bootstrapBreakpoint is "xs"
+    if bootstrapBreakpoint is "xs" or "sm"
       $(document).trigger('breakpoint:change', [bootstrapBreakpoint])
 
   $(window)
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 2540ff497f2..bec0e514963 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -8,7 +8,7 @@
  */
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   .page-with-sidebar {
-    .header-logo {
+    .gitlab-text-container {
       background: $color-darker;
 
       a {
@@ -23,6 +23,7 @@
         background-color: $color-dark;
         a {
           color: $white-light;
+          text-decoration: none;
 
           h3 {
             color: $white-light;
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index f883ad1b8db..7897e544af5 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -109,15 +109,17 @@ header {
     position: relative;
     height: $header-height;
     padding-right: 40px;
-
-    @media (max-width: $screen-xs-min) {
-      padding-left: 40px;
-    }
+    padding-left: 30px;
+    transition-duration: .3s;
 
     @media (min-width: $screen-sm-min) {
       padding-right: 0;
     }
 
+    @media (max-width: $screen-sm-max) {
+      padding-right: 30px;
+    }
+
     .dropdown-menu {
       margin-top: -5px;
     }
@@ -127,6 +129,13 @@ header {
       left: 50%;
       margin-left: -18px;
       top: 7px;
+      transition-duration: .3s;
+      z-index: 999;
+
+      @media (max-width: $screen-sm-min) {
+        right: 25px;
+        left: auto;
+      }
     }
 
     .title {
@@ -142,6 +151,10 @@ header {
       vertical-align: top;
       white-space: nowrap;
 
+      @media (max-width: $screen-sm-min) {
+        max-width: 220px;
+      }
+
       a {
         color: $gl-text-color;
         &:hover {
@@ -169,6 +182,10 @@ header {
     .navbar-collapse {
       float: right;
       border-top: none;
+
+      @media (max-width: $screen-sm-min) {
+        float: none;
+      }
     }
   }
 
@@ -185,17 +202,11 @@ header {
   margin-left: 0;
 
   .header-content {
-    padding-left: 30px;
-    transition-duration: .3s;
-  }
-}
 
-.header-expanded {
-  margin-left: 0;
-
-  .header-content {
-    margin-left: $sidebar_width;
-    transition-duration: .3s;
+    @media (min-width: $screen-sm-max) {
+      padding-left: 30px;
+      transition-duration: .3s;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 8982eaa6833..75f44d81614 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -350,6 +350,8 @@
   }
 
   .nav-control {
+    padding-left: 0;
+    transition-duration: .3s;
 
     .fade-right {
       @media (min-width: $screen-xs-max) {
@@ -362,6 +364,23 @@
   }
 }
 
+.page-sidebar-collapsed {
+
+  .nav-control {
+    @media (min-width: $screen-md-min) {
+      padding-left: 32px;
+      transition-duration: .3s;
+    }
+  }
+
+  .layout-nav {
+
+    @media (max-width: $screen-sm-min) {
+      padding-left: 0;
+    }
+  }
+}
+
 .scrolling-tabs-container {
   position: relative;
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 05c87cf0d49..e461550984a 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -35,9 +35,9 @@
 }
 
 .sidebar-wrapper {
-  .header-logo {
+  .gitlab-text-container {
     height: $header-height;
-    padding: 8px 26px;
+    padding: 0 19px;
     width: $sidebar_width;
     position: fixed;
     z-index: 999;
@@ -47,6 +47,13 @@
     &:hover {
       background-color: #eee;
     }
+
+    h3 {
+      font-size: 19px;
+      line-height: 50px;
+      font-weight: normal;
+      margin: 0;
+    }
   }
 
   .sidebar-user {
@@ -66,8 +73,19 @@
   }
 }
 
+
+.tanuki-shape {
+  transition: all 0.8s;
+
+  &:hover, &.highlight {
+    fill: rgb(255, 255, 255);
+    transition: all 0.1s;
+  }
+}
+
+
 .nav-sidebar {
-  margin-top: 22px;
+  margin-top: 22 + $header-height;
   margin-bottom: 116px;
   transition-duration: .3s;
   list-style: none;
@@ -159,23 +177,15 @@
   .sidebar-wrapper {
     width: 0;
 
-    .header-logo {
+    .gitlab-text-container {
       width: 0;
-      padding: 8px 0;
+      padding: 0;
 
-      a {
-        padding-left: ($sidebar_collapsed_width - 36) / 2;
-
-        .gitlab-text-container {
-          display: none;
-        }
+      h3 {
+        display: none;
       }
     }
 
-    #logo {
-      display: none;
-    }
-
     .nav-sidebar {
       width: $sidebar_collapsed_width;
 
@@ -206,24 +216,10 @@
   }
 }
 
-.gitlab-text-container {
-  height: 50px;
-  padding: 5px;
-  text-align: center;
-
-  h3 {
-    color: white;
-    margin: 0;
-    font-size: 19px;
-    line-height: 41px;
-    font-weight: normal;
-  }
-}
-
 .page-sidebar-expanded {
   padding-left: $sidebar_width;
 
-  @media (max-width: $screen-xs-min) {
+  @media (max-width: $screen-sm-max) {
     padding-left: 0;
   }
 
@@ -246,13 +242,7 @@
   }
 
   .layout-nav {
-    @media (max-width: $screen-xs-min) {
-      padding-right: 0;
-    }
-
-    @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
-      padding-right: 90px;
-    }
+    padding-right: 0;
 
     @media (min-width: $screen-md-min) {
       padding-right: $sidebar_width;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 847b2f80bdf..6f724afa9df 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -1,7 +1,7 @@
 /*
  * Layout
  */
-$sidebar_collapsed_width: 62px;
+$sidebar_collapsed_width: 0;
 $sidebar_width: 90px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index def874008f4..6030613c8cf 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,7 +1,7 @@
 .page-with-sidebar.page-sidebar-collapsed{ class: "#{page_gutter_class}" }
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
-    = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
-      .gitlab-text-container
+    .gitlab-text-container
+      = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
         %h3 GitLab
 
     - if defined?(sidebar) && sidebar

From 5957fdc493af72579571368d584145acf10861a1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 9 Jun 2016 21:35:25 -0500
Subject: [PATCH 1400/1431] Fix profile test

---
 app/assets/stylesheets/framework/variables.scss | 2 +-
 features/steps/profile/profile.rb               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 6f724afa9df..847b2f80bdf 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -1,7 +1,7 @@
 /*
  * Layout
  */
-$sidebar_collapsed_width: 0;
+$sidebar_collapsed_width: 62px;
 $sidebar_width: 90px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index b1a87b96efd..9e5602dacf1 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -155,6 +155,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
   end
 
   step 'I click on my profile picture' do
+    find(:css, '.side-nav-toggle').click
     find(:css, '.sidebar-user').click
   end
 

From 9662a5e3df59216d7a3cc18b16bbf467b2233ece Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 9 Jun 2016 22:39:54 -0500
Subject: [PATCH 1401/1431] Update media queries

---
 app/assets/stylesheets/framework/header.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 7897e544af5..7ccd25bc1ba 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -132,7 +132,7 @@ header {
       transition-duration: .3s;
       z-index: 999;
 
-      @media (max-width: $screen-sm-min) {
+      @media (max-width: $screen-xs-max) {
         right: 25px;
         left: auto;
       }
@@ -151,7 +151,7 @@ header {
       vertical-align: top;
       white-space: nowrap;
 
-      @media (max-width: $screen-sm-min) {
+      @media (max-width: $screen-xs-max) {
         max-width: 220px;
       }
 
@@ -183,7 +183,7 @@ header {
       float: right;
       border-top: none;
 
-      @media (max-width: $screen-sm-min) {
+      @media (max-width: $screen-xs-max) {
         float: none;
       }
     }

From cb126995aa57cc9e169f875fbd4f9b5b82575a27 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 10 Jun 2016 10:41:00 -0500
Subject: [PATCH 1402/1431] Revert side nav to full width; remove border under
 nav; remove tooltips on nav links; stop page content shifting with side nav;
 put project nav in container

---
 app/assets/javascripts/application.js.coffee  |  6 --
 .../stylesheets/framework/gitlab-theme.scss   | 23 --------
 app/assets/stylesheets/framework/header.scss  | 11 ++--
 app/assets/stylesheets/framework/nav.scss     | 21 +------
 app/assets/stylesheets/framework/sidebar.scss | 55 +++----------------
 .../stylesheets/framework/variables.scss      |  2 +-
 app/views/layouts/_collapse_button.html.haml  |  2 +-
 app/views/layouts/_page.html.haml             |  5 +-
 app/views/layouts/ci/_page.html.haml          |  6 --
 app/views/layouts/nav/_admin.html.haml        | 38 ++++++-------
 app/views/layouts/nav/_dashboard.html.haml    | 20 +++----
 app/views/layouts/nav/_explore.html.haml      |  8 +--
 12 files changed, 52 insertions(+), 145 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 03bb7fc1f7b..e5531c02836 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -169,12 +169,6 @@ $ ->
     container: 'body'
   )
 
-  $('.page-with-sidebar').tooltip(
-    selector: '.sidebar-collapsed .nav-sidebar a, .sidebar-collapsed a.sidebar-user'
-    placement: 'right'
-    container: 'body'
-  )
-
   # Form submitter
   $('.trigger-submit').on 'change', ->
     $(@).parents('form').submit()
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index bec0e514963..245e8b285e9 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -8,29 +8,6 @@
  */
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   .page-with-sidebar {
-    .gitlab-text-container {
-      background: $color-darker;
-
-      a {
-        color: $color-light;
-
-        h3 {
-          color: $color-light;
-        }
-      }
-
-      &:hover {
-        background-color: $color-dark;
-        a {
-          color: $white-light;
-          text-decoration: none;
-
-          h3 {
-            color: $white-light;
-          }
-        }
-      }
-    }
 
     .collapse-nav a {
       color: $white-light;
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 7ccd25bc1ba..824f5cd21b4 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -28,7 +28,6 @@ header {
     height: $header-height;
     background-color: $background-color;
     border: none;
-    border-bottom: 1px solid $border-color;
 
     @media (max-width: $screen-xs-min) {
       padding: 0 16px;
@@ -132,6 +131,10 @@ header {
       transition-duration: .3s;
       z-index: 999;
 
+      &:hover {
+        cursor: pointer;
+      }
+
       @media (max-width: $screen-xs-max) {
         right: 25px;
         left: auto;
@@ -141,7 +144,7 @@ header {
     .title {
       margin: 0;
       font-size: 19px;
-      max-width: 250px;
+      max-width: 400px;
       display: inline-block;
       line-height: $header-height;
       font-weight: normal;
@@ -151,8 +154,8 @@ header {
       vertical-align: top;
       white-space: nowrap;
 
-      @media (max-width: $screen-xs-max) {
-        max-width: 220px;
+      @media (max-width: $screen-sm-max) {
+        max-width: 190px;
       }
 
       a {
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 75f44d81614..793d4e0479f 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -350,12 +350,10 @@
   }
 
   .nav-control {
-    padding-left: 0;
-    transition-duration: .3s;
 
     .fade-right {
       @media (min-width: $screen-xs-max) {
-        right: 67px;
+        right: 68px;
       }
       @media (max-width: $screen-xs-min) {
         right: 0;
@@ -364,23 +362,6 @@
   }
 }
 
-.page-sidebar-collapsed {
-
-  .nav-control {
-    @media (min-width: $screen-md-min) {
-      padding-left: 32px;
-      transition-duration: .3s;
-    }
-  }
-
-  .layout-nav {
-
-    @media (max-width: $screen-sm-min) {
-      padding-left: 0;
-    }
-  }
-}
-
 .scrolling-tabs-container {
   position: relative;
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index e461550984a..a96ce022309 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -35,31 +35,11 @@
 }
 
 .sidebar-wrapper {
-  .gitlab-text-container {
-    height: $header-height;
-    padding: 0 19px;
-    width: $sidebar_width;
-    position: fixed;
-    z-index: 999;
-    overflow: hidden;
-    transition-duration: .3s;
-
-    &:hover {
-      background-color: #eee;
-    }
-
-    h3 {
-      font-size: 19px;
-      line-height: 50px;
-      font-weight: normal;
-      margin: 0;
-    }
-  }
 
   .sidebar-user {
     padding: 15px 22px;
     position: fixed;
-    bottom: 40px;
+    bottom: 0;
     width: $sidebar_width;
     overflow: hidden;
     transition-duration: .3s;
@@ -104,10 +84,10 @@
     }
 
     a {
-      text-align: center;
-      padding: 8px;
+      width: $sidebar_width;
+      padding: 7px 15px 7px 23px;
       font-size: $gl-font-size;
-      color: $gray;
+      line-height: 24px;
       display: block;
       text-decoration: none;
       font-weight: normal;
@@ -125,10 +105,9 @@
         font-size: 16px;
       }
 
-      .nav-link-text {
-        margin-top: 3px;
-        font-size: 13px;
-        line-height: 18px;
+      i,
+      svg {
+        margin-right: 13px;
       }
 
       &.back-link i {
@@ -150,7 +129,7 @@
 .collapse-nav a {
   width: $sidebar_width;
   position: fixed;
-  bottom: 0;
+  top: 0;
   left: 0;
   font-size: 13px;
   background: transparent;
@@ -177,15 +156,6 @@
   .sidebar-wrapper {
     width: 0;
 
-    .gitlab-text-container {
-      width: 0;
-      padding: 0;
-
-      h3 {
-        display: none;
-      }
-    }
-
     .nav-sidebar {
       width: $sidebar_collapsed_width;
 
@@ -217,7 +187,6 @@
 }
 
 .page-sidebar-expanded {
-  padding-left: $sidebar_width;
 
   @media (max-width: $screen-sm-max) {
     padding-left: 0;
@@ -240,14 +209,6 @@
       }
     }
   }
-
-  .layout-nav {
-    padding-right: 0;
-
-    @media (min-width: $screen-md-min) {
-      padding-right: $sidebar_width;
-    }
-  }
 }
 
 .right-sidebar-collapsed {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 847b2f80bdf..752d8ec8788 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -2,7 +2,7 @@
  * Layout
  */
 $sidebar_collapsed_width: 62px;
-$sidebar_width: 90px;
+$sidebar_width: 220px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
 $gutter_inner_width: 258px;
diff --git a/app/views/layouts/_collapse_button.html.haml b/app/views/layouts/_collapse_button.html.haml
index 61c0e71f031..e4fab897377 100644
--- a/app/views/layouts/_collapse_button.html.haml
+++ b/app/views/layouts/_collapse_button.html.haml
@@ -1 +1 @@
-= link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
+= link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 6030613c8cf..c08aec959fc 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,8 +1,5 @@
 .page-with-sidebar.page-sidebar-collapsed{ class: "#{page_gutter_class}" }
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
-    .gitlab-text-container
-      = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
-        %h3 GitLab
 
     - if defined?(sidebar) && sidebar
       = render "layouts/nav/#{sidebar}"
@@ -18,7 +15,7 @@
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s46'
   - if defined?(nav) && nav
     .layout-nav
-      .container-fluid
+      %div{ class: (container_class) }
         = render "layouts/nav/#{nav}"
   .content-wrapper{ class: "#{layout_nav_class}" }
     = render "layouts/broadcast"
diff --git a/app/views/layouts/ci/_page.html.haml b/app/views/layouts/ci/_page.html.haml
index a13241bebee..2e56d0ac6a3 100644
--- a/app/views/layouts/ci/_page.html.haml
+++ b/app/views/layouts/ci/_page.html.haml
@@ -1,12 +1,6 @@
 .page-with-sidebar{ class: page_sidebar_class }
   = render "layouts/broadcast"
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
-    .header-logo
-      %a#logo
-        = brand_header_logo
-      = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
-        .gitlab-text-container
-          %h3 GitLab
 
     - if defined?(sidebar) && sidebar
       = render "layouts/ci/#{sidebar}"
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index de2276e75e4..40c47487fa8 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -2,102 +2,102 @@
   = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
     = link_to admin_root_path, title: 'Overview' do
       = icon('dashboard fw')
-      .nav-link-text
+      %span
         Overview
   = nav_link(controller: [:admin, :projects]) do
     = link_to admin_namespaces_projects_path, title: 'Projects' do
       = icon('cube fw')
-      .nav-link-text
+      %span
         Projects
   = nav_link(controller: :users) do
     = link_to admin_users_path, title: 'Users' do
       = icon('user fw')
-      .nav-link-text
+      %span
         Users
   = nav_link(controller: :groups) do
     = link_to admin_groups_path, title: 'Groups' do
       = icon('group fw')
-      .nav-link-text
+      %span
         Groups
   = nav_link(controller: :deploy_keys) do
     = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
       = icon('key fw')
-      .nav-link-text
+      %span
         Deploy Keys
   = nav_link path: ['runners#index', 'runners#show'] do
     = link_to admin_runners_path, title: 'Runners' do
       = icon('cog fw')
-      .nav-link-text
+      %span
         Runners
   = nav_link path: 'builds#index' do
     = link_to admin_builds_path, title: 'Builds' do
       = icon('link fw')
-      .nav-link-text
+      %span
         Builds
   = nav_link(controller: :logs) do
     = link_to admin_logs_path, title: 'Logs' do
       = icon('file-text fw')
-      .nav-link-text
+      %span
         Logs
   = nav_link(controller: :health_check) do
     = link_to admin_health_check_path, title: 'Health Check' do
       = icon('medkit fw')
-      .nav-link-text
+      %span
         Health Check
   = nav_link(controller: :broadcast_messages) do
     = link_to admin_broadcast_messages_path, title: 'Messages' do
       = icon('bullhorn fw')
-      .nav-link-text
+      %span
         Messages
   = nav_link(controller: :hooks) do
     = link_to admin_hooks_path, title: 'Hooks' do
       = icon('external-link fw')
-      .nav-link-text
+      %span
         Hooks
   = nav_link(controller: :background_jobs) do
     = link_to admin_background_jobs_path, title: 'Background Jobs' do
       = icon('cog fw')
-      .nav-link-text
+      %span
         Background Jobs
   = nav_link(controller: :appearances) do
     = link_to admin_appearances_path, title: 'Appearances' do
       = icon('image')
-      .nav-link-text
+      %span
         Appearance
 
   = nav_link(controller: :applications) do
     = link_to admin_applications_path, title: 'Applications' do
       = icon('cloud fw')
-      .nav-link-text
+      %span
         Applications
 
   = nav_link(controller: :services) do
     = link_to admin_application_settings_services_path, title: 'Service Templates' do
       = icon('copy fw')
-      .nav-link-text
+      %span
         Service Templates
 
   = nav_link(controller: :labels) do
     = link_to admin_labels_path, title: 'Labels' do
       = icon('tags fw')
-      .nav-link-text
+      %span
         Labels
 
   = nav_link(controller: :abuse_reports) do
     = link_to admin_abuse_reports_path, title: "Abuse Reports" do
       = icon('exclamation-circle fw')
-      .nav-link-text
+      %span
         Abuse Reports
 
   - if askimet_enabled?
     = nav_link(controller: :spam_logs) do
       = link_to admin_spam_logs_path, title: "Spam Logs" do
         = icon('exclamation-triangle fw')
-        .nav-link-text
+        %span
           Spam Logs
 
   = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to admin_application_settings_path, title: 'Settings' do
       = icon('cogs fw')
-      .nav-link-text
+      %span
         Settings
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index b73fde7797f..5dc85ef0d96 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -2,50 +2,50 @@
   = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
     = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
       = navbar_icon('project')
-      .nav-link-text
+      %span
         Projects
   = nav_link(controller: :todos) do
     = link_to dashboard_todos_path, title: 'Todos' do
       = icon('bell fw')
-      .nav-link-text
+      %span
         Todos
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
       = navbar_icon('activity')
-      .nav-link-text
+      %span
         Activity
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = navbar_icon('group')
-      .nav-link-text
+      %span
         Groups
   = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = navbar_icon('milestones')
-      .nav-link-text
+      %span
         Milestones
   = nav_link(path: 'dashboard#issues') do
     = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
       = navbar_icon('issues')
-      .nav-link-text
+      %span
         Issues
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = navbar_icon('mr')
-      .nav-link-text
+      %span
         Merge Requests
   = nav_link(controller: :snippets) do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')
-      .nav-link-text
+      %span
         Snippets
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
       = icon('question-circle fw')
-      .nav-link-text
+      %span
         Help
   = nav_link(html_options: {class: profile_tab_class}) do
     = link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
       = icon('user fw')
-      .nav-link-text
+      %span
         Profile Settings
diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml
index 46fcf1545f2..3b40006a0cc 100644
--- a/app/views/layouts/nav/_explore.html.haml
+++ b/app/views/layouts/nav/_explore.html.haml
@@ -2,20 +2,20 @@
   = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
     = link_to explore_root_path, title: 'Projects' do
       = icon('bookmark fw')
-      .nav-link-text
+      %span
         Projects
   = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to explore_groups_path, title: 'Groups' do
       = icon('group fw')
-      .nav-link-text
+      %span
         Groups
   = nav_link(controller: :snippets) do
     = link_to explore_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')
-      .nav-link-text
+      %span
         Snippets
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help' do
       = icon('question-circle fw')
-      .nav-link-text
+      %span
         Help

From 67a18f34e93ce8aa990794558371096f8f3a4e4c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 10 Jun 2016 12:01:16 -0500
Subject: [PATCH 1403/1431] Fix safari logo loading animation safari bug

---
 app/assets/javascripts/application.js.coffee | 7 -------
 app/assets/javascripts/logo.js.coffee        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index e5531c02836..69d4c4f5dd3 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -162,13 +162,6 @@ $ ->
       $el.data('placement') || 'bottom'
   )
 
-  $('.header-logo .home').tooltip(
-    placement: (_, el) ->
-      $el = $(el)
-      if $('.page-with-sidebar').hasClass('page-sidebar-collapsed') then 'right' else 'bottom'
-    container: 'body'
-  )
-
   # Form submitter
   $('.trigger-submit').on 'change', ->
     $(@).parents('form').submit()
diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee
index d14b7139237..9fdc27a9787 100644
--- a/app/assets/javascripts/logo.js.coffee
+++ b/app/assets/javascripts/logo.js.coffee
@@ -47,4 +47,4 @@ $ ->
   # Make logo clickable as part of a workaround for Safari visited
   # link behaviour (See !2690).
   $('#logo').on 'click', ->
-    $('#js-shortcuts-home').get(0).click()
+    Turbolinks.visit('/')

From f03df228155ae2d8dd779bd1a8e4078698b23c06 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 8 Jun 2016 18:04:31 -0700
Subject: [PATCH 1404/1431] Only create the backup directory if it is local

Closes #12710
---
 lib/backup/manager.rb | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 9dd665441a0..2ff3e3bdfb0 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -38,7 +38,6 @@ module Backup
     end
 
     def upload(tar_file)
-      remote_directory = Gitlab.config.backup.upload.remote_directory
       $progress.print "Uploading backup archive to remote storage #{remote_directory} ... "
 
       connection_settings = Gitlab.config.backup.upload.connection
@@ -47,8 +46,7 @@ module Backup
         return
       end
 
-      connection = ::Fog::Storage.new(connection_settings)
-      directory = connection.directories.create(key: remote_directory)
+      directory = connect_to_remote_directory(connection_settings)
 
       if directory.files.create(key: tar_file, body: File.open(tar_file), public: false,
           multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size,
@@ -155,6 +153,23 @@ module Backup
 
     private
 
+    def connect_to_remote_directory(connection_settings)
+      connection = ::Fog::Storage.new(connection_settings)
+
+      # We only attempt to create the directory for local backups. For AWS
+      # and other cloud providers, we cannot guarantee the user will have
+      # permission to create the bucket.
+      if connection.service == ::Fog::Storage::Local
+        connection.directories.create(key: remote_directory)
+      else
+        connection.directories.get(remote_directory)
+      end
+    end
+
+    def remote_directory
+      Gitlab.config.backup.upload.remote_directory
+    end
+
     def backup_contents
       folders_to_backup + archives_to_backup + ["backup_information.yml"]
     end

From 630aeb31eb7728789d1f7659ec0e12ea5a5fd59c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 10 Jun 2016 12:27:05 -0500
Subject: [PATCH 1405/1431] Add back sidebar counters and username

---
 .../stylesheets/framework/gitlab-theme.scss     |  6 +++++-
 app/assets/stylesheets/framework/header.scss    |  1 +
 app/assets/stylesheets/framework/nav.scss       |  1 -
 app/assets/stylesheets/framework/sidebar.scss   | 17 ++++++++++++++---
 app/helpers/nav_helper.rb                       |  8 +-------
 app/views/layouts/_page.html.haml               |  6 ++++--
 app/views/layouts/header/_default.html.haml     |  2 +-
 app/views/layouts/nav/_admin.html.haml          |  4 ++++
 app/views/layouts/nav/_dashboard.html.haml      |  3 +++
 9 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 245e8b285e9..408d4a68e1e 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -10,8 +10,12 @@
   .page-with-sidebar {
 
     .collapse-nav a {
-      color: $white-light;
+      color: $color-light;
       background: $color;
+
+      &:hover {
+        color: $white-light;
+      }
     }
 
     .sidebar-wrapper {
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 824f5cd21b4..c07b2753f4d 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -28,6 +28,7 @@ header {
     height: $header-height;
     background-color: $background-color;
     border: none;
+    border-bottom: 1px solid $border-color;
 
     @media (max-width: $screen-xs-min) {
       padding: 0 16px;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 793d4e0479f..ffdd8e7e0d4 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -172,7 +172,6 @@
     > form {
       display: inline-block;
       margin-top: -1px;
-      margin-bottom: 12px;
     }
 
     .icon-label {
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index a96ce022309..b7ec3f70bfb 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -115,6 +115,12 @@
       }
     }
   }
+
+  .count {
+    float: right;
+    padding: 0 8px;
+    @include border-radius(6px);
+  }
 }
 
 .sidebar-subnav {
@@ -131,9 +137,10 @@
   position: fixed;
   top: 0;
   left: 0;
-  font-size: 13px;
+  padding: 5px 0;
+  font-size: 18px;
   background: transparent;
-  height: 40px;
+  height: 50px;
   text-align: center;
   line-height: 40px;
   transition-duration: .3s;
@@ -157,7 +164,7 @@
     width: 0;
 
     .nav-sidebar {
-      width: $sidebar_collapsed_width;
+      width: 0;
 
       li {
         width: auto;
@@ -172,6 +179,10 @@
 
     .collapse-nav a {
       width: 0;
+
+      i {
+        display: none;
+      }
     }
 
     .sidebar-user {
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 39831ce2e48..469accf3142 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -36,13 +36,7 @@ module NavHelper
   end
 
   def nav_header_class
-    class_name =
-      if nav_menu_collapsed?
-        "header-collapsed"
-      else
-        "header-expanded"
-      end
-    class_name += " with-horizontal-nav" if defined?(nav) && nav
+    class_name = " with-horizontal-nav" if defined?(nav) && nav
     class_name
   end
 
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index c08aec959fc..1a721b0c296 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -11,8 +11,10 @@
     .collapse-nav
       = render partial: 'layouts/collapse_button'
     - if current_user
-      = link_to current_user, class: 'sidebar-user', title: "Profile", data: {user: current_user.username} do
-        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s46'
+      = link_to current_user, class: 'sidebar-user', title: "Profile" do
+        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
+        .username
+          = current_user.username
   - if defined?(nav) && nav
     .layout-nav
       %div{ class: (container_class) }
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 184dac32e5a..ad30a367fc5 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab.header-collapsed
+%header.navbar.navbar-fixed-top.navbar-gitlab.header-collapsed{ class: nav_header_class }
   %div{ class: fluid_layout ? "container-fluid" : "container-fluid" }
     .header-content
       %button.side-nav-toggle{type: 'button'}
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 40c47487fa8..f292730fe45 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -29,11 +29,13 @@
       = icon('cog fw')
       %span
         Runners
+        %span.count= number_with_delimiter(Ci::Runner.count(:all))
   = nav_link path: 'builds#index' do
     = link_to admin_builds_path, title: 'Builds' do
       = icon('link fw')
       %span
         Builds
+        %span.count= number_with_delimiter(Ci::Build.count(:all))
   = nav_link(controller: :logs) do
     = link_to admin_logs_path, title: 'Logs' do
       = icon('file-text fw')
@@ -88,6 +90,7 @@
       = icon('exclamation-circle fw')
       %span
         Abuse Reports
+        %span.count= number_with_delimiter(AbuseReport.count(:all))
 
   - if askimet_enabled?
     = nav_link(controller: :spam_logs) do
@@ -95,6 +98,7 @@
         = icon('exclamation-triangle fw')
         %span
           Spam Logs
+          %span.count= number_with_delimiter(SpamLog.count(:all))
 
   = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to admin_application_settings_path, title: 'Settings' do
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 5dc85ef0d96..18cae5bf87f 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -9,6 +9,7 @@
       = icon('bell fw')
       %span
         Todos
+        %span.count= number_with_delimiter(todos_pending_count)
   = nav_link(path: 'dashboard#activity') do
     = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
       = navbar_icon('activity')
@@ -29,11 +30,13 @@
       = navbar_icon('issues')
       %span
         Issues
+        %span.count= number_with_delimiter(current_user.assigned_issues.opened.count)
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       = navbar_icon('mr')
       %span
         Merge Requests
+        %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count)
   = nav_link(controller: :snippets) do
     = link_to dashboard_snippets_path, title: 'Snippets' do
       = icon('clipboard fw')

From 3714e1914b6b891274ab7d8b8db8f21dedd29e37 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 10 Jun 2016 21:25:48 +0200
Subject: [PATCH 1406/1431] Improve after review

---
 doc/ci/yaml/README.md                        | 2 +-
 lib/ci/gitlab_ci_yaml_processor.rb           | 4 ++--
 spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 39fad549a04..0707555e393 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -670,7 +670,7 @@ failure.
 
 **Example configurations**
 
-To upload artifacts only when build fails
+To upload artifacts only when build fails.
 
 ```yaml
 job:
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 15d57a46eb0..40a5d180fd0 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -208,7 +208,7 @@ module Ci
         raise ValidationError, "#{name} job: allow_failure parameter should be an boolean"
       end
 
-      if job[:when] && !job[:when].in?(%w(on_success on_failure always))
+      if job[:when] && !job[:when].in?(%w[on_success on_failure always])
         raise ValidationError, "#{name} job: when parameter should be on_success, on_failure or always"
       end
     end
@@ -279,7 +279,7 @@ module Ci
         raise ValidationError, "#{name} job: artifacts:paths parameter should be an array of strings"
       end
 
-      if job[:artifacts][:when] && !job[:artifacts][:when].in?(%w(on_success on_failure always))
+      if job[:artifacts][:when] && !job[:artifacts][:when].in?(%w[on_success on_failure always])
         raise ValidationError, "#{name} job: artifacts:when parameter should be on_success, on_failure or always"
       end
     end
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 3d3715f0ef0..fe1e8b2262e 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -602,7 +602,7 @@ module Ci
         })
       end
 
-      %w(on_success on_failure always).each do |when_state|
+      %w[on_success on_failure always].each do |when_state|
         it "returns artifacts for when #{when_state}  defined" do
           config = YAML.dump({
                                rspec: {
@@ -612,6 +612,7 @@ module Ci
                              })
 
           config_processor = GitlabCiYamlProcessor.new(config, path)
+
           builds = config_processor.builds_for_stage_and_ref("test", "master")
           expect(builds.size).to eq(1)
           expect(builds.first[:options][:artifacts][:when]).to eq(when_state)

From 3e28d04cced2c417ee9144a17866e0cc2c910a6c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 10 Jun 2016 15:08:13 -0500
Subject: [PATCH 1407/1431] Fix preferences_spec test

---
 app/assets/stylesheets/framework/header.scss | 4 ----
 app/views/layouts/_page.html.haml            | 2 +-
 spec/features/profiles/preferences_spec.rb   | 8 +++++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c07b2753f4d..63996ea44f6 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -116,10 +116,6 @@ header {
       padding-right: 0;
     }
 
-    @media (max-width: $screen-sm-max) {
-      padding-right: 30px;
-    }
-
     .dropdown-menu {
       margin-top: -5px;
     }
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 1a721b0c296..dbf425d46c7 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -11,7 +11,7 @@
     .collapse-nav
       = render partial: 'layouts/collapse_button'
     - if current_user
-      = link_to current_user, class: 'sidebar-user', title: "Profile" do
+      = link_to current_user, class: 'sidebar-user', title: "Profile", data: {user: current_user.username} do
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
         .username
           = current_user.username
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb
index 8f645438cff..787bf42d048 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/preferences_spec.rb
@@ -54,7 +54,7 @@ describe 'Profile > Preferences', feature: true do
     end
   end
 
-  describe 'User changes their default dashboard' do
+  describe 'User changes their default dashboard', js: true do
     it 'creates a flash message' do
       select 'Starred Projects', from: 'user_dashboard'
       click_button 'Save'
@@ -66,8 +66,10 @@ describe 'Profile > Preferences', feature: true do
       select 'Starred Projects', from: 'user_dashboard'
       click_button 'Save'
 
-      click_link 'Dashboard'
-      expect(page.current_path).to eq starred_dashboard_projects_path
+      allowing_for_delay do
+        find('#logo').click
+        expect(page.current_path).to eq starred_dashboard_projects_path
+      end
 
       click_link 'Your Projects'
       expect(page.current_path).to eq dashboard_projects_path

From 952660d2cf9b2e25b2014d117cce3bf4c93d6818 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 10 Jun 2016 12:40:54 -0500
Subject: [PATCH 1408/1431] Fixes a bug when assigning a label to multiple
 issues

Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
---
 .../issues-bulk-assignment.js.coffee            | 17 +++++++++++++----
 .../issues/bulk_assigment_labels_spec.rb        | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index 16d023dd391..9dc3529a17f 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -97,13 +97,22 @@ class @IssuableBulkActions
     $labels = @form.find('.labels-filter input[name="update[label_ids][]"]')
 
     $labels.each (k, label) ->
-      labelIds.push $(label).val() if label
+      labelIds.push parseInt($(label).val()) if label
 
     labelIds
 
   ###*
-   * Just an alias of @getUnmarkedIndeterminedLabels
-   * @return {Array} Array of labels
+   * Returns Label IDs that will be removed from issue selection
+   * @return {Array} Array of labels IDs
   ###
   getLabelsToRemove: ->
-    @getUnmarkedIndeterminedLabels()
+    result = []
+    indeterminatedLabels = @getUnmarkedIndeterminedLabels()
+    labelsToApply = @getLabelsToApply()
+
+    indeterminatedLabels.map (id) ->
+      # We need to exclude label IDs that will be applied
+      # By not doing this will cause issues from selection to not add labels at all
+      result.push(id) if labelsToApply.indexOf(id) is -1
+
+    result
diff --git a/spec/features/issues/bulk_assigment_labels_spec.rb b/spec/features/issues/bulk_assigment_labels_spec.rb
index c58b87281a3..0fbc2062e39 100644
--- a/spec/features/issues/bulk_assigment_labels_spec.rb
+++ b/spec/features/issues/bulk_assigment_labels_spec.rb
@@ -83,6 +83,23 @@ feature 'Issues > Labels bulk assignment', feature: true do
       end
     end
 
+    context 'can assign a label to all issues when label is present' do
+      before do
+        issue2.labels << bug
+        issue2.labels << feature
+        visit namespace_project_issues_path(project.namespace, project)
+
+        check 'check_all_issues'
+        open_labels_dropdown ['bug']
+        update_issues
+      end
+
+      it do
+        expect(find("#issue_#{issue1.id}")).to have_content 'bug'
+        expect(find("#issue_#{issue2.id}")).to have_content 'bug'
+      end
+    end
+
     context 'can bulk un-assign' do
       context 'all labels to all issues' do
         before do

From a46b4f11d5afbeaec4fa0caed85b395e3d9d428d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 11 Jun 2016 11:30:53 +0300
Subject: [PATCH 1409/1431] Center layout navigation and remove icons

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/nav.scss |  2 ++
 app/views/layouts/_page.html.haml         |  2 +-
 app/views/layouts/nav/_group.html.haml    |  6 ------
 app/views/layouts/nav/_profile.html.haml  | 10 ----------
 app/views/layouts/nav/_project.html.haml  | 10 ----------
 5 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index ffdd8e7e0d4..4de89daeb36 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -69,6 +69,7 @@
   }
 
   &.sub-nav {
+    text-align: center;
     background-color: $background-color;
 
     .container-fluid {
@@ -250,6 +251,7 @@
   background: $background-color;
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;
+  text-align: center;
 
   .container-fluid {
     position: relative;
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index dbf425d46c7..f89e8582792 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -17,7 +17,7 @@
           = current_user.username
   - if defined?(nav) && nav
     .layout-nav
-      %div{ class: (container_class) }
+      .container-fluid
         = render "layouts/nav/#{nav}"
   .content-wrapper{ class: "#{layout_nav_class}" }
     = render "layouts/broadcast"
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 9cbee0aa363..66361a644dd 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -5,36 +5,30 @@
     .fade-left
     = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
       = link_to group_path(@group), title: 'Home' do
-        = navbar_icon('group')
         %span
           Group
     = nav_link(path: 'groups#activity') do
       = link_to activity_group_path(@group), title: 'Activity' do
-        = navbar_icon('activity')
         %span
           Activity
     = nav_link(controller: [:group, :milestones]) do
       = link_to group_milestones_path(@group), title: 'Milestones' do
-        = navbar_icon('milestones')
         %span
           Milestones
     = nav_link(path: 'groups#issues') do
       = link_to issues_group_path(@group), title: 'Issues' do
-        = navbar_icon('issues')
         %span
           Issues
           - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
           %span.badge.count= number_with_delimiter(issues.count)
     = nav_link(path: 'groups#merge_requests') do
       = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
-        = navbar_icon('mr')
         %span
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
           %span.badge.count= number_with_delimiter(merge_requests.count)
     = nav_link(controller: [:group_members]) do
       = link_to group_group_members_path(@group), title: 'Members' do
-        = navbar_icon('members')
         %span
           Members
     .fade-right
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 09d9f0184be..d4b1f477f3f 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -2,51 +2,41 @@
   .fade-left
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: 'Profile Settings' do
-      = icon('user fw')
       %span
         Profile
   = nav_link(controller: [:accounts, :two_factor_auths]) do
     = link_to profile_account_path, title: 'Account' do
-      = icon('gear fw')
       %span
         Account
   - if current_application_settings.user_oauth_applications?
     = nav_link(controller: 'oauth/applications') do
       = link_to applications_profile_path, title: 'Applications' do
-        = icon('cloud fw')
         %span
           Applications
   = nav_link(controller: :emails) do
     = link_to profile_emails_path, title: 'Emails' do
-      = icon('envelope-o fw')
       %span
         Emails
   - unless current_user.ldap_user?
     = nav_link(controller: :passwords) do
       = link_to edit_profile_password_path, title: 'Password' do
-        = icon('lock fw')
         %span
           Password
   = nav_link(controller: :notifications) do
     = link_to profile_notifications_path, title: 'Notifications' do
-      = icon('inbox fw')
       %span
         Notifications
 
   = nav_link(controller: :keys) do
     = link_to profile_keys_path, title: 'SSH Keys' do
-      = icon('key fw')
       %span
         SSH Keys
   = nav_link(controller: :preferences) do
     = link_to profile_preferences_path, title: 'Preferences' do
-      -# TODO (rspeicher): Better icon?
-      = icon('image fw')
       %span
         Preferences
   = nav_link(path: 'profiles#audit_log') do
     = link_to audit_log_profile_path, title: 'Audit Log' do
-      = icon('history fw')
       %span
         Audit Log
   .fade-right
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 79cc5c02888..53d1fcc30a6 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -24,48 +24,41 @@
     .fade-left
     = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
       = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
-        = navbar_icon('project')
         %span
           Project
 
     = nav_link(path: 'projects#activity') do
       = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-        = navbar_icon('activity')
         %span
           Activity
 
     - if project_nav_tab? :files
       = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do
         = link_to project_files_path(@project), title: 'Code',  class: 'shortcuts-tree' do
-          = icon('code fw')
           %span
             Code
 
     - if project_nav_tab? :pipelines
       = nav_link(controller: :pipelines) do
         = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
-          = navbar_icon('pipelines')
           %span
             Pipelines
 
     - if project_nav_tab? :container_registry
       = nav_link(controller: %w(container_registry)) do
         = link_to project_container_registry_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
-          = icon('hdd-o fw')
           %span
             Registry
 
     - if project_nav_tab? :graphs
       = nav_link(controller: %w(graphs)) do
         = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
-          = icon('area-chart fw')
           %span
             Graphs
 
     - if project_nav_tab? :issues
       = nav_link(controller: [:issues, :labels, :milestones]) do
         = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
-          = navbar_icon('issues')
           %span
             Issues
             - if @project.default_issues_tracker?
@@ -74,7 +67,6 @@
     - if project_nav_tab? :merge_requests
       = nav_link(controller: :merge_requests) do
         = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
-          = navbar_icon('mr')
           %span
             Merge Requests
             %span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
@@ -82,14 +74,12 @@
     - if project_nav_tab? :wiki
       = nav_link(controller: :wikis) do
         = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
-          = navbar_icon('wiki')
           %span
             Wiki
 
     - if project_nav_tab? :snippets
       = nav_link(controller: :snippets) do
         = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
-          = icon('clipboard fw')
           %span
             Snippets
 

From a85dde9182f177cc2fdabd90ccdad870bf4d84c3 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 11 Jun 2016 07:16:32 -0700
Subject: [PATCH 1410/1431] Fix Error 500 when using closes_issues API with an
 external issue tracker

Closes #18484
---
 CHANGELOG                                |  1 +
 doc/api/merge_requests.md                | 13 ++++++++++++-
 lib/api/entities.rb                      |  5 +++++
 lib/api/helpers.rb                       |  8 ++++++++
 lib/api/merge_requests.rb                |  2 +-
 spec/requests/api/merge_requests_spec.rb | 15 +++++++++++++++
 6 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8f897b4a34c..99dd1d3ff4a 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.9.0 (unreleased)
+  - Fix Error 500 when using closes_issues API with an external issue tracker
   - Bulk assign/unassign labels to issues.
   - Ability to prioritize labels !4009 / !3205 (Thijs Wouters)
   - Fix endless redirections when accessing user OAuth applications when they are disabled
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 16b892dc3b7..2930f615fc1 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -572,7 +572,7 @@ GET /projects/:id/merge_requests/:merge_request_id/closes_issues
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/76/merge_requests/1/closes_issues
 ```
 
-Example response:
+Example response when the GitLab issue tracker is used:
 
 ```json
 [
@@ -618,6 +618,17 @@ Example response:
 ]
 ```
 
+Example response when an external issue tracker (e.g. JIRA) is used:
+
+```json
+[
+   {
+       "id" : "PROJECT-123",
+       "title" : "Title of this issue"
+   }
+]
+```
+
 ## Subscribe to a merge request
 
 Subscribes the authenticated user to a merge request to receive notification. If
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 50d69274b2e..14370ac218d 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -179,6 +179,11 @@ module API
       expose :upvotes, :downvotes
     end
 
+    class ExternalIssue < Grape::Entity
+      expose :title
+      expose :id
+    end
+
     class MergeRequest < ProjectEntity
       expose :target_branch, :source_branch
       expose :upvotes, :downvotes
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index e1d3bbcc02d..de5959e3aae 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -418,5 +418,13 @@ module API
     def send_git_archive(repository, ref:, format:)
       header(*Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format))
     end
+
+    def issue_entity(project)
+      if project.has_external_issue_tracker?
+        Entities::ExternalIssue
+      else
+        Entities::Issue
+      end
+    end
   end
 end
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 24df3e397e0..0e94efd4acd 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -329,7 +329,7 @@ module API
         get "#{path}/closes_issues" do
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
           issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
-          present paginate(issues), with: Entities::Issue, current_user: current_user
+          present paginate(issues), with: issue_entity(user_project), current_user: current_user
         end
       end
     end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 1356f87b0e9..5896b93603f 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -563,6 +563,21 @@ describe API::API, api: true  do
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(0)
     end
+
+    it 'handles external issues' do
+      jira_project = create(:jira_project, :public, name: 'JIR_EXT1')
+      issue = ExternalIssue.new("#{jira_project.name}-123", jira_project)
+      merge_request = create(:merge_request, :simple, author: user, assignee: user, source_project: jira_project)
+      merge_request.update_attribute(:description, "Closes #{issue.to_reference(jira_project)}")
+
+      get api("/projects/#{jira_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(1)
+      expect(json_response.first['title']).to eq(issue.title)
+      expect(json_response.first['id']).to eq(issue.id)
+    end
   end
 
   describe 'POST :id/merge_requests/:merge_request_id/subscription' do

From b43c6c43b4098f0633f24fbdc0ff249e3e6d4edc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 12 Jun 2016 23:05:19 +0200
Subject: [PATCH 1411/1431] Cache only apt and ruby from vendor

Since introduction of gitignore the vendor folder contains also gitignores which affects detection when to update a cache.
We explicitly cache only apt and ruby folders.
---
 .gitlab-ci.yml           | 3 ++-
 scripts/prepare_build.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dc48a89463..f1dcf990629 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,8 @@ services:
 cache:
   key: "ruby21"
   paths:
-  - vendor
+  - vendor/apt
+  - vendor/ruby
 
 variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index d6fb1a34e8c..7e71a030901 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -16,10 +16,10 @@ retry() {
 }
 
 if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
-    mkdir -p vendor
+    mkdir -p vendor/apt
 
     # Install phantomjs package
-    pushd vendor
+    pushd vendor/apt
     if [ ! -e 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
     fi

From f395ed242add9c21536a6e4d9ea7f0154351e503 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Sun, 12 Jun 2016 18:25:21 -0600
Subject: [PATCH 1412/1431] Update brakeman from 3.2.1 to 3.3.2

Removes a few dependencies.

Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES
---
 Gemfile      |  2 +-
 Gemfile.lock | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index b2660144f2b..6d8a33c2eef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -245,7 +245,7 @@ end
 
 group :development do
   gem "foreman"
-  gem 'brakeman', '~> 3.2.0', require: false
+  gem 'brakeman', '~> 3.3.0', require: false
 
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'quiet_assets', '~> 1.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index dfc15700494..2ba2676efa1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,16 +97,7 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    brakeman (3.2.1)
-      erubis (~> 2.6)
-      haml (>= 3.0, < 5.0)
-      highline (>= 1.6.20, < 2.0)
-      ruby2ruby (~> 2.3.0)
-      ruby_parser (~> 3.8.1)
-      safe_yaml (>= 1.0)
-      sass (~> 3.0)
-      slim (>= 1.3.6, < 4.0)
-      terminal-table (~> 1.4)
+    brakeman (3.3.2)
     browser (2.0.3)
     builder (3.2.2)
     bullet (5.0.0)
@@ -338,7 +329,6 @@ GEM
     hashie (3.4.3)
     health_check (1.5.1)
       rails (>= 2.3.0)
-    highline (1.7.8)
     hipchat (1.5.2)
       httparty
       mimemagic
@@ -642,10 +632,7 @@ GEM
     ruby-saml (1.1.2)
       nokogiri (>= 1.5.10)
       uuid (~> 2.3)
-    ruby2ruby (2.3.0)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.8.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
     rubyntlm (0.5.2)
     rubypants (0.2.0)
@@ -655,7 +642,7 @@ GEM
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.4.21)
+    sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -704,9 +691,6 @@ GEM
       tilt (>= 1.3, < 3)
     six (0.2.0)
     slack-notifier (1.2.1)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spinach (0.8.10)
       colorize
@@ -747,10 +731,8 @@ GEM
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.2.0)
       teaspoon (>= 1.0.0)
-    temple (0.7.6)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    terminal-table (1.5.2)
     test_after_commit (0.4.2)
       activerecord (>= 3.2)
     thin (1.6.4)
@@ -759,7 +741,7 @@ GEM
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     tinder (1.10.1)
@@ -848,7 +830,7 @@ DEPENDENCIES
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.3.0)
-  brakeman (~> 3.2.0)
+  brakeman (~> 3.3.0)
   browser (~> 2.0.3)
   bullet
   bundler-audit

From 02b882418a44bccbcde403886c560505abd60281 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Thu, 2 Jun 2016 00:37:25 -0300
Subject: [PATCH 1413/1431] Fix SVG whitelisting to allow namespaced attributes

---
 lib/gitlab/sanitizers/svg.rb           | 23 +++++++++---
 spec/lib/gitlab/sanitizers/svg_spec.rb | 48 ++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 spec/lib/gitlab/sanitizers/svg_spec.rb

diff --git a/lib/gitlab/sanitizers/svg.rb b/lib/gitlab/sanitizers/svg.rb
index 5e95f6c0529..a540c534dee 100644
--- a/lib/gitlab/sanitizers/svg.rb
+++ b/lib/gitlab/sanitizers/svg.rb
@@ -13,12 +13,11 @@ module Gitlab
           unless Whitelist::ALLOWED_ELEMENTS.include?(node.name)
             node.unlink
           else
-            node.attributes.each do |attr_name, attr|
-              valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name]
+            valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name]
 
-              unless valid_attributes && valid_attributes.include?(attr_name)
-                if Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) &&
-                    attr_name.start_with?('data-')
+            node.attribute_nodes.each do |attr|
+              unless valid_attributes && valid_attributes.include?(attribute_name_with_namespace(attr))
+                if Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) && data_attribute?(attr)
                   # Arbitrary data attributes are allowed. Verify that the attribute
                   # is a valid data attribute.
                   attr.unlink unless attr_name =~ DATA_ATTR_PATTERN
@@ -29,6 +28,20 @@ module Gitlab
             end
           end
         end
+
+        def attribute_name_with_namespace(attr)
+          if attr.namespace
+            "#{attr.namespace.prefix}:#{attr.name}"
+          else
+            attr.name
+          end
+        end
+
+        private
+
+        def data_attribute?(attr)
+          attr.name.start_with?('data-')
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/sanitizers/svg_spec.rb b/spec/lib/gitlab/sanitizers/svg_spec.rb
new file mode 100644
index 00000000000..bb1c98f51a6
--- /dev/null
+++ b/spec/lib/gitlab/sanitizers/svg_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Gitlab::Sanitizers::SVG do
+  let(:scrubber) { Gitlab::Sanitizers::SVG::Scrubber.new }
+  let(:namespace) { double(Nokogiri::XML::Namespace, prefix: 'xlink') }
+  let(:namespaced_attr) { double(Nokogiri::XML::Attr, name: 'href', namespace: namespace) }
+
+  context 'scrubber' do
+    describe '#scrub' do
+      let(:invalid_element) { double(Nokogiri::XML::Node, name: 'invalid') }
+      let(:invalid_attribute) { double(Nokogiri::XML::Attr, name: 'invalid', namespace: nil) }
+      let(:valid_element) { double(Nokogiri::XML::Node, name: 'use') }
+
+      it 'removes an invalid element' do
+        expect(invalid_element).to receive(:unlink)
+
+        scrubber.scrub(invalid_element)
+      end
+
+      it 'removes an invalid attribute' do
+        allow(valid_element).to receive(:attribute_nodes) { [invalid_attribute] }
+        expect(invalid_attribute).to receive(:unlink)
+
+        scrubber.scrub(valid_element)
+      end
+
+      it 'accepts valid element' do
+        allow(valid_element).to receive(:attribute_nodes) { [namespaced_attr] }
+        expect(valid_element).not_to receive(:unlink)
+
+        scrubber.scrub(valid_element)
+      end
+
+      it 'accepts valid namespaced attributes' do
+        allow(valid_element).to receive(:attribute_nodes) { [namespaced_attr] }
+        expect(namespaced_attr).not_to receive(:unlink)
+
+        scrubber.scrub(valid_element)
+      end
+    end
+
+    describe '#attribute_name_with_namespace' do
+      it 'returns name with prefix when attribute is namespaced' do
+        expect(scrubber.attribute_name_with_namespace(namespaced_attr)).to eq('xlink:href')
+      end
+    end
+  end
+end

From 13791c6704ea6fbca7bcdb2da8e042b00849d783 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Thu, 2 Jun 2016 00:52:35 -0300
Subject: [PATCH 1414/1431] Refactor SVG sanitizer and prevent `xlink:href` to
 refer to external resources

---
 lib/gitlab/sanitizers/svg.rb           | 20 +++++++++++++++-----
 spec/lib/gitlab/sanitizers/svg_spec.rb | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/lib/gitlab/sanitizers/svg.rb b/lib/gitlab/sanitizers/svg.rb
index a540c534dee..3e705687873 100644
--- a/lib/gitlab/sanitizers/svg.rb
+++ b/lib/gitlab/sanitizers/svg.rb
@@ -10,13 +10,19 @@ module Gitlab
         DATA_ATTR_PATTERN = /\Adata-(?!xml)[a-z_][\w.\u00E0-\u00F6\u00F8-\u017F\u01DD-\u02AF-]*\z/u
 
         def scrub(node)
-          unless Whitelist::ALLOWED_ELEMENTS.include?(node.name)
-            node.unlink
-          else
+          if Whitelist::ALLOWED_ELEMENTS.include?(node.name)
             valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name]
+            return unless valid_attributes
 
             node.attribute_nodes.each do |attr|
-              unless valid_attributes && valid_attributes.include?(attribute_name_with_namespace(attr))
+              attr_name = attribute_name_with_namespace(attr)
+
+              if valid_attributes.include?(attr_name)
+                # xlink:href is on the whitelist but we should deny any reference other than internal ids
+                if attr_name == 'xlink:href' && unsafe_href?(attr)
+                  attr.unlink
+                end
+              else
                 if Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) && data_attribute?(attr)
                   # Arbitrary data attributes are allowed. Verify that the attribute
                   # is a valid data attribute.
@@ -26,6 +32,8 @@ module Gitlab
                 end
               end
             end
+          else
+            node.unlink
           end
         end
 
@@ -37,7 +45,9 @@ module Gitlab
           end
         end
 
-        private
+        def unsafe_href?(attr)
+          !attr.value.start_with?('#')
+        end
 
         def data_attribute?(attr)
           attr.name.start_with?('data-')
diff --git a/spec/lib/gitlab/sanitizers/svg_spec.rb b/spec/lib/gitlab/sanitizers/svg_spec.rb
index bb1c98f51a6..061b759bac0 100644
--- a/spec/lib/gitlab/sanitizers/svg_spec.rb
+++ b/spec/lib/gitlab/sanitizers/svg_spec.rb
@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Gitlab::Sanitizers::SVG do
   let(:scrubber) { Gitlab::Sanitizers::SVG::Scrubber.new }
-  let(:namespace) { double(Nokogiri::XML::Namespace, prefix: 'xlink') }
-  let(:namespaced_attr) { double(Nokogiri::XML::Attr, name: 'href', namespace: namespace) }
+  let(:namespace) { double(Nokogiri::XML::Namespace, prefix: 'xlink', href: 'http://www.w3.org/1999/xlink') }
+  let(:namespaced_attr) { double(Nokogiri::XML::Attr, name: 'href', namespace: namespace, value: '#awesome_id') }
 
   context 'scrubber' do
     describe '#scrub' do
-      let(:invalid_element) { double(Nokogiri::XML::Node, name: 'invalid') }
+      let(:invalid_element) { double(Nokogiri::XML::Node, name: 'invalid', value: 'invalid') }
       let(:invalid_attribute) { double(Nokogiri::XML::Attr, name: 'invalid', namespace: nil) }
       let(:valid_element) { double(Nokogiri::XML::Node, name: 'use') }
 
@@ -44,5 +44,17 @@ describe Gitlab::Sanitizers::SVG do
         expect(scrubber.attribute_name_with_namespace(namespaced_attr)).to eq('xlink:href')
       end
     end
+
+    describe '#unsafe_href?' do
+      let(:unsafe_attr) { double(Nokogiri::XML::Attr, name: 'href', namespace: namespace, value: 'http://evilsite.example.com/random.svg') }
+
+      it 'returns true if href attribute is an external url' do
+        expect(scrubber.unsafe_href?(unsafe_attr)).to be_truthy
+      end
+
+      it 'returns false if href atttribute is an internal reference' do
+        expect(scrubber.unsafe_href?(namespaced_attr)).to be_falsey
+      end
+    end
   end
 end

From 388f6eaaa6d97a09de6162c457042f491d42f96e Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Thu, 2 Jun 2016 00:53:34 -0300
Subject: [PATCH 1415/1431] Added SVG sanitizer fix to the changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index 99dd1d3ff4a..364690286e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.9.0 (unreleased)
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
   - Allow customisable text on the 'nearly there' page after a user signs up
   - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
+  - Fix SVG sanitizer to allow more elements
   - Allow forking projects with restricted visibility level
   - Added descriptions to notification settings dropdown
   - Improve note validation to prevent errors when creating invalid note via API

From a9eaa20dcb3da119a2d5f2efca615f2273533015 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Fri, 3 Jun 2016 16:08:43 -0300
Subject: [PATCH 1416/1431] Refactored SVG sanitizer

---
 lib/gitlab/sanitizers/svg.rb           | 43 +++++++++++++-------------
 spec/lib/gitlab/sanitizers/svg_spec.rb | 18 +++++++++++
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/lib/gitlab/sanitizers/svg.rb b/lib/gitlab/sanitizers/svg.rb
index 3e705687873..8304b9a482c 100644
--- a/lib/gitlab/sanitizers/svg.rb
+++ b/lib/gitlab/sanitizers/svg.rb
@@ -10,30 +10,25 @@ module Gitlab
         DATA_ATTR_PATTERN = /\Adata-(?!xml)[a-z_][\w.\u00E0-\u00F6\u00F8-\u017F\u01DD-\u02AF-]*\z/u
 
         def scrub(node)
-          if Whitelist::ALLOWED_ELEMENTS.include?(node.name)
-            valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name]
-            return unless valid_attributes
+          unless Whitelist::ALLOWED_ELEMENTS.include?(node.name)
+            node.unlink
+            return
+          end
 
-            node.attribute_nodes.each do |attr|
-              attr_name = attribute_name_with_namespace(attr)
+          valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name]
+          return unless valid_attributes
 
-              if valid_attributes.include?(attr_name)
-                # xlink:href is on the whitelist but we should deny any reference other than internal ids
-                if attr_name == 'xlink:href' && unsafe_href?(attr)
-                  attr.unlink
-                end
-              else
-                if Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) && data_attribute?(attr)
-                  # Arbitrary data attributes are allowed. Verify that the attribute
-                  # is a valid data attribute.
-                  attr.unlink unless attr_name =~ DATA_ATTR_PATTERN
-                else
-                  attr.unlink
-                end
+          node.attribute_nodes.each do |attr|
+            attr_name = attribute_name_with_namespace(attr)
+
+            if valid_attributes.include?(attr_name)
+              attr.unlink if unsafe_href?(attr)
+            else
+              # Arbitrary data attributes are allowed.
+              unless allows_data_attribute?(node) && data_attribute?(attr)
+                attr.unlink
               end
             end
-          else
-            node.unlink
           end
         end
 
@@ -45,12 +40,16 @@ module Gitlab
           end
         end
 
+        def allows_data_attribute?(node)
+          Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name)
+        end
+
         def unsafe_href?(attr)
-          !attr.value.start_with?('#')
+          attribute_name_with_namespace(attr) == 'xlink:href' && !attr.value.start_with?('#')
         end
 
         def data_attribute?(attr)
-          attr.name.start_with?('data-')
+          attr.name.start_with?('data-') && attr.name =~ DATA_ATTR_PATTERN && attr.namespace.nil?
         end
       end
     end
diff --git a/spec/lib/gitlab/sanitizers/svg_spec.rb b/spec/lib/gitlab/sanitizers/svg_spec.rb
index 061b759bac0..e1b040d6c64 100644
--- a/spec/lib/gitlab/sanitizers/svg_spec.rb
+++ b/spec/lib/gitlab/sanitizers/svg_spec.rb
@@ -56,5 +56,23 @@ describe Gitlab::Sanitizers::SVG do
         expect(scrubber.unsafe_href?(namespaced_attr)).to be_falsey
       end
     end
+
+    describe '#data_attribute?' do
+      let(:data_attr) { double(Nokogiri::XML::Attr, name: 'data-gitlab', namespace: nil, value: 'gitlab is awesome') }
+      let(:namespaced_attr) { double(Nokogiri::XML::Attr, name: 'data-gitlab', namespace: namespace, value: 'gitlab is awesome') }
+      let(:other_attr) { double(Nokogiri::XML::Attr, name: 'something', namespace: nil, value: 'content') }
+
+      it 'returns true if is a valid data attribute' do
+        expect(scrubber.data_attribute?(data_attr)).to be_truthy
+      end
+
+      it 'returns false if attribute is namespaced' do
+        expect(scrubber.data_attribute?(namespaced_attr)).to be_falsey
+      end
+
+      it 'returns false if not a data attribute' do
+        expect(scrubber.data_attribute?(other_attr)).to be_falsey
+      end
+    end
   end
 end

From 7c87dac5f1f3d333b06dbcb2c7f66538abfb8255 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Thu, 9 Jun 2016 02:51:40 -0300
Subject: [PATCH 1417/1431] Improved SVG sanitizer specs to include smoke tests
 for clean.

---
 spec/lib/gitlab/sanitizers/svg_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/spec/lib/gitlab/sanitizers/svg_spec.rb b/spec/lib/gitlab/sanitizers/svg_spec.rb
index e1b040d6c64..030c2063ab2 100644
--- a/spec/lib/gitlab/sanitizers/svg_spec.rb
+++ b/spec/lib/gitlab/sanitizers/svg_spec.rb
@@ -5,6 +5,22 @@ describe Gitlab::Sanitizers::SVG do
   let(:namespace) { double(Nokogiri::XML::Namespace, prefix: 'xlink', href: 'http://www.w3.org/1999/xlink') }
   let(:namespaced_attr) { double(Nokogiri::XML::Attr, name: 'href', namespace: namespace, value: '#awesome_id') }
 
+  describe '.clean' do
+    let(:input_svg_path) { File.join(Rails.root, 'spec', 'fixtures', 'unsanitized.svg') }
+    let(:data) { open(input_svg_path).read }
+    let(:sanitized_svg_path) { File.join(Rails.root, 'spec', 'fixtures', 'sanitized.svg') }
+    let(:sanitized) { open(sanitized_svg_path).read }
+
+    it 'delegates sanitization to scrubber' do
+      expect_any_instance_of(Gitlab::Sanitizers::SVG::Scrubber).to receive(:scrub).at_least(:once)
+      described_class.clean(data)
+    end
+
+    it 'returns sanitized data' do
+      expect(described_class.clean(data)).to eq(sanitized)
+    end
+  end
+
   context 'scrubber' do
     describe '#scrub' do
       let(:invalid_element) { double(Nokogiri::XML::Node, name: 'invalid', value: 'invalid') }

From c1f37964ed04e34fd8606d9b2a63f9d6798766f5 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 12 Jun 2016 19:13:14 -0700
Subject: [PATCH 1418/1431] Fix typo causing related branches to Error 500

---
 app/views/projects/issues/_related_branches.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
index b9bb6fe559d..c6fc499a7b8 100644
--- a/app/views/projects/issues/_related_branches.html.haml
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -6,7 +6,7 @@
       %li
         - sha = @project.repository.find_branch(branch).target
         - pipeline = @project.pipeline(sha, branch) if sha
-        - if ci_copipelinemmit
+        - if pipeline
           %span.related-branch-ci-status
             = render_pipeline_status(pipeline)
         %span.related-branch-info

From b33b7be53e113e4f07154b6aafb7858d76d99516 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 13 Jun 2016 11:22:58 +0200
Subject: [PATCH 1419/1431] Handle NULL migration errors in migration helpers

This ensures that whenever changing the NULL constraint of a column
fails we still drop the column.
---
 lib/gitlab/database/migration_helpers.rb           |  4 ++--
 spec/lib/gitlab/database/migration_helpers_spec.rb | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 978c3f7896d..0f488e968f6 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -126,6 +126,8 @@ module Gitlab
         begin
           transaction do
             update_column_in_batches(table, column, default)
+
+            change_column_null(table, column, false) unless allow_null
           end
         # We want to rescue _all_ exceptions here, even those that don't inherit
         # from StandardError.
@@ -134,8 +136,6 @@ module Gitlab
 
           raise error
         end
-
-        change_column_null(table, column, false) unless allow_null
       end
     end
   end
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 83ddabe6b0b..1ec539066a7 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -120,6 +120,19 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           model.add_column_with_default(:projects, :foo, :integer, default: 10)
         end.to raise_error(RuntimeError)
       end
+
+      it 'removes the added column whenever changing a column NULL constraint fails' do
+        expect(model).to receive(:change_column_null).
+          with(:projects, :foo, false).
+          and_raise(RuntimeError)
+
+        expect(model).to receive(:remove_column).
+          with(:projects, :foo)
+
+        expect do
+          model.add_column_with_default(:projects, :foo, :integer, default: 10)
+        end.to raise_error(RuntimeError)
+      end
     end
 
     context 'inside a transaction' do

From 0e50fa24a5b4ff7665a68da2a1221b5cae9e5633 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 13 Jun 2016 12:32:53 +0300
Subject: [PATCH 1420/1431] Remove counters from Pipeline navigation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/pipelines/_head.html.haml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml
index f278d4e0538..d0ba0d27d7c 100644
--- a/app/views/projects/pipelines/_head.html.haml
+++ b/app/views/projects/pipelines/_head.html.haml
@@ -5,11 +5,9 @@
         = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
           %span
             Pipelines
-            %span.badge.count.ci_counter= number_with_delimiter(@project.pipelines.running_or_pending.count)
 
     - if project_nav_tab? :builds
       = nav_link(controller: %w(builds)) do
         = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
           %span
             Builds
-            %span.badge.count.builds_counter= number_with_delimiter(@project.running_or_pending_build_count)

From 9c238dc970afc4cc9e4e4f9e3327e7a34b8d7c9a Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 13 Jun 2016 11:38:57 +0200
Subject: [PATCH 1421/1431] Update columns in batches until no rows are left

Instead of updating a fixed number of rows (based on the amount of rows
available at the start of the update) the method
"update_column_in_batches" will now continue updating rows until it runs
out of rows to process.

For a table with a high rate of inserts this may result in the migration
taking quite some time. However, the alternative is not all rows being
updated or the "change_column_null" method raising an error due to there
being NULL values.
---
 lib/gitlab/database/migration_helpers.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 0f488e968f6..ddf428e9cb4 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -55,10 +55,10 @@ module Gitlab
           first['count'].
           to_i
 
-        # Update in batches of 5%
+        # Update in batches of 5% until we run out of any rows to update.
         batch_size = ((total / 100.0) * 5.0).ceil
 
-        while processed < total
+        loop do
           start_row = exec_query(%Q{
             SELECT id
             FROM #{quoted_table}
@@ -66,6 +66,9 @@ module Gitlab
             LIMIT 1 OFFSET #{processed}
           }).to_hash.first
 
+          # There are no more rows to process
+          break unless start_row
+
           stop_row = exec_query(%Q{
             SELECT id
             FROM #{quoted_table}

From ea7ff1341032c04ff9abad0e286888a3ab8a9a15 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 13 Jun 2016 11:50:27 +0200
Subject: [PATCH 1422/1431] Removed old comment from update_column_in_batches

---
 lib/gitlab/database/migration_helpers.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index ddf428e9cb4..dd3ff0ab18b 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -31,8 +31,6 @@ module Gitlab
       # Any data inserted while running this method (or after it has finished
       # running) is _not_ updated automatically.
       #
-      # This method _only_ updates rows where the column's value is set to NULL.
-      #
       # table - The name of the table.
       # column - The name of the column to update.
       # value - The value for the column.

From ffd316483ce01591e84996dfaedd539480226e5a Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 13 Jun 2016 11:59:42 +0200
Subject: [PATCH 1423/1431] Instrument all Banzai::ReferenceParser classes

Now that this code is no longer part of Banzai::Filter it needs to be
instrumented explicitly.
---
 CHANGELOG                      |  1 +
 config/initializers/metrics.rb | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 364690286e1..c39c99674b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -68,6 +68,7 @@ v 8.9.0 (unreleased)
   - Improved UX of date pickers on issue & milestone forms
   - Cache on the database if a project has an active external issue tracker.
   - Put project Labels and Milestones pages links under Issues and Merge Requests tabs as subnav
+  - All classes in the Banzai::ReferenceParser namespace are now instrumented
 
 v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 2673093b96a..f6509ee43f1 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -96,13 +96,18 @@ if Gitlab::Metrics.enabled?
       config.instrument_instance_methods(const)
     end
 
-    # Instruments all Banzai filters
-    Dir[Rails.root.join('lib', 'banzai', 'filter', '*.rb')].each do |file|
-      klass = File.basename(file, File.extname(file)).camelize
-      const = Banzai::Filter.const_get(klass)
+    # Instruments all Banzai filters and reference parsers
+    {
+      Filter: Rails.root.join('lib', 'banzai', 'filter', '*.rb'),
+      ReferenceParser: Rails.root.join('lib', 'banzai', 'reference_parser', '*.rb')
+    }.each do |const_name, path|
+      Dir[path].each do |file|
+        klass = File.basename(file, File.extname(file)).camelize
+        const = Banzai.const_get(const_name).const_get(klass)
 
-      config.instrument_methods(const)
-      config.instrument_instance_methods(const)
+        config.instrument_methods(const)
+        config.instrument_instance_methods(const)
+      end
     end
 
     config.instrument_methods(Banzai::Renderer)

From b9977525394ac714e31c1751690c7b993eb8d830 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 10 Jun 2016 16:43:25 +0100
Subject: [PATCH 1424/1431] Only show branches for revert / cherry-pick

Tags are immutable, so we can't add a commit to either revert or
cherry-pick another commit to them.
---
 CHANGELOG                                          | 1 +
 app/helpers/branches_helper.rb                     | 4 ++++
 app/views/projects/commit/_change.html.haml        | 2 +-
 spec/features/projects/commits/cherry_pick_spec.rb | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0c712b445a4..509f3ec6a26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.9.0 (unreleased)
   - Bump rouge to 1.11.0
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
+  - Don't show tags for revert and cherry-pick operations
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
   - Allow customisable text on the 'nearly there' page after a user signs up
   - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index e39548e17e1..3ee3fc74f0c 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -14,4 +14,8 @@ module BranchesHelper
 
     ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(branch_name)
   end
+
+  def project_branches
+    options_for_select(@project.repository.branch_names, @project.default_branch)
+  end
 end
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index 44ef1fdbbe3..d9b800a4ded 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -17,7 +17,7 @@
           .form-group.branch
             = label_tag 'target_branch', target_label, class: 'control-label'
             .col-sm-10
-              = select_tag "target_branch", grouped_options_refs, class: "select2 select2-sm js-target-branch"
+              = select_tag "target_branch", project_branches, class: "select2 select2-sm js-target-branch"
               - if can?(current_user, :push_code, @project)
                 .js-create-merge-request-container
                   .checkbox
diff --git a/spec/features/projects/commits/cherry_pick_spec.rb b/spec/features/projects/commits/cherry_pick_spec.rb
index 0559b02f321..f88c0616b52 100644
--- a/spec/features/projects/commits/cherry_pick_spec.rb
+++ b/spec/features/projects/commits/cherry_pick_spec.rb
@@ -16,6 +16,7 @@ describe 'Cherry-pick Commits' do
     it do
       visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
       find("a[href='#modal-cherry-pick-commit']").click
+      expect(page).not_to have_content('v1.0.0') # Only branches, not tags
       page.within('#modal-cherry-pick-commit') do
         uncheck 'create_merge_request'
         click_button 'Cherry-pick'

From bb3fc8c72c2a3af7873cabf9ae3e951376e7ac9e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 13 Jun 2016 12:07:03 +0200
Subject: [PATCH 1425/1431] Make "four phase test"

---
 spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index fe1e8b2262e..304290d6608 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -501,6 +501,7 @@ module Ci
                              })
 
           config_processor = GitlabCiYamlProcessor.new(config, path)
+
           builds = config_processor.builds_for_stage_and_ref("test", "master")
           expect(builds.size).to eq(1)
           expect(builds.first[:when]).to eq(when_state)

From 35e9fc98655e72ea67f4e04015d255fe7f242717 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 13 Jun 2016 13:52:20 +0200
Subject: [PATCH 1426/1431] Move logs/logs.md to administration/logs.md

[ci skip]
---
 doc/administration/logs.md | 137 +++++++++++++++++++++++++++++++++++++
 doc/logs/logs.md           |  93 +------------------------
 2 files changed, 138 insertions(+), 92 deletions(-)
 create mode 100644 doc/administration/logs.md

diff --git a/doc/administration/logs.md b/doc/administration/logs.md
new file mode 100644
index 00000000000..737b39db16c
--- /dev/null
+++ b/doc/administration/logs.md
@@ -0,0 +1,137 @@
+## Log system
+
+GitLab has an advanced log system where everything is logged so that you
+can analyze your instance using various system log files. In addition to
+system log files, GitLab Enterprise Edition comes with Audit Events.
+Find more about them [in Audit Events
+documentation](http://docs.gitlab.com/ee/administration/audit_events.html)
+
+System log files are typically plain text in a standard log file format.
+This guide talks about how to read and use these system log files.
+
+### production.log
+
+This file lives in `/var/log/gitlab/gitlab-rails/production.log` for
+omnibus package or in `/home/git/gitlab/log/production.log` for
+installations from source.
+
+It contains information about all performed requests. You can see the
+URL and type of request, IP address and what exactly parts of code were
+involved to service this particular request. Also you can see all SQL
+request that have been performed and how much time it took. This task is
+more useful for GitLab contributors and developers. Use part of this log
+file when you are going to report bug. For example:
+
+```
+Started GET "/gitlabhq/yaml_db/tree/master" for 168.111.56.1 at 2015-02-12 19:34:53 +0200
+Processing by Projects::TreeController#show as HTML
+  Parameters: {"project_id"=>"gitlabhq/yaml_db", "id"=>"master"}
+
+  ... [CUT OUT]
+
+  Namespaces"."created_at" DESC, "namespaces"."id" DESC LIMIT 1 [["id", 26]]
+  CACHE (0.0ms) SELECT  "members".* FROM "members"  WHERE "members"."source_type" = 'Project' AND "members"."type" IN ('ProjectMember') AND "members"."source_id" = $1 AND "members"."source_type" = $2 AND "members"."user_id" = 1  ORDER BY "members"."created_at" DESC, "members"."id" DESC LIMIT 1  [["source_id", 18], ["source_type", "Project"]]
+  CACHE (0.0ms) SELECT  "members".* FROM "members"  WHERE "members"."source_type" = 'Project' AND "members".
+  (1.4ms) SELECT COUNT(*) FROM "merge_requests"  WHERE "merge_requests"."target_project_id" = $1 AND ("merge_requests"."state" IN ('opened','reopened')) [["target_project_id", 18]]
+  Rendered layouts/nav/_project.html.haml (28.0ms)
+  Rendered layouts/_collapse_button.html.haml (0.2ms)
+  Rendered layouts/_flash.html.haml (0.1ms)
+  Rendered layouts/_page.html.haml (32.9ms)
+Completed 200 OK in 166ms (Views: 117.4ms | ActiveRecord: 27.2ms)
+```
+
+In this example we can see that server processed an HTTP request with URL
+`/gitlabhq/yaml_db/tree/master` from IP 168.111.56.1 at 2015-02-12
+19:34:53 +0200. Also we can see that request was processed by
+`Projects::TreeController`.
+
+### application.log
+
+This file lives in `/var/log/gitlab/gitlab-rails/application.log` for
+omnibus package or in `/home/git/gitlab/log/application.log` for
+installations from source.
+
+It helps you discover events happening in your instance such as user creation,
+project removing and so on. For example:
+
+```
+October 06, 2014 11:56: User "Administrator" (admin@example.com) was created
+October 06, 2014 11:56: Documentcloud created a new project "Documentcloud / Underscore"
+October 06, 2014 11:56: Gitlab Org created a new project "Gitlab Org / Gitlab Ce"
+October 07, 2014 11:25: User "Claudie Hodkiewicz" (nasir_stehr@olson.co.uk)  was removed
+October 07, 2014 11:25: Project "project133" was removed
+```
+
+### githost.log
+
+This file lives in `/var/log/gitlab/gitlab-rails/githost.log` for
+omnibus package or in `/home/git/gitlab/log/githost.log` for
+installations from source.
+
+GitLab has to interact with Git repositories but in some rare cases
+something can go wrong and in this case you will know what exactly
+happened. This log file contains all failed requests from GitLab to Git
+repositories. In the majority of cases this file will be useful for developers
+only. For example:
+
+```
+December 03, 2014 13:20 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/gitlab-satellites/group184/gitlabhq/.git --work-tree=/Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/gitlab-satellites/group184/gitlabhq merge --no-ff -mMerge branch 'feature_conflict' into 'feature' source/feature_conflict
+
+error: failed to push some refs to '/Users/vsizov/gitlab-development-kit/repositories/gitlabhq/gitlab_git.git'
+```
+
+### sidekiq.log
+
+This file lives in `/var/log/gitlab/gitlab-rails/sidekiq.log` for
+omnibus package or in `/home/git/gitlab/log/sidekiq.log` for
+installations from source.
+
+GitLab uses background jobs for processing tasks which can take a long
+time. All information about processing these jobs are written down to
+this file. For example:
+
+```
+2014-06-10T07:55:20Z 2037 TID-tm504 ERROR: /opt/bitnami/apps/discourse/htdocs/vendor/bundle/ruby/1.9.1/gems/redis-3.0.7/lib/redis/client.rb:228:in `read'
+2014-06-10T18:18:26Z 14299 TID-55uqo INFO: Booting Sidekiq 3.0.0 with redis options {:url=>"redis://localhost:6379/0", :namespace=>"sidekiq"}
+```
+
+### gitlab-shell.log
+
+This file lives in `/var/log/gitlab/gitlab-shell/gitlab-shell.log` for
+omnibus package or in `/home/git/gitlab-shell/gitlab-shell.log` for
+installations from source.
+
+GitLab shell is used by Gitlab for executing Git commands and provide
+SSH access to Git repositories. For example:
+
+```
+I, [2015-02-13T06:17:00.671315 #9291]  INFO -- : Adding project root/example.git at </var/opt/gitlab/git-data/repositories/root/dcdcdcdcd.git>.
+I, [2015-02-13T06:17:00.679433 #9291]  INFO -- : Moving existing hooks directory and symlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git.
+```
+
+### unicorn\_stderr.log
+
+This file lives in `/var/log/gitlab/unicorn/unicorn_stderr.log` for
+omnibus package or in `/home/git/gitlab/log/unicorn_stderr.log` for
+installations from source.
+
+Unicorn is a high-performance forking Web server which is used for
+serving the GitLab application. You can look at this log if, for
+example, your application does not respond. This log contains all
+information about the state of unicorn processes at any given time.
+
+```
+I, [2015-02-13T06:14:46.680381 #9047]  INFO -- : Refreshing Gem list
+I, [2015-02-13T06:14:56.931002 #9047]  INFO -- : listening on addr=127.0.0.1:8080 fd=12
+I, [2015-02-13T06:14:56.931381 #9047]  INFO -- : listening on addr=/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket fd=13
+I, [2015-02-13T06:14:56.936638 #9047]  INFO -- : master process ready
+I, [2015-02-13T06:14:56.946504 #9092]  INFO -- : worker=0 spawned pid=9092
+I, [2015-02-13T06:14:56.946943 #9092]  INFO -- : worker=0 ready
+I, [2015-02-13T06:14:56.947892 #9094]  INFO -- : worker=1 spawned pid=9094
+I, [2015-02-13T06:14:56.948181 #9094]  INFO -- : worker=1 ready
+W, [2015-02-13T07:16:01.312916 #9094]  WARN -- : #<Unicorn::HttpServer:0x0000000208f618>: worker (pid: 9094) exceeds memory limit (320626688 bytes > 247066940 bytes)
+W, [2015-02-13T07:16:01.313000 #9094]  WARN -- : Unicorn::WorkerKiller send SIGQUIT (pid: 9094) alive: 3621 sec (trial 1)
+I, [2015-02-13T07:16:01.530733 #9047]  INFO -- : reaped #<Process::Status: pid 9094 exit 0> worker=1
+I, [2015-02-13T07:16:01.534501 #13379]  INFO -- : worker=1 spawned pid=13379
+I, [2015-02-13T07:16:01.534848 #13379]  INFO -- : worker=1 ready
+```
diff --git a/doc/logs/logs.md b/doc/logs/logs.md
index f84060b8d07..a2eca62d691 100644
--- a/doc/logs/logs.md
+++ b/doc/logs/logs.md
@@ -1,92 +1 @@
-## Log system
-GitLab has an advanced log system where everything is logged so that you can analyze your instance using various system log files.
-In addition to system log files, GitLab Enterprise Edition comes with Audit Events. Find more about them [in Audit Events documentation](http://docs.gitlab.com/ee/administration/audit_events.html)
-
-System log files are typically plain text in a standard log file format. This guide talks about how to read and use these system log files.
-
-#### production.log
-This file lives in `/var/log/gitlab/gitlab-rails/production.log` for omnibus package or in `/home/git/gitlab/log/production.log` for installations from the source.
-
-This file contains information about all performed requests. You can see url and type of request, IP address and what exactly parts of code were involved to service this particular request. Also you can see all SQL request that have been performed and how much time it took.
-This task is more useful for GitLab contributors and developers. Use part of this log file when you are going to report bug.
-
-```
-Started GET "/gitlabhq/yaml_db/tree/master" for 168.111.56.1 at 2015-02-12 19:34:53 +0200
-Processing by Projects::TreeController#show as HTML
-  Parameters: {"project_id"=>"gitlabhq/yaml_db", "id"=>"master"}
-
-  ... [CUT OUT]
-
-  amespaces"."created_at" DESC, "namespaces"."id" DESC LIMIT 1  [["id", 26]]
-  CACHE (0.0ms)  SELECT  "members".* FROM "members"  WHERE "members"."source_type" = 'Project' AND "members"."type" IN ('ProjectMember') AND "members"."source_id" = $1 AND "members"."source_type" = $2 AND "members"."user_id" = 1  ORDER BY "members"."created_at" DESC, "members"."id" DESC LIMIT 1  [["source_id", 18], ["source_type", "Project"]]
-  CACHE (0.0ms)  SELECT  "members".* FROM "members"  WHERE "members"."source_type" = 'Project' AND "members".
-   (1.4ms)  SELECT COUNT(*) FROM "merge_requests"  WHERE "merge_requests"."target_project_id" = $1 AND ("merge_requests"."state" IN ('opened','reopened'))  [["target_project_id", 18]]
-  Rendered layouts/nav/_project.html.haml (28.0ms)
-  Rendered layouts/_collapse_button.html.haml (0.2ms)
-  Rendered layouts/_flash.html.haml (0.1ms)
-  Rendered layouts/_page.html.haml (32.9ms)
-Completed 200 OK in 166ms (Views: 117.4ms | ActiveRecord: 27.2ms)
-```
-In this example we can see that server processed HTTP request with url `/gitlabhq/yaml_db/tree/master` from IP 168.111.56.1 at 2015-02-12 19:34:53 +0200. Also we can see that request was processed by Projects::TreeController.
-
-#### application.log
-This file lives in `/var/log/gitlab/gitlab-rails/application.log` for omnibus package or in `/home/git/gitlab/log/application.log` for installations from the source.
-
-This log file helps you discover events happening in your instance such as user creation, project removing and so on.
-
-```
-October 06, 2014 11:56: User "Administrator" (admin@example.com) was created
-October 06, 2014 11:56: Documentcloud created a new project "Documentcloud / Underscore"
-October 06, 2014 11:56: Gitlab Org created a new project "Gitlab Org / Gitlab Ce"
-October 07, 2014 11:25: User "Claudie Hodkiewicz" (nasir_stehr@olson.co.uk)  was removed
-October 07, 2014 11:25: Project "project133" was removed
-```
-#### githost.log
-This file lives in `/var/log/gitlab/gitlab-rails/githost.log` for omnibus package or in `/home/git/gitlab/log/githost.log` for installations from the source.
-
-The GitLab has to interact with git repositories but in some rare cases something can go wrong and in this case you will know what exactly happened. This log file contains all failed requests from GitLab to git repository. In majority of cases this file will be useful for developers only.
-```
-December 03, 2014 13:20 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/gitlab-satellites/group184/gitlabhq/.git --work-tree=/Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/gitlab-satellites/group184/gitlabhq merge --no-ff -mMerge branch 'feature_conflict' into 'feature' source/feature_conflict
-
-error: failed to push some refs to '/Users/vsizov/gitlab-development-kit/repositories/gitlabhq/gitlab_git.git'
-```
-
-#### sidekiq.log
-This file lives in `/var/log/gitlab/gitlab-rails/sidekiq.log` for omnibus package or in `/home/git/gitlab/log/sidekiq.log` for installations from the source.
-
-GitLab uses background jobs for processing tasks which can take a long time. All information about processing these jobs are writing down to this file.
-```
-2014-06-10T07:55:20Z 2037 TID-tm504 ERROR: /opt/bitnami/apps/discourse/htdocs/vendor/bundle/ruby/1.9.1/gems/redis-3.0.7/lib/redis/client.rb:228:in `read'
-2014-06-10T18:18:26Z 14299 TID-55uqo INFO: Booting Sidekiq 3.0.0 with redis options {:url=>"redis://localhost:6379/0", :namespace=>"sidekiq"}
-```
-
-#### gitlab-shell.log
-This file lives in `/var/log/gitlab/gitlab-shell/gitlab-shell.log` for omnibus package or in `/home/git/gitlab-shell/gitlab-shell.log` for installations from the source.
-
-gitlab-shell is using by Gitlab for executing git commands and provide ssh access to git repositories.
-
-```
-I, [2015-02-13T06:17:00.671315 #9291]  INFO -- : Adding project root/example.git at </var/opt/gitlab/git-data/repositories/root/dcdcdcdcd.git>.
-I, [2015-02-13T06:17:00.679433 #9291]  INFO -- : Moving existing hooks directory and symlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git.
-```
-
-#### unicorn_stderr.log
-This file lives in `/var/log/gitlab/unicorn/unicorn_stderr.log` for omnibus package or in `/home/git/gitlab/log/unicorn_stderr.log` for installations from the source.
-
-Unicorn is a high-performance forking Web server which is used for serving the GitLab application. You can look at this log if, for example, your application does not respond. This log contains all information about the state of unicorn processes at any given time.
-
-```
-I, [2015-02-13T06:14:46.680381 #9047]  INFO -- : Refreshing Gem list
-I, [2015-02-13T06:14:56.931002 #9047]  INFO -- : listening on addr=127.0.0.1:8080 fd=12
-I, [2015-02-13T06:14:56.931381 #9047]  INFO -- : listening on addr=/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket fd=13
-I, [2015-02-13T06:14:56.936638 #9047]  INFO -- : master process ready
-I, [2015-02-13T06:14:56.946504 #9092]  INFO -- : worker=0 spawned pid=9092
-I, [2015-02-13T06:14:56.946943 #9092]  INFO -- : worker=0 ready
-I, [2015-02-13T06:14:56.947892 #9094]  INFO -- : worker=1 spawned pid=9094
-I, [2015-02-13T06:14:56.948181 #9094]  INFO -- : worker=1 ready
-W, [2015-02-13T07:16:01.312916 #9094]  WARN -- : #<Unicorn::HttpServer:0x0000000208f618>: worker (pid: 9094) exceeds memory limit (320626688 bytes > 247066940 bytes)
-W, [2015-02-13T07:16:01.313000 #9094]  WARN -- : Unicorn::WorkerKiller send SIGQUIT (pid: 9094) alive: 3621 sec (trial 1)
-I, [2015-02-13T07:16:01.530733 #9047]  INFO -- : reaped #<Process::Status: pid 9094 exit 0> worker=1
-I, [2015-02-13T07:16:01.534501 #13379]  INFO -- : worker=1 spawned pid=13379
-I, [2015-02-13T07:16:01.534848 #13379]  INFO -- : worker=1 ready
-```
+This document was moved to [administration/logs.md](../administration/logs.md).

From e489e9a58534b7f71085048747e12d6223d1cb1e Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 13 Jun 2016 14:19:29 +0200
Subject: [PATCH 1427/1431] Change logs.md location in README

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

diff --git a/doc/README.md b/doc/README.md
index d1345ab2493..5d89d0c9821 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -28,7 +28,7 @@
 - [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, Twitter.
 - [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages.
 - [Libravatar](customization/libravatar.md) Use Libravatar for user avatars.
-- [Log system](logs/logs.md) Log system.
+- [Log system](administration/logs.md) Log system.
 - [Environment Variables](administration/environment_variables.md) to configure GitLab.
 - [Operations](operations/README.md) Keeping GitLab up and running
 - [Raketasks](raketasks/README.md) Backups, maintenance, automatic webhook setup and the importing of projects.

From d1abbb3b662bd41a3b58eeb60c5c0740adff986c Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 13 Jun 2016 15:00:28 +0200
Subject: [PATCH 1428/1431] Add guide on changing a document's location

[ci skip]
---
 doc/development/doc_styleguide.md | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md
index 8292b393757..c59012bef46 100644
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
@@ -141,6 +141,48 @@ Inside the document:
 
 [ruby-dl]: https://www.ruby-lang.org/en/downloads/ "Ruby download website"
 
+## Changing document location
+
+Changing a document's location is not to be taken lightly. Remember that the
+documentation is available to all installations under `help/` and not only to
+GitLab.com or http://docs.gitlab.com. Make sure this is discussed with the
+Documentation team beforehand.
+
+If you indeed need to change a document's location, do NOT remove the old
+document, but rather put a text in it that points to the new location, like:
+
+```
+This document was moved to [path/to/new_doc.md](path/to/new_doc.md).
+```
+
+where `path/to/new_doc.md` is the relative path to the root directory `doc/`.
+
+---
+
+For example, if you were to move `doc/workflow/lfs/lfs_administration.md` to
+`doc/administration/lfs.md`, then the steps would be:
+
+1. Copy `doc/workflow/lfs/lfs_administration.md` to `doc/administration/lfs.md`
+1. Replace the contents of `doc/workflow/lfs/lfs_administration.md` with:
+
+    ```
+    This document was moved to [administration/lfs.md](../../administration/lfs.md).
+    ```
+
+1. Find and replace any occurrences of the old location with the new one.
+   A quick way to find them is to use `grep`:
+
+    ```
+    grep -nR "lfs_administration.md" doc/
+    ```
+
+    The above command will search in the `doc/` directory for
+    `lfs_administration.md` recursively and will print the file and the line
+    where this file is mentioned. Note that we used just the filename
+    (`lfs_administration.md`) and not the whole the relative path
+    (`workflow/lfs/lfs_administration.md`).
+
+
 ## API
 
 Here is a list of must-have items. Use them in the exact order that appears

From cb7fa10cb593a7288d51e91466ff5be2767c98f0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 13 Jun 2016 15:04:22 +0200
Subject: [PATCH 1429/1431] Change to new Notes styleguide

[ci skip]
---
 doc/development/doc_styleguide.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md
index 8292b393757..dbaa7eff410 100644
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
@@ -103,14 +103,14 @@ Inside the document:
 
 - Every piece of documentation that comes with a new feature should declare the
   GitLab version that feature got introduced. Right below the heading add a
-  note: `_**Note:** This feature was introduced in GitLab 8.3_`
+  note: `>**Note:** This feature was introduced in GitLab 8.3`
 - If possible every feature should have a link to the MR that introduced it.
   The above note would be then transformed to:
-  `_**Note:** This feature was [introduced][ce-1242] in GitLab 8.3_`, where
+  `>**Note:** This feature was [introduced][ce-1242] in GitLab 8.3`, where
   the [link identifier](#links) is named after the repository (CE) and the MR
   number
 - If the feature is only in GitLab EE, don't forget to mention it, like:
-  `_**Note:** This feature was introduced in GitLab EE 8.3_`. Otherwise, leave
+  `>**Note:** This feature was introduced in GitLab EE 8.3`. Otherwise, leave
   this mention out
 
 ## References
@@ -222,8 +222,8 @@ curl --data "name=foo" -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.
 
 #### Post data using JSON content
 
-_**Note:** In this example we create a new group. Watch carefully the single
-and double quotes._
+> **Note:** In this example we create a new group. Watch carefully the single
+and double quotes.
 
 ```bash
 curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" -H "Content-Type: application/json" --data '{"path": "my-group", "name": "My group"}' https://gitlab.example.com/api/v3/groups

From f73cf3e937b92d29753e468dac8a17470253c791 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 13 Jun 2016 15:38:25 +0200
Subject: [PATCH 1430/1431] Also rename "find" in the specs

---
 spec/lib/gitlab/auth_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index f081d550ec8..7bec1367156 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::Auth, lib: true do
   let(:gl_auth) { described_class }
 
-  describe 'find' do
+  describe 'find_for_git_client' do
     it 'recognizes CI' do
       token = '123'
       project = create(:empty_project)
@@ -11,7 +11,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: 'gitlab-ci-token')
-      expect(gl_auth.find('gitlab-ci-token', token, project: project, ip: ip)).to eq(Gitlab::Auth::Result.new(nil, :ci))
+      expect(gl_auth.find_for_git_client('gitlab-ci-token', token, project: project, ip: ip)).to eq(Gitlab::Auth::Result.new(nil, :ci))
     end
 
     it 'recognizes master passwords' do
@@ -19,7 +19,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: user.username)
-      expect(gl_auth.find(user.username, 'password', project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new(user, :gitlab_or_ldap))
+      expect(gl_auth.find_for_git_client(user.username, 'password', project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new(user, :gitlab_or_ldap))
     end
 
     it 'recognizes OAuth tokens' do
@@ -29,7 +29,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: true, login: 'oauth2')
-      expect(gl_auth.find("oauth2", token.token, project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new(user, :oauth))
+      expect(gl_auth.find_for_git_client("oauth2", token.token, project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new(user, :oauth))
     end
 
     it 'returns double nil for invalid credentials' do
@@ -37,7 +37,7 @@ describe Gitlab::Auth, lib: true do
       ip = 'ip'
 
       expect(gl_auth).to receive(:rate_limit!).with(ip, success: false, login: login)
-      expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new)
+      expect(gl_auth.find_for_git_client(login, 'bar', project: nil, ip: ip)).to eq(Gitlab::Auth::Result.new)
     end
   end
 

From 747989c115c86b090612f805170beb175fe1672a Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 13 Jun 2016 17:40:36 -0300
Subject: [PATCH 1431/1431] =?UTF-8?q?Schema=20doesn=E2=80=99t=20reflect=20?=
 =?UTF-8?q?the=20changes=20of=20the=20last=203=20migrations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The schema doesn’t reflect the changes of the last 3 migrations:

* 20160610140403_remove_notification_setting_not_null_constraints.rb
* 20160610201627_migrate_users_notification_level.rb
* 20160610301627_remove_notification_level_from_users.rb
---
 db/schema.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index aac327797e7..3c947d62e82 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: 20160608155312) do
+ActiveRecord::Schema.define(version: 20160610301627) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -670,8 +670,8 @@ ActiveRecord::Schema.define(version: 20160608155312) do
 
   create_table "notification_settings", force: :cascade do |t|
     t.integer  "user_id",                 null: false
-    t.integer  "source_id",               null: false
-    t.string   "source_type",             null: false
+    t.integer  "source_id"
+    t.string   "source_type"
     t.integer  "level",       default: 0, null: false
     t.datetime "created_at",              null: false
     t.datetime "updated_at",              null: false
@@ -988,7 +988,6 @@ ActiveRecord::Schema.define(version: 20160608155312) do
     t.boolean  "can_create_team",             default: true,  null: false
     t.string   "state"
     t.integer  "color_scheme_id",             default: 1,     null: false
-    t.integer  "notification_level",          default: 1,     null: false
     t.datetime "password_expires_at"
     t.integer  "created_by_id"
     t.datetime "last_credential_check_at"