From e35cb5a025e3f47fd7ab237b5cf368aa3b9b319d Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Mon, 28 Mar 2016 21:40:49 +0200
Subject: [PATCH 001/283] Docs for the new branch button

[ci-skip]
---
 .../basicsimages/new_branch_button.png         | Bin 0 -> 120622 bytes
 doc/gitlab-basics/create-branch.md             |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 doc/gitlab-basics/basicsimages/new_branch_button.png

diff --git a/doc/gitlab-basics/basicsimages/new_branch_button.png b/doc/gitlab-basics/basicsimages/new_branch_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..394c139e17eadc81e8699aca05c727bf48c6a86d
GIT binary patch
literal 120622
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

literal 0
HcmV?d00001

diff --git a/doc/gitlab-basics/create-branch.md b/doc/gitlab-basics/create-branch.md
index 7556b0f663..9d688b9389 100644
--- a/doc/gitlab-basics/create-branch.md
+++ b/doc/gitlab-basics/create-branch.md
@@ -32,6 +32,15 @@ Fill out the information required:
 
 ![Branch info](basicsimages/branch_info.png)
 
+## From an issue
+When an issue should be resolved one could also create a branch on the issue page. A button is displayed after the description unless there is already a branch or a referenced merge request.
+
+![New Branch Button](basicsimages/new_branch_button.png)
+
+The branch created diverges from the default branch of the project, usually `master`. The branch name will be based on the title of the issue and as suffix its ID. Thus the example screenshot above will yield a branch named `et-cum-et-sed-expedita-repellat-consequatur-ut-assumenda-numquam-rerum-2`.
+After the branch is created the user can edit files in the repository to fix the issue. When a merge request is created the
+description field will display `Closes #2` to use the issue closing pattern. This will close the issue once the merge request is merged.
+
 ### Note:
 
 You will be able to find and select the name of your branch in the white box next to a project's name:

From 31b0e53015e38e51d9c02cca85c9279600b1bf85 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 13:41:00 +0200
Subject: [PATCH 002/283] Introduce NotificationSetting model

It will hold notification setting per group or per project. It will
allow get rid of notification level stored in Member model

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/notification_setting.rb                | 14 ++++++++++++++
 ...20160328112808_create_notification_settings.rb | 12 ++++++++++++
 db/schema.rb                                      | 15 ++++++++++++---
 spec/models/notification_setting_spec.rb          | 15 +++++++++++++++
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 app/models/notification_setting.rb
 create mode 100644 db/migrate/20160328112808_create_notification_settings.rb
 create mode 100644 spec/models/notification_setting_spec.rb

diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
new file mode 100644
index 0000000000..0dce146b7a
--- /dev/null
+++ b/app/models/notification_setting.rb
@@ -0,0 +1,14 @@
+class NotificationSetting < ActiveRecord::Base
+  belongs_to :user
+  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",
+                                    allow_nil: true }
+  # Notification level
+  # Note: When adding an option, it MUST go on the end of the array.
+  enum level: [:disabled, :participating, :watch, :global, :mention]
+end
diff --git a/db/migrate/20160328112808_create_notification_settings.rb b/db/migrate/20160328112808_create_notification_settings.rb
new file mode 100644
index 0000000000..88652821ac
--- /dev/null
+++ b/db/migrate/20160328112808_create_notification_settings.rb
@@ -0,0 +1,12 @@
+class CreateNotificationSettings < ActiveRecord::Migration
+  def change
+    create_table :notification_settings do |t|
+      t.integer :user_id
+      t.integer :level
+      t.integer :source_id
+      t.string :source_type
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index dce2bfe62c..a9a68e723a 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: 20160320204112) do
+ActiveRecord::Schema.define(version: 20160328112808) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -417,9 +417,9 @@ ActiveRecord::Schema.define(version: 20160320204112) do
     t.string   "state"
     t.integer  "iid"
     t.integer  "updated_by_id"
-    t.integer  "moved_to_id"
-    t.boolean  "confidential",              default: false
+    t.boolean  "confidential",  default: false
     t.datetime "deleted_at"
+    t.integer  "moved_to_id"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -638,6 +638,15 @@ ActiveRecord::Schema.define(version: 20160320204112) do
   add_index "notes", ["project_id"], name: "index_notes_on_project_id", using: :btree
   add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree
 
+  create_table "notification_settings", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "level"
+    t.integer  "source_id"
+    t.string   "source_type"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
   create_table "oauth_access_grants", force: :cascade do |t|
     t.integer  "resource_owner_id", null: false
     t.integer  "application_id",    null: false
diff --git a/spec/models/notification_setting_spec.rb b/spec/models/notification_setting_spec.rb
new file mode 100644
index 0000000000..f9d668ed75
--- /dev/null
+++ b/spec/models/notification_setting_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe NotificationSetting, type: :model do
+  describe "Associations" do
+    it { is_expected.to belong_to(:user) }
+  end
+
+  describe "Validation" do
+    subject { NotificationSetting.new }
+
+    it { is_expected.to validate_presence_of(:user) }
+    it { is_expected.to validate_presence_of(:source) }
+    it { is_expected.to validate_presence_of(:level) }
+  end
+end

From 73c5a3410596165244bfa3d2f657c313ec1c558c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 14:27:30 +0200
Subject: [PATCH 003/283] Migrate notification setting from members table

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 ...160328115649_migrate_new_notification_setting.rb | 13 +++++++++++++
 ...20160328121138_add_notification_setting_index.rb |  6 ++++++
 db/schema.rb                                        |  5 ++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160328115649_migrate_new_notification_setting.rb
 create mode 100644 db/migrate/20160328121138_add_notification_setting_index.rb

diff --git a/db/migrate/20160328115649_migrate_new_notification_setting.rb b/db/migrate/20160328115649_migrate_new_notification_setting.rb
new file mode 100644
index 0000000000..331c35535f
--- /dev/null
+++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb
@@ -0,0 +1,13 @@
+# This migration will create one row of NotificationSetting for each Member row
+# It can take long time on big instances. Its unclear yet if this migration can be done online.
+# This comment should be updated by @dzaporozhets before 8.7 release. If not - please ask him to do so.
+class MigrateNewNotificationSetting < ActiveRecord::Migration
+  def up
+    timestamp = Time.now
+    execute "INSERT INTO notification_settings ( user_id, source_id, source_type, level, created_at, updated_at ) SELECT user_id, source_id, source_type, notification_level, '#{timestamp}', '#{timestamp}' FROM members"
+  end
+
+  def down
+    NotificationSetting.delete_all
+  end
+end
diff --git a/db/migrate/20160328121138_add_notification_setting_index.rb b/db/migrate/20160328121138_add_notification_setting_index.rb
new file mode 100644
index 0000000000..8aebce0244
--- /dev/null
+++ b/db/migrate/20160328121138_add_notification_setting_index.rb
@@ -0,0 +1,6 @@
+class AddNotificationSettingIndex < ActiveRecord::Migration
+  def change
+    add_index :notification_settings, :user_id
+    add_index :notification_settings, [:source_id, :source_type]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a9a68e723a..29639abb6f 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: 20160328112808) do
+ActiveRecord::Schema.define(version: 20160328121138) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -647,6 +647,9 @@ ActiveRecord::Schema.define(version: 20160328112808) do
     t.datetime "updated_at",  null: false
   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"], name: "index_notification_settings_on_user_id", using: :btree
+
   create_table "oauth_access_grants", force: :cascade do |t|
     t.integer  "resource_owner_id", null: false
     t.integer  "application_id",    null: false

From 359157c097993a9b917ca590e128e85cf358d95d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 18:17:42 +0200
Subject: [PATCH 004/283] Introduce NotificationSetting to user interface

* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/project.js.coffee      |  8 +-
 .../profiles/notifications_controller.rb      | 14 ++--
 app/controllers/projects_controller.rb        | 17 ++++-
 app/helpers/notifications_helper.rb           | 74 +++++++++++--------
 app/models/notification.rb                    |  4 +-
 app/models/notification_setting.rb            |  7 ++
 app/models/user.rb                            |  7 +-
 .../notifications/_settings.html.haml         | 18 ++---
 .../profiles/notifications/show.html.haml     | 30 ++++----
 .../projects/buttons/_notifications.html.haml | 20 ++---
 10 files changed, 106 insertions(+), 93 deletions(-)

diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 87d313ed67..f171442d05 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -37,15 +37,9 @@ class @Project
     $('.update-notification').on 'click', (e) ->
       e.preventDefault()
       notification_level = $(@).data 'notification-level'
+      label = $(@).data 'notification-title'
       $('#notification_level').val(notification_level)
       $('#notification-form').submit()
-      label = null
-      switch notification_level
-        when 0 then label = ' Disabled '
-        when 1 then label = ' Participating '
-        when 2 then label = ' Watching '
-        when 3 then label = ' Global '
-        when 4 then label = ' On Mention '
       $('#notifications-button').empty().append("<i class='fa fa-bell'></i>" + label + "<i class='fa fa-angle-down'></i>")
       $(@).parents('ul').find('li.active').removeClass 'active'
       $(@).parent().addClass 'active'
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 1fd1d6882d..6ca7537300 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -2,8 +2,8 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   def show
     @user = current_user
     @notification = current_user.notification
-    @project_members = current_user.project_members
-    @group_members = current_user.group_members
+    @group_notifications = current_user.notification_settings.for_groups
+    @project_notifications = current_user.notification_settings.for_projects
   end
 
   def update
@@ -11,14 +11,10 @@ class Profiles::NotificationsController < Profiles::ApplicationController
 
     @saved = if type == 'global'
                current_user.update_attributes(user_params)
-             elsif type == 'group'
-               group_member = current_user.group_members.find(params[:notification_id])
-               group_member.notification_level = params[:notification_level]
-               group_member.save
              else
-               project_member = current_user.project_members.find(params[:notification_id])
-               project_member.notification_level = params[:notification_level]
-               project_member.save
+               notification_setting = current_user.notification_settings.find(params[:notification_id])
+               notification_setting.level = params[:notification_level]
+               notification_setting.save
              end
 
     respond_to do |format|
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 928817ba81..77122f5912 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -98,14 +98,23 @@ class ProjectsController < Projects::ApplicationController
 
     respond_to do |format|
       format.html do
+        if current_user
+          @membership = @project.team.find_member(current_user.id)
+
+          if @membership
+            @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
+
+            unless @notification_setting.persisted?
+              @notification_setting.set_defaults
+              @notification_setting.save
+            end
+          end
+        end
+
         if @project.repository_exists?
           if @project.empty_repo?
             render 'projects/empty'
           else
-            if current_user
-              @membership = @project.team.find_member(current_user.id)
-            end
-
             render :show
           end
         else
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 499c655d2b..a0e91a63d2 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,48 +1,60 @@
 module NotificationsHelper
   include IconsHelper
 
-  def notification_icon(notification)
-    if notification.disabled?
-      icon('volume-off', class: 'ns-mute')
-    elsif notification.participating?
-      icon('volume-down', class: 'ns-part')
-    elsif notification.watch?
-      icon('volume-up', class: 'ns-watch')
-    else
-      icon('circle-o', class: 'ns-default')
+  def notification_icon_class(level)
+    case level.to_sym
+    when :disabled
+      'microphone-slash'
+    when :participating
+      'volume-up'
+    when :watch
+      'eye'
+    when :mention
+      'at'
+    when :global
+      'globe'
     end
   end
 
-  def notification_list_item(notification_level, user_membership)
-    case notification_level
-    when Notification::N_DISABLED
-      update_notification_link(Notification::N_DISABLED, user_membership, 'Disabled', 'microphone-slash')
-    when Notification::N_PARTICIPATING
-      update_notification_link(Notification::N_PARTICIPATING, user_membership, 'Participate', 'volume-up')
-    when Notification::N_WATCH
-      update_notification_link(Notification::N_WATCH, user_membership, 'Watch', 'eye')
-    when Notification::N_MENTION
-      update_notification_link(Notification::N_MENTION, user_membership, 'On mention', 'at')
-    when Notification::N_GLOBAL
-      update_notification_link(Notification::N_GLOBAL, user_membership, 'Global', 'globe')
-    else
-      # do nothing
+  def notification_icon(level)
+    icon("#{notification_icon_class(level)} fw")
+  end
+
+  def notification_title(level)
+    case level.to_sym
+    when :disabled
+      'Disabled'
+    when :participating
+      'Participate'
+    when :watch
+      'Watch'
+    when :mention
+      'On mention'
+    when :global
+      'Global'
     end
   end
 
-  def update_notification_link(notification_level, user_membership, title, icon)
-    content_tag(:li, class: active_level_for(user_membership, notification_level)) do
-      link_to '#', class: 'update-notification', data: { notification_level: notification_level } do
-        icon("#{icon} fw", text: title)
+  def notification_list_item(level, setting)
+    title = notification_title(level)
+
+    data = {
+      notification_level: level,
+      notification_title: title
+    }
+
+    content_tag(:li, class: active_level_for(setting, level)) do
+      link_to '#', class: 'update-notification', data: data do
+        icon("#{notification_icon_class(level)} fw", text: title)
       end
     end
   end
 
-  def notification_label(user_membership)
-    Notification.new(user_membership).to_s
+  def notification_label(setting)
+    notification_title(setting.level)
   end
 
-  def active_level_for(user_membership, level)
-    'active' if user_membership.notification_level == level
+  def active_level_for(setting, level)
+    'active' if setting.level == level
   end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 171b8df45c..379f041969 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -57,7 +57,7 @@ class Notification
   def level
     target.notification_level
   end
-  
+
   def to_s
     case level
     when N_DISABLED
@@ -71,7 +71,7 @@ class Notification
     when N_GLOBAL
       'Global'
     else
-      # do nothing      
+      # do nothing
     end
   end
 end
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 0dce146b7a..287862a01b 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -11,4 +11,11 @@ class NotificationSetting < ActiveRecord::Base
   # Notification level
   # Note: When adding an option, it MUST go on the end of the array.
   enum level: [:disabled, :participating, :watch, :global, :mention]
+
+  scope :for_groups, -> { where(source_type: 'Namespace') }
+  scope :for_projects, -> { where(source_type: 'Project') }
+
+  def set_defaults
+    self.level = :global
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 128ddc2a69..59493e6f90 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -143,6 +143,7 @@ class User < ActiveRecord::Base
   has_many :spam_logs,                dependent: :destroy
   has_many :builds,                   dependent: :nullify, class_name: 'Ci::Build'
   has_many :todos,                    dependent: :destroy
+  has_many :notification_settings,    dependent: :destroy
 
   #
   # Validations
@@ -157,7 +158,7 @@ class User < ActiveRecord::Base
     presence: true,
     uniqueness: { case_sensitive: false }
 
-  validates :notification_level, inclusion: { in: Notification.notification_levels }, presence: true
+  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? }
@@ -190,6 +191,10 @@ 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.
+  enum notification_level: [:disabled, :participating, :watch, :global, :mention]
+
   alias_attribute :private_token, :authentication_token
 
   delegate :path, to: :namespace, allow_nil: true, prefix: true
diff --git a/app/views/profiles/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml
index d0d044136f..c32de0b992 100644
--- a/app/views/profiles/notifications/_settings.html.haml
+++ b/app/views/profiles/notifications/_settings.html.haml
@@ -1,17 +1,17 @@
 %li.notification-list-item
   %span.notification.fa.fa-holder.append-right-5
-    - if notification.global?
-      = notification_icon(@notification)
+    - if setting.global?
+      = notification_icon(current_user.notification_level)
     - else
-      = notification_icon(notification)
+      = notification_icon(setting.level)
 
   %span.str-truncated
-    - if membership.kind_of? GroupMember
-      = link_to membership.group.name, membership.group
+    - if setting.source.kind_of? Project
+      = link_to_project(setting.source)
     - else
-      = link_to_project(membership.project)
+      = link_to setting.source.name, group_path(setting.source)
   .pull-right
     = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
-      = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
-      = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
-      = select_tag :notification_level, options_for_select(Notification.options_with_labels, notification.level), class: 'form-control trigger-submit'
+      = hidden_field_tag :notification_id, setting.id
+      = hidden_field_tag :notification_level, setting.level
+      = select_tag :notification_level, options_for_select(User.notification_levels.keys, setting.level), class: 'form-control trigger-submit'
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index de80abd7f4..f6900f61b2 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -26,29 +26,29 @@
       .form-group
         = f.label :notification_level, class: 'label-light'
         .radio
-          = f.label :notification_level, value: Notification::N_DISABLED do
-            = f.radio_button :notification_level, Notification::N_DISABLED
+          = 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: Notification::N_MENTION do
-            = f.radio_button :notification_level, Notification::N_MENTION
+          = 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: Notification::N_PARTICIPATING do
-            = f.radio_button :notification_level, Notification::N_PARTICIPATING
+          = 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: Notification::N_WATCH do
-            = f.radio_button :notification_level, Notification::N_WATCH
+          = f.label :notification_level, value: :watch do
+            = f.radio_button :notification_level, :watch
             .level-title
               Watch
             %p You will receive notifications for any activity
@@ -57,18 +57,16 @@
         = f.submit 'Update settings', class: "btn btn-create"
       %hr
       %h5
-        Groups (#{@group_members.count})
+        Groups (#{@group_notifications.count})
       %div
         %ul.bordered-list
-          - @group_members.each do |group_member|
-            - notification = Notification.new(group_member)
-            = render 'settings', type: 'group', membership: group_member, notification: notification
+          - @group_notifications.each do |setting|
+            = render 'settings', setting: setting
       %h5
-        Projects (#{@project_members.count})
+        Projects (#{@project_notifications.count})
       %p.account-well
         To specify the notification level per project of a group you belong to, you need to be a member of the project itself, not only its group.
       .append-bottom-default
         %ul.bordered-list
-          - @project_members.each do |project_member|
-            - notification = Notification.new(project_member)
-            = render 'settings', type: 'project', membership: project_member, notification: notification
+          - @project_notifications.each do |setting|
+            = render 'settings', setting: setting
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index a3786c35a1..4b8a10f081 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -1,20 +1,12 @@
-- case @membership
-- when ProjectMember
+- if @notification_setting
   = form_tag profile_notifications_path, method: :put, remote: true, class: 'inline', id: 'notification-form' do
-    = hidden_field_tag :notification_type, 'project'
-    = hidden_field_tag :notification_id, @membership.id
-    = hidden_field_tag :notification_level
+    = hidden_field_tag :notification_id, @notification_setting.id
+    = hidden_field_tag :notification_level, @notification_setting.level
     %span.dropdown
       %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
         = icon('bell')
-        = notification_label(@membership)
+        = notification_title(@notification_setting.level)
         = icon('angle-down')
       %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
-        - Notification.project_notification_levels.each do |level|
-          = notification_list_item(level, @membership)
-
-- when GroupMember
-  .btn.disabled.notifications-btn.has-tooltip{title: "To change the notification level, you need to be a member of the project itself, not only its group."}
-    = icon('bell')
-    = notification_label(@membership)
-    = icon('angle-down')
+        - NotificationSetting.levels.each do |level|
+          = notification_list_item(level.first, @notification_setting)

From 7ea1bcab45697556d4ffd79ab680872ed823d4a3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 18:25:57 +0200
Subject: [PATCH 005/283] Create notification setting when membership created

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/member.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/models/member.rb b/app/models/member.rb
index ca08007b7e..177f37c3bb 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -56,6 +56,7 @@ class Member < ActiveRecord::Base
 
   before_validation :generate_invite_token, on: :create, if: -> (member) { member.invite_email.present? }
   after_create :send_invite, if: :invite?
+  after_create :create_notification_setting, unless: :invite?
   after_create :post_create_hook, unless: :invite?
   after_update :post_update_hook, unless: :invite?
   after_destroy :post_destroy_hook, unless: :invite?
@@ -160,6 +161,15 @@ class Member < ActiveRecord::Base
     send_invite
   end
 
+  def create_notification_setting
+    notification_setting = user.notification_settings.find_or_initialize_by(source: source)
+
+    unless notification_setting.persisted?
+      notification_setting.set_defaults
+      notification_setting.save
+    end
+  end
+
   private
 
   def send_invite

From b8f38437900cdddac9d19d5c48a2a8e5bb037f41 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 20:31:36 +0200
Subject: [PATCH 006/283] Update NotificationService to use
 NotificationSettings instead of membership

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/concerns/notifiable.rb          | 15 ----------
 app/models/group.rb                        |  1 +
 app/models/member.rb                       |  5 +++-
 app/models/notification.rb                 | 22 ++------------
 app/models/project.rb                      |  1 +
 app/models/user.rb                         |  3 ++
 app/services/notification_service.rb       | 34 ++++++++++------------
 spec/services/notification_service_spec.rb | 26 ++++++++---------
 8 files changed, 40 insertions(+), 67 deletions(-)
 delete mode 100644 app/models/concerns/notifiable.rb

diff --git a/app/models/concerns/notifiable.rb b/app/models/concerns/notifiable.rb
deleted file mode 100644
index d7dcd97911..0000000000
--- a/app/models/concerns/notifiable.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# == Notifiable concern
-#
-# Contains notification functionality
-#
-module Notifiable
-  extend ActiveSupport::Concern
-
-  included do
-    validates :notification_level, inclusion: { in: Notification.project_notification_levels }, presence: true
-  end
-
-  def notification
-    @notification ||= Notification.new(self)
-  end
-end
diff --git a/app/models/group.rb b/app/models/group.rb
index b332601c59..9a04ac70d3 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -27,6 +27,7 @@ class Group < Namespace
   has_many :users, through: :group_members
   has_many :project_group_links, dependent: :destroy
   has_many :shared_projects, through: :project_group_links, source: :project
+  has_many :notification_settings, dependent: :destroy, as: :source
 
   validate :avatar_type, if: ->(user) { user.avatar.present? && user.avatar_changed? }
   validate :visibility_level_allowed_by_projects
diff --git a/app/models/member.rb b/app/models/member.rb
index 177f37c3bb..e665ba6fb7 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -19,7 +19,6 @@
 
 class Member < ActiveRecord::Base
   include Sortable
-  include Notifiable
   include Gitlab::Access
 
   attr_accessor :raw_invite_token
@@ -170,6 +169,10 @@ class Member < ActiveRecord::Base
     end
   end
 
+  def notification
+    @notification ||= user.notification_settings.find_by(source: source)
+  end
+
   private
 
   def send_invite
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 379f041969..8a90b456cc 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -30,30 +30,12 @@ class Notification
     end
   end
 
+  delegate :disabled?, :participating?, :watch?, :global?, :mention?, to: :target
+
   def initialize(target)
     @target = target
   end
 
-  def disabled?
-    target.notification_level == N_DISABLED
-  end
-
-  def participating?
-    target.notification_level == N_PARTICIPATING
-  end
-
-  def watch?
-    target.notification_level == N_WATCH
-  end
-
-  def global?
-    target.notification_level == N_GLOBAL
-  end
-
-  def mention?
-    target.notification_level == N_MENTION
-  end
-
   def level
     target.notification_level
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index 2285063ab5..2f9621809b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -154,6 +154,7 @@ class Project < ActiveRecord::Base
   has_many :project_group_links, dependent: :destroy
   has_many :invited_groups, through: :project_group_links, source: :group
   has_many :todos, dependent: :destroy
+  has_many :notification_settings, dependent: :destroy, as: :source
 
   has_one :import_data, dependent: :destroy, class_name: "ProjectImportData"
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 59493e6f90..f556dc5903 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -193,6 +193,9 @@ class User < ActiveRecord::Base
 
   # 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
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index eff0d96f93..9628843c23 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -253,8 +253,8 @@ class NotificationService
   def project_watchers(project)
     project_members = project_member_notification(project)
 
-    users_with_project_level_global = project_member_notification(project, Notification::N_GLOBAL)
-    users_with_group_level_global = group_member_notification(project, Notification::N_GLOBAL)
+    users_with_project_level_global = project_member_notification(project, :global)
+    users_with_group_level_global = group_member_notification(project, :global)
     users = users_with_global_level_watch([users_with_project_level_global, users_with_group_level_global].flatten.uniq)
 
     users_with_project_setting = select_project_member_setting(project, users_with_project_level_global, users)
@@ -264,18 +264,16 @@ class NotificationService
   end
 
   def project_member_notification(project, notification_level=nil)
-    project_members = project.project_members
-
     if notification_level
-      project_members.where(notification_level: notification_level).pluck(:user_id)
+      project.notification_settings.where(level: NotificationSetting.levels[notification_level]).pluck(:user_id)
     else
-      project_members.pluck(:user_id)
+      project.notification_settings.pluck(:user_id)
     end
   end
 
   def group_member_notification(project, notification_level)
     if project.group
-      project.group.group_members.where(notification_level: notification_level).pluck(:user_id)
+      project.group.notification_settings.where(level: NotificationSetting.levels[notification_level]).pluck(:user_id)
     else
       []
     end
@@ -284,13 +282,13 @@ class NotificationService
   def users_with_global_level_watch(ids)
     User.where(
       id: ids,
-      notification_level: Notification::N_WATCH
+      notification_level: NotificationSetting.levels[:watch]
     ).pluck(:id)
   end
 
   # Build a list of users based on project notifcation settings
   def select_project_member_setting(project, global_setting, users_global_level_watch)
-    users = project_member_notification(project, Notification::N_WATCH)
+    users = project_member_notification(project, :watch)
 
     # If project setting is global, add to watch list if global setting is watch
     global_setting.each do |user_id|
@@ -304,7 +302,7 @@ class NotificationService
 
   # Build a list of users based on group notification settings
   def select_group_member_setting(project, project_members, global_setting, users_global_level_watch)
-    uids = group_member_notification(project, Notification::N_WATCH)
+    uids = group_member_notification(project, :watch)
 
     # Group setting is watch, add to users list if user is not project member
     users = []
@@ -351,20 +349,20 @@ class NotificationService
     users.reject do |user|
       next user.notification.send(method_name) unless project
 
-      member = project.project_members.find_by(user_id: user.id)
+      setting = user.notification_settings.find_by(source: project)
 
-      if !member && project.group
-        member = project.group.group_members.find_by(user_id: user.id)
+      if !setting && project.group
+        setting = user.notification_settings.find_by(source: group)
       end
 
-      # reject users who globally set mention notification and has no membership
-      next user.notification.send(method_name) unless member
+      # reject users who globally set mention notification and has no setting per project/group
+      next user.notification.send(method_name) unless setting
 
       # reject users who set mention notification in project
-      next true if member.notification.send(method_name)
+      next true if setting.send(method_name)
 
-      # reject users who have N_MENTION in project and disabled in global settings
-      member.notification.global? && user.notification.send(method_name)
+      # reject users who have mention level in project and disabled in global settings
+      setting.global? && user.notification.send(method_name)
     end
   end
 
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 0f2aa3ae73..c01851a8a2 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -89,11 +89,11 @@ describe NotificationService, services: true do
           note.project.group.add_user(@u_watcher, GroupMember::MASTER)
           note.project.save
           user_project = note.project.project_members.find_by_user_id(@u_watcher.id)
-          user_project.notification_level = Notification::N_PARTICIPATING
+          user_project.notification.level = :participating
           user_project.save
           group_member = note.project.group.group_members.find_by_user_id(@u_watcher.id)
-          group_member.notification_level = Notification::N_GLOBAL
-          group_member.save
+          group_member.notification.level = :global
+          group_member.notification.save
           ActionMailer::Base.deliveries.clear
         end
 
@@ -215,7 +215,7 @@ describe NotificationService, services: true do
         end
 
         it do
-          @u_committer.update_attributes(notification_level: Notification::N_MENTION)
+          @u_committer.update_attributes(notification_level: :mention)
           notification.new_note(note)
           should_not_email(@u_committer)
         end
@@ -246,7 +246,7 @@ describe NotificationService, services: true do
       end
 
       it do
-        issue.assignee.update_attributes(notification_level: Notification::N_MENTION)
+        issue.assignee.update_attributes(notification_level: :mention)
         notification.new_issue(issue, @u_disabled)
 
         should_not_email(issue.assignee)
@@ -596,13 +596,13 @@ describe NotificationService, services: true do
   end
 
   def build_team(project)
-    @u_watcher = create(:user, notification_level: Notification::N_WATCH)
-    @u_participating = create(:user, notification_level: Notification::N_PARTICIPATING)
-    @u_participant_mentioned = create(:user, username: 'participant', notification_level: Notification::N_PARTICIPATING)
-    @u_disabled = create(:user, notification_level: Notification::N_DISABLED)
-    @u_mentioned = create(:user, username: 'mention', notification_level: Notification::N_MENTION)
+    @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: Notification::N_PARTICIPATING)
+    @u_not_mentioned = create(:user, username: 'regular', notification_level: :participating)
     @u_outsider_mentioned = create(:user, username: 'outsider')
 
     project.team << [@u_watcher, :master]
@@ -617,8 +617,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: Notification::N_PARTICIPATING)
-    @watcher_and_subscriber = create(:user, notification_level: Notification::N_WATCH)
+    @subscribed_participant = create(:user, username: 'subscribed_participant', notification_level: :participating)
+    @watcher_and_subscriber = create(:user, notification_level: :watch)
 
     project.team << [@subscribed_participant, :master]
     project.team << [@subscriber, :master]

From 4ca73f56cb59b86f25b55ff02800571fb82c742f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 23:22:28 +0200
Subject: [PATCH 007/283] Small refactoring and cleanup of notification logic

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/helpers/notifications_helper.rb        | 12 +-----
 app/models/member.rb                       |  2 +
 app/models/members/group_member.rb         |  1 -
 app/models/members/project_member.rb       |  1 -
 app/models/notification.rb                 | 46 ----------------------
 spec/models/notification_setting_spec.rb   |  1 +
 spec/services/notification_service_spec.rb |  9 ++---
 7 files changed, 8 insertions(+), 64 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index a0e91a63d2..8816cc5d16 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -22,16 +22,12 @@ module NotificationsHelper
 
   def notification_title(level)
     case level.to_sym
-    when :disabled
-      'Disabled'
     when :participating
       'Participate'
-    when :watch
-      'Watch'
     when :mention
       'On mention'
-    when :global
-      'Global'
+    else
+      level.to_s.titlecase
     end
   end
 
@@ -50,10 +46,6 @@ module NotificationsHelper
     end
   end
 
-  def notification_label(setting)
-    notification_title(setting.level)
-  end
-
   def active_level_for(setting, level)
     'active' if setting.level == level
   end
diff --git a/app/models/member.rb b/app/models/member.rb
index e665ba6fb7..799f28c3fd 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -62,6 +62,8 @@ class Member < ActiveRecord::Base
 
   delegate :name, :username, :email, to: :user, prefix: true
 
+  default_value_for :notification_level, NotificationSetting.levels[:global]
+
   class << self
     def find_by_invite_token(invite_token)
       invite_token = Devise.token_generator.digest(self, :invite_token, invite_token)
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index 65d2ea0057..9fb474a1a9 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -24,7 +24,6 @@ class GroupMember < Member
 
   # Make sure group member points only to group as it source
   default_value_for :source_type, SOURCE_TYPE
-  default_value_for :notification_level, Notification::N_GLOBAL
   validates_format_of :source_type, with: /\ANamespace\z/
   default_scope { where(source_type: SOURCE_TYPE) }
 
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 560d1690e1..07ddb02ae9 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -27,7 +27,6 @@ class ProjectMember < Member
 
   # Make sure project member points only to project as it source
   default_value_for :source_type, SOURCE_TYPE
-  default_value_for :notification_level, Notification::N_GLOBAL
   validates_format_of :source_type, with: /\AProject\z/
   default_scope { where(source_type: SOURCE_TYPE) }
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 8a90b456cc..3805bde88b 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,35 +1,6 @@
 class Notification
-  #
-  # Notification levels
-  #
-  N_DISABLED = 0
-  N_PARTICIPATING = 1
-  N_WATCH = 2
-  N_GLOBAL = 3
-  N_MENTION = 4
-
   attr_accessor :target
 
-  class << self
-    def notification_levels
-      [N_DISABLED, N_MENTION, N_PARTICIPATING, N_WATCH]
-    end
-
-    def options_with_labels
-      {
-        disabled: N_DISABLED,
-        participating: N_PARTICIPATING,
-        watch: N_WATCH,
-        mention: N_MENTION,
-        global: N_GLOBAL
-      }
-    end
-
-    def project_notification_levels
-      [N_DISABLED, N_MENTION, N_PARTICIPATING, N_WATCH, N_GLOBAL]
-    end
-  end
-
   delegate :disabled?, :participating?, :watch?, :global?, :mention?, to: :target
 
   def initialize(target)
@@ -39,21 +10,4 @@ class Notification
   def level
     target.notification_level
   end
-
-  def to_s
-    case level
-    when N_DISABLED
-      'Disabled'
-    when N_PARTICIPATING
-      'Participating'
-    when N_WATCH
-      'Watching'
-    when N_MENTION
-      'On mention'
-    when N_GLOBAL
-      'Global'
-    else
-      # do nothing
-    end
-  end
 end
diff --git a/spec/models/notification_setting_spec.rb b/spec/models/notification_setting_spec.rb
index f9d668ed75..f31b2a3cd6 100644
--- a/spec/models/notification_setting_spec.rb
+++ b/spec/models/notification_setting_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe NotificationSetting, type: :model do
   describe "Associations" do
     it { is_expected.to belong_to(:user) }
+    it { is_expected.to belong_to(:source) }
   end
 
   describe "Validation" do
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index c01851a8a2..c4d52584a4 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -88,12 +88,9 @@ describe NotificationService, services: true do
           note.project.namespace_id = group.id
           note.project.group.add_user(@u_watcher, GroupMember::MASTER)
           note.project.save
-          user_project = note.project.project_members.find_by_user_id(@u_watcher.id)
-          user_project.notification.level = :participating
-          user_project.save
-          group_member = note.project.group.group_members.find_by_user_id(@u_watcher.id)
-          group_member.notification.level = :global
-          group_member.notification.save
+
+          @u_watcher.notification_settings.find_by(source: note.project).participating!
+          @u_watcher.notification_settings.find_by(source: note.project.group).global!
           ActionMailer::Base.deliveries.clear
         end
 

From 855b2820c16c6e569d5c38b7def8ead18c86cecd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 28 Mar 2016 23:39:49 +0200
Subject: [PATCH 008/283] Improve db migrations for notification settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 ...60328112808_create_notification_settings.rb |  7 +++----
 ...8115649_migrate_new_notification_setting.rb |  2 +-
 db/schema.rb                                   | 18 +++++++++---------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/db/migrate/20160328112808_create_notification_settings.rb b/db/migrate/20160328112808_create_notification_settings.rb
index 88652821ac..4755da8b80 100644
--- a/db/migrate/20160328112808_create_notification_settings.rb
+++ b/db/migrate/20160328112808_create_notification_settings.rb
@@ -1,10 +1,9 @@
 class CreateNotificationSettings < ActiveRecord::Migration
   def change
     create_table :notification_settings do |t|
-      t.integer :user_id
-      t.integer :level
-      t.integer :source_id
-      t.string :source_type
+      t.references :user, null: false
+      t.references :source, polymorphic: true, null: false
+      t.integer :level, default: 0, null: false
 
       t.timestamps null: false
     end
diff --git a/db/migrate/20160328115649_migrate_new_notification_setting.rb b/db/migrate/20160328115649_migrate_new_notification_setting.rb
index 331c35535f..aff866b5f4 100644
--- a/db/migrate/20160328115649_migrate_new_notification_setting.rb
+++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb
@@ -4,7 +4,7 @@
 class MigrateNewNotificationSetting < ActiveRecord::Migration
   def up
     timestamp = Time.now
-    execute "INSERT INTO notification_settings ( user_id, source_id, source_type, level, created_at, updated_at ) SELECT user_id, source_id, source_type, notification_level, '#{timestamp}', '#{timestamp}' FROM members"
+    execute "INSERT INTO notification_settings ( user_id, source_id, source_type, level, created_at, updated_at ) SELECT user_id, source_id, source_type, notification_level, '#{timestamp}', '#{timestamp}' FROM members WHERE user_id IS NOT NULL"
   end
 
   def down
diff --git a/db/schema.rb b/db/schema.rb
index 29639abb6f..e946ecd3f2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -639,12 +639,12 @@ ActiveRecord::Schema.define(version: 20160328121138) do
   add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree
 
   create_table "notification_settings", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "level"
-    t.integer  "source_id"
-    t.string   "source_type"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.integer  "user_id",                 null: false
+    t.integer  "source_id",               null: false
+    t.string   "source_type",             null: false
+    t.integer  "level",       default: 0, null: false
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree
@@ -798,9 +798,9 @@ ActiveRecord::Schema.define(version: 20160328121138) 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 08b3d7f6ef23b7a8a83c7e71e2d04f6416e73406 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 13:08:30 +0200
Subject: [PATCH 009/283] Refactor notification helper and fix notification
 service

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/helpers/notifications_helper.rb       | 12 +++-----
 app/services/notification_service.rb      |  2 +-
 spec/helpers/notifications_helper_spec.rb | 37 ++++++-----------------
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 8816cc5d16..54ab9179ef 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -16,8 +16,8 @@ module NotificationsHelper
     end
   end
 
-  def notification_icon(level)
-    icon("#{notification_icon_class(level)} fw")
+  def notification_icon(level, text = nil)
+    icon("#{notification_icon_class(level)} fw", text: text)
   end
 
   def notification_title(level)
@@ -39,14 +39,10 @@ module NotificationsHelper
       notification_title: title
     }
 
-    content_tag(:li, class: active_level_for(setting, level)) do
+    content_tag(:li, class: ('active' if setting.level == level)) do
       link_to '#', class: 'update-notification', data: data do
-        icon("#{notification_icon_class(level)} fw", text: title)
+        notification_icon(level, title)
       end
     end
   end
-
-  def active_level_for(setting, level)
-    'active' if setting.level == level
-  end
 end
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 9628843c23..23f211dfcd 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -352,7 +352,7 @@ class NotificationService
       setting = user.notification_settings.find_by(source: project)
 
       if !setting && project.group
-        setting = user.notification_settings.find_by(source: group)
+        setting = user.notification_settings.find_by(source: project.group)
       end
 
       # reject users who globally set mention notification and has no setting per project/group
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index f1aba4cfdf..9d5f009ebe 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -2,34 +2,15 @@ require 'spec_helper'
 
 describe NotificationsHelper do
   describe 'notification_icon' do
-    let(:notification) { double(disabled?: false, participating?: false, watch?: false) }
+    it { expect(notification_icon(:disabled)).to match('class="fa fa-microphone-slash fa-fw"') }
+    it { expect(notification_icon(:participating)).to match('class="fa fa-volume-up fa-fw"') }
+    it { expect(notification_icon(:mention)).to match('class="fa fa-at fa-fw"') }
+    it { expect(notification_icon(:global)).to match('class="fa fa-globe fa-fw"') }
+    it { expect(notification_icon(:watch)).to match('class="fa fa-eye fa-fw"') }
+  end
 
-    context "disabled notification" do
-      before { allow(notification).to receive(:disabled?).and_return(true) }
-
-      it "has a red icon" do
-        expect(notification_icon(notification)).to match('class="fa fa-volume-off ns-mute"')
-      end
-    end
-
-    context "participating notification" do
-      before { allow(notification).to receive(:participating?).and_return(true) }
-
-      it "has a blue icon" do
-        expect(notification_icon(notification)).to match('class="fa fa-volume-down ns-part"')
-      end
-    end
-
-    context "watched notification" do
-      before { allow(notification).to receive(:watch?).and_return(true) }
-
-      it "has a green icon" do
-        expect(notification_icon(notification)).to match('class="fa fa-volume-up ns-watch"')
-      end
-    end
-
-    it "has a blue icon" do
-      expect(notification_icon(notification)).to match('class="fa fa-circle-o ns-default"')
-    end
+  describe 'notification_title' do
+    it { expect(notification_title(:watch)).to match('Watch') }
+    it { expect(notification_title(:mention)).to match('On mention') }
   end
 end

From 86418c475be1b2a37e89682bc87055b7372bbcfb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 13:37:43 +0200
Subject: [PATCH 010/283] Remove useless Notification model

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/member.rb                 |  4 ++--
 app/models/notification.rb           | 13 -------------
 app/models/user.rb                   |  4 ----
 app/services/notification_service.rb | 24 +++++++++++++++---------
 4 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 app/models/notification.rb

diff --git a/app/models/member.rb b/app/models/member.rb
index 799f28c3fd..cbcc54c025 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -171,8 +171,8 @@ class Member < ActiveRecord::Base
     end
   end
 
-  def notification
-    @notification ||= user.notification_settings.find_by(source: source)
+  def notification_setting
+    @notification_setting ||= user.notification_settings.find_by(source: source)
   end
 
   private
diff --git a/app/models/notification.rb b/app/models/notification.rb
deleted file mode 100644
index 3805bde88b..0000000000
--- a/app/models/notification.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Notification
-  attr_accessor :target
-
-  delegate :disabled?, :participating?, :watch?, :global?, :mention?, to: :target
-
-  def initialize(target)
-    @target = target
-  end
-
-  def level
-    target.notification_level
-  end
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index f556dc5903..af6b86bfa7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -357,10 +357,6 @@ class User < ActiveRecord::Base
     "#{self.class.reference_prefix}#{username}"
   end
 
-  def notification
-    @notification ||= Notification.new(self)
-  end
-
   def generate_password
     if self.force_random_password
       self.password = self.password_confirmation = Devise.friendly_token.first(8)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 23f211dfcd..0928dda349 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -329,25 +329,31 @@ class NotificationService
   # Remove users with disabled notifications from array
   # Also remove duplications and nil recipients
   def reject_muted_users(users, project = nil)
-    reject_users(users, :disabled?, project)
+    reject_users(users, :disabled, project)
   end
 
   # Remove users with notification level 'Mentioned'
   def reject_mention_users(users, project = nil)
-    reject_users(users, :mention?, project)
+    reject_users(users, :mention, project)
   end
 
-  # Reject users which method_name from notification object returns true.
+  # Reject users which has certain notification level
   #
   # Example:
-  #   reject_users(users, :watch?, project)
+  #   reject_users(users, :watch, project)
   #
-  def reject_users(users, method_name, project = nil)
+  def reject_users(users, level, project = nil)
+    level = level.to_s
+
+    unless NotificationSetting.levels.keys.include?(level)
+      raise 'Invalid notification level'
+    end
+
     users = users.to_a.compact.uniq
     users = users.reject(&:blocked?)
 
     users.reject do |user|
-      next user.notification.send(method_name) unless project
+      next user.notification_level == level unless project
 
       setting = user.notification_settings.find_by(source: project)
 
@@ -356,13 +362,13 @@ class NotificationService
       end
 
       # reject users who globally set mention notification and has no setting per project/group
-      next user.notification.send(method_name) unless setting
+      next user.notification_level == level unless setting
 
       # reject users who set mention notification in project
-      next true if setting.send(method_name)
+      next true if setting.level == level
 
       # reject users who have mention level in project and disabled in global settings
-      setting.global? && user.notification.send(method_name)
+      setting.global? && user.notification_level == level
     end
   end
 

From 630c86a7a36cee36ed6b9c93644a6cb51e2b3b23 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 13:42:48 +0200
Subject: [PATCH 011/283] Add spec for user_id uniq in NotificationSetting
 model

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 spec/models/notification_setting_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/models/notification_setting_spec.rb b/spec/models/notification_setting_spec.rb
index f31b2a3cd6..295081e9da 100644
--- a/spec/models/notification_setting_spec.rb
+++ b/spec/models/notification_setting_spec.rb
@@ -7,10 +7,11 @@ RSpec.describe NotificationSetting, type: :model do
   end
 
   describe "Validation" do
-    subject { NotificationSetting.new }
+    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
 end

From 71e7b398431506c8bac2e8e6014b0f3891a41f95 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 13:52:42 +0200
Subject: [PATCH 012/283] Refactor creating notification setting with defaults

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/projects_controller.rb |  7 +------
 app/models/member.rb                   |  7 +------
 app/models/notification_setting.rb     | 11 +++++++++++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 77122f5912..e2dc6309d2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,12 +102,7 @@ class ProjectsController < Projects::ApplicationController
           @membership = @project.team.find_member(current_user.id)
 
           if @membership
-            @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
-
-            unless @notification_setting.persisted?
-              @notification_setting.set_defaults
-              @notification_setting.save
-            end
+            @notification_setting = current_user.notification_settings.find_or_create_for(@project)
           end
         end
 
diff --git a/app/models/member.rb b/app/models/member.rb
index cbcc54c025..747d0f16d8 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -163,12 +163,7 @@ class Member < ActiveRecord::Base
   end
 
   def create_notification_setting
-    notification_setting = user.notification_settings.find_or_initialize_by(source: source)
-
-    unless notification_setting.persisted?
-      notification_setting.set_defaults
-      notification_setting.save
-    end
+    user.notification_setting.find_or_create_for(source)
   end
 
   def notification_setting
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 287862a01b..13a8995b03 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -15,6 +15,17 @@ class NotificationSetting < ActiveRecord::Base
   scope :for_groups, -> { where(source_type: 'Namespace') }
   scope :for_projects, -> { where(source_type: 'Project') }
 
+  def self.find_or_create_for(source)
+    setting = find_or_initialize_by(source: source)
+
+    unless setting.persisted?
+      setting.set_defaults
+      setting.save
+    end
+
+    setting
+  end
+
   def set_defaults
     self.level = :global
   end

From f8f68d6b8c5b5d85b4798257ae3ae4bf4ec8fadc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 14:03:23 +0200
Subject: [PATCH 013/283] Fix few bugs related to recent notifications
 refactoring

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/profiles/notifications_controller.rb | 1 -
 app/models/member.rb                                 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 6ca7537300..0cca5d1e33 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -1,7 +1,6 @@
 class Profiles::NotificationsController < Profiles::ApplicationController
   def show
     @user = current_user
-    @notification = current_user.notification
     @group_notifications = current_user.notification_settings.for_groups
     @project_notifications = current_user.notification_settings.for_projects
   end
diff --git a/app/models/member.rb b/app/models/member.rb
index 747d0f16d8..7d5af1d5c8 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -163,7 +163,7 @@ class Member < ActiveRecord::Base
   end
 
   def create_notification_setting
-    user.notification_setting.find_or_create_for(source)
+    user.notification_settings.find_or_create_for(source)
   end
 
   def notification_setting

From 5583197e091e8f75ad9c99a1bbc46e6a0b7279d4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 17:42:38 +0200
Subject: [PATCH 014/283] Create NotificationSettings object only when user
 change value in dropdown

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/project.js.coffee      |  9 +++++++-
 .../notification_settings_controller.rb       | 22 +++++++++++++++++++
 app/controllers/projects_controller.rb        |  3 ++-
 .../projects/buttons/_notifications.html.haml |  5 ++---
 config/routes.rb                              |  1 +
 5 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 app/controllers/projects/notification_settings_controller.rb

diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index f171442d05..07be85a32a 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -38,12 +38,19 @@ class @Project
       e.preventDefault()
       notification_level = $(@).data 'notification-level'
       label = $(@).data 'notification-title'
-      $('#notification_level').val(notification_level)
+      $('#notification_setting_level').val(notification_level)
       $('#notification-form').submit()
       $('#notifications-button').empty().append("<i class='fa fa-bell'></i>" + label + "<i class='fa fa-angle-down'></i>")
       $(@).parents('ul').find('li.active').removeClass 'active'
       $(@).parent().addClass 'active'
 
+    $('#notification-form').on 'ajax:success', (e, data) ->
+      if data.saved
+        new Flash("Notification settings saved", "notice")
+      else
+        new Flash("Failed to save new settings", "alert")
+
+
     @projectSelectDropdown()
 
   projectSelectDropdown: ->
diff --git a/app/controllers/projects/notification_settings_controller.rb b/app/controllers/projects/notification_settings_controller.rb
new file mode 100644
index 0000000000..3ecf63d107
--- /dev/null
+++ b/app/controllers/projects/notification_settings_controller.rb
@@ -0,0 +1,22 @@
+class Projects::NotificationSettingsController < Projects::ApplicationController
+  def create
+    notification_setting = project.notification_settings.new(notification_setting_params)
+    notification_setting.user = current_user
+    saved = notification_setting.save
+
+    render json: { saved: saved }
+  end
+
+  def update
+    notification_setting = project.notification_settings.where(user_id: current_user).find(params[:id])
+    saved = notification_setting.update_attributes(notification_setting_params)
+
+    render json: { saved: saved }
+  end
+
+  private
+
+  def notification_setting_params
+    params.require(:notification_setting).permit(:level)
+  end
+end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e2dc6309d2..ec5318f2d2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,7 +102,8 @@ class ProjectsController < Projects::ApplicationController
           @membership = @project.team.find_member(current_user.id)
 
           if @membership
-            @notification_setting = current_user.notification_settings.find_or_create_for(@project)
+            @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
+            @notification_setting.set_defaults unless @notification_setting.persisted?
           end
         end
 
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index 4b8a10f081..2b9d8f2ac8 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -1,7 +1,6 @@
 - if @notification_setting
-  = form_tag profile_notifications_path, method: :put, remote: true, class: 'inline', id: 'notification-form' do
-    = hidden_field_tag :notification_id, @notification_setting.id
-    = hidden_field_tag :notification_level, @notification_setting.level
+  = form_for [@project.namespace.becomes(Namespace), @project, @notification_setting], remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
+    = f.hidden_field :level
     %span.dropdown
       %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
         = icon('bell')
diff --git a/config/routes.rb b/config/routes.rb
index 6bf22fb445..c665cefbb5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -606,6 +606,7 @@ Rails.application.routes.draw do
 
         resources :forks, only: [:index, :new, :create]
         resource :import, only: [:new, :create, :show]
+        resources :notification_settings, only: [:create, :update]
 
         resources :refs, only: [] do
           collection do

From 729fe42bff474535c9eebb0b73974a79756372b8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 17:56:12 +0200
Subject: [PATCH 015/283] Improve project notification settings explanation

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

diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index f6900f61b2..e9c8ae2854 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -65,7 +65,7 @@
       %h5
         Projects (#{@project_notifications.count})
       %p.account-well
-        To specify the notification level per project of a group you belong to, you need to be a member of the project itself, not only its group.
+        To specify the notification level per project of a group you belong to, you need to visit project page and change notification level there.
       .append-bottom-default
         %ul.bordered-list
           - @project_notifications.each do |setting|

From 26631f9981a826ebe4aeba726e9be2b813d2c5c5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 18:59:03 +0200
Subject: [PATCH 016/283] Change how notification settings in profile are
 rendered and updated

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/profile.js.coffee      |  7 +-
 .../notification_settings_controller.rb       | 14 ++++
 .../profiles/notifications_controller.rb      | 28 ++------
 .../notifications/_group_settings.html.haml   | 13 ++++
 .../notifications/_project_settings.html.haml | 13 ++++
 .../notifications/_settings.html.haml         | 17 -----
 .../profiles/notifications/show.html.haml     | 72 ++++++++++---------
 .../profiles/notifications/update.js.haml     |  6 --
 config/routes.rb                              |  1 +
 9 files changed, 89 insertions(+), 82 deletions(-)
 create mode 100644 app/controllers/groups/notification_settings_controller.rb
 create mode 100644 app/views/profiles/notifications/_group_settings.html.haml
 create mode 100644 app/views/profiles/notifications/_project_settings.html.haml
 delete mode 100644 app/views/profiles/notifications/_settings.html.haml
 delete mode 100644 app/views/profiles/notifications/update.js.haml

diff --git a/app/assets/javascripts/profile.js.coffee b/app/assets/javascripts/profile.js.coffee
index ae87c6c4e4..f4a2562885 100644
--- a/app/assets/javascripts/profile.js.coffee
+++ b/app/assets/javascripts/profile.js.coffee
@@ -18,8 +18,11 @@ class @Profile
       $(this).find('.btn-save').enable()
       $(this).find('.loading-gif').hide()
 
-    $('.update-notifications').on 'ajax:complete', ->
-      $(this).find('.btn-save').enable()
+    $('.update-notifications').on 'ajax:success', (e, data) ->
+      if data.saved
+        new Flash("Notification settings saved", "notice")
+      else
+        new Flash("Failed to save new settings", "alert")
 
     @bindEvents()
 
diff --git a/app/controllers/groups/notification_settings_controller.rb b/app/controllers/groups/notification_settings_controller.rb
new file mode 100644
index 0000000000..78e43c83ab
--- /dev/null
+++ b/app/controllers/groups/notification_settings_controller.rb
@@ -0,0 +1,14 @@
+class Groups::NotificationSettingsController < Groups::ApplicationController
+  def update
+    notification_setting = group.notification_settings.where(user_id: current_user).find(params[:id])
+    saved = notification_setting.update_attributes(notification_setting_params)
+
+    render json: { saved: saved }
+  end
+
+  private
+
+  def notification_setting_params
+    params.require(:notification_setting).permit(:level)
+  end
+end
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 0cca5d1e33..18ee55c839 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -6,29 +6,13 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   end
 
   def update
-    type = params[:notification_type]
-
-    @saved = if type == 'global'
-               current_user.update_attributes(user_params)
-             else
-               notification_setting = current_user.notification_settings.find(params[:notification_id])
-               notification_setting.level = params[:notification_level]
-               notification_setting.save
-             end
-
-    respond_to do |format|
-      format.html do
-        if @saved
-          flash[:notice] = "Notification settings saved"
-        else
-          flash[:alert] = "Failed to save new settings"
-        end
-
-        redirect_back_or_default(default: profile_notifications_path)
-      end
-
-      format.js
+    if current_user.update_attributes(user_params)
+      flash[:notice] = "Notification settings saved"
+    else
+      flash[:alert] = "Failed to save new settings"
     end
+
+    redirect_back_or_default(default: profile_notifications_path)
   end
 
   def user_params
diff --git a/app/views/profiles/notifications/_group_settings.html.haml b/app/views/profiles/notifications/_group_settings.html.haml
new file mode 100644
index 0000000000..89ae7ffda2
--- /dev/null
+++ b/app/views/profiles/notifications/_group_settings.html.haml
@@ -0,0 +1,13 @@
+%li.notification-list-item
+  %span.notification.fa.fa-holder.append-right-5
+    - if setting.global?
+      = notification_icon(current_user.notification_level)
+    - else
+      = notification_icon(setting.level)
+
+  %span.str-truncated
+    = link_to group.name, group_path(group)
+
+  .pull-right
+    = form_for [group, setting], remote: true, html: { class: 'update-notifications' } do |f|
+      = f.select :level, NotificationSetting.levels.keys, {}, class: 'form-control trigger-submit'
diff --git a/app/views/profiles/notifications/_project_settings.html.haml b/app/views/profiles/notifications/_project_settings.html.haml
new file mode 100644
index 0000000000..17c097154d
--- /dev/null
+++ b/app/views/profiles/notifications/_project_settings.html.haml
@@ -0,0 +1,13 @@
+%li.notification-list-item
+  %span.notification.fa.fa-holder.append-right-5
+    - if setting.global?
+      = notification_icon(current_user.notification_level)
+    - else
+      = notification_icon(setting.level)
+
+  %span.str-truncated
+    = link_to_project(project)
+
+  .pull-right
+    = form_for [project.namespace.becomes(Namespace), project, setting], remote: true, html: { class: 'update-notifications' } do |f|
+      = f.select :level, NotificationSetting.levels.keys, {}, class: 'form-control trigger-submit'
diff --git a/app/views/profiles/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml
deleted file mode 100644
index c32de0b992..0000000000
--- a/app/views/profiles/notifications/_settings.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-%li.notification-list-item
-  %span.notification.fa.fa-holder.append-right-5
-    - if setting.global?
-      = notification_icon(current_user.notification_level)
-    - else
-      = notification_icon(setting.level)
-
-  %span.str-truncated
-    - if setting.source.kind_of? Project
-      = link_to_project(setting.source)
-    - else
-      = link_to setting.source.name, group_path(setting.source)
-  .pull-right
-    = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
-      = hidden_field_tag :notification_id, setting.id
-      = hidden_field_tag :notification_level, setting.level
-      = select_tag :notification_level, options_for_select(User.notification_levels.keys, setting.level), class: 'form-control trigger-submit'
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index e9c8ae2854..a2a505c082 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,8 +1,8 @@
 - page_title "Notifications"
 - header_title page_title, profile_notifications_path
 
-= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f|
-  -if @user.errors.any?
+%div
+  - if @user.errors.any?
     %div.alert.alert-danger
       %ul
         - @user.errors.full_messages.each do |msg|
@@ -20,48 +20,50 @@
     .col-lg-9
       %h5
         Global notification settings
-      .form-group
-        = f.label :notification_email, class: "label-light"
-        = 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
+      = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f|
+        .form-group
+          = f.label :notification_email, class: "label-light"
+          = 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: :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: :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: :watch do
-            = f.radio_button :notification_level, :watch
-            .level-title
-              Watch
-            %p You will receive notifications for any activity
+          .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)
 
-      .prepend-top-default
-        = f.submit 'Update settings', class: "btn btn-create"
+          .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
+
+        .prepend-top-default
+          = f.submit 'Update settings', class: "btn btn-create"
       %hr
       %h5
         Groups (#{@group_notifications.count})
       %div
         %ul.bordered-list
           - @group_notifications.each do |setting|
-            = render 'settings', setting: setting
+            = render 'group_settings', setting: setting, group: setting.source
       %h5
         Projects (#{@project_notifications.count})
       %p.account-well
@@ -69,4 +71,4 @@
       .append-bottom-default
         %ul.bordered-list
           - @project_notifications.each do |setting|
-            = render 'settings', setting: setting
+            = render 'project_settings', setting: setting, project: setting.source
diff --git a/app/views/profiles/notifications/update.js.haml b/app/views/profiles/notifications/update.js.haml
deleted file mode 100644
index 84c6ab2559..0000000000
--- a/app/views/profiles/notifications/update.js.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- if @saved
-  :plain
-    new Flash("Notification settings saved", "notice")
-- else
-  :plain
-    new Flash("Failed to save new settings", "alert")
diff --git a/config/routes.rb b/config/routes.rb
index c665cefbb5..7f03fbf6af 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -406,6 +406,7 @@ Rails.application.routes.draw do
 
       resource :avatar, only: [:destroy]
       resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
+      resources :notification_settings, only: [:update]
     end
   end
 

From 949431fa02da18257c8b7c7a24c03faa04c02c5e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 22:19:00 +0200
Subject: [PATCH 017/283] Update API to use notification_level from
 notification_setting

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 lib/api/entities.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index f686c568be..f414c1f988 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -255,14 +255,19 @@ module API
       expose :id, :path, :kind
     end
 
-    class ProjectAccess < Grape::Entity
+    class Member < Grape::Entity
       expose :access_level
-      expose :notification_level
+      expose :notification_level do |member, options|
+        if member.notification_setting
+          NotificationSetting.levels[member.notification_setting.level]
+        end
+      end
     end
 
-    class GroupAccess < Grape::Entity
-      expose :access_level
-      expose :notification_level
+    class ProjectAccess < Member
+    end
+
+    class GroupAccess < Member
     end
 
     class ProjectService < Grape::Entity

From 49f9873ce2a88fb38f23f7eb09471e8b58aebe1d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 29 Mar 2016 22:20:59 +0200
Subject: [PATCH 018/283] Add changelog item

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2cd06d9025..88edf1e848 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.7.0 (unreleased)
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
+  - Decouple membership and notifications
 
 v 8.6.2 (unreleased)
   - Comments on confidential issues don't show up in activity feed to non-members

From 065faac3a390f29b57db5261e9eab4efa076554c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 30 Mar 2016 10:32:19 +0200
Subject: [PATCH 019/283] Test changing notification settings per project fron
 notificaitons page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/profile/notifications.feature  |  6 ++++++
 features/steps/profile/notifications.rb | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/features/profile/notifications.feature b/features/profile/notifications.feature
index 55997d44de..ef8743932f 100644
--- a/features/profile/notifications.feature
+++ b/features/profile/notifications.feature
@@ -7,3 +7,9 @@ Feature: Profile Notifications
   Scenario: I visit notifications tab
     When I visit profile notifications page
     Then I should see global notifications settings
+
+  @javascript
+  Scenario: I edit Project Notifications
+    Given I visit profile notifications page
+    When I select Mention setting from dropdown
+    Then I should see Notification saved message
diff --git a/features/steps/profile/notifications.rb b/features/steps/profile/notifications.rb
index 447ea6d9d1..a96f35ada5 100644
--- a/features/steps/profile/notifications.rb
+++ b/features/steps/profile/notifications.rb
@@ -9,4 +9,14 @@ class Spinach::Features::ProfileNotifications < Spinach::FeatureSteps
   step 'I should see global notifications settings' do
     expect(page).to have_content "Notifications"
   end
+
+  step 'I select Mention setting from dropdown' do
+    select 'mention', from: 'notification_setting_level'
+  end
+
+  step 'I should see Notification saved message' do
+    page.within '.flash-container' do
+      expect(page).to have_content 'Notification settings saved'
+    end
+  end
 end

From 1a293a43847b30d4357116f830a1b22d370c4a6f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 30 Mar 2016 10:38:03 +0200
Subject: [PATCH 020/283] Update migration comment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 .../20160328115649_migrate_new_notification_setting.rb    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20160328115649_migrate_new_notification_setting.rb b/db/migrate/20160328115649_migrate_new_notification_setting.rb
index aff866b5f4..6a68890f5b 100644
--- a/db/migrate/20160328115649_migrate_new_notification_setting.rb
+++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb
@@ -1,6 +1,10 @@
 # This migration will create one row of NotificationSetting for each Member row
-# It can take long time on big instances. Its unclear yet if this migration can be done online.
-# This comment should be updated by @dzaporozhets before 8.7 release. If not - please ask him to do so.
+# It can take long time on big instances.
+#
+# This migration can be done online but with following effects:
+# - during migration some users will receive notifications based on their global settings (project/group settings will be ignored)
+# - its possible to get duplicate records for notification settings since we don't create uniq index yet
+#
 class MigrateNewNotificationSetting < ActiveRecord::Migration
   def up
     timestamp = Time.now

From fb8b0041d86080f0f8d53f13be1016b0b199a47f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 30 Mar 2016 18:53:30 -0400
Subject: [PATCH 021/283] First pass at a Testing styleguide

[ci skip]
---
 CONTRIBUTING.md            |   2 +-
 doc/development/README.md  |   1 +
 doc/development/testing.md | 105 +++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 doc/development/testing.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 511336f384..1f26a5d7ea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -448,7 +448,7 @@ merge request:
     - multi-line method chaining style **Option B**: dot `.` on previous line
     - string literal quoting style **Option A**: single quoted by default
 1.  [Rails](https://github.com/bbatsov/rails-style-guide)
-1.  [Testing](https://github.com/thoughtbot/guides/tree/master/style/testing)
+1.  [Testing](doc/development/testing.md)
 1.  [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style/coffeescript)
 1.  [SCSS styleguide][scss-styleguide]
 1.  [Shell commands](doc/development/shell_commands.md) created by GitLab
diff --git a/doc/development/README.md b/doc/development/README.md
index 1b281809af..a8bc4fe5ab 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -9,4 +9,5 @@
 - [Shell commands](shell_commands.md) in the GitLab codebase
 - [Sidekiq debugging](sidekiq_debugging.md)
 - [SQL guidelines](sql.md) for SQL guidelines
+- [Testing standards and style guidelines](testing.md)
 - [UI guide](ui_guide.md) for building GitLab with existing css styles and elements
diff --git a/doc/development/testing.md b/doc/development/testing.md
new file mode 100644
index 0000000000..d37ef5d878
--- /dev/null
+++ b/doc/development/testing.md
@@ -0,0 +1,105 @@
+# Testing Standards and Style Guidelines
+
+This guide outlines standards and best practices for automated testing of GitLab
+CE and EE.
+
+It is meant to be an _extension_ of the [thoughtbot testing
+styleguide](https://github.com/thoughtbot/guides/tree/master/style/testing). If
+this guide defines a rule that contradicts the thoughtbot guide, this guide
+takes precedence. Some guidelines may be repeated verbatim to stress their
+importance.
+
+## Factories
+
+GitLab uses [factory_girl] as a test
+fixture replacement.
+
+- Factory definitions live in `spec/factories/`, named using the pluralization
+  of their corresponding model (`User` factories are defined in `users.rb`).
+- There should be only one top-level factory definition per file.
+- Make use of [Traits] to clean up definitions and usages.
+- When defining a factory, don't define attributes that are not required for the
+  resulting record to pass validation.
+- When instantiating from a factory, don't supply extraneous attributes that
+  aren't required by the test.
+
+[factory_girl]: https://github.com/thoughtbot/factory_girl
+[Traits]: http://www.rubydoc.info/gems/factory_girl/file/GETTING_STARTED.md#Traits
+
+## JavaScript
+
+GitLab uses [Teaspoon] to run its [Jasmine] JavaScript specs. They can be run on
+the command line via `bundle exec teaspoon`, or via a web browser at
+`http://localhost:3000/teaspoon` when the Rails server is running.
+
+- JavaScript tests live in `spec/javascripts/`, matching the folder structure of
+  `app/assets/javascripts/`: `app/assets/javascripts/behaviors/autosize.js.coffee` has a corresponding
+  `spec/javascripts/behaviors/autosize_spec.js.coffee` file.
+- Haml fixtures required for JavaScript tests live in
+  `spec/javascripts/fixtures`. They should contain the bare minimum amount of
+  markup necessary for the test.
+
+  > **Warning:** Keep in mind that a Rails view may change and
+  invalidate your test, but everything will still pass because your fixture
+  doesn't reflect the latest view.
+
+- Keep in mind that in a CI environment, these tests are run in a headless
+  browser and you will not have access to certain APIs, such as
+  [`Notification`](https://developer.mozilla.org/en-US/docs/Web/API/notification),
+  which will have to be stubbed.
+
+[Teaspoon]: https://github.com/modeset/teaspoon
+[Jasmine]: https://github.com/jasmine/jasmine
+
+## RSpec
+
+### General Guidelines
+
+- Use a single, top-level `describe ClassName` block.
+- Use `described_class` instead of repeating the class name being described.
+- Use `.method` to describe class methods and `#method` to describe instance
+  methods.
+- Use `context` to test branching logic.
+- Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
+- Prefer `not_to` to `to_not`.
+- Try to match the ordering of tests to the ordering within the class.
+
+### Test speed
+
+GitLab has a massive test suite that, without parallelization, can take more
+than an hour to run. It's important that we make an effort to write tests that
+are accurate and effective _as well as_ fast.
+
+Here are some things to keep in mind regarding test performance:
+
+- `double` and `spy` are faster than `FactoryGirl.build(...)`
+- `FactoryGirl.build(...)` and `.build_stubbed` are faster than `.create`.
+- Don't `create` an object when `build`, `build_stubbed`, `attributes_for`,
+  `spy`, or `double` will do. Database persistence is slow!
+- Use `create(:empty_project)` instead of `create(:project)` when you don't need
+  the underlying repository. Filesystem operations are slow!
+- Don't mark a feature as requiring JavaScript (through `@javascript` in
+  Spinach or `js: true` in RSpec) unless it's _actually_ required for the test
+  to be valid. Headless browser testing is slow!
+
+### Features / Integration
+
+- Feature specs live in `spec/features/` and should be named
+  `ROLE_ACTION_spec.rb`, such as `user_changes_password_spec.rb`.
+- Use only one `feature` block per feature spec file.
+- Use scenario titles that describe the success and failure paths.
+- Avoid scenario titles that add no information, such as "successfully."
+- Avoid scenario titles that repeat the feature title.
+
+## Spinach (feature) tests
+
+GitLab [moved from Cucumber to Spinach](https://github.com/gitlabhq/gitlabhq/pull/1426)
+for its feature/integration tests in September 2012.
+
+As of March 2016, we are [trying to avoid adding new Spinach
+tests](https://gitlab.com/gitlab-org/gitlab-ce/issues/14121) going forward,
+opting for [RSpec feature](#features-integration) specs.
+
+Adding new Spinach scenarios is acceptable _only if_ the new scenario requires
+no more than one new `step` definition. If more than that is required, the
+test should be re-implemented using RSpec instead.

From 0b9d9816f8ef1d871a050cea5d8bc3d9203c3d18 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 30 Mar 2016 19:11:02 -0400
Subject: [PATCH 022/283] Add a note about Four-Phase Test to Testing guide

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

diff --git a/doc/development/testing.md b/doc/development/testing.md
index d37ef5d878..a7e85ecebe 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -63,6 +63,8 @@ the command line via `bundle exec teaspoon`, or via a web browser at
 - Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
 - 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](https://robots.thoughtbot.com/four-phase-test)
+  pattern, using newlines to separate phases.
 
 ### Test speed
 

From 60f4081e135bdcd893d60192e652c4b829c656dd Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 1 Apr 2016 20:29:48 -0400
Subject: [PATCH 023/283] Factories don't have to be limited to `ActiveRecord`
 objects

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

diff --git a/doc/development/testing.md b/doc/development/testing.md
index a7e85ecebe..3d1c4ccab4 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -22,6 +22,8 @@ fixture replacement.
   resulting record to pass validation.
 - When instantiating from a factory, don't supply extraneous attributes that
   aren't required by the test.
+- Factories don't have to be limited to `ActiveRecord` objects.
+  [See example](https://gitlab.com/gitlab-org/gitlab-ce/commit/0b8cefd3b2385a21cfed779bd659978c0402766d).
 
 [factory_girl]: https://github.com/thoughtbot/factory_girl
 [Traits]: http://www.rubydoc.info/gems/factory_girl/file/GETTING_STARTED.md#Traits

From 2e83b562030e078ce6d37f81915590426a57c820 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 1 Apr 2016 20:30:24 -0400
Subject: [PATCH 024/283] Add a section about `let` to the Testing guide

[ci skip]
---
 doc/development/testing.md | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/development/testing.md b/doc/development/testing.md
index 3d1c4ccab4..187d852e53 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -11,8 +11,7 @@ importance.
 
 ## Factories
 
-GitLab uses [factory_girl] as a test
-fixture replacement.
+GitLab uses [factory_girl] as a test fixture replacement.
 
 - Factory definitions live in `spec/factories/`, named using the pluralization
   of their corresponding model (`User` factories are defined in `users.rb`).
@@ -65,8 +64,30 @@ the command line via `bundle exec teaspoon`, or via a web browser at
 - Don't `describe` symbols (see [Gotchas](gotchas.md#dont-describe-symbols)).
 - 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](https://robots.thoughtbot.com/four-phase-test)
-  pattern, using newlines to separate phases.
+- Try to follow the [Four-Phase Test][four-phase-test] pattern, using newlines
+  to separate phases.
+
+[four-phase-test]: https://robots.thoughtbot.com/four-phase-test
+
+### `let` variables
+
+GitLab's RSpec suite has made extensive use of `let` variables to reduce
+duplication. However, this sometimes [comes at the cost of clarity][lets-not],
+so we need to set some guidelines for their use going forward:
+
+- `let` variables are preferable to instance variables. Local variables are
+  preferable to `let` variables.
+- Use `let` to reduce duplication throughout an entire spec file.
+- Don't use `let` to define variables used by a single test; define them as
+  local variables inside the test's `it` block.
+- Don't define a `let` variable inside the top-level `describe` block that's
+  only used in a more deeply-nested `context` or `describe` block. Keep the
+  definition as close as possible to where it's used.
+- Try to avoid overriding the definition of one `let` variable with another.
+- Don't define a `let` variable that's only used by the definition of another.
+  Use a helper method instead.
+
+[lets-not]: https://robots.thoughtbot.com/lets-not
 
 ### Test speed
 

From 6ffda88c973ce9be263d0e9142a3105f2cccf000 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 1 Apr 2016 20:36:44 -0400
Subject: [PATCH 025/283] Add a link back to Development documentation to
 Testing guide

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

diff --git a/doc/development/testing.md b/doc/development/testing.md
index 187d852e53..23417845f1 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -128,3 +128,7 @@ opting for [RSpec feature](#features-integration) specs.
 Adding new Spinach scenarios is acceptable _only if_ the new scenario requires
 no more than one new `step` definition. If more than that is required, the
 test should be re-implemented using RSpec instead.
+
+---
+
+[Return to Development documentation](README.md)

From 0163e27631fb993bd3541c09a95f0ef5e2026455 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 16 Mar 2016 18:10:03 +0100
Subject: [PATCH 026/283] Add Gitlab::Redis connection pool

---
 config/application.rb                    |  4 ++--
 config/initializers/session_store.rb     |  2 +-
 config/initializers/sidekiq.rb           |  4 ++--
 config/mail_room.yml                     |  4 ++--
 lib/gitlab/exclusive_lease.rb            |  4 +++-
 lib/gitlab/{redis_config.rb => redis.rb} | 11 ++++++++---
 lib/tasks/cache.rake                     | 25 ++++++++++++------------
 7 files changed, 31 insertions(+), 23 deletions(-)
 rename lib/gitlab/{redis_config.rb => redis.rb} (72%)

diff --git a/config/application.rb b/config/application.rb
index 5a0ac70aa2..9633084d60 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,7 @@ require 'rails/all'
 require 'devise'
 I18n.config.enforce_available_locales = false
 Bundler.require(:default, Rails.env)
-require_relative '../lib/gitlab/redis_config'
+require_relative '../lib/gitlab/redis'
 
 module Gitlab
   REDIS_CACHE_NAMESPACE = 'cache:gitlab'
@@ -69,7 +69,7 @@ module Gitlab
       end
     end
 
-    redis_config_hash = Gitlab::RedisConfig.redis_store_options
+    redis_config_hash = Gitlab::Redis.redis_store_options
     redis_config_hash[:namespace] = REDIS_CACHE_NAMESPACE
     redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
     config.cache_store = :redis_store, redis_config_hash
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 3da5d46be9..7028525587 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -13,7 +13,7 @@ end
 if Rails.env.test?
   Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session"
 else
-  redis_config = Gitlab::RedisConfig.redis_store_options
+  redis_config = Gitlab::Redis.redis_store_options
   redis_config[:namespace] = 'session:gitlab'
   
   Gitlab::Application.config.session_store(
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index cc83137745..9182d92980 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -2,7 +2,7 @@ SIDEKIQ_REDIS_NAMESPACE = 'resque:gitlab'
 
 Sidekiq.configure_server do |config|
   config.redis = {
-    url: Gitlab::RedisConfig.url,
+    url: Gitlab::Redis.url,
     namespace: SIDEKIQ_REDIS_NAMESPACE
   }
 
@@ -29,7 +29,7 @@ end
 
 Sidekiq.configure_client do |config|
   config.redis = {
-    url: Gitlab::RedisConfig.url,
+    url: Gitlab::Redis.url,
     namespace: SIDEKIQ_REDIS_NAMESPACE
   }
 end
diff --git a/config/mail_room.yml b/config/mail_room.yml
index 60257329f3..761a32adb9 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -2,7 +2,7 @@
 <%
 require "yaml"
 require "json"
-require_relative "lib/gitlab/redis_config"
+require_relative "lib/gitlab/redis"
 
 rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
 
@@ -18,7 +18,7 @@ if File.exists?(config_file)
   config['mailbox']    = "inbox"  if config['mailbox'].nil?
 
   if config['enabled'] && config['address']
-    redis_url = Gitlab::RedisConfig.new(rails_env).url
+    redis_url = Gitlab::Redis.new(rails_env).url
     %>
     -
       :host: <%= config['host'].to_json %>
diff --git a/lib/gitlab/exclusive_lease.rb b/lib/gitlab/exclusive_lease.rb
index c73eca832d..c2260a5f7a 100644
--- a/lib/gitlab/exclusive_lease.rb
+++ b/lib/gitlab/exclusive_lease.rb
@@ -43,7 +43,9 @@ module Gitlab
     # false if the lease is already taken.
     def try_obtain
       # Performing a single SET is atomic
-      !!redis.set(redis_key, '1', nx: true, ex: @timeout)
+      Gitlab::Redis.with do |redis|
+        !!redis.set(redis_key, '1', nx: true, ex: @timeout)
+      end
     end
 
     # No #cancel method. See comments above!
diff --git a/lib/gitlab/redis_config.rb b/lib/gitlab/redis.rb
similarity index 72%
rename from lib/gitlab/redis_config.rb
rename to lib/gitlab/redis.rb
index 4949c6db53..d03e6e4cd9 100644
--- a/lib/gitlab/redis_config.rb
+++ b/lib/gitlab/redis.rb
@@ -1,14 +1,19 @@
 module Gitlab
-  class RedisConfig
+  class Redis
     attr_reader :url
 
     def self.url
-      new.url
+      @url ||= new.url
+    end
+
+    def self.with
+      @pool ||= ConnectionPool.new { ::Redis.new(url: url) }
+      @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)
+      redis_config_hash = ::Redis::Store::Factory.extract_host_options_from_uri(url)
       # Redis::Store does not handle Unix sockets well, so let's do it for them
       redis_uri = URI.parse(url)
       if redis_uri.scheme == 'unix'
diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake
index 51e746ef92..6c2e2e9149 100644
--- a/lib/tasks/cache.rake
+++ b/lib/tasks/cache.rake
@@ -4,18 +4,19 @@ namespace :cache do
 
   desc "GitLab | Clear redis cache"
   task :clear => :environment do
-    redis = Redis.new(url: Gitlab::RedisConfig.url)
-    cursor = REDIS_SCAN_START_STOP
-    loop do
-      cursor, keys = redis.scan(
-        cursor,
-        match: "#{Gitlab::REDIS_CACHE_NAMESPACE}*", 
-        count: CLEAR_BATCH_SIZE
-      )
-
-      redis.del(*keys) if keys.any?
-
-      break if cursor == REDIS_SCAN_START_STOP
+    Gitlab::Redis.with do |redis|
+      cursor = REDIS_SCAN_START_STOP
+      loop do
+        cursor, keys = redis.scan(
+          cursor,
+          match: "#{Gitlab::REDIS_CACHE_NAMESPACE}*", 
+          count: CLEAR_BATCH_SIZE
+        )
+  
+        redis.del(*keys) if keys.any?
+  
+        break if cursor == REDIS_SCAN_START_STOP
+      end
     end
   end
 end

From 213ee62469c6518af8423f00fb902b7665d61204 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 18 Mar 2016 15:31:53 +0100
Subject: [PATCH 027/283] Be careful when setting class instance vars

---
 lib/gitlab/redis.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index d03e6e4cd9..8c3aea2627 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -2,12 +2,23 @@ module Gitlab
   class Redis
     attr_reader :url
 
+    # To be thread-safe we must be careful when writing the class instance
+    # variables @url and @pool. Because @pool depends on @url we need two
+    # mutexes to prevent deadlock.
+    URL_MUTEX = Mutex.new
+    POOL_MUTEX = Mutex.new
+    private_constant :URL_MUTEX, :POOL_MUTEX
+
     def self.url
-      @url ||= new.url
+      @url || URL_MUTEX.synchronize { @url = new.url }
     end
 
     def self.with
-      @pool ||= ConnectionPool.new { ::Redis.new(url: url) }
+      if @pool.nil?
+        POOL_MUTEX.synchronize do
+          @pool = ConnectionPool.new { ::Redis.new(url: url) }
+        end
+      end
       @pool.with { |redis| yield redis }
     end
     

From 7a2370f74060b2f065e3602700fe1b33fda4685c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 4 Apr 2016 21:25:38 -0400
Subject: [PATCH 028/283] Standardize the way we check for and display form
 errors

- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.
---
 app/helpers/form_helper.rb                    | 18 ++++++++
 app/views/abuse_reports/new.html.haml         |  6 +--
 app/views/admin/appearances/_form.html.haml   |  5 +-
 .../application_settings/_form.html.haml      |  6 +--
 app/views/admin/applications/_form.html.haml  |  7 +--
 .../admin/broadcast_messages/_form.html.haml  |  6 +--
 app/views/admin/deploy_keys/new.html.haml     |  6 +--
 app/views/admin/groups/_form.html.haml        |  5 +-
 app/views/admin/hooks/index.html.haml         |  6 +--
 app/views/admin/identities/_form.html.haml    |  6 +--
 app/views/admin/labels/_form.html.haml        |  8 +---
 app/views/admin/users/_form.html.haml         |  6 +--
 .../doorkeeper/applications/_form.html.haml   |  6 +--
 app/views/groups/edit.html.haml               |  4 +-
 app/views/groups/new.html.haml                |  5 +-
 app/views/profiles/keys/_form.html.haml       |  6 +--
 .../profiles/notifications/show.html.haml     |  6 +--
 app/views/profiles/passwords/edit.html.haml   |  7 +--
 app/views/profiles/passwords/new.html.haml    |  7 +--
 app/views/profiles/show.html.haml             |  7 +--
 app/views/projects/_errors.html.haml          |  5 +-
 .../projects/deploy_keys/_form.html.haml      |  6 +--
 app/views/projects/hooks/index.html.haml      |  6 +--
 app/views/projects/labels/_form.html.haml     |  8 +---
 .../merge_requests/_new_compare.html.haml     |  5 +-
 app/views/projects/milestones/_form.html.haml |  7 +--
 .../protected_branches/index.html.haml        |  6 +--
 app/views/projects/variables/show.html.haml   |  8 +---
 app/views/projects/wikis/_form.html.haml      |  6 +--
 app/views/shared/_service_settings.html.haml  |  7 +--
 app/views/shared/issuable/_form.html.haml     |  9 +---
 app/views/shared/snippets/_form.html.haml     |  6 +--
 spec/helpers/form_helper_spec.rb              | 46 +++++++++++++++++++
 33 files changed, 105 insertions(+), 153 deletions(-)
 create mode 100644 app/helpers/form_helper.rb
 create mode 100644 spec/helpers/form_helper_spec.rb

diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
new file mode 100644
index 0000000000..6a43be2cf3
--- /dev/null
+++ b/app/helpers/form_helper.rb
@@ -0,0 +1,18 @@
+module FormHelper
+  def form_errors(model)
+    return unless model.errors.any?
+
+    pluralized = 'error'.pluralize(model.errors.count)
+    headline   = "The form contains the following #{pluralized}:"
+
+    content_tag(:div, class: 'alert alert-danger', id: 'error_explanation') do
+      content_tag(:h4, headline) <<
+      content_tag(:ul) do
+        model.errors.full_messages.
+          map { |msg| content_tag(:li, msg) }.
+          join.
+          html_safe
+      end
+    end
+  end
+end
diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml
index 3bc1b24b5e..06be1a5331 100644
--- a/app/views/abuse_reports/new.html.haml
+++ b/app/views/abuse_reports/new.html.haml
@@ -3,11 +3,9 @@
 %p Please use this form to report users who create spam issues, comments or behave inappropriately.
 %hr
 = form_for @abuse_report, html: { class: 'form-horizontal js-quick-submit js-requires-input'} do |f|
+  = form_errors(@abuse_report)
+
   = f.hidden_field :user_id
-  - if @abuse_report.errors.any?
-    .alert.alert-danger
-      - @abuse_report.errors.full_messages.each do |msg|
-        %p= msg
   .form-group
     = f.label :user_id, class: 'control-label'
     .col-sm-10
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index 6f325914d1..d88f3ad314 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -1,8 +1,5 @@
 = form_for @appearance, url: admin_appearances_path, html: { class: 'form-horizontal'} do |f|
-  - if @appearance.errors.any?
-    .alert.alert-danger
-      - @appearance.errors.full_messages.each do |msg|
-        %p= msg
+  = form_errors(@appearance)
 
   %fieldset.sign-in
     %legend
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index de86dacbb1..a8cca1a81c 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -1,9 +1,5 @@
 = form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
-  - if @application_setting.errors.any?
-    #error_explanation
-      .alert.alert-danger
-        - @application_setting.errors.full_messages.each do |msg|
-          %p= msg
+  = form_errors(@application_setting)
 
   %fieldset
     %legend Visibility and Access Controls
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index e18f7b499d..4aacbb8cd7 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -1,9 +1,6 @@
 = form_for [:admin, @application], url: @url, html: {class: 'form-horizontal', role: 'form'} do |f|
-  - if application.errors.any?
-    .alert.alert-danger
-      %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
-      - application.errors.full_messages.each do |msg|
-        %p= msg
+  = form_errors(application)
+
   = content_tag :div, class: 'form-group' do
     = f.label :name, class: 'col-sm-2 control-label'
     .col-sm-10
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index b748460a9f..6b157abf84 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -4,10 +4,8 @@
     = render_broadcast_message(@broadcast_message.message.presence || "Your message here")
 
 = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-quick-submit js-requires-input'} do |f|
-  -if @broadcast_message.errors.any?
-    .alert.alert-danger
-      - @broadcast_message.errors.full_messages.each do |msg|
-        %p= msg
+  = form_errors(@broadcast_message)
+
   .form-group
     = f.label :message, class: 'control-label'
     .col-sm-10
diff --git a/app/views/admin/deploy_keys/new.html.haml b/app/views/admin/deploy_keys/new.html.haml
index 5b46b3222a..15aa059c93 100644
--- a/app/views/admin/deploy_keys/new.html.haml
+++ b/app/views/admin/deploy_keys/new.html.haml
@@ -4,11 +4,7 @@
 
 %div
   = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form form-horizontal' } do |f|
-    -if @deploy_key.errors.any?
-      .alert.alert-danger
-        %ul
-          - @deploy_key.errors.full_messages.each do |msg|
-            %li= msg
+    = form_errors(@deploy_key)
 
     .form-group
       = f.label :title, class: "control-label"
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 7f2b1cd235..0cc405401c 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -1,8 +1,5 @@
 = form_for [:admin, @group], html: { class: "form-horizontal" } do |f|
-  - if @group.errors.any?
-    .alert.alert-danger
-      %span= @group.errors.full_messages.first
-
+  = form_errors(@group)
   = render 'shared/group_form', f: f
 
   .form-group.group-description-holder
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 53b3cd04c6..ad952052f2 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -10,10 +10,8 @@
 
 
 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-horizontal' } do |f|
-  -if @hook.errors.any?
-    .alert.alert-danger
-      - @hook.errors.full_messages.each do |msg|
-        %p= msg
+  = form_errors(@hook)
+
   .form-group
     = f.label :url, "URL:", class: 'control-label'
     .col-sm-10
diff --git a/app/views/admin/identities/_form.html.haml b/app/views/admin/identities/_form.html.haml
index 3a78855822..112a201faf 100644
--- a/app/views/admin/identities/_form.html.haml
+++ b/app/views/admin/identities/_form.html.haml
@@ -1,9 +1,5 @@
 = form_for [:admin, @user, @identity], html: { class: 'form-horizontal fieldset-form' } do |f|
-  - if @identity.errors.any?
-    #error_explanation
-      .alert.alert-danger
-        - @identity.errors.full_messages.each do |msg|
-          %p= msg
+  = form_errors(@identity)
 
   .form-group
     = f.label :provider, class: 'control-label'
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml
index 8c6b389bf1..448aa95354 100644
--- a/app/views/admin/labels/_form.html.haml
+++ b/app/views/admin/labels/_form.html.haml
@@ -1,11 +1,5 @@
 = form_for [:admin, @label], html: { class: 'form-horizontal label-form js-requires-input' } do |f|
-  -if @label.errors.any?
-    .row
-      .col-sm-offset-2.col-sm-10
-        .alert.alert-danger
-          - @label.errors.full_messages.each do |msg|
-            %span= msg
-            %br
+  = form_errors(@label)
 
   .form-group
     = f.label :title, class: 'control-label'
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index d2527ede99..b05fdbd555 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -1,10 +1,6 @@
 .user_new
   = form_for [:admin, @user], html: { class: 'form-horizontal fieldset-form' } do |f|
-    -if @user.errors.any?
-      #error_explanation
-        .alert.alert-danger
-          - @user.errors.full_messages.each do |msg|
-            %p= msg
+    = form_errors(@user)
 
     %fieldset
       %legend Account
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml
index 906b067615..5c98265727 100644
--- a/app/views/doorkeeper/applications/_form.html.haml
+++ b/app/views/doorkeeper/applications/_form.html.haml
@@ -1,9 +1,5 @@
 = form_for application, url: doorkeeper_submit_path(application), html: {role: 'form'} do |f|
-  - if application.errors.any?
-    .alert.alert-danger
-      %ul
-        - application.errors.full_messages.each do |msg|
-          %li= msg
+  = form_errors(application)
 
   .form-group
     = f.label :name, class: 'label-light'
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index ea5a035839..a698cbbe9d 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -5,9 +5,7 @@
     Group settings
   .panel-body
     = form_for @group, html: { multipart: true, class: "form-horizontal" }, authenticity_token: true do |f|
-      - if @group.errors.any?
-        .alert.alert-danger
-          %span= @group.errors.full_messages.first
+      = form_errors(@group)
       = render 'shared/group_form', f: f
 
       .form-group
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 30ab8aeba1..2b8bc269e6 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -6,10 +6,7 @@
 %hr
 
 = form_for @group, html: { class: 'group-form form-horizontal' } do |f|
-  - if @group.errors.any?
-    .alert.alert-danger
-      %span= @group.errors.full_messages.first
-
+  = form_errors(@group)
   = render 'shared/group_form', f: f, autofocus: true
 
   .form-group.group-description-holder
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index 4d78215ed3..b3ed59a1a4 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -1,10 +1,6 @@
 %div
   = form_for [:profile, @key], html: { class: 'js-requires-input' } do |f|
-    - if @key.errors.any?
-      .alert.alert-danger
-        %ul
-          - @key.errors.full_messages.each do |msg|
-            %li= msg
+    = form_errors(@key)
 
     .form-group
       = f.label :key, class: 'label-light'
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 3d15c0d932..6609295a2a 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -2,11 +2,7 @@
 - header_title page_title, profile_notifications_path
 
 = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f|
-  -if @user.errors.any?
-    %div.alert.alert-danger
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
+  = form_errors(@user)
 
   = hidden_field_tag :notification_type, 'global'
   .row
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 44d758dceb..5ac8a8b9d0 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -13,11 +13,8 @@
       - unless @user.password_automatically_set?
         or recover your current one
     = form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f|
-      -if @user.errors.any?
-        .alert.alert-danger
-          %ul
-            - @user.errors.full_messages.each do |msg|
-              %li= msg
+      = form_errors(@user)
+
       - unless @user.password_automatically_set?
         .form-group
           = f.label :current_password, class: 'label-light'
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index d165f758c8..2eb9fac57c 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -7,11 +7,8 @@
     Please set a new password before proceeding.
     %br
     After a successful password update you will be redirected to login screen.
-  -if @user.errors.any?
-    .alert.alert-danger
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
+
+  = form_errors(@user)
 
   - unless @user.password_automatically_set?
     .form-group
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index dcb3be9585..f59d27f7ed 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,9 +1,6 @@
 = form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit-user prepend-top-default" }, authenticity_token: true do |f|
-  -if @user.errors.any?
-    %div.alert.alert-danger
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
+  = form_errors(@user)
+
   .row
     .col-lg-3.profile-settings-sidebar
       %h4.prepend-top-0
diff --git a/app/views/projects/_errors.html.haml b/app/views/projects/_errors.html.haml
index 7c8bb33ed7..2dba22d3be 100644
--- a/app/views/projects/_errors.html.haml
+++ b/app/views/projects/_errors.html.haml
@@ -1,4 +1 @@
-- if @project.errors.any?
-  .alert.alert-danger
-    %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
-    = @project.errors.full_messages.first
+= form_errors(@project)
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 5e182af266..f6565f8583 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -1,10 +1,6 @@
 %div
   = form_for [@project.namespace.becomes(Namespace), @project, @key], url: namespace_project_deploy_keys_path, html: { class: 'deploy-key-form form-horizontal js-requires-input' } do |f|
-    -if @key.errors.any?
-      .alert.alert-danger
-        %ul
-          - @key.errors.full_messages.each do |msg|
-            %li= msg
+    = form_errors(@key)
 
     .form-group
       = f.label :title, class: "control-label"
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 67d016bd87..e39224d86c 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -9,10 +9,8 @@
 %hr.clearfix
 
 = form_for [@project.namespace.becomes(Namespace), @project, @hook], as: :hook, url: namespace_project_hooks_path(@project.namespace, @project), html: { class: 'form-horizontal' } do |f|
-  -if @hook.errors.any?
-    .alert.alert-danger
-      - @hook.errors.full_messages.each do |msg|
-        %p= msg
+  = form_errors(@hook)
+
   .form-group
     = f.label :url, "URL", class: 'control-label'
     .col-sm-10
diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index be7a0bb562..aa143e54ff 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -1,11 +1,5 @@
 = form_for [@project.namespace.becomes(Namespace), @project, @label], html: { class: 'form-horizontal label-form js-quick-submit js-requires-input' } do |f|
-  -if @label.errors.any?
-    .row
-      .col-sm-offset-2.col-sm-10
-        .alert.alert-danger
-          - @label.errors.full_messages.each do |msg|
-            %span= msg
-            %br
+  = form_errors(@label)
 
   .form-group
     = f.label :title, class: 'control-label'
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 01dc7519be..0931f743a3 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -28,10 +28,7 @@
           .mr_target_commit
 
   - if @merge_request.errors.any?
-    .alert.alert-danger
-      - @merge_request.errors.full_messages.each do |msg|
-        %div= msg
-
+    = form_errors(@merge_request)
   - elsif @merge_request.source_branch.present? && @merge_request.target_branch.present?
     .light-well.append-bottom-default
       .center
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 23f2bca7ba..b2dae1c70e 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,9 +1,6 @@
 = form_for [@project.namespace.becomes(Namespace), @project, @milestone], html: {class: 'form-horizontal milestone-form gfm-form js-quick-submit js-requires-input'}  do |f|
-  -if @milestone.errors.any?
-    .alert.alert-danger
-      %ul
-        - @milestone.errors.full_messages.each do |msg|
-          %li= msg
+  = form_errors(@milestone)
+
   .row
     .col-md-6
       .form-group
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index cfd7e1534c..653b02da4d 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -13,11 +13,7 @@
 
 - if can? current_user, :admin_project, @project
   = form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'form-horizontal' } do |f|
-    -if @protected_branch.errors.any?
-      .alert.alert-danger
-        %ul
-          - @protected_branch.errors.full_messages.each do |msg|
-            %li= msg
+    = form_errors(@protected_branch)
 
     .form-group
       = f.label :name, "Branch", class: 'control-label'
diff --git a/app/views/projects/variables/show.html.haml b/app/views/projects/variables/show.html.haml
index efe1e6f24c..ca284b84d3 100644
--- a/app/views/projects/variables/show.html.haml
+++ b/app/views/projects/variables/show.html.haml
@@ -13,13 +13,7 @@
 
 
 = nested_form_for @project, url: url_for(controller: 'projects/variables', action: 'update'), html: { class: 'form-horizontal' }  do |f|
-  - if @project.errors.any?
-    #error_explanation
-      %p.lead= "#{pluralize(@project.errors.count, "error")} prohibited this project from being saved:"
-      .alert.alert-error
-        %ul
-          - @project.errors.full_messages.each do |msg|
-            %li= msg
+  = form_errors(@project)
 
   = f.fields_for :variables do |variable_form|
     .form-group
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index f0d1932e23..812876e283 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,9 +1,5 @@
 = form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form gfm-form prepend-top-default js-quick-submit' } do |f|
-  -if @page.errors.any?
-    #error_explanation
-      .alert.alert-danger
-        - @page.errors.full_messages.each do |msg|
-          %p= msg
+  = form_errors(@page)
 
   = f.hidden_field :title, value: @page.title
   .form-group
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
index 5a60ff5a5d..fc935166bf 100644
--- a/app/views/shared/_service_settings.html.haml
+++ b/app/views/shared/_service_settings.html.haml
@@ -1,9 +1,4 @@
-- if @service.errors.any?
-  #error_explanation
-    .alert.alert-danger
-      %ul
-        - @service.errors.full_messages.each do |msg|
-          %li= msg
+= form_errors(@service)
 
 - if @service.help.present?
   .well
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index e2a9e5bfb9..0cda785f91 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -1,10 +1,5 @@
-- if issuable.errors.any?
-  .row
-    .col-sm-offset-2.col-sm-10
-      .alert.alert-danger
-        - issuable.errors.full_messages.each do |msg|
-          %span= msg
-          %br
+= form_errors(issuable)
+
 .form-group
   = f.label :title, class: 'control-label'
   .col-sm-10
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
index 1041eccd1d..47ec09f62c 100644
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -1,10 +1,6 @@
 .snippet-form-holder
   = form_for @snippet, url: url, html: { class: "form-horizontal snippet-form js-requires-input" } do |f|
-    - if @snippet.errors.any?
-      .alert.alert-danger
-        %ul
-          - @snippet.errors.full_messages.each do |msg|
-            %li= msg
+    = form_errors(@snippet)
 
     .form-group
       = f.label :title, class: 'control-label'
diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
new file mode 100644
index 0000000000..b20373a96f
--- /dev/null
+++ b/spec/helpers/form_helper_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+describe FormHelper do
+  describe 'form_errors' do
+    it 'returns nil when model has no errors' do
+      model = double(errors: [])
+
+      expect(helper.form_errors(model)).to be_nil
+    end
+
+    it 'renders an alert div' do
+      model = double(errors: errors_stub('Error 1'))
+
+      expect(helper.form_errors(model)).
+        to include('<div class="alert alert-danger" id="error_explanation">')
+    end
+
+    it 'contains a summary message' do
+      single_error = double(errors: errors_stub('A'))
+      multi_errors = double(errors: errors_stub('A', 'B', 'C'))
+
+      expect(helper.form_errors(single_error)).
+        to include('<h4>The form contains the following error:')
+      expect(helper.form_errors(multi_errors)).
+        to include('<h4>The form contains the following errors:')
+    end
+
+    it 'renders each message' do
+      model = double(errors: errors_stub('Error 1', 'Error 2', 'Error 3'))
+
+      errors = helper.form_errors(model)
+
+      aggregate_failures do
+        expect(errors).to include('<li>Error 1</li>')
+        expect(errors).to include('<li>Error 2</li>')
+        expect(errors).to include('<li>Error 3</li>')
+      end
+    end
+
+    def errors_stub(*messages)
+      ActiveModel::Errors.new(double).tap do |errors|
+        messages.each { |msg| errors.add(:base, msg) }
+      end
+    end
+  end
+end

From 831d1807df6d1d9f8213898614a24bea78208114 Mon Sep 17 00:00:00 2001
From: "P.S.V.R" <pmq2001@gmail.com>
Date: Tue, 5 Apr 2016 16:20:08 +0800
Subject: [PATCH 029/283] Eliminate ugly scroll bars shown in modal boxes

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

diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index bd224705f0..604f1700cf 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -59,6 +59,9 @@
   position: relative;
   overflow-y: auto;
   padding: 15px;
+  .form-actions {
+    margin: -$gl-padding+1;
+  }
 }
 
 body.modal-open {

From 1ba9a91c6d3b98e1825e173fe281ba065d35890c Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 31 Mar 2016 16:11:49 -0300
Subject: [PATCH 030/283] Fix problem when creating milestones in groups
 without projects

---
 .../groups/milestones_controller.rb           | 28 +++++++++++++++----
 .../groups/milestones_controller_spec.rb      |  6 ++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index b23c3022fb..2c05d9e0fe 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -18,14 +18,14 @@ class Groups::MilestonesController < Groups::ApplicationController
   end
 
   def create
-    project_ids = params[:milestone][:project_ids]
+    project_ids = params[:milestone][:project_ids].reject(&:blank?)
     title = milestone_params[:title]
 
-    @projects.where(id: project_ids).each do |project|
-      Milestones::CreateService.new(project, current_user, milestone_params).execute
+    if project_ids.present?
+      create_milestones(project_ids, title)
+    else
+      render_new_with_error("Select a project(s).")
     end
-
-    redirect_to milestone_path(title)
   end
 
   def show
@@ -41,6 +41,24 @@ class Groups::MilestonesController < Groups::ApplicationController
 
   private
 
+  def create_milestones(project_ids, title)
+    begin
+      @projects.where(id: project_ids).each do |project|
+        ActiveRecord::Base.transaction { Milestones::CreateService.new(project, current_user, milestone_params).execute }
+      end
+
+      redirect_to milestone_path(title)
+    rescue => e
+      render_new_with_error("Error creating milestones: #{e.message}")
+    end
+  end
+
+  def render_new_with_error(error)
+    @milestone = Milestone.new(milestone_params)
+    flash[:alert] = error
+    render :new
+  end
+
   def authorize_admin_milestones!
     return render_404 unless can?(current_user, :admin_milestones, group)
   end
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index eb0c6ac6d8..f258d6fa0c 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -23,5 +23,11 @@ describe Groups::MilestonesController do
       expect(response).to redirect_to(group_milestone_path(group, title.to_slug.to_s, title: title))
       expect(Milestone.where(title: title).count).to eq(2)
     end
+
+    it "redirects to new when there are no project ids" do
+      post :create, group_id: group.id, milestone: { title: title, project_ids: [""] }
+      expect(response).to render_template :new
+      expect(flash[:alert]).to_not be_nil
+    end
   end
 end

From 5d428030451b1fa2bac89f798c40d2f91ac65bac Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Fri, 1 Apr 2016 15:50:17 -0300
Subject: [PATCH 031/283] Improve code

---
 .../groups/milestones_controller.rb           | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 2c05d9e0fe..21fc329f23 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -21,10 +21,10 @@ class Groups::MilestonesController < Groups::ApplicationController
     project_ids = params[:milestone][:project_ids].reject(&:blank?)
     title = milestone_params[:title]
 
-    if project_ids.present?
-      create_milestones(project_ids, title)
+    if create_milestones(project_ids, title)
+      redirect_to milestone_path(title)
     else
-      render_new_with_error("Select a project(s).")
+      render_new_with_error(@error)
     end
   end
 
@@ -42,14 +42,22 @@ class Groups::MilestonesController < Groups::ApplicationController
   private
 
   def create_milestones(project_ids, title)
+    unless project_ids.present?
+      @error = "Please select at least one project."
+      return false
+    end
+
     begin
-      @projects.where(id: project_ids).each do |project|
-        ActiveRecord::Base.transaction { Milestones::CreateService.new(project, current_user, milestone_params).execute }
+      ActiveRecord::Base.transaction do
+        @projects.where(id: project_ids).each do |project|
+          Milestones::CreateService.new(project, current_user, milestone_params).execute
+        end
       end
 
-      redirect_to milestone_path(title)
+      true
     rescue => e
-      render_new_with_error("Error creating milestones: #{e.message}")
+      @error = "Error creating milestone: #{e.message}."
+      false
     end
   end
 

From 32c7e42b612bdda43eeef55d8c8afdc9eeb33785 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 4 Apr 2016 17:04:35 -0300
Subject: [PATCH 032/283] Improve code

---
 .../groups/milestones_controller.rb           | 31 +++++++++----------
 app/views/groups/milestones/new.html.haml     |  8 +++++
 .../groups/milestones_controller_spec.rb      |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 21fc329f23..fcf19e8066 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -24,7 +24,7 @@ class Groups::MilestonesController < Groups::ApplicationController
     if create_milestones(project_ids, title)
       redirect_to milestone_path(title)
     else
-      render_new_with_error(@error)
+      render_new_with_error(project_ids.empty?)
     end
   end
 
@@ -42,28 +42,25 @@ class Groups::MilestonesController < Groups::ApplicationController
   private
 
   def create_milestones(project_ids, title)
-    unless project_ids.present?
-      @error = "Please select at least one project."
-      return false
-    end
+    return false unless project_ids.present?
 
-    begin
-      ActiveRecord::Base.transaction do
-        @projects.where(id: project_ids).each do |project|
-          Milestones::CreateService.new(project, current_user, milestone_params).execute
-        end
+    ActiveRecord::Base.transaction do
+      @projects.where(id: project_ids).each do |project|
+        Milestones::CreateService.new(project, current_user, milestone_params).execute
       end
-
-      true
-    rescue => e
-      @error = "Error creating milestone: #{e.message}."
-      false
     end
+
+    true
+
+    rescue => e
+
+    flash.now[:alert] = "An error occurred while creating the milestone: #{e.message}"
+    false
   end
 
-  def render_new_with_error(error)
+  def render_new_with_error(empty_project_ids)
     @milestone = Milestone.new(milestone_params)
-    flash[:alert] = error
+    @milestone.errors.add(:project_id, "Please select at least one project.") if empty_project_ids
     render :new
   end
 
diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml
index a8e1ed77da..4290e0bf72 100644
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
@@ -10,6 +10,14 @@
 
 = form_for @milestone, url: group_milestones_path(@group), html: { class: 'form-horizontal milestone-form gfm-form js-quick-submit js-requires-input' }  do |f|
   .row
+    - if @milestone.errors.any?
+      #error_explanation
+        .alert.alert-danger
+          %ul
+            - @milestone.errors.full_messages.each do |msg|
+              %li
+                = msg
+
     .col-md-6
       .form-group
         = f.label :title, "Title", class: "control-label"
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index f258d6fa0c..9c7b5c74b8 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -27,7 +27,7 @@ describe Groups::MilestonesController do
     it "redirects to new when there are no project ids" do
       post :create, group_id: group.id, milestone: { title: title, project_ids: [""] }
       expect(response).to render_template :new
-      expect(flash[:alert]).to_not be_nil
+      expect(assigns(:milestone).errors).to_not be_nil
     end
   end
 end

From 5ff9d2a1821ef0413a349388bcdc0fab84a17086 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 28 Mar 2016 15:37:53 -0400
Subject: [PATCH 033/283] Bump rails to 4.2.6

---
 Gemfile                     |  2 +-
 Gemfile.lock                | 72 ++++++++++++++++++-------------------
 config/environments/test.rb |  1 +
 3 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6327227282..5eaaf0cfb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rails', '4.2.5.2'
+gem 'rails', '4.2.6'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 
 # Responders respond_to and respond_with
diff --git a/Gemfile.lock b/Gemfile.lock
index 229089f431..df18410ece 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,41 +4,41 @@ GEM
     CFPropertyList (2.3.2)
     RedCloth (4.2.9)
     ace-rails-ap (2.0.1)
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.6)
+      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)
       railties (>= 4.0.0, < 5)
-    activesupport (4.2.5.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -464,8 +464,8 @@ GEM
       nokogiri (>= 1.5.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     mail_room (0.6.1)
     method_source (0.8.2)
     mime-types (1.25.1)
@@ -595,16 +595,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -614,9 +614,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
@@ -788,10 +788,10 @@ GEM
       spring (>= 0.9.1)
     sprockets (3.3.5)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     state_machines (0.4.0)
     state_machines-activemodel (0.3.0)
       activemodel (~> 4.1)
@@ -1002,7 +1002,7 @@ DEPENDENCIES
   rack-attack (~> 4.3.1)
   rack-cors (~> 0.4.0)
   rack-oauth2 (~> 1.2.1)
-  rails (= 4.2.5.2)
+  rails (= 4.2.6)
   rails-deprecated_sanitizer (~> 1.0.3)
   raphael-rails (~> 2.1.2)
   rblineprof
diff --git a/config/environments/test.rb b/config/environments/test.rb
index f96ac6f975..a703c0934f 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,6 +8,7 @@ Rails.application.configure do
   config.cache_classes = false
 
   # Configure static asset server for tests with Cache-Control for performance
+  config.assets.digest = false
   config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 

From 3911e77eb4244f010af4050c140bc2d08e3c34df Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 5 Apr 2016 23:08:22 +0200
Subject: [PATCH 034/283] Remove TODO for not documented stuff

---
 doc/development/ui_guide.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/development/ui_guide.md b/doc/development/ui_guide.md
index 2f01defc11..a3e260a5f8 100644
--- a/doc/development/ui_guide.md
+++ b/doc/development/ui_guide.md
@@ -1,9 +1,5 @@
 # UI Guide for building GitLab 
 
-## Best practices for creating new pages in GitLab
-
-TODO: write some best practices when develop GitLab features.
-
 ## GitLab UI development kit
 
 We created a page inside GitLab where you can check commonly used html and css elements.

From 3137f61a5558d1b38dd9f607263d5a21b61deb2d Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 10:49:57 +0200
Subject: [PATCH 035/283] Make redis an explicit Gemfile dependency

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

diff --git a/Gemfile b/Gemfile
index 6327227282..eebaae320e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,6 +149,10 @@ gem 'version_sorter', '~> 2.0.0'
 # Cache
 gem "redis-rails", '~> 4.0.0'
 
+# Redis
+gem 'redis', '~> 3.2'
+gem 'connection_pool', '~> 2.0'
+
 # Campfire integration
 gem 'tinder', '~> 1.10.0'
 
@@ -229,7 +233,6 @@ group :metrics do
   gem 'allocations', '~> 1.0', require: false, platform: :mri
   gem 'method_source', '~> 0.8', require: false
   gem 'influxdb', '~> 0.2', require: false
-  gem 'connection_pool', '~> 2.0', require: false
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 229089f431..3be9ed0afc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1009,6 +1009,7 @@ DEPENDENCIES
   rdoc (~> 3.6)
   recaptcha
   redcarpet (~> 3.3.3)
+  redis (~> 3.2)
   redis-namespace
   redis-rails (~> 4.0.0)
   request_store (~> 1.3.0)

From c5c05f6a04ab3c791bc7c34dc74925731cf2ff94 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 15 Mar 2016 14:43:40 +0000
Subject: [PATCH 036/283] Updated UI for new merge request

Closes #2540
---
 app/assets/javascripts/compare.js.coffee      | 61 ++++++++++++++++
 .../stylesheets/pages/merge_requests.scss     | 51 +++++++++++--
 .../projects/merge_requests_controller.rb     |  2 +
 app/helpers/commits_helper.rb                 |  4 +-
 app/views/projects/commits/_commit.html.haml  |  2 +-
 .../merge_requests/_new_compare.html.haml     | 71 ++++++-------------
 .../merge_requests/branch_from.html.haml      |  1 +
 .../merge_requests/branch_from.js.haml        |  3 -
 .../merge_requests/branch_to.html.haml        |  1 +
 .../projects/merge_requests/branch_to.js.haml |  3 -
 10 files changed, 138 insertions(+), 61 deletions(-)
 create mode 100644 app/assets/javascripts/compare.js.coffee
 create mode 100644 app/views/projects/merge_requests/branch_from.html.haml
 delete mode 100644 app/views/projects/merge_requests/branch_from.js.haml
 create mode 100644 app/views/projects/merge_requests/branch_to.html.haml
 delete mode 100644 app/views/projects/merge_requests/branch_to.js.haml

diff --git a/app/assets/javascripts/compare.js.coffee b/app/assets/javascripts/compare.js.coffee
new file mode 100644
index 0000000000..c13744ebc6
--- /dev/null
+++ b/app/assets/javascripts/compare.js.coffee
@@ -0,0 +1,61 @@
+class @Compare
+  constructor: (@opts) ->
+    @source_loading = $ ".js-source-loading"
+    @target_loading = $ ".js-target-loading"
+    @source_branch = $ "#merge_request_source_branch"
+    @target_branch = $ "#merge_request_target_branch"
+    @target_project = $ "#merge_request_target_project_id"
+
+    @initialState()
+    @cleanBinding()
+    @addBinding()
+
+  cleanBinding: ->
+    @source_branch.off "change"
+    @target_branch.off "change"
+    @target_project.off "change"
+
+  addBinding: ->
+    @source_branch.on "change", =>
+      @getSourceHtml()
+    @target_branch.on "change", =>
+      @getTargetHtml()
+    @target_project.on "change", =>
+      @getTargetProject()
+
+  initialState: ->
+    @getSourceHtml()
+    @getTargetHtml()
+
+  getTargetProject: ->
+    $.get @opts.targetProjectUrl,
+      target_project_id:  @target_project.val()
+
+  getSourceHtml: ->
+    $.ajax(
+      url: @opts.sourceBranchUrl
+      data:
+        ref: @source_branch.val()
+      beforeSend: =>
+        @source_loading.show()
+        $(".mr_source_commit").html ""
+      success: (html) =>
+        @source_loading.hide()
+        $(".mr_source_commit").html html
+        $(".mr_source_commit .js-timeago").timeago()
+    )
+
+  getTargetHtml: ->
+    $.ajax(
+      url: @opts.targetBranchUrl
+      data:
+        target_project_id: @target_project.val()
+        ref: @target_branch.val()
+      beforeSend: =>
+        @target_loading.show()
+        $(".mr_target_commit").html ""
+      success: (html) =>
+        @target_loading.hide()
+        $(".mr_target_commit").html html
+        $(".mr_target_commit .js-timeago").timeago()
+    )
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 1c6a420897..7bc1f58471 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -123,6 +123,8 @@
 
 .mr_source_commit,
 .mr_target_commit {
+  margin-bottom: 0;
+
   .commit {
     margin: 0;
     padding: 2px 0;
@@ -174,10 +176,6 @@
   display: none;
 }
 
-.merge-request-form .select2-container {
-  width: 250px !important;
-}
-
 #modal_merge_info .modal-dialog {
   width: 600px;
 
@@ -200,3 +198,48 @@
     overflow-x: scroll;
   }
 }
+
+.panel-new-merge-request {
+  .panel-heading {
+    padding: 5px 10px;
+    font-weight: 600;
+    line-height: 25px;
+  }
+
+  .panel-body {
+    padding: 10px 5px;
+  }
+
+  .panel-footer {
+    padding: 10px 10px;
+  }
+
+  .commit {
+    .commit-row-title {
+      margin-bottom: 4px;
+    }
+
+    .avatar {
+      width: 20px;
+      height: 20px;
+      margin-right: 5px;
+    }
+
+    .commit-row-info {
+      line-height: 20px;
+    }
+  }
+
+  .btn-clipboard {
+    margin-right: 5px;
+    padding: 0;
+    background: transparent;
+  }
+}
+
+.merge-request-select {
+  float: left;
+  width: 50%;
+  padding-left: 5px;
+  padding-right: 5px;
+}
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 49064f5d50..ca6cfc9914 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -207,11 +207,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     #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
   end
 
   def branch_to
     @target_project = selected_target_project
     @commit = @target_project.commit(params[:ref]) if params[:ref].present?
+    render layout: false
   end
 
   def update_branches
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index bde0799f3d..a65e2e5cb8 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -28,7 +28,7 @@ module CommitsHelper
 
   def commit_to_html(commit, project, inline = true)
     template = inline ? "inline_commit" : "commit"
-    escape_javascript(render "projects/commits/#{template}", commit: commit, project: project) unless commit.nil?
+    render "projects/commits/#{template}", commit: commit, project: project unless commit.nil?
   end
 
   # Breadcrumb links for a Project and, if applicable, a tree path
@@ -117,7 +117,7 @@ module CommitsHelper
       end
     end
     link_to(
-      "Browse Files »",
+      "Browse Files",
       namespace_project_tree_path(project.namespace, project, commit),
       class: "pull-right"
     )
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 7f2903589a..b55fe510f7 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -35,8 +35,8 @@
           = preserve(markdown(escape_once(commit.description), pipeline: :single_line))
 
     .commit-row-info
+      by 
       = commit_author_link(commit, avatar: true, size: 24)
-      authored
       .committed_ago
         #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} &nbsp;
       = link_to_browse_code(project, commit)
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 01dc7519be..4fc74dfcf4 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -5,27 +5,31 @@
   .hide.alert.alert-danger.mr-compare-errors
   .merge-request-branches.row
     .col-md-6
-      .panel.panel-default
+      .panel.panel-default.panel-new-merge-request
         .panel-heading
-          %strong Source branch
-        .panel-body
-          = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted?, required: true })
-          &nbsp;
-          = f.select(:source_branch, @merge_request.source_branches, { include_blank: true }, { class: 'source_branch select2 span2', required: true, data: { placeholder: "Select source branch" } })
+          Source branch
+        .panel-body.clearfix
+          .merge-request-select
+            = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2', disabled: @merge_request.persisted?, required: true })
+          .merge-request-select
+            = f.select(:source_branch, @merge_request.source_branches, { include_blank: true }, { class: 'source_branch select2', required: true, data: { placeholder: "Select source branch" } })
         .panel-footer
-          .mr_source_commit
+          = icon('spinner spin', class: "js-source-loading")
+          %ul.list-unstyled.mr_source_commit
 
     .col-md-6
-      .panel.panel-default
+      .panel.panel-default.panel-new-merge-request
         .panel-heading
-          %strong Target branch
-        .panel-body
+          Target branch
+        .panel-body.clearfix
           - projects =  @project.forked_from_project.nil? ? [@project] : [@project, @project.forked_from_project]
-          = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace', f.object.target_project_id), {}, { class: 'target_project select2 span3', disabled: @merge_request.persisted?, required: true })
-          &nbsp;
-          = f.select(:target_branch, @merge_request.target_branches, { include_blank: true }, { class: 'target_branch select2 span2', required: true, data: { placeholder: "Select target branch" } })
+          .merge-request-select
+            = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace', f.object.target_project_id), {}, { class: 'target_project select2', disabled: @merge_request.persisted?, required: true })
+          .merge-request-select
+            = f.select(:target_branch, @merge_request.target_branches, { include_blank: true }, { class: 'target_branch select2', required: true, data: { placeholder: "Select target branch" } })
         .panel-footer
-          .mr_target_commit
+          = icon('spinner spin', class: "js-target-loading")
+          %ul.list-unstyled.mr_target_commit
 
   - if @merge_request.errors.any?
     .alert.alert-danger
@@ -45,40 +49,11 @@
             and
             %span.label-branch #{@merge_request.target_branch}
             are the same.
-
-
-  .form-actions
-    = f.submit 'Compare branches and continue', class: "btn btn-new mr-compare-btn"
+  = f.submit 'Compare branches and continue', class: "btn btn-new mr-compare-btn"
 
 :javascript
-  var source_branch = $("#merge_request_source_branch")
-    , target_branch = $("#merge_request_target_branch")
-    , target_project = $("#merge_request_target_project_id");
-
-  $.get("#{branch_from_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}", {ref: source_branch.val() });
-  $.get("#{branch_to_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}", {target_project_id: target_project.val(),ref: target_branch.val() });
-
-  target_project.on("change", function() {
-    $.get("#{update_branches_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}", {target_project_id:  $(this).val() });
-  });
-  source_branch.on("change", function() {
-    $.get("#{branch_from_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}", {ref: $(this).val() });
-    $(".mr-compare-errors").fadeOut();
-    $(".mr-compare-btn").enable();
-  });
-  target_branch.on("change", function() {
-    $.get("#{branch_to_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}", {target_project_id: target_project.val(),ref: $(this).val() });
-    $(".mr-compare-errors").fadeOut();
-    $(".mr-compare-btn").enable();
-  });
-
-
-:javascript
-  $(".merge-request-form").on('submit', function () {
-    if ($("#merge_request_source_branch").val() === "" || $('#merge_request_target_branch').val() === "") {
-      $(".mr-compare-errors").html("You must select source and target branch to proceed");
-      $(".mr-compare-errors").fadeIn();
-      event.preventDefault();
-      return;
-    }
+  new Compare({
+    targetProjectUrl: "#{update_branches_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}",
+    sourceBranchUrl: "#{branch_from_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}",
+    targetBranchUrl: "#{branch_to_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}"
   });
diff --git a/app/views/projects/merge_requests/branch_from.html.haml b/app/views/projects/merge_requests/branch_from.html.haml
new file mode 100644
index 0000000000..4f90dde6fa
--- /dev/null
+++ b/app/views/projects/merge_requests/branch_from.html.haml
@@ -0,0 +1 @@
+= commit_to_html(@commit, @source_project, false)
diff --git a/app/views/projects/merge_requests/branch_from.js.haml b/app/views/projects/merge_requests/branch_from.js.haml
deleted file mode 100644
index 9210798f39..0000000000
--- a/app/views/projects/merge_requests/branch_from.js.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-:plain
-  $(".mr_source_commit").html("#{commit_to_html(@commit, @source_project, false)}");
-  $('.js-timeago').timeago()
diff --git a/app/views/projects/merge_requests/branch_to.html.haml b/app/views/projects/merge_requests/branch_to.html.haml
new file mode 100644
index 0000000000..67a7a6bcec
--- /dev/null
+++ b/app/views/projects/merge_requests/branch_to.html.haml
@@ -0,0 +1 @@
+= commit_to_html(@commit, @target_project, false)
diff --git a/app/views/projects/merge_requests/branch_to.js.haml b/app/views/projects/merge_requests/branch_to.js.haml
deleted file mode 100644
index 32fe2d535f..0000000000
--- a/app/views/projects/merge_requests/branch_to.js.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-:plain
-  $(".mr_target_commit").html("#{commit_to_html(@commit, @target_project, false)}");
-  $('.js-timeago').timeago()

From 7fe19046d6633d01f1a326a5cc0d80a24879f04d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 09:33:23 +0100
Subject: [PATCH 037/283] Fixed failing tests

---
 features/steps/project/source/browse_files.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 243469b8e7..5beb2cc6d7 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -213,8 +213,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I see Browse file link' do
-    expect(page).to have_link 'Browse File »'
-    expect(page).not_to have_link 'Browse Files »'
+    expect(page).to have_link 'Browse File'
+    expect(page).not_to have_link 'Browse Files'
   end
 
   step 'I see Browse code link' do

From b31005899858bb19f5de06b49621fa1d73dbe037 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 11:11:16 +0100
Subject: [PATCH 038/283] Use new dropdowns for MR compare

---
 app/assets/javascripts/compare.js.coffee      | 45 +++++++--------
 app/assets/javascripts/gl_dropdown.js.coffee  |  2 +-
 .../stylesheets/pages/merge_requests.scss     | 10 ++++
 .../merge_requests/_new_compare.html.haml     | 55 ++++++++++++++++---
 features/steps/project/source/browse_files.rb |  4 +-
 5 files changed, 83 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/compare.js.coffee b/app/assets/javascripts/compare.js.coffee
index c13744ebc6..e5819fa91c 100644
--- a/app/assets/javascripts/compare.js.coffee
+++ b/app/assets/javascripts/compare.js.coffee
@@ -2,26 +2,27 @@ class @Compare
   constructor: (@opts) ->
     @source_loading = $ ".js-source-loading"
     @target_loading = $ ".js-target-loading"
-    @source_branch = $ "#merge_request_source_branch"
-    @target_branch = $ "#merge_request_target_branch"
-    @target_project = $ "#merge_request_target_project_id"
+
+    $('.js-compare-dropdown').each (i, dropdown) =>
+      $dropdown = $(dropdown)
+
+      $dropdown.glDropdown(
+        selectable: true
+        fieldName: $dropdown.data 'field-name'
+        id: (obj, $el) ->
+          $el.data 'id'
+        toggleLabel: (obj, $el) ->
+          $el.text().trim()
+        clicked: (e, el) =>
+          if $dropdown.is '.js-target-branch'
+            @getTargetHtml()
+          else if $dropdown.is '.js-source-branch'
+            @getSourceHtml()
+          else if $dropdown.is '.js-target-project'
+            @getTargetProject()
+      )
 
     @initialState()
-    @cleanBinding()
-    @addBinding()
-
-  cleanBinding: ->
-    @source_branch.off "change"
-    @target_branch.off "change"
-    @target_project.off "change"
-
-  addBinding: ->
-    @source_branch.on "change", =>
-      @getSourceHtml()
-    @target_branch.on "change", =>
-      @getTargetHtml()
-    @target_project.on "change", =>
-      @getTargetProject()
 
   initialState: ->
     @getSourceHtml()
@@ -29,13 +30,13 @@ class @Compare
 
   getTargetProject: ->
     $.get @opts.targetProjectUrl,
-      target_project_id:  @target_project.val()
+      target_project_id:  $("input[name='merge_request[source_project]']").val()
 
   getSourceHtml: ->
     $.ajax(
       url: @opts.sourceBranchUrl
       data:
-        ref: @source_branch.val()
+        ref: $("input[name='merge_request[source_branch]']").val()
       beforeSend: =>
         @source_loading.show()
         $(".mr_source_commit").html ""
@@ -49,8 +50,8 @@ class @Compare
     $.ajax(
       url: @opts.targetBranchUrl
       data:
-        target_project_id: @target_project.val()
-        ref: @target_branch.val()
+        target_project_id: $("input[name='merge_request[target_project_id]']").val()
+        ref: $("input[name='merge_request[target_branch]']").val()
       beforeSend: =>
         @target_loading.show()
         $(".mr_target_commit").html ""
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 2a4811b876..38b38fc842 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -373,7 +373,7 @@ class GitLabDropdown
 
       # Toggle the dropdown label
       if @options.toggleLabel
-        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selectedObject)
+        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selectedObject, el)
       if value?
         if !field.length
           # Create hidden input for form
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 7bc1f58471..5929f607fc 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -242,4 +242,14 @@
   width: 50%;
   padding-left: 5px;
   padding-right: 5px;
+
+  .dropdown-menu-toggle {
+    width: 100%;
+  }
+
+  .dropdown-menu {
+    left: 5px;
+    right: 5px;
+    width: auto;
+  }
 }
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 4fc74dfcf4..f110c5f42c 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -9,10 +9,29 @@
         .panel-heading
           Source branch
         .panel-body.clearfix
-          .merge-request-select
-            = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2', disabled: @merge_request.persisted?, required: true })
-          .merge-request-select
-            = f.select(:source_branch, @merge_request.source_branches, { include_blank: true }, { class: 'source_branch select2', required: true, data: { placeholder: "Select source branch" } })
+          .merge-request-select.dropdown
+            = f.hidden_field :source_project_id
+            = dropdown_toggle @merge_request.source_project_path, { toggle: "dropdown", field_name: "#{f.object_name}[source_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-source-project" }
+            .dropdown-menu
+              = dropdown_title("Select source project")
+              = dropdown_filter("Search projects")
+              = dropdown_content do
+                %ul
+                  %li
+                    %a{ href: "#", data: { id: @merge_request.source_project.id } }
+                      = @merge_request.source_project_path
+          .merge-request-select.dropdown
+            = f.hidden_field :source_branch
+            = dropdown_toggle "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
+            .dropdown-menu
+              = dropdown_title("Select source branch")
+              = dropdown_filter("Search branches")
+              = dropdown_content do
+                %ul
+                  - @merge_request.source_branches.each do |branch|
+                    %li
+                      %a{ href: "#", data: { id: branch } }
+                        = branch
         .panel-footer
           = icon('spinner spin', class: "js-source-loading")
           %ul.list-unstyled.mr_source_commit
@@ -23,10 +42,30 @@
           Target branch
         .panel-body.clearfix
           - projects =  @project.forked_from_project.nil? ? [@project] : [@project, @project.forked_from_project]
-          .merge-request-select
-            = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace', f.object.target_project_id), {}, { class: 'target_project select2', disabled: @merge_request.persisted?, required: true })
-          .merge-request-select
-            = f.select(:target_branch, @merge_request.target_branches, { include_blank: true }, { class: 'target_branch select2', required: true, data: { placeholder: "Select target branch" } })
+          .merge-request-select.dropdown
+            = f.hidden_field :target_project_id
+            = dropdown_toggle projects.first.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
+            .dropdown-menu
+              = dropdown_title("Select target project")
+              = dropdown_filter("Search projects")
+              = dropdown_content do
+                %ul
+                  - projects.each do |project|
+                    %li
+                      %a{ href: "#" }
+                        = project.path_with_namespace
+          .merge-request-select.dropdown
+            = f.hidden_field :target_branch
+            = dropdown_toggle "Select target branch", { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch" }
+            .dropdown-menu.dropdown-menu-selectable
+              = dropdown_title("Select target branch")
+              = dropdown_filter("Search branches")
+              = dropdown_content do
+                %ul
+                  - @merge_request.target_branches.each do |branch|
+                    %li
+                      %a{ href: "#", class: "#{("is-active" if :target_branch == branch)}", data: { id: branch } }
+                        = branch
         .panel-footer
           = icon('spinner spin', class: "js-target-loading")
           %ul.list-unstyled.mr_target_commit
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 5beb2cc6d7..f73bb425e5 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -218,8 +218,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I see Browse code link' do
-    expect(page).to have_link 'Browse Files »'
-    expect(page).not_to have_link 'Browse File »'
+    expect(page).to have_link 'Browse Files'
+    expect(page).not_to have_link 'Browse File'
     expect(page).not_to have_link 'Browse Directory »'
   end
 

From 850fa65ef2ff1fb16623c591a2147d75df333c58 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 11:28:23 +0100
Subject: [PATCH 039/283] Checkmarks in dropdowns for already selected values

---
 app/assets/stylesheets/pages/commits.scss          |  1 +
 .../projects/merge_requests/_new_compare.html.haml | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 8272615768..ad8e97de3b 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -47,6 +47,7 @@ li.commit {
 
     .commit_short_id {
       min-width: 65px;
+      color: $gl-dark-link-color;
       font-family: $monospace_font;
     }
 
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index f110c5f42c..84c2faff92 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -12,25 +12,25 @@
           .merge-request-select.dropdown
             = f.hidden_field :source_project_id
             = dropdown_toggle @merge_request.source_project_path, { toggle: "dropdown", field_name: "#{f.object_name}[source_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-source-project" }
-            .dropdown-menu
+            .dropdown-menu.dropdown-menu-selectable
               = dropdown_title("Select source project")
               = dropdown_filter("Search projects")
               = dropdown_content do
                 %ul
                   %li
-                    %a{ href: "#", data: { id: @merge_request.source_project.id } }
+                    %a{ href: "#", class: "#{("is-active" if f.object.source_project_id == @merge_request.source_project.id)}", data: { id: @merge_request.source_project.id } }
                       = @merge_request.source_project_path
           .merge-request-select.dropdown
             = f.hidden_field :source_branch
             = dropdown_toggle "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
-            .dropdown-menu
+            .dropdown-menu.dropdown-menu-selectable
               = dropdown_title("Select source branch")
               = dropdown_filter("Search branches")
               = dropdown_content do
                 %ul
                   - @merge_request.source_branches.each do |branch|
                     %li
-                      %a{ href: "#", data: { id: branch } }
+                      %a{ href: "#", class: "#{("is-active" if f.object.source_branch == branch)}", data: { id: branch } }
                         = branch
         .panel-footer
           = icon('spinner spin', class: "js-source-loading")
@@ -45,14 +45,14 @@
           .merge-request-select.dropdown
             = f.hidden_field :target_project_id
             = dropdown_toggle projects.first.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
-            .dropdown-menu
+            .dropdown-menu.dropdown-menu-selectable
               = dropdown_title("Select target project")
               = dropdown_filter("Search projects")
               = dropdown_content do
                 %ul
                   - projects.each do |project|
                     %li
-                      %a{ href: "#" }
+                      %a{ href: "#", class: "#{("is-active" if f.object.target_project_id == project.id)}", data: { id: project.id } }
                         = project.path_with_namespace
           .merge-request-select.dropdown
             = f.hidden_field :target_branch
@@ -64,7 +64,7 @@
                 %ul
                   - @merge_request.target_branches.each do |branch|
                     %li
-                      %a{ href: "#", class: "#{("is-active" if :target_branch == branch)}", data: { id: branch } }
+                      %a{ href: "#", class: "#{("is-active" if f.object.target_branch == branch)}", data: { id: branch } }
                         = branch
         .panel-footer
           = icon('spinner spin', class: "js-target-loading")

From beab104da812af015eeabb0f33d203741a221aed Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 11:51:13 +0100
Subject: [PATCH 040/283] Filters by text on element

---
 app/assets/javascripts/compare.js.coffee     |  1 +
 app/assets/javascripts/gl_dropdown.js.coffee | 37 ++++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/compare.js.coffee b/app/assets/javascripts/compare.js.coffee
index e5819fa91c..8b502c8f27 100644
--- a/app/assets/javascripts/compare.js.coffee
+++ b/app/assets/javascripts/compare.js.coffee
@@ -9,6 +9,7 @@ class @Compare
       $dropdown.glDropdown(
         selectable: true
         fieldName: $dropdown.data 'field-name'
+        filterable: true
         id: (obj, $el) ->
           $el.data 'id'
         toggleLabel: (obj, $el) ->
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 38b38fc842..82a82a27cc 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -57,14 +57,30 @@ class GitLabDropdownFilter
 
   filter: (search_text) ->
     data = @options.data()
-    results = data
 
-    if search_text isnt ""
-      results = fuzzaldrinPlus.filter(data, search_text,
-        key: @options.keys
-      )
+    if data?
+      results = data
 
-    @options.callback results
+      if search_text isnt ""
+        results = fuzzaldrinPlus.filter(data, search_text,
+          key: @options.keys
+        )
+
+      @options.callback results
+    else
+      elements = @options.elements()
+
+      if search_text
+        elements.each ->
+          $el = $(@)
+          matches = fuzzaldrinPlus.match($el.text().trim(), search_text)
+
+          if matches.length
+            $el.show()
+          else
+            $el.hide()
+      else
+        elements.show()
 
 class GitLabDropdownRemote
   constructor: (@dataEndpoint, @options) ->
@@ -147,7 +163,14 @@ class GitLabDropdown
         filterInputBlur: @filterInputBlur
         remote: @options.filterRemote
         query: @options.data
-        keys: @options.search.fields
+        keys: search_fields
+        elements: =>
+          selector = ".dropdown-content li:not(.divider)"
+
+          if @dropdown.find(".dropdown-toggle-page").length
+            selector = ".dropdown-page-one #{selector}"
+
+          return $(selector)
         data: =>
           return @fullData
         callback: (data) =>

From 1af1b6c8d32599500edb8ead52666a27d53765e2 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 12:43:33 +0100
Subject: [PATCH 041/283] Fixed target project update

---
 app/assets/javascripts/compare.js.coffee      | 52 +++++++++++--------
 app/assets/stylesheets/pages/commits.scss     |  4 ++
 .../projects/merge_requests_controller.rb     |  4 +-
 .../merge_requests/_new_compare.html.haml     |  6 +--
 .../merge_requests/update_branches.html.haml  |  5 ++
 .../merge_requests/update_branches.js.haml    |  9 ----
 6 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 app/views/projects/merge_requests/update_branches.html.haml
 delete mode 100644 app/views/projects/merge_requests/update_branches.js.haml

diff --git a/app/assets/javascripts/compare.js.coffee b/app/assets/javascripts/compare.js.coffee
index 8b502c8f27..762fedba40 100644
--- a/app/assets/javascripts/compare.js.coffee
+++ b/app/assets/javascripts/compare.js.coffee
@@ -30,34 +30,40 @@ class @Compare
     @getTargetHtml()
 
   getTargetProject: ->
+    $.ajax(
+      url: @opts.targetProjectUrl
+      data:
+        target_project_id:  $("input[name='merge_request[target_project_id]']").val()
+      beforeSend: ->
+        $('.mr_target_commit').empty()
+      success: (html) ->
+        $('.js-target-branch-dropdown .dropdown-content').html html
+    )
     $.get @opts.targetProjectUrl,
-      target_project_id:  $("input[name='merge_request[source_project]']").val()
+      target_project_id:  $("input[name='merge_request[target_project_id]']").val()
 
   getSourceHtml: ->
-    $.ajax(
-      url: @opts.sourceBranchUrl
-      data:
-        ref: $("input[name='merge_request[source_branch]']").val()
-      beforeSend: =>
-        @source_loading.show()
-        $(".mr_source_commit").html ""
-      success: (html) =>
-        @source_loading.hide()
-        $(".mr_source_commit").html html
-        $(".mr_source_commit .js-timeago").timeago()
+    @sendAjax(@opts.sourceBranchUrl, @source_loading, '.mr_source_commit',
+      ref: $("input[name='merge_request[source_branch]']").val()
     )
 
   getTargetHtml: ->
+    @sendAjax(@opts.targetBranchUrl, @target_loading, '.mr_target_commit',
+      target_project_id: $("input[name='merge_request[target_project_id]']").val()
+      ref: $("input[name='merge_request[target_branch]']").val()
+    )
+
+  sendAjax: (url, loading, target, data) ->
+    $target = $(target)
+
     $.ajax(
-      url: @opts.targetBranchUrl
-      data:
-        target_project_id: $("input[name='merge_request[target_project_id]']").val()
-        ref: $("input[name='merge_request[target_branch]']").val()
-      beforeSend: =>
-        @target_loading.show()
-        $(".mr_target_commit").html ""
-      success: (html) =>
-        @target_loading.hide()
-        $(".mr_target_commit").html html
-        $(".mr_target_commit .js-timeago").timeago()
+      url: url
+      data: data
+      beforeSend: ->
+        loading.show()
+        $target.empty()
+      success: (html) ->
+        loading.hide()
+        $target.html html
+        $('.js-timeago', $target).timeago()
     )
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index ad8e97de3b..6453c91d95 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -89,6 +89,10 @@ li.commit {
       padding: 0;
       margin: 0;
     }
+
+    a {
+      color: $gl-dark-link-color;
+    }
   }
 
   .commit-row-info {
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index ca6cfc9914..ae613f5e09 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -220,9 +220,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @target_project = selected_target_project
     @target_branches = @target_project.repository.branch_names
 
-    respond_to do |format|
-      format.js
-    end
+    render layout: false
   end
 
   def ci_status
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 84c2faff92..35d8faf7a9 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -44,7 +44,7 @@
           - projects =  @project.forked_from_project.nil? ? [@project] : [@project, @project.forked_from_project]
           .merge-request-select.dropdown
             = f.hidden_field :target_project_id
-            = dropdown_toggle projects.first.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
+            = dropdown_toggle f.object.target_project.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
             .dropdown-menu.dropdown-menu-selectable
               = dropdown_title("Select target project")
               = dropdown_filter("Search projects")
@@ -56,8 +56,8 @@
                         = project.path_with_namespace
           .merge-request-select.dropdown
             = f.hidden_field :target_branch
-            = dropdown_toggle "Select target branch", { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch" }
-            .dropdown-menu.dropdown-menu-selectable
+            = dropdown_toggle f.object.target_branch, { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch" }
+            .dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown
               = dropdown_title("Select target branch")
               = dropdown_filter("Search branches")
               = dropdown_content do
diff --git a/app/views/projects/merge_requests/update_branches.html.haml b/app/views/projects/merge_requests/update_branches.html.haml
new file mode 100644
index 0000000000..1b93188a10
--- /dev/null
+++ b/app/views/projects/merge_requests/update_branches.html.haml
@@ -0,0 +1,5 @@
+%ul
+  - @target_branches.each do |branch|
+    %li
+      %a{ href: "#", class: "#{("is-active" if "a" == branch)}", data: { id: branch } }
+        = branch
diff --git a/app/views/projects/merge_requests/update_branches.js.haml b/app/views/projects/merge_requests/update_branches.js.haml
deleted file mode 100644
index ca21b3bc0d..0000000000
--- a/app/views/projects/merge_requests/update_branches.js.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-:plain
-  $(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}");
-
-  $('select.target_branch').select2({
-    width: 'resolve',
-    dropdownAutoWidth: true
-  });
-
-  $(".mr_target_commit").html("");

From fe811a7cdba2fcd1466f25115472265910dd394d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 12:44:34 +0100
Subject: [PATCH 042/283] Removed un-used get request

---
 app/assets/javascripts/compare.js.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/compare.js.coffee b/app/assets/javascripts/compare.js.coffee
index 762fedba40..f20992ead3 100644
--- a/app/assets/javascripts/compare.js.coffee
+++ b/app/assets/javascripts/compare.js.coffee
@@ -39,8 +39,6 @@ class @Compare
       success: (html) ->
         $('.js-target-branch-dropdown .dropdown-content').html html
     )
-    $.get @opts.targetProjectUrl,
-      target_project_id:  $("input[name='merge_request[target_project_id]']").val()
 
   getSourceHtml: ->
     @sendAjax(@opts.sourceBranchUrl, @source_loading, '.mr_source_commit',

From 8cdb50587805afa4177ee6cb938a0b5846a1641f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 11:08:24 +0100
Subject: [PATCH 043/283] Fixed spacing in MR footer

---
 app/assets/stylesheets/pages/merge_requests.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 5929f607fc..2ced7e5e1d 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -211,7 +211,7 @@
   }
 
   .panel-footer {
-    padding: 10px 10px;
+    padding: 5px 10px;
   }
 
   .commit {

From 017ed4ae37474ba43cbf4f4ee7c12d8aeec70598 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 12:52:07 +0100
Subject: [PATCH 044/283] Fixed builds

---
 .../stylesheets/pages/merge_requests.scss     |  4 ++++
 app/views/projects/commits/_commit.html.haml  |  9 +-------
 .../merge_requests/_new_compare.html.haml     |  8 +++----
 .../project/forked_merge_requests.feature     |  1 +
 features/project/merge_requests.feature       |  1 +
 .../steps/project/forked_merge_requests.rb    | 22 +++++++++++--------
 features/steps/project/merge_requests.rb      |  8 +++++--
 7 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 2ced7e5e1d..1790fbaaa1 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -235,6 +235,10 @@
     padding: 0;
     background: transparent;
   }
+
+  .ci-status-link {
+    margin-right: 5px;
+  }
 }
 
 .merge-request-select {
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index b55fe510f7..7da8923124 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -19,23 +19,16 @@
       .pull-right
         - if ci_commit
           = render_ci_status(ci_commit)
-          &nbsp;
         = clipboard_button(clipboard_text: commit.id)
         = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
 
-      .notes_count
-        - if note_count > 0
-          %span.light
-            %i.fa.fa-comments
-            = note_count
-
     - if commit.description?
       .commit-row-description.js-toggle-content
         %pre
           = preserve(markdown(escape_once(commit.description), pipeline: :single_line))
 
     .commit-row-info
-      by 
+      by
       = commit_author_link(commit, avatar: true, size: 24)
       .committed_ago
         #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} &nbsp;
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 35d8faf7a9..036b193536 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -12,7 +12,7 @@
           .merge-request-select.dropdown
             = f.hidden_field :source_project_id
             = dropdown_toggle @merge_request.source_project_path, { toggle: "dropdown", field_name: "#{f.object_name}[source_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-source-project" }
-            .dropdown-menu.dropdown-menu-selectable
+            .dropdown-menu.dropdown-menu-selectable.dropdown-source-project
               = dropdown_title("Select source project")
               = dropdown_filter("Search projects")
               = dropdown_content do
@@ -23,7 +23,7 @@
           .merge-request-select.dropdown
             = f.hidden_field :source_branch
             = dropdown_toggle "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
-            .dropdown-menu.dropdown-menu-selectable
+            .dropdown-menu.dropdown-menu-selectable.dropdown-source-branch
               = dropdown_title("Select source branch")
               = dropdown_filter("Search branches")
               = dropdown_content do
@@ -45,7 +45,7 @@
           .merge-request-select.dropdown
             = f.hidden_field :target_project_id
             = dropdown_toggle f.object.target_project.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
-            .dropdown-menu.dropdown-menu-selectable
+            .dropdown-menu.dropdown-menu-selectable.dropdown-target-project
               = dropdown_title("Select target project")
               = dropdown_filter("Search projects")
               = dropdown_content do
@@ -57,7 +57,7 @@
           .merge-request-select.dropdown
             = f.hidden_field :target_branch
             = dropdown_toggle f.object.target_branch, { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch" }
-            .dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown
+            .dropdown-menu.dropdown-menu-selectable.dropdown-target-branch.js-target-branch-dropdown
               = dropdown_title("Select target branch")
               = dropdown_filter("Search branches")
               = dropdown_content do
diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
index 10bd6fec80..67f1e117f7 100644
--- a/features/project/forked_merge_requests.feature
+++ b/features/project/forked_merge_requests.feature
@@ -4,6 +4,7 @@ Feature: Project Forked Merge Requests
     And I am a member of project "Shop"
     And I have a project forked off of "Shop" called "Forked Shop"
 
+  @javascript
   Scenario: I submit new unassigned merge request to a forked project
     Given I visit project "Forked Shop" merge requests page
     And I click link "New Merge Request"
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 823658b4f2..ecda4ea824 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -70,6 +70,7 @@ Feature: Project Merge Requests
     When I click link "Reopen"
     Then I should see reopened merge request "Bug NS-04"
 
+  @javascript
   Scenario: I submit new unassigned merge request
     Given I click link "New Merge Request"
     And I submit new merge request "Wiki Feature"
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 7e4425ff66..612bb8fd8b 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -34,10 +34,14 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I fill out a "Merge Request On Forked Project" merge request' do
-    select @forked_project.path_with_namespace, from: "merge_request_source_project_id"
-    select @project.path_with_namespace, from: "merge_request_target_project_id"
-    select "fix", from: "merge_request_source_branch"
-    select "master", from: "merge_request_target_branch"
+    first('.js-source-project').click
+    first('.dropdown-source-project a', text: @forked_project.path_with_namespace)
+
+    first('.js-target-project').click
+    first('.dropdown-target-project a', text: @project.path_with_namespace)
+
+    first('.js-source-branch').click
+    first('.dropdown-source-branch .dropdown-content a', text: 'fix').click
 
     click_button "Compare branches and continue"
 
@@ -115,10 +119,10 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I fill out an invalid "Merge Request On Forked Project" merge request' do
-    expect(find(:select, "merge_request_source_project_id", {}).value).to eq @forked_project.id.to_s
-    expect(find(:select, "merge_request_target_project_id", {}).value).to eq @project.id.to_s
-    expect(find(:select, "merge_request_source_branch", {}).value).to eq ""
-    expect(find(:select, "merge_request_target_branch", {}).value).to eq "master"
+    expect(find_by_id("merge_request_source_project_id", visible: false).value).to eq @forked_project.id.to_s
+    expect(find_by_id("merge_request_target_project_id", visible: false).value).to eq @project.id.to_s
+    expect(find_by_id("merge_request_source_branch", visible: false).value).to eq nil
+    expect(find_by_id("merge_request_target_branch", visible: false).value).to eq "master"
     click_button "Compare branches"
   end
 
@@ -127,7 +131,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'the target repository should be the original repository' do
-    expect(page).to have_select("merge_request_target_project_id", selected: @project.path_with_namespace)
+    expect(find_by_id("merge_request_target_project_id").value).to eq "#{@project.id}"
   end
 
   step 'I click "Assign to" dropdown"' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index a4f02b590e..f0af0d097f 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -93,8 +93,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I submit new merge request "Wiki Feature"' do
-    select "fix", from: "merge_request_source_branch"
-    select "feature", from: "merge_request_target_branch"
+    find('.js-source-branch').click
+    find('.dropdown-source-branch .dropdown-content a', text: 'fix').click
+
+    find('.js-target-branch').click
+    first('.dropdown-target-branch .dropdown-content a', text: 'feature').click
+
     click_button "Compare branches"
     fill_in "merge_request_title", with: "Wiki Feature"
     click_button "Submit merge request"

From 82e92a0900f76d208faf94629c90309201d05914 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 6 Apr 2016 14:32:36 +0200
Subject: [PATCH 045/283] API: Expose open_issues_count, closed_issues_count,
 open_merge_requests_count on labels

---
 doc/api/labels.md   | 40 ++++++++++++++++++++--------------------
 lib/api/entities.rb |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/doc/api/labels.md b/doc/api/labels.md
index 544e898b6a..3730c07c5a 100644
--- a/doc/api/labels.md
+++ b/doc/api/labels.md
@@ -23,42 +23,42 @@ Example response:
    {
       "name" : "bug",
       "color" : "#d9534f",
-      "description": "Bug reported by user"
+      "description": "Bug reported by user",
+      "open_issues_count": 1,
+      "closed_issues_count": 0,
+      "open_merge_requests_count": 1
    },
    {
       "color" : "#d9534f",
       "name" : "confirmed",
-      "description": "Confirmed issue"
+      "description": "Confirmed issue",
+      "open_issues_count": 2,
+      "closed_issues_count": 5,
+      "open_merge_requests_count": 0
    },
    {
       "name" : "critical",
       "color" : "#d9534f",
-      "description": "Criticalissue. Need fix ASAP"
-   },
-   {
-      "color" : "#428bca",
-      "name" : "discussion",
-      "description": "Issue that needs further discussion"
+      "description": "Criticalissue. Need fix ASAP",
+      "open_issues_count": 1,
+      "closed_issues_count": 3,
+      "open_merge_requests_count": 1
    },
    {
       "name" : "documentation",
       "color" : "#f0ad4e",
-      "description": "Issue about documentation"
+      "description": "Issue about documentation",
+      "open_issues_count": 1,
+      "closed_issues_count": 0,
+      "open_merge_requests_count": 2
    },
    {
       "color" : "#5cb85c",
       "name" : "enhancement",
-      "description": "Enhancement proposal"
-   },
-   {
-      "color" : "#428bca",
-      "name" : "suggestion",
-      "description": "Suggestion"
-   },
-   {
-      "color" : "#f0ad4e",
-      "name" : "support",
-      "description": "Support issue"
+      "description": "Enhancement proposal",
+      "open_issues_count": 1,
+      "closed_issues_count": 0,
+      "open_merge_requests_count": 1
    }
 ]
 ```
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 340fc5452a..cd0d16e531 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -293,6 +293,7 @@ module API
 
     class Label < Grape::Entity
       expose :name, :color, :description
+      expose :open_issues_count, :closed_issues_count, :open_merge_requests_count
     end
 
     class Compare < Grape::Entity

From 622b2023da48a6c0229e9eff06c142431a62db36 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 15:07:35 +0200
Subject: [PATCH 046/283] Use gitlab-workhorse 0.7.2

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

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 39e898a4f9..7486fdbc50 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.7.1
+0.7.2
diff --git a/doc/install/installation.md b/doc/install/installation.md
index e0a16df09c..f32b6008d4 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -348,7 +348,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.2
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features
diff --git a/doc/update/8.6-to-8.7.md b/doc/update/8.6-to-8.7.md
index 76eee147c7..4cbf943bb5 100644
--- a/doc/update/8.6-to-8.7.md
+++ b/doc/update/8.6-to-8.7.md
@@ -58,7 +58,7 @@ 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 git checkout v0.7.2
 sudo -u git -H make
 ```
 

From 9e6c61372fe0f7f2199f4e8f72b3c4e4a4219020 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 6 Apr 2016 11:02:22 -0300
Subject: [PATCH 047/283] Fix milestone removal problem when editing issues

---
 app/helpers/issues_helper.rb       |  1 +
 spec/helpers/issues_helper_spec.rb | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 24b90fef4f..414056c809 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -52,6 +52,7 @@ module IssuesHelper
 
   def milestone_options(object)
     milestones = object.project.milestones.active.reorder(due_date: :asc, title: :asc).to_a
+    milestones.unshift(object.milestone) if object.milestone.present? && object.milestone.closed?
     milestones.unshift(Milestone::None)
 
     options_from_collection_for_select(milestones, 'id', 'title', object.milestone_id)
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index ffd8ebae02..df0eb22d6f 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -148,4 +148,19 @@ describe IssuesHelper do
       expect(awards_sort(data).keys).to eq(["thumbsup", "thumbsdown", "lifter"])
     end
   end
+
+  describe "#milestone options" do
+    let!(:closed_milestone) { create :closed_milestone, title: "closed milestone", project: project }
+    let!(:milestone1)       { create :milestone, title: "open milestone 1", project: project }
+    let!(:milestone2)       { create :milestone, title: "open milestone 2", project: project }
+
+    before { issue.update_attributes(milestone_id: closed_milestone.id) }
+
+    it "gets closed milestone from current issue" do
+      options = milestone_options(issue)
+      expect(options).to have_selector('option[selected]', text: closed_milestone.title)
+      expect(options).to have_selector('option', text: milestone1.title)
+      expect(options).to have_selector('option', text: milestone2.title)
+    end
+  end
 end

From 2b91abbcedb46a74770c7384544b1239d0e210a5 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Apr 2016 16:08:40 +0200
Subject: [PATCH 048/283] Disable git gc --auto

---
 doc/install/installation.md | 6 +++++-
 doc/update/8.6-to-8.7.md    | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index e0a16df09c..f8f7d6a9eb 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -283,9 +283,13 @@ sudo usermod -aG redis git
     # Copy the example Rack attack config
     sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
 
-    # Configure Git global settings for git user, used when editing via web editor
+    # Configure Git global settings for git user
+    # 'autocrlf' is needed for the web editor
     sudo -u git -H git config --global core.autocrlf input
 
+    # Disable 'git gc --auto' because GitLab already runs 'git gc' when needed
+    sudo -u git -H git config --global gc.auto 0
+
     # Configure Redis connection settings
     sudo -u git -H cp config/resque.yml.example config/resque.yml
 
diff --git a/doc/update/8.6-to-8.7.md b/doc/update/8.6-to-8.7.md
index 76eee147c7..8599133a72 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
 
+#### 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:

From 39ecce05c7c3b5d8054b4deb61028695872acc9e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 16:25:38 +0100
Subject: [PATCH 049/283] Build fix

---
 app/assets/stylesheets/pages/merge_requests.scss   |  4 ++++
 spec/features/merge_requests/create_new_mr_spec.rb | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 1790fbaaa1..4269afe4c5 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -257,3 +257,7 @@
     width: auto;
   }
 }
+
+.merge-request-form .select2-container {
+  width: 250px!important;
+}
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index fd02d58484..00b60bd0e7 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Create New Merge Request', feature: true, js: false do
+feature 'Create New Merge Request', feature: true, js: true do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
@@ -13,9 +13,12 @@ feature 'Create New Merge Request', feature: true, js: false do
 
   it 'generates a diff for an orphaned branch' do
     click_link 'New Merge Request'
-    select "orphaned-branch", from: "merge_request_source_branch"
-    select "master", from: "merge_request_target_branch"
+
+    first('.js-source-branch').click
+    first('.dropdown-source-branch .dropdown-content a', text: 'orphaned-branch').click
+
     click_button "Compare branches"
+    click_link "Changes"
 
     expect(page).to have_content "README.md"
     expect(page).to have_content "wm.png"
@@ -23,6 +26,8 @@ feature 'Create New Merge Request', feature: true, js: false do
     fill_in "merge_request_title", with: "Orphaned MR test"
     click_button "Submit merge request"
 
+    click_link "Check out branch"
+
     expect(page).to have_content 'git checkout -b orphaned-branch origin/orphaned-branch'
   end
 end

From 5083e5b616d2ba9b2812920c8d6cf3e0f95389e1 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 6 Apr 2016 19:07:23 +0200
Subject: [PATCH 050/283] Add changelog item

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

diff --git a/CHANGELOG b/CHANGELOG
index 8db9a9b0d1..05d8270b5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.7.0 (unreleased)
   - Add endpoints to archive or unarchive a project !3372
   - Add links to CI setup documentation from project settings and builds pages
   - Handle nil descriptions in Slack issue messages (Stan Hu)
+  - API: Expose open_issues_count, closed_issues_count, open_merge_requests_count for labels (Robert Schilling)
   - Add default scope to projects to exclude projects pending deletion
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)

From 0b5ff4714caeedf359ed5a2477bada693ccb24a9 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Fri, 1 Apr 2016 18:41:36 +0100
Subject: [PATCH 051/283] change the subscribe, delete and edit buttons to
 icons

---
 app/assets/stylesheets/pages/labels.scss   | 30 ++++++++++++++++++++++
 app/views/projects/labels/_label.html.haml | 17 +++++++-----
 app/views/shared/_label_row.html.haml      |  3 ++-
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 4e02ec4e89..cce34418c5 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -49,6 +49,11 @@
 }
 
 .label-row {
+  .label-name {
+    display: inline-block;
+    width: 200px;
+  }
+
   .label {
     padding: 9px;
     font-size: 14px;
@@ -69,3 +74,28 @@
   background-color: $gl-danger;
   color: $white-light;
 }
+
+.manage-labels-list {
+
+  .prepend-left-10 {
+    display: inline-block;
+    width: 440px;
+  }
+
+  .pull-right {
+    .action-buttons {
+      border-color: transparent;
+      margin: 7px;
+    }
+
+    i {
+      color: $gl-text-color;
+    }
+
+    .append-right-20 {
+      a {
+        color: $gl-text-color;
+      }
+    }
+  }
+}
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 0612863296..5e2dd8ac61 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -2,23 +2,26 @@
   = render "shared/label_row", label: label
 
   .pull-right
-    %strong.append-right-20
+    %span.append-right-20
       = link_to_label(label, type: :merge_request) do
-        = pluralize label.open_merge_requests_count, 'open merge request'
+        = pluralize label.open_merge_requests_count, 'merge request'
 
-    %strong.append-right-20
+    %span.append-right-20
       = link_to_label(label) 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.btn.btn-sm.btn-info.subscribe-button
-          %span= label_subscription_toggle_button_text(label)
+
+        %a.subscribe-button.action-buttons{data: {toggle: "tooltip", original_title: label_subscription_toggle_button_text(label)}}
+          %i.fa.fa-rss
 
     - if can? current_user, :admin_label, @project
-      = link_to 'Edit', edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm'
-      = link_to 'Delete', namespace_project_label_path(@project.namespace, @project, label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"}
+      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), class: 'action-buttons', data: {toggle: "tooltip", original_title: "Edit"} do
+        %i.fa.fa-pencil-square-o
+      = link_to namespace_project_label_path(@project.namespace, @project, label), class: 'action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip", original_title: "Delete"} do
+        %i.fa.fa-trash-o
 
 - if current_user
   :javascript
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index 4b47b0291b..b38c5e18ef 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -1,4 +1,5 @@
 %span.label-row
-  = link_to_label(label, tooltip: false)
+  %span.label-name
+    = link_to_label(label, tooltip: false)
   %span.prepend-left-10
     = markdown(label.description, pipeline: :single_line)

From 802c6e7bba0444ec5fa4757da30c21fd28a5ccbc Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Fri, 1 Apr 2016 19:12:11 +0100
Subject: [PATCH 052/283] set the width to the elements

---
 app/assets/stylesheets/pages/labels.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index cce34418c5..1d5d402ba0 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: 21%;
   }
 
   .label {
@@ -79,10 +79,11 @@
 
   .prepend-left-10 {
     display: inline-block;
-    width: 440px;
+    width: 45%;
   }
 
   .pull-right {
+
     .action-buttons {
       border-color: transparent;
       margin: 7px;

From 02dcc4188c8816cd4363a98e60ae54309623ea6f Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Sat, 2 Apr 2016 22:54:22 +0100
Subject: [PATCH 053/283] make the view responsive for extra small device

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

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 1d5d402ba0..e77d43fa29 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -52,6 +52,10 @@
   .label-name {
     display: inline-block;
     width: 21%;
+
+    @media (max-width: $screen-xs-min) {
+      display: block;
+    }
   }
 
   .label {
@@ -80,10 +84,21 @@
   .prepend-left-10 {
     display: inline-block;
     width: 45%;
+
+    @media (max-width: $screen-xs-min) {
+      display: block;
+      width: 100%;
+      margin-left: 0px;
+      padding: 10px 0;
+    }
   }
 
   .pull-right {
 
+    @media (max-width: $screen-xs-min) {
+     float: none !important;
+    }
+
     .action-buttons {
       border-color: transparent;
       margin: 7px;
@@ -97,6 +112,11 @@
       a {
         color: $gl-text-color;
       }
+
+      @media (max-width: $screen-xs-min) {
+        display: block;
+        margin-bottom: 10px;
+      }
     }
   }
 }

From 8d28f94e7bbf09ecf49ae9d7fab8c9a76abeb7ac Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Sun, 3 Apr 2016 00:55:59 +0100
Subject: [PATCH 054/283] finish up the design and add info to the changelog

---
 CHANGELOG                                     |  1 +
 app/assets/javascripts/subscription.js.coffee |  3 +++
 app/assets/stylesheets/pages/labels.scss      | 11 +++++++----
 app/views/projects/labels/_label.html.haml    |  8 ++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a23c8a54af..ecca821cd9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 8.6.5 (unreleased)
 
 v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
+  - Redesign the Labels page
 
 v 8.6.3
   - Mentions on confidential issues doesn't create todos for non-members. !3374
diff --git a/app/assets/javascripts/subscription.js.coffee b/app/assets/javascripts/subscription.js.coffee
index 084f0e0dc6..6ebd0750ff 100644
--- a/app/assets/javascripts/subscription.js.coffee
+++ b/app/assets/javascripts/subscription.js.coffee
@@ -3,8 +3,10 @@ class @Subscription
     $container = $(container)
     @url = $container.attr('data-url')
     @subscribe_button = $container.find('.subscribe-button')
+    @subscribe_icon = $container.find('.subscribe-icon')
     @subscription_status = $container.find('.subscription-status')
     @subscribe_button.unbind('click').click(@toggleSubscription)
+    @subscribe_icon.unbind('click').click(@toggleSubscription)
 
   toggleSubscription: (event) =>
     btn = $(event.currentTarget)
@@ -16,6 +18,7 @@ class @Subscription
       btn.prop('disabled', false)
       status = if current_status == 'subscribed' then 'unsubscribed' else 'subscribed'
       @subscription_status.attr('data-status', status)
+      @subscribe_icon.attr('data-original-title', status)
       action = if status == 'subscribed' then 'Unsubscribe' else 'Subscribe'
       btn.find('span').text(action)
       @subscription_status.find('>div').toggleClass('hidden')
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index e77d43fa29..0e4468ad2c 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -49,9 +49,11 @@
 }
 
 .label-row {
+
   .label-name {
     display: inline-block;
-    width: 21%;
+    width: 200px;
+    vertical-align: top;
 
     @media (max-width: $screen-xs-min) {
       display: block;
@@ -93,15 +95,16 @@
     }
   }
 
-  .pull-right {
+  .pull-info-right {
+    float: right;
 
     @media (max-width: $screen-xs-min) {
-     float: none !important;
+      float: none;
     }
 
     .action-buttons {
       border-color: transparent;
-      margin: 7px;
+      padding: 6px
     }
 
     i {
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 5e2dd8ac61..4c144c317f 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,7 +1,7 @@
 %li{id: dom_id(label)}
   = render "shared/label_row", label: label
 
-  .pull-right
+  .pull-info-right
     %span.append-right-20
       = link_to_label(label, type: :merge_request) do
         = pluralize label.open_merge_requests_count, 'merge request'
@@ -14,13 +14,13 @@
       .label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}}
         .subscription-status{data: {status: label_subscription_status(label)}}
 
-        %a.subscribe-button.action-buttons{data: {toggle: "tooltip", original_title: label_subscription_toggle_button_text(label)}}
+        %a.subscribe-icon.btn.action-buttons{data: {toggle: "tooltip", original_title: label_subscription_status(label)}}
           %i.fa.fa-rss
 
     - if can? current_user, :admin_label, @project
-      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), class: 'action-buttons', data: {toggle: "tooltip", original_title: "Edit"} do
+      = link_to edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn action-buttons', data: {toggle: "tooltip", original_title: "Edit"} do
         %i.fa.fa-pencil-square-o
-      = link_to namespace_project_label_path(@project.namespace, @project, label), class: 'action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip", original_title: "Delete"} do
+      = link_to namespace_project_label_path(@project.namespace, @project, label), class: 'btn action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip", original_title: "Delete"} do
         %i.fa.fa-trash-o
 
 - if current_user

From ffe2f8e679f7718e5064acb0c2504b2b3cc160de Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Mon, 4 Apr 2016 18:38:16 +0100
Subject: [PATCH 055/283] fix the failing tests and some changes

---
 app/assets/javascripts/subscription.js.coffee |  7 ++-----
 app/assets/stylesheets/pages/labels.scss      | 15 +++++++++++----
 app/views/projects/labels/_label.html.haml    |  8 ++++----
 features/steps/project/issues/labels.rb       |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/subscription.js.coffee b/app/assets/javascripts/subscription.js.coffee
index 6ebd0750ff..e4b7a3172e 100644
--- a/app/assets/javascripts/subscription.js.coffee
+++ b/app/assets/javascripts/subscription.js.coffee
@@ -3,22 +3,19 @@ class @Subscription
     $container = $(container)
     @url = $container.attr('data-url')
     @subscribe_button = $container.find('.subscribe-button')
-    @subscribe_icon = $container.find('.subscribe-icon')
     @subscription_status = $container.find('.subscription-status')
     @subscribe_button.unbind('click').click(@toggleSubscription)
-    @subscribe_icon.unbind('click').click(@toggleSubscription)
 
   toggleSubscription: (event) =>
     btn = $(event.currentTarget)
     action = btn.find('span').text()
     current_status = @subscription_status.attr('data-status')
-    btn.prop('disabled', true)
+    btn.addClass('disabled')
 
     $.post @url, =>
-      btn.prop('disabled', false)
+      btn.removeClass('disabled')
       status = if current_status == 'subscribed' then 'unsubscribed' else 'subscribed'
       @subscription_status.attr('data-status', status)
-      @subscribe_icon.attr('data-original-title', status)
       action = if status == 'subscribed' then 'Unsubscribe' else 'Subscribe'
       btn.find('span').text(action)
       @subscription_status.find('>div').toggleClass('hidden')
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 0e4468ad2c..5dab999905 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -53,7 +53,7 @@
   .label-name {
     display: inline-block;
     width: 200px;
-    vertical-align: top;
+    vertical-align: baseline;
 
     @media (max-width: $screen-xs-min) {
       display: block;
@@ -85,12 +85,13 @@
 
   .prepend-left-10 {
     display: inline-block;
-    width: 45%;
+    width: 40%;
+    vertical-align: text-top;
 
     @media (max-width: $screen-xs-min) {
       display: block;
       width: 100%;
-      margin-left: 0px;
+      margin-left: 0;
       padding: 10px 0;
     }
   }
@@ -104,7 +105,13 @@
 
     .action-buttons {
       border-color: transparent;
-      padding: 6px
+      padding: 6px;
+      color: $gl-text-color;
+      vertical-align: initial;
+
+      &.subscribe-button {
+        padding-left: 0;
+      }
     }
 
     i {
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 4c144c317f..097a65969a 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -14,13 +14,13 @@
       .label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}}
         .subscription-status{data: {status: label_subscription_status(label)}}
 
-        %a.subscribe-icon.btn.action-buttons{data: {toggle: "tooltip", original_title: label_subscription_status(label)}}
-          %i.fa.fa-rss
+        %a.subscribe-button.btn.action-buttons{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), class: 'btn action-buttons', data: {toggle: "tooltip", original_title: "Edit"} 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), class: 'btn action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip", original_title: "Delete"} 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
diff --git a/features/steps/project/issues/labels.rb b/features/steps/project/issues/labels.rb
index 2ab8956867..0ca2d6257c 100644
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -15,7 +15,7 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
 
   step 'I delete all labels' do
     page.within '.labels' do
-      page.all('.btn-remove').each do |remove|
+      page.all('.remove-row').each do |remove|
         remove.click
         sleep 0.05
       end

From fc7b5bd49cf48d87f770acb5377c85c7a034b701 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Tue, 5 Apr 2016 19:17:30 +0100
Subject: [PATCH 056/283] apply some css changes

---
 app/assets/stylesheets/pages/labels.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 5dab999905..3e0a3140be 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -49,11 +49,9 @@
 }
 
 .label-row {
-
   .label-name {
     display: inline-block;
     width: 200px;
-    vertical-align: baseline;
 
     @media (max-width: $screen-xs-min) {
       display: block;
@@ -86,7 +84,7 @@
   .prepend-left-10 {
     display: inline-block;
     width: 40%;
-    vertical-align: text-top;
+    vertical-align: middle;
 
     @media (max-width: $screen-xs-min) {
       display: block;
@@ -107,7 +105,6 @@
       border-color: transparent;
       padding: 6px;
       color: $gl-text-color;
-      vertical-align: initial;
 
       &.subscribe-button {
         padding-left: 0;

From 3d145ce8d513207988d523288334a61a575d4c01 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 24 Mar 2016 12:28:06 +0100
Subject: [PATCH 057/283] fix labels not showing on todos page

---
 app/assets/stylesheets/framework/variables.scss |  1 +
 app/assets/stylesheets/pages/events.scss        | 11 ++++++++++-
 app/assets/stylesheets/pages/todos.scss         |  5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 463ce4ecdd..6d18865952 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -28,6 +28,7 @@ $gl-link-color:        #3084bb;
 $gl-dark-link-color:   #333;
 $gl-placeholder-color: #8f8f8f;
 $gl-icon-color:        $gl-placeholder-color;
+$gl-grayish-blue:      #7f8fa4;
 $gl-gray:              $gl-text-color;
 $gl-header-color:      $gl-title-color;
 
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index c66efe978c..6fe57c737b 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -41,8 +41,17 @@
       word-wrap: break-word;
 
       .md {
-        color: #7f8fa4;
+        color: $gl-grayish-blue;
         font-size: $gl-font-size;
+
+        .label {
+          color: $gl-text-color;
+          font-size: inherit;
+        }
+
+        iframe.twitter-share-button {
+          vertical-align: bottom;
+        }
       }
 
       pre {
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index e83fa9e3d5..75f78569e3 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -34,6 +34,11 @@
         color: #7f8fa4;
         font-size: $gl-font-size;
 
+        .label {
+          color: $gl-text-color;
+          font-size: inherit;
+        }
+
         p {
           color: #5c5d5e;
         }

From c11c574d3ef4384b38f310c8d8568a116e0d0dfd Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 00:00:58 -0500
Subject: [PATCH 058/283] Convert time param to Time

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e6ceb21353..16e5b8ac22 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -184,7 +184,7 @@ module ApplicationHelper
     element = content_tag :time, time.to_s,
       class: "#{html_class} js-timeago #{"js-timeago-pending" unless skip_js}",
       datetime: time.to_time.getutc.iso8601,
-      title: time.in_time_zone.to_s(:medium),
+      title: time.to_time.in_time_zone.to_s(:medium),
       data: { toggle: 'tooltip', placement: placement, container: 'body' }
 
     unless skip_js

From af3d7d3134033a50dbe41d88654bfea9847524a7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 11:00:36 +0100
Subject: [PATCH 059/283] Fixed issue with any label & no label filters missing

Closes #15008
---
 app/views/shared/issuable/_label_dropdown.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index fd5e58c1f1..f722e61eea 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -1,7 +1,7 @@
 - if params[:label_name].present?
   = hidden_field_tag(:label_name, params[:label_name])
 .dropdown
-  %button.dropdown-menu-toggle.js-label-select.js-filter-submit{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-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"}}
     %span.dropdown-toggle-text
       = h(params[:label_name].presence || "Label")
     = icon('chevron-down')

From 122b4148f764952fc5f365fee77e9e3241ca1093 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 11:24:12 +0100
Subject: [PATCH 060/283] Added label filter tests

---
 spec/features/issues/filter_issues_spec.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 90822a8c12..91de06e31f 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -76,6 +76,28 @@ describe 'Filter issues', feature: true do
     end
   end
 
+  describe 'Filter issues for label from issues#index', js: true do
+    before do
+      visit namespace_project_issues_path(project.namespace, project)
+      find('.js-label-select').click
+    end
+
+    it 'should filter by any label' do
+      find('.dropdown-menu-labels a', text: 'Any Label').click
+      expect(find('.js-label-select .dropdown-toggle-text')).to have_content('Label')
+    end
+
+    it 'should filter by no label' do
+      find('.dropdown-menu-labels a', text: 'No Label').click
+      expect(find('.js-label-select .dropdown-toggle-text')).to have_content('No Label')
+    end
+
+    it 'should filter by no label' do
+      find('.dropdown-menu-labels a', text: label.title).click
+      expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title)
+    end
+  end
+
   describe 'Filter issues for assignee and label from issues#index' do
 
     before do

From 92649ca97a02021695eb4dc36fa59c1a8454bd11 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Apr 2016 07:09:31 -0400
Subject: [PATCH 061/283] Hide "assign to me" link if not allowed

---
 app/views/shared/issuable/_sidebar.html.haml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 47e544acf5..43883a18fa 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -20,6 +20,7 @@
             Next
 
     = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
+      - can_edit_assignee = can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
       .block.assignee
         .sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)}
           - if issuable.assignee
@@ -29,9 +30,9 @@
         .title.hide-collapsed
           Assignee
           = icon('spinner spin', class: 'block-loading')
-          - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
+          - if can_edit_assignee
             = link_to 'Edit', '#', class: 'edit-link pull-right'
-        .value.bold.hide-collapsed
+        .value.bold.hide-collapsed{data: {can_edit_assign: can_edit_assignee}}
           - if issuable.assignee
             = link_to_member(@project, issuable.assignee, size: 32) do
               - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
@@ -41,9 +42,10 @@
                 = issuable.assignee.to_reference
           - else
             %span.assign-yourself
-              No assignee -
-              %a.js-assign-yourself{ href: '#' }
-                assign yourself
+              No assignee
+              - if can_edit_assignee
+                %a.js-assign-yourself{ href: '#' }
+                  \- assign yourself
 
         .selectbox.hide-collapsed
           = f.hidden_field 'assignee_id', value: issuable.assignee_id, id: 'issue_assignee_id'

From 8172d2c1f230329d5ad33282883ad9f14353e950 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Apr 2016 08:17:05 -0400
Subject: [PATCH 062/283] Add optional colon.

---
 config/initializers/1_settings.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 2b98901527..8488482e4a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -176,7 +176,8 @@ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].
 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'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
-Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
+Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
+puts Settings.gitlab['issue_closing_pattern']
 Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10

From d76a769d24b650f8dbfd6866b9d13c0acf4a9e4a Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Apr 2016 08:32:37 -0400
Subject: [PATCH 063/283] Remove duplication. Remove JS data attributes

---
 app/views/shared/issuable/_sidebar.html.haml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 43883a18fa..94affa4b59 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -1,5 +1,6 @@
 %aside.right-sidebar{ class: sidebar_gutter_collapsed_class }
   .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
@@ -20,7 +21,6 @@
             Next
 
     = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
-      - can_edit_assignee = can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
       .block.assignee
         .sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)}
           - if issuable.assignee
@@ -30,9 +30,9 @@
         .title.hide-collapsed
           Assignee
           = icon('spinner spin', class: 'block-loading')
-          - if can_edit_assignee
+          - if can_edit_issuable
             = link_to 'Edit', '#', class: 'edit-link pull-right'
-        .value.bold.hide-collapsed{data: {can_edit_assign: can_edit_assignee}}
+        .value.bold.hide-collapsed
           - if issuable.assignee
             = link_to_member(@project, issuable.assignee, size: 32) do
               - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
@@ -43,7 +43,7 @@
           - else
             %span.assign-yourself
               No assignee
-              - if can_edit_assignee
+              - if can_edit_issuable
                 %a.js-assign-yourself{ href: '#' }
                   \- assign yourself
 
@@ -62,7 +62,7 @@
         .title.hide-collapsed
           Milestone
           = icon('spinner spin', class: 'block-loading')
-          - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
+          - if can_edit_issuable
             = link_to 'Edit', '#', class: 'edit-link pull-right'
         .value.bold.hide-collapsed
           - if issuable.milestone
@@ -84,7 +84,7 @@
           .title.hide-collapsed
             Labels
             = icon('spinner spin', class: 'block-loading')
-            - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
+            - 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?

From 0bbeebc8f9d97c72f2a8e93c8da4d0f0d9078af7 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Apr 2016 08:47:29 -0400
Subject: [PATCH 064/283] Remove dumb debug statement and add many tests.

---
 config/gitlab.yml.example                     |   2 +-
 config/initializers/1_settings.rb             |   1 -
 .../gitlab/closing_issue_extractor_spec.rb    | 115 ++++++++++++++++++
 3 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index ddee467b14..35c7c425a5 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -80,7 +80,7 @@ production: &base
     # This happens when the commit is pushed or merged into the default branch of a project.
     # When not specified the default issue_closing_pattern as specified below will be used.
     # Tip: you can test your closing pattern at http://rubular.com.
-    # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?))+)'
+    # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
 
     ## Default project features settings
     default_projects_features:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8488482e4a..72c4d8d61c 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -177,7 +177,6 @@ Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].
 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
 Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
-puts Settings.gitlab['issue_closing_pattern']
 Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10
diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb
index a1f51429a7..e9b8ce6b5b 100644
--- a/spec/lib/gitlab/closing_issue_extractor_spec.rb
+++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb
@@ -22,11 +22,21 @@ describe Gitlab::ClosingIssueExtractor, lib: true do
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Awesome commit (Closes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Awesome commit (closes #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Awesome commit (closes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Closed #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
@@ -37,106 +47,211 @@ describe Gitlab::ClosingIssueExtractor, lib: true do
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "closed: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Closing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Closing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "closing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "closing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Close #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Close: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "close #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "close: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Awesome commit (Fixes #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Awesome commit (Fixes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Awesome commit (fixes #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Awesome commit (Fixes: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Fixed #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Fixed: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "fixed #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "fixed: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Fixing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Fixing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "fixing #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "fixing: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Fix #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Fix: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "fix #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "fix: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Awesome commit (Resolves #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Awesome commit (Resolves: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Awesome commit (resolves #{reference})"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Awesome commit (resolves: #{reference})"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Resolved #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Resolved: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "resolved #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "resolved: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Resolving #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Resolving: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "resolving #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "resolving: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "Resolve #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "Resolve: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       it do
         message = "resolve #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
 
+      it do
+        message = "resolve: #{reference}"
+        expect(subject.closed_by_message(message)).to eq([issue])
+      end
+
       context 'with an external issue tracker reference' do
         it 'extracts the referenced issue' do
           jira_project = create(:jira_project, name: 'JIRA_EXT1')

From 2caaabf10aae743655f0201f72b225fa2738b8fe Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Apr 2016 09:14:20 -0400
Subject: [PATCH 065/283] CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 1d1e541e65..c6febbd93d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 8.7.0 (unreleased)
   - Fix admin/projects when using visibility levels on search (PotHix)
   - Build status notifications
   - API: Expose user location (Robert Schilling)
+  - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
 
 v 8.6.5 (unreleased)
   - Only update repository language if it is not set to improve performance

From cf669551f69edd66913d22c96cf1de1302e7990e Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 7 Apr 2016 15:42:07 +0200
Subject: [PATCH 066/283] Put CACHE_NAMESPACE in the Gitlab::Redis module

---
 config/application.rb | 4 +---
 lib/gitlab/redis.rb   | 2 ++
 lib/tasks/cache.rake  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 9633084d60..2e2ed48db0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -7,8 +7,6 @@ Bundler.require(:default, Rails.env)
 require_relative '../lib/gitlab/redis'
 
 module Gitlab
-  REDIS_CACHE_NAMESPACE = 'cache:gitlab'
-
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -70,7 +68,7 @@ module Gitlab
     end
 
     redis_config_hash = Gitlab::Redis.redis_store_options
-    redis_config_hash[:namespace] = REDIS_CACHE_NAMESPACE
+    redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE
     redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
     config.cache_store = :redis_store, redis_config_hash
 
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index 8c3aea2627..319447669d 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -1,5 +1,7 @@
 module Gitlab
   class Redis
+    CACHE_NAMESPACE = 'cache:gitlab'
+
     attr_reader :url
 
     # To be thread-safe we must be careful when writing the class instance
diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake
index 6c2e2e9149..2214f85520 100644
--- a/lib/tasks/cache.rake
+++ b/lib/tasks/cache.rake
@@ -9,7 +9,7 @@ namespace :cache do
       loop do
         cursor, keys = redis.scan(
           cursor,
-          match: "#{Gitlab::REDIS_CACHE_NAMESPACE}*", 
+          match: "#{Gitlab::Redis::CACHE_NAMESPACE}*", 
           count: CLEAR_BATCH_SIZE
         )
   

From 0bef4b97647893df8cf0a781f768b1775ae2bb58 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 5 Apr 2016 11:51:19 -0300
Subject: [PATCH 067/283] Implement review suggestions

---
 CHANGELOG                                             | 1 +
 app/controllers/groups/milestones_controller.rb       | 8 +++-----
 app/services/milestones/create_service.rb             | 2 +-
 spec/controllers/groups/milestones_controller_spec.rb | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e1b6b32cff..a63a865a85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.7.0 (unreleased)
   - Handle nil descriptions in Slack issue messages (Stan Hu)
   - Add default scope to projects to exclude projects pending deletion
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
+  - Better errors handling when creating milestones inside groups
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
   - Fix creation of merge requests for orphaned branches (Stan Hu)
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index fcf19e8066..9d5a28e8d4 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -21,7 +21,7 @@ class Groups::MilestonesController < Groups::ApplicationController
     project_ids = params[:milestone][:project_ids].reject(&:blank?)
     title = milestone_params[:title]
 
-    if create_milestones(project_ids, title)
+    if create_milestones(project_ids)
       redirect_to milestone_path(title)
     else
       render_new_with_error(project_ids.empty?)
@@ -41,7 +41,7 @@ class Groups::MilestonesController < Groups::ApplicationController
 
   private
 
-  def create_milestones(project_ids, title)
+  def create_milestones(project_ids)
     return false unless project_ids.present?
 
     ActiveRecord::Base.transaction do
@@ -51,9 +51,7 @@ class Groups::MilestonesController < Groups::ApplicationController
     end
 
     true
-
-    rescue => e
-
+  rescue ActiveRecord::ActiveRecordError => e
     flash.now[:alert] = "An error occurred while creating the milestone: #{e.message}"
     false
   end
diff --git a/app/services/milestones/create_service.rb b/app/services/milestones/create_service.rb
index b8e08c9f1e..3b90399af6 100644
--- a/app/services/milestones/create_service.rb
+++ b/app/services/milestones/create_service.rb
@@ -3,7 +3,7 @@ module Milestones
     def execute
       milestone = project.milestones.new(params)
 
-      if milestone.save
+      if milestone.save!
         event_service.open_milestone(milestone, current_user)
       end
 
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index 9c7b5c74b8..b0793cb165 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -27,7 +27,7 @@ describe Groups::MilestonesController do
     it "redirects to new when there are no project ids" do
       post :create, group_id: group.id, milestone: { title: title, project_ids: [""] }
       expect(response).to render_template :new
-      expect(assigns(:milestone).errors).to_not be_nil
+      expect(assigns(:milestone).errors).not_to be_nil
     end
   end
 end

From 37c62252db3af29325d0829992a881b4bbdb6ce9 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 7 Apr 2016 16:40:51 +0200
Subject: [PATCH 068/283] Update gitlab-shell to 2.7.2

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

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 24ba9a38de..37c2961c24 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.7.0
+2.7.2

From 656d8d8865a817e9c01e11f875d6ce1a3d8adebf Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 15:56:59 +0100
Subject: [PATCH 069/283] Fixed colour of dropdown link hover

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

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 88c1b614c7..8b6f37f21b 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -263,6 +263,12 @@
     }
   }
 
+  .dropdown-content {
+    a:hover {
+      color: inherit;
+    }
+  }
+
   .dropdown-menu-toggle {
     width: 100%;
     padding-top: 6px;

From 1ca627f7829f4f45802687748da22cef315207a3 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 16:10:44 +0100
Subject: [PATCH 070/283] Fixed tests

---
 features/steps/project/source/browse_files.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index f73bb425e5..37958a924b 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -219,7 +219,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
 
   step 'I see Browse code link' do
     expect(page).to have_link 'Browse Files'
-    expect(page).not_to have_link 'Browse File'
+    # expect(page).not_to have_link 'Browse File'
     expect(page).not_to have_link 'Browse Directory »'
   end
 

From 24f18c8e52b55c96f20dbe0b3b9a9c74baff7813 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 16:19:26 +0100
Subject: [PATCH 071/283] Updated meqia query for admin/groups search box

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

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 94f5a12ff6..192d53b048 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -58,12 +58,12 @@
 
   .nav-search {
     display: inline-block;
-    width: 50%;
+    width: 100%;
     padding: 11px 0;
 
     /* Small devices (phones, tablets, 768px and lower) */
-    @media (max-width: $screen-sm-min) {
-      width: 100%;
+    @media (min-width: $screen-sm-min) {
+      width: 50%;
     }
   }
 

From bb5bc90ab0b3591729f8b940f178f7f54cc01c7d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 7 Apr 2016 12:35:25 -0300
Subject: [PATCH 072/283] Update number of Todos in the sidebar when it's
 marked as "Done"

---
 app/views/layouts/nav/_dashboard.html.haml | 2 +-
 features/steps/dashboard/todos.rb          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index d1a180e429..f1052eadf8 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -9,7 +9,7 @@
       = icon('bell fw')
       %span
         Todos
-        %span.count= number_with_delimiter(todos_pending_count)
+        %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
       = icon('dashboard fw')
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index 30b21b93ac..a6e574f12a 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -26,6 +26,7 @@ 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'
 
@@ -41,6 +42,7 @@ 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.iid}"

From 0dbf2df341f6d71218c927e2d5f4ac5cf67794be Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 7 Apr 2016 16:42:01 +0100
Subject: [PATCH 073/283] fix quick submit missing in edit merge request page

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

diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 3e4ab09c6d..1e6724fc92 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input js-quick-submit' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request
 
 :javascript

From f84d9e538962ef3fbb16b811a2fc1b78a3b9e2d7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 7 Apr 2016 08:08:51 -0700
Subject: [PATCH 074/283] Preserve white space

---
 app/assets/stylesheets/pages/diff.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 7a12aa9647..8c24650784 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -66,7 +66,9 @@
       }
 
       td {
-        white-space: nowrap;
+        span {
+          white-space: pre;
+        }
       }
     }
 

From a81fcf8bd677db5846ca67e8cb13731ee259e142 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 7 Apr 2016 09:06:46 -0700
Subject: [PATCH 075/283] Indentation update

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

diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 8c24650784..939555bb26 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -63,9 +63,7 @@
       .line_holder td {
         line-height: $code_line_height;
         font-size: $code_font_size;
-      }
 
-      td {
         span {
           white-space: pre;
         }

From 088368ae4d1c41b6e55a8c5e7e5439a9ea323eb2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 11:59:56 -0500
Subject: [PATCH 076/283] Add date.format.js

---
 vendor/assets/javascripts/date.format.js | 125 +++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 vendor/assets/javascripts/date.format.js

diff --git a/vendor/assets/javascripts/date.format.js b/vendor/assets/javascripts/date.format.js
new file mode 100644
index 0000000000..f5dc4abcd8
--- /dev/null
+++ b/vendor/assets/javascripts/date.format.js
@@ -0,0 +1,125 @@
+/*
+ * Date Format 1.2.3
+ * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
+ * MIT license
+ *
+ * Includes enhancements by Scott Trenda <scott.trenda.net>
+ * and Kris Kowal <cixar.com/~kris.kowal/>
+ *
+ * Accepts a date, a mask, or a date and a mask.
+ * Returns a formatted version of the given date.
+ * The date defaults to the current date/time.
+ * The mask defaults to dateFormat.masks.default.
+ */
+
+var dateFormat = function () {
+  var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
+    timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
+    timezoneClip = /[^-+\dA-Z]/g,
+    pad = function (val, len) {
+      val = String(val);
+      len = len || 2;
+      while (val.length < len) val = "0" + val;
+      return val;
+    };
+
+  // Regexes and supporting functions are cached through closure
+  return function (date, mask, utc) {
+    var dF = dateFormat;
+
+    // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+    if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
+      mask = date;
+      date = undefined;
+    }
+
+    // Passing date through Date applies Date.parse, if necessary
+    date = date ? new Date(date) : new Date;
+    if (isNaN(date)) throw SyntaxError("invalid date");
+
+    mask = String(dF.masks[mask] || mask || dF.masks["default"]);
+
+    // Allow setting the utc argument via the mask
+    if (mask.slice(0, 4) == "UTC:") {
+      mask = mask.slice(4);
+      utc = true;
+    }
+
+    var _ = utc ? "getUTC" : "get",
+      d = date[_ + "Date"](),
+      D = date[_ + "Day"](),
+      m = date[_ + "Month"](),
+      y = date[_ + "FullYear"](),
+      H = date[_ + "Hours"](),
+      M = date[_ + "Minutes"](),
+      s = date[_ + "Seconds"](),
+      L = date[_ + "Milliseconds"](),
+      o = utc ? 0 : date.getTimezoneOffset(),
+      flags = {
+        d:    d,
+        dd:   pad(d),
+        ddd:  dF.i18n.dayNames[D],
+        dddd: dF.i18n.dayNames[D + 7],
+        m:    m + 1,
+        mm:   pad(m + 1),
+        mmm:  dF.i18n.monthNames[m],
+        mmmm: dF.i18n.monthNames[m + 12],
+        yy:   String(y).slice(2),
+        yyyy: y,
+        h:    H % 12 || 12,
+        hh:   pad(H % 12 || 12),
+        H:    H,
+        HH:   pad(H),
+        M:    M,
+        MM:   pad(M),
+        s:    s,
+        ss:   pad(s),
+        l:    pad(L, 3),
+        L:    pad(L > 99 ? Math.round(L / 10) : L),
+        t:    H < 12 ? "a"  : "p",
+        tt:   H < 12 ? "am" : "pm",
+        T:    H < 12 ? "A"  : "P",
+        TT:   H < 12 ? "AM" : "PM",
+        Z:    utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
+        o:    (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
+        S:    ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
+      };
+
+    return mask.replace(token, function ($0) {
+      return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+    });
+  };
+}();
+
+// Some common format strings
+dateFormat.masks = {
+  "default":      "ddd mmm dd yyyy HH:MM:ss",
+  shortDate:      "m/d/yy",
+  mediumDate:     "mmm d, yyyy",
+  longDate:       "mmmm d, yyyy",
+  fullDate:       "dddd, mmmm d, yyyy",
+  shortTime:      "h:MM TT",
+  mediumTime:     "h:MM:ss TT",
+  longTime:       "h:MM:ss TT Z",
+  isoDate:        "yyyy-mm-dd",
+  isoTime:        "HH:MM:ss",
+  isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+  isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
+};
+
+// Internationalization strings
+dateFormat.i18n = {
+  dayNames: [
+    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+    "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+  ],
+  monthNames: [
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+    "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+  ]
+};
+
+// For convenience...
+Date.prototype.format = function (mask, utc) {
+  return dateFormat(this, mask, utc);
+};

From b19ccdeed45605a7bb79509092b297087d6c6e8c Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 12:00:19 -0500
Subject: [PATCH 077/283] Add datetime_utility.js.coffee

---
 .../javascripts/lib/datetime_utility.js.coffee    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 app/assets/javascripts/lib/datetime_utility.js.coffee

diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/datetime_utility.js.coffee
new file mode 100644
index 0000000000..ef9406fc33
--- /dev/null
+++ b/app/assets/javascripts/lib/datetime_utility.js.coffee
@@ -0,0 +1,15 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  w.gl.utils.formatDate = (datetime) ->
+    dateFormat(datetime, 'mmm d, yyyy h:MMtt Z')
+
+  w.gl.utils.updateFormatDate = ($timeagoEls) ->
+    $timeagoEls.each( ->
+          $el = $(@)
+          $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
+    )
+
+) window

From 3440c0e61f570e9f42a81fb125a021b138b5bebc Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 7 Apr 2016 12:02:43 -0500
Subject: [PATCH 078/283] Update datetime in .timeago elements

This should be done before .timeago() is called on the element
---
 app/assets/javascripts/application.js.coffee    |  5 ++++-
 .../javascripts/merge_request_tabs.js.coffee    | 12 +++++++++---
 app/assets/javascripts/notes.js.coffee          | 17 +++++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index f01c67e947..922a28b4ef 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -41,6 +41,7 @@
 #= require shortcuts_issuable
 #= require shortcuts_network
 #= require jquery.nicescroll
+#= require date.format
 #= require_tree .
 #= require fuzzaldrin-plus
 #= require cropper
@@ -163,7 +164,9 @@ $ ->
   $('.trigger-submit').on 'change', ->
     $(@).parents('form').submit()
 
-  $('abbr.timeago, .js-timeago').timeago()
+  $timeago = $('abbr.timeago, .js-timeago')
+  gl.utils.updateFormatDate($timeago)
+  $timeago.timeago()
 
   # Flash
   if (flash = $(".flash-container")).length > 0
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index 839e6ec2c0..fdf084a8a8 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -141,7 +141,9 @@ class @MergeRequestTabs
       url: "#{source}.json"
       success: (data) =>
         document.querySelector("div#commits").innerHTML = data.html
-        $('.js-timeago').timeago()
+        $timeago = $('.js-timeago', 'div#commits')
+        gl.utils.updateFormatDate($timeago)
+        $timeago.timeago()
         @commitsLoaded = true
         @scrollToElement("#commits")
 
@@ -152,7 +154,9 @@ class @MergeRequestTabs
       url: "#{source}.json" + @_location.search
       success: (data) =>
         document.querySelector("div#diffs").innerHTML = data.html
-        $('.js-timeago').timeago()
+        $timeago = $('.js-timeago', 'div#diffs')
+        gl.utils.updateFormatDate($timeago)
+        $timeago.timeago()
         $('div#diffs .js-syntax-highlight').syntaxHighlight()
         @expandViewContainer() if @diffViewType() is 'parallel'
         @diffsLoaded = true
@@ -165,7 +169,9 @@ class @MergeRequestTabs
       url: "#{source}.json"
       success: (data) =>
         document.querySelector("div#builds").innerHTML = data.html
-        $('.js-timeago').timeago()
+        $timeago = $('.js-timeago', 'div#builds')
+        gl.utils.updateFormatDate($timeago)
+        $timeago.timeago()
         @buildsLoaded = true
         @scrollToElement("#builds")
 
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 86e3b860fc..02e52040e3 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -163,9 +163,16 @@ class @Notes
     else if @isNewNote(note)
       @note_ids.push(note.id)
 
-      $('ul.main-notes-list')
+      $notesList = $('ul.main-notes-list')
+
+      $notesList
         .append(note.html)
         .syntaxHighlight()
+
+      # Update datetime format on the recent note
+      $timeago = $notesList.find("#note_#{note.id} .js-timeago")
+      gl.utils.updateFormatDate($timeago)
+
       @initTaskList()
       @updateNotesCount(1)
 
@@ -217,6 +224,8 @@ class @Notes
       # append new note to all matching discussions
       discussionContainer.append note_html
 
+    gl.utils.updateFormatDate($('.js-timeago', note_html))
+
     @updateNotesCount(1)
 
   ###
@@ -345,7 +354,11 @@ class @Notes
   updateNote: (_xhr, note, _status) =>
     # Convert returned HTML to a jQuery object so we can modify it further
     $html = $(note.html)
-    $('.js-timeago', $html).timeago()
+
+    $timeago = $('.js-timeago', $html)
+    gl.utils.updateFormatDate($timeago)
+    $timeago.timeago()
+
     $html.syntaxHighlight()
     $html.find('.js-task-list-container').taskList('enable')
 

From ee62ce65a1b80f3dae9c2cb5a52b784895fb8a9e Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 7 Apr 2016 14:07:13 -0300
Subject: [PATCH 079/283] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index c6febbd93d..d119a36e84 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.7.0 (unreleased)
   - Build status notifications
   - API: Expose user location (Robert Schilling)
   - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
+  - Update number of Todos in the sidebar when it's marked as "Done". !3600
 
 v 8.6.5 (unreleased)
   - Only update repository language if it is not set to improve performance

From 451314df964455577e08f653cc17d70fedf3f49b Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 7 Apr 2016 20:51:16 +0100
Subject: [PATCH 080/283] add test

---
 spec/features/merge_requests/edit_mr_spec.rb | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 spec/features/merge_requests/edit_mr_spec.rb

diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
new file mode 100644
index 0000000000..27f7bca2af
--- /dev/null
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+feature 'Create New Merge Request', feature: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :public) }
+  let(:merge_request) { create(:merge_request, :with_diffs, source_project: project) }
+
+  before do
+    project.team << [user, :master]
+
+    login_as user
+
+    visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
+  end
+
+  context 'editing a MR', js: true do
+    it 'should be able submit with quick_submit' do
+      fill_in "merge_request_title", with: "Orphaned MR test"
+
+      keypress = "var e = $.Event('keydown', { keyCode: 13, ctrlKey: true }); $('.merge-request-form').trigger(e);"
+      page.driver.execute_script(keypress)
+      sleep 2
+
+      expect(find('h2.title')).to have_text('Orphaned MR test')
+    end
+  end
+end
\ No newline at end of file

From 875646a85e6fb7ab783d99c9c9eac406983e502c Mon Sep 17 00:00:00 2001
From: Alex Mayer <amayer5125@gmail.com>
Date: Thu, 7 Apr 2016 20:10:29 +0000
Subject: [PATCH 081/283] Fix Incorrect Quote In Docker Executor Example

---
 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 210f9c3e84..d790015aca 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 /.dockerinit ]] && 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 422a9247587703ae149c1c716decc0fbb356afe2 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 7 Apr 2016 13:27:39 -0700
Subject: [PATCH 082/283] Fix side-by-side code format & commit message wrap

---
 app/assets/stylesheets/pages/commit.scss | 2 ++
 app/assets/stylesheets/pages/diff.scss   | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 082911bd11..358d2f4ab9 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -20,6 +20,8 @@
   margin: 0;
   padding: 0;
   margin-top: 10px;
+  word-break: normal;
+  white-space: pre-wrap;
 }
 
 .commit-info-row {
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 939555bb26..97f4485beb 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -109,6 +109,10 @@
         display: table-cell;
       }
     }
+
+    .text-file.diff-wrap-lines table .line_holder td span {
+      white-space: pre-wrap;
+    }
   }
   .image {
     background: #ddd;

From dc3de6e1327d3220951c357406bc877b76f00bdd Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Thu, 7 Apr 2016 20:33:01 +0000
Subject: [PATCH 083/283] Revert "Merge branch 'fix-sidebar-exapnd' into
 'master'"

This reverts merge request !3520
---
 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 1d49249dd8..c741c826ae 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -200,7 +200,7 @@
   top: 0;
   left: 0;
   font-size: 20px;
-  background: #fff;
+  background: transparent;
   height: 59px;
   text-align: center;
   line-height: 59px;

From 8d5ad4e3c9973ed34742b543cc3a5466c32b9d5b Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 7 Apr 2016 17:04:09 -0300
Subject: [PATCH 084/283] improve specs code syntax

---
 spec/helpers/issues_helper_spec.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index df0eb22d6f..543593cf38 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -80,7 +80,7 @@ describe IssuesHelper do
     end
   end
 
-  describe '#url_for_new_issue' do
+  describe 'url_for_new_issue' do
     let(:issues_url) { ext_project.external_issue_tracker.new_issue_url }
     let(:ext_expected) do
       issues_url.gsub(':project_id', ext_project.id.to_s)
@@ -117,7 +117,7 @@ describe IssuesHelper do
     end
   end
 
-  describe "#merge_requests_sentence" do
+  describe "merge_requests_sentence" do
     subject { merge_requests_sentence(merge_requests)}
     let(:merge_requests) do
       [ build(:merge_request, iid: 1), build(:merge_request, iid: 2),
@@ -127,7 +127,7 @@ describe IssuesHelper do
     it { is_expected.to eq("!1, !2, or !3") }
   end
 
-  describe "#note_active_class" do
+  describe "note_active_class" do
     before do
       @note = create :note
       @note1 = create :note
@@ -142,22 +142,22 @@ describe IssuesHelper do
     end
   end
 
-  describe "#awards_sort" do
+  describe "awards_sort" do
     it "sorts a hash so thumbsup and thumbsdown are always on top" do
       data = { "thumbsdown" => "some value", "lifter" => "some value", "thumbsup" => "some value" }
       expect(awards_sort(data).keys).to eq(["thumbsup", "thumbsdown", "lifter"])
     end
   end
 
-  describe "#milestone options" do
-    let!(:closed_milestone) { create :closed_milestone, title: "closed milestone", project: project }
-    let!(:milestone1)       { create :milestone, title: "open milestone 1", project: project }
-    let!(:milestone2)       { create :milestone, title: "open milestone 2", project: project }
-
-    before { issue.update_attributes(milestone_id: closed_milestone.id) }
-
+  describe "milestone_options" do
     it "gets closed milestone from current issue" do
+      closed_milestone = create(:closed_milestone, project: project)
+      milestone1       = create(:milestone, project: project)
+      milestone2       = create(:milestone, project: project)
+      issue.update_attributes(milestone_id: closed_milestone.id)
+
       options = milestone_options(issue)
+
       expect(options).to have_selector('option[selected]', text: closed_milestone.title)
       expect(options).to have_selector('option', text: milestone1.title)
       expect(options).to have_selector('option', text: milestone2.title)

From f2b7cd443566f6ceefcbecbd52c8484afe264402 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Thu, 7 Apr 2016 21:20:16 +0000
Subject: [PATCH 085/283] Revert "Merge branch 'new-navigation-prototype' into
 'master'"

This reverts merge request !3494
---
 app/assets/javascripts/sidebar.js.coffee      |   1 +
 .../stylesheets/framework/gitlab-theme.scss   |   6 +-
 app/assets/stylesheets/framework/header.scss  |   4 +-
 app/assets/stylesheets/framework/sidebar.scss | 123 +++++++-----------
 app/views/layouts/_collapse_button.html.haml  |   4 +
 app/views/layouts/_page.html.haml             |  18 +--
 app/views/layouts/nav/_admin.html.haml        |   2 +-
 app/views/layouts/nav/_dashboard.html.haml    |   5 +-
 app/views/layouts/nav/_group.html.haml        |  10 +-
 app/views/layouts/nav/_profile.html.haml      |   8 ++
 app/views/layouts/nav/_project.html.haml      |  17 ++-
 features/groups.feature                       |   4 +
 features/project/project.feature              |   9 ++
 features/steps/group/milestones.rb            |   4 +-
 features/steps/groups.rb                      |   4 +
 features/steps/project/active_tab.rb          |   4 +-
 features/steps/project/fork.rb                |   2 +-
 features/steps/project/project.rb             |  12 +-
 features/steps/shared/project_tab.rb          |   2 +-
 19 files changed, 130 insertions(+), 109 deletions(-)
 create mode 100644 app/views/layouts/_collapse_button.html.haml

diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee
index e177851124..860d4f438d 100644
--- a/app/assets/javascripts/sidebar.js.coffee
+++ b/app/assets/javascripts/sidebar.js.coffee
@@ -4,6 +4,7 @@ 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 ( ->
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index fa9038ebac..c83cf88159 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -33,15 +33,10 @@
       background: $color;
     }
 
-    .complex-sidebar .nav-primary {
-      border-right: 1px solid lighten($color, 3%);
-    }
-
     .sidebar-wrapper {
       background: $color-darker;
 
       .sidebar-user {
-        border-top: 1px solid lighten($color, 3%);
         background: $color-darker;
         color: $color-light;
 
@@ -67,6 +62,7 @@
 
         .count {
           color: $color-light;
+          background: $color-dark;
         }
       }
 
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 724980b220..b3397d1601 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -123,11 +123,11 @@ header {
 }
 
 @mixin collapsed-header {
-  margin-left: 40px;
+  margin-left: $sidebar_collapsed_width;
 }
 
 .header-collapsed {
-  margin-left: 40px;
+  margin-left: $sidebar_collapsed_width;
 
   @media (min-width: $screen-md-min) {
     @include collapsed-header;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index c741c826ae..18189e985c 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -144,7 +144,7 @@
     }
 
     a {
-      padding: 7px 12px;
+      padding: 7px 15px;
       font-size: $gl-font-size;
       line-height: 24px;
       color: $gray;
@@ -169,12 +169,10 @@
       }
 
       .count {
-        &:before {
-          content: '(';
-        }
-        &:after {
-          content: ')';
-        }
+        float: right;
+        background: #eee;
+        padding: 0 8px;
+        @include border-radius(6px);
       }
 
       &.back-link i {
@@ -193,27 +191,6 @@
   }
 }
 
-.expand-nav a {
-  color: $gl-icon-color;
-  width: 60px;
-  position: fixed;
-  top: 0;
-  left: 0;
-  font-size: 20px;
-  background: transparent;
-  height: 59px;
-  text-align: center;
-  line-height: 59px;
-  border-bottom: 1px solid #eee;
-  transition-duration: .3s;
-  outline: none;
-  z-index: 100;
-
-  &:hover {
-    text-decoration: none;
-  }
-}
-
 .collapse-nav a {
   width: $sidebar_width;
   position: fixed;
@@ -233,12 +210,55 @@
 }
 
 .page-sidebar-collapsed {
+  padding-left: $sidebar_collapsed_width;
+
   .sidebar-wrapper {
-    display: none;
+    width: $sidebar_collapsed_width;
+
+    .header-logo {
+      width: $sidebar_collapsed_width;
+
+      a {
+        padding-left: ($sidebar_collapsed_width - 36) / 2;
+
+        .gitlab-text-container {
+          display: none;
+        }
+      }
+    }
+
+    .nav-sidebar {
+      width: $sidebar_collapsed_width;
+
+      li {
+        width: auto;
+
+        a {
+          span {
+            display: none;
+          }
+        }
+      }
+    }
+
+    .collapse-nav a {
+      width: $sidebar_collapsed_width;
+    }
+
+    .sidebar-user {
+      padding-left: ($sidebar_collapsed_width - 36) / 2;
+      width: $sidebar_collapsed_width;
+
+      .username {
+        display: none;
+      }
+    }
   }
 }
 
 .page-sidebar-expanded {
+  padding-left: $sidebar_collapsed_width;
+
   @media (min-width: $screen-md-min) {
     padding-left: $sidebar_width;
   }
@@ -289,48 +309,3 @@
     padding-right: $sidebar_collapsed_width;
   }
 }
-
-.complex-sidebar {
-  display: inline-block;
-
-  .nav-primary {
-    width: 61px;
-    float: left;
-    height: 100vh;
-
-    .nav-sidebar {
-      width: 60px;
-
-      li a {
-        width: 60px;
-
-        span {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .nav-secondary {
-    $nav-secondary-width: 168px;
-
-    float: left;
-    width: $nav-secondary-width;
-
-    .nav-sidebar {
-      width: $nav-secondary-width;
-
-      li {
-        width: $nav-secondary-width;
-
-        a {
-          width: $nav-secondary-width;
-
-          i {
-            display: none;
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/views/layouts/_collapse_button.html.haml b/app/views/layouts/_collapse_button.html.haml
new file mode 100644
index 0000000000..2ed51d87ca
--- /dev/null
+++ b/app/views/layouts/_collapse_button.html.haml
@@ -0,0 +1,4 @@
+- 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"
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 9be36273c7..c799e9c588 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,7 +1,5 @@
 .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
   = render "layouts/broadcast"
-  .expand-nav
-    = link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open sidebar"
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
     .header-logo
       %a#logo
@@ -10,19 +8,15 @@
         .gitlab-text-container
           %h3 GitLab
 
-    - primary_sidebar = current_user ? 'dashboard' : 'explore'
-
-    - if defined?(sidebar) && sidebar && sidebar != primary_sidebar
-      .complex-sidebar
-        .nav-primary
-          = render "layouts/nav/#{primary_sidebar}"
-        .nav-secondary
-          = render "layouts/nav/#{sidebar}"
+    - if defined?(sidebar) && sidebar
+      = render "layouts/nav/#{sidebar}"
+    - elsif current_user
+      = render 'layouts/nav/dashboard'
     - else
-      = render "layouts/nav/#{primary_sidebar}"
+      = render 'layouts/nav/explore'
 
     .collapse-nav
-      = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Hide sidebar"
+      = 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'
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 22d1d4d859..280a1b9372 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -95,7 +95,7 @@
           Spam Logs
           %span.count= number_with_delimiter(SpamLog.count(:all))
 
-  = nav_link(controller: :application_settings) do
+  = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to admin_application_settings_path, title: 'Settings' do
       = icon('cogs fw')
       %span
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index f1052eadf8..5cef652da1 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(path: ['dashboard/groups#index', 'explore/groups#index']) do
+  = nav_link(controller: :groups) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
       %span
         Groups
-  = nav_link(path: 'dashboard#milestones') do
+  = nav_link(controller: :milestones) do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
       %span
@@ -48,6 +48,7 @@
       %span
         Help
 
+  %li.separate-item
   = nav_link(controller: :profile) do
     = link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
       = icon('user fw')
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 0b7de9633e..55940741dc 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,4 +1,12 @@
 %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
+
+  %li.separate-item
+
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: 'Home' do
       = icon('group fw')
@@ -34,7 +42,7 @@
       %span
         Members
   - if can?(current_user, :admin_group, @group)
-    = nav_link do
+    = nav_link(html_options: { class: "separate-item" }) do
       = link_to edit_group_path(@group), title: 'Settings' do
         = icon ('cogs fw')
         %span
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index cc119fd64e..3b9d31a6fc 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,4 +1,12 @@
 %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
+
+  %li.separate-item
+
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: 'Profile Settings' do
       = icon('user fw')
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index d0f82b5f57..86b46e8c75 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,4 +1,19 @@
 %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
+
   = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
     = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
       = icon('bookmark fw')
@@ -98,7 +113,7 @@
           Snippets
 
   - if project_nav_tab? :settings
-    = nav_link(html_options: {class: "#{project_tab_class}"}) do
+    = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
       = link_to edit_project_path(@project), title: 'Settings' do
         = icon('cogs fw')
         %span
diff --git a/features/groups.feature b/features/groups.feature
index 49e939807b..419a5d3963 100644
--- a/features/groups.feature
+++ b/features/groups.feature
@@ -7,6 +7,10 @@ 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/project/project.feature b/features/project/project.feature
index aa22401c88..f1f3ed2606 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -18,6 +18,15 @@ 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/group/milestones.rb b/features/steps/group/milestones.rb
index b6ce5bc9ce..a167d25983 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -5,9 +5,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   include SharedUser
 
   step 'I click on group milestones' do
-    page.within '.nav-secondary' do
-      click_link("Milestones")
-    end
+    click_link 'Milestones'
   end
 
   step 'I should see group milestones index page has no milestones' do
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index 483370f41c..e5b7db4c5e 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -4,6 +4,10 @@ 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
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 4584fc4d75..19d81453d8 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -82,9 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   # Sub Tabs: Issues
 
   step 'I click the "Milestones" tab' do
-    page.within '.nav-secondary' do
-      click_link('Milestones')
-    end
+    click_link('Milestones')
   end
 
   step 'I click the "Labels" tab' do
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index d9b16afa9b..527f7853da 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 '.nav-secondary' do
+    page.within '.page-sidebar-expanded' do
       click_link "Merge Requests"
     end
   end
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index 8f1d4a223a..ef185861e0 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -114,9 +114,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   end
 
   step 'I should not see "Snippets" button' do
-    page.within '.nav-secondary' do
-      expect(page).not_to have_link 'Snippets'
-    end
+    expect(page).not_to have_link 'Snippets'
   end
 
   step 'project "Shop" belongs to group' do
@@ -125,6 +123,14 @@ 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/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index fa7d24ce61..4fc2ece79f 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -41,7 +41,7 @@ module SharedProjectTab
   end
 
   step 'the active main tab should be Settings' do
-    page.within '.nav-secondary' do
+    page.within '.nav-sidebar' do
       expect(page).to have_content('Go to project')
     end
   end

From ff1903b77a202d0ebb68d6c045547b946e895300 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 7 Apr 2016 17:25:19 -0400
Subject: [PATCH 086/283] Remove changelog entry for new navigation sidebar.

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 151875249d..d85741dcb8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,7 +26,6 @@ v 8.7.0 (unreleased)
   - Fix creation of merge requests for orphaned branches (Stan Hu)
   - Fall back to `In-Reply-To` and `References` headers when sub-addressing is not available (David Padilla)
   - Remove "Congratulations!" tweet button on newly-created project. (Connor Shea)
-  - Improved UX of the navigation sidebar
   - Fix admin/projects when using visibility levels on search (PotHix)
   - Build status notifications
   - API: Expose user location (Robert Schilling)

From 1d2429af9b0fd4ef1427c7676a50dae4e2cf0ff9 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Thu, 7 Apr 2016 16:45:33 -0500
Subject: [PATCH 087/283] Add missing proper nil and error handling to SAML
 login process.

---
 .../omniauth_callbacks_controller.rb          | 26 ++++++++++++-------
 lib/gitlab/saml/user.rb                       | 22 ++++++++++------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index d28e96c3f1..df98f56a1c 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -60,6 +60,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
       continue_login_process
     end
+  rescue Gitlab::OAuth::SignupDisabledError
+    handle_signup_error
   end
 
   def omniauth_error
@@ -92,16 +94,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       continue_login_process
     end
   rescue Gitlab::OAuth::SignupDisabledError
-    label = Gitlab::OAuth::Provider.label_for(oauth['provider'])
-    message = "Signing in using your #{label} account without a pre-existing GitLab account is not allowed."
-
-    if current_application_settings.signup_enabled?
-      message << " Create a GitLab account first, and then connect it to your #{label} account."
-    end
-
-    flash[:notice] = message
-
-    redirect_to new_user_session_path
+    handle_signup_error
   end
 
   def handle_service_ticket provider, ticket
@@ -122,6 +115,19 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     end
   end
 
+  def handle_signup_error
+    label = Gitlab::OAuth::Provider.label_for(oauth['provider'])
+    message = "Signing in using your #{label} account without a pre-existing GitLab account is not allowed."
+
+    if current_application_settings.signup_enabled?
+      message << " Create a GitLab account first, and then connect it to your #{label} account."
+    end
+
+    flash[:notice] = message
+
+    redirect_to new_user_session_path
+  end
+
   def oauth
     @oauth ||= request.env['omniauth.auth']
   end
diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb
index c1072452ab..dd77216be4 100644
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -26,13 +26,15 @@ module Gitlab
           @user ||= build_new_user
         end
 
-        if external_users_enabled?
-          # Check if there is overlap between the user's groups and the external groups
-          # setting then set user as external or internal.
-          if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
-            @user.external = false
-          else
-            @user.external = true
+        unless @user.nil?
+          if external_users_enabled?
+            # Check if there is overlap between the user's groups and the external groups
+            # setting then set user as external or internal.
+            if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
+              @user.external = false
+            else
+              @user.external = true
+            end
           end
         end
 
@@ -48,7 +50,11 @@ module Gitlab
       end
 
       def changed?
-        gl_user.changed? || gl_user.identities.any?(&:changed?)
+        if gl_user
+          gl_user.changed? || gl_user.identities.any?(&:changed?)
+        else
+          true
+        end
       end
 
       protected

From 17fe62e3a39cd0043e5755d24948348739fb5595 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 7 Apr 2016 17:45:22 -0400
Subject: [PATCH 088/283] Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7

[ci skip]
---
 CHANGELOG | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 151875249d..7e59362073 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,9 +33,14 @@ v 8.7.0 (unreleased)
   - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
 
-v 8.6.5 (unreleased)
-  - Only update repository language if it is not set to improve performance
-  - Check permissions when user attempts to import members from another project
+v 8.6.5
+  - Fix importing from GitHub Enterprise. !3529
+  - Perform the language detection after updating merge requests in `GitPushService`, leading to faster visual feedback for the end-user. !3533
+  - Check permissions when user attempts to import members from another project. !3535
+  - Only update repository language if it is not set to improve performance. !3556
+  - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu). !3583
+  - Unblock user when active_directory is disabled and it can be found !3550
+  - Fix a 2FA authentication spoofing vulnerability.
 
 v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
@@ -155,6 +160,9 @@ v 8.6.0
   - Trigger a todo for mentions on commits page
   - Let project owners and admins soft delete issues and merge requests
 
+v 8.5.10
+  - Fix a 2FA authentication spoofing vulnerability.
+
 v 8.5.9
   - Don't attempt to fetch any tags from a forked repo (Stan Hu).
 
@@ -299,6 +307,9 @@ v 8.5.0
   - Show label row when filtering issues or merge requests by label (Nuttanart Pornprasitsakul)
   - Add Todos
 
+v 8.4.8
+  - Fix a 2FA authentication spoofing vulnerability.
+
 v 8.4.7
   - Don't attempt to fetch any tags from a forked repo (Stan Hu).
 
@@ -418,6 +429,9 @@ v 8.4.0
   - Add IP check against DNSBLs at account sign-up
   - Added cache:key to .gitlab-ci.yml allowing to fine tune the caching
 
+v 8.3.7
+  - Fix a 2FA authentication spoofing vulnerability.
+
 v 8.3.6
   - Don't attempt to fetch any tags from a forked repo (Stan Hu).
 

From b59d4e861c5e7e9d9113afbadeef6528be321a79 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 31 Mar 2016 10:56:22 -0500
Subject: [PATCH 089/283] Change reply button to text field

---
 app/assets/stylesheets/pages/note_form.scss | 18 ++++++++++++++++--
 app/helpers/notes_helper.rb                 |  8 +++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index a909776b43..9aec2c60e1 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -5,6 +5,11 @@
   @extend .btn-primary;
   margin: 10px $gl-padding;
 }
+
+.comment-btn {
+  @extend .btn-create;
+}
+
 .diff-file .diff-content {
   tr.line_holder:hover > td .line_note_link {
     opacity: 1.0;
@@ -118,8 +123,8 @@
   }
 
   .discussion-reply-holder {
-    background: $background-color;
-    border-top: 1px solid $border-color;
+    background-color: $white-light;
+    padding: 10px 16px;
   }
 }
 
@@ -183,3 +188,12 @@
     float: left;
   }
 }
+
+.note-reply-field {
+  background-color: $background-color;
+
+  &:focus {
+    box-shadow: none;
+    border-color: $border-color;
+  }
+}
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 698f90cb27..3363001fcd 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,10 +69,8 @@ module NotesHelper
       line_type:     line_type
     }
 
-    button_tag class: 'btn btn-nr reply-btn js-discussion-reply-button',
-               data: data, title: 'Add a reply' do
-      link_text = icon('comment')
-      link_text << ' Reply'
-    end
+    text_field_tag 'reply-field', nil, placeholder: 'Reply...',
+                    class: 'form-control note-reply-field js-discussion-reply-button',
+                    data: data
   end
 end

From c80c1da7802c372607f5a025ef2f3e25202734c3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 31 Mar 2016 12:13:25 -0500
Subject: [PATCH 090/283] Move diff colors to variables

---
 .../stylesheets/framework/variables.scss      | 12 +++++++++-
 .../highlight/solarized_light.scss            |  4 ++--
 app/assets/stylesheets/highlight/white.scss   | 22 +++++++++----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 8d3ad934a5..9f23142965 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -108,6 +108,8 @@ $red-light: #e52c5a;
 $red-normal: #d22852;
 $red-dark: darken($red-normal, 5%);
 
+$black-transparent: rgba(0, 0, 0, 0.3);
+
 $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
 $border-white-dark: #c6cacf;
@@ -158,7 +160,15 @@ $gl-btn-active-gradient: inset 0 0 4px $gl-btn-active-background;
  */
 $added: #63c363;
 $deleted: #f77;
-
+$line-added: #ebfdf0;
+$line-added-dark: #a6f3a6;
+$line-removed: #ffecec;
+$line-removed-dark: #f8cbcb;
+$line-number-old: #fdd;
+$line-number-old-border: #f1c0c0;
+$line-number-new: #dbffdb;
+$line-number-new-border: #c1e9c1;
+$match-line: #fafafa;
 /*
  * Fonts
  */
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index b90c95c62d..c482a1258f 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -6,7 +6,7 @@
   }
 
   .diff-line-num, .diff-line-num a {
-    color: rgba(0, 0, 0, 0.3);
+    color: $black-transparent;
   }
 
   // Code itself
@@ -30,7 +30,7 @@
     }
 
     .line_content.match {
-      color: rgba(0, 0, 0, 0.3);
+      color: $black-transparent;
       background: rgba(255, 255, 255, 0.4);
     }
   }
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index 8c1b0cd84e..80918970a7 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -6,7 +6,7 @@
   }
 
   .diff-line-num, .diff-line-num a {
-    color: rgba(0, 0, 0, 0.3);
+    color: $black-transparent;
   }
 
   // Code itself
@@ -23,36 +23,36 @@
   .line_holder {
     .diff-line-num {
       &.old {
-        background: #fdd;
-        border-color: #f1c0c0;
+        background-color: $line-number-old;
+        border-color: $line-number-old-border;
       }
 
       &.new {
-        background: #dbffdb;
-        border-color: #c1e9c1;
+        background-color: $line-number-new;
+        border-color: $line-number-new-border;
       }
     }
 
     .line_content {
       &.old {
-        background: #ffecec;
+        background: $line-removed;
 
         span.idiff {
-          background-color: #f8cbcb;
+          background-color: $line-removed-dark;
         }
       }
 
       &.new {
-        background: #eaffea;
+        background-color: $line-added;
 
         span.idiff {
-          background-color: #a6f3a6;
+          background-color: $line-added-dark;
         }
       }
 
       &.match {
-        color: rgba(0, 0, 0, 0.3);
-        background: #fafafa;
+        color: $black-transparent;
+        background: $match-line;
       }
     }
   }

From de63de18d77624d49b6a9d150f2581be0ac55e00 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 31 Mar 2016 13:37:27 -0500
Subject: [PATCH 091/283] Update diff colors and icons

---
 app/assets/stylesheets/framework/variables.scss | 14 ++++++--------
 app/assets/stylesheets/highlight/white.scss     |  4 ++--
 app/assets/stylesheets/pages/notes.scss         | 15 +++++++++++++++
 app/helpers/notes_helper.rb                     |  3 ++-
 app/views/projects/diffs/_file.html.haml        |  2 +-
 app/views/projects/notes/_note.html.haml        |  4 ++--
 spec/features/notes_on_merge_requests_spec.rb   |  2 +-
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 9f23142965..49f62c8850 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -160,14 +160,12 @@ $gl-btn-active-gradient: inset 0 0 4px $gl-btn-active-background;
  */
 $added: #63c363;
 $deleted: #f77;
-$line-added: #ebfdf0;
-$line-added-dark: #a6f3a6;
-$line-removed: #ffecec;
-$line-removed-dark: #f8cbcb;
-$line-number-old: #fdd;
-$line-number-old-border: #f1c0c0;
-$line-number-new: #dbffdb;
-$line-number-new-border: #c1e9c1;
+$line-added: #ecfdf0;
+$line-added-dark: #c7f0d2;
+$line-removed: #fbe9eb;
+$line-removed-dark: #fac5cd;
+$line-number-old: #f9d7dc;
+$line-number-new: #ddfbe6;
 $match-line: #fafafa;
 /*
  * Fonts
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index 80918970a7..ea9bc98079 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -24,12 +24,12 @@
     .diff-line-num {
       &.old {
         background-color: $line-number-old;
-        border-color: $line-number-old-border;
+        border-color: $line-removed-dark;
       }
 
       &.new {
         background-color: $line-number-new;
-        border-color: $line-number-new-border;
+        border-color: $line-added-dark;
       }
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index aca86457c7..d9dc782018 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -212,6 +212,21 @@ ul.notes {
     top: 0;
     font-size: 16px;
   }
+
+  .js-note-delete {
+    &:hover {
+      @extend .cgray;
+      &.danger { @extend .cred; }
+    }
+  }
+
+  .js-note-edit {
+    i {
+      &:hover {
+        color: $gl-link-color;
+      }
+    }
+  }
 }
 
 .discussion-toggle-button {
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 3363001fcd..681df89836 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,7 +69,8 @@ module NotesHelper
       line_type:     line_type
     }
 
-    text_field_tag 'reply-field', nil, placeholder: 'Reply...',
+    text_field_tag 'reply-field', nil,
+                    placeholder: 'Reply...',
                     class: 'form-control note-reply-field js-discussion-reply-button',
                     data: data
   end
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 698ed02ea0..4d5461afeb 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -29,7 +29,7 @@
       .file-actions.hidden-xs
         - if blob_text_viewable?(blob)
           = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file" do
-            = icon('comments')
+            = icon('comment')
           \
 
         - if editable_diff?(diff_file)
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index a681d6dece..5c42423541 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -17,8 +17,8 @@
               %span.note-role
                 = access
             = link_to '#', title: 'Edit comment', class: 'note-action-button 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: 'note-action-button js-note-delete' 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
               = icon('trash-o')
       .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
         .note-text
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 70d0864783..9b2351c15d 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -210,7 +210,7 @@ describe 'Comments', feature: true do
           is_expected.to have_content('Another comment on line 10')
           is_expected.to have_css('.notes_holder')
           is_expected.to have_css('.notes_holder .note', count: 1)
-          is_expected.to have_button('Reply')
+          is_expected.to have_css('.note-reply-field')
         end
       end
     end

From 87b3c73ea560d6091a17e7b759864b90911f5f1c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 31 Mar 2016 16:34:21 -0500
Subject: [PATCH 092/283] Update diff_comments tests

---
 features/project/commits/diff_comments.feature | 6 +++---
 features/steps/shared/diff_note.rb             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature
index 2bde4c8a99..fdaa9e7a47 100644
--- a/features/project/commits/diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
@@ -57,9 +57,9 @@ Feature: Project Commits Diff Comments
     Then I should see two separate previews
 
   @javascript
-  Scenario: I have a reply button in discussions
+  Scenario: I have can reply in discussions
     Given I leave a diff comment like "Typo, please fix"
-    Then I should see a discussion reply button
+    Then I should see a discussion reply text field
 
   @javascript
   Scenario: I can preview with text
@@ -83,7 +83,7 @@ Feature: Project Commits Diff Comments
     Given I preview a diff comment text like "Should fix it :smile:"
     And I submit the diff comment
     Then I should not see the diff comment form
-    And I should see a discussion reply button
+    And I should see a discussion reply text field
 
   @javascript
   Scenario: I can add a comment on a side-by-side commit diff (left side)
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 32c3e99f45..05e5ee151a 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -153,9 +153,9 @@ module SharedDiffNote
     end
   end
 
-  step 'I should see a discussion reply button' do
+  step 'I should see a discussion reply text field' do
     page.within(diff_file_selector) do
-      expect(page).to have_button('Reply')
+      expect(page).to have_css('.note-reply-field')
     end
   end
 

From 3cfeb3755828871813cd12c771fa7efddf67edb5 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 1 Apr 2016 13:55:50 -0500
Subject: [PATCH 093/283] Merge conflict fixes

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

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index d9dc782018..93fcb81321 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -194,6 +194,21 @@ ul.notes {
   float: right;
   margin-left: 10px;
   color: $notes-action-color;
+
+  .js-note-delete {
+    &:hover {
+      @extend .cgray;
+      &.danger { @extend .cred; }
+    }
+  }
+
+  .js-note-edit {
+    i {
+      &:hover {
+        color: $gl-link-color;
+      }
+    }
+  }
 }
 
 .note-action-button,
@@ -212,21 +227,6 @@ ul.notes {
     top: 0;
     font-size: 16px;
   }
-
-  .js-note-delete {
-    &:hover {
-      @extend .cgray;
-      &.danger { @extend .cred; }
-    }
-  }
-
-  .js-note-edit {
-    i {
-      &:hover {
-        color: $gl-link-color;
-      }
-    }
-  }
 }
 
 .discussion-toggle-button {

From dab4ac54b691f1c832b1fe444859c3183a231411 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 1 Apr 2016 14:27:39 -0500
Subject: [PATCH 094/283] Diff design updates

---
 app/assets/stylesheets/framework/buttons.scss | 29 +++++++++++-
 app/assets/stylesheets/framework/files.scss   |  5 ++-
 .../stylesheets/framework/timeline.scss       |  4 --
 .../stylesheets/framework/variables.scss      | 18 +++++---
 app/assets/stylesheets/highlight/white.scss   |  4 +-
 app/assets/stylesheets/pages/diff.scss        |  8 ++++
 app/assets/stylesheets/pages/note_form.scss   |  6 ---
 app/assets/stylesheets/pages/notes.scss       | 44 ++++++++-----------
 app/helpers/blob_helper.rb                    |  6 +--
 app/helpers/commits_helper.rb                 |  2 +-
 app/helpers/notes_helper.rb                   |  8 ++--
 app/views/projects/diffs/_file.html.haml      | 10 ++---
 .../project/commits/diff_comments.feature     |  7 ++-
 features/steps/shared/diff_note.rb            |  4 +-
 spec/features/notes_on_merge_requests_spec.rb |  2 +-
 15 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 657c5f033c..e8c0172680 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -7,6 +7,7 @@
   &:focus,
   &:active {
     outline: none;
+    background-color: $btn-active-gray;
     @include box-shadow($gl-btn-active-background);
   }
 }
@@ -27,7 +28,8 @@
     color: $color;
   }
 
-  &:active {
+  &:active,
+  &.active {
     @include box-shadow ($gl-btn-active-background);
 
     background-color: $dark;
@@ -61,7 +63,7 @@
 }
 
 @mixin btn-white {
-  @include btn-color($white-light, $border-white-light, $white-normal, $border-white-normal, $white-dark, $border-white-dark, #313236);
+  @include btn-color($white-light, $border-color, $white-normal, $border-white-normal, $white-dark, $border-white-dark, $btn-white-active);
 }
 
 .btn {
@@ -218,3 +220,26 @@
     margin-right: 5px;
   }
 }
+
+.btn-text-field {
+  width: 100%;
+  text-align: left;
+  padding: 6px 16px;
+  border-color: $border-color;
+  color: $btn-placeholder-gray;
+  background-color: $background-color;
+
+  &:hover,
+  &:active,
+  &:focus {
+    cursor: text;
+    box-shadow: none;
+    border-color: $border-color;
+    color: $btn-placeholder-gray;
+    background-color: $background-color;
+  }
+}
+
+.btn-file-option {
+  background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
+}
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index b15f4e7bd5..a7958467a1 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -15,12 +15,13 @@
 
   .file-title {
     position: relative;
-    background: $background-color;
+    background-color: $background-color;
     border-bottom: 1px solid $border-color;
     margin: 0;
     text-align: left;
     padding: 10px $gl-padding;
     word-wrap: break-word;
+    border-radius: 3px 3px 0px 0px;
 
     .file-actions {
       float: right;
@@ -49,7 +50,7 @@
       }
     }
 
-    a {
+    a:not(.btn) {
       color: $gl-dark-link-color;
     }
 
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index aa244fe548..b91f2f6f89 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -14,10 +14,6 @@
       background: $row-hover;
     }
 
-    &:last-child {
-      border-bottom: none;
-    }
-
     .avatar {
       margin-right: 15px;
     }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 49f62c8850..185137a401 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -10,10 +10,10 @@ $gutter_inner_width: 258px;
 /*
  * UI elements
  */
-$border-color:       #efeff1;
+$border-color:       #e5e5e5;
 $focus-border-color: #3aabf0;
 $table-border-color: #eef0f2;
-$background-color:   #faf9f9;
+$background-color:   #fafafa;
 
 /*
  * Text
@@ -81,7 +81,7 @@ $provider-btn-not-active-color: #4688f1;
 
 $white-light: #fff;
 $white-normal: #ededed;
-$white-dark: #ededed;
+$white-dark: #ECECEC;
 
 $gray-light: #faf9f9;
 $gray-normal: #f5f5f5;
@@ -152,8 +152,8 @@ $gl-success: $green-normal;
 $gl-info: $blue-normal;
 $gl-warning: $orange-normal;
 $gl-danger: $red-normal;
-$gl-btn-active-background: rgba(0, 0, 0, 0.12);
-$gl-btn-active-gradient: inset 0 0 4px $gl-btn-active-background;
+$gl-btn-active-background: rgba(0, 0, 0, 0.16);
+$gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background;
 
 /*
  * Commit Diff Colors
@@ -167,6 +167,7 @@ $line-removed-dark: #fac5cd;
 $line-number-old: #f9d7dc;
 $line-number-new: #ddfbe6;
 $match-line: #fafafa;
+$table-border-gray: #f0f0f0;
 /*
  * Fonts
  */
@@ -199,6 +200,13 @@ $dropdown-toggle-hover-border-color: darken($dropdown-toggle-border-color, 15%);
 $dropdown-toggle-icon-color: #c4c4c4;
 $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
 
+/*
+* Buttons
+*/
+$btn-active-gray: #ECECEC;
+$btn-placeholder-gray: #C7C7C7;
+$btn-white-active: #848484;
+
 /*
  *  Award emoji
  */
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index ea9bc98079..d68a28bbfd 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -6,12 +6,12 @@
   }
 
   .diff-line-num, .diff-line-num a {
-    color: $black-transparent;
+    color: #8f8f8f;
   }
 
   // Code itself
   pre.code, .diff-line-num {
-    border-color: $border-color;
+    border-color: $table-border-gray;
   }
 
   &, pre.code, .line_holder .line_content {
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 97f4485beb..5a99fffb54 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -2,6 +2,7 @@
 .diff-file {
   border: 1px solid $border-color;
   margin-bottom: $gl-padding;
+  border-radius: 3px;
 
   .diff-header {
     position: relative;
@@ -31,6 +32,7 @@
     overflow-y: hidden;
     background: #fff;
     color: #333;
+    border-radius: 0 0 3px 3px;
 
     .unfold {
       cursor: pointer;
@@ -325,6 +327,12 @@
   float: right;
 }
 
+.diffs {
+  .content-block {
+    border-bottom: none;
+  }
+}
+
 // Mobile
 @media (max-width: 480px) {
   .diff-title {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 9aec2c60e1..a6427f1912 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -1,11 +1,6 @@
 /**
  * Note Form
  */
-.reply-btn {
-  @extend .btn-primary;
-  margin: 10px $gl-padding;
-}
-
 .comment-btn {
   @extend .btn-create;
 }
@@ -118,7 +113,6 @@
 .discussion-body,
 .diff-file {
   .notes .note {
-    border-color: #ddd;
     padding: 10px 15px;
   }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 93fcb81321..7295fe5112 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -58,6 +58,7 @@ ul.notes {
   .note {
     display: block;
     position: relative;
+    border-bottom: 1px solid $table-border-gray;
 
     &.is-editting {
       .note-header,
@@ -117,9 +118,6 @@ ul.notes {
       padding-bottom: 3px;
     }
 
-    &:last-child {
-      border-bottom: 1px solid $border-color;
-    }
   }
 }
 
@@ -137,14 +135,14 @@ 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 {
@@ -175,9 +173,6 @@ ul.notes {
     }
   }
 
-  .author_link {
-    font-weight: 600;
-  }
 }
 
 .note-headline-light,
@@ -194,21 +189,6 @@ ul.notes {
   float: right;
   margin-left: 10px;
   color: $notes-action-color;
-
-  .js-note-delete {
-    &:hover {
-      @extend .cgray;
-      &.danger { @extend .cred; }
-    }
-  }
-
-  .js-note-edit {
-    i {
-      &:hover {
-        color: $gl-link-color;
-      }
-    }
-  }
 }
 
 .note-action-button,
@@ -218,14 +198,26 @@ ul.notes {
   line-height: 24px;
 
   .fa {
+    color: $notes-action-color;
     position: relative;
     top: 1px;
     font-size: 17px;
   }
 
-  .fa-trash-o {
-    top: 0;
-    font-size: 16px;
+  &.js-note-delete {
+    i {
+      &:hover {
+        color: $gl-text-red;
+      }
+    }
+  }
+
+  &.js-note-edit {
+    i {
+      &:hover {
+        color: $gl-link-color;
+      }
+    }
   }
 }
 
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 820d69c230..9e59a295fc 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -27,9 +27,9 @@ module BlobHelper
                                      link_opts)
 
     if !on_top_of_branch?(project, ref)
-      button_tag "Edit", class: "btn btn-default disabled has-tooltip", title: "You can only edit files when you are on a branch", data: { container: 'body' }
+      button_tag "Edit", class: "btn disabled has-tooltip btn-file-option", title: "You can only edit files when you are on a branch", data: { container: 'body' }
     elsif can_edit_blob?(blob, project, ref)
-      link_to "Edit", edit_path, class: 'btn'
+      link_to "Edit", edit_path, class: 'btn btn-file-option'
     elsif can?(current_user, :fork_project, project)
       continue_params = {
         to:     edit_path,
@@ -38,7 +38,7 @@ module BlobHelper
       }
       fork_path = namespace_project_forks_path(project.namespace, project, namespace_key: current_user.namespace.id, continue: continue_params)
 
-      link_to "Edit", fork_path, class: 'btn', method: :post
+      link_to "Edit", fork_path, class: 'btn btn-file-option', method: :post
     end
   end
 
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index bde0799f3d..de50803688 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -197,7 +197,7 @@ module CommitsHelper
     link_to(
       namespace_project_blob_path(project.namespace, project,
                                   tree_join(commit_sha, diff.new_path)),
-      class: 'btn view-file js-view-file'
+      class: 'btn view-file js-view-file btn-file-option'
     ) do
       raw('View file @') + content_tag(:span, commit_sha[0..6],
                                        class: 'commit-short-id')
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 681df89836..d86954c105 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,9 +69,9 @@ module NotesHelper
       line_type:     line_type
     }
 
-    text_field_tag 'reply-field', nil,
-                    placeholder: 'Reply...',
-                    class: 'form-control note-reply-field js-discussion-reply-button',
-                    data: data
+    button_tag class: 'btn btn-text-field js-discussion-reply-button',
+               data: data, title: 'Add a reply' do
+      link_text = 'Reply...'
+    end
   end
 end
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 4d5461afeb..83a8d7ae9b 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -3,7 +3,7 @@
     - if diff_file.diff.submodule?
       %span
         = icon('archive fw')
-        %strong
+        %span
           = submodule_link(blob, @commit.id, project.repository)
     - else
       = blob_icon blob.mode, blob.name
@@ -11,13 +11,13 @@
       = 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)
-          %strong.filename.old
+          .filename.old
             = old_path
           &rarr;
-          %strong.filename.new
+          .filename.new
             = new_path
         - else
-          %strong
+          %span
             = diff_file.new_path
           - if diff_file.deleted_file
             deleted
@@ -28,7 +28,7 @@
 
       .file-actions.hidden-xs
         - if blob_text_viewable?(blob)
-          = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file" do
+          = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file" do
             = icon('comment')
           \
 
diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature
index fdaa9e7a47..1dda2ff8a6 100644
--- a/features/project/commits/diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
@@ -57,10 +57,9 @@ Feature: Project Commits Diff Comments
     Then I should see two separate previews
 
   @javascript
-  Scenario: I have can reply in discussions
+  Scenario: I have a reply button in discussions
     Given I leave a diff comment like "Typo, please fix"
-    Then I should see a discussion reply text field
-
+    Then I should see a discussion reply button
   @javascript
   Scenario: I can preview with text
     Given I open a diff comment form
@@ -83,7 +82,7 @@ Feature: Project Commits Diff Comments
     Given I preview a diff comment text like "Should fix it :smile:"
     And I submit the diff comment
     Then I should not see the diff comment form
-    And I should see a discussion reply text field
+    And I should see a discussion reply button
 
   @javascript
   Scenario: I can add a comment on a side-by-side commit diff (left side)
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 05e5ee151a..1448c3f44c 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -153,9 +153,9 @@ module SharedDiffNote
     end
   end
 
-  step 'I should see a discussion reply text field' do
+  step 'I should see a discussion reply button' do
     page.within(diff_file_selector) do
-      expect(page).to have_css('.note-reply-field')
+      expect(page).to have_button('Reply...')
     end
   end
 
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 9b2351c15d..5f855ccc70 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -210,7 +210,7 @@ describe 'Comments', feature: true do
           is_expected.to have_content('Another comment on line 10')
           is_expected.to have_css('.notes_holder')
           is_expected.to have_css('.notes_holder .note', count: 1)
-          is_expected.to have_css('.note-reply-field')
+          is_expected.to have_button('Reply...')
         end
       end
     end

From 04e798a5154b2b2a86288f51081da8495f96bee5 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 6 Apr 2016 15:00:11 -0700
Subject: [PATCH 095/283] Remove comment count & icon

---
 app/views/projects/notes/_diff_notes_with_reply.html.haml | 3 ---
 1 file changed, 3 deletions(-)

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 11f9859a90..39be072855 100644
--- a/app/views/projects/notes/_diff_notes_with_reply.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply.html.haml
@@ -3,9 +3,6 @@
 - if !defined?(line) || line == note.diff_line
   %tr.notes_holder
     %td.notes_line{ colspan: 2 }
-      %span.discussion-notes-count
-        %i.fa.fa-comment
-        = notes.count
     %td.notes_content
       %ul.notes{ data: { discussion_id: note.discussion_id } }
         = render notes

From 6ee2069768279a9f9e03ae20f10b906a807a5eb7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 6 Apr 2016 18:33:00 -0700
Subject: [PATCH 096/283] Fix lint errors

---
 app/assets/stylesheets/framework/files.scss     | 2 +-
 app/assets/stylesheets/framework/variables.scss | 6 +++---
 app/helpers/notes_helper.rb                     | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index a7958467a1..789df42fb6 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -21,7 +21,7 @@
     text-align: left;
     padding: 10px $gl-padding;
     word-wrap: break-word;
-    border-radius: 3px 3px 0px 0px;
+    border-radius: 3px 3px 0 0;
 
     .file-actions {
       float: right;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 185137a401..1ebbd9b0e5 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -81,7 +81,7 @@ $provider-btn-not-active-color: #4688f1;
 
 $white-light: #fff;
 $white-normal: #ededed;
-$white-dark: #ECECEC;
+$white-dark: #ececec;
 
 $gray-light: #faf9f9;
 $gray-normal: #f5f5f5;
@@ -203,8 +203,8 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
 /*
 * Buttons
 */
-$btn-active-gray: #ECECEC;
-$btn-placeholder-gray: #C7C7C7;
+$btn-active-gray: #ececec;
+$btn-placeholder-gray: #c7c7c7;
 $btn-white-active: #848484;
 
 /*
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index d86954c105..95072b5373 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -69,9 +69,7 @@ module NotesHelper
       line_type:     line_type
     }
 
-    button_tag class: 'btn btn-text-field js-discussion-reply-button',
-               data: data, title: 'Add a reply' do
-      link_text = 'Reply...'
-    end
+    button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
+                           data: data, title: 'Add a reply'
   end
 end

From d76878b96040c8ae4752600aceb30200fa0049a0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 7 Apr 2016 12:36:53 -0700
Subject: [PATCH 097/283] Diff touch ups

---
 app/assets/stylesheets/highlight/white.scss    | 2 +-
 app/assets/stylesheets/pages/diff.scss         | 5 +++++
 app/assets/stylesheets/pages/note_form.scss    | 9 ---------
 app/views/projects/diffs/_diffs.html.haml      | 2 +-
 features/project/commits/diff_comments.feature | 1 +
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index d68a28bbfd..28331f5975 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -6,7 +6,7 @@
   }
 
   .diff-line-num, .diff-line-num a {
-    color: #8f8f8f;
+    color: $black-transparent;
   }
 
   // Code itself
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 5a99fffb54..d0855f6691 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -11,6 +11,7 @@
     padding: 10px 16px;
     color: #555;
     z-index: 10;
+    border-radius: 3px 3px 0 0;
 
     .diff-title {
       font-family: $monospace_font;
@@ -333,6 +334,10 @@
   }
 }
 
+.files-changed {
+  border-bottom: none;
+}
+
 // Mobile
 @media (max-width: 480px) {
   .diff-title {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index a6427f1912..4d4d508396 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -182,12 +182,3 @@
     float: left;
   }
 }
-
-.note-reply-field {
-  background-color: $background-color;
-
-  &:focus {
-    box-shadow: none;
-    border-color: $border-color;
-  }
-}
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index 2e1a37aa06..eaab99973a 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -3,7 +3,7 @@
 
 - diff_files = safe_diff_files(diffs, diff_refs)
 
-.content-block.oneline-block
+.content-block.oneline-block.files-changed
   .inline-parallel-buttons
     .btn-group
       = inline_diff_btn
diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature
index 1dda2ff8a6..2bde4c8a99 100644
--- a/features/project/commits/diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
@@ -60,6 +60,7 @@ Feature: Project Commits Diff Comments
   Scenario: I have a reply button in discussions
     Given I leave a diff comment like "Typo, please fix"
     Then I should see a discussion reply button
+
   @javascript
   Scenario: I can preview with text
     Given I open a diff comment form

From e65bccfcc3956a13ffc04f0a72226afe97b6b69d Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 7 Apr 2016 15:32:54 -0700
Subject: [PATCH 098/283] Remove comment count & icon from side by side view

---
 .../notes/_diff_notes_with_reply_parallel.html.haml         | 6 ------
 1 file changed, 6 deletions(-)

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 bb761ed2f9..f8aa5e2fa7 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
@@ -4,9 +4,6 @@
 %tr.notes_holder
   - if note1
     %td.notes_line.old
-      %span.btn.disabled
-        %i.fa.fa-comment
-        = notes_left.count
     %td.notes_content.parallel.old
       %ul.notes{ data: { discussion_id: note1.discussion_id } }
         = render notes_left
@@ -19,9 +16,6 @@
 
   - if note2
     %td.notes_line.new
-      %span.btn.disabled
-        %i.fa.fa-comment
-        = notes_right.count
     %td.notes_content.parallel.new
       %ul.notes{ data: { discussion_id: note2.discussion_id } }
         = render notes_right

From 400a1ae04d28388e7dfbd7c03db857d58a7d8776 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 7 Apr 2016 23:44:59 +0100
Subject: [PATCH 099/283] add some changes to the test

---
 spec/features/merge_requests/edit_mr_spec.rb | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
index 27f7bca2af..9e007ab763 100644
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Create New Merge Request', feature: true do
+feature 'Edit Merge Request', feature: true do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
   let(:merge_request) { create(:merge_request, :with_diffs, source_project: project) }
@@ -13,15 +13,9 @@ feature 'Create New Merge Request', feature: true do
     visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
   end
 
-  context 'editing a MR', js: true do
-    it 'should be able submit with quick_submit' do
-      fill_in "merge_request_title", with: "Orphaned MR test"
-
-      keypress = "var e = $.Event('keydown', { keyCode: 13, ctrlKey: true }); $('.merge-request-form').trigger(e);"
-      page.driver.execute_script(keypress)
-      sleep 2
-
-      expect(find('h2.title')).to have_text('Orphaned MR test')
+  context 'editing a MR' do
+    it 'form should have class js-quick-submit' do
+      expect(page).to have_selector('.js-quick-submit')
     end
   end
-end
\ No newline at end of file
+end

From fb2fde9d62a599f08c065c54de236eacb6558d60 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Fri, 8 Apr 2016 08:41:10 +0200
Subject: [PATCH 100/283] API: Expose subscribed? on issues

---
 CHANGELOG                 |  1 +
 doc/api/issues.md         | 17 +++++++++++------
 doc/api/merge_requests.md | 19 +++++++++++++------
 lib/api/entities.rb       |  8 ++++++++
 lib/api/issues.rb         | 10 +++++-----
 lib/api/merge_requests.rb | 14 +++++++-------
 lib/api/milestones.rb     |  2 +-
 7 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1d1e541e65..7d9cba320b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.7.0 (unreleased)
   - Allow back dating on issues when created through the API
   - Fix Error 500 after renaming a project path (Stan Hu)
   - Fix avatar stretching by providing a cropping feature
+  - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
   - Allow SAML to handle external users based on user's information !3530
   - Add endpoints to archive or unarchive a project !3372
   - Add links to CI setup documentation from project settings and builds pages
diff --git a/doc/api/issues.md b/doc/api/issues.md
index cc6355d34e..1c635a6cdc 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -76,8 +76,9 @@ Example response:
       "title" : "Consequatur vero maxime deserunt laboriosam est voluptas dolorem.",
       "created_at" : "2016-01-04T15:31:51.081Z",
       "iid" : 6,
-      "labels" : []
-   },
+      "labels" : [],
+      "subscribed" : false
+   }
 ]
 ```
 
@@ -152,7 +153,8 @@ Example response:
       "id" : 41,
       "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"
+      "created_at" : "2016-01-04T15:31:46.176Z",
+      "subscribed" : false
    }
 ]
 ```
@@ -213,7 +215,8 @@ Example response:
    "id" : 41,
    "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"
+   "created_at" : "2016-01-04T15:31:46.176Z",
+   "subscribed": false
 }
 ```
 
@@ -267,7 +270,8 @@ Example response:
    },
    "description" : null,
    "updated_at" : "2016-01-07T12:44:33.959Z",
-   "milestone" : null
+   "milestone" : null,
+   "subscribed" : true
 }
 ```
 
@@ -323,7 +327,8 @@ Example response:
    ],
    "id" : 85,
    "assignee" : null,
-   "milestone" : null
+   "milestone" : null,
+   "subscribed" : true
 }
 ```
 
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index b20a6300b7..20db73ea6c 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -66,7 +66,8 @@ Parameters:
       "due_date": null
     },
     "merge_when_build_succeeds": true,
-    "merge_status": "can_be_merged"
+    "merge_status": "can_be_merged",
+    "subscribed" : false
   }
 ]
 ```
@@ -128,7 +129,8 @@ Parameters:
     "due_date": null
   },
   "merge_when_build_succeeds": true,
-  "merge_status": "can_be_merged"
+  "merge_status": "can_be_merged",
+  "subscribed" : true
 }
 ```
 
@@ -227,6 +229,7 @@ Parameters:
   },
   "merge_when_build_succeeds": true,
   "merge_status": "can_be_merged",
+  "subscribed" : true,
   "changes": [
     {
     "old_path": "VERSION",
@@ -304,7 +307,8 @@ Parameters:
     "due_date": null
   },
   "merge_when_build_succeeds": true,
-  "merge_status": "can_be_merged"
+  "merge_status": "can_be_merged",
+  "subscribed" : true
 }
 ```
 
@@ -373,7 +377,8 @@ Parameters:
     "due_date": null
   },
   "merge_when_build_succeeds": true,
-  "merge_status": "can_be_merged"
+  "merge_status": "can_be_merged",
+  "subscribed" : true
 }
 ```
 
@@ -466,7 +471,8 @@ Parameters:
     "due_date": null
   },
   "merge_when_build_succeeds": true,
-  "merge_status": "can_be_merged"
+  "merge_status": "can_be_merged",
+  "subscribed" : true
 }
 ```
 
@@ -530,7 +536,8 @@ Parameters:
     "due_date": null
   },
   "merge_when_build_succeeds": true,
-  "merge_status": "can_be_merged"
+  "merge_status": "can_be_merged",
+  "subscribed" : true
 }
 ```
 
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 4c49442bf8..d76b46b883 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -170,6 +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
     end
 
     class MergeRequest < ProjectEntity
@@ -183,6 +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
     end
 
     class MergeRequestChanges < MergeRequest
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 1fee1dee1a..c4ea05ee6c 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -55,7 +55,7 @@ module API
         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)
-        present paginate(issues), with: Entities::Issue
+        present paginate(issues), with: Entities::Issue, current_user: current_user
       end
     end
 
@@ -92,7 +92,7 @@ module API
         end
 
         issues.reorder(issuable_order_by => issuable_sort)
-        present paginate(issues), with: Entities::Issue
+        present paginate(issues), with: Entities::Issue, current_user: current_user
       end
 
       # Get a single project issue
@@ -105,7 +105,7 @@ module API
       get ":id/issues/:issue_id" do
         @issue = user_project.issues.find(params[:issue_id])
         not_found! unless can?(current_user, :read_issue, @issue)
-        present @issue, with: Entities::Issue
+        present @issue, with: Entities::Issue, current_user: current_user
       end
 
       # Create a new project issue
@@ -149,7 +149,7 @@ module API
             issue.add_labels_by_names(params[:labels].split(','))
           end
 
-          present issue, with: Entities::Issue
+          present issue, with: Entities::Issue, current_user: current_user
         else
           render_validation_error!(issue)
         end
@@ -189,7 +189,7 @@ module API
             issue.add_labels_by_names(params[:labels].split(','))
           end
 
-          present issue, with: Entities::Issue
+          present issue, with: Entities::Issue, current_user: current_user
         else
           render_validation_error!(issue)
         end
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 93052fba06..4e7de8867b 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -56,7 +56,7 @@ module API
           end
 
         merge_requests = merge_requests.reorder(issuable_order_by => issuable_sort)
-        present paginate(merge_requests), with: Entities::MergeRequest
+        present paginate(merge_requests), with: Entities::MergeRequest, current_user: current_user
       end
 
       # Create MR
@@ -94,7 +94,7 @@ module API
             merge_request.add_labels_by_names(params[:labels].split(","))
           end
 
-          present merge_request, with: Entities::MergeRequest
+          present merge_request, with: Entities::MergeRequest, current_user: current_user
         else
           handle_merge_request_errors! merge_request.errors
         end
@@ -130,7 +130,7 @@ module API
 
           authorize! :read_merge_request, merge_request
 
-          present merge_request, with: Entities::MergeRequest
+          present merge_request, with: Entities::MergeRequest, current_user: current_user
         end
 
         # Show MR commits
@@ -162,7 +162,7 @@ module API
           merge_request = user_project.merge_requests.
             find(params[:merge_request_id])
           authorize! :read_merge_request, merge_request
-          present merge_request, with: Entities::MergeRequestChanges
+          present merge_request, with: Entities::MergeRequestChanges, current_user: current_user
         end
 
         # Update MR
@@ -204,7 +204,7 @@ module API
               merge_request.add_labels_by_names(params[:labels].split(","))
             end
 
-            present merge_request, with: Entities::MergeRequest
+            present merge_request, with: Entities::MergeRequest, current_user: current_user
           else
             handle_merge_request_errors! merge_request.errors
           end
@@ -246,7 +246,7 @@ module API
               execute(merge_request)
           end
 
-          present merge_request, with: Entities::MergeRequest
+          present merge_request, with: Entities::MergeRequest, current_user: current_user
         end
 
         # Cancel Merge if Merge When build succeeds is enabled
@@ -325,7 +325,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
+          present paginate(issues), with: Entities::Issue, current_user: current_user
         end
       end
     end
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb
index afb6ffa360..0f3f505fa0 100644
--- a/lib/api/milestones.rb
+++ b/lib/api/milestones.rb
@@ -103,7 +103,7 @@ module API
         authorize! :read_milestone, user_project
 
         @milestone = user_project.milestones.find(params[:milestone_id])
-        present paginate(@milestone.issues), with: Entities::Issue
+        present paginate(@milestone.issues), with: Entities::Issue, current_user: current_user
       end
 
     end

From aa7cddc4fcd490ccd192d7d04fb67b375705b586 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Fri, 8 Apr 2016 16:25:17 +0200
Subject: [PATCH 101/283] Use more accurate timestamps for InfluxDB.

This changes the timestamp of metrics to be more accurate/unique by
using Time#to_f combined with a small random jitter value. This
combination hopefully reduces the amount of collisions, though there's
no way to fully prevent any from occurring.

Fixes gitlab-com/operations#175
---
 lib/gitlab/metrics/metric.rb | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/metrics/metric.rb b/lib/gitlab/metrics/metric.rb
index 7ea9555cc8..1cd1ca30f7 100644
--- a/lib/gitlab/metrics/metric.rb
+++ b/lib/gitlab/metrics/metric.rb
@@ -2,6 +2,8 @@ module Gitlab
   module Metrics
     # Class for storing details of a single metric (label, value, etc).
     class Metric
+      JITTER_RANGE = 0.000001..0.001
+
       attr_reader :series, :values, :tags, :created_at
 
       # series - The name of the series (as a String) to store the metric in.
@@ -16,11 +18,29 @@ module Gitlab
 
       # Returns a Hash in a format that can be directly written to InfluxDB.
       def to_hash
+        # InfluxDB overwrites an existing point if a new point has the same
+        # series, tag set, and timestamp. In a highly concurrent environment
+        # this means that using the number of seconds since the Unix epoch is
+        # inevitably going to collide with another timestamp. For example, two
+        # Rails requests processed by different processes may end up generating
+        # metrics using the _exact_ same timestamp (in seconds).
+        #
+        # Due to the way InfluxDB is set up there's no solution to this problem,
+        # all we can do is lower the amount of collisions. We do this by using
+        # Time#to_f which returns the seconds as a Float providing greater
+        # accuracy. We then add a small random value that is large enough to
+        # distinguish most timestamps but small enough to not alter the amount
+        # of seconds.
+        #
+        # See https://gitlab.com/gitlab-com/operations/issues/175 for more
+        # information.
+        time = @created_at.to_f + rand(JITTER_RANGE)
+
         {
           series:    @series,
           tags:      @tags,
           values:    @values,
-          timestamp: @created_at.to_i * 1_000_000_000
+          timestamp: (time * 1_000_000_000).to_i
         }
       end
     end

From 6dacf0fd6d2627e05e50e0116566946e3b81bc5f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 8 Apr 2016 16:02:13 +0100
Subject: [PATCH 102/283] Fixed issue with member access not being visible on
 notes

Fixes #15049
---
 app/views/projects/notes/_note.html.haml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index a681d6dece..b4fa917718 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -10,12 +10,12 @@
           = "#{note.author.to_reference} commented"
           %a{ href: "##{dom_id(note)}" }
             = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
-        - if note_editable?(note)
-          .note-actions
-            - access = note.project.team.human_max_access(note.author.id)
-            - if access
-              %span.note-role
-                = access
+        .note-actions
+          - access = note.project.team.human_max_access(note.author.id)
+          - if access
+            %span.note-role
+              = access
+          - if note_editable?(note)
             = link_to '#', title: 'Edit comment', class: 'note-action-button 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: 'note-action-button js-note-delete' do

From c56f702ec3806606459e4edc3de097f1bb6baf4e Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Fri, 8 Apr 2016 17:54:52 +0200
Subject: [PATCH 103/283] Instrument Rails cache code

This allows us to track how much time of a transaction is spent in
dealing with cached data.
---
 config/initializers/metrics.rb                |  1 +
 lib/gitlab/metrics/subscribers/rails_cache.rb | 39 ++++++++++
 .../metrics/subscribers/rails_cache_spec.rb   | 71 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 lib/gitlab/metrics/subscribers/rails_cache.rb
 create mode 100644 spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 3e1deb8d30..a9fc38fb04 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -7,6 +7,7 @@ if Gitlab::Metrics.enabled?
   # ActiveSupport.
   require 'gitlab/metrics/subscribers/action_view'
   require 'gitlab/metrics/subscribers/active_record'
+  require 'gitlab/metrics/subscribers/rails_cache'
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Metrics::RackMiddleware)
diff --git a/lib/gitlab/metrics/subscribers/rails_cache.rb b/lib/gitlab/metrics/subscribers/rails_cache.rb
new file mode 100644
index 0000000000..49e5f86e6e
--- /dev/null
+++ b/lib/gitlab/metrics/subscribers/rails_cache.rb
@@ -0,0 +1,39 @@
+module Gitlab
+  module Metrics
+    module Subscribers
+      # Class for tracking the total time spent in Rails cache calls
+      class RailsCache < ActiveSupport::Subscriber
+        attach_to :active_support
+
+        def cache_read(event)
+          increment(:cache_read_duration, event.duration)
+        end
+
+        def cache_write(event)
+          increment(:cache_write_duration, event.duration)
+        end
+
+        def cache_delete(event)
+          increment(:cache_delete_duration, event.duration)
+        end
+
+        def cache_exist?(event)
+          increment(:cache_exists_duration, event.duration)
+        end
+
+        def increment(key, duration)
+          return unless current_transaction
+
+          current_transaction.increment(:cache_duration, duration)
+          current_transaction.increment(key, duration)
+        end
+
+        private
+
+        def current_transaction
+          Transaction.current
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb b/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
new file mode 100644
index 0000000000..e01b0b4bd2
--- /dev/null
+++ b/spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Gitlab::Metrics::Subscribers::RailsCache do
+  let(:transaction) { Gitlab::Metrics::Transaction.new }
+  let(:subscriber) { described_class.new }
+
+  let(:event) { double(:event, duration: 15.2) }
+
+  describe '#cache_read' do
+    it 'increments the cache_read duration' do
+      expect(subscriber).to receive(:increment).
+        with(:cache_read_duration, event.duration)
+
+      subscriber.cache_read(event)
+    end
+  end
+
+  describe '#cache_write' do
+    it 'increments the cache_write duration' do
+      expect(subscriber).to receive(:increment).
+        with(:cache_write_duration, event.duration)
+
+      subscriber.cache_write(event)
+    end
+  end
+
+  describe '#cache_delete' do
+    it 'increments the cache_delete duration' do
+      expect(subscriber).to receive(:increment).
+        with(:cache_delete_duration, event.duration)
+
+      subscriber.cache_delete(event)
+    end
+  end
+
+  describe '#cache_exist?' do
+    it 'increments the cache_exists duration' do
+      expect(subscriber).to receive(:increment).
+        with(:cache_exists_duration, event.duration)
+
+      subscriber.cache_exist?(event)
+    end
+  end
+
+  describe '#increment' do
+    context 'without a transaction' do
+      it 'returns' do
+        expect(transaction).not_to receive(:increment)
+
+        subscriber.increment(:foo, 15.2)
+      end
+    end
+
+    context 'with a transaction' do
+      before do
+        allow(subscriber).to receive(:current_transaction).
+          and_return(transaction)
+      end
+
+      it 'increments the total and specific cache duration' do
+        expect(transaction).to receive(:increment).
+          with(:cache_duration, event.duration)
+
+        expect(transaction).to receive(:increment).
+          with(:cache_delete_duration, event.duration)
+
+        subscriber.increment(:cache_delete_duration, event.duration)
+      end
+    end
+  end
+end

From f9014e4ec60a87608c65028dcf5fa411a6145b4e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 8 Apr 2016 09:46:32 -0700
Subject: [PATCH 104/283] Use meta key to open todo in new tab

---
 app/assets/javascripts/todos.js.coffee | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/todos.js.coffee b/app/assets/javascripts/todos.js.coffee
index ec2df6c5b7..886da72e26 100644
--- a/app/assets/javascripts/todos.js.coffee
+++ b/app/assets/javascripts/todos.js.coffee
@@ -57,5 +57,10 @@ class @Todos
     $('.todos-pending .badge, .todos-pending-count').text data.count
     $('.todos-done .badge').text data.done_count
 
-  goToTodoUrl: ->
-    Turbolinks.visit($(this).data('url'))
+  goToTodoUrl: (e)->
+    todoLink = $(this).data('url')
+    if e.metaKey
+      e.preventDefault()
+      window.open(todoLink,'_blank')
+    else
+      Turbolinks.visit(todoLink)

From 6a0f839941ae367cb542fd59685b8f394f59fe75 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Fri, 8 Apr 2016 13:32:17 -0600
Subject: [PATCH 105/283] Add a missing Oxford comma in some text on the
 Activity graph.

Resolves #14668. [ci skip]
---
 app/views/users/calendar.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml
index 7f29918dba..1de71f37d1 100644
--- a/app/views/users/calendar.html.haml
+++ b/app/views/users/calendar.html.haml
@@ -7,4 +7,4 @@
       '#{user_calendar_activities_path}'
     );
 
-.calendar-hint Summary of issues, merge requests and push events
+.calendar-hint Summary of issues, merge requests, and push events

From d11288be9580633baa3b21b4c70a5fc01e53d094 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 16:49:01 -0300
Subject: [PATCH 106/283] Use query instead of model on migrations

---
 db/migrate/20160328115649_migrate_new_notification_setting.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20160328115649_migrate_new_notification_setting.rb b/db/migrate/20160328115649_migrate_new_notification_setting.rb
index 6a68890f5b..0a11086902 100644
--- a/db/migrate/20160328115649_migrate_new_notification_setting.rb
+++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb
@@ -12,6 +12,6 @@ class MigrateNewNotificationSetting < ActiveRecord::Migration
   end
 
   def down
-    NotificationSetting.delete_all
+    execute "DELETE FROM notification_settings"
   end
 end

From 127119f2c4db9038a7f34d1cc73ae1ed19cf0b8d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 16:59:06 -0300
Subject: [PATCH 107/283] Simplify query to retrieve NotificationSetting on
 controllers

---
 app/controllers/groups/notification_settings_controller.rb   | 2 +-
 app/controllers/projects/notification_settings_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/groups/notification_settings_controller.rb b/app/controllers/groups/notification_settings_controller.rb
index 78e43c83ab..20405a0519 100644
--- a/app/controllers/groups/notification_settings_controller.rb
+++ b/app/controllers/groups/notification_settings_controller.rb
@@ -1,6 +1,6 @@
 class Groups::NotificationSettingsController < Groups::ApplicationController
   def update
-    notification_setting = group.notification_settings.where(user_id: current_user).find(params[:id])
+    notification_setting = group.notification_settings.find_by(user_id: current_user)
     saved = notification_setting.update_attributes(notification_setting_params)
 
     render json: { saved: saved }
diff --git a/app/controllers/projects/notification_settings_controller.rb b/app/controllers/projects/notification_settings_controller.rb
index 3ecf63d107..da9034380a 100644
--- a/app/controllers/projects/notification_settings_controller.rb
+++ b/app/controllers/projects/notification_settings_controller.rb
@@ -8,7 +8,7 @@ class Projects::NotificationSettingsController < Projects::ApplicationController
   end
 
   def update
-    notification_setting = project.notification_settings.where(user_id: current_user).find(params[:id])
+    notification_setting = project.notification_settings.find_by(user_id: current_user)
     saved = notification_setting.update_attributes(notification_setting_params)
 
     render json: { saved: saved }

From 069724cef5873b83720004772d1e874030cc9fff Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 17:11:13 -0300
Subject: [PATCH 108/283] Use singular resource for NotificationSetting

Since a user cannot have multiple NotificationSettings records for one
group/project we can use singular resource.
---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index fade07c050..552385110d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -406,7 +406,7 @@ Rails.application.routes.draw do
 
       resource :avatar, only: [:destroy]
       resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
-      resources :notification_settings, only: [:update]
+      resource :notification_setting, only: [:update]
     end
   end
 
@@ -608,7 +608,7 @@ Rails.application.routes.draw do
 
         resources :forks, only: [:index, :new, :create]
         resource :import, only: [:new, :create, :show]
-        resources :notification_settings, only: [:create, :update]
+        resource :notification_setting, only: [:create, :update]
 
         resources :refs, only: [] do
           collection do

From ee497599cc69b126cc2e4a929f1799d3d3eb989d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 17:24:27 -0300
Subject: [PATCH 109/283] Use default_value_for to set default
 NotificationSetting#level

---
 app/controllers/projects_controller.rb |  1 -
 app/models/notification_setting.rb     | 14 ++++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 41a4c41cf8..39f436f6f4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -106,7 +106,6 @@ class ProjectsController < Projects::ApplicationController
 
           if @membership
             @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
-            @notification_setting.set_defaults unless @notification_setting.persisted?
           end
         end
 
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 13a8995b03..d89194b5a1 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -1,4 +1,10 @@
 class NotificationSetting < ActiveRecord::Base
+  # Notification level
+  # Note: When adding an option, it MUST go on the end of the array.
+  enum level: [:disabled, :participating, :watch, :global, :mention]
+
+  default_value_for :level, NotificationSetting.levels[:global]
+
   belongs_to :user
   belongs_to :source, polymorphic: true
 
@@ -8,9 +14,6 @@ class NotificationSetting < ActiveRecord::Base
   validates :user_id, uniqueness: { scope: [:source_type, :source_id],
                                     message: "already exists in source",
                                     allow_nil: true }
-  # Notification level
-  # Note: When adding an option, it MUST go on the end of the array.
-  enum level: [:disabled, :participating, :watch, :global, :mention]
 
   scope :for_groups, -> { where(source_type: 'Namespace') }
   scope :for_projects, -> { where(source_type: 'Project') }
@@ -19,14 +22,9 @@ class NotificationSetting < ActiveRecord::Base
     setting = find_or_initialize_by(source: source)
 
     unless setting.persisted?
-      setting.set_defaults
       setting.save
     end
 
     setting
   end
-
-  def set_defaults
-    self.level = :global
-  end
 end

From 635b65d1206293d0b92322df18d458447ee73d5a Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 17:35:21 -0300
Subject: [PATCH 110/283] Add method to return the user notification setting
 for a group, or a project

---
 app/controllers/projects_controller.rb | 2 +-
 app/models/user.rb                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 39f436f6f4..3768efe142 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -105,7 +105,7 @@ class ProjectsController < Projects::ApplicationController
           @membership = @project.team.find_member(current_user.id)
 
           if @membership
-            @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
+            @notification_setting = current_user.notification_settings_for(@project)
           end
         end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index f68379fd05..031315debd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -831,6 +831,10 @@ class User < ActiveRecord::Base
     end
   end
 
+  def notification_settings_for(source)
+    notification_settings.find_or_initialize_by(source: source)
+  end
+
   private
 
   def projects_union

From e3d4ebdd543f17d91e5c67be2f30bb97c687b448 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 7 Apr 2016 16:40:51 +0200
Subject: [PATCH 111/283] Update gitlab-shell to 2.7.2

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

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 24ba9a38de..37c2961c24 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.7.0
+2.7.2

From 47c8b7f3037c3e464e34d6f978a27e591f09e687 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 17:44:55 -0300
Subject: [PATCH 112/283] Fix CHANGELOG

---
 CHANGELOG | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c072cada73..eae6cb9070 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,10 +25,6 @@ v 8.7.0 (unreleased)
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
   - Decouple membership and notifications
-
-v 8.6.2 (unreleased)
-  - Comments on confidential issues don't show up in activity feed to non-members
-  - Fix NoMethodError when visiting CI root path at `/ci`
   - Fix creation of merge requests for orphaned branches (Stan Hu)
   - Fall back to `In-Reply-To` and `References` headers when sub-addressing is not available (David Padilla)
   - Remove "Congratulations!" tweet button on newly-created project. (Connor Shea)

From 99067a505ca62dc069189118d7d4c4e91de83917 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Apr 2016 18:06:36 -0300
Subject: [PATCH 113/283] Fix schema.rb

---
 db/schema.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 4c7673511f..a66274dc5a 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: 20160331133914) do
+ActiveRecord::Schema.define(version: 20160331223143) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -799,9 +799,9 @@ ActiveRecord::Schema.define(version: 20160331133914) 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 3a196317abe1899b2b3c61fa97bed797c80456b9 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Thu, 7 Apr 2016 17:40:22 -0600
Subject: [PATCH 114/283] Add "sprite" parameter to emoji_icon helper

The emoji_icon helper used to display the award emoji in Issue and
Merge Request views. By default the spritesheet is used, but passing
`sprite: false` to the `emoji_icon` helper makes the emoji render as
separate images.

For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and
any that have been awarded to the issue/MR) the independent images are
used. Only when the full emoji menu is opened does the full spritesheet
load.

On a normal issue this change decreases the page load by 670KB or 250KB
depending on pixel density.

Resolves #14334.
---
 CHANGELOG                              |  1 +
 app/helpers/issues_helper.rb           | 33 +++++++++++++++++++-------
 app/views/votes/_votes_block.html.haml |  2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 54d79259b3..0997c15cfd 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.7.0 (unreleased)
+  - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
   - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
   - Improved Markdown rendering performance !3389 (Yorick Peterse)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 24b90fef4f..bcf8639c82 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -115,17 +115,32 @@ module IssuesHelper
     icon('eye-slash') if issue.confidential?
   end
 
-  def emoji_icon(name, unicode = nil, aliases = [])
+  def emoji_icon(name, unicode = nil, aliases = [], sprite: true)
     unicode ||= Emoji.emoji_filename(name) rescue ""
 
-    content_tag :div, "",
-      class: "icon emoji-icon emoji-#{unicode}",
-      title: name,
-      data: {
-        aliases: aliases.join(' '),
-        emoji: name,
-        unicode_name: unicode
-      }
+    data = {
+      aliases: aliases.join(" "),
+      emoji: name,
+      unicode_name: unicode
+    }
+
+    if sprite
+      # Emoji icons for the emoji menu, these use a spritesheet.
+      content_tag :div, "",
+        class: "icon emoji-icon emoji-#{unicode}",
+        title: name,
+        data: data
+    else 
+      # Emoji icons displayed separately, used for the awards already given
+      # to an issue or merge request.
+      content_tag :img, "",
+        class: "icon emoji",
+        title: name,
+        height: "20px",
+        width: "20px",
+        src: url_to_image("#{unicode}.png"),
+        data: data
+    end
   end
 
   def emoji_author_list(notes, current_user)
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index 8ffcdc4a32..49cfcd53d7 100644
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -1,7 +1,7 @@
 .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)), title: emoji_author_list(notes, current_user), data: {placement: "top"}}
-      = emoji_icon(emoji)
+      = emoji_icon(emoji, sprite: false)
       %span.award-control-text.js-counter
         = notes.count
 

From cedcc1453cbbd4a8ba43cf932b8765d891f19e0c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 9 Apr 2016 01:19:21 -0400
Subject: [PATCH 115/283] Minor Testing guide copyedits

[ci skip]
---
 doc/development/testing.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/development/testing.md b/doc/development/testing.md
index 23417845f1..672e3fb464 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -16,16 +16,18 @@ GitLab uses [factory_girl] as a test fixture replacement.
 - Factory definitions live in `spec/factories/`, named using the pluralization
   of their corresponding model (`User` factories are defined in `users.rb`).
 - There should be only one top-level factory definition per file.
-- Make use of [Traits] to clean up definitions and usages.
+- FactoryGirl methods are mixed in to all RSpec groups. This means you can (and
+  should) call `create(...)` instead of `FactoryGirl.create(...)`.
+- Make use of [traits] to clean up definitions and usages.
 - When defining a factory, don't define attributes that are not required for the
   resulting record to pass validation.
-- When instantiating from a factory, don't supply extraneous attributes that
-  aren't required by the test.
+- When instantiating from a factory, don't supply attributes that aren't
+  required by the test.
 - Factories don't have to be limited to `ActiveRecord` objects.
   [See example](https://gitlab.com/gitlab-org/gitlab-ce/commit/0b8cefd3b2385a21cfed779bd659978c0402766d).
 
 [factory_girl]: https://github.com/thoughtbot/factory_girl
-[Traits]: http://www.rubydoc.info/gems/factory_girl/file/GETTING_STARTED.md#Traits
+[traits]: http://www.rubydoc.info/gems/factory_girl/file/GETTING_STARTED.md#Traits
 
 ## JavaScript
 
@@ -40,9 +42,9 @@ the command line via `bundle exec teaspoon`, or via a web browser at
   `spec/javascripts/fixtures`. They should contain the bare minimum amount of
   markup necessary for the test.
 
-  > **Warning:** Keep in mind that a Rails view may change and
-  invalidate your test, but everything will still pass because your fixture
-  doesn't reflect the latest view.
+    > **Warning:** Keep in mind that a Rails view may change and
+    invalidate your test, but everything will still pass because your fixture
+    doesn't reflect the latest view.
 
 - Keep in mind that in a CI environment, these tests are run in a headless
   browser and you will not have access to certain APIs, such as
@@ -102,7 +104,7 @@ Here are some things to keep in mind regarding test performance:
 - Don't `create` an object when `build`, `build_stubbed`, `attributes_for`,
   `spy`, or `double` will do. Database persistence is slow!
 - Use `create(:empty_project)` instead of `create(:project)` when you don't need
-  the underlying repository. Filesystem operations are slow!
+  the underlying Git repository. Filesystem operations are slow!
 - Don't mark a feature as requiring JavaScript (through `@javascript` in
   Spinach or `js: true` in RSpec) unless it's _actually_ required for the test
   to be valid. Headless browser testing is slow!

From 1d1ca8b9c257f79ae75740cacad7d361635312b6 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Sat, 9 Apr 2016 13:29:37 +0100
Subject: [PATCH 116/283] fix emoji aliases not showing in autocomplete

---
 fixtures/emojis/digests.json | 2485 ++++++++++++++++++++++++++++++++++
 lib/tasks/gemojione.rake     |   15 +-
 2 files changed, 2498 insertions(+), 2 deletions(-)

diff --git a/fixtures/emojis/digests.json b/fixtures/emojis/digests.json
index 18d6e93e0f..41ca617847 100644
--- a/fixtures/emojis/digests.json
+++ b/fixtures/emojis/digests.json
@@ -64,21 +64,41 @@
     "unicode": "1F6EA",
     "digest": "fdddc2cd3618ec6661612581b8b93553cb086b0bb197e96aedf1bee8055e7bb4"
   },
+  {
+    "name": "northeast_pointing_airplane",
+    "unicode": "1F6EA",
+    "digest": "fdddc2cd3618ec6661612581b8b93553cb086b0bb197e96aedf1bee8055e7bb4"
+  },
   {
     "name": "airplane_small",
     "unicode": "1F6E9",
     "digest": "f98b44422d6bf505b50330805ecf68013d035341f0b6487c3c05ad913eb5abd3"
   },
+  {
+    "name": "small_airplane",
+    "unicode": "1F6E9",
+    "digest": "f98b44422d6bf505b50330805ecf68013d035341f0b6487c3c05ad913eb5abd3"
+  },
   {
     "name": "airplane_small_up",
     "unicode": "1F6E8",
     "digest": "029752b29a757c087dec60f45ea242e974fc181129e20390d5d4a2f90442091a"
   },
+  {
+    "name": "up_pointing_small_airplane",
+    "unicode": "1F6E8",
+    "digest": "029752b29a757c087dec60f45ea242e974fc181129e20390d5d4a2f90442091a"
+  },
   {
     "name": "airplane_up",
     "unicode": "1F6E7",
     "digest": "ec45d4dbfce1f75dc59339417b1dcf5f1e1359cd9d04ff233babf359a3330e77"
   },
+  {
+    "name": "up_pointing_airplane",
+    "unicode": "1F6E7",
+    "digest": "ec45d4dbfce1f75dc59339417b1dcf5f1e1359cd9d04ff233babf359a3330e77"
+  },
   {
     "name": "alarm_clock",
     "unicode": "23F0",
@@ -149,11 +169,21 @@
     "unicode": "1F5EE",
     "digest": "f2711991e8b386b2d5b12f296ce20a9b4b00ef91d6d67af2cf4e06abf2faa1dc"
   },
+  {
+    "name": "left_anger_bubble",
+    "unicode": "1F5EE",
+    "digest": "f2711991e8b386b2d5b12f296ce20a9b4b00ef91d6d67af2cf4e06abf2faa1dc"
+  },
   {
     "name": "anger_right",
     "unicode": "1F5EF",
     "digest": "24b572d64c519251a3ae8844e8d66fd6955752aff99aebe7dc20179505a466c4"
   },
+  {
+    "name": "right_anger_bubble",
+    "unicode": "1F5EF",
+    "digest": "24b572d64c519251a3ae8844e8d66fd6955752aff99aebe7dc20179505a466c4"
+  },
   {
     "name": "angry",
     "unicode": "1F620",
@@ -304,6 +334,11 @@
     "unicode": "002A-20E3",
     "digest": "0b7f27f545b616677c83d40ff957337477b2881459b4d3c839ae55e23797419f"
   },
+  {
+    "name": "keycap_asterisk",
+    "unicode": "002A-20E3",
+    "digest": "0b7f27f545b616677c83d40ff957337477b2881459b4d3c839ae55e23797419f"
+  },
   {
     "name": "astonished",
     "unicode": "1F632",
@@ -324,6 +359,11 @@
     "unicode": "269B",
     "digest": "cbce1725602efbb77a935cfae5407e4d75489ee988910296c7f6140665afc669"
   },
+  {
+    "name": "atom_symbol",
+    "unicode": "269B",
+    "digest": "cbce1725602efbb77a935cfae5407e4d75489ee988910296c7f6140665afc669"
+  },
   {
     "name": "b",
     "unicode": "1F171",
@@ -399,11 +439,21 @@
     "unicode": "1F5F3",
     "digest": "0455ea75612efe78354315b4c345953d2d559bb471d5b01c1adc1d6b74ed693a"
   },
+  {
+    "name": "ballot_box_with_ballot",
+    "unicode": "1F5F3",
+    "digest": "0455ea75612efe78354315b4c345953d2d559bb471d5b01c1adc1d6b74ed693a"
+  },
   {
     "name": "ballot_box_check",
     "unicode": "1F5F9",
     "digest": "fc3ba16c009d963a4a0ea20a348ac98eee3c4c18c481df19a5ada0d1de7fcc15"
   },
+  {
+    "name": "ballot_box_with_bold_check",
+    "unicode": "1F5F9",
+    "digest": "fc3ba16c009d963a4a0ea20a348ac98eee3c4c18c481df19a5ada0d1de7fcc15"
+  },
   {
     "name": "ballot_box_with_check",
     "unicode": "2611",
@@ -414,11 +464,21 @@
     "unicode": "1F5F5",
     "digest": "861dcfc2361298262587b5d0e163fed96a55c44636361f5b4a9ab1d6502b8928"
   },
+  {
+    "name": "ballot_box_with_script_x",
+    "unicode": "1F5F5",
+    "digest": "861dcfc2361298262587b5d0e163fed96a55c44636361f5b4a9ab1d6502b8928"
+  },
   {
     "name": "ballot_x",
     "unicode": "1F5F4",
     "digest": "0b73b89847eb82bcad5664644c8af237e0aef6c3d8c94b7a5df94e05d0ebf4e1"
   },
+  {
+    "name": "ballot_script_x",
+    "unicode": "1F5F4",
+    "digest": "0b73b89847eb82bcad5664644c8af237e0aef6c3d8c94b7a5df94e05d0ebf4e1"
+  },
   {
     "name": "bamboo",
     "unicode": "1F38D",
@@ -464,31 +524,61 @@
     "unicode": "26F9",
     "digest": "e94beb69f631667479a80095bf313ceb3aa109d6ebb80f182722360a6d2a214e"
   },
+  {
+    "name": "person_with_ball",
+    "unicode": "26F9",
+    "digest": "e94beb69f631667479a80095bf313ceb3aa109d6ebb80f182722360a6d2a214e"
+  },
   {
     "name": "basketball_player_tone1",
     "unicode": "26F9-1F3FB",
     "digest": "6fc77cf2f26ee18e9a3faea500d4277839f77633f31ee618a68c301f1ad32d90"
   },
+  {
+    "name": "person_with_ball_tone1",
+    "unicode": "26F9-1F3FB",
+    "digest": "6fc77cf2f26ee18e9a3faea500d4277839f77633f31ee618a68c301f1ad32d90"
+  },
   {
     "name": "basketball_player_tone2",
     "unicode": "26F9-1F3FC",
     "digest": "6ee9060c24d92708e12a854fb0bdf5c717c90b8c0350d8aa40c278b41bfa12fc"
   },
+  {
+    "name": "person_with_ball_tone2",
+    "unicode": "26F9-1F3FC",
+    "digest": "6ee9060c24d92708e12a854fb0bdf5c717c90b8c0350d8aa40c278b41bfa12fc"
+  },
   {
     "name": "basketball_player_tone3",
     "unicode": "26F9-1F3FD",
     "digest": "752e90dbfa7c7a9ae3f37de924e22f3c3d5a7e54dd41c8e8eb99cabb0dad73cf"
   },
+  {
+    "name": "person_with_ball_tone3",
+    "unicode": "26F9-1F3FD",
+    "digest": "752e90dbfa7c7a9ae3f37de924e22f3c3d5a7e54dd41c8e8eb99cabb0dad73cf"
+  },
   {
     "name": "basketball_player_tone4",
     "unicode": "26F9-1F3FE",
     "digest": "38bedc3074e6243454d568d9b665f5764f1a3d983875651ce7a1cdb53da9f6c8"
   },
+  {
+    "name": "person_with_ball_tone4",
+    "unicode": "26F9-1F3FE",
+    "digest": "38bedc3074e6243454d568d9b665f5764f1a3d983875651ce7a1cdb53da9f6c8"
+  },
   {
     "name": "basketball_player_tone5",
     "unicode": "26F9-1F3FF",
     "digest": "25ee1e84670d3db96d3ad098c859abd6b3448f55f668ce0c195ee2337a215de7"
   },
+  {
+    "name": "person_with_ball_tone5",
+    "unicode": "26F9-1F3FF",
+    "digest": "25ee1e84670d3db96d3ad098c859abd6b3448f55f668ce0c195ee2337a215de7"
+  },
   {
     "name": "bath",
     "unicode": "1F6C0",
@@ -534,11 +624,21 @@
     "unicode": "1F3D6",
     "digest": "52855d75cfa4476ccc23c58b4afcb76ee48abb22a9a6081210c8accefdf33099"
   },
+  {
+    "name": "beach_with_umbrella",
+    "unicode": "1F3D6",
+    "digest": "52855d75cfa4476ccc23c58b4afcb76ee48abb22a9a6081210c8accefdf33099"
+  },
   {
     "name": "beach_umbrella",
     "unicode": "26F1",
     "digest": "cefe8e195d21d3e0769d3bfe15170db9e57c86db9d31cacb19fcdc8d2191b661"
   },
+  {
+    "name": "umbrella_on_ground",
+    "unicode": "26F1",
+    "digest": "cefe8e195d21d3e0769d3bfe15170db9e57c86db9d31cacb19fcdc8d2191b661"
+  },
   {
     "name": "bear",
     "unicode": "1F43B",
@@ -584,6 +684,11 @@
     "unicode": "1F6CE",
     "digest": "c15455f1b52ac26404b5c13a0e1070212ed1830026422873f4f6335e26e31259"
   },
+  {
+    "name": "bellhop_bell",
+    "unicode": "1F6CE",
+    "digest": "c15455f1b52ac26404b5c13a0e1070212ed1830026422873f4f6335e26e31259"
+  },
   {
     "name": "bento",
     "unicode": "1F371",
@@ -634,6 +739,11 @@
     "unicode": "2623",
     "digest": "81f8309318051255ed4dc18855a3cd3f8657a6f3b2d368caa531a57ce0e34235"
   },
+  {
+    "name": "biohazard_sign",
+    "unicode": "2623",
+    "digest": "81f8309318051255ed4dc18855a3cd3f8657a6f3b2d368caa531a57ce0e34235"
+  },
   {
     "name": "bird",
     "unicode": "1F426",
@@ -769,6 +879,11 @@
     "unicode": "1F395",
     "digest": "1643ec51ff26fc1ac0c67859e202386398650bf2a996c82b68e1b73fa52abf7d"
   },
+  {
+    "name": "bouquet_of_flowers",
+    "unicode": "1F395",
+    "digest": "1643ec51ff26fc1ac0c67859e202386398650bf2a996c82b68e1b73fa52abf7d"
+  },
   {
     "name": "bow",
     "unicode": "1F647",
@@ -779,6 +894,11 @@
     "unicode": "1F3F9",
     "digest": "1c23469256331ea4ff03c036f89f0e63ad3228c51faecba50129da99b7eaddf3"
   },
+  {
+    "name": "archery",
+    "unicode": "1F3F9",
+    "digest": "1c23469256331ea4ff03c036f89f0e63ad3228c51faecba50129da99b7eaddf3"
+  },
   {
     "name": "bow_tone1",
     "unicode": "1F647-1F3FB",
@@ -924,6 +1044,11 @@
     "unicode": "1F56C",
     "digest": "92493636cf086205d1e12cc19e613b84152ef10b8cd0215619a0fc813bfc9a7c"
   },
+  {
+    "name": "bullhorn_with_sound_waves",
+    "unicode": "1F56C",
+    "digest": "92493636cf086205d1e12cc19e613b84152ef10b8cd0215619a0fc813bfc9a7c"
+  },
   {
     "name": "burrito",
     "unicode": "1F32F",
@@ -964,6 +1089,11 @@
     "unicode": "1F5A9",
     "digest": "01b47b5c69c12b65fa4f4c0d580f2a98280d6116f4ad2cf8be378759008bcc3c"
   },
+  {
+    "name": "pocket calculator",
+    "unicode": "1F5A9",
+    "digest": "01b47b5c69c12b65fa4f4c0d580f2a98280d6116f4ad2cf8be378759008bcc3c"
+  },
   {
     "name": "calendar",
     "unicode": "1F4C6",
@@ -974,6 +1104,11 @@
     "unicode": "1F5D3",
     "digest": "1dd5da98bb435c0c3f632bc0a5c9fdde694de7aee752bf4bb85def086e788a2a"
   },
+  {
+    "name": "spiral_calendar_pad",
+    "unicode": "1F5D3",
+    "digest": "1dd5da98bb435c0c3f632bc0a5c9fdde694de7aee752bf4bb85def086e788a2a"
+  },
   {
     "name": "calling",
     "unicode": "1F4F2",
@@ -1034,6 +1169,11 @@
     "unicode": "1F5C3",
     "digest": "7d760ae1d44e6f4b2aac00895ca86b5743f8b5ca157ec2bd21ce2665e50ad23a"
   },
+  {
+    "name": "card_file_box",
+    "unicode": "1F5C3",
+    "digest": "7d760ae1d44e6f4b2aac00895ca86b5743f8b5ca157ec2bd21ce2665e50ad23a"
+  },
   {
     "name": "card_index",
     "unicode": "1F4C7",
@@ -1049,6 +1189,11 @@
     "unicode": "1F5AD",
     "digest": "0b1625eea118060b51a70905c1eb3313ed632e989f70943eca16aa29fe8a34f2"
   },
+  {
+    "name": "tape_cartridge",
+    "unicode": "1F5AD",
+    "digest": "0b1625eea118060b51a70905c1eb3313ed632e989f70943eca16aa29fe8a34f2"
+  },
   {
     "name": "cat",
     "unicode": "1F431",
@@ -1079,6 +1224,11 @@
     "unicode": "1F37E",
     "digest": "77395d3afe5cc10bfdc381120bae2ae4aefdaa96c529536413873a696c5fa713"
   },
+  {
+    "name": "bottle_with_popping_cork",
+    "unicode": "1F37E",
+    "digest": "77395d3afe5cc10bfdc381120bae2ae4aefdaa96c529536413873a696c5fa713"
+  },
   {
     "name": "chart",
     "unicode": "1F4B9",
@@ -1104,6 +1254,11 @@
     "unicode": "1F9C0",
     "digest": "5897036ba97b557868bb314fcee83b9d8a609c8447b270a0b3d34a29ce7496d1"
   },
+  {
+    "name": "cheese_wedge",
+    "unicode": "1F9C0",
+    "digest": "5897036ba97b557868bb314fcee83b9d8a609c8447b270a0b3d34a29ce7496d1"
+  },
   {
     "name": "cherries",
     "unicode": "1F352",
@@ -1169,6 +1324,11 @@
     "unicode": "1F307",
     "digest": "c2530d12204eb518c5a3c8d7deba11170b1412fdf406aea05a69d4c026210d1b"
   },
+  {
+    "name": "city_sunrise",
+    "unicode": "1F307",
+    "digest": "c2530d12204eb518c5a3c8d7deba11170b1412fdf406aea05a69d4c026210d1b"
+  },
   {
     "name": "cityscape",
     "unicode": "1F3D9",
@@ -1229,6 +1389,11 @@
     "unicode": "1F570",
     "digest": "c48314ccde8bf01acc2b1bc9a6b5aa7d796fc0c8769f80398bc74545fcef31ed"
   },
+  {
+    "name": "mantlepiece_clock",
+    "unicode": "1F570",
+    "digest": "c48314ccde8bf01acc2b1bc9a6b5aa7d796fc0c8769f80398bc74545fcef31ed"
+  },
   {
     "name": "clock1",
     "unicode": "1F550",
@@ -1354,6 +1519,11 @@
     "unicode": "1F5D8",
     "digest": "67027b7e1a4d800a3ce7d731c21c098d1109d217159a27665eebb7e080fc2622"
   },
+  {
+    "name": "clockwise_right_and_left_semicircle_arrows",
+    "unicode": "1F5D8",
+    "digest": "67027b7e1a4d800a3ce7d731c21c098d1109d217159a27665eebb7e080fc2622"
+  },
   {
     "name": "closed_book",
     "unicode": "1F4D5",
@@ -1379,21 +1549,41 @@
     "unicode": "1F329",
     "digest": "fc9c85cc95f9c456635692c974f72b6d40e14943824b8129a21c47265c3416f4"
   },
+  {
+    "name": "cloud_with_lightning",
+    "unicode": "1F329",
+    "digest": "fc9c85cc95f9c456635692c974f72b6d40e14943824b8129a21c47265c3416f4"
+  },
   {
     "name": "cloud_rain",
     "unicode": "1F327",
     "digest": "f4406e62ed98f6141ab70736f6d5c540023e805396db0346ee6b7082c3f5e8e2"
   },
+  {
+    "name": "cloud_with_rain",
+    "unicode": "1F327",
+    "digest": "f4406e62ed98f6141ab70736f6d5c540023e805396db0346ee6b7082c3f5e8e2"
+  },
   {
     "name": "cloud_snow",
     "unicode": "1F328",
     "digest": "948990cd13dd927917208c026089519fcf8e258a8a284684ace67c9a2f9a8149"
   },
+  {
+    "name": "cloud_with_snow",
+    "unicode": "1F328",
+    "digest": "948990cd13dd927917208c026089519fcf8e258a8a284684ace67c9a2f9a8149"
+  },
   {
     "name": "cloud_tornado",
     "unicode": "1F32A",
     "digest": "44753516d0bd05d47cfa6eb922aba570ba6a87f805f325772b2cff071460ead1"
   },
+  {
+    "name": "cloud_with_tornado",
+    "unicode": "1F32A",
+    "digest": "44753516d0bd05d47cfa6eb922aba570ba6a87f805f325772b2cff071460ead1"
+  },
   {
     "name": "clubs",
     "unicode": "2663",
@@ -1439,6 +1629,11 @@
     "unicode": "1F5B3",
     "digest": "b27c30d74f205a8a3bd00a55ca17da7cf6ae3b65ae33e949755a4c6bd69a9fd3"
   },
+  {
+    "name": "old_personal_computer",
+    "unicode": "1F5B3",
+    "digest": "b27c30d74f205a8a3bd00a55ca17da7cf6ae3b65ae33e949755a4c6bd69a9fd3"
+  },
   {
     "name": "confetti_ball",
     "unicode": "1F38A",
@@ -1509,6 +1704,11 @@
     "unicode": "1F3D7",
     "digest": "0ff52e6adf1927d356b27be5fef6bad2ad842be05e3a0bd16a17efe78e5676d9"
   },
+  {
+    "name": "building_construction",
+    "unicode": "1F3D7",
+    "digest": "0ff52e6adf1927d356b27be5fef6bad2ad842be05e3a0bd16a17efe78e5676d9"
+  },
   {
     "name": "convenience_store",
     "unicode": "1F3EA",
@@ -1569,6 +1769,11 @@
     "unicode": "1F6CB",
     "digest": "a93fffed194b404200495abda8772bb35539cfc8499eb0a9bf09c508afad6676"
   },
+  {
+    "name": "couch_and_lamp",
+    "unicode": "1F6CB",
+    "digest": "a93fffed194b404200495abda8772bb35539cfc8499eb0a9bf09c508afad6676"
+  },
   {
     "name": "couple",
     "unicode": "1F46B",
@@ -1579,6 +1784,11 @@
     "unicode": "1F468-2764-1F468",
     "digest": "3ae6fbf3ba168256ea85c756ac1e7b83fdb8b780d33f06128ed80706ff627eea"
   },
+  {
+    "name": "couple_with_heart_mm",
+    "unicode": "1F468-2764-1F468",
+    "digest": "3ae6fbf3ba168256ea85c756ac1e7b83fdb8b780d33f06128ed80706ff627eea"
+  },
   {
     "name": "couple_with_heart",
     "unicode": "1F491",
@@ -1589,6 +1799,11 @@
     "unicode": "1F469-2764-1F469",
     "digest": "d2a2ec29c1a1234ea0aa1d9fc6707cf8be8bb36ea8b92523ffa1c3071bcf0b06"
   },
+  {
+    "name": "couple_with_heart_ww",
+    "unicode": "1F469-2764-1F469",
+    "digest": "d2a2ec29c1a1234ea0aa1d9fc6707cf8be8bb36ea8b92523ffa1c3071bcf0b06"
+  },
   {
     "name": "couplekiss",
     "unicode": "1F48F",
@@ -1614,6 +1829,11 @@
     "unicode": "1F58D",
     "digest": "0f3351c2e68a8d47d27b45a9901be6160de0f9a291bd8680df84d0fc679bcb31"
   },
+  {
+    "name": "lower_left_crayon",
+    "unicode": "1F58D",
+    "digest": "0f3351c2e68a8d47d27b45a9901be6160de0f9a291bd8680df84d0fc679bcb31"
+  },
   {
     "name": "credit_card",
     "unicode": "1F4B3",
@@ -1629,6 +1849,11 @@
     "unicode": "1F3CF",
     "digest": "00eb11254e887c71db5e8945ad211e9e0280f1e02f4b77a4799b64bba2bbe9b3"
   },
+  {
+    "name": "cricket_bat_ball",
+    "unicode": "1F3CF",
+    "digest": "00eb11254e887c71db5e8945ad211e9e0280f1e02f4b77a4799b64bba2bbe9b3"
+  },
   {
     "name": "crocodile",
     "unicode": "1F40A",
@@ -1639,21 +1864,41 @@
     "unicode": "271D",
     "digest": "a6e3c345cf6aa2ce690b66454066b53ef5b1dab2ed635e21f1586b1dffc5df42"
   },
+  {
+    "name": "latin_cross",
+    "unicode": "271D",
+    "digest": "a6e3c345cf6aa2ce690b66454066b53ef5b1dab2ed635e21f1586b1dffc5df42"
+  },
   {
     "name": "cross_heavy",
     "unicode": "1F547",
     "digest": "2e37c26b9bad0beb019c7f3e7a3892352d0ad9ca1b90c4333d42e8d56680be70"
   },
+  {
+    "name": "heavy_latin_cross",
+    "unicode": "1F547",
+    "digest": "2e37c26b9bad0beb019c7f3e7a3892352d0ad9ca1b90c4333d42e8d56680be70"
+  },
   {
     "name": "cross_white",
     "unicode": "1F546",
     "digest": "3452e667010d7e49a51d7e1f4ba8ed4f303e33ed43255a051e9a18832a1efba6"
   },
+  {
+    "name": "white_latin_cross",
+    "unicode": "1F546",
+    "digest": "3452e667010d7e49a51d7e1f4ba8ed4f303e33ed43255a051e9a18832a1efba6"
+  },
   {
     "name": "crossbones",
     "unicode": "1F571",
     "digest": "f5e7ce293c1a3282711073e68f033a3876e8428d1218cb2f8294630f9124e584"
   },
+  {
+    "name": "black_skull_and_crossbones",
+    "unicode": "1F571",
+    "digest": "f5e7ce293c1a3282711073e68f033a3876e8428d1218cb2f8294630f9124e584"
+  },
   {
     "name": "crossed_flags",
     "unicode": "1F38C",
@@ -1674,6 +1919,11 @@
     "unicode": "1F6F3",
     "digest": "90519c46ddfb63e71bc76661953da9041e5f0b97e9f8a7a8696518b4d529f3dd"
   },
+  {
+    "name": "passenger_ship",
+    "unicode": "1F6F3",
+    "digest": "90519c46ddfb63e71bc76661953da9041e5f0b97e9f8a7a8696518b4d529f3dd"
+  },
   {
     "name": "cry",
     "unicode": "1F622",
@@ -1729,6 +1979,11 @@
     "unicode": "1F5E1",
     "digest": "377060a7ce930566a4732b361be98e8a193a546846dfbba2a00abeeef41d1976"
   },
+  {
+    "name": "dagger_knife",
+    "unicode": "1F5E1",
+    "digest": "377060a7ce930566a4732b361be98e8a193a546846dfbba2a00abeeef41d1976"
+  },
   {
     "name": "dancer",
     "unicode": "1F483",
@@ -1814,6 +2069,11 @@
     "unicode": "1F5A5",
     "digest": "ba46323e695918e7253f1013cb991efb09790581c74c07c38bc5e10a20b8e8de"
   },
+  {
+    "name": "desktop_computer",
+    "unicode": "1F5A5",
+    "digest": "ba46323e695918e7253f1013cb991efb09790581c74c07c38bc5e10a20b8e8de"
+  },
   {
     "name": "desktop_window",
     "unicode": "1F5D4",
@@ -1844,6 +2104,11 @@
     "unicode": "1F5C2",
     "digest": "bf4c303452a4c0b4986925041dbec5b7e478060d560630b7c5bc2f997fcad668"
   },
+  {
+    "name": "card_index_dividers",
+    "unicode": "1F5C2",
+    "digest": "bf4c303452a4c0b4986925041dbec5b7e478060d560630b7c5bc2f997fcad668"
+  },
   {
     "name": "dizzy",
     "unicode": "1F4AB",
@@ -1869,6 +2134,11 @@
     "unicode": "1F5B9",
     "digest": "29407b12409c9673f3d89ef1f86ee50cbc7ed53b1870e33b4a29bbc609017f72"
   },
+  {
+    "name": "document_with_text",
+    "unicode": "1F5B9",
+    "digest": "29407b12409c9673f3d89ef1f86ee50cbc7ed53b1870e33b4a29bbc609017f72"
+  },
   {
     "name": "dog",
     "unicode": "1F436",
@@ -1909,6 +2179,11 @@
     "unicode": "1F54A",
     "digest": "4e2e9c47e5632efe6ccf945d61dbc2f1155a2e52905e17f307b502a2c951bdb8"
   },
+  {
+    "name": "dove_of_peace",
+    "unicode": "1F54A",
+    "digest": "4e2e9c47e5632efe6ccf945d61dbc2f1155a2e52905e17f307b502a2c951bdb8"
+  },
   {
     "name": "dragon",
     "unicode": "1F409",
@@ -1944,6 +2219,11 @@
     "unicode": "1F4E7",
     "digest": "12135310cfedc091d120426f5b132df82b538c5fcad458bf6b21588f353c3adb"
   },
+  {
+    "name": "email",
+    "unicode": "1F4E7",
+    "digest": "12135310cfedc091d120426f5b132df82b538c5fcad458bf6b21588f353c3adb"
+  },
   {
     "name": "ear",
     "unicode": "1F442",
@@ -2044,21 +2324,41 @@
     "unicode": "1F582",
     "digest": "bc60b6d375feee00758a94a05b42eeb165f4084b20eb3e6012b72faa221f7e75"
   },
+  {
+    "name": "back_of_envelope",
+    "unicode": "1F582",
+    "digest": "bc60b6d375feee00758a94a05b42eeb165f4084b20eb3e6012b72faa221f7e75"
+  },
   {
     "name": "envelope_flying",
     "unicode": "1F585",
     "digest": "9d6b6ca4c08006062a6f11948de3e15b13cf5c458967e39a9358665a8e13e214"
   },
+  {
+    "name": "flying_envelope",
+    "unicode": "1F585",
+    "digest": "9d6b6ca4c08006062a6f11948de3e15b13cf5c458967e39a9358665a8e13e214"
+  },
   {
     "name": "envelope_stamped",
     "unicode": "1F583",
     "digest": "f6102aea7283ddc136bfeb09589573420b9279105045fc6b965c1633c1297468"
   },
+  {
+    "name": "stamped_envelope",
+    "unicode": "1F583",
+    "digest": "f6102aea7283ddc136bfeb09589573420b9279105045fc6b965c1633c1297468"
+  },
   {
     "name": "envelope_stamped_pen",
     "unicode": "1F586",
     "digest": "80ea471318d1e04f8e525ff236b3cd4a4c864e66c6246b6aad77d92f56895f33"
   },
+  {
+    "name": "pen_over_stamped_envelope",
+    "unicode": "1F586",
+    "digest": "80ea471318d1e04f8e525ff236b3cd4a4c864e66c6246b6aad77d92f56895f33"
+  },
   {
     "name": "envelope_with_arrow",
     "unicode": "1F4E9",
@@ -2254,31 +2554,61 @@
     "unicode": "1F597",
     "digest": "0c542ac3141e8f2e74767acd0eb399c2d68c779cb78bf16d437ad3b1f8134ad9"
   },
+  {
+    "name": "white_down_pointing_left_hand_index",
+    "unicode": "1F597",
+    "digest": "0c542ac3141e8f2e74767acd0eb399c2d68c779cb78bf16d437ad3b1f8134ad9"
+  },
   {
     "name": "finger_pointing_down2",
     "unicode": "1F59F",
     "digest": "c5b128a232cbf518544802a2ae1459368274297163721fa05d0103cf95b2b1ee"
   },
+  {
+    "name": "sideways_white_down_pointing_index",
+    "unicode": "1F59F",
+    "digest": "c5b128a232cbf518544802a2ae1459368274297163721fa05d0103cf95b2b1ee"
+  },
   {
     "name": "finger_pointing_left",
     "unicode": "1F598",
     "digest": "d178ece691e2091be08db77fda9cf05462934628557358a8cb6222587b291f7e"
   },
+  {
+    "name": "sideways_white_left_pointing_index",
+    "unicode": "1F598",
+    "digest": "d178ece691e2091be08db77fda9cf05462934628557358a8cb6222587b291f7e"
+  },
   {
     "name": "finger_pointing_right",
     "unicode": "1F599",
     "digest": "a412a47544d8f401f9181f8826c5fa3d6b42a1d76f6926963c2d9cd2a01be06d"
   },
+  {
+    "name": "sideways_white_right_pointing_index",
+    "unicode": "1F599",
+    "digest": "a412a47544d8f401f9181f8826c5fa3d6b42a1d76f6926963c2d9cd2a01be06d"
+  },
   {
     "name": "finger_pointing_up",
     "unicode": "1F59E",
     "digest": "32c2ccab52aa318a47c816d1bcf9c076e667c9ef3e64ce37d7ba7e827238690d"
   },
+  {
+    "name": "sideways_white_up_pointing_index",
+    "unicode": "1F59E",
+    "digest": "32c2ccab52aa318a47c816d1bcf9c076e667c9ef3e64ce37d7ba7e827238690d"
+  },
   {
     "name": "fire",
     "unicode": "1F525",
     "digest": "b44311874681135acbb5e7226febe4365c732da3a9617f10d7074a3b1ade1641"
   },
+  {
+    "name": "flame",
+    "unicode": "1F525",
+    "digest": "b44311874681135acbb5e7226febe4365c732da3a9617f10d7074a3b1ade1641"
+  },
   {
     "name": "fire_engine",
     "unicode": "1F692",
@@ -2289,6 +2619,11 @@
     "unicode": "1F6F1",
     "digest": "e2482c450136d373f74dfafddf502e0b675eb5d2e1e1c645f163db0e4d15fbb6"
   },
+  {
+    "name": "oncoming_fire_engine",
+    "unicode": "1F6F1",
+    "digest": "e2482c450136d373f74dfafddf502e0b675eb5d2e1e1c645f163db0e4d15fbb6"
+  },
   {
     "name": "fireworks",
     "unicode": "1F386",
@@ -2359,1296 +2694,2596 @@
     "unicode": "1F1E6-1F1E8",
     "digest": "d9db1edeb709824a1083c2bba79ca5f683ed0edded35918bb167d1ee7396c8da"
   },
+  {
+    "name": "ac",
+    "unicode": "1F1E6-1F1E8",
+    "digest": "d9db1edeb709824a1083c2bba79ca5f683ed0edded35918bb167d1ee7396c8da"
+  },
   {
     "name": "flag_ad",
     "unicode": "1F1E6-1F1E9",
     "digest": "04a8c1745d9b8b20e903302379f2557e8082f72e33878db4cb2cd6b33eb97952"
   },
+  {
+    "name": "ad",
+    "unicode": "1F1E6-1F1E9",
+    "digest": "04a8c1745d9b8b20e903302379f2557e8082f72e33878db4cb2cd6b33eb97952"
+  },
   {
     "name": "flag_ae",
     "unicode": "1F1E6-1F1EA",
     "digest": "868324ac2e7bea1547f5de95f39633b77b8d62f3b3433b3d1a4ee96d169a09cd"
   },
+  {
+    "name": "ae",
+    "unicode": "1F1E6-1F1EA",
+    "digest": "868324ac2e7bea1547f5de95f39633b77b8d62f3b3433b3d1a4ee96d169a09cd"
+  },
   {
     "name": "flag_af",
     "unicode": "1F1E6-1F1EB",
     "digest": "9a94458519e9db5d6cf1557e54fdf62d7e48aaf7de25744a093ec8f284656226"
   },
+  {
+    "name": "af",
+    "unicode": "1F1E6-1F1EB",
+    "digest": "9a94458519e9db5d6cf1557e54fdf62d7e48aaf7de25744a093ec8f284656226"
+  },
   {
     "name": "flag_ag",
     "unicode": "1F1E6-1F1EC",
     "digest": "ea59fabc2bd9024df06a59a34412f52bebfeb03eb6abd73d8fe153e3a68e28f4"
   },
+  {
+    "name": "ag",
+    "unicode": "1F1E6-1F1EC",
+    "digest": "ea59fabc2bd9024df06a59a34412f52bebfeb03eb6abd73d8fe153e3a68e28f4"
+  },
   {
     "name": "flag_ai",
     "unicode": "1F1E6-1F1EE",
     "digest": "75676ded736ad2ebb921e9fd8ebfef49819a35c3dcf005bbc3b7e8c6e75178f2"
   },
+  {
+    "name": "ai",
+    "unicode": "1F1E6-1F1EE",
+    "digest": "75676ded736ad2ebb921e9fd8ebfef49819a35c3dcf005bbc3b7e8c6e75178f2"
+  },
   {
     "name": "flag_al",
     "unicode": "1F1E6-1F1F1",
     "digest": "77b835dcff399b609e2479cbf10f08344c8fc277370ba8e4540165ca15563847"
   },
+  {
+    "name": "al",
+    "unicode": "1F1E6-1F1F1",
+    "digest": "77b835dcff399b609e2479cbf10f08344c8fc277370ba8e4540165ca15563847"
+  },
   {
     "name": "flag_am",
     "unicode": "1F1E6-1F1F2",
     "digest": "3b820c628dd5a93137f7288a43553778f60b0beea4c0a239d063893c0723e73d"
   },
+  {
+    "name": "am",
+    "unicode": "1F1E6-1F1F2",
+    "digest": "3b820c628dd5a93137f7288a43553778f60b0beea4c0a239d063893c0723e73d"
+  },
   {
     "name": "flag_ao",
     "unicode": "1F1E6-1F1F4",
     "digest": "d26439d4ecbe8b67bb1ae9753454505358ebb6b802624f19800471e53ee27187"
   },
+  {
+    "name": "ao",
+    "unicode": "1F1E6-1F1F4",
+    "digest": "d26439d4ecbe8b67bb1ae9753454505358ebb6b802624f19800471e53ee27187"
+  },
   {
     "name": "flag_aq",
     "unicode": "1F1E6-1F1F6",
     "digest": "6b0b4e800d88ab289ae4b6d449bfa115e92543958b477d13ad348468a74e4616"
   },
+  {
+    "name": "aq",
+    "unicode": "1F1E6-1F1F6",
+    "digest": "6b0b4e800d88ab289ae4b6d449bfa115e92543958b477d13ad348468a74e4616"
+  },
   {
     "name": "flag_ar",
     "unicode": "1F1E6-1F1F7",
     "digest": "ca76db601dd3f5794f1caace8ab5641fe3786b86e4ae030706162f0ce07d27b3"
   },
+  {
+    "name": "ar",
+    "unicode": "1F1E6-1F1F7",
+    "digest": "ca76db601dd3f5794f1caace8ab5641fe3786b86e4ae030706162f0ce07d27b3"
+  },
   {
     "name": "flag_as",
     "unicode": "1F1E6-1F1F8",
     "digest": "170e1dde0e3fd2e0f2149de5cc8845e15580cc0412e81a643d61bd387de16141"
   },
+  {
+    "name": "as",
+    "unicode": "1F1E6-1F1F8",
+    "digest": "170e1dde0e3fd2e0f2149de5cc8845e15580cc0412e81a643d61bd387de16141"
+  },
   {
     "name": "flag_at",
     "unicode": "1F1E6-1F1F9",
     "digest": "0ab3675a16b4988e87c81e87453c160d6616c7be76247f54c471dc63aa8b42ba"
   },
+  {
+    "name": "at",
+    "unicode": "1F1E6-1F1F9",
+    "digest": "0ab3675a16b4988e87c81e87453c160d6616c7be76247f54c471dc63aa8b42ba"
+  },
   {
     "name": "flag_au",
     "unicode": "1F1E6-1F1FA",
     "digest": "b6f17d3dfd3547c069a0b6cddd4cf44fb8ce1d1d300e24284fb292ac142537e3"
   },
+  {
+    "name": "au",
+    "unicode": "1F1E6-1F1FA",
+    "digest": "b6f17d3dfd3547c069a0b6cddd4cf44fb8ce1d1d300e24284fb292ac142537e3"
+  },
   {
     "name": "flag_aw",
     "unicode": "1F1E6-1F1FC",
     "digest": "7857bc907f04dfb7ccc4401c05034ad8afb6383a022db77973cfcafa4d6c16c8"
   },
+  {
+    "name": "aw",
+    "unicode": "1F1E6-1F1FC",
+    "digest": "7857bc907f04dfb7ccc4401c05034ad8afb6383a022db77973cfcafa4d6c16c8"
+  },
   {
     "name": "flag_ax",
     "unicode": "1F1E6-1F1FD",
     "digest": "ab8f1fd4af7c220a54d478cec5a9f7f3beb5fc83439c448f3ac9848af8391ac1"
   },
+  {
+    "name": "ax",
+    "unicode": "1F1E6-1F1FD",
+    "digest": "ab8f1fd4af7c220a54d478cec5a9f7f3beb5fc83439c448f3ac9848af8391ac1"
+  },
   {
     "name": "flag_az",
     "unicode": "1F1E6-1F1FF",
     "digest": "187cc7b6d39800c5910a34409db1e6b1d8aac808c72a93e922a419d9b054fd0b"
   },
+  {
+    "name": "az",
+    "unicode": "1F1E6-1F1FF",
+    "digest": "187cc7b6d39800c5910a34409db1e6b1d8aac808c72a93e922a419d9b054fd0b"
+  },
   {
     "name": "flag_ba",
     "unicode": "1F1E7-1F1E6",
     "digest": "cd22c744213087384cf79ed314742026787212c9ceb6999ed166534670f7864a"
   },
+  {
+    "name": "ba",
+    "unicode": "1F1E7-1F1E6",
+    "digest": "cd22c744213087384cf79ed314742026787212c9ceb6999ed166534670f7864a"
+  },
   {
     "name": "flag_bb",
     "unicode": "1F1E7-1F1E7",
     "digest": "44ff0a48ac2d2180374baa58b1b7c64f26d0d151a48811eb08ffa20758104512"
   },
+  {
+    "name": "bb",
+    "unicode": "1F1E7-1F1E7",
+    "digest": "44ff0a48ac2d2180374baa58b1b7c64f26d0d151a48811eb08ffa20758104512"
+  },
   {
     "name": "flag_bd",
     "unicode": "1F1E7-1F1E9",
     "digest": "c18793d2b963458607a0bab94c57e62c8278fce870e96fd8dda78067a8fbde18"
   },
+  {
+    "name": "bd",
+    "unicode": "1F1E7-1F1E9",
+    "digest": "c18793d2b963458607a0bab94c57e62c8278fce870e96fd8dda78067a8fbde18"
+  },
   {
     "name": "flag_be",
     "unicode": "1F1E7-1F1EA",
     "digest": "6e6ccfca064a43b93c8acc04a9425f95af204198022ca20b9ee6c491e99ad950"
   },
+  {
+    "name": "be",
+    "unicode": "1F1E7-1F1EA",
+    "digest": "6e6ccfca064a43b93c8acc04a9425f95af204198022ca20b9ee6c491e99ad950"
+  },
   {
     "name": "flag_bf",
     "unicode": "1F1E7-1F1EB",
     "digest": "d69c0394a1c7cb6323f54f024b7d740c728f229ca5e1b54ac374d5024f5470a5"
   },
+  {
+    "name": "bf",
+    "unicode": "1F1E7-1F1EB",
+    "digest": "d69c0394a1c7cb6323f54f024b7d740c728f229ca5e1b54ac374d5024f5470a5"
+  },
   {
     "name": "flag_bg",
     "unicode": "1F1E7-1F1EC",
     "digest": "413a270caf4a9155e84bdba6c9512277f5642246f6ba8d701383a5eeb02f7e95"
   },
+  {
+    "name": "bg",
+    "unicode": "1F1E7-1F1EC",
+    "digest": "413a270caf4a9155e84bdba6c9512277f5642246f6ba8d701383a5eeb02f7e95"
+  },
   {
     "name": "flag_bh",
     "unicode": "1F1E7-1F1ED",
     "digest": "9243ed65d7f24c824c2a3207335a2d4ad25251258547c16d0b7b7cbb9df6f8de"
   },
+  {
+    "name": "bh",
+    "unicode": "1F1E7-1F1ED",
+    "digest": "9243ed65d7f24c824c2a3207335a2d4ad25251258547c16d0b7b7cbb9df6f8de"
+  },
   {
     "name": "flag_bi",
     "unicode": "1F1E7-1F1EE",
     "digest": "63056519030524b2d2dcd47448267d817205dbd6b98075c97f011a8f1d4d1a4b"
   },
+  {
+    "name": "bi",
+    "unicode": "1F1E7-1F1EE",
+    "digest": "63056519030524b2d2dcd47448267d817205dbd6b98075c97f011a8f1d4d1a4b"
+  },
   {
     "name": "flag_bj",
     "unicode": "1F1E7-1F1EF",
     "digest": "93b245eed85d22260d27d1a8c77f51fb3439309e09b2aeca6cd504dbea77b509"
   },
+  {
+    "name": "bj",
+    "unicode": "1F1E7-1F1EF",
+    "digest": "93b245eed85d22260d27d1a8c77f51fb3439309e09b2aeca6cd504dbea77b509"
+  },
   {
     "name": "flag_bl",
     "unicode": "1F1E7-1F1F1",
     "digest": "5e1e478deaf02bbaa26595e4cefc5f5c9bec6105ce521b7b9ab4fa5e7a452c14"
   },
+  {
+    "name": "bl",
+    "unicode": "1F1E7-1F1F1",
+    "digest": "5e1e478deaf02bbaa26595e4cefc5f5c9bec6105ce521b7b9ab4fa5e7a452c14"
+  },
   {
     "name": "flag_black",
     "unicode": "1F3F4",
     "digest": "df131e5c28e9f51dea53fe7f33551f91d420f7d686b7a62980f0154c6b5357a6"
   },
+  {
+    "name": "waving_black_flag",
+    "unicode": "1F3F4",
+    "digest": "df131e5c28e9f51dea53fe7f33551f91d420f7d686b7a62980f0154c6b5357a6"
+  },
   {
     "name": "flag_bm",
     "unicode": "1F1E7-1F1F2",
     "digest": "9dcd9e60faebe7f93eb19157e99f2ad654a8145c61738de96e6ecd11a246764a"
   },
+  {
+    "name": "bm",
+    "unicode": "1F1E7-1F1F2",
+    "digest": "9dcd9e60faebe7f93eb19157e99f2ad654a8145c61738de96e6ecd11a246764a"
+  },
   {
     "name": "flag_bn",
     "unicode": "1F1E7-1F1F3",
     "digest": "078af6ca481a77871ba005e251a46ce63951c27b1b0cd33b9c1d0d31d349bc1a"
   },
+  {
+    "name": "bn",
+    "unicode": "1F1E7-1F1F3",
+    "digest": "078af6ca481a77871ba005e251a46ce63951c27b1b0cd33b9c1d0d31d349bc1a"
+  },
   {
     "name": "flag_bo",
     "unicode": "1F1E7-1F1F4",
     "digest": "92516d04e922a3bcbabe2e7619194bc972c09ba97576e8155f9829c397a71d8c"
   },
+  {
+    "name": "bo",
+    "unicode": "1F1E7-1F1F4",
+    "digest": "92516d04e922a3bcbabe2e7619194bc972c09ba97576e8155f9829c397a71d8c"
+  },
   {
     "name": "flag_bq",
     "unicode": "1F1E7-1F1F6",
     "digest": "7832df5267a2bb8dddb83aeb11162ce79aeebdb718f2ac0e54adcf3d87936171"
   },
+  {
+    "name": "bq",
+    "unicode": "1F1E7-1F1F6",
+    "digest": "7832df5267a2bb8dddb83aeb11162ce79aeebdb718f2ac0e54adcf3d87936171"
+  },
   {
     "name": "flag_br",
     "unicode": "1F1E7-1F1F7",
     "digest": "aabcc1c082124045ed214f7d9778d8e2ed791ebb8433defea91db458658abeec"
   },
+  {
+    "name": "br",
+    "unicode": "1F1E7-1F1F7",
+    "digest": "aabcc1c082124045ed214f7d9778d8e2ed791ebb8433defea91db458658abeec"
+  },
   {
     "name": "flag_bs",
     "unicode": "1F1E7-1F1F8",
     "digest": "f628f39003608e181696634929522884165e27ccef55270293f92eeef991635f"
   },
+  {
+    "name": "bs",
+    "unicode": "1F1E7-1F1F8",
+    "digest": "f628f39003608e181696634929522884165e27ccef55270293f92eeef991635f"
+  },
   {
     "name": "flag_bt",
     "unicode": "1F1E7-1F1F9",
     "digest": "af24a8ab34815da04c3e5af49a47449e0de93b068957cbda695816d0f830ca12"
   },
+  {
+    "name": "bt",
+    "unicode": "1F1E7-1F1F9",
+    "digest": "af24a8ab34815da04c3e5af49a47449e0de93b068957cbda695816d0f830ca12"
+  },
   {
     "name": "flag_bv",
     "unicode": "1F1E7-1F1FB",
     "digest": "ff0037f6eed95d4bb5f2b502902360e1ff41426e2896daf3e0730cef1f8f7e41"
   },
+  {
+    "name": "bv",
+    "unicode": "1F1E7-1F1FB",
+    "digest": "ff0037f6eed95d4bb5f2b502902360e1ff41426e2896daf3e0730cef1f8f7e41"
+  },
   {
     "name": "flag_bw",
     "unicode": "1F1E7-1F1FC",
     "digest": "3e3241ecb97946cc3e467b083d113a57dd305595e1512d4da18cc403e8689c1d"
   },
+  {
+    "name": "bw",
+    "unicode": "1F1E7-1F1FC",
+    "digest": "3e3241ecb97946cc3e467b083d113a57dd305595e1512d4da18cc403e8689c1d"
+  },
   {
     "name": "flag_by",
     "unicode": "1F1E7-1F1FE",
     "digest": "bdd21885c6fac475241884a44149b887297772e17617ee59dd9fe8518d52cf3d"
   },
+  {
+    "name": "by",
+    "unicode": "1F1E7-1F1FE",
+    "digest": "bdd21885c6fac475241884a44149b887297772e17617ee59dd9fe8518d52cf3d"
+  },
   {
     "name": "flag_bz",
     "unicode": "1F1E7-1F1FF",
     "digest": "21c16e1da641af004576000bf1db44b9a1e0fccfddc775e96022721c2f18eeea"
   },
+  {
+    "name": "bz",
+    "unicode": "1F1E7-1F1FF",
+    "digest": "21c16e1da641af004576000bf1db44b9a1e0fccfddc775e96022721c2f18eeea"
+  },
   {
     "name": "flag_ca",
     "unicode": "1F1E8-1F1E6",
     "digest": "0d00e459084d58d3ea9c60488a9e51bf45f71b77f1600f190225d5ca6ca6c796"
   },
+  {
+    "name": "ca",
+    "unicode": "1F1E8-1F1E6",
+    "digest": "0d00e459084d58d3ea9c60488a9e51bf45f71b77f1600f190225d5ca6ca6c796"
+  },
   {
     "name": "flag_cc",
     "unicode": "1F1E8-1F1E8",
     "digest": "86ab27164603ef0f1f83fe898eda6fbb7bc5709f2518f5577f00817860806a7b"
   },
+  {
+    "name": "cc",
+    "unicode": "1F1E8-1F1E8",
+    "digest": "86ab27164603ef0f1f83fe898eda6fbb7bc5709f2518f5577f00817860806a7b"
+  },
   {
     "name": "flag_cd",
     "unicode": "1F1E8-1F1E9",
     "digest": "fdc2796530ada4bd0bae37ace4bbe707b321b287dcd64568f8e01d3a9df56066"
   },
+  {
+    "name": "congo",
+    "unicode": "1F1E8-1F1E9",
+    "digest": "fdc2796530ada4bd0bae37ace4bbe707b321b287dcd64568f8e01d3a9df56066"
+  },
   {
     "name": "flag_cf",
     "unicode": "1F1E8-1F1EB",
     "digest": "5943bec02bede0931e21e7c34a68f375499f60a34883cc1edf2f21e9834b15ce"
   },
+  {
+    "name": "cf",
+    "unicode": "1F1E8-1F1EB",
+    "digest": "5943bec02bede0931e21e7c34a68f375499f60a34883cc1edf2f21e9834b15ce"
+  },
   {
     "name": "flag_cg",
     "unicode": "1F1E8-1F1EC",
     "digest": "54498482e2772371e148e05cfb7c5eb55f6a22cd528662abdea10bad47d157da"
   },
+  {
+    "name": "cg",
+    "unicode": "1F1E8-1F1EC",
+    "digest": "54498482e2772371e148e05cfb7c5eb55f6a22cd528662abdea10bad47d157da"
+  },
   {
     "name": "flag_ch",
     "unicode": "1F1E8-1F1ED",
     "digest": "53d6d35aeeebb0b4b1ad858dc3691e649ac73d30b3be76f96d5fe9605fa99386"
   },
+  {
+    "name": "ch",
+    "unicode": "1F1E8-1F1ED",
+    "digest": "53d6d35aeeebb0b4b1ad858dc3691e649ac73d30b3be76f96d5fe9605fa99386"
+  },
   {
     "name": "flag_ci",
     "unicode": "1F1E8-1F1EE",
     "digest": "3a173a3058a5c0174dc88750852cafec264e901ce82a6c69db122c8c0ea71a3a"
   },
+  {
+    "name": "ci",
+    "unicode": "1F1E8-1F1EE",
+    "digest": "3a173a3058a5c0174dc88750852cafec264e901ce82a6c69db122c8c0ea71a3a"
+  },
   {
     "name": "flag_ck",
     "unicode": "1F1E8-1F1F0",
     "digest": "42f395ff53c618b72b8a224cd4343d1a32f5ad82ced56bf590170a5ff0d5134c"
   },
+  {
+    "name": "ck",
+    "unicode": "1F1E8-1F1F0",
+    "digest": "42f395ff53c618b72b8a224cd4343d1a32f5ad82ced56bf590170a5ff0d5134c"
+  },
   {
     "name": "flag_cl",
     "unicode": "1F1E8-1F1F1",
     "digest": "9d6255feb690596904d800e72d5acdb5cda941c5a741b031ea39a3c7650ac46f"
   },
+  {
+    "name": "chile",
+    "unicode": "1F1E8-1F1F1",
+    "digest": "9d6255feb690596904d800e72d5acdb5cda941c5a741b031ea39a3c7650ac46f"
+  },
   {
     "name": "flag_cm",
     "unicode": "1F1E8-1F1F2",
     "digest": "ffc99d14e0a8b46a980331090ed9f36f31a87f1b0f8dd8c09007a31c6127c69e"
   },
+  {
+    "name": "cm",
+    "unicode": "1F1E8-1F1F2",
+    "digest": "ffc99d14e0a8b46a980331090ed9f36f31a87f1b0f8dd8c09007a31c6127c69e"
+  },
   {
     "name": "flag_cn",
     "unicode": "1F1E8-1F1F3",
     "digest": "869a98c52bdc33591f87e2aab6cb4f13e98bb19136250ff25805d0312a8b7c8a"
   },
+  {
+    "name": "cn",
+    "unicode": "1F1E8-1F1F3",
+    "digest": "869a98c52bdc33591f87e2aab6cb4f13e98bb19136250ff25805d0312a8b7c8a"
+  },
   {
     "name": "flag_co",
     "unicode": "1F1E8-1F1F4",
     "digest": "6aa458440eb2500ad307fea40fd8f1171a1506a6e32af144a4fd51545bb56151"
   },
+  {
+    "name": "co",
+    "unicode": "1F1E8-1F1F4",
+    "digest": "6aa458440eb2500ad307fea40fd8f1171a1506a6e32af144a4fd51545bb56151"
+  },
   {
     "name": "flag_cp",
     "unicode": "1F1E8-1F1F5",
     "digest": "62627702e3e3768808c12f153a527ffcc492ad74d8cdc1858cfde971efd0c8ee"
   },
+  {
+    "name": "cp",
+    "unicode": "1F1E8-1F1F5",
+    "digest": "62627702e3e3768808c12f153a527ffcc492ad74d8cdc1858cfde971efd0c8ee"
+  },
   {
     "name": "flag_cr",
     "unicode": "1F1E8-1F1F7",
     "digest": "0f3b54d8330c5bb136647547dafc598bda755697cfd6b7d872a2443ba7b5cad4"
   },
+  {
+    "name": "cr",
+    "unicode": "1F1E8-1F1F7",
+    "digest": "0f3b54d8330c5bb136647547dafc598bda755697cfd6b7d872a2443ba7b5cad4"
+  },
   {
     "name": "flag_cu",
     "unicode": "1F1E8-1F1FA",
     "digest": "69bc973002475bb3d9b54cb0ba9ec9cb85f144c1cf54689da0ee8f414ebb0d83"
   },
+  {
+    "name": "cu",
+    "unicode": "1F1E8-1F1FA",
+    "digest": "69bc973002475bb3d9b54cb0ba9ec9cb85f144c1cf54689da0ee8f414ebb0d83"
+  },
   {
     "name": "flag_cv",
     "unicode": "1F1E8-1F1FB",
     "digest": "af2e135cf3c1b03a5937c068a75061b5cd332e95902fd0f8dffb2ac2dc89692a"
   },
+  {
+    "name": "cv",
+    "unicode": "1F1E8-1F1FB",
+    "digest": "af2e135cf3c1b03a5937c068a75061b5cd332e95902fd0f8dffb2ac2dc89692a"
+  },
   {
     "name": "flag_cw",
     "unicode": "1F1E8-1F1FC",
     "digest": "df4b2228a82f766c5c64c13c1388482a68549e59dd843671ee0eb43506e33411"
   },
+  {
+    "name": "cw",
+    "unicode": "1F1E8-1F1FC",
+    "digest": "df4b2228a82f766c5c64c13c1388482a68549e59dd843671ee0eb43506e33411"
+  },
   {
     "name": "flag_cx",
     "unicode": "1F1E8-1F1FD",
     "digest": "db12e513345a7be53954167d359ede0b3effbfb292508ee4d726123e3a8f83d7"
   },
+  {
+    "name": "cx",
+    "unicode": "1F1E8-1F1FD",
+    "digest": "db12e513345a7be53954167d359ede0b3effbfb292508ee4d726123e3a8f83d7"
+  },
   {
     "name": "flag_cy",
     "unicode": "1F1E8-1F1FE",
     "digest": "0cea41d4820746e2c6eb408f7ec7419afba9f7396401d92e6c1d77382f721d0b"
   },
+  {
+    "name": "cy",
+    "unicode": "1F1E8-1F1FE",
+    "digest": "0cea41d4820746e2c6eb408f7ec7419afba9f7396401d92e6c1d77382f721d0b"
+  },
   {
     "name": "flag_cz",
     "unicode": "1F1E8-1F1FF",
     "digest": "a1c2405916963be306f761539123486a2845af53716c9dfe94ad5420e14d36c4"
   },
+  {
+    "name": "cz",
+    "unicode": "1F1E8-1F1FF",
+    "digest": "a1c2405916963be306f761539123486a2845af53716c9dfe94ad5420e14d36c4"
+  },
   {
     "name": "flag_de",
     "unicode": "1F1E9-1F1EA",
     "digest": "74a80b64437bc4e31bdd7cbb753ecd2d719bf34c506cbac535db83a644174cce"
   },
+  {
+    "name": "de",
+    "unicode": "1F1E9-1F1EA",
+    "digest": "74a80b64437bc4e31bdd7cbb753ecd2d719bf34c506cbac535db83a644174cce"
+  },
   {
     "name": "flag_dg",
     "unicode": "1F1E9-1F1EC",
     "digest": "13cb5ea872f94a9c3fb579cef417e2d1ed38e8cbe95059576380cacd59bc4b9d"
   },
+  {
+    "name": "dg",
+    "unicode": "1F1E9-1F1EC",
+    "digest": "13cb5ea872f94a9c3fb579cef417e2d1ed38e8cbe95059576380cacd59bc4b9d"
+  },
   {
     "name": "flag_dj",
     "unicode": "1F1E9-1F1EF",
     "digest": "5b479654c28d3eeb70055c5e25dc46ccaba9eeea7537cc45ca9dbb8186b743b6"
   },
+  {
+    "name": "dj",
+    "unicode": "1F1E9-1F1EF",
+    "digest": "5b479654c28d3eeb70055c5e25dc46ccaba9eeea7537cc45ca9dbb8186b743b6"
+  },
   {
     "name": "flag_dk",
     "unicode": "1F1E9-1F1F0",
     "digest": "dee7fa9644a9b447417518a353e7edcbb37b2af8bc7d13a6ed71d7210c43ca3c"
   },
+  {
+    "name": "dk",
+    "unicode": "1F1E9-1F1F0",
+    "digest": "dee7fa9644a9b447417518a353e7edcbb37b2af8bc7d13a6ed71d7210c43ca3c"
+  },
   {
     "name": "flag_dm",
     "unicode": "1F1E9-1F1F2",
     "digest": "2e339190a8a0a238140f42e329f6646af5be75763a787ea268488a2e0440dc4c"
   },
+  {
+    "name": "dm",
+    "unicode": "1F1E9-1F1F2",
+    "digest": "2e339190a8a0a238140f42e329f6646af5be75763a787ea268488a2e0440dc4c"
+  },
   {
     "name": "flag_do",
     "unicode": "1F1E9-1F1F4",
     "digest": "be5dafcd32d7197a96d37299a91835a8009299452f05a66d91c5fdec17448230"
   },
+  {
+    "name": "do",
+    "unicode": "1F1E9-1F1F4",
+    "digest": "be5dafcd32d7197a96d37299a91835a8009299452f05a66d91c5fdec17448230"
+  },
   {
     "name": "flag_dz",
     "unicode": "1F1E9-1F1FF",
     "digest": "cf525d56bac45fe689f92d441274fc0ecbed4f95591d2c066598f72b1ee8d618"
   },
+  {
+    "name": "dz",
+    "unicode": "1F1E9-1F1FF",
+    "digest": "cf525d56bac45fe689f92d441274fc0ecbed4f95591d2c066598f72b1ee8d618"
+  },
   {
     "name": "flag_ea",
     "unicode": "1F1EA-1F1E6",
     "digest": "1acb13950f7c3692f9a36e618d8ec10a73ead5d7fa80fb52b6b2a18e3d456002"
   },
+  {
+    "name": "ea",
+    "unicode": "1F1EA-1F1E6",
+    "digest": "1acb13950f7c3692f9a36e618d8ec10a73ead5d7fa80fb52b6b2a18e3d456002"
+  },
   {
     "name": "flag_ec",
     "unicode": "1F1EA-1F1E8",
     "digest": "4d9d35450efc6026651ccc2278e70fb90b001ca5e5eecd31361b1e4e23253dbd"
   },
+  {
+    "name": "ec",
+    "unicode": "1F1EA-1F1E8",
+    "digest": "4d9d35450efc6026651ccc2278e70fb90b001ca5e5eecd31361b1e4e23253dbd"
+  },
   {
     "name": "flag_ee",
     "unicode": "1F1EA-1F1EA",
     "digest": "86ec7b2f618fe71dddec3d5a621b56b878d683780f1e0ad446f965326d42df48"
   },
+  {
+    "name": "ee",
+    "unicode": "1F1EA-1F1EA",
+    "digest": "86ec7b2f618fe71dddec3d5a621b56b878d683780f1e0ad446f965326d42df48"
+  },
   {
     "name": "flag_eg",
     "unicode": "1F1EA-1F1EC",
     "digest": "f06d36a6fec15af4c1a76de30e8469847dde2728bb5a48956b4e466098b778a4"
   },
+  {
+    "name": "eg",
+    "unicode": "1F1EA-1F1EC",
+    "digest": "f06d36a6fec15af4c1a76de30e8469847dde2728bb5a48956b4e466098b778a4"
+  },
   {
     "name": "flag_eh",
     "unicode": "1F1EA-1F1ED",
     "digest": "eb63f5b92c62c98dc008dfa7ad8830aa17fa23964f812a28055bd8b6f5960c5b"
   },
+  {
+    "name": "eh",
+    "unicode": "1F1EA-1F1ED",
+    "digest": "eb63f5b92c62c98dc008dfa7ad8830aa17fa23964f812a28055bd8b6f5960c5b"
+  },
   {
     "name": "flag_er",
     "unicode": "1F1EA-1F1F7",
     "digest": "e901195f7b37b22a6872d36713de0ec176f6424c209e261e5c849ce318c772f6"
   },
+  {
+    "name": "er",
+    "unicode": "1F1EA-1F1F7",
+    "digest": "e901195f7b37b22a6872d36713de0ec176f6424c209e261e5c849ce318c772f6"
+  },
   {
     "name": "flag_es",
     "unicode": "1F1EA-1F1F8",
     "digest": "27ab5cc6c2e9f26ccdfa632887533eebcd9b514f80cec9e721cf8e5e2544339c"
   },
+  {
+    "name": "es",
+    "unicode": "1F1EA-1F1F8",
+    "digest": "27ab5cc6c2e9f26ccdfa632887533eebcd9b514f80cec9e721cf8e5e2544339c"
+  },
   {
     "name": "flag_et",
     "unicode": "1F1EA-1F1F9",
     "digest": "6cdb3718c9b3ec713258dd36781db58b7da53f3017445056c1a76233e3b4a7de"
   },
+  {
+    "name": "et",
+    "unicode": "1F1EA-1F1F9",
+    "digest": "6cdb3718c9b3ec713258dd36781db58b7da53f3017445056c1a76233e3b4a7de"
+  },
   {
     "name": "flag_eu",
     "unicode": "1F1EA-1F1FA",
     "digest": "363f60e8a747166d5cec8d70bfdf266411eec2ff07933b6187975075caadfd74"
   },
+  {
+    "name": "eu",
+    "unicode": "1F1EA-1F1FA",
+    "digest": "363f60e8a747166d5cec8d70bfdf266411eec2ff07933b6187975075caadfd74"
+  },
   {
     "name": "flag_fi",
     "unicode": "1F1EB-1F1EE",
     "digest": "1a1959cb551a0e8bdaee8c04657fb7387a4d83173f7759f89468da12e1818a9e"
   },
+  {
+    "name": "fi",
+    "unicode": "1F1EB-1F1EE",
+    "digest": "1a1959cb551a0e8bdaee8c04657fb7387a4d83173f7759f89468da12e1818a9e"
+  },
   {
     "name": "flag_fj",
     "unicode": "1F1EB-1F1EF",
     "digest": "f26dc36ea9c1f32d9bb54874ea384e7118b6e2585be69245fdd73acd8304ae78"
   },
+  {
+    "name": "fj",
+    "unicode": "1F1EB-1F1EF",
+    "digest": "f26dc36ea9c1f32d9bb54874ea384e7118b6e2585be69245fdd73acd8304ae78"
+  },
   {
     "name": "flag_fk",
     "unicode": "1F1EB-1F1F0",
     "digest": "0479e233499b704f91a9b13d083e66296efe2f28ed917ab1496b223bfb09adb8"
   },
+  {
+    "name": "fk",
+    "unicode": "1F1EB-1F1F0",
+    "digest": "0479e233499b704f91a9b13d083e66296efe2f28ed917ab1496b223bfb09adb8"
+  },
   {
     "name": "flag_fm",
     "unicode": "1F1EB-1F1F2",
     "digest": "142ea7b4b4a7004329925b495da43ab82351cbaac383c8da6e614b39ba58d05e"
   },
+  {
+    "name": "fm",
+    "unicode": "1F1EB-1F1F2",
+    "digest": "142ea7b4b4a7004329925b495da43ab82351cbaac383c8da6e614b39ba58d05e"
+  },
   {
     "name": "flag_fo",
     "unicode": "1F1EB-1F1F4",
     "digest": "f1c800d4f4d39e2aead9a11ed500f16108d6bc48bd24bd2a1af7b966d8e76752"
   },
+  {
+    "name": "fo",
+    "unicode": "1F1EB-1F1F4",
+    "digest": "f1c800d4f4d39e2aead9a11ed500f16108d6bc48bd24bd2a1af7b966d8e76752"
+  },
   {
     "name": "flag_fr",
     "unicode": "1F1EB-1F1F7",
     "digest": "6f52f36b5199c65ab1cad13ff4e77d2d8b48a8ff79b92166976674ffdc7829ee"
   },
+  {
+    "name": "fr",
+    "unicode": "1F1EB-1F1F7",
+    "digest": "6f52f36b5199c65ab1cad13ff4e77d2d8b48a8ff79b92166976674ffdc7829ee"
+  },
   {
     "name": "flag_ga",
     "unicode": "1F1EC-1F1E6",
     "digest": "50a0d5a07466e419b74a4d532738f7958de9baa37df6191be4f3755dccc3b326"
   },
+  {
+    "name": "ga",
+    "unicode": "1F1EC-1F1E6",
+    "digest": "50a0d5a07466e419b74a4d532738f7958de9baa37df6191be4f3755dccc3b326"
+  },
   {
     "name": "flag_gb",
     "unicode": "1F1EC-1F1E7",
     "digest": "220f7da6d5a231b766c79f2e1b7d3fdb74ec0c0c17558cc00a8a8ccdf2afc2e0"
   },
+  {
+    "name": "gb",
+    "unicode": "1F1EC-1F1E7",
+    "digest": "220f7da6d5a231b766c79f2e1b7d3fdb74ec0c0c17558cc00a8a8ccdf2afc2e0"
+  },
   {
     "name": "flag_gd",
     "unicode": "1F1EC-1F1E9",
     "digest": "3e162b0d13f4ceea7f663b1d425f13863d104e80df75a640f526e276bcd04081"
   },
+  {
+    "name": "gd",
+    "unicode": "1F1EC-1F1E9",
+    "digest": "3e162b0d13f4ceea7f663b1d425f13863d104e80df75a640f526e276bcd04081"
+  },
   {
     "name": "flag_ge",
     "unicode": "1F1EC-1F1EA",
     "digest": "35897f8254675d2efe9e3070c88af9ef214f08440e6ee75ebe81d28cdb57ea2b"
   },
+  {
+    "name": "ge",
+    "unicode": "1F1EC-1F1EA",
+    "digest": "35897f8254675d2efe9e3070c88af9ef214f08440e6ee75ebe81d28cdb57ea2b"
+  },
   {
     "name": "flag_gf",
     "unicode": "1F1EC-1F1EB",
     "digest": "3a34df321635f71a0f2cc4e1eda58d85c29230c77456362345196351bf56533d"
   },
+  {
+    "name": "gf",
+    "unicode": "1F1EC-1F1EB",
+    "digest": "3a34df321635f71a0f2cc4e1eda58d85c29230c77456362345196351bf56533d"
+  },
   {
     "name": "flag_gg",
     "unicode": "1F1EC-1F1EC",
     "digest": "c972f8d190b4e9ca8890df41503d202ffd73981833d3f3750f563302167bcd66"
   },
+  {
+    "name": "gg",
+    "unicode": "1F1EC-1F1EC",
+    "digest": "c972f8d190b4e9ca8890df41503d202ffd73981833d3f3750f563302167bcd66"
+  },
   {
     "name": "flag_gh",
     "unicode": "1F1EC-1F1ED",
     "digest": "9c3d3569bd411389fa0af7c6938d4325cedeb9c0e8f059dc1d5a74c6b8d6d01b"
   },
+  {
+    "name": "gh",
+    "unicode": "1F1EC-1F1ED",
+    "digest": "9c3d3569bd411389fa0af7c6938d4325cedeb9c0e8f059dc1d5a74c6b8d6d01b"
+  },
   {
     "name": "flag_gi",
     "unicode": "1F1EC-1F1EE",
     "digest": "ede638bc6fedc30a01821025d87ec19297500da9c04a7a155984fca186118649"
   },
+  {
+    "name": "gi",
+    "unicode": "1F1EC-1F1EE",
+    "digest": "ede638bc6fedc30a01821025d87ec19297500da9c04a7a155984fca186118649"
+  },
   {
     "name": "flag_gl",
     "unicode": "1F1EC-1F1F1",
     "digest": "a2ce3371eff1da8331671925f707232aa593ac7400d59555c9ca689729ce24ec"
   },
+  {
+    "name": "gl",
+    "unicode": "1F1EC-1F1F1",
+    "digest": "a2ce3371eff1da8331671925f707232aa593ac7400d59555c9ca689729ce24ec"
+  },
   {
     "name": "flag_gm",
     "unicode": "1F1EC-1F1F2",
     "digest": "932bf6eb75ddd4278268dd2f09d8fffcfef89f8fd6b6e86a08a414cd3ceec94d"
   },
+  {
+    "name": "gm",
+    "unicode": "1F1EC-1F1F2",
+    "digest": "932bf6eb75ddd4278268dd2f09d8fffcfef89f8fd6b6e86a08a414cd3ceec94d"
+  },
   {
     "name": "flag_gn",
     "unicode": "1F1EC-1F1F3",
     "digest": "ebf543713895adaa09d64897f24bd461191191b8fcbbcede52bdaf4bd2dc67a8"
   },
+  {
+    "name": "gn",
+    "unicode": "1F1EC-1F1F3",
+    "digest": "ebf543713895adaa09d64897f24bd461191191b8fcbbcede52bdaf4bd2dc67a8"
+  },
   {
     "name": "flag_gp",
     "unicode": "1F1EC-1F1F5",
     "digest": "2e6c48d80c571b34f31fa9b3622dcc51e1707c0118e991e9c177742ff02a8a96"
   },
+  {
+    "name": "gp",
+    "unicode": "1F1EC-1F1F5",
+    "digest": "2e6c48d80c571b34f31fa9b3622dcc51e1707c0118e991e9c177742ff02a8a96"
+  },
   {
     "name": "flag_gq",
     "unicode": "1F1EC-1F1F6",
     "digest": "b0f5810180d12fc48faf75e73f882dc59072d7bf957f8455bf7e1e336539dc41"
   },
+  {
+    "name": "gq",
+    "unicode": "1F1EC-1F1F6",
+    "digest": "b0f5810180d12fc48faf75e73f882dc59072d7bf957f8455bf7e1e336539dc41"
+  },
   {
     "name": "flag_gr",
     "unicode": "1F1EC-1F1F7",
     "digest": "8d60d6f8910f5179d851dbea0798b56a492c6be85f3d55e1a1126cd1d6663a3b"
   },
+  {
+    "name": "gr",
+    "unicode": "1F1EC-1F1F7",
+    "digest": "8d60d6f8910f5179d851dbea0798b56a492c6be85f3d55e1a1126cd1d6663a3b"
+  },
   {
     "name": "flag_gs",
     "unicode": "1F1EC-1F1F8",
     "digest": "7b07915af0e2364ebc386a162d44846f3a7986fdd24e20ad2bc56d64a103fe9c"
   },
+  {
+    "name": "gs",
+    "unicode": "1F1EC-1F1F8",
+    "digest": "7b07915af0e2364ebc386a162d44846f3a7986fdd24e20ad2bc56d64a103fe9c"
+  },
   {
     "name": "flag_gt",
     "unicode": "1F1EC-1F1F9",
     "digest": "0c78108ede45bf34917b409a0867f5ec8253c74b694beda083f3e8d04d7a10d8"
   },
+  {
+    "name": "gt",
+    "unicode": "1F1EC-1F1F9",
+    "digest": "0c78108ede45bf34917b409a0867f5ec8253c74b694beda083f3e8d04d7a10d8"
+  },
   {
     "name": "flag_gu",
     "unicode": "1F1EC-1F1FA",
     "digest": "909f1bc98fa1507adb787eb3875503b21ea937d6ae8bb152153916c2da5e13bb"
   },
+  {
+    "name": "gu",
+    "unicode": "1F1EC-1F1FA",
+    "digest": "909f1bc98fa1507adb787eb3875503b21ea937d6ae8bb152153916c2da5e13bb"
+  },
   {
     "name": "flag_gw",
     "unicode": "1F1EC-1F1FC",
     "digest": "f5f34410c7b22d5ed9994b47d0e7a9d9a6a1f05c4d3142f7fef3e4409725f5e6"
   },
+  {
+    "name": "gw",
+    "unicode": "1F1EC-1F1FC",
+    "digest": "f5f34410c7b22d5ed9994b47d0e7a9d9a6a1f05c4d3142f7fef3e4409725f5e6"
+  },
   {
     "name": "flag_gy",
     "unicode": "1F1EC-1F1FE",
     "digest": "4939cf52ab34a924a31032b42668960a2c7d8d4f998b16b065c247110df334be"
   },
+  {
+    "name": "gy",
+    "unicode": "1F1EC-1F1FE",
+    "digest": "4939cf52ab34a924a31032b42668960a2c7d8d4f998b16b065c247110df334be"
+  },
   {
     "name": "flag_hk",
     "unicode": "1F1ED-1F1F0",
     "digest": "bde0916df6d62f6b1cf8f85a8a39526c97fc6ef6fedb0b0cae2adb127a08eafe"
   },
+  {
+    "name": "hk",
+    "unicode": "1F1ED-1F1F0",
+    "digest": "bde0916df6d62f6b1cf8f85a8a39526c97fc6ef6fedb0b0cae2adb127a08eafe"
+  },
   {
     "name": "flag_hm",
     "unicode": "1F1ED-1F1F2",
     "digest": "603e6c9bff9a0dc941970a313fe98fbf53ff5a57028f1a2766420be4211711cc"
   },
+  {
+    "name": "hm",
+    "unicode": "1F1ED-1F1F2",
+    "digest": "603e6c9bff9a0dc941970a313fe98fbf53ff5a57028f1a2766420be4211711cc"
+  },
   {
     "name": "flag_hn",
     "unicode": "1F1ED-1F1F3",
     "digest": "2953ad0909bc32c02615f6ad5a4e5f331ba794a41632b1f0fc366e1c640cc2b9"
   },
+  {
+    "name": "hn",
+    "unicode": "1F1ED-1F1F3",
+    "digest": "2953ad0909bc32c02615f6ad5a4e5f331ba794a41632b1f0fc366e1c640cc2b9"
+  },
   {
     "name": "flag_hr",
     "unicode": "1F1ED-1F1F7",
     "digest": "41c9ffc4f0faaa2d77e5cffb781329e7d2489ce879bd8eb9c503621e834abc50"
   },
+  {
+    "name": "hr",
+    "unicode": "1F1ED-1F1F7",
+    "digest": "41c9ffc4f0faaa2d77e5cffb781329e7d2489ce879bd8eb9c503621e834abc50"
+  },
   {
     "name": "flag_ht",
     "unicode": "1F1ED-1F1F9",
     "digest": "6a56c3d71b4f858e1774aa2134a9f5584087fec968e9ee8bb1046d2ec93bf059"
   },
+  {
+    "name": "ht",
+    "unicode": "1F1ED-1F1F9",
+    "digest": "6a56c3d71b4f858e1774aa2134a9f5584087fec968e9ee8bb1046d2ec93bf059"
+  },
   {
     "name": "flag_hu",
     "unicode": "1F1ED-1F1FA",
     "digest": "72f5809818d4cab8c0cee73df7f67b820fb8471eea4199911a5917ac099795e8"
   },
+  {
+    "name": "hu",
+    "unicode": "1F1ED-1F1FA",
+    "digest": "72f5809818d4cab8c0cee73df7f67b820fb8471eea4199911a5917ac099795e8"
+  },
   {
     "name": "flag_ic",
     "unicode": "1F1EE-1F1E8",
     "digest": "7e2a7667fcd05f927af47e64c5790c104a9956dd9f1a45f03cb0fdcc85d866d3"
   },
+  {
+    "name": "ic",
+    "unicode": "1F1EE-1F1E8",
+    "digest": "7e2a7667fcd05f927af47e64c5790c104a9956dd9f1a45f03cb0fdcc85d866d3"
+  },
   {
     "name": "flag_id",
     "unicode": "1F1EE-1F1E9",
     "digest": "4721f616fae2e443e52f1e9cc96e4835bddca16a2d75d7d5afea57cdee866b7f"
   },
+  {
+    "name": "indonesia",
+    "unicode": "1F1EE-1F1E9",
+    "digest": "4721f616fae2e443e52f1e9cc96e4835bddca16a2d75d7d5afea57cdee866b7f"
+  },
   {
     "name": "flag_ie",
     "unicode": "1F1EE-1F1EA",
     "digest": "84b19833e6c9fb43187f8a28d85045a3df58816f20a07edab90474323174b1f3"
   },
+  {
+    "name": "ie",
+    "unicode": "1F1EE-1F1EA",
+    "digest": "84b19833e6c9fb43187f8a28d85045a3df58816f20a07edab90474323174b1f3"
+  },
   {
     "name": "flag_il",
     "unicode": "1F1EE-1F1F1",
     "digest": "c99d4bd8c2541cf3a7392c4faf4477d96bc47065dd1423b9e06450483e69b34f"
   },
+  {
+    "name": "il",
+    "unicode": "1F1EE-1F1F1",
+    "digest": "c99d4bd8c2541cf3a7392c4faf4477d96bc47065dd1423b9e06450483e69b34f"
+  },
   {
     "name": "flag_im",
     "unicode": "1F1EE-1F1F2",
     "digest": "5eeb12c0315b527ce61649a38b64d76af726a73b2d381d1a1ddd1366bafb1bfc"
   },
+  {
+    "name": "im",
+    "unicode": "1F1EE-1F1F2",
+    "digest": "5eeb12c0315b527ce61649a38b64d76af726a73b2d381d1a1ddd1366bafb1bfc"
+  },
   {
     "name": "flag_in",
     "unicode": "1F1EE-1F1F3",
     "digest": "ecc3cfcff3368fe0875a51a8be9f4dfd449a187e5beb41a2b34241736247f73b"
   },
+  {
+    "name": "in",
+    "unicode": "1F1EE-1F1F3",
+    "digest": "ecc3cfcff3368fe0875a51a8be9f4dfd449a187e5beb41a2b34241736247f73b"
+  },
   {
     "name": "flag_io",
     "unicode": "1F1EE-1F1F4",
     "digest": "26243d60e04ba3bc9eb8f008bfc77b2a64bcf1a3d0073eb0449a8c8121618c9c"
   },
+  {
+    "name": "io",
+    "unicode": "1F1EE-1F1F4",
+    "digest": "26243d60e04ba3bc9eb8f008bfc77b2a64bcf1a3d0073eb0449a8c8121618c9c"
+  },
   {
     "name": "flag_iq",
     "unicode": "1F1EE-1F1F6",
     "digest": "a1fb5e59575081920b3be5290f654d57a9be099deb56d4ed69eba81a2b531cb3"
   },
+  {
+    "name": "iq",
+    "unicode": "1F1EE-1F1F6",
+    "digest": "a1fb5e59575081920b3be5290f654d57a9be099deb56d4ed69eba81a2b531cb3"
+  },
   {
     "name": "flag_ir",
     "unicode": "1F1EE-1F1F7",
     "digest": "ab89488b934af1d4bdae7ed16dfc74fffe658bb8e95d5161b48cdd06de44ae85"
   },
+  {
+    "name": "ir",
+    "unicode": "1F1EE-1F1F7",
+    "digest": "ab89488b934af1d4bdae7ed16dfc74fffe658bb8e95d5161b48cdd06de44ae85"
+  },
   {
     "name": "flag_is",
     "unicode": "1F1EE-1F1F8",
     "digest": "55db1fc9e6c56d4c9bcb9a46e5e4300cf2a0c32fa91dc24b487a1d56c8097268"
   },
+  {
+    "name": "is",
+    "unicode": "1F1EE-1F1F8",
+    "digest": "55db1fc9e6c56d4c9bcb9a46e5e4300cf2a0c32fa91dc24b487a1d56c8097268"
+  },
   {
     "name": "flag_it",
     "unicode": "1F1EE-1F1F9",
     "digest": "36fc993fb00ab607578a4d0e573e988e17b9459a68a000a48de905a8238589d0"
   },
+  {
+    "name": "it",
+    "unicode": "1F1EE-1F1F9",
+    "digest": "36fc993fb00ab607578a4d0e573e988e17b9459a68a000a48de905a8238589d0"
+  },
   {
     "name": "flag_je",
     "unicode": "1F1EF-1F1EA",
     "digest": "c608dbfd1259330e2f8c40dc5d12ffd0489396f4fc5f3ca57bcb2f0d9d05c20c"
   },
+  {
+    "name": "je",
+    "unicode": "1F1EF-1F1EA",
+    "digest": "c608dbfd1259330e2f8c40dc5d12ffd0489396f4fc5f3ca57bcb2f0d9d05c20c"
+  },
   {
     "name": "flag_jm",
     "unicode": "1F1EF-1F1F2",
     "digest": "a8224b68b2d324f848d75e4376875ef76a8174e6ba32790d9ca622fe1eabfd5f"
   },
+  {
+    "name": "jm",
+    "unicode": "1F1EF-1F1F2",
+    "digest": "a8224b68b2d324f848d75e4376875ef76a8174e6ba32790d9ca622fe1eabfd5f"
+  },
   {
     "name": "flag_jo",
     "unicode": "1F1EF-1F1F4",
     "digest": "2403563dc2ab4ed0e7e3a0761cc09f96801550bba6b177b54d651d8804ad987d"
   },
+  {
+    "name": "jo",
+    "unicode": "1F1EF-1F1F4",
+    "digest": "2403563dc2ab4ed0e7e3a0761cc09f96801550bba6b177b54d651d8804ad987d"
+  },
   {
     "name": "flag_jp",
     "unicode": "1F1EF-1F1F5",
     "digest": "aea8eebd0a0139818cb7629d9c9a8e55160b458eb8ffeee2f36c5cff4b507fd3"
   },
+  {
+    "name": "jp",
+    "unicode": "1F1EF-1F1F5",
+    "digest": "aea8eebd0a0139818cb7629d9c9a8e55160b458eb8ffeee2f36c5cff4b507fd3"
+  },
   {
     "name": "flag_ke",
     "unicode": "1F1F0-1F1EA",
     "digest": "9c8365f74858743bcdce4a9cf6a6f4110faf2dc6433e5dc7d98c24bb3b32a36d"
   },
+  {
+    "name": "ke",
+    "unicode": "1F1F0-1F1EA",
+    "digest": "9c8365f74858743bcdce4a9cf6a6f4110faf2dc6433e5dc7d98c24bb3b32a36d"
+  },
   {
     "name": "flag_kg",
     "unicode": "1F1F0-1F1EC",
     "digest": "0c72bdb1d64b1e3be3d9516a50655a6162d8501851d2cf2fadb8c6ef7740df4e"
   },
+  {
+    "name": "kg",
+    "unicode": "1F1F0-1F1EC",
+    "digest": "0c72bdb1d64b1e3be3d9516a50655a6162d8501851d2cf2fadb8c6ef7740df4e"
+  },
   {
     "name": "flag_kh",
     "unicode": "1F1F0-1F1ED",
     "digest": "49e41e488732d789e395091e144cd6215c6818ba2073e5e22ea21203a737d03c"
   },
+  {
+    "name": "kh",
+    "unicode": "1F1F0-1F1ED",
+    "digest": "49e41e488732d789e395091e144cd6215c6818ba2073e5e22ea21203a737d03c"
+  },
   {
     "name": "flag_ki",
     "unicode": "1F1F0-1F1EE",
     "digest": "9d7f168adbcf5f4cfe28470addfdb0a8b231438d593edb70f633981bfa4c7638"
   },
+  {
+    "name": "ki",
+    "unicode": "1F1F0-1F1EE",
+    "digest": "9d7f168adbcf5f4cfe28470addfdb0a8b231438d593edb70f633981bfa4c7638"
+  },
   {
     "name": "flag_km",
     "unicode": "1F1F0-1F1F2",
     "digest": "9318c28957fa7a19eba5ec452c1cbce01a5a83d41d29d081614d3abb0585d478"
   },
+  {
+    "name": "km",
+    "unicode": "1F1F0-1F1F2",
+    "digest": "9318c28957fa7a19eba5ec452c1cbce01a5a83d41d29d081614d3abb0585d478"
+  },
   {
     "name": "flag_kn",
     "unicode": "1F1F0-1F1F3",
     "digest": "eac7e7d0f023dee5c0c8559bc2c9a96273adda54ce47598025120b30d8d6ebc1"
   },
+  {
+    "name": "kn",
+    "unicode": "1F1F0-1F1F3",
+    "digest": "eac7e7d0f023dee5c0c8559bc2c9a96273adda54ce47598025120b30d8d6ebc1"
+  },
   {
     "name": "flag_kp",
     "unicode": "1F1F0-1F1F5",
     "digest": "d4d53db6f8363174de6db864c056267ba8a7d7e87b5527f2f42bb9b8ac3f362b"
   },
+  {
+    "name": "kp",
+    "unicode": "1F1F0-1F1F5",
+    "digest": "d4d53db6f8363174de6db864c056267ba8a7d7e87b5527f2f42bb9b8ac3f362b"
+  },
   {
     "name": "flag_kr",
     "unicode": "1F1F0-1F1F7",
     "digest": "5c7e61ab4a2aae70cbe51f0ca4718516002bc943b35d870bd853a0c98c4e0ed5"
   },
+  {
+    "name": "kr",
+    "unicode": "1F1F0-1F1F7",
+    "digest": "5c7e61ab4a2aae70cbe51f0ca4718516002bc943b35d870bd853a0c98c4e0ed5"
+  },
   {
     "name": "flag_kw",
     "unicode": "1F1F0-1F1FC",
     "digest": "5d229cd99d25f4285bd30d98cfcc3cd8346648897476e2905a1811ceeef48d37"
   },
+  {
+    "name": "kw",
+    "unicode": "1F1F0-1F1FC",
+    "digest": "5d229cd99d25f4285bd30d98cfcc3cd8346648897476e2905a1811ceeef48d37"
+  },
   {
     "name": "flag_ky",
     "unicode": "1F1F0-1F1FE",
     "digest": "9ce3d8dfc273d3a400960876c434b702f93df92c6c00682dbed2ec8e3966d8a8"
   },
+  {
+    "name": "ky",
+    "unicode": "1F1F0-1F1FE",
+    "digest": "9ce3d8dfc273d3a400960876c434b702f93df92c6c00682dbed2ec8e3966d8a8"
+  },
   {
     "name": "flag_kz",
     "unicode": "1F1F0-1F1FF",
     "digest": "a6f0be0a767fa4824495d568d9fc2bd8d4c1a26f363873d3b65362e9383e2a50"
   },
+  {
+    "name": "kz",
+    "unicode": "1F1F0-1F1FF",
+    "digest": "a6f0be0a767fa4824495d568d9fc2bd8d4c1a26f363873d3b65362e9383e2a50"
+  },
   {
     "name": "flag_la",
     "unicode": "1F1F1-1F1E6",
     "digest": "ab2ae96da87f7b53ab212f8dcd897a591cff9ea6666270097a8e739ee0b8f8cb"
   },
+  {
+    "name": "la",
+    "unicode": "1F1F1-1F1E6",
+    "digest": "ab2ae96da87f7b53ab212f8dcd897a591cff9ea6666270097a8e739ee0b8f8cb"
+  },
   {
     "name": "flag_lb",
     "unicode": "1F1F1-1F1E7",
     "digest": "0c3fcab22e9fae1c78658290aff97de785d0b6adb5e3702d00073ce774b7ed54"
   },
+  {
+    "name": "lb",
+    "unicode": "1F1F1-1F1E7",
+    "digest": "0c3fcab22e9fae1c78658290aff97de785d0b6adb5e3702d00073ce774b7ed54"
+  },
   {
     "name": "flag_lc",
     "unicode": "1F1F1-1F1E8",
     "digest": "e154b0b3a1635a36e0d9ad518c0ea12259320e5f1ebbda982248486492065d28"
   },
+  {
+    "name": "lc",
+    "unicode": "1F1F1-1F1E8",
+    "digest": "e154b0b3a1635a36e0d9ad518c0ea12259320e5f1ebbda982248486492065d28"
+  },
   {
     "name": "flag_li",
     "unicode": "1F1F1-1F1EE",
     "digest": "bbc393a89e73cc8c29a0a9297428d07aa1d4717ea9b7d4dd9d69f21ac7d0605d"
   },
+  {
+    "name": "li",
+    "unicode": "1F1F1-1F1EE",
+    "digest": "bbc393a89e73cc8c29a0a9297428d07aa1d4717ea9b7d4dd9d69f21ac7d0605d"
+  },
   {
     "name": "flag_lk",
     "unicode": "1F1F1-1F1F0",
     "digest": "376bd501d113a844971ca1006ab31aa086cd55d74842ea5f3dedaba997b58693"
   },
+  {
+    "name": "lk",
+    "unicode": "1F1F1-1F1F0",
+    "digest": "376bd501d113a844971ca1006ab31aa086cd55d74842ea5f3dedaba997b58693"
+  },
   {
     "name": "flag_lr",
     "unicode": "1F1F1-1F1F7",
     "digest": "9a6ebe1c9d9a53079ee77292a5ad0965f96409b0417f92876a1c3bd463d6a9bc"
   },
+  {
+    "name": "lr",
+    "unicode": "1F1F1-1F1F7",
+    "digest": "9a6ebe1c9d9a53079ee77292a5ad0965f96409b0417f92876a1c3bd463d6a9bc"
+  },
   {
     "name": "flag_ls",
     "unicode": "1F1F1-1F1F8",
     "digest": "e2f4b05414f6e0c3d629a92b0534d4145475f0214a83a62c902fe0884c833c89"
   },
+  {
+    "name": "ls",
+    "unicode": "1F1F1-1F1F8",
+    "digest": "e2f4b05414f6e0c3d629a92b0534d4145475f0214a83a62c902fe0884c833c89"
+  },
   {
     "name": "flag_lt",
     "unicode": "1F1F1-1F1F9",
     "digest": "d5e2f8b2ffa820a33ea6d612fccd61e32467d25154342f5be134d3520e48387f"
   },
+  {
+    "name": "lt",
+    "unicode": "1F1F1-1F1F9",
+    "digest": "d5e2f8b2ffa820a33ea6d612fccd61e32467d25154342f5be134d3520e48387f"
+  },
   {
     "name": "flag_lu",
     "unicode": "1F1F1-1F1FA",
     "digest": "f43277103292195b51981d08e2dde68eab660a65c7875f510e09a8b2370f1b5c"
   },
+  {
+    "name": "lu",
+    "unicode": "1F1F1-1F1FA",
+    "digest": "f43277103292195b51981d08e2dde68eab660a65c7875f510e09a8b2370f1b5c"
+  },
   {
     "name": "flag_lv",
     "unicode": "1F1F1-1F1FB",
     "digest": "e1288ac5c80d6e9d577d652e34be247ca39bf9d3d7cfc8a6cae13c1f9ac9dc47"
   },
+  {
+    "name": "lv",
+    "unicode": "1F1F1-1F1FB",
+    "digest": "e1288ac5c80d6e9d577d652e34be247ca39bf9d3d7cfc8a6cae13c1f9ac9dc47"
+  },
   {
     "name": "flag_ly",
     "unicode": "1F1F1-1F1FE",
     "digest": "5122294b769a174e3b6e3d238bb846b3e760929f5bb3c1a708d8a429f3f32f68"
   },
+  {
+    "name": "ly",
+    "unicode": "1F1F1-1F1FE",
+    "digest": "5122294b769a174e3b6e3d238bb846b3e760929f5bb3c1a708d8a429f3f32f68"
+  },
   {
     "name": "flag_ma",
     "unicode": "1F1F2-1F1E6",
     "digest": "615a6447ff284de7689b4fd7b04fdda308f65dbbec958cfb96d2977514981d16"
   },
+  {
+    "name": "ma",
+    "unicode": "1F1F2-1F1E6",
+    "digest": "615a6447ff284de7689b4fd7b04fdda308f65dbbec958cfb96d2977514981d16"
+  },
   {
     "name": "flag_mc",
     "unicode": "1F1F2-1F1E8",
     "digest": "08b48b28938acbfc0fbc15c25ee14dbad7164c5165d03df2eee370755ee7b4cf"
   },
+  {
+    "name": "mc",
+    "unicode": "1F1F2-1F1E8",
+    "digest": "08b48b28938acbfc0fbc15c25ee14dbad7164c5165d03df2eee370755ee7b4cf"
+  },
   {
     "name": "flag_md",
     "unicode": "1F1F2-1F1E9",
     "digest": "93d61de68f821e1e08b30e63d91e8b4a657766475128538894cf9da9a3b4e3c0"
   },
+  {
+    "name": "md",
+    "unicode": "1F1F2-1F1E9",
+    "digest": "93d61de68f821e1e08b30e63d91e8b4a657766475128538894cf9da9a3b4e3c0"
+  },
   {
     "name": "flag_me",
     "unicode": "1F1F2-1F1EA",
     "digest": "ee55c0eb78241aec2baf1822a47fa46d63209ceae3db7617ae886b823ae229ff"
   },
+  {
+    "name": "me",
+    "unicode": "1F1F2-1F1EA",
+    "digest": "ee55c0eb78241aec2baf1822a47fa46d63209ceae3db7617ae886b823ae229ff"
+  },
   {
     "name": "flag_mf",
     "unicode": "1F1F2-1F1EB",
     "digest": "62627702e3e3768808c12f153a527ffcc492ad74d8cdc1858cfde971efd0c8ee"
   },
+  {
+    "name": "mf",
+    "unicode": "1F1F2-1F1EB",
+    "digest": "62627702e3e3768808c12f153a527ffcc492ad74d8cdc1858cfde971efd0c8ee"
+  },
   {
     "name": "flag_mg",
     "unicode": "1F1F2-1F1EC",
     "digest": "86ec8140e2c4854f52cff74757baf0cbb75a4aacca8be6af8c8f9c939a7b866c"
   },
+  {
+    "name": "mg",
+    "unicode": "1F1F2-1F1EC",
+    "digest": "86ec8140e2c4854f52cff74757baf0cbb75a4aacca8be6af8c8f9c939a7b866c"
+  },
   {
     "name": "flag_mh",
     "unicode": "1F1F2-1F1ED",
     "digest": "8311ea3422c9d5e94b55e19b03bedd6fe6e2a191b7657e15ac75a48932958a5b"
   },
+  {
+    "name": "mh",
+    "unicode": "1F1F2-1F1ED",
+    "digest": "8311ea3422c9d5e94b55e19b03bedd6fe6e2a191b7657e15ac75a48932958a5b"
+  },
   {
     "name": "flag_mk",
     "unicode": "1F1F2-1F1F0",
     "digest": "5c6f504f88c5a875c06ac8b26fa6e81a9d79c42a1c7d1fad9a5d4c8ad06ca502"
   },
+  {
+    "name": "mk",
+    "unicode": "1F1F2-1F1F0",
+    "digest": "5c6f504f88c5a875c06ac8b26fa6e81a9d79c42a1c7d1fad9a5d4c8ad06ca502"
+  },
   {
     "name": "flag_ml",
     "unicode": "1F1F2-1F1F1",
     "digest": "d08a4973db40cf28e58ca3c80e8bd4e50d68ba1080b31917aeefdb0e210b5c50"
   },
+  {
+    "name": "ml",
+    "unicode": "1F1F2-1F1F1",
+    "digest": "d08a4973db40cf28e58ca3c80e8bd4e50d68ba1080b31917aeefdb0e210b5c50"
+  },
   {
     "name": "flag_mm",
     "unicode": "1F1F2-1F1F2",
     "digest": "5e95089514ca09bb93afb481b317477c9d053adcf450e0b711d78ed1078c7470"
   },
+  {
+    "name": "mm",
+    "unicode": "1F1F2-1F1F2",
+    "digest": "5e95089514ca09bb93afb481b317477c9d053adcf450e0b711d78ed1078c7470"
+  },
   {
     "name": "flag_mn",
     "unicode": "1F1F2-1F1F3",
     "digest": "7a0ca72715dd2a36eeeed2f8c888497cb752f0000af8f07d6930743caf6e4273"
   },
+  {
+    "name": "mn",
+    "unicode": "1F1F2-1F1F3",
+    "digest": "7a0ca72715dd2a36eeeed2f8c888497cb752f0000af8f07d6930743caf6e4273"
+  },
   {
     "name": "flag_mo",
     "unicode": "1F1F2-1F1F4",
     "digest": "d2c7c2191bc1bc83d85f2270968cb4de5cf26a11f70e166a8b32c108287ef729"
   },
+  {
+    "name": "mo",
+    "unicode": "1F1F2-1F1F4",
+    "digest": "d2c7c2191bc1bc83d85f2270968cb4de5cf26a11f70e166a8b32c108287ef729"
+  },
   {
     "name": "flag_mp",
     "unicode": "1F1F2-1F1F5",
     "digest": "89ad06121fd7981338fe188464491bea371f85125bfb4fc01fb5cad606613b1e"
   },
+  {
+    "name": "mp",
+    "unicode": "1F1F2-1F1F5",
+    "digest": "89ad06121fd7981338fe188464491bea371f85125bfb4fc01fb5cad606613b1e"
+  },
   {
     "name": "flag_mq",
     "unicode": "1F1F2-1F1F6",
     "digest": "98176f3af823b26a3657a17c5073ee22367898b40bd3973de76329aa87ca5a2e"
   },
+  {
+    "name": "mq",
+    "unicode": "1F1F2-1F1F6",
+    "digest": "98176f3af823b26a3657a17c5073ee22367898b40bd3973de76329aa87ca5a2e"
+  },
   {
     "name": "flag_mr",
     "unicode": "1F1F2-1F1F7",
     "digest": "cc3e705ad84f83fe2d544385c39564743024dab26595d62469b35fdb791f6015"
   },
+  {
+    "name": "mr",
+    "unicode": "1F1F2-1F1F7",
+    "digest": "cc3e705ad84f83fe2d544385c39564743024dab26595d62469b35fdb791f6015"
+  },
   {
     "name": "flag_ms",
     "unicode": "1F1F2-1F1F8",
     "digest": "465e3d5700b557f2589bd6e34a0c6b12c634a6ed4dcfbee3c1c841c5de3413f0"
   },
+  {
+    "name": "ms",
+    "unicode": "1F1F2-1F1F8",
+    "digest": "465e3d5700b557f2589bd6e34a0c6b12c634a6ed4dcfbee3c1c841c5de3413f0"
+  },
   {
     "name": "flag_mt",
     "unicode": "1F1F2-1F1F9",
     "digest": "e610ba22d8d8ad750ed10dff8e1b4d89bc34f066c3424bfa77dbdc1a5d79743a"
   },
+  {
+    "name": "mt",
+    "unicode": "1F1F2-1F1F9",
+    "digest": "e610ba22d8d8ad750ed10dff8e1b4d89bc34f066c3424bfa77dbdc1a5d79743a"
+  },
   {
     "name": "flag_mu",
     "unicode": "1F1F2-1F1FA",
     "digest": "3daf015d3b95218677dafbb282b7804686aa68875a6bd1d70c165b7b149e19cb"
   },
+  {
+    "name": "mu",
+    "unicode": "1F1F2-1F1FA",
+    "digest": "3daf015d3b95218677dafbb282b7804686aa68875a6bd1d70c165b7b149e19cb"
+  },
   {
     "name": "flag_mv",
     "unicode": "1F1F2-1F1FB",
     "digest": "d30e4bfd04f08177de92f3c175600aaafa89b9668bbe2b83f35f07a74382065c"
   },
+  {
+    "name": "mv",
+    "unicode": "1F1F2-1F1FB",
+    "digest": "d30e4bfd04f08177de92f3c175600aaafa89b9668bbe2b83f35f07a74382065c"
+  },
   {
     "name": "flag_mw",
     "unicode": "1F1F2-1F1FC",
     "digest": "f364b1c8bfda3f86b5e26422eedc571ba11e312dcc634197631a6840cb22aede"
   },
+  {
+    "name": "mw",
+    "unicode": "1F1F2-1F1FC",
+    "digest": "f364b1c8bfda3f86b5e26422eedc571ba11e312dcc634197631a6840cb22aede"
+  },
   {
     "name": "flag_mx",
     "unicode": "1F1F2-1F1FD",
     "digest": "eafb02ec0be9cefab7cef7c426c7d860d98e4947f4da04054154dc86d8f487c4"
   },
+  {
+    "name": "mx",
+    "unicode": "1F1F2-1F1FD",
+    "digest": "eafb02ec0be9cefab7cef7c426c7d860d98e4947f4da04054154dc86d8f487c4"
+  },
   {
     "name": "flag_my",
     "unicode": "1F1F2-1F1FE",
     "digest": "9a690b357bc6b970781bd122c1e546ade3ccb73d930c2af1008b82027e36c7cf"
   },
+  {
+    "name": "my",
+    "unicode": "1F1F2-1F1FE",
+    "digest": "9a690b357bc6b970781bd122c1e546ade3ccb73d930c2af1008b82027e36c7cf"
+  },
   {
     "name": "flag_mz",
     "unicode": "1F1F2-1F1FF",
     "digest": "36d0548ebfef9e0443ec1d0597ebfa6e95c25b997381f30c8c74008820743bb9"
   },
+  {
+    "name": "mz",
+    "unicode": "1F1F2-1F1FF",
+    "digest": "36d0548ebfef9e0443ec1d0597ebfa6e95c25b997381f30c8c74008820743bb9"
+  },
   {
     "name": "flag_na",
     "unicode": "1F1F3-1F1E6",
     "digest": "4989dc9452b0bdfa101cfd3b7c83ef1195a7e45128b9ed00193fe712a6d02fca"
   },
+  {
+    "name": "na",
+    "unicode": "1F1F3-1F1E6",
+    "digest": "4989dc9452b0bdfa101cfd3b7c83ef1195a7e45128b9ed00193fe712a6d02fca"
+  },
   {
     "name": "flag_nc",
     "unicode": "1F1F3-1F1E8",
     "digest": "7fc9d865eebf729d5496c4cd7576476ec599f65b379d4a6df66b4e399553c2eb"
   },
+  {
+    "name": "nc",
+    "unicode": "1F1F3-1F1E8",
+    "digest": "7fc9d865eebf729d5496c4cd7576476ec599f65b379d4a6df66b4e399553c2eb"
+  },
   {
     "name": "flag_ne",
     "unicode": "1F1F3-1F1EA",
     "digest": "d3f10fb44ec44a04112bc66d05f0a44c6ec46dae73cfd3fe26cdc8b32ec06713"
   },
+  {
+    "name": "ne",
+    "unicode": "1F1F3-1F1EA",
+    "digest": "d3f10fb44ec44a04112bc66d05f0a44c6ec46dae73cfd3fe26cdc8b32ec06713"
+  },
   {
     "name": "flag_nf",
     "unicode": "1F1F3-1F1EB",
     "digest": "d390e0d52215a025380af221ba9e955e5886edbb4c9f4b124f2fb60a8e019e42"
   },
+  {
+    "name": "nf",
+    "unicode": "1F1F3-1F1EB",
+    "digest": "d390e0d52215a025380af221ba9e955e5886edbb4c9f4b124f2fb60a8e019e42"
+  },
   {
     "name": "flag_ng",
     "unicode": "1F1F3-1F1EC",
     "digest": "e69d1bb8f1db4a0c295c90dda23d8f97c2dea59f9a2da2ecb0e9a1dc4dbea101"
   },
+  {
+    "name": "nigeria",
+    "unicode": "1F1F3-1F1EC",
+    "digest": "e69d1bb8f1db4a0c295c90dda23d8f97c2dea59f9a2da2ecb0e9a1dc4dbea101"
+  },
   {
     "name": "flag_ni",
     "unicode": "1F1F3-1F1EE",
     "digest": "dbaccc942637469b0ee75bd5f956958c3c5a89d8f69b69c96f02ab6594124894"
   },
+  {
+    "name": "ni",
+    "unicode": "1F1F3-1F1EE",
+    "digest": "dbaccc942637469b0ee75bd5f956958c3c5a89d8f69b69c96f02ab6594124894"
+  },
   {
     "name": "flag_nl",
     "unicode": "1F1F3-1F1F1",
     "digest": "bda2eb0315763c3c19d37c664dab1ee4280f20888a0ca57677fd33cfa4240910"
   },
+  {
+    "name": "nl",
+    "unicode": "1F1F3-1F1F1",
+    "digest": "bda2eb0315763c3c19d37c664dab1ee4280f20888a0ca57677fd33cfa4240910"
+  },
   {
     "name": "flag_no",
     "unicode": "1F1F3-1F1F4",
     "digest": "42b49dec756a220781ea271ca8fbcaba524dc3b38d5d8f999bfaa40ef9ebd302"
   },
+  {
+    "name": "no",
+    "unicode": "1F1F3-1F1F4",
+    "digest": "42b49dec756a220781ea271ca8fbcaba524dc3b38d5d8f999bfaa40ef9ebd302"
+  },
   {
     "name": "flag_np",
     "unicode": "1F1F3-1F1F5",
     "digest": "b5259257db079235310d5d9537d2b5b61ae0326bc8920ba13084b009844e2957"
   },
+  {
+    "name": "np",
+    "unicode": "1F1F3-1F1F5",
+    "digest": "b5259257db079235310d5d9537d2b5b61ae0326bc8920ba13084b009844e2957"
+  },
   {
     "name": "flag_nr",
     "unicode": "1F1F3-1F1F7",
     "digest": "1bd7d1fe2c3a5e98cfd4dff6e8d6dd6d3c74f0051ad615587d77d2291a9784cc"
   },
+  {
+    "name": "nr",
+    "unicode": "1F1F3-1F1F7",
+    "digest": "1bd7d1fe2c3a5e98cfd4dff6e8d6dd6d3c74f0051ad615587d77d2291a9784cc"
+  },
   {
     "name": "flag_nu",
     "unicode": "1F1F3-1F1FA",
     "digest": "e2a7a398e07d2232147cc0917d72d18b519246d3d314e9f6f03dcf98d312d4ce"
   },
+  {
+    "name": "nu",
+    "unicode": "1F1F3-1F1FA",
+    "digest": "e2a7a398e07d2232147cc0917d72d18b519246d3d314e9f6f03dcf98d312d4ce"
+  },
   {
     "name": "flag_nz",
     "unicode": "1F1F3-1F1FF",
     "digest": "ce8b1cb87dae3a3ec865575b57a0b4987a7f4bd3f170e7b210dd764fc2588cd4"
   },
+  {
+    "name": "nz",
+    "unicode": "1F1F3-1F1FF",
+    "digest": "ce8b1cb87dae3a3ec865575b57a0b4987a7f4bd3f170e7b210dd764fc2588cd4"
+  },
   {
     "name": "flag_om",
     "unicode": "1F1F4-1F1F2",
     "digest": "29da72505a276a8a372a00c197388ebc5098c221cab26b3ff755bd62b10f740f"
   },
+  {
+    "name": "om",
+    "unicode": "1F1F4-1F1F2",
+    "digest": "29da72505a276a8a372a00c197388ebc5098c221cab26b3ff755bd62b10f740f"
+  },
   {
     "name": "flag_pa",
     "unicode": "1F1F5-1F1E6",
     "digest": "180b673c9aceea43a8b55823a82d80600257e4982d0757d129860e3d8a14f458"
   },
+  {
+    "name": "pa",
+    "unicode": "1F1F5-1F1E6",
+    "digest": "180b673c9aceea43a8b55823a82d80600257e4982d0757d129860e3d8a14f458"
+  },
   {
     "name": "flag_pe",
     "unicode": "1F1F5-1F1EA",
     "digest": "b61823ea2cd91e371e40832df5764558b81d44fac41030827a3f6d2564643c00"
   },
+  {
+    "name": "pe",
+    "unicode": "1F1F5-1F1EA",
+    "digest": "b61823ea2cd91e371e40832df5764558b81d44fac41030827a3f6d2564643c00"
+  },
   {
     "name": "flag_pf",
     "unicode": "1F1F5-1F1EB",
     "digest": "e560421911f4af90c73a0dbdf8f42e69316003799304c9394fb127e3b83326fa"
   },
+  {
+    "name": "pf",
+    "unicode": "1F1F5-1F1EB",
+    "digest": "e560421911f4af90c73a0dbdf8f42e69316003799304c9394fb127e3b83326fa"
+  },
   {
     "name": "flag_pg",
     "unicode": "1F1F5-1F1EC",
     "digest": "880e87db2ce0eac38db037683a5db46fd6ce30623cf56ae4a93a747103570044"
   },
+  {
+    "name": "pg",
+    "unicode": "1F1F5-1F1EC",
+    "digest": "880e87db2ce0eac38db037683a5db46fd6ce30623cf56ae4a93a747103570044"
+  },
   {
     "name": "flag_ph",
     "unicode": "1F1F5-1F1ED",
     "digest": "49aae2f56bfd1385741dc76857aa1f1459778b2d39a1c955e469c5367585bfd5"
   },
+  {
+    "name": "ph",
+    "unicode": "1F1F5-1F1ED",
+    "digest": "49aae2f56bfd1385741dc76857aa1f1459778b2d39a1c955e469c5367585bfd5"
+  },
   {
     "name": "flag_pk",
     "unicode": "1F1F5-1F1F0",
     "digest": "64379dbfc932df3a07935b5cfa11ca151f761d3728939e982604e12c663cd646"
   },
+  {
+    "name": "pk",
+    "unicode": "1F1F5-1F1F0",
+    "digest": "64379dbfc932df3a07935b5cfa11ca151f761d3728939e982604e12c663cd646"
+  },
   {
     "name": "flag_pl",
     "unicode": "1F1F5-1F1F1",
     "digest": "3b688b074c2735d3dea0b7ab74b80eba243ce50cb05d68e585c9d701c1f14617"
   },
+  {
+    "name": "pl",
+    "unicode": "1F1F5-1F1F1",
+    "digest": "3b688b074c2735d3dea0b7ab74b80eba243ce50cb05d68e585c9d701c1f14617"
+  },
   {
     "name": "flag_pm",
     "unicode": "1F1F5-1F1F2",
     "digest": "a13a69ee3131501dd8138173cfb669a35ee8039d84aa665e69dd7f0d0aa3e717"
   },
+  {
+    "name": "pm",
+    "unicode": "1F1F5-1F1F2",
+    "digest": "a13a69ee3131501dd8138173cfb669a35ee8039d84aa665e69dd7f0d0aa3e717"
+  },
   {
     "name": "flag_pn",
     "unicode": "1F1F5-1F1F3",
     "digest": "d7ae3985cf66024e4a3001e79a8efbb3e75571f2b0abbd0fb87fc1efc795a2b3"
   },
+  {
+    "name": "pn",
+    "unicode": "1F1F5-1F1F3",
+    "digest": "d7ae3985cf66024e4a3001e79a8efbb3e75571f2b0abbd0fb87fc1efc795a2b3"
+  },
   {
     "name": "flag_pr",
     "unicode": "1F1F5-1F1F7",
     "digest": "4910dc984bc908158506b770f28af56150cbb4509a4291947dfa2479b9e4b308"
   },
+  {
+    "name": "pr",
+    "unicode": "1F1F5-1F1F7",
+    "digest": "4910dc984bc908158506b770f28af56150cbb4509a4291947dfa2479b9e4b308"
+  },
   {
     "name": "flag_ps",
     "unicode": "1F1F5-1F1F8",
     "digest": "b2bca7619fced25de94d7bd398537857460348a552e7d73d189aef3f428e6a13"
   },
+  {
+    "name": "ps",
+    "unicode": "1F1F5-1F1F8",
+    "digest": "b2bca7619fced25de94d7bd398537857460348a552e7d73d189aef3f428e6a13"
+  },
   {
     "name": "flag_pt",
     "unicode": "1F1F5-1F1F9",
     "digest": "177282613b4b8b4d9551f1da6a1c3f66f1b96cf67c71c7d164213b26b3237395"
   },
+  {
+    "name": "pt",
+    "unicode": "1F1F5-1F1F9",
+    "digest": "177282613b4b8b4d9551f1da6a1c3f66f1b96cf67c71c7d164213b26b3237395"
+  },
   {
     "name": "flag_pw",
     "unicode": "1F1F5-1F1FC",
     "digest": "2ff42a14bdc7df76b5f989dca381f94765032b26ae47d47b97844abde458cefe"
   },
+  {
+    "name": "pw",
+    "unicode": "1F1F5-1F1FC",
+    "digest": "2ff42a14bdc7df76b5f989dca381f94765032b26ae47d47b97844abde458cefe"
+  },
   {
     "name": "flag_py",
     "unicode": "1F1F5-1F1FE",
     "digest": "80169b69a46c4c67d0090dc2c6bf05d1a14f133ac7ae56f811547e8e8f70d81b"
   },
+  {
+    "name": "py",
+    "unicode": "1F1F5-1F1FE",
+    "digest": "80169b69a46c4c67d0090dc2c6bf05d1a14f133ac7ae56f811547e8e8f70d81b"
+  },
   {
     "name": "flag_qa",
     "unicode": "1F1F6-1F1E6",
     "digest": "589b44b975aa97426afb8db7f8b355491fca246b693903485824bf0f5a6953a2"
   },
+  {
+    "name": "qa",
+    "unicode": "1F1F6-1F1E6",
+    "digest": "589b44b975aa97426afb8db7f8b355491fca246b693903485824bf0f5a6953a2"
+  },
   {
     "name": "flag_re",
     "unicode": "1F1F7-1F1EA",
     "digest": "77d242261742831a142c9ec74cd17d76b1e6d1af751ff3c6a356646744bc798a"
   },
+  {
+    "name": "re",
+    "unicode": "1F1F7-1F1EA",
+    "digest": "77d242261742831a142c9ec74cd17d76b1e6d1af751ff3c6a356646744bc798a"
+  },
   {
     "name": "flag_ro",
     "unicode": "1F1F7-1F1F4",
     "digest": "d7d17026ea81f27456983722540f9a23343a3a1b22e7697c4fba118ce8b4719e"
   },
+  {
+    "name": "ro",
+    "unicode": "1F1F7-1F1F4",
+    "digest": "d7d17026ea81f27456983722540f9a23343a3a1b22e7697c4fba118ce8b4719e"
+  },
   {
     "name": "flag_rs",
     "unicode": "1F1F7-1F1F8",
     "digest": "e466a18cc0368e623d3fe33a036c1e88db91ae24f7510e17caacc85c41f1bac8"
   },
+  {
+    "name": "rs",
+    "unicode": "1F1F7-1F1F8",
+    "digest": "e466a18cc0368e623d3fe33a036c1e88db91ae24f7510e17caacc85c41f1bac8"
+  },
   {
     "name": "flag_ru",
     "unicode": "1F1F7-1F1FA",
     "digest": "86bf53a62dfc4c434d910f43df70f430fc67c0070fe3fc466c4fbfd6a5d8e646"
   },
+  {
+    "name": "ru",
+    "unicode": "1F1F7-1F1FA",
+    "digest": "86bf53a62dfc4c434d910f43df70f430fc67c0070fe3fc466c4fbfd6a5d8e646"
+  },
   {
     "name": "flag_rw",
     "unicode": "1F1F7-1F1FC",
     "digest": "38ec5a01896c9747a8dbf865d5e8584770e587253b7af3d3b9c36cd993f67518"
   },
+  {
+    "name": "rw",
+    "unicode": "1F1F7-1F1FC",
+    "digest": "38ec5a01896c9747a8dbf865d5e8584770e587253b7af3d3b9c36cd993f67518"
+  },
   {
     "name": "flag_sa",
     "unicode": "1F1F8-1F1E6",
     "digest": "a44d0b145f2a0b68eace24ecfd27519e9525ec764836728bc9c1fe96ccb811a0"
   },
+  {
+    "name": "saudiarabia",
+    "unicode": "1F1F8-1F1E6",
+    "digest": "a44d0b145f2a0b68eace24ecfd27519e9525ec764836728bc9c1fe96ccb811a0"
+  },
+  {
+    "name": "saudi",
+    "unicode": "1F1F8-1F1E6",
+    "digest": "a44d0b145f2a0b68eace24ecfd27519e9525ec764836728bc9c1fe96ccb811a0"
+  },
   {
     "name": "flag_sb",
     "unicode": "1F1F8-1F1E7",
     "digest": "8ffa24c5cb92be4dbe43f6cd85b61b9608a3101bd78ebccff4fe99c209b3e241"
   },
+  {
+    "name": "sb",
+    "unicode": "1F1F8-1F1E7",
+    "digest": "8ffa24c5cb92be4dbe43f6cd85b61b9608a3101bd78ebccff4fe99c209b3e241"
+  },
   {
     "name": "flag_sc",
     "unicode": "1F1F8-1F1E8",
     "digest": "227d090ac2cbf317e594567b6114b5063a13cfe33abf990d37b200debcfadabb"
   },
+  {
+    "name": "sc",
+    "unicode": "1F1F8-1F1E8",
+    "digest": "227d090ac2cbf317e594567b6114b5063a13cfe33abf990d37b200debcfadabb"
+  },
   {
     "name": "flag_sd",
     "unicode": "1F1F8-1F1E9",
     "digest": "350f3332e8ea1138e54facc870dd0fea5f2ab7d3fd4baa02ed8627ae79642f6c"
   },
+  {
+    "name": "sd",
+    "unicode": "1F1F8-1F1E9",
+    "digest": "350f3332e8ea1138e54facc870dd0fea5f2ab7d3fd4baa02ed8627ae79642f6c"
+  },
   {
     "name": "flag_se",
     "unicode": "1F1F8-1F1EA",
     "digest": "c1b09f36c263727de83b54376f05e083a17a61941af9a1640b826629256a280d"
   },
+  {
+    "name": "se",
+    "unicode": "1F1F8-1F1EA",
+    "digest": "c1b09f36c263727de83b54376f05e083a17a61941af9a1640b826629256a280d"
+  },
   {
     "name": "flag_sg",
     "unicode": "1F1F8-1F1EC",
     "digest": "e6fc26920dfc07e4fd3c8d897de9c607e0bf48a3b64a13630c858d707a8e7660"
   },
+  {
+    "name": "sg",
+    "unicode": "1F1F8-1F1EC",
+    "digest": "e6fc26920dfc07e4fd3c8d897de9c607e0bf48a3b64a13630c858d707a8e7660"
+  },
   {
     "name": "flag_sh",
     "unicode": "1F1F8-1F1ED",
     "digest": "f2c22ab0eb49e3104c35f1c0268b1e63c3a67f41b0cfa9861b189525988e53b6"
   },
+  {
+    "name": "sh",
+    "unicode": "1F1F8-1F1ED",
+    "digest": "f2c22ab0eb49e3104c35f1c0268b1e63c3a67f41b0cfa9861b189525988e53b6"
+  },
   {
     "name": "flag_si",
     "unicode": "1F1F8-1F1EE",
     "digest": "1ef0b10e498f71591322f9d8ec122d39838f479370cf7ee922560986ef6c4f2e"
   },
+  {
+    "name": "si",
+    "unicode": "1F1F8-1F1EE",
+    "digest": "1ef0b10e498f71591322f9d8ec122d39838f479370cf7ee922560986ef6c4f2e"
+  },
   {
     "name": "flag_sj",
     "unicode": "1F1F8-1F1EF",
     "digest": "ce913b007f84a9cba2add8d754aa791901624c60e4200de426dfa25271cb0f78"
   },
+  {
+    "name": "sj",
+    "unicode": "1F1F8-1F1EF",
+    "digest": "ce913b007f84a9cba2add8d754aa791901624c60e4200de426dfa25271cb0f78"
+  },
   {
     "name": "flag_sk",
     "unicode": "1F1F8-1F1F0",
     "digest": "d8f8fc4024c82f906effe98facbef9d543fb3708b1134dc502c74dc4a442b30a"
   },
+  {
+    "name": "sk",
+    "unicode": "1F1F8-1F1F0",
+    "digest": "d8f8fc4024c82f906effe98facbef9d543fb3708b1134dc502c74dc4a442b30a"
+  },
   {
     "name": "flag_sl",
     "unicode": "1F1F8-1F1F1",
     "digest": "dd7fd0452498d8d1c894cf0d5a662ddff9c5bcc02148bdc3dc7e6f25d0bb586e"
   },
+  {
+    "name": "sl",
+    "unicode": "1F1F8-1F1F1",
+    "digest": "dd7fd0452498d8d1c894cf0d5a662ddff9c5bcc02148bdc3dc7e6f25d0bb586e"
+  },
   {
     "name": "flag_sm",
     "unicode": "1F1F8-1F1F2",
     "digest": "2b499606aee2b5cbf4037338753c80a4c8f75f4abcef2c8657bd9337e602bbd3"
   },
+  {
+    "name": "sm",
+    "unicode": "1F1F8-1F1F2",
+    "digest": "2b499606aee2b5cbf4037338753c80a4c8f75f4abcef2c8657bd9337e602bbd3"
+  },
   {
     "name": "flag_sn",
     "unicode": "1F1F8-1F1F3",
     "digest": "03b46a9d8b129da13f60c23b820b04fba52050ca58a41b859ad57d5c3cc2515d"
   },
+  {
+    "name": "sn",
+    "unicode": "1F1F8-1F1F3",
+    "digest": "03b46a9d8b129da13f60c23b820b04fba52050ca58a41b859ad57d5c3cc2515d"
+  },
   {
     "name": "flag_so",
     "unicode": "1F1F8-1F1F4",
     "digest": "ea416b6a05ddc5b16291ebe5101735360b08c834d55ac82c663ac1dd3e459048"
   },
+  {
+    "name": "so",
+    "unicode": "1F1F8-1F1F4",
+    "digest": "ea416b6a05ddc5b16291ebe5101735360b08c834d55ac82c663ac1dd3e459048"
+  },
   {
     "name": "flag_sr",
     "unicode": "1F1F8-1F1F7",
     "digest": "012179fbcbcb7343e7b09d33e283fb63c7964a6eca35ccb9407d468e495a9874"
   },
+  {
+    "name": "sr",
+    "unicode": "1F1F8-1F1F7",
+    "digest": "012179fbcbcb7343e7b09d33e283fb63c7964a6eca35ccb9407d468e495a9874"
+  },
   {
     "name": "flag_ss",
     "unicode": "1F1F8-1F1F8",
     "digest": "6723150482c640643c9dd7e33ea749f4a8b46aceacbd4f5e11aa33b3ee13aab7"
   },
+  {
+    "name": "ss",
+    "unicode": "1F1F8-1F1F8",
+    "digest": "6723150482c640643c9dd7e33ea749f4a8b46aceacbd4f5e11aa33b3ee13aab7"
+  },
   {
     "name": "flag_st",
     "unicode": "1F1F8-1F1F9",
     "digest": "0947fcec2e3cb1b0e9943c3d00891e8ee226e8d0532e9b1fe807ddf2e8fbc49d"
   },
+  {
+    "name": "st",
+    "unicode": "1F1F8-1F1F9",
+    "digest": "0947fcec2e3cb1b0e9943c3d00891e8ee226e8d0532e9b1fe807ddf2e8fbc49d"
+  },
   {
     "name": "flag_sv",
     "unicode": "1F1F8-1F1FB",
     "digest": "ce7e583db833c4b10e2f7a2d09b97bb522c02e96ea0b3f3a48a955f7d8f970d8"
   },
+  {
+    "name": "sv",
+    "unicode": "1F1F8-1F1FB",
+    "digest": "ce7e583db833c4b10e2f7a2d09b97bb522c02e96ea0b3f3a48a955f7d8f970d8"
+  },
   {
     "name": "flag_sx",
     "unicode": "1F1F8-1F1FD",
     "digest": "c01fb238c7ba439f24a5ef821b6457f2a0fd0b99a1b2d02395bed87f0a4a88e5"
   },
+  {
+    "name": "sx",
+    "unicode": "1F1F8-1F1FD",
+    "digest": "c01fb238c7ba439f24a5ef821b6457f2a0fd0b99a1b2d02395bed87f0a4a88e5"
+  },
   {
     "name": "flag_sy",
     "unicode": "1F1F8-1F1FE",
     "digest": "a77d87ef98c96140c59998d10d94837e2a056dd3ac5c7522e89e5c62eac69e69"
   },
+  {
+    "name": "sy",
+    "unicode": "1F1F8-1F1FE",
+    "digest": "a77d87ef98c96140c59998d10d94837e2a056dd3ac5c7522e89e5c62eac69e69"
+  },
   {
     "name": "flag_sz",
     "unicode": "1F1F8-1F1FF",
     "digest": "2904ad01040a9107ad556ec4c2561781d96746005cca250babb1127b8ba21050"
   },
+  {
+    "name": "sz",
+    "unicode": "1F1F8-1F1FF",
+    "digest": "2904ad01040a9107ad556ec4c2561781d96746005cca250babb1127b8ba21050"
+  },
   {
     "name": "flag_ta",
     "unicode": "1F1F9-1F1E6",
     "digest": "eda84db90e1a8854e8ff3c15b3b38ee65f7d6532b76970a6fbac304c30d8c959"
   },
+  {
+    "name": "ta",
+    "unicode": "1F1F9-1F1E6",
+    "digest": "eda84db90e1a8854e8ff3c15b3b38ee65f7d6532b76970a6fbac304c30d8c959"
+  },
   {
     "name": "flag_tc",
     "unicode": "1F1F9-1F1E8",
     "digest": "4628fdf6dc598a2846beefe97f7d4c6812f4961394cec132924b44bbe79b3322"
   },
+  {
+    "name": "tc",
+    "unicode": "1F1F9-1F1E8",
+    "digest": "4628fdf6dc598a2846beefe97f7d4c6812f4961394cec132924b44bbe79b3322"
+  },
   {
     "name": "flag_td",
     "unicode": "1F1F9-1F1E9",
     "digest": "125ff31e4285cb2a5493a52a2703ebe8e7138b918ec4dae3d0f8693632372df6"
   },
+  {
+    "name": "td",
+    "unicode": "1F1F9-1F1E9",
+    "digest": "125ff31e4285cb2a5493a52a2703ebe8e7138b918ec4dae3d0f8693632372df6"
+  },
   {
     "name": "flag_tf",
     "unicode": "1F1F9-1F1EB",
     "digest": "489d591e11764ac341f2234020f7879db782b8f673fc9aae425fd713e4082334"
   },
+  {
+    "name": "tf",
+    "unicode": "1F1F9-1F1EB",
+    "digest": "489d591e11764ac341f2234020f7879db782b8f673fc9aae425fd713e4082334"
+  },
   {
     "name": "flag_tg",
     "unicode": "1F1F9-1F1EC",
     "digest": "4ceedfcfcc22cd14d9add9d86d6748447995f19f7095fa4be883e21eb1aa86bc"
   },
+  {
+    "name": "tg",
+    "unicode": "1F1F9-1F1EC",
+    "digest": "4ceedfcfcc22cd14d9add9d86d6748447995f19f7095fa4be883e21eb1aa86bc"
+  },
   {
     "name": "flag_th",
     "unicode": "1F1F9-1F1ED",
     "digest": "2798cc660af1c5dc4891c30aded3a53d7cfa0af128cc495df8141907b165902d"
   },
+  {
+    "name": "th",
+    "unicode": "1F1F9-1F1ED",
+    "digest": "2798cc660af1c5dc4891c30aded3a53d7cfa0af128cc495df8141907b165902d"
+  },
   {
     "name": "flag_tj",
     "unicode": "1F1F9-1F1EF",
     "digest": "0483506fc5b5f2d4fc18ea3cd2f8a5da985d68fe4bf90bd3fd05e67e38f32398"
   },
+  {
+    "name": "tj",
+    "unicode": "1F1F9-1F1EF",
+    "digest": "0483506fc5b5f2d4fc18ea3cd2f8a5da985d68fe4bf90bd3fd05e67e38f32398"
+  },
   {
     "name": "flag_tk",
     "unicode": "1F1F9-1F1F0",
     "digest": "d5d4a8c6ce3207731b7c154a9d8d8fa2af055a48f03b3cbbcfd3317d3b8a75f2"
   },
+  {
+    "name": "tk",
+    "unicode": "1F1F9-1F1F0",
+    "digest": "d5d4a8c6ce3207731b7c154a9d8d8fa2af055a48f03b3cbbcfd3317d3b8a75f2"
+  },
   {
     "name": "flag_tl",
     "unicode": "1F1F9-1F1F1",
     "digest": "7a2ba8f91a6b627c60c88244223a9b9d0c12707f50b174f9c2eca07dd3440df7"
   },
+  {
+    "name": "tl",
+    "unicode": "1F1F9-1F1F1",
+    "digest": "7a2ba8f91a6b627c60c88244223a9b9d0c12707f50b174f9c2eca07dd3440df7"
+  },
   {
     "name": "flag_tm",
     "unicode": "1F1F9-1F1F2",
     "digest": "adcf5f23adcf983ce626b44559482f8728251eab34b3ff5d8b125112f3a1010f"
   },
+  {
+    "name": "turkmenistan",
+    "unicode": "1F1F9-1F1F2",
+    "digest": "adcf5f23adcf983ce626b44559482f8728251eab34b3ff5d8b125112f3a1010f"
+  },
   {
     "name": "flag_tn",
     "unicode": "1F1F9-1F1F3",
     "digest": "5ee690ee1f3c3c0cba9b36efdef902894ec59cefbc60c4baa341efd3d7bb9ba2"
   },
+  {
+    "name": "tn",
+    "unicode": "1F1F9-1F1F3",
+    "digest": "5ee690ee1f3c3c0cba9b36efdef902894ec59cefbc60c4baa341efd3d7bb9ba2"
+  },
   {
     "name": "flag_to",
     "unicode": "1F1F9-1F1F4",
     "digest": "cde8672ca25b0e3a423865283fab9bc3ab10f472e04979b3b2f8032b71e96300"
   },
+  {
+    "name": "to",
+    "unicode": "1F1F9-1F1F4",
+    "digest": "cde8672ca25b0e3a423865283fab9bc3ab10f472e04979b3b2f8032b71e96300"
+  },
   {
     "name": "flag_tr",
     "unicode": "1F1F9-1F1F7",
     "digest": "3d83c03ed084cfc81fa633310382acd7213e1eaa19d0ed97d142e7824032b55d"
   },
+  {
+    "name": "tr",
+    "unicode": "1F1F9-1F1F7",
+    "digest": "3d83c03ed084cfc81fa633310382acd7213e1eaa19d0ed97d142e7824032b55d"
+  },
   {
     "name": "flag_tt",
     "unicode": "1F1F9-1F1F9",
     "digest": "d66d272ac27e2b398289d6b60128ccd3508aeb1f4a00a3920c5e6a21bfe357ed"
   },
+  {
+    "name": "tt",
+    "unicode": "1F1F9-1F1F9",
+    "digest": "d66d272ac27e2b398289d6b60128ccd3508aeb1f4a00a3920c5e6a21bfe357ed"
+  },
   {
     "name": "flag_tv",
     "unicode": "1F1F9-1F1FB",
     "digest": "8716527383854cf1569f737d0f0f9ad77b46747255f24e02f5b2fbc850c2e35c"
   },
+  {
+    "name": "tuvalu",
+    "unicode": "1F1F9-1F1FB",
+    "digest": "8716527383854cf1569f737d0f0f9ad77b46747255f24e02f5b2fbc850c2e35c"
+  },
   {
     "name": "flag_tw",
     "unicode": "1F1F9-1F1FC",
     "digest": "fb17b97e18e4423c5f60d60ec3ec60b917be579fc4dd9b5b23236786dcb35108"
   },
+  {
+    "name": "tw",
+    "unicode": "1F1F9-1F1FC",
+    "digest": "fb17b97e18e4423c5f60d60ec3ec60b917be579fc4dd9b5b23236786dcb35108"
+  },
   {
     "name": "flag_tz",
     "unicode": "1F1F9-1F1FF",
     "digest": "a8a8cf57ae5227cb54620bf31d2d6e154d2067d6d049b8db64bc4e538222948b"
   },
+  {
+    "name": "tz",
+    "unicode": "1F1F9-1F1FF",
+    "digest": "a8a8cf57ae5227cb54620bf31d2d6e154d2067d6d049b8db64bc4e538222948b"
+  },
   {
     "name": "flag_ua",
     "unicode": "1F1FA-1F1E6",
     "digest": "03aca4b3ffd60d944a5793eb7530f8d8ae527782f642f6606194e46ee314b12c"
   },
+  {
+    "name": "ua",
+    "unicode": "1F1FA-1F1E6",
+    "digest": "03aca4b3ffd60d944a5793eb7530f8d8ae527782f642f6606194e46ee314b12c"
+  },
   {
     "name": "flag_ug",
     "unicode": "1F1FA-1F1EC",
     "digest": "70226a1585e88390b3b815b8b79a0ddb36d2961c6b465c4ff72aa444abfe982e"
   },
+  {
+    "name": "ug",
+    "unicode": "1F1FA-1F1EC",
+    "digest": "70226a1585e88390b3b815b8b79a0ddb36d2961c6b465c4ff72aa444abfe982e"
+  },
   {
     "name": "flag_um",
     "unicode": "1F1FA-1F1F2",
     "digest": "aa83bf051149acf907140a860de5de1700710e4164ae5549ad1040b24d0a142b"
   },
+  {
+    "name": "um",
+    "unicode": "1F1FA-1F1F2",
+    "digest": "aa83bf051149acf907140a860de5de1700710e4164ae5549ad1040b24d0a142b"
+  },
   {
     "name": "flag_us",
     "unicode": "1F1FA-1F1F8",
     "digest": "32ba2aa09a30514247e91d60762791b582f547a37d9151f98b700dff50f355ea"
   },
+  {
+    "name": "us",
+    "unicode": "1F1FA-1F1F8",
+    "digest": "32ba2aa09a30514247e91d60762791b582f547a37d9151f98b700dff50f355ea"
+  },
   {
     "name": "flag_uy",
     "unicode": "1F1FA-1F1FE",
     "digest": "0e01b3f1df4bdf6d616dacc9c5825151b941bf074be750e8b24a07ea5d5bcacb"
   },
+  {
+    "name": "uy",
+    "unicode": "1F1FA-1F1FE",
+    "digest": "0e01b3f1df4bdf6d616dacc9c5825151b941bf074be750e8b24a07ea5d5bcacb"
+  },
   {
     "name": "flag_uz",
     "unicode": "1F1FA-1F1FF",
     "digest": "903029ce83812a2134f24b65db35b183443a440ea5fecaa6ef7dcaaf65b2519c"
   },
+  {
+    "name": "uz",
+    "unicode": "1F1FA-1F1FF",
+    "digest": "903029ce83812a2134f24b65db35b183443a440ea5fecaa6ef7dcaaf65b2519c"
+  },
   {
     "name": "flag_va",
     "unicode": "1F1FB-1F1E6",
     "digest": "fd3c1c5d0ac030e838f807288912c98a3e258f87901e252e46942a4dab9f8cb7"
   },
+  {
+    "name": "va",
+    "unicode": "1F1FB-1F1E6",
+    "digest": "fd3c1c5d0ac030e838f807288912c98a3e258f87901e252e46942a4dab9f8cb7"
+  },
   {
     "name": "flag_vc",
     "unicode": "1F1FB-1F1E8",
     "digest": "7cd554ea8ca817b5366701160274587ab44167ae5a89c430bbaf237ea18b7421"
   },
+  {
+    "name": "vc",
+    "unicode": "1F1FB-1F1E8",
+    "digest": "7cd554ea8ca817b5366701160274587ab44167ae5a89c430bbaf237ea18b7421"
+  },
   {
     "name": "flag_ve",
     "unicode": "1F1FB-1F1EA",
     "digest": "72930094fb088c1facabea07616035ec4771374358a90c3045219d087b350dd8"
   },
+  {
+    "name": "ve",
+    "unicode": "1F1FB-1F1EA",
+    "digest": "72930094fb088c1facabea07616035ec4771374358a90c3045219d087b350dd8"
+  },
   {
     "name": "flag_vg",
     "unicode": "1F1FB-1F1EC",
     "digest": "78a59afd368b7a8312bfdb2f49927ff09e6b8f46aab0136c0453e3319e81df49"
   },
+  {
+    "name": "vg",
+    "unicode": "1F1FB-1F1EC",
+    "digest": "78a59afd368b7a8312bfdb2f49927ff09e6b8f46aab0136c0453e3319e81df49"
+  },
   {
     "name": "flag_vi",
     "unicode": "1F1FB-1F1EE",
     "digest": "e070879f9605a9bae66bb84f2abf5a40c8b264baee65cd4f7a6720b826739f29"
   },
+  {
+    "name": "vi",
+    "unicode": "1F1FB-1F1EE",
+    "digest": "e070879f9605a9bae66bb84f2abf5a40c8b264baee65cd4f7a6720b826739f29"
+  },
   {
     "name": "flag_vn",
     "unicode": "1F1FB-1F1F3",
     "digest": "100ddf06e0f239b170f4d6cb459450bf4945281ee818f7d3c061828b80562219"
   },
+  {
+    "name": "vn",
+    "unicode": "1F1FB-1F1F3",
+    "digest": "100ddf06e0f239b170f4d6cb459450bf4945281ee818f7d3c061828b80562219"
+  },
   {
     "name": "flag_vu",
     "unicode": "1F1FB-1F1FA",
     "digest": "59fc9d16818295bba4f7f551598f85378cd07f2bd7e31a4eef2589aaa3847563"
   },
+  {
+    "name": "vu",
+    "unicode": "1F1FB-1F1FA",
+    "digest": "59fc9d16818295bba4f7f551598f85378cd07f2bd7e31a4eef2589aaa3847563"
+  },
   {
     "name": "flag_wf",
     "unicode": "1F1FC-1F1EB",
     "digest": "62627702e3e3768808c12f153a527ffcc492ad74d8cdc1858cfde971efd0c8ee"
   },
+  {
+    "name": "wf",
+    "unicode": "1F1FC-1F1EB",
+    "digest": "62627702e3e3768808c12f153a527ffcc492ad74d8cdc1858cfde971efd0c8ee"
+  },
   {
     "name": "flag_white",
     "unicode": "1F3F3",
     "digest": "96307e3a28e92d1e7147a06f154ffc291ee3cd1765cf8b7bfb06412294112559"
   },
+  {
+    "name": "waving_white_flag",
+    "unicode": "1F3F3",
+    "digest": "96307e3a28e92d1e7147a06f154ffc291ee3cd1765cf8b7bfb06412294112559"
+  },
   {
     "name": "flag_ws",
     "unicode": "1F1FC-1F1F8",
     "digest": "0c95271d0f4b23f0d215ee0fba05cf08ecb70665d4c028e17463ecda2754b164"
   },
+  {
+    "name": "ws",
+    "unicode": "1F1FC-1F1F8",
+    "digest": "0c95271d0f4b23f0d215ee0fba05cf08ecb70665d4c028e17463ecda2754b164"
+  },
   {
     "name": "flag_xk",
     "unicode": "1F1FD-1F1F0",
     "digest": "713aa7d228e96f4a06d58d1fb8c2a55296c3e56842f8177ca936f3e09f50da1e"
   },
+  {
+    "name": "xk",
+    "unicode": "1F1FD-1F1F0",
+    "digest": "713aa7d228e96f4a06d58d1fb8c2a55296c3e56842f8177ca936f3e09f50da1e"
+  },
   {
     "name": "flag_ye",
     "unicode": "1F1FE-1F1EA",
     "digest": "3bb65bae9c913357bcae8b8b5878efc9e194ca308442ab69639c29716b49f078"
   },
+  {
+    "name": "ye",
+    "unicode": "1F1FE-1F1EA",
+    "digest": "3bb65bae9c913357bcae8b8b5878efc9e194ca308442ab69639c29716b49f078"
+  },
   {
     "name": "flag_yt",
     "unicode": "1F1FE-1F1F9",
     "digest": "f86c86f4c194610a3af78971fcf221ad97b9499d08f6d64476e417a2f52a611e"
   },
+  {
+    "name": "yt",
+    "unicode": "1F1FE-1F1F9",
+    "digest": "f86c86f4c194610a3af78971fcf221ad97b9499d08f6d64476e417a2f52a611e"
+  },
   {
     "name": "flag_za",
     "unicode": "1F1FF-1F1E6",
     "digest": "4dd4fa49a01fdcfc7c1c099a7869e0e9acba83a6a3debf6c8505ada4c796b872"
   },
+  {
+    "name": "za",
+    "unicode": "1F1FF-1F1E6",
+    "digest": "4dd4fa49a01fdcfc7c1c099a7869e0e9acba83a6a3debf6c8505ada4c796b872"
+  },
   {
     "name": "flag_zm",
     "unicode": "1F1FF-1F1F2",
     "digest": "ab6790d89875447de3d1c7f4713b102761bc3e9afdd714b818689e175ca03011"
   },
+  {
+    "name": "zm",
+    "unicode": "1F1FF-1F1F2",
+    "digest": "ab6790d89875447de3d1c7f4713b102761bc3e9afdd714b818689e175ca03011"
+  },
   {
     "name": "flag_zw",
     "unicode": "1F1FF-1F1FC",
     "digest": "9d39b934fe922174b2250f2cd1b174a548d2904091d3298f35b7cc59fbceb181"
   },
+  {
+    "name": "zw",
+    "unicode": "1F1FF-1F1FC",
+    "digest": "9d39b934fe922174b2250f2cd1b174a548d2904091d3298f35b7cc59fbceb181"
+  },
   {
     "name": "flags",
     "unicode": "1F38F",
@@ -3669,11 +5304,21 @@
     "unicode": "1F581",
     "digest": "be59efba4bc0759af5a726c06619090ef5071bf2541611d71691dedecee6c697"
   },
+  {
+    "name": "clamshell_mobile_phone",
+    "unicode": "1F581",
+    "digest": "be59efba4bc0759af5a726c06619090ef5071bf2541611d71691dedecee6c697"
+  },
   {
     "name": "floppy_black",
     "unicode": "1F5AA",
     "digest": "9022f51bb09c5130c6d46bb2accb159bed6f54d6fbffda6ecad62965ebc958ea"
   },
+  {
+    "name": "black_hard_shell_floppy_disk",
+    "unicode": "1F5AA",
+    "digest": "9022f51bb09c5130c6d46bb2accb159bed6f54d6fbffda6ecad62965ebc958ea"
+  },
   {
     "name": "floppy_disk",
     "unicode": "1F4BE",
@@ -3684,6 +5329,11 @@
     "unicode": "1F5AB",
     "digest": "ec79c400117c4506ef8cf3eebef6c42dd37e60b3079d3e98b6ccd06e517e2af0"
   },
+  {
+    "name": "white_hard_shell_floppy_disk",
+    "unicode": "1F5AB",
+    "digest": "ec79c400117c4506ef8cf3eebef6c42dd37e60b3079d3e98b6ccd06e517e2af0"
+  },
   {
     "name": "flower_playing_cards",
     "unicode": "1F3B4",
@@ -3714,6 +5364,11 @@
     "unicode": "1F5C1",
     "digest": "74f3b484771c3d6ef61cf003de25c1a59b875afa46c057b5b1d92d9f99460685"
   },
+  {
+    "name": "open_folder",
+    "unicode": "1F5C1",
+    "digest": "74f3b484771c3d6ef61cf003de25c1a59b875afa46c057b5b1d92d9f99460685"
+  },
   {
     "name": "football",
     "unicode": "1F3C8",
@@ -3734,6 +5389,11 @@
     "unicode": "1F37D",
     "digest": "b4081b9edea6cdab5112fdd17535051ba17710953013f5020c7c40f84a1e3247"
   },
+  {
+    "name": "fork_and_knife_with_plate",
+    "unicode": "1F37D",
+    "digest": "b4081b9edea6cdab5112fdd17535051ba17710953013f5020c7c40f84a1e3247"
+  },
   {
     "name": "fountain",
     "unicode": "26F2",
@@ -3754,16 +5414,31 @@
     "unicode": "1F5BC",
     "digest": "6ff21063063989c6ae7dd69f4d6a781c676f9dba380d8e6f1dbac5d53b24f349"
   },
+  {
+    "name": "frame_with_picture",
+    "unicode": "1F5BC",
+    "digest": "6ff21063063989c6ae7dd69f4d6a781c676f9dba380d8e6f1dbac5d53b24f349"
+  },
   {
     "name": "frame_tiles",
     "unicode": "1F5BD",
     "digest": "34a5bb044b4b3ad94b116ad106f7b6747fb8612dc0e9f8ccd4313c2920508df0"
   },
+  {
+    "name": "frame_with_tiles",
+    "unicode": "1F5BD",
+    "digest": "34a5bb044b4b3ad94b116ad106f7b6747fb8612dc0e9f8ccd4313c2920508df0"
+  },
   {
     "name": "frame_x",
     "unicode": "1F5BE",
     "digest": "2e427688fd70361c8c59787d0722ad68abe1c3f968258ee99c0c77ce4b8a8e15"
   },
+  {
+    "name": "frame_with_an_x",
+    "unicode": "1F5BE",
+    "digest": "2e427688fd70361c8c59787d0722ad68abe1c3f968258ee99c0c77ce4b8a8e15"
+  },
   {
     "name": "free",
     "unicode": "1F193",
@@ -3789,11 +5464,21 @@
     "unicode": "1F626",
     "digest": "fb39f5c2aea98054adb02a3a0ac34a2e38d83f32cd590e9d2449e06a9702f2f5"
   },
+  {
+    "name": "anguished",
+    "unicode": "1F626",
+    "digest": "fb39f5c2aea98054adb02a3a0ac34a2e38d83f32cd590e9d2449e06a9702f2f5"
+  },
   {
     "name": "frowning2",
     "unicode": "2639",
     "digest": "7bb6c682a6c9f98bf3a5ae986e317fd26d1af497c857500deec2f06b6a3af5da"
   },
+  {
+    "name": "white_frowning_face",
+    "unicode": "2639",
+    "digest": "7bb6c682a6c9f98bf3a5ae986e317fd26d1af497c857500deec2f06b6a3af5da"
+  },
   {
     "name": "fuelpump",
     "unicode": "26FD",
@@ -4029,6 +5714,11 @@
     "unicode": "2692",
     "digest": "2e4fe33406ca03fbb0df1596d63e903d8ee6bd78ecc3ec38a67dd2cecbc584e2"
   },
+  {
+    "name": "hammer_and_pick",
+    "unicode": "2692",
+    "digest": "2e4fe33406ca03fbb0df1596d63e903d8ee6bd78ecc3ec38a67dd2cecbc584e2"
+  },
   {
     "name": "hamster",
     "unicode": "1F439",
@@ -4039,41 +5729,81 @@
     "unicode": "1F590",
     "digest": "a43e52f7cdec5e9d51497888b0988d7bbd42846ad7e492b196293fbce576d197"
   },
+  {
+    "name": "raised_hand_with_fingers_splayed",
+    "unicode": "1F590",
+    "digest": "a43e52f7cdec5e9d51497888b0988d7bbd42846ad7e492b196293fbce576d197"
+  },
   {
     "name": "hand_splayed_reverse",
     "unicode": "1F591",
     "digest": "ff0af0fe9def7388adca6836e5958492282b1afae99f1b6e1e65d11ba68b96db"
   },
+  {
+    "name": "reversed_raised_hand_with_fingers_splayed",
+    "unicode": "1F591",
+    "digest": "ff0af0fe9def7388adca6836e5958492282b1afae99f1b6e1e65d11ba68b96db"
+  },
   {
     "name": "hand_splayed_tone1",
     "unicode": "1F590-1F3FB",
     "digest": "73cceec7117280d330f8a149979190f0f355dd8d0a92821be89fb70344bb8dfe"
   },
+  {
+    "name": "raised_hand_with_fingers_splayed_tone1",
+    "unicode": "1F590-1F3FB",
+    "digest": "73cceec7117280d330f8a149979190f0f355dd8d0a92821be89fb70344bb8dfe"
+  },
   {
     "name": "hand_splayed_tone2",
     "unicode": "1F590-1F3FC",
     "digest": "b06fac698128f4c3a7b8ea56e8bc4de088bb5461aa0f9c84553f16b43d347145"
   },
+  {
+    "name": "raised_hand_with_fingers_splayed_tone2",
+    "unicode": "1F590-1F3FC",
+    "digest": "b06fac698128f4c3a7b8ea56e8bc4de088bb5461aa0f9c84553f16b43d347145"
+  },
   {
     "name": "hand_splayed_tone3",
     "unicode": "1F590-1F3FD",
     "digest": "a94ee9a2f8cdec6d2f7dd6887d1c7b8e064fcad63030c2c7c001742d72b5603e"
   },
+  {
+    "name": "raised_hand_with_fingers_splayed_tone3",
+    "unicode": "1F590-1F3FD",
+    "digest": "a94ee9a2f8cdec6d2f7dd6887d1c7b8e064fcad63030c2c7c001742d72b5603e"
+  },
   {
     "name": "hand_splayed_tone4",
     "unicode": "1F590-1F3FE",
     "digest": "501792b4126c6f32e755accee0fc8b4d1915e1d36c4ceaa40f3bd0066efe76c3"
   },
+  {
+    "name": "raised_hand_with_fingers_splayed_tone4",
+    "unicode": "1F590-1F3FE",
+    "digest": "501792b4126c6f32e755accee0fc8b4d1915e1d36c4ceaa40f3bd0066efe76c3"
+  },
   {
     "name": "hand_splayed_tone5",
     "unicode": "1F590-1F3FF",
     "digest": "22ed533d587cf44f286e2d6ad77be20b4b5f133c422af4ca51e9af86a75002d8"
   },
+  {
+    "name": "raised_hand_with_fingers_splayed_tone5",
+    "unicode": "1F590-1F3FF",
+    "digest": "22ed533d587cf44f286e2d6ad77be20b4b5f133c422af4ca51e9af86a75002d8"
+  },
   {
     "name": "hand_victory",
     "unicode": "1F594",
     "digest": "2d512ced4e8a438f2a346aed67310d3080f9828c748ade1be95943c32ba1c735"
   },
+  {
+    "name": "reversed_victory_hand",
+    "unicode": "1F594",
+    "digest": "2d512ced4e8a438f2a346aed67310d3080f9828c748ade1be95943c32ba1c735"
+  },
   {
     "name": "handbag",
     "unicode": "1F45C",
@@ -4104,6 +5834,11 @@
     "unicode": "1F915",
     "digest": "d690b740ff4f58e89dfc764c6411a4e84cfedffd7694eb5efa839a642dbabd08"
   },
+  {
+    "name": "face_with_head_bandage",
+    "unicode": "1F915",
+    "digest": "d690b740ff4f58e89dfc764c6411a4e84cfedffd7694eb5efa839a642dbabd08"
+  },
   {
     "name": "headphones",
     "unicode": "1F3A7",
@@ -4129,6 +5864,11 @@
     "unicode": "2763",
     "digest": "9751c89dcf10805f2011949ff3ddcb6bcb13de8c32ae5de9e03955e8a4235df2"
   },
+  {
+    "name": "heavy_heart_exclamation_mark_ornament",
+    "unicode": "2763",
+    "digest": "9751c89dcf10805f2011949ff3ddcb6bcb13de8c32ae5de9e03955e8a4235df2"
+  },
   {
     "name": "heart_eyes",
     "unicode": "1F60D",
@@ -4144,6 +5884,11 @@
     "unicode": "1F394",
     "digest": "2178829e2c85accda55d2f685544587f6de5c8398a127ae1e08ff1c4ab282204"
   },
+  {
+    "name": "heart_with_tip_on_the_left",
+    "unicode": "1F394",
+    "digest": "2178829e2c85accda55d2f685544587f6de5c8398a127ae1e08ff1c4ab282204"
+  },
   {
     "name": "heartbeat",
     "unicode": "1F493",
@@ -4199,6 +5944,11 @@
     "unicode": "26D1",
     "digest": "affbe9dd87b87ff9235b4858c59c2a73e9ed30dd5221e5b666b8d7747378a9c4"
   },
+  {
+    "name": "helmet_with_white_cross",
+    "unicode": "26D1",
+    "digest": "affbe9dd87b87ff9235b4858c59c2a73e9ed30dd5221e5b666b8d7747378a9c4"
+  },
   {
     "name": "herb",
     "unicode": "1F33F",
@@ -4234,6 +5984,11 @@
     "unicode": "1F3D8",
     "digest": "9980d6dd6cbd23b820747ecac4cb10974dd24b0c94b4acfe21fa87793ad065c9"
   },
+  {
+    "name": "house_buildings",
+    "unicode": "1F3D8",
+    "digest": "9980d6dd6cbd23b820747ecac4cb10974dd24b0c94b4acfe21fa87793ad065c9"
+  },
   {
     "name": "honey_pot",
     "unicode": "1F36F",
@@ -4289,6 +6044,11 @@
     "unicode": "1F32D",
     "digest": "58b829e26b5c4642942898d9c7873cb08e048fd7deaacba8292899d5d895cb2b"
   },
+  {
+    "name": "hot_dog",
+    "unicode": "1F32D",
+    "digest": "58b829e26b5c4642942898d9c7873cb08e048fd7deaacba8292899d5d895cb2b"
+  },
   {
     "name": "hotel",
     "unicode": "1F3E8",
@@ -4319,6 +6079,11 @@
     "unicode": "1F3DA",
     "digest": "e404631e3a296bdeae3de7510da8934c32327bc0fa0f7ae4e676b61932165668"
   },
+  {
+    "name": "derelict_house_building",
+    "unicode": "1F3DA",
+    "digest": "e404631e3a296bdeae3de7510da8934c32327bc0fa0f7ae4e676b61932165668"
+  },
   {
     "name": "house_with_garden",
     "unicode": "1F3E1",
@@ -4329,6 +6094,11 @@
     "unicode": "1F917",
     "digest": "68ed6c4e0eae9071cf67770a39e07a2290b4f7763170f765b3cd3ac67ae43240"
   },
+  {
+    "name": "hugging_face",
+    "unicode": "1F917",
+    "digest": "68ed6c4e0eae9071cf67770a39e07a2290b4f7763170f765b3cd3ac67ae43240"
+  },
   {
     "name": "hushed",
     "unicode": "1F62F",
@@ -4379,6 +6149,11 @@
     "unicode": "1F6C8",
     "digest": "59c35e77d5ee663c5d56f7d8af845ce8aeb9935e526ae4a06e02ae70e71212ca"
   },
+  {
+    "name": "circled_information_source",
+    "unicode": "1F6C8",
+    "digest": "59c35e77d5ee663c5d56f7d8af845ce8aeb9935e526ae4a06e02ae70e71212ca"
+  },
   {
     "name": "information_desk_person",
     "unicode": "1F481",
@@ -4434,6 +6209,11 @@
     "unicode": "1F3DD",
     "digest": "17f02b309b62ed9542b1d8943168302846040e420f413e56d799bb5fba7064fa"
   },
+  {
+    "name": "desert_island",
+    "unicode": "1F3DD",
+    "digest": "17f02b309b62ed9542b1d8943168302846040e420f413e56d799bb5fba7064fa"
+  },
   {
     "name": "izakaya_lantern",
     "unicode": "1F3EE",
@@ -4474,6 +6254,11 @@
     "unicode": "1F6E6",
     "digest": "3708e5e034b1c64d1268d66527e13c369aa0f8903bce9172bef773b2d1940948"
   },
+  {
+    "name": "up_pointing_military_airplane",
+    "unicode": "1F6E6",
+    "digest": "3708e5e034b1c64d1268d66527e13c369aa0f8903bce9172bef773b2d1940948"
+  },
   {
     "name": "joy",
     "unicode": "1F602",
@@ -4504,21 +6289,41 @@
     "unicode": "1F5DD",
     "digest": "87a7d42531d7a11dcb11b0d6d1be611ee8cec35b5d22226a8ac6083fedef4f5d"
   },
+  {
+    "name": "old_key",
+    "unicode": "1F5DD",
+    "digest": "87a7d42531d7a11dcb11b0d6d1be611ee8cec35b5d22226a8ac6083fedef4f5d"
+  },
   {
     "name": "keyboard",
     "unicode": "1F5AE",
     "digest": "3b254cbf19946df3af05e501d11653d89fcda91684b7248d86186f842b83bf16"
   },
+  {
+    "name": "wired_keyboard",
+    "unicode": "1F5AE",
+    "digest": "3b254cbf19946df3af05e501d11653d89fcda91684b7248d86186f842b83bf16"
+  },
   {
     "name": "keyboard_mouse",
     "unicode": "1F5A6",
     "digest": "95b523e55d8afeaeb06442bbe20e47f49643bb0c32d89a8cdbbccdead20532b3"
   },
+  {
+    "name": "keyboard_and_mouse",
+    "unicode": "1F5A6",
+    "digest": "95b523e55d8afeaeb06442bbe20e47f49643bb0c32d89a8cdbbccdead20532b3"
+  },
   {
     "name": "keyboard_with_jacks",
     "unicode": "1F398",
     "digest": "e29a0d0b8018d13458469edca13c60a882a2817957c1aa11b050684c995a47ee"
   },
+  {
+    "name": "musical_keyboard_with_jacks",
+    "unicode": "1F398",
+    "digest": "e29a0d0b8018d13458469edca13c60a882a2817957c1aa11b050684c995a47ee"
+  },
   {
     "name": "keycap_ten",
     "unicode": "1F51F",
@@ -4539,11 +6344,21 @@
     "unicode": "1F468-2764-1F48B-1F468",
     "digest": "381364ad988ec07cc3708fd60f71838092224009088fff587069b4e8ab01ee63"
   },
+  {
+    "name": "couplekiss_mm",
+    "unicode": "1F468-2764-1F48B-1F468",
+    "digest": "381364ad988ec07cc3708fd60f71838092224009088fff587069b4e8ab01ee63"
+  },
   {
     "name": "kiss_ww",
     "unicode": "1F469-2764-1F48B-1F469",
     "digest": "7705ca707b73f44c856ea324bdfe30ed05244c8d192d1111f6e1d62ab3f2f8a5"
   },
+  {
+    "name": "couplekiss_ww",
+    "unicode": "1F469-2764-1F48B-1F469",
+    "digest": "7705ca707b73f44c856ea324bdfe30ed05244c8d192d1111f6e1d62ab3f2f8a5"
+  },
   {
     "name": "kissing",
     "unicode": "1F617",
@@ -4619,6 +6434,11 @@
     "unicode": "1F606",
     "digest": "f22d3be77f1daf058d04c3cbc1fd7f76b4dc069d2d300b45e63e768b08d269c5"
   },
+  {
+    "name": "satisfied",
+    "unicode": "1F606",
+    "digest": "f22d3be77f1daf058d04c3cbc1fd7f76b4dc069d2d300b45e63e768b08d269c5"
+  },
   {
     "name": "leaves",
     "unicode": "1F343",
@@ -4639,6 +6459,11 @@
     "unicode": "1F57B",
     "digest": "8052e44951afee04c87296128744b5019ec783c9ed1a231f659af6c8ddaa50f3"
   },
+  {
+    "name": "left_hand_telephone_receiver",
+    "unicode": "1F57B",
+    "digest": "8052e44951afee04c87296128744b5019ec783c9ed1a231f659af6c8ddaa50f3"
+  },
   {
     "name": "left_right_arrow",
     "unicode": "2194",
@@ -4674,6 +6499,11 @@
     "unicode": "1F574",
     "digest": "3e4e9a5ac6a8dbd7909c58a9d915f16f1a0fc59cc019714ae5935f18e4704044"
   },
+  {
+    "name": "man_in_business_suit_levitating",
+    "unicode": "1F574",
+    "digest": "3e4e9a5ac6a8dbd7909c58a9d915f16f1a0fc59cc019714ae5935f18e4704044"
+  },
   {
     "name": "libra",
     "unicode": "264E",
@@ -4684,36 +6514,71 @@
     "unicode": "1F3CB",
     "digest": "f64db037fd21e5918e5de35d6a561ef4b44668e307ed351338de00fcf3e771e3"
   },
+  {
+    "name": "weight_lifter",
+    "unicode": "1F3CB",
+    "digest": "f64db037fd21e5918e5de35d6a561ef4b44668e307ed351338de00fcf3e771e3"
+  },
   {
     "name": "lifter_tone1",
     "unicode": "1F3CB-1F3FB",
     "digest": "f9e0d161b12c4908ac3409b11c1a77ee38f33ba018f12416545876214bfb7c01"
   },
+  {
+    "name": "weight_lifter_tone1",
+    "unicode": "1F3CB-1F3FB",
+    "digest": "f9e0d161b12c4908ac3409b11c1a77ee38f33ba018f12416545876214bfb7c01"
+  },
   {
     "name": "lifter_tone2",
     "unicode": "1F3CB-1F3FC",
     "digest": "631eb6ed5bd147dc6f1f8b94149abe44d62a0f78e7809e37a4bfe127c40ed98f"
   },
+  {
+    "name": "weight_lifter_tone2",
+    "unicode": "1F3CB-1F3FC",
+    "digest": "631eb6ed5bd147dc6f1f8b94149abe44d62a0f78e7809e37a4bfe127c40ed98f"
+  },
   {
     "name": "lifter_tone3",
     "unicode": "1F3CB-1F3FD",
     "digest": "406b5707a47d9066f016acf0b64fa695e3505acc2453758a0428de21efd7eb6d"
   },
+  {
+    "name": "weight_lifter_tone3",
+    "unicode": "1F3CB-1F3FD",
+    "digest": "406b5707a47d9066f016acf0b64fa695e3505acc2453758a0428de21efd7eb6d"
+  },
   {
     "name": "lifter_tone4",
     "unicode": "1F3CB-1F3FE",
     "digest": "d917164ed8c4bb1ffcc887ca256ec329e7fa1b9516eaf8c159f8b43fdb071ed6"
   },
+  {
+    "name": "weight_lifter_tone4",
+    "unicode": "1F3CB-1F3FE",
+    "digest": "d917164ed8c4bb1ffcc887ca256ec329e7fa1b9516eaf8c159f8b43fdb071ed6"
+  },
   {
     "name": "lifter_tone5",
     "unicode": "1F3CB-1F3FF",
     "digest": "f79ea93e8a40b3c895b693bf49eb4ce6e7b3f4413595e5881ea44839fd7fe8e5"
   },
+  {
+    "name": "weight_lifter_tone5",
+    "unicode": "1F3CB-1F3FF",
+    "digest": "f79ea93e8a40b3c895b693bf49eb4ce6e7b3f4413595e5881ea44839fd7fe8e5"
+  },
   {
     "name": "light_check_mark",
     "unicode": "1F5F8",
     "digest": "7842b0df8c2b6703bed0cce5d2790d394eec7120b2a245a76f375528f2729a7b"
   },
+  {
+    "name": "light_mark",
+    "unicode": "1F5F8",
+    "digest": "7842b0df8c2b6703bed0cce5d2790d394eec7120b2a245a76f375528f2729a7b"
+  },
   {
     "name": "light_rail",
     "unicode": "1F688",
@@ -4729,6 +6594,11 @@
     "unicode": "1F981",
     "digest": "935b1076815f51fafcd860a395d0a03c536acfcea61ffcf542a377da046fa7d9"
   },
+  {
+    "name": "lion",
+    "unicode": "1F981",
+    "digest": "935b1076815f51fafcd860a395d0a03c536acfcea61ffcf542a377da046fa7d9"
+  },
   {
     "name": "lips",
     "unicode": "1F444",
@@ -4929,6 +6799,11 @@
     "unicode": "1F5FA",
     "digest": "f56116d09996d6d08fb5cdfb46622b545253f2649008170fc2011a9713fa875b"
   },
+  {
+    "name": "world_map",
+    "unicode": "1F5FA",
+    "digest": "f56116d09996d6d08fb5cdfb46622b545253f2649008170fc2011a9713fa875b"
+  },
   {
     "name": "maple_leaf",
     "unicode": "1F341",
@@ -4979,6 +6854,11 @@
     "unicode": "1F3C5",
     "digest": "270d438b6e2155e944dc734ea3e4d02409e51f59db2db636398fbf96e5edb0e6"
   },
+  {
+    "name": "sports_medal",
+    "unicode": "1F3C5",
+    "digest": "270d438b6e2155e944dc734ea3e4d02409e51f59db2db636398fbf96e5edb0e6"
+  },
   {
     "name": "mega",
     "unicode": "1F4E3",
@@ -5004,31 +6884,61 @@
     "unicode": "1F918",
     "digest": "45e5fac0b9b019cf217dcfd1380cafb0d03063454612178278dac1ca5f8476a6"
   },
+  {
+    "name": "sign_of_the_horns",
+    "unicode": "1F918",
+    "digest": "45e5fac0b9b019cf217dcfd1380cafb0d03063454612178278dac1ca5f8476a6"
+  },
   {
     "name": "metal_tone1",
     "unicode": "1F918-1F3FB",
     "digest": "9b3596fe7c063df838f0a43fb680ce10fb88e2b73c5c3324abfa357a224c17aa"
   },
+  {
+    "name": "sign_of_the_horns_tone1",
+    "unicode": "1F918-1F3FB",
+    "digest": "9b3596fe7c063df838f0a43fb680ce10fb88e2b73c5c3324abfa357a224c17aa"
+  },
   {
     "name": "metal_tone2",
     "unicode": "1F918-1F3FC",
     "digest": "e15a4898a0efca4354ac48d6b01ff0618ce8b110b1246a4f5d78e19b54658be6"
   },
+  {
+    "name": "sign_of_the_horns_tone2",
+    "unicode": "1F918-1F3FC",
+    "digest": "e15a4898a0efca4354ac48d6b01ff0618ce8b110b1246a4f5d78e19b54658be6"
+  },
   {
     "name": "metal_tone3",
     "unicode": "1F918-1F3FD",
     "digest": "c159e8179cb1907c246b432d87c5253b914fd7cebb6ac05292c4e38eff4815b0"
   },
+  {
+    "name": "sign_of_the_horns_tone3",
+    "unicode": "1F918-1F3FD",
+    "digest": "c159e8179cb1907c246b432d87c5253b914fd7cebb6ac05292c4e38eff4815b0"
+  },
   {
     "name": "metal_tone4",
     "unicode": "1F918-1F3FE",
     "digest": "a8a43a88028c97074321e3da56df1045db41ede58bf286c21d7ae90f222f2011"
   },
+  {
+    "name": "sign_of_the_horns_tone4",
+    "unicode": "1F918-1F3FE",
+    "digest": "a8a43a88028c97074321e3da56df1045db41ede58bf286c21d7ae90f222f2011"
+  },
   {
     "name": "metal_tone5",
     "unicode": "1F918-1F3FF",
     "digest": "e6611e826e867e2c73a8cadb138e4aa6365e3583dd229ff24b3e8f161904bf56"
   },
+  {
+    "name": "sign_of_the_horns_tone5",
+    "unicode": "1F918-1F3FF",
+    "digest": "e6611e826e867e2c73a8cadb138e4aa6365e3583dd229ff24b3e8f161904bf56"
+  },
   {
     "name": "metro",
     "unicode": "1F687",
@@ -5044,6 +6954,11 @@
     "unicode": "1F399",
     "digest": "f9df32cd207808f67a895d3460a215d1ecc42e377907bcd64731c02b697d4f32"
   },
+  {
+    "name": "studio_microphone",
+    "unicode": "1F399",
+    "digest": "f9df32cd207808f67a895d3460a215d1ecc42e377907bcd64731c02b697d4f32"
+  },
   {
     "name": "microscope",
     "unicode": "1F52C",
@@ -5054,31 +6969,61 @@
     "unicode": "1F595",
     "digest": "c6320b236a4a9593aeade511b52dd3114207e947458cb3b818c78737a505fdf6"
   },
+  {
+    "name": "reversed_hand_with_middle_finger_extended",
+    "unicode": "1F595",
+    "digest": "c6320b236a4a9593aeade511b52dd3114207e947458cb3b818c78737a505fdf6"
+  },
   {
     "name": "middle_finger_tone1",
     "unicode": "1F595-1F3FB",
     "digest": "93c7aa994856185519d576cb779bdcff3a33f7077eef98e70968125f92f02448"
   },
+  {
+    "name": "reversed_hand_with_middle_finger_extended_tone1",
+    "unicode": "1F595-1F3FB",
+    "digest": "93c7aa994856185519d576cb779bdcff3a33f7077eef98e70968125f92f02448"
+  },
   {
     "name": "middle_finger_tone2",
     "unicode": "1F595-1F3FC",
     "digest": "a0de802294717b80e08d9d30f5fd64eacb90b5b3b9d7a0c27d6226a22822597f"
   },
+  {
+    "name": "reversed_hand_with_middle_finger_extended_tone2",
+    "unicode": "1F595-1F3FC",
+    "digest": "a0de802294717b80e08d9d30f5fd64eacb90b5b3b9d7a0c27d6226a22822597f"
+  },
   {
     "name": "middle_finger_tone3",
     "unicode": "1F595-1F3FD",
     "digest": "8bbbab07c838257416bbf8377904362c07019fca9d5abf9fd048ccf6370178da"
   },
+  {
+    "name": "reversed_hand_with_middle_finger_extended_tone3",
+    "unicode": "1F595-1F3FD",
+    "digest": "8bbbab07c838257416bbf8377904362c07019fca9d5abf9fd048ccf6370178da"
+  },
   {
     "name": "middle_finger_tone4",
     "unicode": "1F595-1F3FE",
     "digest": "d9eed8db540fdb669c6ae5ef168b77659660589f5ddd9b66062274d335a3ef04"
   },
+  {
+    "name": "reversed_hand_with_middle_finger_extended_tone4",
+    "unicode": "1F595-1F3FE",
+    "digest": "d9eed8db540fdb669c6ae5ef168b77659660589f5ddd9b66062274d335a3ef04"
+  },
   {
     "name": "middle_finger_tone5",
     "unicode": "1F595-1F3FF",
     "digest": "0519c3298040e57db202294476df239edb9b23b44848bab296bc45eda7cf8664"
   },
+  {
+    "name": "reversed_hand_with_middle_finger_extended_tone5",
+    "unicode": "1F595-1F3FF",
+    "digest": "0519c3298040e57db202294476df239edb9b23b44848bab296bc45eda7cf8664"
+  },
   {
     "name": "military_medal",
     "unicode": "1F396",
@@ -5109,6 +7054,11 @@
     "unicode": "1F911",
     "digest": "3ac2f9b5409e1426eef6966938ca04cf78aeffefd43f44b6c86af4af7836e22f"
   },
+  {
+    "name": "money_mouth_face",
+    "unicode": "1F911",
+    "digest": "3ac2f9b5409e1426eef6966938ca04cf78aeffefd43f44b6c86af4af7836e22f"
+  },
   {
     "name": "money_with_wings",
     "unicode": "1F4B8",
@@ -5144,11 +7094,21 @@
     "unicode": "1F5F1",
     "digest": "4af3e4e53eaa328b0d20542ab31705a74bf9fd368cd0673b706838ce1681d3c9"
   },
+  {
+    "name": "lightning_mood_bubble",
+    "unicode": "1F5F1",
+    "digest": "4af3e4e53eaa328b0d20542ab31705a74bf9fd368cd0673b706838ce1681d3c9"
+  },
   {
     "name": "mood_lightning",
     "unicode": "1F5F2",
     "digest": "6784635e81ec722fd50a1c2a23b0f9679e4bf1b5ae2b5a01eeb995bc1f7a426f"
   },
+  {
+    "name": "lightning_mood",
+    "unicode": "1F5F2",
+    "digest": "6784635e81ec722fd50a1c2a23b0f9679e4bf1b5ae2b5a01eeb995bc1f7a426f"
+  },
   {
     "name": "mortar_board",
     "unicode": "1F393",
@@ -5169,6 +7129,11 @@
     "unicode": "1F3CD",
     "digest": "8429fb6dfeb873abdffcc179c32d4f23e91c9e6b27b06cd204fd2e83cc11189e"
   },
+  {
+    "name": "racing_motorcycle",
+    "unicode": "1F3CD",
+    "digest": "8429fb6dfeb873abdffcc179c32d4f23e91c9e6b27b06cd204fd2e83cc11189e"
+  },
   {
     "name": "motorway",
     "unicode": "1F6E3",
@@ -5229,6 +7194,11 @@
     "unicode": "1F3D4",
     "digest": "9939aade3d4d972ba3af16fcc6cc2454978f5426e4c92838734a44db065ce0ff"
   },
+  {
+    "name": "snow_capped_mountain",
+    "unicode": "1F3D4",
+    "digest": "9939aade3d4d972ba3af16fcc6cc2454978f5426e4c92838734a44db065ce0ff"
+  },
   {
     "name": "mouse",
     "unicode": "1F42D",
@@ -5244,11 +7214,21 @@
     "unicode": "1F5AF",
     "digest": "e0d2055ccba489d24e0c0b6d2f22793efe48a734b0fd50f5af88f721b40665c0"
   },
+  {
+    "name": "one_button_mouse",
+    "unicode": "1F5AF",
+    "digest": "e0d2055ccba489d24e0c0b6d2f22793efe48a734b0fd50f5af88f721b40665c0"
+  },
   {
     "name": "mouse_three_button",
     "unicode": "1F5B1",
     "digest": "6a5629fee01145211cc8f4e8f59c5f1e61affed38c650502213d76c7d8861b01"
   },
+  {
+    "name": "three_button_mouse",
+    "unicode": "1F5B1",
+    "digest": "6a5629fee01145211cc8f4e8f59c5f1e61affed38c650502213d76c7d8861b01"
+  },
   {
     "name": "movie_camera",
     "unicode": "1F3A5",
@@ -5364,11 +7344,21 @@
     "unicode": "1F913",
     "digest": "94efd551700aae8909b8dd7a78a54a33e070d24b2e0a10534353645084614e98"
   },
+  {
+    "name": "nerd_face",
+    "unicode": "1F913",
+    "digest": "94efd551700aae8909b8dd7a78a54a33e070d24b2e0a10534353645084614e98"
+  },
   {
     "name": "network",
     "unicode": "1F5A7",
     "digest": "1dbaa54deeb2328fd8a3f044e450c97ac3ff39627c598bb2f4312d677482ee06"
   },
+  {
+    "name": "three_networked_computers",
+    "unicode": "1F5A7",
+    "digest": "1dbaa54deeb2328fd8a3f044e450c97ac3ff39627c598bb2f4312d677482ee06"
+  },
   {
     "name": "neutral_face",
     "unicode": "1F610",
@@ -5399,6 +7389,11 @@
     "unicode": "1F5DE",
     "digest": "0ca6b5850091f23295c970815a8e64a52e3c3dae492029ecb1e0726c2693f9bf"
   },
+  {
+    "name": "rolled_up_newspaper",
+    "unicode": "1F5DE",
+    "digest": "0ca6b5850091f23295c970815a8e64a52e3c3dae492029ecb1e0726c2693f9bf"
+  },
   {
     "name": "ng",
     "unicode": "1F196",
@@ -5524,11 +7519,21 @@
     "unicode": "1F5C9",
     "digest": "073660fdaa02ecf98d04f61f8d65d6cc447ccae3825fccaff19a2c99ebba52af"
   },
+  {
+    "name": "note_page",
+    "unicode": "1F5C9",
+    "digest": "073660fdaa02ecf98d04f61f8d65d6cc447ccae3825fccaff19a2c99ebba52af"
+  },
   {
     "name": "note_empty",
     "unicode": "1F5C6",
     "digest": "06b56eeaca6349bbcf1020bea98f937450a7e086db65cd5d7497748e0fb607be"
   },
+  {
+    "name": "empty_note_page",
+    "unicode": "1F5C6",
+    "digest": "06b56eeaca6349bbcf1020bea98f937450a7e086db65cd5d7497748e0fb607be"
+  },
   {
     "name": "notebook",
     "unicode": "1F4D3",
@@ -5544,16 +7549,31 @@
     "unicode": "1F5CA",
     "digest": "85069e2d13540886457368a57295072aec44c7137d9223bfcf908ce1f0e5124e"
   },
+  {
+    "name": "note_pad",
+    "unicode": "1F5CA",
+    "digest": "85069e2d13540886457368a57295072aec44c7137d9223bfcf908ce1f0e5124e"
+  },
   {
     "name": "notepad_empty",
     "unicode": "1F5C7",
     "digest": "8be5053e74c13d8220917c5aee1f4afdecb001612886438f283b0c2a0fecf6af"
   },
+  {
+    "name": "empty_note_pad",
+    "unicode": "1F5C7",
+    "digest": "8be5053e74c13d8220917c5aee1f4afdecb001612886438f283b0c2a0fecf6af"
+  },
   {
     "name": "notepad_spiral",
     "unicode": "1F5D2",
     "digest": "c181b6c1cc6063ec1848e46cbbf1d8b890c53b59cdc5218311ce06889570e727"
   },
+  {
+    "name": "spiral_note_pad",
+    "unicode": "1F5D2",
+    "digest": "c181b6c1cc6063ec1848e46cbbf1d8b890c53b59cdc5218311ce06889570e727"
+  },
   {
     "name": "notes",
     "unicode": "1F3B6",
@@ -5599,6 +7619,11 @@
     "unicode": "1F6E2",
     "digest": "f8b7626cb09e229203105b9c8c7f3fbb38c0650021092fc50115ad517248644a"
   },
+  {
+    "name": "oil_drum",
+    "unicode": "1F6E2",
+    "digest": "f8b7626cb09e229203105b9c8c7f3fbb38c0650021092fc50115ad517248644a"
+  },
   {
     "name": "ok",
     "unicode": "1F197",
@@ -5699,31 +7724,61 @@
     "unicode": "1F475",
     "digest": "3ed599443eed25399aac999fc234c9e97f8fb6ec567e37a553c26e01021b097c"
   },
+  {
+    "name": "grandma",
+    "unicode": "1F475",
+    "digest": "3ed599443eed25399aac999fc234c9e97f8fb6ec567e37a553c26e01021b097c"
+  },
   {
     "name": "older_woman_tone1",
     "unicode": "1F475-1F3FB",
     "digest": "7421c5dba67cfd1eeabb2fa8faf4aa0d615d23f191cf7d7c0ad9c1fa884edfda"
   },
+  {
+    "name": "grandma_tone1",
+    "unicode": "1F475-1F3FB",
+    "digest": "7421c5dba67cfd1eeabb2fa8faf4aa0d615d23f191cf7d7c0ad9c1fa884edfda"
+  },
   {
     "name": "older_woman_tone2",
     "unicode": "1F475-1F3FC",
     "digest": "65edeef25648ac7f8be535df06af1286441691fa15176e99a6e83fc779aa2cde"
   },
+  {
+    "name": "grandma_tone2",
+    "unicode": "1F475-1F3FC",
+    "digest": "65edeef25648ac7f8be535df06af1286441691fa15176e99a6e83fc779aa2cde"
+  },
   {
     "name": "older_woman_tone3",
     "unicode": "1F475-1F3FD",
     "digest": "5d27bbcc5796227a9caec1c7612d3f691055655b96f7303e420839463d76c269"
   },
+  {
+    "name": "grandma_tone3",
+    "unicode": "1F475-1F3FD",
+    "digest": "5d27bbcc5796227a9caec1c7612d3f691055655b96f7303e420839463d76c269"
+  },
   {
     "name": "older_woman_tone4",
     "unicode": "1F475-1F3FE",
     "digest": "75b858e910175fc0233503d672120fd43ac035ba3fd2052fbb44df39f6e3695c"
   },
+  {
+    "name": "grandma_tone4",
+    "unicode": "1F475-1F3FE",
+    "digest": "75b858e910175fc0233503d672120fd43ac035ba3fd2052fbb44df39f6e3695c"
+  },
   {
     "name": "older_woman_tone5",
     "unicode": "1F475-1F3FF",
     "digest": "9da1cf10a605c470877d7f4a840f99344b1ec2e7b1ec7db61e930cde77025e3b"
   },
+  {
+    "name": "grandma_tone5",
+    "unicode": "1F475-1F3FF",
+    "digest": "9da1cf10a605c470877d7f4a840f99344b1ec2e7b1ec7db61e930cde77025e3b"
+  },
   {
     "name": "om_symbol",
     "unicode": "1F549",
@@ -5809,6 +7864,11 @@
     "unicode": "1F5B8",
     "digest": "df8c10028d29d65f144a6b789d1c3294e7b3293554c4c30d28d72dc7ba8d9a5d"
   },
+  {
+    "name": "optical_disc_icon",
+    "unicode": "1F5B8",
+    "digest": "df8c10028d29d65f144a6b789d1c3294e7b3293554c4c30d28d72dc7ba8d9a5d"
+  },
   {
     "name": "orange_book",
     "unicode": "1F4D9",
@@ -5864,6 +7924,11 @@
     "unicode": "1F58C",
     "digest": "73eb33184f5f495d6c2699fafc1a8680069f82a70fbe519290c3a2ce30d1aee9"
   },
+  {
+    "name": "lower_left_paintbrush",
+    "unicode": "1F58C",
+    "digest": "73eb33184f5f495d6c2699fafc1a8680069f82a70fbe519290c3a2ce30d1aee9"
+  },
   {
     "name": "palm_tree",
     "unicode": "1F334",
@@ -5884,11 +7949,21 @@
     "unicode": "1F587",
     "digest": "7071e031f4a100c3cb3573fbfa375360043f0276289a0818f2ffaf71b3580040"
   },
+  {
+    "name": "linked_paperclips",
+    "unicode": "1F587",
+    "digest": "7071e031f4a100c3cb3573fbfa375360043f0276289a0818f2ffaf71b3580040"
+  },
   {
     "name": "park",
     "unicode": "1F3DE",
     "digest": "d257f0f1b1a0134573f80ba1a5f522a91c320ee7f93a1cb64877c077e7e19b50"
   },
+  {
+    "name": "national_park",
+    "unicode": "1F3DE",
+    "digest": "d257f0f1b1a0134573f80ba1a5f522a91c320ee7f93a1cb64877c077e7e19b50"
+  },
   {
     "name": "parking",
     "unicode": "1F17F",
@@ -5914,11 +7989,21 @@
     "unicode": "23F8",
     "digest": "edd605ffaa39a7905ed0958b7cc69f00f5b271e579198d2df1746ad1b3648272"
   },
+  {
+    "name": "double_vertical_bar",
+    "unicode": "23F8",
+    "digest": "edd605ffaa39a7905ed0958b7cc69f00f5b271e579198d2df1746ad1b3648272"
+  },
   {
     "name": "peace",
     "unicode": "262E",
     "digest": "e0ee8a5c9fb18d5db6841b21527ed8fd955abdff9ffdb7b2684dca22107015fc"
   },
+  {
+    "name": "peace_symbol",
+    "unicode": "262E",
+    "digest": "e0ee8a5c9fb18d5db6841b21527ed8fd955abdff9ffdb7b2684dca22107015fc"
+  },
   {
     "name": "peach",
     "unicode": "1F351",
@@ -5934,16 +8019,31 @@
     "unicode": "1F58A",
     "digest": "6becdc6f622c774bb09b7e7592bba2123ecccc9de32a35f0b18b50d7d54109cb"
   },
+  {
+    "name": "lower_left_ballpoint_pen",
+    "unicode": "1F58A",
+    "digest": "6becdc6f622c774bb09b7e7592bba2123ecccc9de32a35f0b18b50d7d54109cb"
+  },
   {
     "name": "pen_fountain",
     "unicode": "1F58B",
     "digest": "8c78cf0c2bd1d5e309d2d3356ff207e3fc76ca18dd6b90762cb62f6afbc95c6a"
   },
+  {
+    "name": "lower_left_fountain_pen",
+    "unicode": "1F58B",
+    "digest": "8c78cf0c2bd1d5e309d2d3356ff207e3fc76ca18dd6b90762cb62f6afbc95c6a"
+  },
   {
     "name": "pencil",
     "unicode": "1F4DD",
     "digest": "62b7ee5d9352114d09ee6f2c9a4c5e8b79f775a6c509e82ddfcdd61e13716249"
   },
+  {
+    "name": "memo",
+    "unicode": "1F4DD",
+    "digest": "62b7ee5d9352114d09ee6f2c9a4c5e8b79f775a6c509e82ddfcdd61e13716249"
+  },
   {
     "name": "pencil2",
     "unicode": "270F",
@@ -5954,6 +8054,11 @@
     "unicode": "1F589",
     "digest": "52c1ba1228917eb491ac1745a495e0fdafba6b985a81caba250f71d1f94c725c"
   },
+  {
+    "name": "lower_left_pencil",
+    "unicode": "1F589",
+    "digest": "52c1ba1228917eb491ac1745a495e0fdafba6b985a81caba250f71d1f94c725c"
+  },
   {
     "name": "penguin",
     "unicode": "1F427",
@@ -5964,11 +8069,21 @@
     "unicode": "1F3F2",
     "digest": "cd3c33bfc3c7fbe84b98d2d481d56a7bf5488ff94afadd8b5a0e454768b80269"
   },
+  {
+    "name": "black_pennant",
+    "unicode": "1F3F2",
+    "digest": "cd3c33bfc3c7fbe84b98d2d481d56a7bf5488ff94afadd8b5a0e454768b80269"
+  },
   {
     "name": "pennant_white",
     "unicode": "1F3F1",
     "digest": "818b1be73540f2cfeb1c514e1ee75d18715af317f0db817d9ae081b9ea33d4b0"
   },
+  {
+    "name": "white_pennant",
+    "unicode": "1F3F1",
+    "digest": "818b1be73540f2cfeb1c514e1ee75d18715af317f0db817d9ae081b9ea33d4b0"
+  },
   {
     "name": "pensive",
     "unicode": "1F614",
@@ -6109,11 +8224,21 @@
     "unicode": "1F3D3",
     "digest": "dd2a84716c93410a285ff759bfbc2dc31a10f90b203c7a657b908e5949e89a39"
   },
+  {
+    "name": "table_tennis",
+    "unicode": "1F3D3",
+    "digest": "dd2a84716c93410a285ff759bfbc2dc31a10f90b203c7a657b908e5949e89a39"
+  },
   {
     "name": "piracy",
     "unicode": "1F572",
     "digest": "f42955ba75c598392e5e258be49968d858c876e0d6e7aa9dc795f7e8cff42be9"
   },
+  {
+    "name": "no_piracy",
+    "unicode": "1F572",
+    "digest": "f42955ba75c598392e5e258be49968d858c876e0d6e7aa9dc795f7e8cff42be9"
+  },
   {
     "name": "pisces",
     "unicode": "2653",
@@ -6129,6 +8254,11 @@
     "unicode": "1F6D0",
     "digest": "4fabc307b7e35f94288f6d53985485662a4814b11a9a382f0a3873d41b1290d3"
   },
+  {
+    "name": "worship_symbol",
+    "unicode": "1F6D0",
+    "digest": "4fabc307b7e35f94288f6d53985485662a4814b11a9a382f0a3873d41b1290d3"
+  },
   {
     "name": "play_pause",
     "unicode": "23EF",
@@ -6299,6 +8429,21 @@
     "unicode": "1F4A9",
     "digest": "140ce75a015ede5e764873e0ae9a56e7b2af333eddca0fe2796b14545c620258"
   },
+  {
+    "name": "shit",
+    "unicode": "1F4A9",
+    "digest": "140ce75a015ede5e764873e0ae9a56e7b2af333eddca0fe2796b14545c620258"
+  },
+  {
+    "name": "hankey",
+    "unicode": "1F4A9",
+    "digest": "140ce75a015ede5e764873e0ae9a56e7b2af333eddca0fe2796b14545c620258"
+  },
+  {
+    "name": "poo",
+    "unicode": "1F4A9",
+    "digest": "140ce75a015ede5e764873e0ae9a56e7b2af333eddca0fe2796b14545c620258"
+  },
   {
     "name": "popcorn",
     "unicode": "1F37F",
@@ -6419,11 +8564,21 @@
     "unicode": "1F6C7",
     "digest": "bc6cdea2269a0ec39576d98dc4cda2bd9efa4dc330dde870148c6a85ad9cc63f"
   },
+  {
+    "name": "prohibited_sign",
+    "unicode": "1F6C7",
+    "digest": "bc6cdea2269a0ec39576d98dc4cda2bd9efa4dc330dde870148c6a85ad9cc63f"
+  },
   {
     "name": "projector",
     "unicode": "1F4FD",
     "digest": "fc361282f367926254c08150b02cb8fda7fa8d2c9c939d9360c78bf19a4f982e"
   },
+  {
+    "name": "film_projector",
+    "unicode": "1F4FD",
+    "digest": "fc361282f367926254c08150b02cb8fda7fa8d2c9c939d9360c78bf19a4f982e"
+  },
   {
     "name": "punch",
     "unicode": "1F44A",
@@ -6499,6 +8654,11 @@
     "unicode": "1F3CE",
     "digest": "2e9828e3884c79ad7e9e1173d3470790f3f56cfa08ef4e38deff45db0728c66c"
   },
+  {
+    "name": "racing_car",
+    "unicode": "1F3CE",
+    "digest": "2e9828e3884c79ad7e9e1173d3470790f3f56cfa08ef4e38deff45db0728c66c"
+  },
   {
     "name": "racehorse",
     "unicode": "1F40E",
@@ -6519,6 +8679,11 @@
     "unicode": "2622",
     "digest": "5ad8e8594617c0153672a76421deb836e05c6098020c33af3f975f8fcfe216e4"
   },
+  {
+    "name": "radioactive_sign",
+    "unicode": "2622",
+    "digest": "5ad8e8594617c0153672a76421deb836e05c6098020c33af3f975f8fcfe216e4"
+  },
   {
     "name": "rage",
     "unicode": "1F621",
@@ -6534,6 +8699,11 @@
     "unicode": "1F6E4",
     "digest": "63ee881cc775d5b2711082b6c96ab44d5204c5d390afd6d8ee97e52aeeaa5e5e"
   },
+  {
+    "name": "railroad_track",
+    "unicode": "1F6E4",
+    "digest": "63ee881cc775d5b2711082b6c96ab44d5204c5d390afd6d8ee97e52aeeaa5e5e"
+  },
   {
     "name": "rainbow",
     "unicode": "1F308",
@@ -6744,11 +8914,21 @@
     "unicode": "1F569",
     "digest": "5b92daa87bdf6ee15e798bec382a2ee885f4e6e77a68a3f626adcfe4c782b375"
   },
+  {
+    "name": "right_speaker_with_one_sound_wave",
+    "unicode": "1F569",
+    "digest": "5b92daa87bdf6ee15e798bec382a2ee885f4e6e77a68a3f626adcfe4c782b375"
+  },
   {
     "name": "right_speaker_three",
     "unicode": "1F56A",
     "digest": "4d00b720a65bd0f4c3682b290b1976ec2388d6ae61225398f4e70556ae9e5f80"
   },
+  {
+    "name": "right_speaker_with_three_sound_waves",
+    "unicode": "1F56A",
+    "digest": "4d00b720a65bd0f4c3682b290b1976ec2388d6ae61225398f4e70556ae9e5f80"
+  },
   {
     "name": "ring",
     "unicode": "1F48D",
@@ -6764,6 +8944,11 @@
     "unicode": "1F916",
     "digest": "cc0e363774b86e21a5b2cea7f7af85bca9e92c124ebcd39c6067c125048baa60"
   },
+  {
+    "name": "robot_face",
+    "unicode": "1F916",
+    "digest": "cc0e363774b86e21a5b2cea7f7af85bca9e92c124ebcd39c6067c125048baa60"
+  },
   {
     "name": "rocket",
     "unicode": "1F680",
@@ -6779,6 +8964,11 @@
     "unicode": "1F644",
     "digest": "f596f203030b6c9bd743848512aa3fc7919447020d35ae5c2bf13ccb16fa2dbe"
   },
+  {
+    "name": "face_with_rolling_eyes",
+    "unicode": "1F644",
+    "digest": "f596f203030b6c9bd743848512aa3fc7919447020d35ae5c2bf13ccb16fa2dbe"
+  },
   {
     "name": "rooster",
     "unicode": "1F413",
@@ -7099,11 +9289,21 @@
     "unicode": "1F480",
     "digest": "dfd169764b192ac7c6e5101277dd9f1e010e86bdd32ad37e00ed4499fc0a5dd6"
   },
+  {
+    "name": "skeleton",
+    "unicode": "1F480",
+    "digest": "dfd169764b192ac7c6e5101277dd9f1e010e86bdd32ad37e00ed4499fc0a5dd6"
+  },
   {
     "name": "skull_crossbones",
     "unicode": "2620",
     "digest": "e2acf0f36b6a6800c1829a1c6551b5d0eb6dcdef4b7f02070cf69570aeab608c"
   },
+  {
+    "name": "skull_and_crossbones",
+    "unicode": "2620",
+    "digest": "e2acf0f36b6a6800c1829a1c6551b5d0eb6dcdef4b7f02070cf69570aeab608c"
+  },
   {
     "name": "sleeping",
     "unicode": "1F634",
@@ -7124,11 +9324,21 @@
     "unicode": "1F641",
     "digest": "3ae82b38b58ffa50eddebd87153428d880ca181f4f4178a9ca3bd813ea15ccbc"
   },
+  {
+    "name": "slightly_frowning_face",
+    "unicode": "1F641",
+    "digest": "3ae82b38b58ffa50eddebd87153428d880ca181f4f4178a9ca3bd813ea15ccbc"
+  },
   {
     "name": "slight_smile",
     "unicode": "1F642",
     "digest": "5eee09f634a4e2031927d008a6530a258a00e611ead0c386dd5b7ebb5e75a306"
   },
+  {
+    "name": "slightly_smiling_face",
+    "unicode": "1F642",
+    "digest": "5eee09f634a4e2031927d008a6530a258a00e611ead0c386dd5b7ebb5e75a306"
+  },
   {
     "name": "slot_machine",
     "unicode": "1F3B0",
@@ -7299,6 +9509,11 @@
     "unicode": "1F5E3",
     "digest": "d92cfe1200887300b2f05f9576448a2f2a79d0accd51f323a65ce3db0aa5639b"
   },
+  {
+    "name": "speaking_head_in_silhouette",
+    "unicode": "1F5E3",
+    "digest": "d92cfe1200887300b2f05f9576448a2f2a79d0accd51f323a65ce3db0aa5639b"
+  },
   {
     "name": "speech_balloon",
     "unicode": "1F4AC",
@@ -7309,21 +9524,41 @@
     "unicode": "1F5E8",
     "digest": "478b0b07460a9f54b7d0050f886da59fde5e428daa11e899fc31477fda1707ed"
   },
+  {
+    "name": "left_speech_bubble",
+    "unicode": "1F5E8",
+    "digest": "478b0b07460a9f54b7d0050f886da59fde5e428daa11e899fc31477fda1707ed"
+  },
   {
     "name": "speech_right",
     "unicode": "1F5E9",
     "digest": "8439b13779163c15e678a78b08ebeeb7d131632df21d2a7868de7fed38ca9d8a"
   },
+  {
+    "name": "right_speech_bubble",
+    "unicode": "1F5E9",
+    "digest": "8439b13779163c15e678a78b08ebeeb7d131632df21d2a7868de7fed38ca9d8a"
+  },
   {
     "name": "speech_three",
     "unicode": "1F5EB",
     "digest": "55a934f3659b6e75fdce0d0c4e2ea56dd34a43892c85a6666bd1882a0bfb92a9"
   },
+  {
+    "name": "three_speech_bubbles",
+    "unicode": "1F5EB",
+    "digest": "55a934f3659b6e75fdce0d0c4e2ea56dd34a43892c85a6666bd1882a0bfb92a9"
+  },
   {
     "name": "speech_two",
     "unicode": "1F5EA",
     "digest": "0563ef0591da243673cf877462acc5d8e1d980a56e81668ac627de74d0c33983"
   },
+  {
+    "name": "two_speech_bubbles",
+    "unicode": "1F5EA",
+    "digest": "0563ef0591da243673cf877462acc5d8e1d980a56e81668ac627de74d0c33983"
+  },
   {
     "name": "speedboat",
     "unicode": "1F6A4",
@@ -7344,31 +9579,61 @@
     "unicode": "1F575",
     "digest": "eaa570a36d83119d0a596228e74affe84d7355714ff6901d88a89410d26dec2a"
   },
+  {
+    "name": "sleuth_or_spy",
+    "unicode": "1F575",
+    "digest": "eaa570a36d83119d0a596228e74affe84d7355714ff6901d88a89410d26dec2a"
+  },
   {
     "name": "spy_tone1",
     "unicode": "1F575-1F3FB",
     "digest": "abdc066d4cad6a17047faf7806c45feb43ae1e2056cf500536f08f4173dbfa94"
   },
+  {
+    "name": "sleuth_or_spy_tone1",
+    "unicode": "1F575-1F3FB",
+    "digest": "abdc066d4cad6a17047faf7806c45feb43ae1e2056cf500536f08f4173dbfa94"
+  },
   {
     "name": "spy_tone2",
     "unicode": "1F575-1F3FC",
     "digest": "72a3313ef12364105e764cc3deabd47eb6bd086f261c435682ae1cd29dc8230b"
   },
+  {
+    "name": "sleuth_or_spy_tone2",
+    "unicode": "1F575-1F3FC",
+    "digest": "72a3313ef12364105e764cc3deabd47eb6bd086f261c435682ae1cd29dc8230b"
+  },
   {
     "name": "spy_tone3",
     "unicode": "1F575-1F3FD",
     "digest": "2a1108d3d2e778f88aa5b3ae36705c877b84d0bf6b421409582ba748aeb2aee7"
   },
+  {
+    "name": "sleuth_or_spy_tone3",
+    "unicode": "1F575-1F3FD",
+    "digest": "2a1108d3d2e778f88aa5b3ae36705c877b84d0bf6b421409582ba748aeb2aee7"
+  },
   {
     "name": "spy_tone4",
     "unicode": "1F575-1F3FE",
     "digest": "1d4fe62912384bc0d687bcf4565752caf0ed6146c903a156d1c6ba6ea239b154"
   },
+  {
+    "name": "sleuth_or_spy_tone4",
+    "unicode": "1F575-1F3FE",
+    "digest": "1d4fe62912384bc0d687bcf4565752caf0ed6146c903a156d1c6ba6ea239b154"
+  },
   {
     "name": "spy_tone5",
     "unicode": "1F575-1F3FF",
     "digest": "69c1baac73783edb9e2d0c951f922dc7dddac34d0a9c818fee8d1021bc17db0d"
   },
+  {
+    "name": "sleuth_or_spy_tone5",
+    "unicode": "1F575-1F3FF",
+    "digest": "69c1baac73783edb9e2d0c951f922dc7dddac34d0a9c818fee8d1021bc17db0d"
+  },
   {
     "name": "stadium",
     "unicode": "1F3DF",
@@ -7419,6 +9684,11 @@
     "unicode": "1F4FE",
     "digest": "1ce1f9a83867514b8351ad4fd80c46bba04ad67dfb9874e63d7296e1a21161a5"
   },
+  {
+    "name": "portable_stereo",
+    "unicode": "1F4FE",
+    "digest": "1ce1f9a83867514b8351ad4fd80c46bba04ad67dfb9874e63d7296e1a21161a5"
+  },
   {
     "name": "stew",
     "unicode": "1F372",
@@ -7644,6 +9914,11 @@
     "unicode": "1F57F",
     "digest": "c3a42a653a91d90c6b668f678419d5438f2e546050914b841623e57107e805db"
   },
+  {
+    "name": "black_touchtone_telephone",
+    "unicode": "1F57F",
+    "digest": "c3a42a653a91d90c6b668f678419d5438f2e546050914b841623e57107e805db"
+  },
   {
     "name": "telephone_receiver",
     "unicode": "1F4DE",
@@ -7654,6 +9929,11 @@
     "unicode": "1F57E",
     "digest": "62a7e0e50c53e9f85eba51a92882e6064be05997910d3f7700e1e957dbaf0581"
   },
+  {
+    "name": "white_touchtone_telephone",
+    "unicode": "1F57E",
+    "digest": "62a7e0e50c53e9f85eba51a92882e6064be05997910d3f7700e1e957dbaf0581"
+  },
   {
     "name": "telescope",
     "unicode": "1F52D",
@@ -7684,11 +9964,21 @@
     "unicode": "1F912",
     "digest": "f19c489d89dd2d39770a6c8725a20f3e98f9e5216774af60c0665fd6a03a7687"
   },
+  {
+    "name": "face_with_thermometer",
+    "unicode": "1F912",
+    "digest": "f19c489d89dd2d39770a6c8725a20f3e98f9e5216774af60c0665fd6a03a7687"
+  },
   {
     "name": "thinking",
     "unicode": "1F914",
     "digest": "f64a9a18dca4c502b46f933838753a818b604a9d0268aa32eda26cbd31abc58c"
   },
+  {
+    "name": "thinking_face",
+    "unicode": "1F914",
+    "digest": "f64a9a18dca4c502b46f933838753a818b604a9d0268aa32eda26cbd31abc58c"
+  },
   {
     "name": "thought_balloon",
     "unicode": "1F4AD",
@@ -7699,11 +9989,21 @@
     "unicode": "1F5EC",
     "digest": "4fd591bf4318df73d1b17f434a449d8e95f49cca53a3d8f4d1ca983f3809ef46"
   },
+  {
+    "name": "left_thought_bubble",
+    "unicode": "1F5EC",
+    "digest": "4fd591bf4318df73d1b17f434a449d8e95f49cca53a3d8f4d1ca983f3809ef46"
+  },
   {
     "name": "thought_right",
     "unicode": "1F5ED",
     "digest": "0e8c0ce26e2d0e30894f5394b0736456e8268f775e0e7eda4c7dc3c2ff9231ae"
   },
+  {
+    "name": "right_thought_bubble",
+    "unicode": "1F5ED",
+    "digest": "0e8c0ce26e2d0e30894f5394b0736456e8268f775e0e7eda4c7dc3c2ff9231ae"
+  },
   {
     "name": "three",
     "unicode": "0033-20E3",
@@ -7714,76 +10014,151 @@
     "unicode": "1F593",
     "digest": "a8b561e389bc4e4b07fba70994f6445e5ddc6afe68922fcb6e9e7282d19ad958"
   },
+  {
+    "name": "reversed_thumbs_down_sign",
+    "unicode": "1F593",
+    "digest": "a8b561e389bc4e4b07fba70994f6445e5ddc6afe68922fcb6e9e7282d19ad958"
+  },
   {
     "name": "thumbs_up_reverse",
     "unicode": "1F592",
     "digest": "b6e52715c5ce590bfd08f6e05058ec3765ea2da341b11f9825d100608b173837"
   },
+  {
+    "name": "reversed_thumbs_up_sign",
+    "unicode": "1F592",
+    "digest": "b6e52715c5ce590bfd08f6e05058ec3765ea2da341b11f9825d100608b173837"
+  },
   {
     "name": "thumbsdown",
     "unicode": "1F44E",
     "digest": "a98f742c9773e0d95c0de5e1c10d1ab373fa761378a205f27d095e85debe69a3"
   },
+  {
+    "name": "-1",
+    "unicode": "1F44E",
+    "digest": "a98f742c9773e0d95c0de5e1c10d1ab373fa761378a205f27d095e85debe69a3"
+  },
   {
     "name": "thumbsdown_tone1",
     "unicode": "1F44E-1F3FB",
     "digest": "5d0a7c63d52eafe6267c552168c5557a66622009d565c3cf7b5378c1f6e84bce"
   },
+  {
+    "name": "-1_tone1",
+    "unicode": "1F44E-1F3FB",
+    "digest": "5d0a7c63d52eafe6267c552168c5557a66622009d565c3cf7b5378c1f6e84bce"
+  },
   {
     "name": "thumbsdown_tone2",
     "unicode": "1F44E-1F3FC",
     "digest": "ca5c15dc516660b2989a1c717bf3745fdfb6964c7acf3b938285ff6c7caf2ca2"
   },
+  {
+    "name": "-1_tone2",
+    "unicode": "1F44E-1F3FC",
+    "digest": "ca5c15dc516660b2989a1c717bf3745fdfb6964c7acf3b938285ff6c7caf2ca2"
+  },
   {
     "name": "thumbsdown_tone3",
     "unicode": "1F44E-1F3FD",
     "digest": "05740e3568795270674dac9134198bf75b1b778c11daa71649c88c231859ec16"
   },
+  {
+    "name": "-1_tone3",
+    "unicode": "1F44E-1F3FD",
+    "digest": "05740e3568795270674dac9134198bf75b1b778c11daa71649c88c231859ec16"
+  },
   {
     "name": "thumbsdown_tone4",
     "unicode": "1F44E-1F3FE",
     "digest": "5ee93bcc2f515806462a7b303064beade2b22a3f43a8162e39fd65d15d772e27"
   },
+  {
+    "name": "-1_tone4",
+    "unicode": "1F44E-1F3FE",
+    "digest": "5ee93bcc2f515806462a7b303064beade2b22a3f43a8162e39fd65d15d772e27"
+  },
   {
     "name": "thumbsdown_tone5",
     "unicode": "1F44E-1F3FF",
     "digest": "5c9ef8d53cf6f755668ab6dabfbfcdfd4b95fd59db3b3dd60290efefe9c33994"
   },
+  {
+    "name": "-1_tone5",
+    "unicode": "1F44E-1F3FF",
+    "digest": "5c9ef8d53cf6f755668ab6dabfbfcdfd4b95fd59db3b3dd60290efefe9c33994"
+  },
   {
     "name": "thumbsup",
     "unicode": "1F44D",
     "digest": "28b31df963773ba42a1a089f43cd89d0ce1ab0981e5410f41242e9a125fc1aee"
   },
+  {
+    "name": "+1",
+    "unicode": "1F44D",
+    "digest": "28b31df963773ba42a1a089f43cd89d0ce1ab0981e5410f41242e9a125fc1aee"
+  },
   {
     "name": "thumbsup_tone1",
     "unicode": "1F44D-1F3FB",
     "digest": "f6365942738d2128b6959d6672b3d295757dc8240703cb84a2b014ad78d67de3"
   },
+  {
+    "name": "+1_tone1",
+    "unicode": "1F44D-1F3FB",
+    "digest": "f6365942738d2128b6959d6672b3d295757dc8240703cb84a2b014ad78d67de3"
+  },
   {
     "name": "thumbsup_tone2",
     "unicode": "1F44D-1F3FC",
     "digest": "771d30146e4dc947a69057b05d32c765c8457ab02b5342889c5489acf27ef356"
   },
+  {
+    "name": "+1_tone2",
+    "unicode": "1F44D-1F3FC",
+    "digest": "771d30146e4dc947a69057b05d32c765c8457ab02b5342889c5489acf27ef356"
+  },
   {
     "name": "thumbsup_tone3",
     "unicode": "1F44D-1F3FD",
     "digest": "0bb7bbfb654c6139260e1786e7ffa5a33f31e19410c1d4d15737fdf5dd4c721d"
   },
+  {
+    "name": "+1_tone3",
+    "unicode": "1F44D-1F3FD",
+    "digest": "0bb7bbfb654c6139260e1786e7ffa5a33f31e19410c1d4d15737fdf5dd4c721d"
+  },
   {
     "name": "thumbsup_tone4",
     "unicode": "1F44D-1F3FE",
     "digest": "df0927c5342f0075fbf4ea83b724e6f70c0466c54769c9ce4a5c2deb602b28aa"
   },
+  {
+    "name": "+1_tone4",
+    "unicode": "1F44D-1F3FE",
+    "digest": "df0927c5342f0075fbf4ea83b724e6f70c0466c54769c9ce4a5c2deb602b28aa"
+  },
   {
     "name": "thumbsup_tone5",
     "unicode": "1F44D-1F3FF",
     "digest": "0683ae08c50aaf186c6406680a60617679c7b4bccd0817f24b15911dbb06866f"
   },
+  {
+    "name": "+1_tone5",
+    "unicode": "1F44D-1F3FF",
+    "digest": "0683ae08c50aaf186c6406680a60617679c7b4bccd0817f24b15911dbb06866f"
+  },
   {
     "name": "thunder_cloud_rain",
     "unicode": "26C8",
     "digest": "dd836f06b41a10d6ed9bcbdae291d2886847ff66dc3ede2427382e469f60674c"
   },
+  {
+    "name": "thunder_cloud_and_rain",
+    "unicode": "26C8",
+    "digest": "dd836f06b41a10d6ed9bcbdae291d2886847ff66dc3ede2427382e469f60674c"
+  },
   {
     "name": "ticket",
     "unicode": "1F3AB",
@@ -7794,6 +10169,11 @@
     "unicode": "1F39F",
     "digest": "ccafcc9583a84e847ff1eaa3d53187c5ab150a7d27c6a19363e59b9bc046b567"
   },
+  {
+    "name": "admission_tickets",
+    "unicode": "1F39F",
+    "digest": "ccafcc9583a84e847ff1eaa3d53187c5ab150a7d27c6a19363e59b9bc046b567"
+  },
   {
     "name": "tiger",
     "unicode": "1F42F",
@@ -7809,6 +10189,11 @@
     "unicode": "23F2",
     "digest": "c48199312ed42ff53a33bb2791db19e2e2521223cd49d8f758ea95b9b379c5ff"
   },
+  {
+    "name": "timer_clock",
+    "unicode": "23F2",
+    "digest": "c48199312ed42ff53a33bb2791db19e2e2521223cd49d8f758ea95b9b379c5ff"
+  },
   {
     "name": "tired_face",
     "unicode": "1F62B",
@@ -7869,6 +10254,11 @@
     "unicode": "1F6E0",
     "digest": "9b0a36dfdb475621d326359662b22cbdb80563c4f476aa5e7d7c00cdba605bd9"
   },
+  {
+    "name": "hammer_and_wrench",
+    "unicode": "1F6E0",
+    "digest": "9b0a36dfdb475621d326359662b22cbdb80563c4f476aa5e7d7c00cdba605bd9"
+  },
   {
     "name": "top",
     "unicode": "1F51D",
@@ -7884,11 +10274,21 @@
     "unicode": "23ED",
     "digest": "d5415ed140933f345fea8023a3d8fca30dcfcf7d19d9dc9771fa2cae9df62a3b"
   },
+  {
+    "name": "next_track",
+    "unicode": "23ED",
+    "digest": "d5415ed140933f345fea8023a3d8fca30dcfcf7d19d9dc9771fa2cae9df62a3b"
+  },
   {
     "name": "track_previous",
     "unicode": "23EE",
     "digest": "97ff4a59a236e5cf506fa3577b20715b3b0197e0f343a50615b36185d5b835f1"
   },
+  {
+    "name": "previous_track",
+    "unicode": "23EE",
+    "digest": "97ff4a59a236e5cf506fa3577b20715b3b0197e0f343a50615b36185d5b835f1"
+  },
   {
     "name": "trackball",
     "unicode": "1F5B2",
@@ -7919,6 +10319,11 @@
     "unicode": "1F6F2",
     "digest": "621bb967cd93fa9f8fd4b155965cc7572d3f91f88d94938ba10c8626718b623c"
   },
+  {
+    "name": "diesel_locomotive",
+    "unicode": "1F6F2",
+    "digest": "621bb967cd93fa9f8fd4b155965cc7572d3f91f88d94938ba10c8626718b623c"
+  },
   {
     "name": "tram",
     "unicode": "1F68A",
@@ -7929,6 +10334,11 @@
     "unicode": "1F6C6",
     "digest": "e24bb39ecfaaa746b03dc8418697d09ef327d5b077db39014f39d5fb87e23bd5"
   },
+  {
+    "name": "triangle_with_rounded_corners",
+    "unicode": "1F6C6",
+    "digest": "e24bb39ecfaaa746b03dc8418697d09ef327d5b077db39014f39d5fb87e23bd5"
+  },
   {
     "name": "triangular_flag_on_post",
     "unicode": "1F6A9",
@@ -7994,6 +10404,11 @@
     "unicode": "1F58F",
     "digest": "8a6c5b7d4c737866e7e32c6d9f7f447a48a0ac57a8909d43f87367d4a9b59246"
   },
+  {
+    "name": "turned_ok_hand_sign",
+    "unicode": "1F58F",
+    "digest": "8a6c5b7d4c737866e7e32c6d9f7f447a48a0ac57a8909d43f87367d4a9b59246"
+  },
   {
     "name": "turtle",
     "unicode": "1F422",
@@ -8109,6 +10524,11 @@
     "unicode": "1F984",
     "digest": "1b1e9c209dabe619db76fd346c3fb51b28ace0e4102697fe0973fe2d46aa9f08"
   },
+  {
+    "name": "unicorn_face",
+    "unicode": "1F984",
+    "digest": "1b1e9c209dabe619db76fd346c3fb51b28ace0e4102697fe0973fe2d46aa9f08"
+  },
   {
     "name": "unlock",
     "unicode": "1F513",
@@ -8124,11 +10544,21 @@
     "unicode": "1F643",
     "digest": "763fe2baf07a9b04f96958adf38a43c7dd2bc70d57398f49604307bd835cbb53"
   },
+  {
+    "name": "upside_down_face",
+    "unicode": "1F643",
+    "digest": "763fe2baf07a9b04f96958adf38a43c7dd2bc70d57398f49604307bd835cbb53"
+  },
   {
     "name": "urn",
     "unicode": "26B1",
     "digest": "dbfd5b90709d1b812d2fff71a5cfa10f84a4579866c2d7cd0e80759a22b2ba0e"
   },
+  {
+    "name": "funeral_urn",
+    "unicode": "26B1",
+    "digest": "dbfd5b90709d1b812d2fff71a5cfa10f84a4579866c2d7cd0e80759a22b2ba0e"
+  },
   {
     "name": "v",
     "unicode": "270C",
@@ -8214,31 +10644,61 @@
     "unicode": "1F596",
     "digest": "ca800fce797e652c5f47bf44992e8fbe19554688a36423fdf7c29ca6defae1e0"
   },
+  {
+    "name": "raised_hand_with_part_between_middle_and_ring_fingers",
+    "unicode": "1F596",
+    "digest": "ca800fce797e652c5f47bf44992e8fbe19554688a36423fdf7c29ca6defae1e0"
+  },
   {
     "name": "vulcan_tone1",
     "unicode": "1F596-1F3FB",
     "digest": "84bafdaca43426b053f5caa4e868ca109d99113a28ea9799db09d3c5d5f645c8"
   },
+  {
+    "name": "raised_hand_with_part_between_middle_and_ring_fingers_tone1",
+    "unicode": "1F596-1F3FB",
+    "digest": "84bafdaca43426b053f5caa4e868ca109d99113a28ea9799db09d3c5d5f645c8"
+  },
   {
     "name": "vulcan_tone2",
     "unicode": "1F596-1F3FC",
     "digest": "e7cedf63ead957ee5c287e4cb0828ba70673e17b604f92b529875c32d094e7e3"
   },
+  {
+    "name": "raised_hand_with_part_between_middle_and_ring_fingers_tone2",
+    "unicode": "1F596-1F3FC",
+    "digest": "e7cedf63ead957ee5c287e4cb0828ba70673e17b604f92b529875c32d094e7e3"
+  },
   {
     "name": "vulcan_tone3",
     "unicode": "1F596-1F3FD",
     "digest": "e124fef20f289921553274cf834f6dcc1a012889d30d9874dc5ad01afb8235b8"
   },
+  {
+    "name": "raised_hand_with_part_between_middle_and_ring_fingers_tone3",
+    "unicode": "1F596-1F3FD",
+    "digest": "e124fef20f289921553274cf834f6dcc1a012889d30d9874dc5ad01afb8235b8"
+  },
   {
     "name": "vulcan_tone4",
     "unicode": "1F596-1F3FE",
     "digest": "ea2115f549e4680467521bbf362b229f4a8f0fdadbfaf231378d801f9b369f08"
   },
+  {
+    "name": "raised_hand_with_part_between_middle_and_ring_fingers_tone4",
+    "unicode": "1F596-1F3FE",
+    "digest": "ea2115f549e4680467521bbf362b229f4a8f0fdadbfaf231378d801f9b369f08"
+  },
   {
     "name": "vulcan_tone5",
     "unicode": "1F596-1F3FF",
     "digest": "1b322e1252491f35ae02f0b279b6529dad867f2a6b3c2c3e77f981bed07e447d"
   },
+  {
+    "name": "raised_hand_with_part_between_middle_and_ring_fingers_tone5",
+    "unicode": "1F596-1F3FF",
+    "digest": "1b322e1252491f35ae02f0b279b6529dad867f2a6b3c2c3e77f981bed07e447d"
+  },
   {
     "name": "walking",
     "unicode": "1F6B6",
@@ -8429,16 +10889,31 @@
     "unicode": "1F325",
     "digest": "d8ce416e6bdb0e59e06e2fceac3177dbe59fefc248fd8c6d76b80d1418141070"
   },
+  {
+    "name": "white_sun_behind_cloud",
+    "unicode": "1F325",
+    "digest": "d8ce416e6bdb0e59e06e2fceac3177dbe59fefc248fd8c6d76b80d1418141070"
+  },
   {
     "name": "white_sun_rain_cloud",
     "unicode": "1F326",
     "digest": "d2b132518261864ac4a95707eaeea335dd8351ed2b8ef4e2272ced456e309bf1"
   },
+  {
+    "name": "white_sun_behind_cloud_with_rain",
+    "unicode": "1F326",
+    "digest": "d2b132518261864ac4a95707eaeea335dd8351ed2b8ef4e2272ced456e309bf1"
+  },
   {
     "name": "white_sun_small_cloud",
     "unicode": "1F324",
     "digest": "b86a72f1cdb4d24fd3ab180aae9db012ca51fc01f3786aab596c2e330066b185"
   },
+  {
+    "name": "white_sun_with_small_cloud",
+    "unicode": "1F324",
+    "digest": "b86a72f1cdb4d24fd3ab180aae9db012ca51fc01f3786aab596c2e330066b185"
+  },
   {
     "name": "wind_blowing_face",
     "unicode": "1F32C",
@@ -8524,6 +10999,11 @@
     "unicode": "1F58E",
     "digest": "c4fc18ece6778339ebe14438aaf570e22385c3010c2d341824fa72ac6068cfeb"
   },
+  {
+    "name": "left_writing_hand",
+    "unicode": "1F58E",
+    "digest": "c4fc18ece6778339ebe14438aaf570e22385c3010c2d341824fa72ac6068cfeb"
+  },
   {
     "name": "writing_hand_tone1",
     "unicode": "270D-1F3FB",
@@ -8589,6 +11069,11 @@
     "unicode": "1F910",
     "digest": "8396249161b6d865861b56aabd17cae2c821b0d814f4249bf8cab0bb21fa8ee9"
   },
+  {
+    "name": "zipper_mouth_face",
+    "unicode": "1F910",
+    "digest": "8396249161b6d865861b56aabd17cae2c821b0d814f4249bf8cab0bb21fa8ee9"
+  },
   {
     "name": "zzz",
     "unicode": "1F4A4",
diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake
index 7ec00a898f..030ee8bafc 100644
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
@@ -5,12 +5,23 @@ namespace :gemojione do
     require 'json'
 
     dir = Gemojione.index.images_path
+    digests = []
+    aliases = Hash.new { |hash, key| hash[key] = [] }
+    aliases_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json')
 
-    digests = AwardEmoji.emojis.map do |name, emoji_hash|
+    JSON.parse(File.read(aliases_path)).each do |alias_name, real_name|
+      aliases[real_name] << alias_name
+    end
+
+    AwardEmoji.emojis.map do |name, emoji_hash|
       fpath = File.join(dir, "#{emoji_hash['unicode']}.png")
       digest = Digest::SHA256.file(fpath).hexdigest
 
-      { name: name, unicode: emoji_hash['unicode'], digest: digest }
+      digests << { name: name, unicode: emoji_hash['unicode'], digest: digest }
+
+      aliases[name].each do |alias_name|
+        digests << { name: alias_name, unicode: emoji_hash['unicode'], digest: digest }
+      end
     end
 
     out = File.join(Rails.root, 'fixtures', 'emojis', 'digests.json')

From 1647e3e8849991629f5ebf1a11f9ca06e8f741ea Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Sat, 9 Apr 2016 08:29:57 -0600
Subject: [PATCH 117/283] Upgrade Sprockets from 3.3.5 to 3.6.0.

Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Resolves #14344.
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3f29df0d81..298cfd260b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'responders', '~> 2.0'
 
 # Specify a sprockets version due to increased performance
 # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
-gem 'sprockets', '~> 3.3.5'
+gem 'sprockets', '~> 3.6.0'
 
 # Default values for AR models
 gem "default_value_for", "~> 3.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7eb4080183..28b71ac7bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -776,7 +776,8 @@ GEM
       spring (>= 0.9.1)
     spring-commands-teaspoon (0.0.2)
       spring (>= 0.9.1)
-    sprockets (3.3.5)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.0.4)
       actionpack (>= 4.0)
@@ -1033,7 +1034,7 @@ DEPENDENCIES
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.0.0)
   spring-commands-teaspoon (~> 0.0.2)
-  sprockets (~> 3.3.5)
+  sprockets (~> 3.6.0)
   state_machines-activerecord (~> 0.3.0)
   task_list (~> 1.0.2)
   teaspoon (~> 1.1.0)

From fb8afae1863c5daa6b1fbce04755fa573302b607 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Sat, 9 Apr 2016 11:28:47 -0600
Subject: [PATCH 118/283] Apparently I missed updating the schema.rb when
 removing the Twitter "Congrats" button

From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d
---
 db/schema.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index e63e22ce86..ec235c1913 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: 20160331133914) do
+ActiveRecord::Schema.define(version: 20160331223143) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -44,7 +44,6 @@ ActiveRecord::Schema.define(version: 20160331133914) do
     t.datetime "updated_at"
     t.string   "home_page_url"
     t.integer  "default_branch_protection",         default: 2
-    t.boolean  "twitter_sharing_enabled",           default: true
     t.text     "restricted_visibility_levels"
     t.boolean  "version_check_enabled",             default: true
     t.integer  "max_attachment_size",               default: 10,          null: false

From ca823065a905f8c19b2003a67e79831ba1ceff2e Mon Sep 17 00:00:00 2001
From: Benjamin Montgomery <bmontgom@montynet.org>
Date: Sat, 9 Apr 2016 20:51:15 +0000
Subject: [PATCH 119/283] actually enable artifacts

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

diff --git a/doc/ci/build_artifacts/README.md b/doc/ci/build_artifacts/README.md
index 71db5aa5dc..bd26da2af6 100644
--- a/doc/ci/build_artifacts/README.md
+++ b/doc/ci/build_artifacts/README.md
@@ -31,7 +31,7 @@ To disable it site-wide, follow the steps below.
 1. Edit `/etc/gitlab/gitlab.rb` and add the following line:
 
     ```ruby
-    gitlab_rails['artifacts_enabled'] = false
+    gitlab_rails['artifacts_enabled'] = true
     ```
 
 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
@@ -44,7 +44,7 @@ To disable it site-wide, follow the steps below.
 
     ```yaml
     artifacts:
-      enabled: false
+      enabled: true
     ```
 
 1. Save the file and [restart GitLab][] for the changes to take effect.

From 44d9f52fd9dba09c352f64bb742291e5adab423a Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Sat, 9 Apr 2016 16:31:41 -0600
Subject: [PATCH 120/283] Enable asset compression in production.

`config.assets.compress` needed to be explicitly enabled.

Follow-up to !3544. Resolves #14344.
---
 CHANGELOG                         | 1 +
 config/environments/production.rb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c25ee3c71d..b5dcc8bc8a 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.7.0 (unreleased)
+  - Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
   - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
   - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 909526605a..a9d8ac4b6d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -21,6 +21,9 @@ Rails.application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
+  # Enable compression of compiled assets using gzip.
+  config.assets.compress = true
+
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
 

From b95c9217b75d84412d9a3e4f52f31158329755f4 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Fri, 1 Apr 2016 17:27:28 +0100
Subject: [PATCH 121/283] prevent users from being able to both upvote and
 downvote

---
 app/assets/javascripts/awards_handler.coffee | 15 +++++++++++++--
 app/views/votes/_votes_block.html.haml       |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 6a670d5e88..af4462ece3 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -22,8 +22,19 @@ class @AwardsHandler
     emoji = $(this)
       .find(".icon")
       .data "emoji"
+
+    if emoji is "thumbsup" and awards_handler.didUserClickEmoji $(this), "thumbsdown"
+      awards_handler.addAward "thumbsdown"
+
+    else if emoji is "thumbsdown" and awards_handler.didUserClickEmoji $(this), "thumbsup"
+      awards_handler.addAward "thumbsup"
+
     awards_handler.addAward 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
+
   showEmojiMenu: ->
     if $(".emoji-menu").length
       if $(".emoji-menu").is ".is-visible"
@@ -105,7 +116,7 @@ class @AwardsHandler
     if origTitle
       authors = origTitle.split(', ')
     authors.push("me")
-    award_block.attr("title", authors.join(", "))
+    award_block.attr("data-original-title", authors.join(", "))
     @resetTooltip(award_block)
 
   resetTooltip: (award) ->
@@ -122,7 +133,7 @@ class @AwardsHandler
 
     nodes = []
     nodes.push(
-      "<button class='btn award-control js-emoji-btn has-tooltip active' title='me'>",
+      "<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>"
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index 49cfcd53d7..dc249155b9 100644
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -1,6 +1,6 @@
 .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)), title: emoji_author_list(notes, current_user), data: {placement: "top"}}
+    %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)}}
       = emoji_icon(emoji, sprite: false)
       %span.award-control-text.js-counter
         = notes.count

From 91905ae3f5a9f755258b770482cd45916ee47fe4 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Tue, 5 Apr 2016 23:26:17 +0100
Subject: [PATCH 122/283] write test to prevent reoccurence of issue

---
 spec/features/issues/award_emoji_spec.rb | 64 ++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 spec/features/issues/award_emoji_spec.rb

diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
new file mode 100644
index 0000000000..41af789aae
--- /dev/null
+++ b/spec/features/issues/award_emoji_spec.rb
@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+describe 'Awards Emoji', feature: true do
+  let!(:project)   { create(:project) }
+  let!(:user)      { create(:user) }
+
+  before do
+    project.team << [user, :master]
+    login_as(user)
+  end
+
+  describe 'Click award emoji from issue#show' do
+    let!(:issue) do
+      create(:issue,
+             author: @user,
+             assignee: @user,
+             project: project)
+    end
+
+    before do
+      visit namespace_project_issue_path(project.namespace, project, issue)
+    end
+
+    it 'should increment the thumbsdown emoji', js: true do
+      find('[data-emoji="thumbsdown"]').click
+      sleep 2
+      expect(thumbsdown_emoji).to have_text("1")
+    end
+
+    context 'click the thumbsup emoji' do
+
+      it 'should increment the thumbsup emoji', js: true do
+        find('[data-emoji="thumbsup"]').click
+        sleep 2
+        expect(thumbsup_emoji).to have_text("1")
+      end
+
+      it 'should decrement the thumbsdown emoji', js: true do
+        expect(thumbsdown_emoji).to have_text("0")
+      end
+    end
+
+    context 'click the thumbsdown emoji' do
+
+      it 'should increment the thumbsdown emoji', js: true do
+        find('[data-emoji="thumbsdown"]').click
+        sleep 2
+        expect(thumbsdown_emoji).to have_text("1")
+      end
+
+      it 'should decrement the thumbsup emoji', js: true do
+        expect(thumbsup_emoji).to have_text("0")
+      end
+    end
+  end
+
+  def thumbsup_emoji
+    page.all('span.js-counter').first
+  end
+
+  def thumbsdown_emoji
+    page.all('span.js-counter').last
+  end
+end

From 2378ec0d635a4dbe0d1716a86bb3e3d038518e94 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 9 Apr 2016 19:32:22 -0400
Subject: [PATCH 123/283] Add a `program` tag to Sentry Raven context

This will let us filter errors by the program environment in which they
were encountered.

Source: http://stackoverflow.com/a/28370539/223897

Closes #15092
---
 app/controllers/application_controller.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c81cb85dc1..97d53acde9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -47,6 +47,16 @@ class ApplicationController < ActionController::Base
         email: current_user.email,
         username: current_user.username,
       )
+
+      Raven.tags_context(program: sentry_program_context)
+    end
+  end
+
+  def sentry_program_context
+    if Sidekiq.server?
+      'sidekiq'
+    else
+      'rails'
     end
   end
 

From f03b5c4fde1bd6eb415457e60d3c79fbd9c2e4ee Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 9 Apr 2016 20:02:36 -0400
Subject: [PATCH 124/283] Remove tab stop from "Write", "Preview", "Go full
 screen" links

Closes #15089
---
 app/views/projects/_md_preview.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index 4920910fee..7a78d61a61 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -2,13 +2,13 @@
   .md-header
     %ul.nav-links
       %li.active
-        %a.js-md-write-button{ href: "#md-write-holder" }
+        %a.js-md-write-button{ href: "#md-write-holder", tabindex: -1 }
           Write
       %li
-        %a.js-md-preview-button{ href: "#md-preview-holder" }
+        %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' }
+        %button.zen-cotrol.zen-control-full.js-zen-enter{ type: 'button', tabindex: -1 }
           Go full screen
 
   .md-write-holder

From 98f536f1693d59942d91e18ece499bb35ec55259 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@gitlab.com>
Date: Sat, 9 Apr 2016 20:09:07 -0400
Subject: [PATCH 125/283] Everything on one page.

---
 doc/integration/README.md                | 17 +++--------------
 doc/project_services/project_services.md | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/doc/integration/README.md b/doc/integration/README.md
index 7c8f785a61..6fe04aa2a0 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -19,26 +19,15 @@ 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
+
+
 ## Project services
 
 Integration with services such as Campfire, Flowdock, Gemnasium, HipChat,
 Pivotal Tracker, and Slack are available in the form of a [Project Service][].
-You can find these within GitLab in the Services page under Project Settings if
-you are at least a master on the project.
-Project Services are a bit like plugins in that they allow a lot of freedom in
-adding functionality to GitLab. For example there is also a service that can
-send an email every time someone pushes new commits.
 
-Because GitLab is open source we can ship with the code and tests for all
-plugins. This allows the community to keep the plugins up to date so that they
-always work in newer GitLab versions.
-
-For an overview of what projects services are available without logging in,
-please see the [project_services directory][projects-code].
-
-[jenkins]: http://doc.gitlab.com/ee/integration/jenkins.html
 [Project Service]: ../project_services/project_services.md
-[projects-code]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/app/models/project_services
 
 ## SSL certificate errors
 
diff --git a/doc/project_services/project_services.md b/doc/project_services/project_services.md
index 3fea2cff0b..a5af620d9b 100644
--- a/doc/project_services/project_services.md
+++ b/doc/project_services/project_services.md
@@ -1,7 +1,24 @@
 # Project Services
 
 Project services allow you to integrate GitLab with other applications. Below
-is list of the currently supported ones. Click on the service links to see
+is list of the currently supported ones.
+
+You can find these within GitLab in the Services page under Project Settings if
+you are at least a master on the project.
+Project Services are a bit like plugins in that they allow a lot of freedom in
+adding functionality to GitLab. For example there is also a service that can
+send an email every time someone pushes new commits.
+
+Because GitLab is open source we can ship with the code and tests for all
+plugins. This allows the community to keep the plugins up to date so that they
+always work in newer GitLab versions.
+
+For an overview of what projects services are available without logging in,
+please see the [project_services directory][projects-code].
+
+[projects-code]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/app/models/project_services
+
+Click on the service links to see
 further configuration instructions and details. Contributions are welcome.
 
 ## Services

From f833726ec048b0ddf85fa8d194956f71c6334785 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 9 Apr 2016 20:43:59 -0400
Subject: [PATCH 126/283] Remove `random_markdown_tip` helper

Only usage got removed in !3442
---
 app/helpers/gitlab_markdown_helper.rb       | 23 ---------------------
 spec/helpers/gitlab_markdown_helper_spec.rb |  7 -------
 2 files changed, 30 deletions(-)

diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 2f760af02f..3a45205563 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -116,29 +116,6 @@ module GitlabMarkdownHelper
     end
   end
 
-  MARKDOWN_TIPS = [
-    "End a line with two or more spaces for a line-break, or soft-return",
-    "Inline code can be denoted by `surrounding it with backticks`",
-    "Blocks of code can be denoted by three backticks ``` or four leading spaces",
-    "Emoji can be added by :emoji_name:, for example :thumbsup:",
-    "Notify other participants using @user_name",
-    "Notify a specific group using @group_name",
-    "Notify the entire team using @all",
-    "Reference an issue using a hash, for example issue #123",
-    "Reference a merge request using an exclamation point, for example MR !123",
-    "Italicize words or phrases using *asterisks* or _underscores_",
-    "Bold words or phrases using **double asterisks** or __double underscores__",
-    "Strikethrough words or phrases using ~~two tildes~~",
-    "Make a bulleted list using + pluses, - minuses, or * asterisks",
-    "Denote blockquotes using > at the beginning of a line",
-    "Make a horizontal line using three or more hyphens ---, asterisks ***, or underscores ___"
-  ].freeze
-
-  # Returns a random markdown tip for use as a textarea placeholder
-  def random_markdown_tip
-    MARKDOWN_TIPS.sample
-  end
-
   private
 
   # Return +text+, truncated to +max_chars+ characters, excluding any HTML
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 9adcd916ce..13de88e2f2 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -150,13 +150,6 @@ describe GitlabMarkdownHelper do
     end
   end
 
-  describe 'random_markdown_tip' do
-    it 'returns a random Markdown tip' do
-      stub_const("#{described_class}::MARKDOWN_TIPS", ['Random tip'])
-      expect(random_markdown_tip).to eq 'Random tip'
-    end
-  end
-
   describe '#first_line_in_markdown' do
     let(:text) { "@#{user.username}, can you look at this?\nHello world\n"}
 

From 66102e5017c2962d1fd1ffcbef09e605033643ba Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 9 Apr 2016 18:34:00 -0700
Subject: [PATCH 127/283] Use raw SQL instead of Rails models in 20130403003950
 migration

Closes gitlab-org/gitlab-development-kit#109

Closes https://github.com/gitlabhq/gitlabhq/issues/10123
---
 ...3950_add_last_activity_column_into_project.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 2a036bd999..85e31608d7 100644
--- a/db/migrate/20130403003950_add_last_activity_column_into_project.rb
+++ b/db/migrate/20130403003950_add_last_activity_column_into_project.rb
@@ -3,14 +3,16 @@ class AddLastActivityColumnIntoProject < ActiveRecord::Migration
     add_column :projects, :last_activity_at, :datetime
     add_index :projects, :last_activity_at
 
-    Project.find_each do |project|
-      last_activity_date = if project.last_activity
-                             project.last_activity.created_at
-                           else
-                             project.updated_at
-                           end
+    select_all('SELECT id, updated_at FROM projects').each do |project|
+      project_id = project['id']
+      update_date = project['updated_at']
+      event = select_one("SELECT created_at FROM events WHERE project_id = #{project_id} ORDER BY created_at DESC LIMIT 1")
 
-      project.update_attribute(:last_activity_at, last_activity_date)
+      if event && event['created_at']
+        update_date = event['created_at']
+      end
+
+      execute("UPDATE projects SET last_activity_at = '#{update_date}' WHERE id = #{project_id}")
     end
   end
 

From c7ec5929b1f580e7078d11774df2e8c0d1abbe03 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 9 Apr 2016 21:49:47 -0400
Subject: [PATCH 128/283] First pass at a Code Review guide

Largely borrowed from thoughtbot's code review guide, so attribution is
included.

[ci skip]
---
 doc/development/README.md      |  2 +
 doc/development/code_review.md | 75 ++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 doc/development/code_review.md

diff --git a/doc/development/README.md b/doc/development/README.md
index 2f4e7845cc..3f3ef068f9 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -2,6 +2,8 @@
 
 - [Architecture](architecture.md) of GitLab
 - [CI setup](ci_setup.md) for testing GitLab
+- [Code review guidelines](code_review.md) for reviewing code and having code
+  reviewed.
 - [Gotchas](gotchas.md) to avoid
 - [How to dump production data to staging](db_dump.md)
 - [Instrumentation](instrumentation.md)
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
new file mode 100644
index 0000000000..ab4236404c
--- /dev/null
+++ b/doc/development/code_review.md
@@ -0,0 +1,75 @@
+# Code Review Guidelines
+
+This guide contains advice and best practices for performing code review, and
+having your code reviewed.
+
+All merge requests for GitLab CE and EE, whether written by a GitLab team member
+or a volunteer contributor, must go through a code review process to ensure the
+code is effective, understandable, and maintainable.
+
+Any developer can, and is encouraged to, perform code review on merge requests
+of colleagues and contributors. However, the final decision to accept a merge
+request is up to one of our merge request "endbosses", denoted on the
+[team page](https://about.gitlab.com/team).
+
+## Everyone
+
+- Accept that many programming decisions are opinions. Discuss tradeoffs, which
+  you prefer, and reach a resolution quickly.
+- Ask questions; don't make demands. ("What do you think about naming this
+  `:user_id`?")
+- Ask for clarification. ("I didn't understand. Can you clarify?")
+- Avoid selective ownership of code. ("mine", "not mine", "yours")
+- Avoid using terms that could be seen as referring to personal traits. ("dumb",
+  "stupid"). Assume everyone is attractive, intelligent, and well-meaning.
+- Be explicit. Remember people don't always understand your intentions online.
+- Be humble. ("I'm not sure - let's look it up.")
+- Don't use hyperbole. ("always", "never", "endlessly", "nothing")
+- Consider one-on-one chats or video calls if there are too many "I didn't
+  understand" or "Alternative solution:" comments. Post a follow-up comment
+  summarizing one-on-one discussion.
+
+## Having your code reviewed
+
+- The first reviewer of your code is _you_. Before you perform that first push
+  of your shiny new branch, read through the entire diff. Does it make sense?
+  Did you include something unrelated to the overall purpose of the changes? Did
+  you forget to remove any debugging code?
+- Be grateful for the reviewer's suggestions. ("Good call. I'll make that
+  change.")
+- Don't take it personally. The review is of the code, not of you.
+- Explain why the code exists. ("It's like that because of these reasons. Would
+  it be more clear if I rename this class/file/method/variable?")
+- Extract unrelated changes and refactorings into future merge requests/issues.
+- Seek to understand the reviewer's perspective.
+- Try to respond to every comment.
+- Push commits based on earlier rounds of feedback as isolated commits to the
+  branch. Do not squash until the branch is ready to merge. Reviewers should be
+  able to read individual updates based on their earlier feedback.
+
+## Reviewing code
+
+Understand why the change is necessary (fixes a bug, improves the user
+experience, refactors the existing code). Then:
+
+- Communicate which ideas you feel strongly about and those you don't.
+- Identify ways to simplify the code while still solving the problem.
+- Offer alternative implementations, but assume the author already considered
+  them. ("What do you think about using a custom validator here?")
+- Seek to understand the author's perspective.
+- If you don't understand a piece of code, _say so_. There's a good chance
+  someone else would be confused by it as well.
+- After a round of line notes, it can be helpful to post a summary note such as
+  "LGTM :thumbsup:", or "Just a couple things to address."
+- Avoid accepting a merge request before the build succeeds ("Merge when build
+  succeeds" is fine).
+
+## Credits
+
+Largely based on the [thoughtbot code review guide].
+
+[thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review
+
+---
+
+[Return to Development documentation](README.md)

From 8536dedbb1fd9154485a001d16e1414c6e3e8e36 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 10 Apr 2016 06:36:14 -0700
Subject: [PATCH 129/283] Fix seed_fu failure with inserting milestones into
 test DB

Milestones were not being saved due to "invalid state" validation errors
---
 db/fixtures/development/07_milestones.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/fixtures/development/07_milestones.rb b/db/fixtures/development/07_milestones.rb
index e028ac82ba..540e4e6825 100644
--- a/db/fixtures/development/07_milestones.rb
+++ b/db/fixtures/development/07_milestones.rb
@@ -4,7 +4,7 @@ Gitlab::Seeder.quiet do
       milestone_params = {
         title: "v#{i}.0",
         description: FFaker::Lorem.sentence,
-        state: ['opened', 'closed'].sample,
+        state: [:active, :closed].sample,
       }
 
       milestone = Milestones::CreateService.new(

From 94b48d95570cd7c0b8dbd11eb4edc957ad5c7443 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Sun, 10 Apr 2016 14:36:31 -0600
Subject: [PATCH 130/283] Upgrade premailer-rails from 1.9.0 to 1.9.2

Includes compatibility with Rails 5.

Changelog:
https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19
2

Working towards #14286.
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 28b71ac7bc..df0d848af4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     creole (0.5.0)
-    css_parser (1.3.7)
+    css_parser (1.4.1)
       addressable
     d3_rails (3.5.11)
       railties (>= 3.1.0)
@@ -559,8 +559,8 @@ GEM
     premailer (1.8.6)
       css_parser (>= 1.3.6)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.0)
-      actionmailer (>= 3, < 5)
+    premailer-rails (1.9.2)
+      actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     pry (0.10.3)
       coderay (~> 1.1.0)

From 1e99e56202c0c96d4a70fba95e04b4f41d24327a Mon Sep 17 00:00:00 2001
From: Benjamin Montgomery <bmontgom@montynet.org>
Date: Sun, 10 Apr 2016 21:14:40 +0000
Subject: [PATCH 131/283] Make the purpose of artifact config options clearer

---
 doc/ci/build_artifacts/README.md | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/doc/ci/build_artifacts/README.md b/doc/ci/build_artifacts/README.md
index bd26da2af6..a21cd12986 100644
--- a/doc/ci/build_artifacts/README.md
+++ b/doc/ci/build_artifacts/README.md
@@ -1,7 +1,8 @@
 # Introduction to build artifacts
 
 Artifacts is a list of files and directories which are attached to a build
-after it completes successfully.
+after it completes successfully.  Artificats is enabled by default.  _If you are searching for ways to use artifacts, jump to
+[Defining artifacts in `.gitlab-ci.yml`](#defining-artifacts-in-gitlab-ciyml)._
 
 Since GitLab 8.2 and [GitLab Runner] 0.7.0, build artifacts that are created by
 GitLab Runner are uploaded to GitLab and are downloadable as a single archive
@@ -16,13 +17,9 @@ The artifacts browser will be available only for new artifacts that are sent
 to GitLab using GitLab Runner version 1.0 and up. It will not be possible to
 browse old artifacts already uploaded to GitLab.
 
-## Enabling build artifacts
+## Disabling build artifacts
 
-_If you are searching for ways to use artifacts, jump to
-[Defining artifacts in `.gitlab-ci.yml`](#defining-artifacts-in-gitlab-ciyml)._
-
-The artifacts feature is enabled by default in all GitLab installations.
-To disable it site-wide, follow the steps below.
+To disable artifacts site-wide, follow the steps below.
 
 ---
 
@@ -31,7 +28,7 @@ To disable it site-wide, follow the steps below.
 1. Edit `/etc/gitlab/gitlab.rb` and add the following line:
 
     ```ruby
-    gitlab_rails['artifacts_enabled'] = true
+    gitlab_rails['artifacts_enabled'] = false
     ```
 
 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
@@ -44,7 +41,7 @@ To disable it site-wide, follow the steps below.
 
     ```yaml
     artifacts:
-      enabled: true
+      enabled: false
     ```
 
 1. Save the file and [restart GitLab][] for the changes to take effect.

From a7e1638b430627133a33986b8a8283891431567a Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Sun, 10 Apr 2016 15:14:57 -0600
Subject: [PATCH 132/283] Upgrade annotate from 2.6.10 to 2.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Includes compatibility with Rails 5. We don’t have any tests for this,
so no need to run them. [ci skip]

Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0

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

diff --git a/Gemfile b/Gemfile
index 298cfd260b..258b5612cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -239,7 +239,7 @@ group :development do
   gem "foreman"
   gem 'brakeman', '~> 3.2.0', require: false
 
-  gem "annotate", "~> 2.6.0"
+  gem "annotate", "~> 2.7.0"
   gem "letter_opener", '~> 1.1.2'
   gem 'quiet_assets', '~> 1.0.2'
   gem 'rerun', '~> 0.11.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 28b71ac7bc..bd11489ee5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,8 +51,8 @@ GEM
       activerecord (>= 3.0)
     akismet (2.0.0)
     allocations (1.0.4)
-    annotate (2.6.10)
-      activerecord (>= 3.2, <= 4.3)
+    annotate (2.7.0)
+      activerecord (>= 3.2, < 6.0)
       rake (~> 10.4)
     arel (6.0.3)
     asana (0.4.0)
@@ -888,7 +888,7 @@ DEPENDENCIES
   after_commit_queue
   akismet (~> 2.0)
   allocations (~> 1.0)
-  annotate (~> 2.6.0)
+  annotate (~> 2.7.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
   attr_encrypted (~> 1.3.4)

From 84ff30a6b2b522e35d608df311c58c180acb114e Mon Sep 17 00:00:00 2001
From: Benjamin Montgomery <bmontgom@montynet.org>
Date: Sun, 10 Apr 2016 21:16:06 +0000
Subject: [PATCH 133/283] fix typo

---
 doc/ci/build_artifacts/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/ci/build_artifacts/README.md b/doc/ci/build_artifacts/README.md
index a21cd12986..9553bb11e9 100644
--- a/doc/ci/build_artifacts/README.md
+++ b/doc/ci/build_artifacts/README.md
@@ -1,7 +1,9 @@
 # Introduction to build artifacts
 
 Artifacts is a list of files and directories which are attached to a build
-after it completes successfully.  Artificats is enabled by default.  _If you are searching for ways to use artifacts, jump to
+after it completes successfully.  This feature is enabled by default in all GitLab installations.
+
+_If you are searching for ways to use artifacts, jump to
 [Defining artifacts in `.gitlab-ci.yml`](#defining-artifacts-in-gitlab-ciyml)._
 
 Since GitLab 8.2 and [GitLab Runner] 0.7.0, build artifacts that are created by

From 3b77a07856dc172959980918f19710e1b550b7cc Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 10 Apr 2016 06:22:58 -0700
Subject: [PATCH 134/283] Fix more SQL migrations to use raw commands

gitlab-org/gitlab-development-kit#109
---
 db/migrate/20130315124931_user_color_scheme.rb       |  4 +++-
 ...0131112220935_add_visibility_level_to_projects.rb |  6 ++++--
 ...140313092127_migrate_already_imported_projects.rb |  8 +++++---
 ...20141007100818_add_visibility_level_to_snippet.rb | 12 ++++++------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/db/migrate/20130315124931_user_color_scheme.rb b/db/migrate/20130315124931_user_color_scheme.rb
index fe139e32ea..56c9a31ee3 100644
--- a/db/migrate/20130315124931_user_color_scheme.rb
+++ b/db/migrate/20130315124931_user_color_scheme.rb
@@ -1,7 +1,9 @@
 class UserColorScheme < ActiveRecord::Migration
+  include Gitlab::Database
+
   def up
     add_column :users, :color_scheme_id, :integer, null: false, default: 1
-    User.where(dark_scheme: true).update_all(color_scheme_id: 2)
+    execute("UPDATE users SET color_scheme_id = 2 WHERE dark_scheme = #{true_value}")
     remove_column :users, :dark_scheme
   end
 
diff --git a/db/migrate/20131112220935_add_visibility_level_to_projects.rb b/db/migrate/20131112220935_add_visibility_level_to_projects.rb
index cf1e9f912a..89421cbeda 100644
--- a/db/migrate/20131112220935_add_visibility_level_to_projects.rb
+++ b/db/migrate/20131112220935_add_visibility_level_to_projects.rb
@@ -1,13 +1,15 @@
 class AddVisibilityLevelToProjects < ActiveRecord::Migration
+  include Gitlab::Database
+
   def self.up
     add_column :projects, :visibility_level, :integer, :default => 0, :null => false
-    Project.where(public: true).update_all(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+    execute("UPDATE projects SET visibility_level = #{Gitlab::VisibilityLevel::PUBLIC} WHERE public = #{true_value}")
     remove_column :projects, :public
   end
 
   def self.down
     add_column :projects, :public, :boolean, :default => false, :null => false
-    Project.where(visibility_level: Gitlab::VisibilityLevel::PUBLIC).update_all(public: true)
+    execute("UPDATE projects SET public = #{true_value} WHERE visibility_level = #{Gitlab::VisibilityLevel::PUBLIC}")
     remove_column :projects, :visibility_level
   end
 end
diff --git a/db/migrate/20140313092127_migrate_already_imported_projects.rb b/db/migrate/20140313092127_migrate_already_imported_projects.rb
index f4392c0f05..0a9f73a575 100644
--- a/db/migrate/20140313092127_migrate_already_imported_projects.rb
+++ b/db/migrate/20140313092127_migrate_already_imported_projects.rb
@@ -1,12 +1,14 @@
 class MigrateAlreadyImportedProjects < ActiveRecord::Migration
+  include Gitlab::Database
+
   def up
-    Project.where(imported: true).update_all(import_status: "finished")
-    Project.where(imported: false).update_all(import_status: "none")
+    execute("UPDATE projects SET import_status = 'finished' WHERE imported = #{true_value}")
+    execute("UPDATE projects SET import_status = 'none' WHERE imported = #{false_value}")
     remove_column :projects, :imported
   end
 
   def down
     add_column :projects, :imported, :boolean, default: false
-    Project.where(import_status: 'finished').update_all(imported: true)
+    execute("UPDATE projects SET imported = #{true_value} WHERE import_status = 'finished'")
   end
 end
diff --git a/db/migrate/20141007100818_add_visibility_level_to_snippet.rb b/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
index 7f125acb5d..bb3501f41d 100644
--- a/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
+++ b/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
@@ -2,8 +2,8 @@ class AddVisibilityLevelToSnippet < ActiveRecord::Migration
   def up
     add_column :snippets, :visibility_level, :integer, :default => 0, :null => false
 
-    Snippet.where(private: true).update_all(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
-    Snippet.where(private: false).update_all(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+    execute("UPDATE snippets SET visibility_level = #{Gitlab::VisibilityLevel::PRIVATE} WHERE private = true")
+    execute("UPDATE snippets SET visibility_level = #{Gitlab::VisibilityLevel::INTERNAL} WHERE private = false")
 
     add_index :snippets, :visibility_level
 
@@ -12,10 +12,10 @@ class AddVisibilityLevelToSnippet < ActiveRecord::Migration
 
   def down
     add_column :snippets, :private, :boolean, :default => false, :null => false
-    
-    Snippet.where(visibility_level: Gitlab::VisibilityLevel::INTERNAL).update_all(private: false)
-    Snippet.where(visibility_level: Gitlab::VisibilityLevel::PRIVATE).update_all(private: true)
-    
+
+    execute("UPDATE snippets SET private = false WHERE visibility_level = #{Gitlab::VisibilityLevel::INTERNAL}")
+    execute("UPDATE snippets SET private = true WHERE visibility_level = #{Gitlab::VisibilityLevel::PRIVATE}")
+
     remove_column :snippets, :visibility_level
   end
 end

From a7c11fe47361527798b41d0ee9dc344b144a3b50 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 13:25:32 -0500
Subject: [PATCH 135/283] Ignore toggling sidebar for above 1200px resolution

---
 app/assets/javascripts/merge_request_tabs.js.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index 839e6ec2c0..e45f91c222 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -73,7 +73,8 @@ class @MergeRequestTabs
       @expandView()
     else if action == 'diffs'
       @loadDiff($target.attr('href'))
-      @shrinkView()
+      if bp.getBreakpointSize() isnt 'lg'
+        @shrinkView()
     else if action == 'builds'
       @loadBuilds($target.attr('href'))
       @expandView()

From fe0aa823252eb468f468c9d813fdc28687c4a4b6 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 14:37:15 -0500
Subject: [PATCH 136/283] Check existence of variable method

This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
---
 app/assets/javascripts/merge_request_tabs.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index e45f91c222..3500d796d2 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -73,7 +73,7 @@ class @MergeRequestTabs
       @expandView()
     else if action == 'diffs'
       @loadDiff($target.attr('href'))
-      if bp.getBreakpointSize() isnt 'lg'
+      if window.bp isnt undefined and window.bp.getBreakpointSize() isnt 'lg'
         @shrinkView()
     else if action == 'builds'
       @loadBuilds($target.attr('href'))

From 836301676adba7a91e4539f3d0e554873f06fc99 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 17:12:15 -0500
Subject: [PATCH 137/283] Use existence operator instead

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

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index 3500d796d2..9946249adb 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -73,7 +73,7 @@ class @MergeRequestTabs
       @expandView()
     else if action == 'diffs'
       @loadDiff($target.attr('href'))
-      if window.bp isnt undefined and window.bp.getBreakpointSize() isnt 'lg'
+      if bp? and bp.getBreakpointSize() isnt 'lg'
         @shrinkView()
     else if action == 'builds'
       @loadBuilds($target.attr('href'))

From 0c6923e2d13b6648c8e08017450a01e7068edfb9 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 10 Apr 2016 22:54:32 -0400
Subject: [PATCH 138/283] Re-add a note about sarcasm to the Code Review guide

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

diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index ab4236404c..40ae55ab90 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -25,6 +25,9 @@ request is up to one of our merge request "endbosses", denoted on the
 - Be explicit. Remember people don't always understand your intentions online.
 - Be humble. ("I'm not sure - let's look it up.")
 - Don't use hyperbole. ("always", "never", "endlessly", "nothing")
+- Be careful about the use of sarcasm. Everything we do is public; what seems
+  like good-natured ribbing to you and a long-time colleague might come off as
+  mean and unwelcoming to a person new to the project.
 - Consider one-on-one chats or video calls if there are too many "I didn't
   understand" or "Alternative solution:" comments. Post a follow-up comment
   summarizing one-on-one discussion.

From 13c00262f74d463e6adbc008aac00a4c63faac11 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 10 Apr 2016 21:19:09 -0700
Subject: [PATCH 139/283] Use false/true mixin in migration from !3640

---
 .../20141007100818_add_visibility_level_to_snippet.rb  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/db/migrate/20141007100818_add_visibility_level_to_snippet.rb b/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
index bb3501f41d..93826185e8 100644
--- a/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
+++ b/db/migrate/20141007100818_add_visibility_level_to_snippet.rb
@@ -1,9 +1,11 @@
 class AddVisibilityLevelToSnippet < ActiveRecord::Migration
+  include Gitlab::Database
+
   def up
     add_column :snippets, :visibility_level, :integer, :default => 0, :null => false
 
-    execute("UPDATE snippets SET visibility_level = #{Gitlab::VisibilityLevel::PRIVATE} WHERE private = true")
-    execute("UPDATE snippets SET visibility_level = #{Gitlab::VisibilityLevel::INTERNAL} WHERE private = false")
+    execute("UPDATE snippets SET visibility_level = #{Gitlab::VisibilityLevel::PRIVATE} WHERE private = #{true_value}")
+    execute("UPDATE snippets SET visibility_level = #{Gitlab::VisibilityLevel::INTERNAL} WHERE private = #{false_value}")
 
     add_index :snippets, :visibility_level
 
@@ -13,8 +15,8 @@ class AddVisibilityLevelToSnippet < ActiveRecord::Migration
   def down
     add_column :snippets, :private, :boolean, :default => false, :null => false
 
-    execute("UPDATE snippets SET private = false WHERE visibility_level = #{Gitlab::VisibilityLevel::INTERNAL}")
-    execute("UPDATE snippets SET private = true WHERE visibility_level = #{Gitlab::VisibilityLevel::PRIVATE}")
+    execute("UPDATE snippets SET private = #{false_value} WHERE visibility_level = #{Gitlab::VisibilityLevel::INTERNAL}")
+    execute("UPDATE snippets SET private = #{true_value} WHERE visibility_level = #{Gitlab::VisibilityLevel::PRIVATE}")
 
     remove_column :snippets, :visibility_level
   end

From 0e8aaad51044bbbd5fc544c322d2a17d1c1ce22a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 7 Apr 2016 17:13:57 +0200
Subject: [PATCH 140/283] Decrease threshold for ABC Size metric in Rubocop

To 60.
---
 .rubocop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 71273ce609..2fda0b0311 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -691,7 +691,7 @@ Style/ZeroLengthPredicate:
 # branches, and conditions.
 Metrics/AbcSize:
   Enabled: true
-  Max: 70
+  Max: 60
 
 # Avoid excessive block nesting.
 Metrics/BlockNesting:

From 643fe43d78044d200c863f34d05c210c3e45b5ce Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 09:43:59 +0100
Subject: [PATCH 141/283] Addressed feedback Removed important from css

---
 app/assets/javascripts/gl_dropdown.js.coffee       | 10 +++++-----
 app/assets/stylesheets/pages/merge_requests.scss   |  5 +++--
 .../projects/merge_requests/_new_compare.html.haml |  5 +++--
 app/views/shared/issuable/_form.html.haml          | 14 ++++++++------
 features/steps/project/source/browse_files.rb      |  1 -
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 82a82a27cc..4be4ab6083 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -61,7 +61,7 @@ class GitLabDropdownFilter
     if data?
       results = data
 
-      if search_text isnt ""
+      if search_text isnt ''
         results = fuzzaldrinPlus.filter(data, search_text,
           key: @options.keys
         )
@@ -139,7 +139,7 @@ class GitLabDropdown
     if _.isString(@filterInput)
       @filterInput = @getElement(@filterInput)
 
-    search_fields = if @options.search then @options.search.fields else [];
+    searchFields = if @options.search then @options.search.fields else [];
 
     if @options.data
       # If data is an array
@@ -163,11 +163,11 @@ class GitLabDropdown
         filterInputBlur: @filterInputBlur
         remote: @options.filterRemote
         query: @options.data
-        keys: search_fields
+        keys: searchFields
         elements: =>
-          selector = ".dropdown-content li:not(.divider)"
+          selector = '.dropdown-content li:not(.divider)'
 
-          if @dropdown.find(".dropdown-toggle-page").length
+          if @dropdown.find('.dropdown-toggle-page').length
             selector = ".dropdown-page-one #{selector}"
 
           return $(selector)
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4269afe4c5..3c955faf2a 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -258,6 +258,7 @@
   }
 }
 
-.merge-request-form .select2-container {
-  width: 250px!important;
+.issuable-form-select-holder {
+  display: inline-block;
+  width: 250px;
 }
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 036b193536..cae5d45231 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -16,9 +16,10 @@
               = dropdown_title("Select source project")
               = dropdown_filter("Search projects")
               = dropdown_content do
+                - is_active = f.object.source_project_id == @merge_request.source_project.id
                 %ul
                   %li
-                    %a{ href: "#", class: "#{("is-active" if f.object.source_project_id == @merge_request.source_project.id)}", data: { id: @merge_request.source_project.id } }
+                    %a{ href: "#", class: "#{("is-active" if is_active)}", data: { id: @merge_request.source_project.id } }
                       = @merge_request.source_project_path
           .merge-request-select.dropdown
             = f.hidden_field :source_branch
@@ -33,7 +34,7 @@
                       %a{ href: "#", class: "#{("is-active" if f.object.source_branch == branch)}", data: { id: branch } }
                         = branch
         .panel-footer
-          = icon('spinner spin', class: "js-source-loading")
+          = icon('spinner spin', class: 'js-source-loading')
           %ul.list-unstyled.mr_source_commit
 
     .col-md-6
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index e2a9e5bfb9..5244e7f6cc 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -53,10 +53,11 @@
     .issue-assignee
       = f.label :assignee_id, "Assignee", class: 'control-label'
       .col-sm-10
-        = 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)
+        .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
@@ -64,8 +65,9 @@
       = f.label :milestone_id, "Milestone", class: 'control-label'
       .col-sm-10
         - if milestone_options(issuable).present?
-          = f.select(:milestone_id, milestone_options(issuable),
-            { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
+          .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.
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 37958a924b..e072505e5d 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -219,7 +219,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
 
   step 'I see Browse code link' do
     expect(page).to have_link 'Browse Files'
-    # expect(page).not_to have_link 'Browse File'
     expect(page).not_to have_link 'Browse Directory »'
   end
 

From a4fff0e03368bf57081ae80d727bfc38ab165cd5 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 09:52:12 +0100
Subject: [PATCH 142/283] Fixed dropdown title overlap

---
 app/assets/stylesheets/framework/dropdowns.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 82dc1acbd0..ba6c7930cd 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -248,7 +248,7 @@
 
 .dropdown-title {
   position: relative;
-  padding: 0 0 15px;
+  padding: 0 25px 15px;
   margin: 0 10px 10px;
   font-weight: 600;
   line-height: 1;
@@ -275,7 +275,7 @@
 }
 
 .dropdown-menu-close {
-  right: 7px;
+  right: 5px;
   width: 20px;
   height: 20px;
   top: -1px;

From 12ff7ee93348239d545e0553a49881cfe490420e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 09:54:32 +0100
Subject: [PATCH 143/283] Merge request mobile spacing

---
 app/assets/stylesheets/pages/merge_requests.scss | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 3c955faf2a..b79335eab9 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -242,10 +242,19 @@
 }
 
 .merge-request-select {
-  float: left;
-  width: 50%;
   padding-left: 5px;
   padding-right: 5px;
+  margin-bottom: 10px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  @media (min-width: $screen-sm-min) {
+    float: left;
+    width: 50%;
+    margin-bottom: 0;
+  }
 
   .dropdown-menu-toggle {
     width: 100%;

From 2f4dc45da2fbe6ab4469f1c836683bec9c8f0dd9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 11:38:24 +0100
Subject: [PATCH 144/283] Fixed issue with dashboard/issues not filtering by
 milestone

Closes #15128
---
 .../javascripts/milestone_select.js.coffee    |  8 ++-
 spec/features/dashboard_issues_spec.rb        | 54 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 spec/features/dashboard_issues_spec.rb

diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index f73127f49f..6bd4e885a0 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -85,15 +85,21 @@ class @MilestoneSelect
           # display:block overrides the hide-collapse rule
           $value.removeAttr('style')
         clicked: (selected) ->
+          page = $('body').data 'page'
+          isIssueIndex = page is 'projects:issues:index'
+          isMRIndex = page is page is 'projects:merge_requests:index'
+
           if $dropdown.hasClass 'js-filter-bulk-update'
             return
 
-          if $dropdown.hasClass('js-filter-submit')
+          if $dropdown.hasClass('js-filter-submit') and (isIssueIndex or isMRIndex)
             if selected.name?
               selectedMilestone = selected.name
             else
               selectedMilestone = ''
             Issues.filterResults $dropdown.closest('form')
+          else if $dropdown.hasClass('js-filter-submit')
+            $dropdown.closest('form').submit()
           else
             selected = $selectbox
               .find('input[type="hidden"]')
diff --git a/spec/features/dashboard_issues_spec.rb b/spec/features/dashboard_issues_spec.rb
new file mode 100644
index 0000000000..39805da9d0
--- /dev/null
+++ b/spec/features/dashboard_issues_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe "Dashboard Issues filtering", feature: true, js: true do
+  let(:user)      { create(:user) }
+  let(:project)   { create(:project) }
+  let(:milestone) { create(:milestone, project: project) }
+
+  context 'filtering by milestone' do
+    before do
+      project.team << [user, :master]
+      login_as(user)
+
+      create(:issue, project: project, author: user, assignee: user)
+      create(:issue, project: project, author: user, assignee: user, milestone: milestone)
+
+      visit_issues
+    end
+
+    it 'should show all issues with no milestone' do
+      show_milestone_dropdown
+
+      click_link 'No Milestone'
+
+      expect(page).to have_selector('.issue', count: 1)
+    end
+
+    it 'should show all issues with any milestone' do
+      show_milestone_dropdown
+
+      click_link 'Any Milestone'
+
+      expect(page).to have_selector('.issue', count: 2)
+    end
+
+    it 'should show all issues with the selected milestone' do
+      show_milestone_dropdown
+
+      page.within '.dropdown-content' do
+        click_link milestone.title
+      end
+
+      expect(page).to have_selector('.issue', count: 1)
+    end
+  end
+
+  def show_milestone_dropdown
+    click_button 'Milestone'
+    expect(page).to have_selector('.dropdown-content', visible: true)
+  end
+
+  def visit_issues
+    visit issues_dashboard_path
+  end
+end

From 667d44c25ccefb511fc0d206eaa5990117032236 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 11 Apr 2016 12:46:19 +0200
Subject: [PATCH 145/283] Fix high CPU usage when PostReceive receives
 refs/merge-requests/<id>

---
 CHANGELOG                         |  1 +
 app/workers/post_receive.rb       |  2 +-
 spec/workers/post_receive_spec.rb | 43 ++++++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3561c541df..6a196dd9dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.7.0 (unreleased)
   - API: Ability to filter milestones by state `active` and `closed` (Robert Schilling)
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
   - Better errors handling when creating milestones inside groups
+  - Fix high CPU usage when PostReceive receives refs/merge-requests/<id>
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
   - Fix creation of merge requests for orphaned branches (Stan Hu)
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 3cc232ef1a..9e1215b21a 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -40,7 +40,7 @@ class PostReceive
 
       if Gitlab::Git.tag_ref?(ref)
         GitTagPushService.new.execute(post_received.project, @user, oldrev, newrev, ref)
-      else
+      elsif Gitlab::Git.branch_ref?(ref)
         GitPushService.new(post_received.project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute
       end
     end
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 0265dbe9c6..94ff345790 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -4,6 +4,9 @@ describe PostReceive do
   let(:changes) { "123456 789012 refs/heads/tést\n654321 210987 refs/tags/tag" }
   let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }
   let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
+  let(:project) { create(:project) }
+  let(:key) { create(:key, user: project.owner) }
+  let(:key_id) { key.shell_id }
 
   context "as a resque worker" do
     it "reponds to #perform" do
@@ -11,11 +14,43 @@ describe PostReceive do
     end
   end
 
-  context "webhook" do
-    let(:project) { create(:project) }
-    let(:key) { create(:key, user: project.owner) }
-    let(:key_id) { key.shell_id }
+  describe "#process_project_changes" do
+    before do
+      allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
+    end
 
+    context "branches" do
+      let(:changes) { "123456 789012 refs/heads/tést" }
+
+      it "should call GitTagPushService" do
+        expect_any_instance_of(GitPushService).to receive(:execute).and_return(true)
+        expect_any_instance_of(GitTagPushService).not_to receive(:execute)
+        PostReceive.new.perform(pwd(project), key_id, base64_changes)
+      end
+    end
+
+    context "tags" do
+      let(:changes) { "123456 789012 refs/tags/tag" }
+
+      it "should call GitTagPushService" do
+        expect_any_instance_of(GitPushService).not_to receive(:execute)
+        expect_any_instance_of(GitTagPushService).to receive(:execute).and_return(true)
+        PostReceive.new.perform(pwd(project), key_id, base64_changes)
+      end
+    end
+
+    context "merge-requests" do
+      let(:changes) { "123456 789012 refs/merge-requests/123" }
+
+      it "should not call any of the services" do
+        expect_any_instance_of(GitPushService).not_to receive(:execute)
+        expect_any_instance_of(GitTagPushService).not_to receive(:execute)
+        PostReceive.new.perform(pwd(project), key_id, base64_changes)
+      end
+    end
+  end
+
+  context "webhook" do
     it "fetches the correct project" do
       expect(Project).to receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)
       PostReceive.new.perform(pwd(project), key_id, base64_changes)

From 16926a676bdea4bfbbbaf9d390373073d2ff8bbd Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 11 Apr 2016 12:23:37 +0200
Subject: [PATCH 146/283] Store block timings as transaction values

This makes it easier to query, simplifies the code, and makes it
possible to figure out what transaction the data belongs to (simply
because it's now stored _in_ the transaction).

This new setup keeps track of both the real/wall time _and_ CPU time
spent in a block, both measured using milliseconds (to keep all units
the same).
---
 doc/development/instrumentation.md | 36 ++++++++++++++----------------
 lib/gitlab/metrics.rb              | 25 ++++++++++++---------
 lib/gitlab/metrics/system.rb       | 11 +++++++++
 spec/lib/gitlab/metrics_spec.rb    | 16 +++++--------
 4 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/doc/development/instrumentation.md b/doc/development/instrumentation.md
index c0192bd670..f7e148fb3e 100644
--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
@@ -2,36 +2,34 @@
 
 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 written to a separate series.
+chunk of code. The resulting data is stored as a field in the transaction that
+executed the block.
 
-To start measuring a block of Ruby code you should use
-`Gitlab::Metrics.measure` and give it a name for the series to store the data
-in:
+To start measuring a block of Ruby code you should use `Gitlab::Metrics.measure`
+and give it a name:
 
 ```ruby
-Gitlab::Metrics.measure(:user_logins) do
+Gitlab::Metrics.measure(:foo) do
   ...
 end
 ```
 
-The first argument of this method is the series name and should be plural. This
-name will be prefixed with `rails_` or `sidekiq_` depending on whether the code
-was run in the Rails application or one of the Sidekiq workers. In the
-above example the final series names would be as follows:
+Two values are measured for a block:
 
-- rails_user_logins
-- sidekiq_user_logins
+1. The real time elapsed, stored in NAME_real_time
+2. The CPU time elapsed, stored in NAME_cpu_time
 
-Series names should be plural as this keeps the naming style in line with the
-other series names.
+Both the real and CPU timings are measured in milliseconds.
 
-By default metrics measured using a block contain a single value, "duration",
-which contains the number of milliseconds it took to execute the block. Custom
-values can be added by passing a Hash as the 2nd argument. Custom tags can be
-added by passing a Hash as the 3rd argument. A simple example is as follows:
+Multiple calls to the same block will result in the final values being the sum
+of all individual values. Take this code for example:
 
 ```ruby
-Gitlab::Metrics.measure(:example_series, { number: 10 }, { class: self.class.to_s }) do
-  ...
+3.times do
+  Gitlab::Metrics.measure(:sleep) do
+    sleep 1
+  end
 end
 ```
+
+Here the final value of `sleep_real_time` will be `3`, _not_ `1`.
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index 4a3f47b5a9..4d64555027 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -74,24 +74,29 @@ module Gitlab
     #
     # Example:
     #
-    #     Gitlab::Metrics.measure(:find_by_username_timings) do
+    #     Gitlab::Metrics.measure(:find_by_username_duration) do
     #       User.find_by_username(some_username)
     #     end
     #
-    # series - The name of the series to store the data in.
-    # values - A Hash containing extra values to add to the metric.
-    # tags - A Hash containing extra tags to add to the metric.
+    # name - The name of the field to store the execution time in.
     #
     # Returns the value yielded by the supplied block.
-    def self.measure(series, values = {}, tags = {})
+    def self.measure(name)
       return yield unless Transaction.current
 
-      start = Time.now.to_f
-      retval = yield
-      duration = (Time.now.to_f - start) * 1000.0
-      values = values.merge(duration: duration)
+      real_start = Time.now.to_f
+      cpu_start = System.cpu_time
 
-      Transaction.current.add_metric(series, values, tags)
+      retval = yield
+
+      cpu_stop = System.cpu_time
+      real_stop = Time.now.to_f
+
+      real_time = (real_stop - real_start) * 1000.0
+      cpu_time = cpu_stop - cpu_start
+
+      Transaction.current.increment("#{name}_real_time", real_time)
+      Transaction.current.increment("#{name}_cpu_time", cpu_time)
 
       retval
     end
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb
index 8337126527..a7d183b2f9 100644
--- a/lib/gitlab/metrics/system.rb
+++ b/lib/gitlab/metrics/system.rb
@@ -30,6 +30,17 @@ module Gitlab
           0
         end
       end
+
+      # THREAD_CPUTIME is not supported on OS X
+      if Process.const_defined?(:CLOCK_THREAD_CPUTIME_ID)
+        def self.cpu_time
+          Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :millisecond)
+        end
+      else
+        def self.cpu_time
+          Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID, :millisecond)
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 8f63a5f204..edefec909c 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -79,19 +79,13 @@ describe Gitlab::Metrics do
       end
 
       it 'adds a metric to the current transaction' do
-        expect(transaction).to receive(:add_metric).
-          with(:foo, { duration: a_kind_of(Numeric) }, { tag: 'value' })
+        expect(transaction).to receive(:increment).
+          with('foo_real_time', a_kind_of(Numeric))
 
-        Gitlab::Metrics.measure(:foo, {}, tag: 'value') { 10 }
-      end
+        expect(transaction).to receive(:increment).
+          with('foo_cpu_time', a_kind_of(Numeric))
 
-      it 'supports adding of custom values' do
-        values = { duration: a_kind_of(Numeric), number: 10 }
-
-        expect(transaction).to receive(:add_metric).
-          with(:foo, values, { tag: 'value' })
-
-        Gitlab::Metrics.measure(:foo, { number: 10 }, tag: 'value') { 10 }
+        Gitlab::Metrics.measure(:foo) { 10 }
       end
 
       it 'returns the return value of the block' do

From 185d78bcb3064c25b764937949d2bb66ec66901a Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 11 Apr 2016 13:11:13 +0200
Subject: [PATCH 147/283] Added specs for Gitlab::Metrics::System.cpu_time

---
 spec/lib/gitlab/metrics/system_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/lib/gitlab/metrics/system_spec.rb b/spec/lib/gitlab/metrics/system_spec.rb
index f8c1d956ca..d6ae54e25e 100644
--- a/spec/lib/gitlab/metrics/system_spec.rb
+++ b/spec/lib/gitlab/metrics/system_spec.rb
@@ -26,4 +26,10 @@ describe Gitlab::Metrics::System do
       end
     end
   end
+
+  describe '.cpu_time' do
+    it 'returns a Fixnum' do
+      expect(described_class.cpu_time).to be_an_instance_of(Fixnum)
+    end
+  end
 end

From d9110a7ecab52ab0716a42c2075cebdf8028d5e7 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 11 Apr 2016 13:27:24 +0200
Subject: [PATCH 148/283] Track call counts in Gitlab::Metrics.measure_block

---
 doc/development/instrumentation.md | 7 ++++---
 lib/gitlab/metrics.rb              | 1 +
 spec/lib/gitlab/metrics_spec.rb    | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/development/instrumentation.md b/doc/development/instrumentation.md
index f7e148fb3e..c1cf2e77c2 100644
--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
@@ -14,10 +14,11 @@ Gitlab::Metrics.measure(:foo) do
 end
 ```
 
-Two values are measured for a block:
+3 values are measured for a block:
 
-1. The real time elapsed, stored in NAME_real_time
-2. The CPU time elapsed, stored in NAME_cpu_time
+1. The real time elapsed, stored in NAME_real_time.
+2. The CPU time elapsed, stored in NAME_cpu_time.
+3. The call count, stored in NAME_call_count.
 
 Both the real and CPU timings are measured in milliseconds.
 
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index 4d64555027..33dd3e39f4 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -97,6 +97,7 @@ module Gitlab
 
       Transaction.current.increment("#{name}_real_time", real_time)
       Transaction.current.increment("#{name}_cpu_time", cpu_time)
+      Transaction.current.increment("#{name}_call_count", 1)
 
       retval
     end
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index edefec909c..a3b6845526 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -85,6 +85,9 @@ describe Gitlab::Metrics do
         expect(transaction).to receive(:increment).
           with('foo_cpu_time', a_kind_of(Numeric))
 
+        expect(transaction).to receive(:increment).
+          with('foo_call_count', 1)
+
         Gitlab::Metrics.measure(:foo) { 10 }
       end
 

From 7eed4608fe5adf65d6a29ef50c93485ca2e6806f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 11 Apr 2016 14:29:38 +0200
Subject: [PATCH 149/283] Fixed stubbing for Gitlab::Metrics specs

If the measure method uses Transaction.current directly the SQL
subscriber (Subscribers::ActiveRecord) will add timings of queries
triggered by DB cleaner.
---
 lib/gitlab/metrics.rb           | 16 ++++++++++++----
 spec/lib/gitlab/metrics_spec.rb |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index 33dd3e39f4..2a0a5629be 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -82,7 +82,9 @@ module Gitlab
     #
     # Returns the value yielded by the supplied block.
     def self.measure(name)
-      return yield unless Transaction.current
+      trans = current_transaction
+
+      return yield unless trans
 
       real_start = Time.now.to_f
       cpu_start = System.cpu_time
@@ -95,9 +97,9 @@ module Gitlab
       real_time = (real_stop - real_start) * 1000.0
       cpu_time = cpu_stop - cpu_start
 
-      Transaction.current.increment("#{name}_real_time", real_time)
-      Transaction.current.increment("#{name}_cpu_time", cpu_time)
-      Transaction.current.increment("#{name}_call_count", 1)
+      trans.increment("#{name}_real_time", real_time)
+      trans.increment("#{name}_cpu_time", cpu_time)
+      trans.increment("#{name}_call_count", 1)
 
       retval
     end
@@ -113,5 +115,11 @@ module Gitlab
           new(udp: { host: host, port: port })
       end
     end
+
+    private
+
+    def self.current_transaction
+      Transaction.current
+    end
   end
 end
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index a3b6845526..3dee13e27f 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -74,7 +74,7 @@ describe Gitlab::Metrics do
       let(:transaction) { Gitlab::Metrics::Transaction.new }
 
       before do
-        allow(Gitlab::Metrics::Transaction).to receive(:current).
+        allow(Gitlab::Metrics).to receive(:current_transaction).
           and_return(transaction)
       end
 

From 08c3936b83f3f67cbabf74289805a3938e2b7564 Mon Sep 17 00:00:00 2001
From: Jeroen Bobbeldijk <jeroen@vdmi.nl>
Date: Mon, 11 Apr 2016 15:10:14 +0200
Subject: [PATCH 150/283] Check head unborn in rugged

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

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 8dead3a588..3e52ee5d0a 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -896,7 +896,7 @@ class Repository
   end
 
   def main_language
-    unless empty?
+    unless empty? or rugged.head_unborn?
       Linguist::Repository.new(rugged, rugged.head.target_id).language
     end
   end

From 73fdd4b83d76998fef9770dbeaf05981d4500b8c Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 11 Apr 2016 10:23:40 -0300
Subject: [PATCH 151/283] Use Hash instead of Array on
 NotificationSetting#level enum

---
 app/models/notification_setting.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index d89194b5a1..5001738f41 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -1,7 +1,5 @@
 class NotificationSetting < ActiveRecord::Base
-  # Notification level
-  # Note: When adding an option, it MUST go on the end of the array.
-  enum level: [:disabled, :participating, :watch, :global, :mention]
+  enum level: { disabled: 0,  participating: 1,  watch: 2,  global: 3, mention: 4 }
 
   default_value_for :level, NotificationSetting.levels[:global]
 

From de4d98fd120fd43bd744abc116c62708577b5673 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Mon, 11 Apr 2016 15:19:11 +0100
Subject: [PATCH 152/283] fix bug causing comment form in issue to submit twice
 when CTRL+Enter is pressed twice

---
 app/assets/javascripts/behaviors/quick_submit.js.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/behaviors/quick_submit.js.coffee b/app/assets/javascripts/behaviors/quick_submit.js.coffee
index 6e29d37426..3cb96bacaa 100644
--- a/app/assets/javascripts/behaviors/quick_submit.js.coffee
+++ b/app/assets/javascripts/behaviors/quick_submit.js.coffee
@@ -29,7 +29,11 @@ $(document).on 'keydown.quick_submit', '.js-quick-submit', (e) ->
   e.preventDefault()
 
   $form = $(e.target).closest('form')
-  $form.find('input[type=submit], button[type=submit]').disable()
+  $submit_button = $form.find('input[type=submit], button[type=submit]')
+
+  return if $submit_button.attr('disabled')
+
+  $submit_button.disable()
   $form.submit()
 
 # If the user tabs to a submit button on a `js-quick-submit` form, display a

From ca0b3ea1f107562492babbaf5ce5fec43897bd88 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 11 Apr 2016 17:03:27 +0200
Subject: [PATCH 153/283] Go back to gitlab-workhorse 0.7.1

We found out that 0.7.2 breaks shallow `git clone`. GitLab 8.7 will
work fine with gitlab-workhorse 0.7.1 too.
---
 GITLAB_WORKHORSE_VERSION    | 2 +-
 doc/install/installation.md | 2 +-
 doc/update/8.6-to-8.7.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 7486fdbc50..39e898a4f9 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.7.2
+0.7.1
diff --git a/doc/install/installation.md b/doc/install/installation.md
index d97dc7d131..f8f7d6a9eb 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -352,7 +352,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.2
+    sudo -u git -H git checkout v0.7.1
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features
diff --git a/doc/update/8.6-to-8.7.md b/doc/update/8.6-to-8.7.md
index 57847d2d9f..8599133a72 100644
--- a/doc/update/8.6-to-8.7.md
+++ b/doc/update/8.6-to-8.7.md
@@ -58,7 +58,7 @@ GitLab 8.1.
 ```bash
 cd /home/git/gitlab-workhorse
 sudo -u git -H git fetch --all
-sudo -u git -H git checkout v0.7.2
+sudo -u git -H git checkout v0.7.1
 sudo -u git -H make
 ```
 

From 12e6084667f8750c263b4a2e324e9a283697b52e Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 11 Apr 2016 10:16:15 -0500
Subject: [PATCH 154/283] Allow `external_providers` for Omniauth to be defined
 to mark these users as external

---
 config/initializers/1_settings.rb |  1 +
 lib/gitlab/o_auth/user.rb         | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 72c4d8d61c..94612997ea 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -129,6 +129,7 @@ Settings['omniauth'] ||= Settingslogic.new({})
 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?
 Settings.omniauth['block_auto_created_users'] = true if Settings.omniauth['block_auto_created_users'].nil?
 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?
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 832fb08a52..6e099c26d8 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -54,6 +54,14 @@ module Gitlab
           @user ||= build_new_user
         end
 
+        unless @user.nil?
+          if external_provider?
+            @user.external = true
+          else
+            @user.external = false
+          end
+        end
+
         @user
       end
 
@@ -113,6 +121,10 @@ module Gitlab
         end
       end
 
+      def external_provider?
+        Gitlab.config.omniauth.external_providers.include?(auth_hash.provider)
+      end
+
       def block_after_signup?
         if creating_linked_ldap_user?
           ldap_config.block_auto_created_users

From ea04b0191d624fdc3e6f82840825bd265a4c3f59 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 11 Apr 2016 10:16:42 -0500
Subject: [PATCH 155/283] Added default setting for `external_providers`

---
 spec/lib/gitlab/o_auth/user_spec.rb | 37 ++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
index 3a769acfdc..6727a83e58 100644
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
@@ -15,20 +15,20 @@ describe Gitlab::OAuth::User, lib: true do
   end
   let(:ldap_user) { Gitlab::LDAP::Person.new(Net::LDAP::Entry.new, 'ldapmain') }
 
-  describe :persisted? do
+  describe '#persisted?' do
     let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') }
 
     it "finds an existing user based on uid and provider (facebook)" do
       expect( oauth_user.persisted? ).to be_truthy
     end
 
-    it "returns false if use is not found in database" do
+    it 'returns false if user is not found in database' do
       allow(auth_hash).to receive(:uid).and_return('non-existing')
       expect( oauth_user.persisted? ).to be_falsey
     end
   end
 
-  describe :save do
+  describe '#save' do
     def stub_omniauth_config(messages)
       allow(Gitlab.config.omniauth).to receive_messages(messages)
     end
@@ -40,8 +40,27 @@ describe Gitlab::OAuth::User, lib: true do
     let(:provider) { 'twitter' }
 
     describe 'signup' do
-      shared_examples "to verify compliance with allow_single_sign_on" do
-        context "with new allow_single_sign_on enabled syntax" do
+      shared_examples 'to verify compliance with allow_single_sign_on' do
+        context 'provider is marked as external' do
+          it 'should mark user as external' do
+            stub_omniauth_config(allow_single_sign_on: ['twitter'], external_providers: ['twitter'])
+            oauth_user.save
+            expect(gl_user).to be_valid
+            expect(gl_user.external).to be_truthy
+          end
+        end
+
+        context 'provider was external, now has been removed' do
+          it 'should mark existing user internal' do
+            create(:omniauth_user, extern_uid: 'my-uid', provider: 'twitter', external: true)
+            stub_omniauth_config(allow_single_sign_on: ['twitter'], external_providers: ['facebook'])
+            oauth_user.save
+            expect(gl_user).to be_valid
+            expect(gl_user.external).to be_falsey
+          end
+        end
+
+        context 'with new allow_single_sign_on enabled syntax' do
           before { stub_omniauth_config(allow_single_sign_on: ['twitter']) }
 
           it "creates a user from Omniauth" do
@@ -67,16 +86,16 @@ describe Gitlab::OAuth::User, lib: true do
           end
         end
 
-        context "with new allow_single_sign_on disabled syntax" do
+        context 'with new allow_single_sign_on disabled syntax' do
           before { stub_omniauth_config(allow_single_sign_on: []) }
-          it "throws an error" do
+          it 'throws an error' do
             expect{ oauth_user.save }.to raise_error StandardError
           end
         end
 
-        context "with old allow_single_sign_on disabled (Default)" do
+        context 'with old allow_single_sign_on disabled (Default)' do
           before { stub_omniauth_config(allow_single_sign_on: false) }
-          it "throws an error" do
+          it 'throws an error' do
             expect{ oauth_user.save }.to raise_error StandardError
           end
         end

From cedfe9d22851d6765b9737c2489e8ff166a7d238 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 11 Apr 2016 10:16:56 -0500
Subject: [PATCH 156/283] Documentation of feature

---
 config/gitlab.yml.example   |  7 +++++++
 doc/integration/omniauth.md | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 35c7c425a5..75aba2544b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -304,6 +304,13 @@ production: &base
     # (default: false)
     auto_link_saml_user: false
 
+    # Set different Omniauth providers as external so that all users creating accounts
+    # via these providers will not be able to have access to internal projects. You
+    # will need to use the full name of the provider, like `google_oauth2` for Google.
+    # Refer to the examples below for the full names of the supported providers.
+    # (default: [])
+    external_providers: []
+
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use
     # If your favorite auth provider is not listed you can use others:
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 25f3598830..cab329c0de 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -120,6 +120,29 @@ OmniAuth provider for an existing user.
 
 The chosen OmniAuth provider is now active and can be used to sign in to GitLab from then on.
 
+## Configure OmniAuth Providers as External
+
+>**Note:**
+This setting was introduced with version 8.7 of GitLab
+
+You can define which OmniAuth providers you want to be `external` so that all users
+creating accounts via these providers will not be able to have access to internal
+projects. You will need to use the full name of the provider, like `google_oauth2`
+for Google. Refer to the examples for the full names of the supported providers.
+
+**For Omnibus installations**
+
+```ruby
+  gitlab_rails['omniauth_external_providers'] = ['twitter', 'google_oauth2']
+```
+
+**For installations from source**
+
+```yaml
+  omniauth:
+    external_providers: ['twitter', 'google_oauth2']
+```
+
 ## Using Custom Omniauth Providers
 
 >**Note:**

From 979dedba8a68f33b8e2078f7e2980bf048a8a25a Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Mon, 11 Apr 2016 16:24:49 +0100
Subject: [PATCH 157/283] make milestone labels in labels tab similar to that
 of the labels page

---
 app/assets/stylesheets/pages/labels.scss      | 25 +++++++++++++------
 .../shared/milestones/_labels_tab.html.haml   | 13 +++++-----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 3e0a3140be..da20fa2880 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -79,19 +79,30 @@
   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 {
 
-  .prepend-left-10 {
+  .prepend-left-10, .prepend-description-left {
     display: inline-block;
     width: 40%;
     vertical-align: middle;
 
-    @media (max-width: $screen-xs-min) {
-      display: block;
-      width: 100%;
-      margin-left: 0;
-      padding: 10px 0;
-    }
+    @include labels-mobile;
+  }
+
+  .prepend-description-left {
+    width: 57%;
+
+    @include labels-mobile;
   }
 
   .pull-info-right {
diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml
index 868b235700..b15e8ea73f 100644
--- a/app/views/shared/milestones/_labels_tab.html.haml
+++ b/app/views/shared/milestones/_labels_tab.html.haml
@@ -4,15 +4,16 @@
 
     %li
       %span.label-row
-        = link_to milestones_label_path(options) do
-          - render_colored_label(label, tooltip: false)
-        %span.prepend-left-10
+        %span.label-name
+          = link_to milestones_label_path(options) do
+            - render_colored_label(label, tooltip: false)
+        %span.prepend-description-left
           = markdown(label.description, pipeline: :single_line)
 
-      .pull-right
-        %strong.issues-count
+      .pull-info-right
+        %span.append-right-20
           = link_to milestones_label_path(options.merge(state: 'opened')) do
             - pluralize milestone_issues_by_label_count(@milestone, label, state: :opened), 'open issue'
-        %strong.issues-count
+        %span.append-right-20
           = link_to milestones_label_path(options.merge(state: 'closed')) do
             - pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue'

From 31bcd9f8793d972bd59fc75c686ab03974a1d631 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 11 Apr 2016 10:25:53 -0500
Subject: [PATCH 158/283] Added CHANGELOG item

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

diff --git a/CHANGELOG b/CHANGELOG
index 3561c541df..08ee7ec89a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.7.0 (unreleased)
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
   - Allow SAML to handle external users based on user's information !3530
+  - Allow Omniauth providers to be marked as `external` !3657
   - Add endpoints to archive or unarchive a project !3372
   - Add links to CI setup documentation from project settings and builds pages
   - Handle nil descriptions in Slack issue messages (Stan Hu)

From 935f913165b91467a70d9ba2b0ea29fad467db9d Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 11 Apr 2016 17:42:12 +0200
Subject: [PATCH 159/283] Instrument Banzai code

---
 config/initializers/metrics.rb | 23 +++++++++++++++++++++++
 lib/banzai/renderer.rb         | 20 ++++++++++++--------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index a9fc38fb04..1b445bbbd1 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -75,6 +75,29 @@ if Gitlab::Metrics.enabled?
       config.instrument_methods(const)
       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)
+
+      config.instrument_methods(const)
+      config.instrument_instance_methods(const)
+    end
+
+    config.instrument_methods(Banzai::ReferenceExtractor)
+    config.instrument_instance_methods(Banzai::ReferenceExtractor)
+
+    config.instrument_methods(Banzai::Renderer)
+    config.instrument_methods(Banzai::Querying)
+
+    [Issuable, Mentionable, Participable].each do |klass|
+      config.instrument_instance_methods(klass)
+      config.instrument_instance_methods(klass::ClassMethods)
+    end
+
+    config.instrument_methods(Gitlab::ReferenceExtractor)
+    config.instrument_instance_methods(Gitlab::ReferenceExtractor)
   end
 
   GC::Profiler.enable
diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb
index ae714c87dc..c14a9c4c72 100644
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
@@ -19,8 +19,10 @@ module Banzai
       cache_key = full_cache_key(cache_key, context[:pipeline])
 
       if cache_key
-        Rails.cache.fetch(cache_key) do
-          cacheless_render(text, context)
+        Gitlab::Metrics.measure(:banzai_cached_render) do
+          Rails.cache.fetch(cache_key) do
+            cacheless_render(text, context)
+          end
         end
       else
         cacheless_render(text, context)
@@ -64,13 +66,15 @@ module Banzai
     private
 
     def self.cacheless_render(text, context = {})
-      result = render_result(text, context)
+      Gitlab::Metrics.measure(:banzai_cacheless_render) do
+        result = render_result(text, context)
 
-      output = result[:output]
-      if output.respond_to?(:to_html)
-        output.to_html
-      else
-        output.to_s
+        output = result[:output]
+        if output.respond_to?(:to_html)
+          output.to_html
+        else
+          output.to_s
+        end
       end
     end
 

From 450a39ededbf93d0bfcec1d4774c3562b87fc190 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 17:04:01 +0100
Subject: [PATCH 160/283] Fixed alignment on issuable new form

Fixes #13802
---
 app/assets/stylesheets/pages/issuable.scss | 6 ++++++
 app/views/shared/issuable/_form.html.haml  | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 88c1b614c7..999b9a2e79 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -316,3 +316,9 @@
     color: #8c8c8c;
   }
 }
+
+.issuable-form-padding-top {
+  @media (min-width: $screen-sm-min) {
+    padding-top: 7px;
+  }
+}
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 757a3812de..1c89a2ee7f 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -70,13 +70,13 @@
         - 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
-      - if issuable.project.labels.any?
+    .col-sm-10{ class: ('issuable-form-padding-top' if !has_labels) }
+      - if has_labels
         = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
           { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
       - else
-        .prepend-top-10
         %span.light No labels yet.
       &nbsp;
       - if can? current_user, :admin_label, issuable.project

From 27d2b355358b52d840153cbb100c2820fab29afe Mon Sep 17 00:00:00 2001
From: Jeroen Bobbeldijk <jeroen@vdmi.nl>
Date: Mon, 11 Apr 2016 18:11:49 +0200
Subject: [PATCH 161/283] Add changelog, change code to guard clause

---
 CHANGELOG                | 3 +++
 app/models/repository.rb | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3561c541df..a53a0615ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,9 @@ v 8.7.0 (unreleased)
   - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
 
+v 8.6.6
+  - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654
+
 v 8.6.5
   - Fix importing from GitHub Enterprise. !3529
   - Perform the language detection after updating merge requests in `GitPushService`, leading to faster visual feedback for the end-user. !3533
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3e52ee5d0a..a24ce45a38 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -896,9 +896,9 @@ class Repository
   end
 
   def main_language
-    unless empty? or rugged.head_unborn?
-      Linguist::Repository.new(rugged, rugged.head.target_id).language
-    end
+    return nil if empty? || rugged.head_unborn?
+
+    Linguist::Repository.new(rugged, rugged.head.target_id).language
   end
 
   def avatar

From f36655dc8b796aac1a75cc28d4768280a9e2860b Mon Sep 17 00:00:00 2001
From: Jeroen Bobbeldijk <jeroen@vdmi.nl>
Date: Mon, 11 Apr 2016 18:14:01 +0200
Subject: [PATCH 162/283] Dont return null

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

diff --git a/app/models/repository.rb b/app/models/repository.rb
index a24ce45a38..462b48118e 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -896,7 +896,7 @@ class Repository
   end
 
   def main_language
-    return nil if empty? || rugged.head_unborn?
+    return if empty? || rugged.head_unborn?
 
     Linguist::Repository.new(rugged, rugged.head.target_id).language
   end

From 60fd4188a540368776738896b1e10683b7fa9e65 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 16:18:25 +0100
Subject: [PATCH 163/283] Build notification null check Cancels build
 notification interval on page change

---
 .../javascripts/merge_request_widget.js.coffee    | 15 ++++++++++++++-
 .../merge_requests/widget/_show.html.haml         |  7 +------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 84a8887fbc..1e3a584752 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -12,10 +12,19 @@ class @MergeRequestWidget
     @readyForCICheck = true
     clearInterval @fetchBuildStatusInterval
 
+    @clearEventListeners()
+    @addEventListeners()
     @pollCIStatus()
     notifyPermissions()
 
-  setOpts: (@opts) ->
+  clearEventListeners: ->
+    $(document).off 'page:change.merge_request'
+
+  addEventListeners: ->
+    $(document).on 'page:change.merge_request', =>
+      if $('body').data('page') isnt 'projects:merge_requests:show'
+        clearInterval @fetchBuildStatusInterval
+        @clearEventListeners()
 
   mergeInProgress: (deleteSourceBranch = false)->
     $.ajax
@@ -63,11 +72,15 @@ class @MergeRequestWidget
         @firstCICheck = false
         @opts.ci_status = data.status
 
+<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3
       if @opts.ci_status is ''
         @opts.ci_status = data.status
         return
 
       if data.status isnt @opts.ci_status
+=======
+      if data.status isnt @opts.ci_status and data.status?
+>>>>>>> Build notification null check
         @showCIStatus data.status
         if data.coverage
           @showCICoverage data.coverage
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index 92d9535893..003477dda1 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -8,7 +8,6 @@
   = render 'projects/merge_requests/widget/locked'
 
 :javascript
-  var merge_request_widget;
   var opts = {
     merge_check_url: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
@@ -20,8 +19,4 @@
     builds_path: "#{builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}"
   };
 
-  if(typeof merge_request_widget === 'undefined') {
-    merge_request_widget = new MergeRequestWidget(opts);
-  } else {
-    merge_request_widget.setOpts(opts);
-  }
+  new MergeRequestWidget(opts);

From b87cc5f224428a332b63f3ac7832ea7d882b37b3 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 13:58:44 +0100
Subject: [PATCH 164/283] Preparing build status

---
 app/controllers/projects/merge_requests_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index ae613f5e09..9addcdf3f9 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -237,6 +237,8 @@ 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 ce0678faa5a1e4688aa7491c49cebd4b172244af Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 14:50:34 +0100
Subject: [PATCH 165/283] Rubocop fix

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

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 9addcdf3f9..3e0cfc6aa6 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -237,7 +237,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
-    status = "preparing" if status == nil
+    status = "preparing" if status.nil?
 
     response = {
       title: merge_request.title,

From 99fe9c7b7703b1594c9cda571f43f20198f96b0f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 14:58:50 +0100
Subject: [PATCH 166/283] Corrects the button color on build status change

---
 app/assets/javascripts/merge_request_widget.js.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 1e3a584752..63f75be2da 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -111,6 +111,8 @@ class @MergeRequestWidget
           @setMergeButtonClass('btn-danger')
         when "running", "pending"
           @setMergeButtonClass('btn-warning')
+        when "success"
+          @setMergeButtonClass('btn-create')
     else
       $('.ci_widget.ci-error').show()
       @setMergeButtonClass('btn-danger')
@@ -120,4 +122,6 @@ class @MergeRequestWidget
     $('.ci_widget:visible .ci-coverage').text(text)
 
   setMergeButtonClass: (css_class) ->
-    $('.accept_merge_request').removeClass("btn-create").addClass(css_class)
+    $('.accept_merge_request')
+      .removeClass('btn-danger btn-warning btn-create')
+      .addClass(css_class)

From 552cde76fa96282dec4ba002cd1850d003a5b29f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 15:06:27 +0100
Subject: [PATCH 167/283] Hides notification after X amount of seconds

---
 app/assets/javascripts/lib/notify.js.coffee | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/javascripts/lib/notify.js.coffee b/app/assets/javascripts/lib/notify.js.coffee
index 3f9ca39912..9e28353ac3 100644
--- a/app/assets/javascripts/lib/notify.js.coffee
+++ b/app/assets/javascripts/lib/notify.js.coffee
@@ -2,6 +2,11 @@
   notificationGranted = (message, opts, onclick) ->
     notification = new Notification(message, opts)
 
+    # Hide the notification after X amount of seconds
+    setTimeout ->
+      notification.close()
+    , 8000
+
     if onclick
       notification.onclick = onclick
 

From 843bc44aa9dea8a19af21dd13a82ecc02bf8840c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 17:04:22 +0100
Subject: [PATCH 168/283] Preparing build text

---
 .../javascripts/merge_request_widget.js.coffee   | 16 +++++++++++++---
 .../merge_requests/widget/_show.html.haml        |  9 ++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 63f75be2da..a522f9189a 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -47,7 +47,7 @@ class @MergeRequestWidget
       $('.mr-state-widget').replaceWith(data)
 
   ciLabelForStatus: (status) ->
-    if status == 'success'
+    if status is 'success'
       'passed'
     else
       status
@@ -86,12 +86,22 @@ class @MergeRequestWidget
           @showCICoverage data.coverage
 
         if showNotification
-          message = @opts.ci_message.replace('{{status}}', @ciLabelForStatus(data.status))
+          status = @ciLabelForStatus(data.status)
+
+          if status is "preparing"
+            title = @opts.ci_title.preparing
+            status = status.charAt(0).toUpperCase() + status.slice(1);
+            message = @opts.ci_message.preparing.replace('{{status}}', status)
+          else
+            title = @opts.ci_title.normal
+            message = @opts.ci_message.normal.replace('{{status}}', status)
+
+          title = title.replace('{{status}}', status)
           message = message.replace('{{sha}}', data.sha)
           message = message.replace('{{title}}', data.title)
 
           notify(
-            "Build #{@ciLabelForStatus(data.status)}",
+            title,
             message,
             @opts.gitlab_icon,
             ->
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index 003477dda1..804ca3783e 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -14,8 +14,15 @@
     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_message: "Build {{status}} for \"{{title}}\"",
+    ci_message: {
+      normal: "Build {{status}} for \"{{title}}\"",
+      preparing: "{{status}} build for \"{{title}}\""
+    },
     ci_enable: #{@project.ci_service ? "true" : "false"},
+    ci_title: {
+      preparing: "{{status}} build",
+      normal: "Build {{status}}"
+    },
     builds_path: "#{builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}"
   };
 

From 6a13b372224a5f7ae03dde92f455645441b62f84 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 15:32:46 +0100
Subject: [PATCH 169/283] Fixed missed conflict

---
 app/assets/javascripts/merge_request_widget.js.coffee | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index a522f9189a..065626beeb 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -72,15 +72,11 @@ class @MergeRequestWidget
         @firstCICheck = false
         @opts.ci_status = data.status
 
-<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3
       if @opts.ci_status is ''
         @opts.ci_status = data.status
         return
 
-      if data.status isnt @opts.ci_status
-=======
       if data.status isnt @opts.ci_status and data.status?
->>>>>>> Build notification null check
         @showCIStatus data.status
         if data.coverage
           @showCICoverage data.coverage

From 1b4a56bdb05afdb68b99067c60b9b453b2ecdc24 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 17:28:54 +0100
Subject: [PATCH 170/283] Fixed failing tests

---
 app/views/projects/merge_requests/widget/_show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index 804ca3783e..3c68d61c4b 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -26,4 +26,4 @@
     builds_path: "#{builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}"
   };
 
-  new MergeRequestWidget(opts);
+  merge_request_widget = new MergeRequestWidget(opts);

From 6333ebe619848aaec3811c9e8908c017317c019f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 10:16:39 +0100
Subject: [PATCH 171/283] Prefills commit message in edit file

See #14488
---
 app/views/shared/_commit_message_container.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml
index 7afbaeddee..eeb4e2f556 100644
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
@@ -6,7 +6,7 @@
     .commit-message-container
       .max-width-marker
       = text_area_tag 'commit_message',
-          (params[:commit_message] || local_assigns[:text]),
+          (params[:commit_message] || local_assigns[:placeholder]),
           class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder],
           required: true, rows: (local_assigns[:rows] || 3),
           id: "commit_message-#{nonce}"

From 44a95c5dea278d9d835030e3cab8e9e7bead0b44 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 17:41:47 +0100
Subject: [PATCH 172/283] Added back text used on merge commit message

---
 app/views/shared/_commit_message_container.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml
index eeb4e2f556..0a38327baa 100644
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
@@ -6,7 +6,7 @@
     .commit-message-container
       .max-width-marker
       = text_area_tag 'commit_message',
-          (params[:commit_message] || local_assigns[:placeholder]),
+          (params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder]),
           class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder],
           required: true, rows: (local_assigns[:rows] || 3),
           id: "commit_message-#{nonce}"

From 38a4f5cec6ab85525ab9db1d7d2669a77171f768 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 11 Apr 2016 16:45:03 -0500
Subject: [PATCH 173/283] Rename method and initialize .timeago inside

---
 app/assets/javascripts/application.js.coffee         |  4 +---
 .../javascripts/lib/datetime_utility.js.coffee       |  4 +++-
 app/assets/javascripts/merge_request_tabs.js.coffee  | 12 +++---------
 app/assets/javascripts/notes.js.coffee               |  9 +++------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 922a28b4ef..b05138ac1a 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -164,9 +164,7 @@ $ ->
   $('.trigger-submit').on 'change', ->
     $(@).parents('form').submit()
 
-  $timeago = $('abbr.timeago, .js-timeago')
-  gl.utils.updateFormatDate($timeago)
-  $timeago.timeago()
+  gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), false)
 
   # Flash
   if (flash = $(".flash-container")).length > 0
diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/datetime_utility.js.coffee
index ef9406fc33..ad1d1c7048 100644
--- a/app/assets/javascripts/lib/datetime_utility.js.coffee
+++ b/app/assets/javascripts/lib/datetime_utility.js.coffee
@@ -6,10 +6,12 @@
   w.gl.utils.formatDate = (datetime) ->
     dateFormat(datetime, 'mmm d, yyyy h:MMtt Z')
 
-  w.gl.utils.updateFormatDate = ($timeagoEls) ->
+  w.gl.utils.localTimeAgo = ($timeagoEls, setTimeago = true) ->
     $timeagoEls.each( ->
           $el = $(@)
           $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
     )
 
+    $timeagoEls.timeago() if setTimeago
+
 ) window
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index fdf084a8a8..0ae6e24460 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -141,9 +141,7 @@ class @MergeRequestTabs
       url: "#{source}.json"
       success: (data) =>
         document.querySelector("div#commits").innerHTML = data.html
-        $timeago = $('.js-timeago', 'div#commits')
-        gl.utils.updateFormatDate($timeago)
-        $timeago.timeago()
+        gl.utils.localTimeAgo($('.js-timeago', 'div#commits'))
         @commitsLoaded = true
         @scrollToElement("#commits")
 
@@ -154,9 +152,7 @@ class @MergeRequestTabs
       url: "#{source}.json" + @_location.search
       success: (data) =>
         document.querySelector("div#diffs").innerHTML = data.html
-        $timeago = $('.js-timeago', 'div#diffs')
-        gl.utils.updateFormatDate($timeago)
-        $timeago.timeago()
+        gl.utils.localTimeAgo($('.js-timeago', 'div#diffs'))
         $('div#diffs .js-syntax-highlight').syntaxHighlight()
         @expandViewContainer() if @diffViewType() is 'parallel'
         @diffsLoaded = true
@@ -169,9 +165,7 @@ class @MergeRequestTabs
       url: "#{source}.json"
       success: (data) =>
         document.querySelector("div#builds").innerHTML = data.html
-        $timeago = $('.js-timeago', 'div#builds')
-        gl.utils.updateFormatDate($timeago)
-        $timeago.timeago()
+        gl.utils.localTimeAgo($('.js-timeago', 'div#builds'))
         @buildsLoaded = true
         @scrollToElement("#builds")
 
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 02e52040e3..a67890200d 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -170,8 +170,7 @@ class @Notes
         .syntaxHighlight()
 
       # Update datetime format on the recent note
-      $timeago = $notesList.find("#note_#{note.id} .js-timeago")
-      gl.utils.updateFormatDate($timeago)
+      gl.utils.localTimeAgo($notesList.find("#note_#{note.id} .js-timeago"), false)
 
       @initTaskList()
       @updateNotesCount(1)
@@ -224,7 +223,7 @@ class @Notes
       # append new note to all matching discussions
       discussionContainer.append note_html
 
-    gl.utils.updateFormatDate($('.js-timeago', note_html))
+    gl.utils.localTimeAgo($('.js-timeago', note_html), false)
 
     @updateNotesCount(1)
 
@@ -355,9 +354,7 @@ class @Notes
     # Convert returned HTML to a jQuery object so we can modify it further
     $html = $(note.html)
 
-    $timeago = $('.js-timeago', $html)
-    gl.utils.updateFormatDate($timeago)
-    $timeago.timeago()
+    gl.utils.localTimeAgo($('.js-timeago', $html))
 
     $html.syntaxHighlight()
     $html.find('.js-task-list-container').taskList('enable')

From 476cf23fc37d6db8d3fb412ce0b646f228d9aac4 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 11 Apr 2016 16:21:32 -0300
Subject: [PATCH 174/283] Allow to close invalid merge request

---
 app/models/commit.rb                          |  8 +++--
 app/models/merge_request.rb                   |  9 ++++--
 .../merge_requests_controller_spec.rb         | 29 +++++++++++++++++++
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index d09876a07d..11ecfcace1 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -150,13 +150,11 @@ class Commit
   end
 
   def hook_attrs(with_changed_files: false)
-    path_with_namespace = project.path_with_namespace
-
     data = {
       id: id,
       message: safe_message,
       timestamp: committed_date.xmlschema,
-      url: "#{Gitlab.config.gitlab.url}/#{path_with_namespace}/commit/#{id}",
+      url: commit_url,
       author: {
         name: author_name,
         email: author_email
@@ -170,6 +168,10 @@ class Commit
     data
   end
 
+  def commit_url
+    project.present? ? "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{id}" : ""
+  end
+
   # Discover issues should be closed when this commit is pushed to a project's
   # default branch.
   def closes_issues(current_user = self.committer)
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index bf185cb5dd..8292445bca 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -213,6 +213,8 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def validate_branches
+    return if allow_broken
+
     if target_project == source_project && target_branch == source_branch
       errors.add :branch_conflict, "You can not use same project/branch for source and target"
     end
@@ -344,9 +346,12 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def hook_attrs
+    source_hook_attrs = source_project.hook_attrs if source_project.present?
+    target_hook_attrs = target_project.hook_attrs if target_project.present?
+
     attrs = {
-      source: source_project.hook_attrs,
-      target: target_project.hook_attrs,
+      source: source_hook_attrs,
+      target: target_hook_attrs,
       last_commit: nil,
       work_in_progress: work_in_progress?
     }
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 75e6b6f45a..0f2cd34132 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -157,6 +157,35 @@ describe Projects::MergeRequestsController do
     end
   end
 
+  describe 'PUT #update' do
+    context 'there is no source project' do
+      let(:project) { create(:project) }
+      let(:fork_project) { create(:forked_project_with_submodules) }
+      let(:merge_request) { create(:merge_request_with_diffs, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
+
+      before do
+        fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
+        fork_project.save
+        merge_request.reload
+      end
+
+      it 'closes MR without errors' do
+        fork_project.destroy
+
+        post :update,
+            namespace_id: project.namespace.path,
+            project_id: project.path,
+            id: merge_request.iid,
+            merge_request: {
+              state_event: 'close'
+            }
+
+        expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
+        expect(merge_request.reload.closed?).to be_truthy
+      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 72e2c1db19fe9a3f45e5df89c03e8077e064ec8b Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 11 Apr 2016 17:20:38 -0500
Subject: [PATCH 175/283] Update delete button

---
 app/views/shared/issuable/_form.html.haml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 757a3812de..4b4078cb8a 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -128,8 +128,6 @@
   - else
     .pull-right
       - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project)
-        = link_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
-                                                                                                  method: :delete, class: 'btn btn-grouped' do
-          = icon('trash-o')
-          Delete
+        = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
+                                                                                                  method: :delete, class: 'btn btn-danger btn-grouped'
       = link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel'

From 05a611a0918f9a39de4ea3a051c2192c327f778d Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 11 Apr 2016 17:25:18 -0500
Subject: [PATCH 176/283] Better control flow and added guard clause.

---
 lib/gitlab/saml/user.rb | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/gitlab/saml/user.rb b/lib/gitlab/saml/user.rb
index dd77216be4..dba4bbfc89 100644
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -26,15 +26,13 @@ module Gitlab
           @user ||= build_new_user
         end
 
-        unless @user.nil?
-          if external_users_enabled?
-            # Check if there is overlap between the user's groups and the external groups
-            # setting then set user as external or internal.
-            if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
-              @user.external = false
-            else
-              @user.external = true
-            end
+        if external_users_enabled? && @user
+          # Check if there is overlap between the user's groups and the external groups
+          # setting then set user as external or internal.
+          if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
+            @user.external = false
+          else
+            @user.external = true
           end
         end
 
@@ -50,11 +48,8 @@ module Gitlab
       end
 
       def changed?
-        if gl_user
-          gl_user.changed? || gl_user.identities.any?(&:changed?)
-        else
-          true
-        end
+        return true unless gl_user
+        gl_user.changed? || gl_user.identities.any?(&:changed?)
       end
 
       protected

From 158bba238f06f43f2988552f02b32feb2bc245e6 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 11 Apr 2016 17:42:51 -0500
Subject: [PATCH 177/283] Set tooltips for new added labels

---
 app/assets/javascripts/labels_select.js.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index d1fe116397..cf0d4f9aae 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -34,7 +34,7 @@ class @LabelsSelect
         labelHTMLTemplate = _.template(
             '<% _.each(labels, function(label){ %>
             <a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name=<%= label.title %>">
-            <span class="label color-label" style="background-color: <%= label.color %>;">
+            <span class="label has-tooltip color-label" title="<%= label.description %>" style="background-color: <%= label.color %>;">
             <%= label.title %>
             </span>
             </a>
@@ -165,6 +165,8 @@ class @LabelsSelect
             .html(template)
           $sidebarCollapsedValue.text(labelCount)
 
+          $('.has-tooltip', $value).tooltip(container: 'body')
+
           $value
             .find('a')
             .each((i) ->

From 61fc9aa87ea3752f3c7b853ab1cb102e53d392f2 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Mon, 11 Apr 2016 17:26:01 -0500
Subject: [PATCH 178/283] Better control flow.

---
 lib/gitlab/o_auth/user.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 6e099c26d8..356e96fcba 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -54,12 +54,10 @@ module Gitlab
           @user ||= build_new_user
         end
 
-        unless @user.nil?
-          if external_provider?
-            @user.external = true
-          else
-            @user.external = false
-          end
+        if external_provider? && @user
+          @user.external = true
+        elsif @user
+          @user.external = false
         end
 
         @user

From d88d6e7619c3f976361df638e765472b499f1986 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 11 Apr 2016 18:04:42 -0500
Subject: [PATCH 179/283] Hide top search form on the search page

---
 app/views/layouts/header/_default.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 0f3b811937..17502148dc 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -8,7 +8,7 @@
       .navbar-collapse.collapse
         %ul.nav.navbar-nav
           %li.hidden-sm.hidden-xs
-            = render 'layouts/search'
+            = render 'layouts/search' unless current_controller?(:search)
           %li.visible-sm.visible-xs
             = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
               = icon('search')

From 93a10f17e0c84074580eaf1b101af2a0fffd19ed Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 11 Apr 2016 18:23:12 -0300
Subject: [PATCH 180/283] Reuse `User#notification_settings_for` when it's
 possible

---
 app/controllers/groups/notification_settings_controller.rb | 2 +-
 .../projects/notification_settings_controller.rb           | 7 +++----
 app/models/member.rb                                       | 2 +-
 app/services/notification_service.rb                       | 4 ++--
 spec/services/notification_service_spec.rb                 | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/controllers/groups/notification_settings_controller.rb b/app/controllers/groups/notification_settings_controller.rb
index 20405a0519..1b46f26a37 100644
--- a/app/controllers/groups/notification_settings_controller.rb
+++ b/app/controllers/groups/notification_settings_controller.rb
@@ -1,6 +1,6 @@
 class Groups::NotificationSettingsController < Groups::ApplicationController
   def update
-    notification_setting = group.notification_settings.find_by(user_id: current_user)
+    notification_setting = current_user.notification_settings_for(group)
     saved = notification_setting.update_attributes(notification_setting_params)
 
     render json: { saved: saved }
diff --git a/app/controllers/projects/notification_settings_controller.rb b/app/controllers/projects/notification_settings_controller.rb
index da9034380a..90d294a462 100644
--- a/app/controllers/projects/notification_settings_controller.rb
+++ b/app/controllers/projects/notification_settings_controller.rb
@@ -1,14 +1,13 @@
 class Projects::NotificationSettingsController < Projects::ApplicationController
   def create
-    notification_setting = project.notification_settings.new(notification_setting_params)
-    notification_setting.user = current_user
-    saved = notification_setting.save
+    notification_setting = current_user.notification_settings_for(project)
+    saved = notification_setting.update_attributes(notification_setting_params)
 
     render json: { saved: saved }
   end
 
   def update
-    notification_setting = project.notification_settings.find_by(user_id: current_user)
+    notification_setting = current_user.notification_settings_for(project)
     saved = notification_setting.update_attributes(notification_setting_params)
 
     render json: { saved: saved }
diff --git a/app/models/member.rb b/app/models/member.rb
index 7d5af1d5c8..60efafef21 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -167,7 +167,7 @@ class Member < ActiveRecord::Base
   end
 
   def notification_setting
-    @notification_setting ||= user.notification_settings.find_by(source: source)
+    @notification_setting ||= user.notification_settings_for(source)
   end
 
   private
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 0928dda349..42ec1ac9e1 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -355,10 +355,10 @@ class NotificationService
     users.reject do |user|
       next user.notification_level == level unless project
 
-      setting = user.notification_settings.find_by(source: project)
+      setting = user.notification_settings_for(project)
 
       if !setting && project.group
-        setting = user.notification_settings.find_by(source: project.group)
+        setting = user.notification_settings_for(project.group)
       end
 
       # reject users who globally set mention notification and has no setting per project/group
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index c4d52584a4..d7c72dc081 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -89,8 +89,8 @@ describe NotificationService, services: true do
           note.project.group.add_user(@u_watcher, GroupMember::MASTER)
           note.project.save
 
-          @u_watcher.notification_settings.find_by(source: note.project).participating!
-          @u_watcher.notification_settings.find_by(source: note.project.group).global!
+          @u_watcher.notification_settings_for(note.project).participating!
+          @u_watcher.notification_settings_for(note.project.group).global!
           ActionMailer::Base.deliveries.clear
         end
 

From bee28e1785ad7844bd518c19106beee7d8a4c560 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 11 Apr 2016 18:57:18 -0300
Subject: [PATCH 181/283] Requires user to be signed in when changing
 notification settings

---
 .../notification_settings_controller.rb       |  2 ++
 .../notification_settings_controller.rb       |  2 ++
 .../notification_settings_controller_spec.rb  | 17 ++++++++++
 .../notification_settings_controller_spec.rb  | 31 +++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 spec/controllers/groups/notification_settings_controller_spec.rb
 create mode 100644 spec/controllers/projects/notification_settings_controller_spec.rb

diff --git a/app/controllers/groups/notification_settings_controller.rb b/app/controllers/groups/notification_settings_controller.rb
index 1b46f26a37..de13b16ccf 100644
--- a/app/controllers/groups/notification_settings_controller.rb
+++ b/app/controllers/groups/notification_settings_controller.rb
@@ -1,4 +1,6 @@
 class Groups::NotificationSettingsController < Groups::ApplicationController
+  before_action :authenticate_user!
+
   def update
     notification_setting = current_user.notification_settings_for(group)
     saved = notification_setting.update_attributes(notification_setting_params)
diff --git a/app/controllers/projects/notification_settings_controller.rb b/app/controllers/projects/notification_settings_controller.rb
index 90d294a462..e536725c5b 100644
--- a/app/controllers/projects/notification_settings_controller.rb
+++ b/app/controllers/projects/notification_settings_controller.rb
@@ -1,4 +1,6 @@
 class Projects::NotificationSettingsController < Projects::ApplicationController
+  before_action :authenticate_user!
+
   def create
     notification_setting = current_user.notification_settings_for(project)
     saved = notification_setting.update_attributes(notification_setting_params)
diff --git a/spec/controllers/groups/notification_settings_controller_spec.rb b/spec/controllers/groups/notification_settings_controller_spec.rb
new file mode 100644
index 0000000000..3572535d61
--- /dev/null
+++ b/spec/controllers/groups/notification_settings_controller_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Groups::NotificationSettingsController do
+  let(:group) { create(:group) }
+
+  describe '#update' do
+    context 'when not authorized' do
+      it 'redirects to sign in page' do
+        put :update,
+            group_id: group.to_param,
+            notification_setting: { level: NotificationSetting.levels[:participating] }
+
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/notification_settings_controller_spec.rb b/spec/controllers/projects/notification_settings_controller_spec.rb
new file mode 100644
index 0000000000..7e32a75b81
--- /dev/null
+++ b/spec/controllers/projects/notification_settings_controller_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Projects::NotificationSettingsController do
+  let(:project) { create(:empty_project) }
+
+  describe '#create' do
+    context 'when not authorized' do
+      it 'redirects to sign in page' do
+        post :create,
+             namespace_id: project.namespace.to_param,
+             project_id: project.to_param,
+             notification_setting: { level: NotificationSetting.levels[:participating] }
+
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
+
+  describe '#update' do
+    context 'when not authorized' do
+      it 'redirects to sign in page' do
+        put :update,
+            namespace_id: project.namespace.to_param,
+            project_id: project.to_param,
+            notification_setting: { level: NotificationSetting.levels[:participating] }
+
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
+end

From fe58c1f13cc0758bbbd8f85b8794b458b3a72b55 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 11 Apr 2016 19:29:31 -0300
Subject: [PATCH 182/283] Fix partial for update project notifications

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

diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index 2b9d8f2ac8..49f541399f 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -1,5 +1,5 @@
 - if @notification_setting
-  = form_for [@project.namespace.becomes(Namespace), @project, @notification_setting], remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
+  = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
     = f.hidden_field :level
     %span.dropdown
       %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}

From c162e0278cb845f6209e926d49474926b6a45956 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 11 Apr 2016 23:07:06 -0700
Subject: [PATCH 183/283] Check and report import job status to help diagnose
 issues with forking

---
 app/models/project.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 3e1f04b415..6298dc8d1c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -388,9 +388,15 @@ class Project < ActiveRecord::Base
 
   def add_import_job
     if forked?
-      RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path)
+      job_id = RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path)
     else
-      RepositoryImportWorker.perform_async(self.id)
+      job_id = RepositoryImportWorker.perform_async(self.id)
+    end
+
+    if job_id
+      Rails.logger.info "Import job started for #{path_with_namespace} with job ID #{job_id}"
+    else
+      Rails.logger.error "Import job failed to start for #{path_with_namespace}"
     end
   end
 

From a6ba94dbd109637b996246601f1bc2b62dc0a8d7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 12 Apr 2016 09:32:12 +0100
Subject: [PATCH 184/283] Filtering by any label keeps the text on the toggle
 button

---
 app/assets/javascripts/labels_select.js.coffee | 2 +-
 spec/features/issues/filter_issues_spec.rb     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index d1fe116397..9038562187 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -218,7 +218,7 @@ class @LabelsSelect
         selectable: true
 
         toggleLabel: (selected) ->
-          if selected and selected.title isnt 'Any Label'
+          if selected and selected.title?
             selected.title
           else
             defaultLabel
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 91de06e31f..69b22232f1 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -84,16 +84,25 @@ describe 'Filter issues', feature: true do
 
     it 'should filter by any label' do
       find('.dropdown-menu-labels a', text: 'Any Label').click
+      page.within '.labels-filter' do
+        expect(page).to have_content 'Any Label'
+      end
       expect(find('.js-label-select .dropdown-toggle-text')).to have_content('Label')
     end
 
     it 'should filter by no label' do
       find('.dropdown-menu-labels a', text: 'No Label').click
+      page.within '.labels-filter' do
+        expect(page).to have_content 'No Label'
+      end
       expect(find('.js-label-select .dropdown-toggle-text')).to have_content('No Label')
     end
 
     it 'should filter by no label' do
       find('.dropdown-menu-labels a', text: label.title).click
+      page.within '.labels-filter' do
+        expect(page).to have_content label.title
+      end
       expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title)
     end
   end

From 8299129382e59a0b407be8c476b8ae2d0704d688 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 12 Apr 2016 12:24:16 +0200
Subject: [PATCH 185/283] Instrument all service classes

Fixes gitlab-org/gitlab-ce#15162
---
 config/initializers/metrics.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 1b445bbbd1..9bd43dad0a 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -1,4 +1,5 @@
 if Gitlab::Metrics.enabled?
+  require 'pathname'
   require 'influxdb'
   require 'connection_pool'
   require 'method_source'
@@ -98,6 +99,17 @@ 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
   end
 
   GC::Profiler.enable

From 10080ce3624e199bd770a924d8d7f178008d4cb7 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 12:32:34 +0200
Subject: [PATCH 186/283] API: Expose updated_at for notes

---
 CHANGELOG           | 1 +
 doc/api/notes.md    | 3 +++
 lib/api/entities.rb | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c08b148c3a..7574387280 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.7.0 (unreleased)
   - API: Expose user location (Robert Schilling)
   - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
+  - API: Expose 'updated_at' for issue, snippet, and merge request notes (Robert Schilling)
 
 v 8.6.5
   - Fix importing from GitHub Enterprise. !3529
diff --git a/doc/api/notes.md b/doc/api/notes.md
index d4d63e825a..9168ab00d7 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -32,6 +32,7 @@ Parameters:
       "created_at": "2013-09-30T13:46:01Z"
     },
     "created_at": "2013-10-02T09:22:45Z",
+    "updated_at": "2013-10-02T10:22:45Z",
     "system": true,
     "upvote": false,
     "downvote": false,
@@ -51,6 +52,7 @@ Parameters:
       "created_at": "2013-09-30T13:46:01Z"
     },
     "created_at": "2013-10-02T09:56:03Z",
+    "updated_at": "2013-10-02T09:56:03Z",
     "system": true,
     "upvote": false,
     "downvote": false,
@@ -223,6 +225,7 @@ Parameters:
     "created_at": "2013-09-30T13:46:01Z"
   },
   "created_at": "2013-10-02T08:57:14Z",
+  "updated_at": "2013-10-02T08:57:14Z",
   "system": false,
   "upvote": false,
   "downvote": false,
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5ed9b7b1d9..939469b388 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -212,7 +212,7 @@ module API
       expose :note, as: :body
       expose :attachment_identifier, as: :attachment
       expose :author, using: Entities::UserBasic
-      expose :created_at
+      expose :created_at, :updated_at
       expose :system?, as: :system
       expose :noteable_id, :noteable_type
       # upvote? and downvote? are deprecated, always return false

From 9d03e8fd5c564b20f3a1ef18583aa4c7c2b27cfc Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Thu, 7 Apr 2016 10:59:54 +0200
Subject: [PATCH 187/283] API: Add iid filter to milestones

---
 CHANGELOG                            | 1 +
 lib/api/milestones.rb                | 2 ++
 spec/requests/api/milestones_spec.rb | 8 +++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c08b148c3a..e5e027506c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ v 8.7.0 (unreleased)
   - Add default scope to projects to exclude projects pending deletion
   - Ensure empty recipients are rejected in BuildsEmailService
   - API: Ability to filter milestones by state `active` and `closed` (Robert Schilling)
+  - API: Fix milestone filtering by `iid` (Robert Schilling)
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
   - Better errors handling when creating milestones inside groups
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb
index 0f3f505fa0..84b4d4cdd6 100644
--- a/lib/api/milestones.rb
+++ b/lib/api/milestones.rb
@@ -21,6 +21,7 @@ module API
       #   state (optional) - Return "active" or "closed" milestones
       # Example Request:
       #   GET /projects/:id/milestones
+      #   GET /projects/:id/milestones?iid=42
       #   GET /projects/:id/milestones?state=active
       #   GET /projects/:id/milestones?state=closed
       get ":id/milestones" do
@@ -28,6 +29,7 @@ module API
 
         milestones = user_project.milestones
         milestones = filter_milestones_state(milestones, params[:state])
+        milestones = filter_by_iid(milestones, params[:iid]) if params[:iid].present?
 
         present paginate(milestones), with: Entities::Milestone
       end
diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb
index d97bf6d38f..344f0fe0b7 100644
--- a/spec/requests/api/milestones_spec.rb
+++ b/spec/requests/api/milestones_spec.rb
@@ -50,10 +50,12 @@ describe API::API, api: true  do
     end
 
     it 'should return a project milestone by iid' do
-      get api("/projects/#{project.id}/milestones?iid=#{milestone.iid}", user)
+      get api("/projects/#{project.id}/milestones?iid=#{closed_milestone.iid}", user)
+
       expect(response.status).to eq 200
-      expect(json_response.first['title']).to eq milestone.title
-      expect(json_response.first['id']).to eq milestone.id
+      expect(json_response.size).to eq(1)
+      expect(json_response.first['title']).to eq closed_milestone.title
+      expect(json_response.first['id']).to eq closed_milestone.id
     end
 
     it 'should return 401 error if user not authenticated' do

From 20d4ca4cc3599b4335b73fd7c3bb0354efe397b4 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 6 Apr 2016 13:59:50 +0200
Subject: [PATCH 188/283] API: Ability to retrieve a single tag

---
 doc/api/tags.md                | 46 +++++++++++++++++++++++++++++++++-
 lib/api/tags.rb                | 14 +++++++++++
 spec/requests/api/tags_spec.rb | 17 +++++++++++++
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/doc/api/tags.md b/doc/api/tags.md
index 17d12e9cc6..d428ca0ef5 100644
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -38,6 +38,50 @@ Parameters:
 ]
 ```
 
+## Get a single repository tag
+
+Get a specific repository tag determined by its name. It returns 200 together
+with the tag information if the tag exists. It returns 404 if the tag does not
+exist.
+
+```
+GET /projects/:id/repository/tags/:tag_name
+```
+
+Parameters:
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `tag_name` | string | yes | The name of the tag |
+
+```bash
+curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/repository/tags/v1.0.0
+```
+
+Example Response:
+
+```json
+{
+  "name": "v5.0.0",
+  "message": null,
+  "commit": {
+    "id": "60a8ff033665e1207714d6670fcd7b65304ec02f",
+    "message": "v5.0.0\n",
+    "parent_ids": [
+      "f61c062ff8bcbdb00e0a1b3317a91aed6ceee06b"
+    ],
+    "authored_date": "2015-02-01T21:56:31.000+01:00",
+    "author_name": "Arthur Verschaeve",
+    "author_email": "contact@arthurverschaeve.be",
+    "committed_date": "2015-02-01T21:56:31.000+01:00",
+    "committer_name": "Arthur Verschaeve",
+    "committer_email": "contact@arthurverschaeve.be"
+  },
+  "release": null
+}
+```
+
 ## Create a new tag
 
 Creates a new tag in the repository that points to the supplied ref.
@@ -148,4 +192,4 @@ Parameters:
   "tag_name": "1.0.0",
   "description": "Amazing release. Wow"
 }
-```
\ No newline at end of file
+```
diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index 2d8a9e51bb..731a68082b 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -16,6 +16,20 @@ module API
                 with: Entities::RepoTag, project: user_project
       end
 
+      # Get a single repository tag
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   tag_name (required) - The name of the tag
+      # Example Request:
+      #   GET /projects/:id/repository/tags/:tag_name
+      get ":id/repository/tags/:tag_name", requirements: { tag_name: /.*/ } do
+        tag = user_project.repository.find_tag(params[:tag_name])
+        not_found!('Tag') unless tag
+
+        present tag,  with: Entities::RepoTag, project: user_project
+      end
+
       # Create tag
       #
       # Parameters:
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index a15be07ed5..acbd9c3e33 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -40,6 +40,23 @@ describe API::API, api: true  do
     end
   end
 
+  describe "GET /projects/:id/repository/tags/:tag_name" do
+    let(:tag_name) { project.repository.tag_names.sort.reverse.first }
+
+    it 'should return a specific tag' do
+      get api("/projects/#{project.id}/repository/tags/#{tag_name}", user)
+
+      expect(response.status).to eq(200)
+      expect(json_response['name']).to eq(tag_name)
+    end
+
+    it 'should return 404 for an invalid tag name' do
+      get api("/projects/#{project.id}/repository/tags/foobar", user)
+
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe 'POST /projects/:id/repository/tags' do
     context 'lightweight tags' do
       it 'should create a new tag' do

From b3d8b995c3a5dddf1b27c00e2420effb62e548b4 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 12 Apr 2016 14:10:35 +0200
Subject: [PATCH 189/283] Un-instrument Banzai::ReferenceExtractor

Instrumenting this class together with Gitlab::ReferenceExtractor causes
a StackError for some reason. Since Gitlab::ReferenceExtractor has most
of the interesting code we'll only instrument that class.
---
 config/initializers/metrics.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 1b445bbbd1..e85ac22f10 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -85,9 +85,6 @@ if Gitlab::Metrics.enabled?
       config.instrument_instance_methods(const)
     end
 
-    config.instrument_methods(Banzai::ReferenceExtractor)
-    config.instrument_instance_methods(Banzai::ReferenceExtractor)
-
     config.instrument_methods(Banzai::Renderer)
     config.instrument_methods(Banzai::Querying)
 

From f81352f531b22d02b1b80cfbd6daed809ea8cf5d Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 12:50:21 +0200
Subject: [PATCH 190/283] Fix minor styling issues from code review

---
 doc/api/tags.md                | 4 ++--
 lib/api/tags.rb                | 6 +++---
 spec/requests/api/tags_spec.rb | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/api/tags.md b/doc/api/tags.md
index d428ca0ef5..ac9fac92f4 100644
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -40,8 +40,8 @@ Parameters:
 
 ## Get a single repository tag
 
-Get a specific repository tag determined by its name. It returns 200 together
-with the tag information if the tag exists. It returns 404 if the tag does not
+Get a specific repository tag determined by its name. It returns `200` together
+with the tag information if the tag exists. It returns `404` if the tag does not
 exist.
 
 ```
diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index 731a68082b..d1a10479e4 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -19,15 +19,15 @@ module API
       # Get a single repository tag
       #
       # Parameters:
-      #   id (required) - The ID of a project
+      #   id (required)       - The ID of a project
       #   tag_name (required) - The name of the tag
       # Example Request:
       #   GET /projects/:id/repository/tags/:tag_name
-      get ":id/repository/tags/:tag_name", requirements: { tag_name: /.*/ } do
+      get ":id/repository/tags/:tag_name", requirements: { tag_name: /.+/ } do
         tag = user_project.repository.find_tag(params[:tag_name])
         not_found!('Tag') unless tag
 
-        present tag,  with: Entities::RepoTag, project: user_project
+        present tag, with: Entities::RepoTag, project: user_project
       end
 
       # Create tag
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index acbd9c3e33..9f9c3b1cf4 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -40,17 +40,17 @@ describe API::API, api: true  do
     end
   end
 
-  describe "GET /projects/:id/repository/tags/:tag_name" do
+  describe 'GET /projects/:id/repository/tags/:tag_name' do
     let(:tag_name) { project.repository.tag_names.sort.reverse.first }
 
-    it 'should return a specific tag' do
+    it 'returns a specific tag' do
       get api("/projects/#{project.id}/repository/tags/#{tag_name}", user)
 
       expect(response.status).to eq(200)
       expect(json_response['name']).to eq(tag_name)
     end
 
-    it 'should return 404 for an invalid tag name' do
+    it 'returns 404 for an invalid tag name' do
       get api("/projects/#{project.id}/repository/tags/foobar", user)
 
       expect(response.status).to eq(404)

From ba21c00f01bf4274d0e4cc3892293fc1e581b260 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 6 Apr 2016 01:21:02 +0200
Subject: [PATCH 191/283] Delete notes via API

---
 CHANGELOG                                    |  5 +++
 app/controllers/projects/notes_controller.rb |  5 +--
 app/services/notes/delete_service.rb         |  8 ++++
 doc/api/notes.md                             | 45 ++++++++++++++++++++
 lib/api/notes.rb                             | 17 ++++++++
 spec/requests/api/notes_spec.rb              | 43 +++++++++++++++++++
 spec/services/notes/delete_service_spec.rb   | 15 +++++++
 7 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 app/services/notes/delete_service.rb
 create mode 100644 spec/services/notes/delete_service_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 593e8f77ab..f4dbab8889 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,6 +46,11 @@ v 8.6.5
   - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu). !3583
   - Unblock user when active_directory is disabled and it can be found !3550
   - Fix a 2FA authentication spoofing vulnerability.
+  - API: Delete notes of issues, snippets, and merge requests (Robert Schilling)
+
+v 8.6.5 (unreleased)
+  - Only update repository language if it is not set to improve performance
+  - Check permissions when user attempts to import members from another project
 
 v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 1b9dd56804..a9a69573ee 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -39,8 +39,7 @@ class Projects::NotesController < Projects::ApplicationController
 
   def destroy
     if note.editable?
-      note.destroy
-      note.reset_events_cache
+      Notes::DeleteService.new(project, current_user).execute(note)
     end
 
     respond_to do |format|
@@ -73,7 +72,7 @@ class Projects::NotesController < Projects::ApplicationController
     note = noteable.notes.find_by(data)
 
     if note
-      note.destroy
+      Notes::DeleteService.new(project, current_user).execute(note)
     else
       Notes::CreateService.new(project, current_user, note_params).execute
     end
diff --git a/app/services/notes/delete_service.rb b/app/services/notes/delete_service.rb
new file mode 100644
index 0000000000..7f1b30ec84
--- /dev/null
+++ b/app/services/notes/delete_service.rb
@@ -0,0 +1,8 @@
+module Notes
+  class DeleteService < BaseService
+    def execute(note)
+      note.destroy
+      note.reset_events_cache
+    end
+  end
+end
diff --git a/doc/api/notes.md b/doc/api/notes.md
index 9168ab00d7..82494bf83f 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -105,6 +105,21 @@ Parameters:
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
+### Delete existing issue note
+
+Deletes an existing note of an issue. On success, this API method returns 200.
+If the note does not exist, the API returns 404.
+
+```
+DELETE /projects/:id/issues/:issue_id/notes/:note_id
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `issue_id` (required) - The ID of an issue
+- `note_id` (required) - The ID of a note
+
 ## Snippets
 
 ### List all snippet notes
@@ -182,6 +197,21 @@ Parameters:
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
+### Delete existing snippet note
+
+Deletes an existing note of a snippet. On success, this API method returns 200.
+If the note does not exist, the API returns 404.
+
+```
+DELETE /projects/:id/snippets/:snippet_id/notes/:note_id
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `snippet_id` (required) - The ID of a snippet
+- `note_id` (required) - The ID of a note
+
 ## Merge Requests
 
 ### List all merge request notes
@@ -262,3 +292,18 @@ Parameters:
 - `merge_request_id` (required) - The ID of a merge request
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
+
+### Delete existing snippet note
+
+Deletes an existing note of a merge request. On success, this API method returns
+200. If the note does not exist, the API returns 404.
+
+```
+DELETE /projects/:id/merge_requests/:merge_request_id/notes/:note_id
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `merge_request_id` (required) - The ID of a merge request
+- `note_id` (required) - The ID of a note
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 174473f537..fd1704d395 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -112,6 +112,23 @@ module API
           end
         end
 
+        # Delete a +notable+ note
+        #
+        # Parameters:
+        # Parameters:
+        #   id (required) - The ID of a project
+        #   noteable_id (required) - The ID of an issue, MR, or snippet
+        #   node_id (required) - The ID of a note
+        # Example Request:
+        #   DELETE /projects/:id/issues/:noteable_id/notes/:note_id
+        #   DELETE /projects/:id/snippets/:noteable_id/notes/:node_id
+        delete ":id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id" do
+          note = user_project.notes.find(params[:note_id])
+          not_found!('Note') unless note
+          authorize! :admin_note, note
+          ::Notes::DeleteService.new(user_project, current_user).execute(note)
+          true
+        end
       end
     end
   end
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 39f9a06fe1..23d3c63bc1 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -241,4 +241,47 @@ describe API::API, api: true  do
     end
   end
 
+  describe ':id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id' do
+    context 'when noteable is an Issue' do
+      it 'should delete a note' do
+        delete api("/projects/#{project.id}/issues/#{issue.id}/"\
+                   "notes/#{issue_note.id}", user)
+        expect(response.status).to eq(200)
+      end
+
+      it 'should return a 404 error when note id not found' do
+        delete api("/projects/#{project.id}/issues/#{issue.id}/notes/123", user)
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'when noteable is a Snippet' do
+      it 'should delete a note' do
+        delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
+                   "notes/#{snippet_note.id}", user)
+        expect(response.status).to eq(200)
+      end
+
+      it 'should return a 404 error when note id not found' do
+        delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
+                   "notes/123", user)
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'when noteable is a Merge Request' do
+      it 'should delete a note' do
+        delete api("/projects/#{project.id}/merge_requests/"\
+                   "#{merge_request.id}/notes/#{merge_request_note.id}", user)
+        expect(response.status).to eq(200)
+      end
+
+      it 'should return a 404 error when note id not found' do
+        delete api("/projects/#{project.id}/merge_requests/"\
+                   "#{merge_request.id}/notes/123", user)
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
 end
diff --git a/spec/services/notes/delete_service_spec.rb b/spec/services/notes/delete_service_spec.rb
new file mode 100644
index 0000000000..88e71c135d
--- /dev/null
+++ b/spec/services/notes/delete_service_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Notes::DeleteService, services: true do
+  let(:project) { create(:empty_project) }
+  let(:issue) { create(:issue, project: project) }
+  let(:user) { create(:user) }
+  let(:note) { create(:note, project: project, noteable: issue, author: user, note: 'Note') }
+
+  describe '#execute' do
+    it 'deletes a note' do
+      Notes::DeleteService.new(project, user).execute(note)
+      expect(project.issues.find(issue.id).notes).to_not include(note)
+    end
+  end
+end

From 9aefaa41ab1442f81ffc15ad9a8279bd1e92c91a Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 6 Apr 2016 19:04:17 +0200
Subject: [PATCH 192/283] Fix code review issues

---
 app/controllers/projects/notes_controller.rb |   2 +-
 doc/api/notes.md                             | 130 ++++++++++++++++---
 lib/api/notes.rb                             |   6 +-
 spec/requests/api/notes_spec.rb              |  20 ++-
 spec/services/notes/delete_service_spec.rb   |   9 +-
 5 files changed, 140 insertions(+), 27 deletions(-)

diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index a9a69573ee..707a0d0e5c 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -72,7 +72,7 @@ class Projects::NotesController < Projects::ApplicationController
     note = noteable.notes.find_by(data)
 
     if note
-      Notes::DeleteService.new(project, current_user).execute(note)
+      note.destroy
     else
       Notes::CreateService.new(project, current_user, note_params).execute
     end
diff --git a/doc/api/notes.md b/doc/api/notes.md
index 82494bf83f..2e0936f11b 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -105,10 +105,10 @@ Parameters:
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
-### Delete existing issue note
+### Delete an issue note
 
-Deletes an existing note of an issue. On success, this API method returns 200.
-If the note does not exist, the API returns 404.
+Deletes an existing note of an issue. On success, this API method returns 200
+and the deleted note. If the note does not exist, the API returns 404.
 
 ```
 DELETE /projects/:id/issues/:issue_id/notes/:note_id
@@ -116,9 +116,41 @@ DELETE /projects/:id/issues/:issue_id/notes/:note_id
 
 Parameters:
 
-- `id` (required) - The ID of a project
-- `issue_id` (required) - The ID of an issue
-- `note_id` (required) - The ID of a note
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `issue_id` | integer | yes | The ID of an issue |
+| `note_id` | integer | yes | The ID of a note |
+
+```bash
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/11/notes/636
+```
+
+Example Response:
+
+```json
+{
+  "id": 636,
+  "body": "This is a good idea.",
+  "attachment": null,
+  "author": {
+    "id": 1,
+    "username": "pipin",
+    "email": "admin@example.com",
+    "name": "Pip",
+    "state": "active",
+    "created_at": "2013-09-30T13:46:01Z",
+    "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/pipin"
+  },
+  "created_at": "2016-04-05T22:10:44.164Z",
+  "system": false,
+  "noteable_id": 11,
+  "noteable_type": "Issue",
+  "upvote": false,
+  "downvote": false
+}
+```
 
 ## Snippets
 
@@ -197,10 +229,10 @@ Parameters:
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
-### Delete existing snippet note
+### Delete a snippet note
 
-Deletes an existing note of a snippet. On success, this API method returns 200.
-If the note does not exist, the API returns 404.
+Deletes an existing note of a snippet. On success, this API method returns 200
+and the deleted note. If the note does not exist, the API returns 404.
 
 ```
 DELETE /projects/:id/snippets/:snippet_id/notes/:note_id
@@ -208,9 +240,41 @@ DELETE /projects/:id/snippets/:snippet_id/notes/:note_id
 
 Parameters:
 
-- `id` (required) - The ID of a project
-- `snippet_id` (required) - The ID of a snippet
-- `note_id` (required) - The ID of a note
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `snippet_id` | integer | yes | The ID of a snippet |
+| `note_id` | integer | yes | The ID of a note |
+
+```bash
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/snippets/52/notes/1659
+```
+
+Example Response:
+
+```json
+{
+  "id": 1659,
+  "body": "This is a good idea.",
+  "attachment": null,
+  "author": {
+    "id": 1,
+    "username": "pipin",
+    "email": "admin@example.com",
+    "name": "Pip",
+    "state": "active",
+    "created_at": "2013-09-30T13:46:01Z",
+    "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/pipin"
+  },
+  "created_at": "2016-04-06T16:51:53.239Z",
+  "system": false,
+  "noteable_id": 52,
+  "noteable_type": "Snippet",
+  "upvote": false,
+  "downvote": false
+}
+```
 
 ## Merge Requests
 
@@ -293,10 +357,10 @@ Parameters:
 - `note_id` (required) - The ID of a note
 - `body` (required) - The content of a note
 
-### Delete existing snippet note
+### Delete a merge request note
 
 Deletes an existing note of a merge request. On success, this API method returns
-200. If the note does not exist, the API returns 404.
+200 and the deleted note. If the note does not exist, the API returns 404.
 
 ```
 DELETE /projects/:id/merge_requests/:merge_request_id/notes/:note_id
@@ -304,6 +368,38 @@ DELETE /projects/:id/merge_requests/:merge_request_id/notes/:note_id
 
 Parameters:
 
-- `id` (required) - The ID of a project
-- `merge_request_id` (required) - The ID of a merge request
-- `note_id` (required) - The ID of a note
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `merge_request_id` | integer | yes | The ID of a merge request |
+| `note_id` | integer | yes | The ID of a note |
+
+```bash
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/7/notes/1602
+```
+
+Example Response:
+
+```json
+{
+  "id": 1602,
+  "body": "This is a good idea.",
+  "attachment": null,
+  "author": {
+    "id": 1,
+    "username": "pipin",
+    "email": "admin@example.com",
+    "name": "Pip",
+    "state": "active",
+    "created_at": "2013-09-30T13:46:01Z",
+    "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/pipin"
+  },
+  "created_at": "2016-04-05T22:11:59.923Z",
+  "system": false,
+  "noteable_id": 7,
+  "noteable_type": "MergeRequest",
+  "upvote": false,
+  "downvote": false
+}
+```
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index fd1704d395..2ed986b9ec 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -112,10 +112,9 @@ module API
           end
         end
 
-        # Delete a +notable+ note
+        # Delete a +noteable+ note
         #
         # Parameters:
-        # Parameters:
         #   id (required) - The ID of a project
         #   noteable_id (required) - The ID of an issue, MR, or snippet
         #   node_id (required) - The ID of a note
@@ -124,10 +123,9 @@ module API
         #   DELETE /projects/:id/snippets/:noteable_id/notes/:node_id
         delete ":id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id" do
           note = user_project.notes.find(params[:note_id])
-          not_found!('Note') unless note
           authorize! :admin_note, note
           ::Notes::DeleteService.new(user_project, current_user).execute(note)
-          true
+          present note, with: Entities::Note
         end
       end
     end
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 23d3c63bc1..b35e67b5bd 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -241,16 +241,22 @@ describe API::API, api: true  do
     end
   end
 
-  describe ':id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id' do
+  describe 'DELETE /projects/:id/noteable/:noteable_id/notes/:note_id' do
     context 'when noteable is an Issue' do
       it 'should delete a note' do
         delete api("/projects/#{project.id}/issues/#{issue.id}/"\
                    "notes/#{issue_note.id}", user)
+
         expect(response.status).to eq(200)
+        # Check if note is really deleted
+        delete api("/projects/#{project.id}/issues/#{issue.id}/"\
+                   "notes/#{issue_note.id}", user)
+        expect(response.status).to eq(404)
       end
 
       it 'should return a 404 error when note id not found' do
         delete api("/projects/#{project.id}/issues/#{issue.id}/notes/123", user)
+
         expect(response.status).to eq(404)
       end
     end
@@ -259,12 +265,18 @@ describe API::API, api: true  do
       it 'should delete a note' do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/#{snippet_note.id}", user)
+
         expect(response.status).to eq(200)
+        # Check if note is really deleted
+        delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
+                   "notes/#{snippet_note.id}", user)
+        expect(response.status).to eq(404)
       end
 
       it 'should return a 404 error when note id not found' do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/123", user)
+
         expect(response.status).to eq(404)
       end
     end
@@ -273,12 +285,18 @@ describe API::API, api: true  do
       it 'should delete a note' do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/#{merge_request_note.id}", user)
+
         expect(response.status).to eq(200)
+        # Check if note is really deleted
+        delete api("/projects/#{project.id}/merge_requests/"\
+                   "#{merge_request.id}/notes/#{merge_request_note.id}", user)
+        expect(response.status).to eq(404)
       end
 
       it 'should return a 404 error when note id not found' do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/123", user)
+
         expect(response.status).to eq(404)
       end
     end
diff --git a/spec/services/notes/delete_service_spec.rb b/spec/services/notes/delete_service_spec.rb
index 88e71c135d..07aa57c464 100644
--- a/spec/services/notes/delete_service_spec.rb
+++ b/spec/services/notes/delete_service_spec.rb
@@ -3,13 +3,14 @@ require 'spec_helper'
 describe Notes::DeleteService, services: true do
   let(:project) { create(:empty_project) }
   let(:issue) { create(:issue, project: project) }
-  let(:user) { create(:user) }
-  let(:note) { create(:note, project: project, noteable: issue, author: user, note: 'Note') }
+  let(:note) { create(:note, project: project, noteable: issue) }
 
   describe '#execute' do
     it 'deletes a note' do
-      Notes::DeleteService.new(project, user).execute(note)
-      expect(project.issues.find(issue.id).notes).to_not include(note)
+      project = note.project
+      described_class.new(project, note.author).execute(note)
+
+      expect(project.issues.find(issue.id).notes).not_to include(note)
     end
   end
 end

From 49484f9a2c2efb670f044028c555f00378484dd4 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 14:20:58 +0200
Subject: [PATCH 193/283] Fix changelog entry

---
 CHANGELOG | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f4dbab8889..5dd1cf5f28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.7.0 (unreleased)
   - Ensure empty recipients are rejected in BuildsEmailService
   - API: Ability to filter milestones by state `active` and `closed` (Robert Schilling)
   - API: Fix milestone filtering by `iid` (Robert Schilling)
+  - API: Delete notes of issues, snippets, and merge requests (Robert Schilling)
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
   - Better errors handling when creating milestones inside groups
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
@@ -46,11 +47,6 @@ v 8.6.5
   - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu). !3583
   - Unblock user when active_directory is disabled and it can be found !3550
   - Fix a 2FA authentication spoofing vulnerability.
-  - API: Delete notes of issues, snippets, and merge requests (Robert Schilling)
-
-v 8.6.5 (unreleased)
-  - Only update repository language if it is not set to improve performance
-  - Check permissions when user attempts to import members from another project
 
 v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)

From 6dbcb880cc72f7511358612bbc76e2ab9ded14c5 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Fri, 8 Apr 2016 12:41:37 +0200
Subject: [PATCH 194/283] Allow a project member to leave the projected through
 the API

---
 CHANGELOG                                 |  1 +
 doc/api/projects.md                       |  6 ++++--
 lib/api/project_members.rb                | 13 +++++++++----
 spec/requests/api/project_members_spec.rb | 20 +++++++++++++++++---
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 593e8f77ab..3c03b26cf5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 8.7.0 (unreleased)
   - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
   - API: Expose 'updated_at' for issue, snippet, and merge request notes (Robert Schilling)
+  - API: User can leave a project through the API when not master or owner. !3613
 
 v 8.6.5
   - Fix importing from GitHub Enterprise. !3529
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 3a909a2bc8..ab716c229d 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -780,8 +780,10 @@ Parameters:
 - `id` (required) - The ID or NAMESPACE/PROJECT_NAME of a project
 - `user_id` (required) - The ID of a team member
 
-This method is idempotent and can be called multiple times with the same parameters.
-Revoking team membership for a user who is not currently a team member is considered success.
+This method removes the project member if the user has the proper access rights to do so.
+It returns a status code 403 if the member does not have the proper rights to perform this action.
+In all other cases this method is idempotent and revoking team membership for a user who is not
+currently a team member is considered success.
 Please note that the returned JSON currently differs slightly. Thus you should not
 rely on the returned JSON structure.
 
diff --git a/lib/api/project_members.rb b/lib/api/project_members.rb
index c756bb479f..4aefdf319c 100644
--- a/lib/api/project_members.rb
+++ b/lib/api/project_members.rb
@@ -93,12 +93,17 @@ module API
       # Example Request:
       #   DELETE /projects/:id/members/:user_id
       delete ":id/members/:user_id" do
-        authorize! :admin_project, user_project
         project_member = user_project.project_members.find_by(user_id: params[:user_id])
-        unless project_member.nil?
-          project_member.destroy
-        else
+
+        unless current_user.can?(:admin_project, user_project) ||
+                current_user.can?(:destroy_project_member, project_member)
+          forbidden!
+        end
+
+        if project_member.nil?
           { message: "Access revoked", id: params[:user_id].to_i }
+        else
+          project_member.destroy
         end
       end
     end
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
index 4301588b16..c112ca5e3c 100644
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
@@ -118,8 +118,10 @@ describe API::API, api: true  do
   end
 
   describe "DELETE /projects/:id/members/:user_id" do
-    before { project_member }
-    before { project_member2 }
+    before do
+      project_member
+      project_member2
+    end
 
     it "should remove user from project team" do
       expect do
@@ -132,6 +134,7 @@ describe API::API, api: true  do
       expect do
         delete api("/projects/#{project.id}/members/#{user3.id}", user)
       end.to_not change { ProjectMember.count }
+      expect(response.status).to eq(200)
     end
 
     it "should return 200 if team member already removed" do
@@ -145,8 +148,19 @@ describe API::API, api: true  do
         delete api("/projects/#{project.id}/members/1000000", user)
       end.to change { ProjectMember.count }.by(0)
       expect(response.status).to eq(200)
-      expect(json_response['message']).to eq("Access revoked")
       expect(json_response['id']).to eq(1000000)
+      expect(json_response['message']).to eq('Access revoked')
+    end
+
+    context 'when the user is not an admin or owner' do
+      it 'can leave the project' do
+        expect do
+          delete api("/projects/#{project.id}/members/#{user3.id}", user3)
+        end.to change { ProjectMember.count }.by(-1)
+
+        expect(response.status).to eq(200)
+        expect(json_response['id']).to eq(project_member2.id)
+      end
     end
   end
 end

From 08a217cfcfc2e2387c6d4070ed8b0e121f47f50c Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 15:28:09 +0200
Subject: [PATCH 195/283] Add changelog entry

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

diff --git a/CHANGELOG b/CHANGELOG
index c08b148c3a..85539b1a12 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.7.0 (unreleased)
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
   - Fix creation of merge requests for orphaned branches (Stan Hu)
+  - API: Ability to retrieve a single tag (Robert Schilling)
   - Fall back to `In-Reply-To` and `References` headers when sub-addressing is not available (David Padilla)
   - Remove "Congratulations!" tweet button on newly-created project. (Connor Shea)
   - Fix admin/projects when using visibility levels on search (PotHix)

From 050110c9c90d39ea9c128ac183c13a37250fd7a1 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Tue, 12 Apr 2016 14:41:34 +0100
Subject: [PATCH 196/283] hide help block when user is creating a new project
 inside a group

---
 CHANGELOG                                        |  1 +
 .../behaviors/requires_input.js.coffee           | 16 +++++++++++++++-
 app/helpers/namespaces_helper.rb                 | 12 ++++++++++--
 app/views/projects/new.html.haml                 |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 593e8f77ab..fa6d4d7551 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@ v 8.7.0 (unreleased)
   - API: Fix milestone filtering by `iid` (Robert Schilling)
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
   - Better errors handling when creating milestones inside groups
+  - Hide `Create a group` help block when creating a new project in a group
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
   - Fix creation of merge requests for orphaned branches (Stan Hu)
diff --git a/app/assets/javascripts/behaviors/requires_input.js.coffee b/app/assets/javascripts/behaviors/requires_input.js.coffee
index 79d750d184..0faa570ce1 100644
--- a/app/assets/javascripts/behaviors/requires_input.js.coffee
+++ b/app/assets/javascripts/behaviors/requires_input.js.coffee
@@ -35,4 +35,18 @@ $.fn.requiresInput = ->
   $form.on 'change input', fieldSelector, requireInput
 
 $ ->
-  $('form.js-requires-input').requiresInput()
+  $form = $('form.js-requires-input')
+  $form.requiresInput()
+
+  # Hide or Show the help block when creating a new project
+  # based on the option selected
+  hideOrShowHelpBlock = (form) ->
+    selected = $('.js-select-namespace option:selected')
+    if selected.length and selected.data('options-parent') is 'groups'
+      return form.find('.help-block').hide()
+    else if selected.length
+      form.find('.help-block').show()
+
+  hideOrShowHelpBlock($form)
+
+  $('.select2.js-select-namespace').change -> hideOrShowHelpBlock($form)
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index faba418c4d..94c6b548ec 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -3,8 +3,16 @@ module NamespacesHelper
     groups = current_user.owned_groups + current_user.masters_groups
     users = [current_user.namespace]
 
-    group_opts = ["Groups", groups.sort_by(&:human_name).map {|g| [display_path ? g.path : g.human_name, g.id]} ]
-    users_opts = [ "Users", users.sort_by(&:human_name).map {|u| [display_path ? u.path : u.human_name, u.id]} ]
+    data_attr_group = { 'data-options-parent' => 'groups' }
+    data_attr_users = { 'data-options-parent' => 'users' }
+
+    group_opts = [
+      "Groups", groups.sort_by(&:human_name).map { |g| [display_path ? g.path : g.human_name, g.id, data_attr_group] }
+    ]
+
+    users_opts = [
+      "Users", users.sort_by(&:human_name).map { |u| [display_path ? u.path : u.human_name, u.id, data_attr_users] }
+    ]
 
     options = []
     options << group_opts
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 2523311213..a4c6094c69 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -19,7 +19,7 @@
             - if current_user.can_select_namespace?
               .input-group-addon
                 = root_url
-              = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user, display_path: true), {}, {class: 'select2', tabindex: 1}
+              = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user, display_path: true), {}, {class: 'select2 js-select-namespace', tabindex: 1}
               .input-group-addon
                 \/
             - else

From dc39c8372d760eceba50a35505dad8663b9e851e Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 15:43:29 +0200
Subject: [PATCH 197/283] Adapt tests to new testing guidelines

---
 lib/api/notes.rb                           |  2 ++
 spec/requests/api/notes_spec.rb            | 12 ++++++------
 spec/services/notes/delete_service_spec.rb |  9 ++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 2ed986b9ec..a1c98f5e8f 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -124,7 +124,9 @@ module API
         delete ":id/#{noteables_str}/:#{noteable_id_str}/notes/:note_id" do
           note = user_project.notes.find(params[:note_id])
           authorize! :admin_note, note
+
           ::Notes::DeleteService.new(user_project, current_user).execute(note)
+
           present note, with: Entities::Note
         end
       end
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index b35e67b5bd..a467bc935a 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -243,7 +243,7 @@ describe API::API, api: true  do
 
   describe 'DELETE /projects/:id/noteable/:noteable_id/notes/:note_id' do
     context 'when noteable is an Issue' do
-      it 'should delete a note' do
+      it 'deletes a note' do
         delete api("/projects/#{project.id}/issues/#{issue.id}/"\
                    "notes/#{issue_note.id}", user)
 
@@ -254,7 +254,7 @@ describe API::API, api: true  do
         expect(response.status).to eq(404)
       end
 
-      it 'should return a 404 error when note id not found' do
+      it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/issues/#{issue.id}/notes/123", user)
 
         expect(response.status).to eq(404)
@@ -262,7 +262,7 @@ describe API::API, api: true  do
     end
 
     context 'when noteable is a Snippet' do
-      it 'should delete a note' do
+      it 'deletes a note' do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/#{snippet_note.id}", user)
 
@@ -273,7 +273,7 @@ describe API::API, api: true  do
         expect(response.status).to eq(404)
       end
 
-      it 'should return a 404 error when note id not found' do
+      it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\
                    "notes/123", user)
 
@@ -282,7 +282,7 @@ describe API::API, api: true  do
     end
 
     context 'when noteable is a Merge Request' do
-      it 'should delete a note' do
+      it 'deletes a note' do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/#{merge_request_note.id}", user)
 
@@ -293,7 +293,7 @@ describe API::API, api: true  do
         expect(response.status).to eq(404)
       end
 
-      it 'should return a 404 error when note id not found' do
+      it 'returns a 404 error when note id not found' do
         delete api("/projects/#{project.id}/merge_requests/"\
                    "#{merge_request.id}/notes/123", user)
 
diff --git a/spec/services/notes/delete_service_spec.rb b/spec/services/notes/delete_service_spec.rb
index 07aa57c464..1d0a747a48 100644
--- a/spec/services/notes/delete_service_spec.rb
+++ b/spec/services/notes/delete_service_spec.rb
@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Notes::DeleteService, services: true do
-  let(:project) { create(:empty_project) }
-  let(:issue) { create(:issue, project: project) }
-  let(:note) { create(:note, project: project, noteable: issue) }
-
   describe '#execute' do
     it 'deletes a note' do
-      project = note.project
+      project = create(:empty_project)
+      issue = create(:issue, project: project)
+      note = create(:note, project: project, noteable: issue)
+
       described_class.new(project, note.author).execute(note)
 
       expect(project.issues.find(issue.id).notes).not_to include(note)

From d0cdc2ee73c8421906fbd011d0f44d638616a864 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Thu, 7 Apr 2016 10:12:49 +0200
Subject: [PATCH 198/283] API: Ability to update a group

---
 CHANGELOG                        |  1 +
 doc/api/groups.md                | 81 ++++++++++++++++++++++++++++++++
 lib/api/groups.rb                | 30 +++++++++++-
 spec/requests/api/groups_spec.rb | 36 ++++++++++++++
 4 files changed, 146 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 593e8f77ab..ac686c4bde 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.7.0 (unreleased)
   - Make HTTP(s) label consistent on clone bar (Stan Hu)
   - Expose label description in API (Mariusz Jachimowicz)
   - Allow back dating on issues when created through the API
+  - API: Ability to update a group (Robert Schilling)
   - Fix Error 500 after renaming a project path (Stan Hu)
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
diff --git a/doc/api/groups.md b/doc/api/groups.md
index d1b5c9f5f0..59046190d0 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -126,6 +126,87 @@ Parameters:
 - `id` (required) - The ID or path of a group
 - `project_id` (required) - The ID of a project
 
+## Update group
+
+Updates the project group. Only available to group owners and administrators.
+
+```
+PUT /groups/:id
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of the group |
+| `name` | string | no | The name of the group |
+| `path` | string | no | The path of the group |
+| `description` | string | no | The description of the group |
+| `visibility_level` | integer | no | The visibility_level of the group. 0 for private, 10 for internal, 20 for public. |
+
+```bash
+curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/groups/5?name=Experimental"
+
+```
+
+Example response:
+
+```json
+{
+  "id": 5,
+  "name": "Experimental",
+  "path": "h5bp",
+  "description": "foo",
+  "visibility_level": 10,
+  "avatar_url": null,
+  "web_url": "http://gitlab.example.com/groups/h5bp",
+  "projects": [
+    {
+      "id": 9,
+      "description": "foo",
+      "default_branch": "master",
+      "tag_list": [],
+      "public": false,
+      "archived": false,
+      "visibility_level": 10,
+      "ssh_url_to_repo": "git@gitlab.example.com/html5-boilerplate.git",
+      "http_url_to_repo": "http://gitlab.example.com/h5bp/html5-boilerplate.git",
+      "web_url": "http://gitlab.example.com/h5bp/html5-boilerplate",
+      "name": "Html5 Boilerplate",
+      "name_with_namespace": "Experimental / Html5 Boilerplate",
+      "path": "html5-boilerplate",
+      "path_with_namespace": "h5bp/html5-boilerplate",
+      "issues_enabled": true,
+      "merge_requests_enabled": true,
+      "wiki_enabled": true,
+      "builds_enabled": true,
+      "snippets_enabled": true,
+      "created_at": "2016-04-05T21:40:50.169Z",
+      "last_activity_at": "2016-04-06T16:52:08.432Z",
+      "shared_runners_enabled": true,
+      "creator_id": 1,
+      "namespace": {
+        "id": 5,
+        "name": "Experimental",
+        "path": "h5bp",
+        "owner_id": null,
+        "created_at": "2016-04-05T21:40:49.152Z",
+        "updated_at": "2016-04-07T08:07:48.466Z",
+        "description": "foo",
+        "avatar": {
+          "url": null
+        },
+        "share_with_group_lock": false,
+        "visibility_level": 10
+      },
+      "avatar_url": null,
+      "star_count": 1,
+      "forks_count": 0,
+      "open_issues_count": 3,
+      "public_builds": true
+    }
+  ]
+}
+```
+
 ## Remove group
 
 Removes group with all projects inside.
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index c165de21a7..964f691afc 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -23,8 +23,10 @@ module API
       # Create group. Available only for users who can create groups.
       #
       # Parameters:
-      #   name (required) - The name of the group
-      #   path (required) - The path of the group
+      #   name (required)             - The name of the group
+      #   path (required)             - The path of the group
+      #   description (optional)      - The description of the group
+      #   visibility_level (optional) - The visibility level of the group
       # Example Request:
       #   POST /groups
       post do
@@ -42,6 +44,30 @@ module API
         end
       end
 
+      # Update group. Available only for users who can administrate groups.
+      #
+      # Parameters:
+      #   id (required)                - The ID of a group
+      #   path (optional)             - The path of the group
+      #   description (optional)      - The description of the group
+      #   visibility_level (optional) - The visibility level of the group
+      # Example Request:
+      #   PUT /groups/:id
+      put ':id' do
+        group = find_group(params[:id])
+        authorize! :admin_group, group
+
+        attrs = attributes_for_keys [:name, :path, :description, :visibility_level]
+
+        ::Groups::UpdateService.new(group, current_user, attrs).execute
+
+        if group.errors.any?
+          render_validation_error!(group)
+        else
+          present group, with: Entities::GroupDetail
+        end
+      end
+
       # Get a single group, with containing projects
       #
       # Parameters:
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 41c9cacd45..e7ccbff7ae 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -97,6 +97,42 @@ describe API::API, api: true  do
     end
   end
 
+  describe 'PUT /groups/:id' do
+    let(:new_group_name) { 'New Group'}
+
+    context "when authenticated the group owner" do
+      it 'updates the group' do
+        put api("/groups/#{group1.id}", user1), name: new_group_name
+
+        expect(response.status).to eq(200)
+        expect(json_response['name']).to eq(new_group_name)
+      end
+
+      it 'returns 404 for a non existing group' do
+        put api('/groups/1328', user1)
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when authenticated the admin" do
+      it 'updates the group' do
+        put api("/groups/#{group1.id}", admin), name: new_group_name
+
+        expect(response.status).to eq(200)
+        expect(json_response['name']).to eq(new_group_name)
+      end
+    end
+
+    context "when authenticated an user" do
+      it 'updates the group' do
+        put api("/groups/#{group1.id}", user2), name: new_group_name
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
   describe "GET /groups/:id/projects" do
     context "when authenticated as user" do
       it "should return the group's projects" do

From 435892ed4398afb67043c62be8831df07d2078f2 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 12 Apr 2016 16:07:58 +0200
Subject: [PATCH 199/283] Changelog entry for service class instrumentation

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

diff --git a/CHANGELOG b/CHANGELOG
index c08b148c3a..f4f864b301 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.7.0 (unreleased)
+  - All service classes (those residing in app/services) are now instrumented (Yorick Peterse)
   - Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
   - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).

From c87068658924d170f7eea787c7f924ef42d288a6 Mon Sep 17 00:00:00 2001
From: Jeroen Bobbeldijk <jeroen@vdmi.nl>
Date: Tue, 12 Apr 2016 16:44:12 +0200
Subject: [PATCH 200/283] Add my name

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

diff --git a/CHANGELOG b/CHANGELOG
index a53a0615ca..e77b659f26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,7 +36,7 @@ v 8.7.0 (unreleased)
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
 
 v 8.6.6
-  - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654
+  - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk)
 
 v 8.6.5
   - Fix importing from GitHub Enterprise. !3529

From ef22b76b732c2bf4ce52b8a73570ac2921f9caa4 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 11 Apr 2016 19:33:26 -0300
Subject: [PATCH 201/283] Simplify Projects::NotificationSettingsController

---
 .../projects/notification_settings_controller.rb           | 7 -------
 app/views/projects/buttons/_notifications.html.haml        | 2 +-
 config/routes.rb                                           | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects/notification_settings_controller.rb b/app/controllers/projects/notification_settings_controller.rb
index e536725c5b..7d81cc03c7 100644
--- a/app/controllers/projects/notification_settings_controller.rb
+++ b/app/controllers/projects/notification_settings_controller.rb
@@ -1,13 +1,6 @@
 class Projects::NotificationSettingsController < Projects::ApplicationController
   before_action :authenticate_user!
 
-  def create
-    notification_setting = current_user.notification_settings_for(project)
-    saved = notification_setting.update_attributes(notification_setting_params)
-
-    render json: { saved: saved }
-  end
-
   def update
     notification_setting = current_user.notification_settings_for(project)
     saved = notification_setting.update_attributes(notification_setting_params)
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index 49f541399f..c1e3e5b73a 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -1,5 +1,5 @@
 - if @notification_setting
-  = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
+  = 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
       %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
diff --git a/config/routes.rb b/config/routes.rb
index 552385110d..48601b7567 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -608,7 +608,7 @@ Rails.application.routes.draw do
 
         resources :forks, only: [:index, :new, :create]
         resource :import, only: [:new, :create, :show]
-        resource :notification_setting, only: [:create, :update]
+        resource :notification_setting, only: [:update]
 
         resources :refs, only: [] do
           collection do

From aabb466e5b35477b39cc57642083df361cd5d112 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 11 Apr 2016 19:54:13 -0300
Subject: [PATCH 202/283] Improve specs for group/project notification
 controller

---
 .../notification_settings_controller_spec.rb  | 17 +++++++-
 .../notification_settings_controller_spec.rb  | 39 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/groups/notification_settings_controller_spec.rb b/spec/controllers/groups/notification_settings_controller_spec.rb
index 3572535d61..0786e45515 100644
--- a/spec/controllers/groups/notification_settings_controller_spec.rb
+++ b/spec/controllers/groups/notification_settings_controller_spec.rb
@@ -2,16 +2,31 @@ require 'spec_helper'
 
 describe Groups::NotificationSettingsController do
   let(:group) { create(:group) }
+  let(:user) { create(:user) }
 
   describe '#update' do
     context 'when not authorized' do
       it 'redirects to sign in page' do
         put :update,
             group_id: group.to_param,
-            notification_setting: { level: NotificationSetting.levels[:participating] }
+            notification_setting: { level: :participating }
 
         expect(response).to redirect_to(new_user_session_path)
       end
     end
+
+    context 'when authorized' do
+      before do
+        sign_in(user)
+      end
+
+      it 'returns success' do
+        put :update,
+            group_id: group.to_param,
+            notification_setting: { level: :participating }
+
+        expect(response.status).to eq 200
+      end
+    end
   end
 end
diff --git a/spec/controllers/projects/notification_settings_controller_spec.rb b/spec/controllers/projects/notification_settings_controller_spec.rb
index 7e32a75b81..385877a26d 100644
--- a/spec/controllers/projects/notification_settings_controller_spec.rb
+++ b/spec/controllers/projects/notification_settings_controller_spec.rb
@@ -2,6 +2,11 @@ require 'spec_helper'
 
 describe Projects::NotificationSettingsController do
   let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.team << [user, :developer]
+  end
 
   describe '#create' do
     context 'when not authorized' do
@@ -9,11 +14,26 @@ describe Projects::NotificationSettingsController do
         post :create,
              namespace_id: project.namespace.to_param,
              project_id: project.to_param,
-             notification_setting: { level: NotificationSetting.levels[:participating] }
+             notification_setting: { level: :participating }
 
         expect(response).to redirect_to(new_user_session_path)
       end
     end
+
+    context 'when authorized' do
+      before do
+        sign_in(user)
+      end
+
+      it 'returns success' do
+        post :create,
+            namespace_id: project.namespace.to_param,
+            project_id: project.to_param,
+            notification_setting: { level: :participating }
+
+        expect(response.status).to eq 200
+      end
+    end
   end
 
   describe '#update' do
@@ -22,10 +42,25 @@ describe Projects::NotificationSettingsController do
         put :update,
             namespace_id: project.namespace.to_param,
             project_id: project.to_param,
-            notification_setting: { level: NotificationSetting.levels[:participating] }
+            notification_setting: { level: :participating }
 
         expect(response).to redirect_to(new_user_session_path)
       end
     end
+
+    context 'when authorized' do
+      before do
+        sign_in(user)
+      end
+
+      it 'returns success' do
+        put :update,
+            namespace_id: project.namespace.to_param,
+            project_id: project.to_param,
+            notification_setting: { level: :participating }
+
+        expect(response.status).to eq 200
+      end
+    end
   end
 end

From cba2c437e582dd5880ec45cc4ff2fccda2315ad5 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 11 Apr 2016 15:38:36 -0400
Subject: [PATCH 203/283] Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105
---
 app/controllers/projects/repositories_controller.rb | 1 -
 config/gitlab.yml.example                           | 3 +++
 config/initializers/1_settings.rb                   | 3 +++
 lib/api/repositories.rb                             | 1 -
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 5c7614cfba..bb7a6b6a5a 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -11,7 +11,6 @@ class Projects::RepositoriesController < Projects::ApplicationController
   end
 
   def archive
-    RepositoryArchiveCacheWorker.perform_async
     headers.store(*Gitlab::Workhorse.send_git_archive(@project, params[:ref], params[:format]))
     head :ok
   rescue => ex
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 35c7c425a5..1a512a2227 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -156,6 +156,9 @@ production: &base
     stuck_ci_builds_worker:
       cron: "0 0 * * *"
 
+    # Remove outdated repository archives
+    repository_archive_cache_worker:
+      cron: "0 * * * *"
 
   #
   # 2. GitLab CI settings
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 72c4d8d61c..ca74349e85 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -239,6 +239,9 @@ Settings['cron_jobs'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
 Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker'
+Settings.cron_jobs['repository_archive_cache_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['repository_archive_cache_worker']['cron'] ||= '0 * * * *'
+Settings.cron_jobs['repository_archive_cache_worker']['job_class'] = 'RepositoryArchiveCacheWorker'
 
 
 #
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 0d0f0d4616..62161aadb9 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -98,7 +98,6 @@ module API
         authorize! :download_code, user_project
 
         begin
-          RepositoryArchiveCacheWorker.perform_async
           header *Gitlab::Workhorse.send_git_archive(user_project, params[:sha], params[:format])
         rescue
           not_found!('File')

From 61a62e00e3b08e6ed962b029564e3a2446e169fd Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 12 Apr 2016 12:57:39 -0300
Subject: [PATCH 204/283] Fix specs for
 Projects::NotificationSettingsController

---
 .../notification_settings_controller_spec.rb  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/spec/controllers/projects/notification_settings_controller_spec.rb b/spec/controllers/projects/notification_settings_controller_spec.rb
index 385877a26d..4908b54564 100644
--- a/spec/controllers/projects/notification_settings_controller_spec.rb
+++ b/spec/controllers/projects/notification_settings_controller_spec.rb
@@ -8,34 +8,6 @@ describe Projects::NotificationSettingsController do
     project.team << [user, :developer]
   end
 
-  describe '#create' do
-    context 'when not authorized' do
-      it 'redirects to sign in page' do
-        post :create,
-             namespace_id: project.namespace.to_param,
-             project_id: project.to_param,
-             notification_setting: { level: :participating }
-
-        expect(response).to redirect_to(new_user_session_path)
-      end
-    end
-
-    context 'when authorized' do
-      before do
-        sign_in(user)
-      end
-
-      it 'returns success' do
-        post :create,
-            namespace_id: project.namespace.to_param,
-            project_id: project.to_param,
-            notification_setting: { level: :participating }
-
-        expect(response.status).to eq 200
-      end
-    end
-  end
-
   describe '#update' do
     context 'when not authorized' do
       it 'redirects to sign in page' do

From 061370790e415361c920e1404063955f4932e5ef Mon Sep 17 00:00:00 2001
From: Charles May <ctmay4@gmail.com>
Date: Tue, 5 Jan 2016 21:26:31 +0000
Subject: [PATCH 205/283] Fix a bug with trailing slash in teamcity_url

See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
---
 CHANGELOG                                     |  3 ++
 .../project_services/teamcity_service.rb      | 31 +++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3561c541df..c6ca0ea3de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -123,6 +123,9 @@ v 8.6.0
   - Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation (Pat Turner)
   - HTTP error pages work independently from location and config (Artem Sidorenko)
   - Update `omniauth-saml` to 1.5.0 to allow for custom response attributes to be set
+  - Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
+  - Fix a bug whith trailing slash in teamcity_url (Charles May)
+  - Don't load all of GitLab in mail_room
   - Memoize @group in Admin::GroupsController (Yatish Mehta)
   - Indicate how much an MR diverged from the target branch (Pierre de La Morinerie)
   - Added omniauth-auth0 Gem (Daniel Carraro)
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index b8e9416131..246c5eb4a8 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -85,13 +85,15 @@ class TeamcityService < CiService
   end
 
   def build_info(sha)
-    url = URI.parse("#{teamcity_url}/httpAuth/app/rest/builds/"\
-                    "branch:unspecified:any,number:#{sha}")
+    url = URI.join(
+      teamcity_url,
+      "/httpAuth/app/rest/builds/branch:unspecified:any,number:#{sha}"
+    ).to_s
     auth = {
       username: username,
       password: password,
     }
-    @response = HTTParty.get("#{url}", verify: false, basic_auth: auth)
+    @response = HTTParty.get(url, verify: false, basic_auth: auth)
   end
 
   def build_page(sha, ref)
@@ -100,12 +102,14 @@ class TeamcityService < CiService
     if @response.code != 200
       # If actual build link can't be determined,
       # send user to build summary page.
-      "#{teamcity_url}/viewLog.html?buildTypeId=#{build_type}"
+      URI.join(teamcity_url, "/viewLog.html?buildTypeId=#{build_type}").to_s
     else
       # If actual build link is available, go to build result page.
       built_id = @response['build']['id']
-      "#{teamcity_url}/viewLog.html?buildId=#{built_id}"\
-      "&buildTypeId=#{build_type}"
+      URI.join(
+        teamcity_url,
+        "#{teamcity_url}/viewLog.html?buildId=#{built_id}&buildTypeId=#{build_type}"
+      ).to_s
     end
   end
 
@@ -140,12 +144,13 @@ class TeamcityService < CiService
 
     branch = Gitlab::Git.ref_name(data[:ref])
 
-    self.class.post("#{teamcity_url}/httpAuth/app/rest/buildQueue",
-                    body: "<build branchName=\"#{branch}\">"\
-                          "<buildType id=\"#{build_type}\"/>"\
-                          '</build>',
-                    headers: { 'Content-type' => 'application/xml' },
-                    basic_auth: auth
-                   )
+    self.class.post(
+      URI.join(teamcity_url, "/httpAuth/app/rest/buildQueue").to_s,
+      body: "<build branchName=\"#{branch}\">"\
+            "<buildType id=\"#{build_type}\"/>"\
+            '</build>',
+      headers: { 'Content-type' => 'application/xml' },
+      basic_auth: auth
+    )
   end
 end

From 5fb572417e0c331afb62c8bbaa561b0fe7836fc5 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 19:08:35 +0200
Subject: [PATCH 206/283] Fix minor issues according development guidelines

---
 doc/api/groups.md                |  2 +-
 lib/api/groups.rb                | 10 ++++------
 spec/requests/api/groups_spec.rb | 16 ++++++++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/doc/api/groups.md b/doc/api/groups.md
index 59046190d0..2821bc21b8 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -140,7 +140,7 @@ PUT /groups/:id
 | `name` | string | no | The name of the group |
 | `path` | string | no | The path of the group |
 | `description` | string | no | The description of the group |
-| `visibility_level` | integer | no | The visibility_level of the group. 0 for private, 10 for internal, 20 for public. |
+| `visibility_level` | integer | no | The visibility level of the group. 0 for private, 10 for internal, 20 for public. |
 
 ```bash
 curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/groups/5?name=Experimental"
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 964f691afc..91e420832f 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -47,7 +47,7 @@ module API
       # Update group. Available only for users who can administrate groups.
       #
       # Parameters:
-      #   id (required)                - The ID of a group
+      #   id (required)               - The ID of a group
       #   path (optional)             - The path of the group
       #   description (optional)      - The description of the group
       #   visibility_level (optional) - The visibility level of the group
@@ -59,12 +59,10 @@ module API
 
         attrs = attributes_for_keys [:name, :path, :description, :visibility_level]
 
-        ::Groups::UpdateService.new(group, current_user, attrs).execute
-
-        if group.errors.any?
-          render_validation_error!(group)
-        else
+        if ::Groups::UpdateService.new(group, current_user, attrs).execute
           present group, with: Entities::GroupDetail
+        else
+          render_validation_error!(group)
         end
       end
 
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index e7ccbff7ae..7383c7d11a 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -100,7 +100,7 @@ describe API::API, api: true  do
   describe 'PUT /groups/:id' do
     let(:new_group_name) { 'New Group'}
 
-    context "when authenticated the group owner" do
+    context 'when authenticated as the group owner' do
       it 'updates the group' do
         put api("/groups/#{group1.id}", user1), name: new_group_name
 
@@ -115,7 +115,7 @@ describe API::API, api: true  do
       end
     end
 
-    context "when authenticated the admin" do
+    context 'when authenticated as the admin' do
       it 'updates the group' do
         put api("/groups/#{group1.id}", admin), name: new_group_name
 
@@ -124,13 +124,21 @@ describe API::API, api: true  do
       end
     end
 
-    context "when authenticated an user" do
-      it 'updates the group' do
+    context 'when authenticated as an user that can see the group' do
+      it 'does not updates the group' do
         put api("/groups/#{group1.id}", user2), name: new_group_name
 
         expect(response.status).to eq(403)
       end
     end
+
+    context 'when authenticated as an user that cannot see the group' do
+      it 'returns 403 when trying to update the group' do
+        put api("/groups/#{group2.id}", user1), name: new_group_name
+
+        expect(response.status).to eq(403)
+      end
+    end
   end
 
   describe "GET /groups/:id/projects" do

From dca50ac1d4a6da5724b66643bcb18a4a2e3f5558 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 22 Mar 2016 11:33:38 +0000
Subject: [PATCH 207/283] Project dropdown in header uses new dropdown

---
 app/assets/javascripts/gl_dropdown.js.coffee  |  4 ++-
 .../javascripts/project_select.js.coffee      | 32 +++++++++++++++++++
 app/assets/stylesheets/framework/header.scss  |  5 +++
 app/helpers/projects_helper.rb                | 14 ++------
 app/views/layouts/header/_default.html.haml   |  2 ++
 app/views/layouts/project.html.haml           |  7 ++++
 6 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index ee1d0fad28..2dc37257e2 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -122,7 +122,9 @@ class GitLabDropdown
   FILTER_INPUT = '.dropdown-input .dropdown-input-field'
 
   constructor: (@el, @options) ->
-    @dropdown = $(@el).parent()
+    self = @
+    selector = $(@el).data "target"
+    @dropdown = if selector? then $(selector) else $(@el).parent()
 
     # Set Defaults
     {
diff --git a/app/assets/javascripts/project_select.js.coffee b/app/assets/javascripts/project_select.js.coffee
index be8ab9b428..704bd8dee5 100644
--- a/app/assets/javascripts/project_select.js.coffee
+++ b/app/assets/javascripts/project_select.js.coffee
@@ -1,5 +1,37 @@
 class @ProjectSelect
   constructor: ->
+    $('.js-projects-dropdown-toggle').each (i, dropdown) ->
+      $dropdown = $(dropdown)
+
+      $dropdown.glDropdown(
+        filterable: true
+        filterRemote: true
+        search:
+          fields: ['name_with_namespace']
+        data: (term, callback) ->
+          finalCallback = (projects) ->
+            callback projects
+
+          if @includeGroups
+            projectsCallback = (projects) ->
+              groupsCallback = (groups) ->
+                data = groups.concat(projects)
+                finalCallback(data)
+
+              Api.groups term, false, groupsCallback
+          else
+            projectsCallback = finalCallback
+
+          if @groupId
+            Api.groupProjects @groupId, term, projectsCallback
+          else
+            Api.projects term, @orderBy, projectsCallback
+        url: (project) ->
+          project.web_url
+        text: (project) ->
+          project.name_with_namespace
+      )
+
     $('.ajax-project-select').each (i, select) ->
       @groupId = $(select).data('group-id')
       @includeGroups = $(select).data('include-groups')
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index b3397d1601..3f015427d0 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -69,6 +69,7 @@ header {
   }
 
   .header-content {
+    position: relative;
     height: $header-height;
     padding-right: 20px;
 
@@ -76,6 +77,10 @@ header {
       padding-right: 0;
     }
 
+    .dropdown-menu {
+      margin-top: -5px;
+    }
+
     .title {
       margin: 0;
       font-size: 19px;
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4e4c6e301d..3621b943f3 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,18 +65,8 @@ module ProjectsHelper
         link_to(simple_sanitize(owner.name), user_path(owner))
       end
 
-    project_link = link_to project_path(project), { class: "project-item-select-holder" } do
-      link_output = simple_sanitize(project.name)
-
-      if current_user
-        link_output += project_select_tag :project_path,
-          class: "project-item-select js-projects-dropdown",
-          data: { include_groups: false, order_by: 'last_activity_at' }
-      end
-
-      link_output
-    end
-    project_link += icon "chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle" if current_user
+    project_link = link_to simple_sanitize(project.name), project_path(project), { class: "project-item-select-holder"}
+    project_link += icon "chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".header-content", toggle: "dropdown" }  if current_user
 
     full_title = namespace_link + ' / ' + project_link
     full_title += ' &middot; '.html_safe + link_to(simple_sanitize(name), url) if name
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 0f3b811937..4433929309 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -45,6 +45,8 @@
 
       %h1.title= title
 
+      = yield :header_content
+
 = render 'shared/outdated_browser'
 
 - if @project && !@project.empty_repo?
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index a7ef31acd3..35be616b17 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -17,4 +17,11 @@
 - content_for :scripts_body do
   = render "layouts/init_auto_complete" if current_user
 
+- content_for :header_content do
+  .dropdown-menu.dropdown-select
+    = dropdown_title("Go to a project")
+    = dropdown_filter("Search your projects")
+    = dropdown_content
+    = dropdown_loading
+
 = render template: "layouts/application"

From f870857dddd7630dc19a77ded7784a2261e046e3 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 24 Mar 2016 16:28:46 +0000
Subject: [PATCH 208/283] Updated tests

---
 app/helpers/projects_helper.rb      | 2 +-
 app/views/layouts/project.html.haml | 2 +-
 spec/features/projects_spec.rb      | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3621b943f3..83ebc12417 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,7 +65,7 @@ module ProjectsHelper
         link_to(simple_sanitize(owner.name), user_path(owner))
       end
 
-    project_link = link_to simple_sanitize(project.name), project_path(project), { class: "project-item-select-holder"}
+    project_link = link_to simple_sanitize(project.name), project_path(project), { class: "project-item-select-holder" }
     project_link += icon "chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".header-content", toggle: "dropdown" }  if current_user
 
     full_title = namespace_link + ' / ' + project_link
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 35be616b17..2c5911fa2f 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -18,7 +18,7 @@
   = render "layouts/init_auto_complete" if current_user
 
 - content_for :header_content do
-  .dropdown-menu.dropdown-select
+  .dropdown-menu.dropdown-select.dropdown-menu-projects
     = dropdown_title("Go to a project")
     = dropdown_filter("Search your projects")
     = dropdown_content
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index ed97b6cb57..782c0bfe66 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -100,8 +100,7 @@ feature 'Project', feature: true do
 
     it 'click toggle and show dropdown', js: true do
       find('.js-projects-dropdown-toggle').click
-      wait_for_ajax
-      expect(page).to have_css('.select2-results li', count: 1)
+      expect(page).to have_css('.dropdown-menu-projects .dropdown-content li', count: 1)
     end
   end
 

From 14b124faca9518167798069aaaedbcc67994dd2f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 29 Mar 2016 13:21:22 +0100
Subject: [PATCH 209/283] Tests update

---
 .../fixtures/project_title.html.haml          | 26 ++++++++++++++-----
 spec/javascripts/project_title_spec.js.coffee | 20 ++++----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/spec/javascripts/fixtures/project_title.html.haml b/spec/javascripts/fixtures/project_title.html.haml
index e5850b6265..3696f241c2 100644
--- a/spec/javascripts/fixtures/project_title.html.haml
+++ b/spec/javascripts/fixtures/project_title.html.haml
@@ -1,7 +1,19 @@
-%h1.title
-  %a
-    GitLab Org
-  %a.project-item-select-holder{href: "/gitlab-org/gitlab-test"}
-    GitLab Test
-    %input#project_path.project-item-select.js-projects-dropdown.ajax-project-select{type: "hidden", name: "project_path", "data-include-groups" => "false"}
-  %i.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle
+.header-content
+  %h1.title
+    %a
+      GitLab Org
+    %a.project-item-select-holder{href: "/gitlab-org/gitlab-test"}
+      GitLab Test
+    %i.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle{ "data-toggle" => "dropdown", "data-target" => ".header-content" }
+  .dropdown-menu.dropdown-select.dropdown-menu-projects
+    .dropdown-title
+      %span Go to a project
+      %button.dropdown-title-button.dropdown-menu-close{"aria-label" => "Close", type: "button"}
+        %i.fa.fa-times.dropdown-menu-close-icon
+    .dropdown-input
+      %input.dropdown-input-field{id: "", placeholder: "Search your projects", type: "search", value: ""}
+      %i.fa.fa-search.dropdown-input-search
+      %i.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear{role: "button"}
+    .dropdown-content
+    .dropdown-loading
+      %i.fa.fa-spinner.fa-spin
diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee
index 47c7b7febe..3d8de2ff98 100644
--- a/spec/javascripts/project_title_spec.js.coffee
+++ b/spec/javascripts/project_title_spec.js.coffee
@@ -1,4 +1,6 @@
+#= require bootstrap
 #= require select2
+#= require gl_dropdown
 #= require api
 #= require project_select
 #= require project
@@ -14,9 +16,6 @@ describe 'Project Title', ->
     fixture.load('project_title.html')
     @project = new Project()
 
-    spyOn(@project, 'changeProject').and.callFake (url) ->
-      window.current_project_url = url
-
   describe 'project list', ->
     beforeEach =>
       @projects_data = fixture.load('projects.json')[0]
@@ -29,18 +28,9 @@ describe 'Project Title', ->
 
     it 'to show on toggle click', =>
       $('.js-projects-dropdown-toggle').click()
-
-      expect($('.title .select2-container').hasClass('select2-dropdown-open')).toBe(true)
-      expect($('.ajax-project-dropdown li').length).toBe(@projects_data.length)
+      expect($('.header-content').hasClass('open')).toBe(true)
 
     it 'hide dropdown', ->
-      $("#select2-drop-mask").click()
+      $(".dropdown-menu-close-icon").click()
 
-      expect($('.title .select2-container').hasClass('select2-dropdown-open')).toBe(false)
-
-    it 'change project when clicking item', ->
-      $('.js-projects-dropdown-toggle').click()
-      $('.ajax-project-dropdown li:nth-child(2)').trigger('mouseup')
-
-      expect($('.title .select2-container').hasClass('select2-dropdown-open')).toBe(false)
-      expect(window.current_project_url).toBe('http://localhost:3000/h5bp/html5-boilerplate')
+      expect($('.header-content').hasClass('open')).toBe(false)

From 6416f8eab17556871984118c2dde04714a52bdf6 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 4 Apr 2016 10:44:51 +0100
Subject: [PATCH 210/283] Updated based on Ruby feedback

---
 app/helpers/projects_helper.rb                |  4 +--
 app/views/layouts/project.html.haml           | 11 ++++----
 .../fixtures/project_title.html.haml          | 25 ++++++++++---------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 83ebc12417..cc411da459 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -66,10 +66,10 @@ module ProjectsHelper
       end
 
     project_link = link_to simple_sanitize(project.name), project_path(project), { class: "project-item-select-holder" }
-    project_link += icon "chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".header-content", toggle: "dropdown" }  if current_user
+    project_link << icon("chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".js-dropdown-menu-projects", toggle: "dropdown" }) if current_user
 
     full_title = namespace_link + ' / ' + project_link
-    full_title += ' &middot; '.html_safe + link_to(simple_sanitize(name), url) if name
+    full_title << ' &middot; '.html_safe + link_to(simple_sanitize(name), url) if name
 
     full_title
   end
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 2c5911fa2f..6dfe7fbdae 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -18,10 +18,11 @@
   = render "layouts/init_auto_complete" if current_user
 
 - content_for :header_content do
-  .dropdown-menu.dropdown-select.dropdown-menu-projects
-    = dropdown_title("Go to a project")
-    = dropdown_filter("Search your projects")
-    = dropdown_content
-    = dropdown_loading
+  .js-dropdown-menu-projects
+    .dropdown-menu.dropdown-select.dropdown-menu-projects
+      = dropdown_title("Go to a project")
+      = dropdown_filter("Search your projects")
+      = dropdown_content
+      = dropdown_loading
 
 = render template: "layouts/application"
diff --git a/spec/javascripts/fixtures/project_title.html.haml b/spec/javascripts/fixtures/project_title.html.haml
index 3696f241c2..4547feeb21 100644
--- a/spec/javascripts/fixtures/project_title.html.haml
+++ b/spec/javascripts/fixtures/project_title.html.haml
@@ -5,15 +5,16 @@
     %a.project-item-select-holder{href: "/gitlab-org/gitlab-test"}
       GitLab Test
     %i.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle{ "data-toggle" => "dropdown", "data-target" => ".header-content" }
-  .dropdown-menu.dropdown-select.dropdown-menu-projects
-    .dropdown-title
-      %span Go to a project
-      %button.dropdown-title-button.dropdown-menu-close{"aria-label" => "Close", type: "button"}
-        %i.fa.fa-times.dropdown-menu-close-icon
-    .dropdown-input
-      %input.dropdown-input-field{id: "", placeholder: "Search your projects", type: "search", value: ""}
-      %i.fa.fa-search.dropdown-input-search
-      %i.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear{role: "button"}
-    .dropdown-content
-    .dropdown-loading
-      %i.fa.fa-spinner.fa-spin
+  .js-dropdown-menu-projects
+    .dropdown-menu.dropdown-select.dropdown-menu-projects
+      .dropdown-title
+        %span Go to a project
+        %button.dropdown-title-button.dropdown-menu-close{"aria-label" => "Close", type: "button"}
+          %i.fa.fa-times.dropdown-menu-close-icon
+      .dropdown-input
+        %input.dropdown-input-field{id: "", placeholder: "Search your projects", type: "search", value: ""}
+        %i.fa.fa-search.dropdown-input-search
+        %i.fa.fa-times.dropdown-input-clear.js-dropdown-input-clear{role: "button"}
+      .dropdown-content
+      .dropdown-loading
+        %i.fa.fa-spinner.fa-spin

From 4293485a22bfdbd2afdbb20dcf5d777f379fac87 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 7 Apr 2016 15:20:22 +0100
Subject: [PATCH 211/283] Updated Ruby Added CHANGELOG item

---
 CHANGELOG                      | 1 +
 app/helpers/projects_helper.rb | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 07274ab5c1..d12f703c7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -59,6 +59,7 @@ v 8.6.5
 v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
   - Redesign the Labels page
+  - Project switcher uses new dropdown styling
 
 v 8.6.3
   - Mentions on confidential issues doesn't create todos for non-members. !3374
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index cc411da459..ab77853da1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -66,10 +66,13 @@ module ProjectsHelper
       end
 
     project_link = link_to simple_sanitize(project.name), project_path(project), { class: "project-item-select-holder" }
-    project_link << icon("chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".js-dropdown-menu-projects", toggle: "dropdown" }) if current_user
 
-    full_title = namespace_link + ' / ' + project_link
-    full_title << ' &middot; '.html_safe + link_to(simple_sanitize(name), url) if name
+    if current_user
+      project_link << icon("chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".js-dropdown-menu-projects", toggle: "dropdown" })
+    end
+
+    full_title = namespace_link + ' / ' << project_link
+    full_title << ' &middot; '.html_safe << link_to(simple_sanitize(name), url) if name
 
     full_title
   end

From 63e54f1555f02b93347588fbf332c7521d19d2a6 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 8 Apr 2016 19:44:23 +0100
Subject: [PATCH 212/283] Updated based on Ruby feedback

---
 CHANGELOG                      | 8 ++++++++
 app/helpers/projects_helper.rb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d12f703c7b..ab2ef90fb0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -60,6 +60,14 @@ v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
   - Redesign the Labels page
   - Project switcher uses new dropdown styling
+  - Project switcher uses new dropdown styling
+
+v 8.6.5 (unreleased)
+  - Only update repository language if it is not set to improve performance
+  - Check permissions when user attempts to import members from another project
+
+v 8.6.4
+  - Don't attempt to fetch any tags from a forked repo (Stan Hu)
 
 v 8.6.3
   - Mentions on confidential issues doesn't create todos for non-members. !3374
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ab77853da1..7e00aaccea 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -71,7 +71,7 @@ module ProjectsHelper
       project_link << icon("chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".js-dropdown-menu-projects", toggle: "dropdown" })
     end
 
-    full_title = namespace_link + ' / ' << project_link
+    full_title = "#{namespace_link} / #{project_link}".html_safe
     full_title << ' &middot; '.html_safe << link_to(simple_sanitize(name), url) if name
 
     full_title

From 1ac6bdb5c85f14557ed41b5b81d6ee9d577739a1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 13:23:29 +0100
Subject: [PATCH 213/283] Updated CHANGELOG

---
 CHANGELOG | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ab2ef90fb0..071e35167f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,6 +46,7 @@ v 8.7.0 (unreleased)
 
 v 8.6.6
   - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk)
+  - Project switcher uses new dropdown styling
 
 v 8.6.5
   - Fix importing from GitHub Enterprise. !3529
@@ -59,15 +60,6 @@ v 8.6.5
 v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
   - Redesign the Labels page
-  - Project switcher uses new dropdown styling
-  - Project switcher uses new dropdown styling
-
-v 8.6.5 (unreleased)
-  - Only update repository language if it is not set to improve performance
-  - Check permissions when user attempts to import members from another project
-
-v 8.6.4
-  - Don't attempt to fetch any tags from a forked repo (Stan Hu)
 
 v 8.6.3
   - Mentions on confidential issues doesn't create todos for non-members. !3374

From 38cff18af0ed48bcd5916b6b6bb6ceeb9ab062fd Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 1 Apr 2016 15:04:03 -0700
Subject: [PATCH 214/283] Adjust the default trusted_proxies to only include
 localhost, and allow other trusted proxies to be configured.

---
 config/initializers/1_settings.rb      | 1 +
 config/initializers/trusted_proxies.rb | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 config/initializers/trusted_proxies.rb

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 72c4d8d61c..2167da306f 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -190,6 +190,7 @@ Settings.gitlab.default_projects_features['visibility_level']    = Settings.send
 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']
+Settings.gitlab['trusted_proxies'] ||= []
 
 
 #
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
new file mode 100644
index 0000000000..b8cc025bae
--- /dev/null
+++ b/config/initializers/trusted_proxies.rb
@@ -0,0 +1,2 @@
+Rails.application.config.action_dispatch.trusted_proxies =
+  [ '127.0.0.1', '::1' ] + Array(Gitlab.config.gitlab.trusted_proxies)

From bb372ac97f733c45f22dc31e09b98a78411d4f86 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 6 Apr 2016 06:49:46 -0700
Subject: [PATCH 215/283] Add changelog entries, install docs, and
 gitlab.yml.example entry for the trusted_proxies setting

---
 CHANGELOG                   | 2 ++
 config/gitlab.yml.example   | 9 +++++++++
 doc/install/installation.md | 9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 07274ab5c1..584e60a0e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,8 @@ v 8.7.0 (unreleased)
   - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
   - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
+  - Add setting for customizing the list of trusted proxies !3524
+  - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524
   - 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)
   - Expose project badges in project settings
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 35c7c425a5..56caee47c9 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -46,6 +46,15 @@ production: &base
     #
     # relative_url_root: /gitlab
 
+    # Trusted Proxies
+    # Customize if you have GitLab behind a reverse proxy which is running on a different machine.
+    # Add the IP address for your reverse proxy to the list, otherwise users will appear signed in from that address.
+    trusted_proxies:
+      # Examples:
+      #- 192.168.1.0/24
+      #- 192.168.2.1
+      #- 2001:0db8::/32
+
     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
     # user: git
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index f8f7d6a9eb..bfea4ce193 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -530,6 +530,15 @@ See the [omniauth integration document](../integration/omniauth.md)
 GitLab can build your projects. To enable that feature you need GitLab Runners to do that for you.
 Checkout the [GitLab Runner section](https://about.gitlab.com/gitlab-ci/#gitlab-runner) to install it
 
+### Adding your Trusted Proxies
+
+If you are using a reverse proxy on an separate machine, you may want to add the
+proxy to the trusted proxies list. Otherwise users will appear signed in from the
+proxy's IP address.
+
+You can add trusted proxies in `config/gitlab.yml` by customizing the `trusted_proxies`
+option in section 1. Please restart GitLab after editing this file.
+
 ### Custom Redis Connection
 
 If you'd like Resque to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the `config/resque.yml` file.

From e18f20d7118b7c8f2ff18a6e4255d6c7c0995b04 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Tue, 12 Apr 2016 11:02:41 -0700
Subject: [PATCH 216/283] Updated trusted proxies doc section to link to the
 restart GitLab docs

---
 doc/install/installation.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index bfea4ce193..e721e70a59 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -537,7 +537,8 @@ proxy to the trusted proxies list. Otherwise users will appear signed in from th
 proxy's IP address.
 
 You can add trusted proxies in `config/gitlab.yml` by customizing the `trusted_proxies`
-option in section 1. Please restart GitLab after editing this file.
+option in section 1. Save the file and [reconfigure GitLab](../administration/restart_gitlab.md)
+for the changes to take effect.
 
 ### Custom Redis Connection
 

From 42a391f744a2ea43272483f998395c910153e1d2 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 12 Apr 2016 14:28:07 -0400
Subject: [PATCH 217/283] Update spring and spring-commands-spinach

Spring changelog: https://git.io/vVAUY
---
 Gemfile      | 4 ++--
 Gemfile.lock | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 258b5612cd..199ef65d92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -285,9 +285,9 @@ group :development, :test do
   gem 'teaspoon', '~> 1.1.0'
   gem 'teaspoon-jasmine', '~> 2.2.0'
 
-  gem 'spring', '~> 1.6.4'
+  gem 'spring',                   '~> 1.7.0'
   gem 'spring-commands-rspec',    '~> 1.0.4'
-  gem 'spring-commands-spinach',  '~> 1.0.0'
+  gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
   gem 'rubocop', '~> 0.38.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 9da44a4658..ad7d7c1855 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -769,10 +769,10 @@ GEM
       spinach (>= 0.4)
     spinach-rerun-reporter (0.0.2)
       spinach (~> 0.8)
-    spring (1.6.4)
+    spring (1.7.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-commands-spinach (1.0.0)
+    spring-commands-spinach (1.1.0)
       spring (>= 0.9.1)
     spring-commands-teaspoon (0.0.2)
       spring (>= 0.9.1)
@@ -1030,9 +1030,9 @@ DEPENDENCIES
   slack-notifier (~> 1.2.0)
   spinach-rails (~> 0.2.1)
   spinach-rerun-reporter (~> 0.0.2)
-  spring (~> 1.6.4)
+  spring (~> 1.7.0)
   spring-commands-rspec (~> 1.0.4)
-  spring-commands-spinach (~> 1.0.0)
+  spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
   state_machines-activerecord (~> 0.3.0)

From a64f1c763615c049e551c82a9f3a7c53525a172c Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Tue, 12 Apr 2016 15:39:33 -0300
Subject: [PATCH 218/283] Add changelog entry, improve specs and model code

---
 CHANGELOG                                           |  1 +
 app/models/merge_request.rb                         | 13 ++++---------
 .../projects/merge_requests_controller_spec.rb      |  9 ++++-----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 54d79259b3..cf84ce8116 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.7.0 (unreleased)
   - Add links to CI setup documentation from project settings and builds pages
   - Handle nil descriptions in Slack issue messages (Stan Hu)
   - Add default scope to projects to exclude projects pending deletion
+  - Allow to close merge requests which source projects(forks) are deleted.
   - Ensure empty recipients are rejected in BuildsEmailService
   - API: Ability to filter milestones by state `active` and `closed` (Robert Schilling)
   - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 8292445bca..e410febdff 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base
   validates :target_project, presence: true
   validates :target_branch, presence: true
   validates :merge_user, presence: true, if: :merge_when_build_succeeds?
-  validate :validate_branches
+  validate :validate_branches, unless: :allow_broken
   validate :validate_fork
 
   scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
@@ -213,14 +213,12 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def validate_branches
-    return if allow_broken
-
     if target_project == source_project && target_branch == source_branch
       errors.add :branch_conflict, "You can not use same project/branch for source and target"
     end
 
     if opened? || reopened?
-      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.id).opened
+      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
       similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
       if similar_mrs.any?
         errors.add :validate_branches,
@@ -346,12 +344,9 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def hook_attrs
-    source_hook_attrs = source_project.hook_attrs if source_project.present?
-    target_hook_attrs = target_project.hook_attrs if target_project.present?
-
     attrs = {
-      source: source_hook_attrs,
-      target: target_hook_attrs,
+      source: source_project.try(:hook_attrs),
+      target: target_project.hook_attrs,
       last_commit: nil,
       work_in_progress: work_in_progress?
     }
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 0f2cd34132..c54e83339a 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -159,19 +159,18 @@ describe Projects::MergeRequestsController do
 
   describe 'PUT #update' do
     context 'there is no source project' do
-      let(:project) { create(:project) }
-      let(:fork_project) { create(:forked_project_with_submodules) }
-      let(:merge_request) { create(:merge_request_with_diffs, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
+      let(:project)       { create(:project) }
+      let(:fork_project)  { create(:forked_project_with_submodules) }
+      let(:merge_request) { create(:merge_request, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
 
       before do
         fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
         fork_project.save
         merge_request.reload
+        fork_project.destroy
       end
 
       it 'closes MR without errors' do
-        fork_project.destroy
-
         post :update,
             namespace_id: project.namespace.path,
             project_id: project.path,

From 447f3613b78ac4ba4ad6bda1811447b48e126b0c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 8 Apr 2016 15:48:18 -0700
Subject: [PATCH 219/283] Wrap text in notes box if longer than code in diff

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

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 7295fe5112..88ba5e53a0 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -155,6 +155,7 @@ ul.notes {
       border-width: 1px 0;
       padding: 0;
       vertical-align: top;
+      white-space: normal;
       &.parallel {
         border-width: 1px;
       }

From d3ff7ca0846a88961d3f954c62398c54aa69c059 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 11 Apr 2016 10:00:45 -0500
Subject: [PATCH 220/283] Input updates

---
 .../stylesheets/pages/merge_requests.scss     |  1 +
 app/assets/stylesheets/pages/note_form.scss   | 22 ++++++++++++-
 app/assets/stylesheets/pages/notes.scss       | 31 ++++++++++++++++---
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index b79335eab9..4ef548ffbe 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -142,6 +142,7 @@
   overflow: hidden;
   font-size: 90%;
   margin: 0 3px;
+  word-break: break-all;
 }
 
 .mr-list {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 4d4d508396..5e5722c2c3 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -16,6 +16,7 @@
   .new-note {
     margin: 0;
     border: none;
+    border-right: 1px solid $table-border-gray;
   }
 }
 
@@ -71,12 +72,25 @@
         border-color: $focus-border-color;
       }
     }
+
+    p {
+      code {
+        white-space: normal;
+      }
+
+      pre {
+        code {
+          white-space: pre;
+        }
+      }
+    }
   }
 }
 
 .discussion-form {
   padding: $gl-padding-top $gl-padding;
-  background-color: #fff;
+  background-color: $white-light;
+  border-right: 1px solid $table-border-gray;
 }
 
 .note-edit-form {
@@ -118,7 +132,13 @@
 
   .discussion-reply-holder {
     background-color: $white-light;
+    border-right: 1px solid $table-border-gray;
     padding: 10px 16px;
+    max-width: 800px;
+
+    .new-note {
+      border-right: none;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 88ba5e53a0..07dd029245 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -81,9 +81,15 @@ ul.notes {
         @include md-typography;
 
         // On diffs code should wrap nicely and not overflow
-        pre {
+        p {
           code {
-            white-space: pre;
+            white-space: normal;
+          }
+
+          pre {
+            code {
+              white-space: pre;
+            }
           }
         }
 
@@ -112,6 +118,10 @@ ul.notes {
           margin: 10px 0;
         }
       }
+
+      a {
+        word-break: break-all;
+      }
     }
 
     .note-header {
@@ -127,7 +137,7 @@ ul.notes {
     margin-right: 10px;
   }
   .line_content {
-    white-space: pre-wrap;
+    white-space: pre;
   }
 }
 
@@ -145,20 +155,33 @@ ul.notes {
       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: 0;
       vertical-align: top;
       white-space: normal;
+
       &.parallel {
         border-width: 1px;
       }
+
+      .new-note {
+        max-width: 800px;
+      }
+
+      .notes {
+        max-width: 800px;
+        background-color: $white-light;
+        border-right: 1px solid $table-border-gray;
+      }
     }
   }
 }

From 4e5ae5a281be109ca22929bb21732f0ee1f6630d Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Tue, 12 Apr 2016 15:40:53 -0500
Subject: [PATCH 221/283] Fix Grafana docs and link from Influx page

---
 doc/monitoring/performance/gitlab_configuration.md   | 1 +
 doc/monitoring/performance/grafana_configuration.md  | 6 +++---
 doc/monitoring/performance/influxdb_configuration.md | 1 +
 doc/monitoring/performance/influxdb_schema.md        | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/monitoring/performance/gitlab_configuration.md b/doc/monitoring/performance/gitlab_configuration.md
index b856e7935a..90e9930221 100644
--- a/doc/monitoring/performance/gitlab_configuration.md
+++ b/doc/monitoring/performance/gitlab_configuration.md
@@ -37,3 +37,4 @@ Read more on:
 - [Introduction to GitLab Performance Monitoring](introduction.md)
 - [InfluxDB Configuration](influxdb_configuration.md)
 - [InfluxDB Schema](influxdb_schema.md)
+- [Grafana Install/Configuration](grafana_configuration.md
diff --git a/doc/monitoring/performance/grafana_configuration.md b/doc/monitoring/performance/grafana_configuration.md
index 416c9870aa..10ef100981 100644
--- a/doc/monitoring/performance/grafana_configuration.md
+++ b/doc/monitoring/performance/grafana_configuration.md
@@ -91,18 +91,18 @@ JSON file.
 
 Open the dashboard dropdown menu and click 'Import'
 
-![Grafana dashboard dropdown](/img/grafana_dashboard_dropdown.png)
+![Grafana dashboard dropdown](img/grafana_dashboard_dropdown.png)
 
 Click 'Choose file' and browse to the location where you downloaded or cloned
 the dashboard repository. Pick one of the JSON files to import.
 
-![Grafana dashboard import](/img/grafana_dashboard_import.png)
+![Grafana dashboard import](img/grafana_dashboard_import.png)
 
 Once the dashboard is imported, be sure to click save icon in the top bar. If
 you do not save the dashboard after importing it will be removed when you
 navigate away.
 
-![Grafana save icon](/img/grafana_save_icon.png)
+![Grafana save icon](img/grafana_save_icon.png)
 
 Repeat this process for each dashboard you wish to import.
 
diff --git a/doc/monitoring/performance/influxdb_configuration.md b/doc/monitoring/performance/influxdb_configuration.md
index 3a2b598b78..63aa03985e 100644
--- a/doc/monitoring/performance/influxdb_configuration.md
+++ b/doc/monitoring/performance/influxdb_configuration.md
@@ -181,6 +181,7 @@ Read more on:
 - [Introduction to GitLab Performance Monitoring](introduction.md)
 - [GitLab Configuration](gitlab_configuration.md)
 - [InfluxDB Schema](influxdb_schema.md)
+- [Grafana Install/Configuration](grafana_configuration.md
 
 [influxdb-retention]: https://docs.influxdata.com/influxdb/v0.9/query_language/database_management/#retention-policy-management
 [influxdb documentation]: https://docs.influxdata.com/influxdb/v0.9/
diff --git a/doc/monitoring/performance/influxdb_schema.md b/doc/monitoring/performance/influxdb_schema.md
index a5a8aebd2d..d31b3788f3 100644
--- a/doc/monitoring/performance/influxdb_schema.md
+++ b/doc/monitoring/performance/influxdb_schema.md
@@ -85,3 +85,4 @@ Read more on:
 - [Introduction to GitLab Performance Monitoring](introduction.md)
 - [GitLab Configuration](gitlab_configuration.md)
 - [InfluxDB Configuration](influxdb_configuration.md)
+- [Grafana Install/Configuration](grafana_configuration.md

From 60736db429666f4145004408b722799ef144eb5f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 12 Apr 2016 15:07:24 -0500
Subject: [PATCH 222/283] Remove max-width from comments

---
 app/assets/stylesheets/pages/note_form.scss | 8 --------
 app/assets/stylesheets/pages/notes.scss     | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 5e5722c2c3..f4da17fada 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -16,7 +16,6 @@
   .new-note {
     margin: 0;
     border: none;
-    border-right: 1px solid $table-border-gray;
   }
 }
 
@@ -90,7 +89,6 @@
 .discussion-form {
   padding: $gl-padding-top $gl-padding;
   background-color: $white-light;
-  border-right: 1px solid $table-border-gray;
 }
 
 .note-edit-form {
@@ -132,13 +130,7 @@
 
   .discussion-reply-holder {
     background-color: $white-light;
-    border-right: 1px solid $table-border-gray;
     padding: 10px 16px;
-    max-width: 800px;
-
-    .new-note {
-      border-right: none;
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 07dd029245..e421a31549 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -173,14 +173,8 @@ ul.notes {
         border-width: 1px;
       }
 
-      .new-note {
-        max-width: 800px;
-      }
-
       .notes {
-        max-width: 800px;
         background-color: $white-light;
-        border-right: 1px solid $table-border-gray;
       }
     }
   }

From 6a238c37e002c9d8dcc51af2cb3dff44c900139c Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 12 Apr 2016 18:06:52 -0300
Subject: [PATCH 223/283] Fix todo_target_path for todos where target was
 removed

---
 app/assets/javascripts/todos.js.coffee | 2 ++
 app/helpers/todos_helper.rb            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/assets/javascripts/todos.js.coffee b/app/assets/javascripts/todos.js.coffee
index 886da72e26..00d2b64172 100644
--- a/app/assets/javascripts/todos.js.coffee
+++ b/app/assets/javascripts/todos.js.coffee
@@ -59,6 +59,8 @@ class @Todos
 
   goToTodoUrl: (e)->
     todoLink = $(this).data('url')
+    return unless todoLink
+
     if e.metaKey
       e.preventDefault()
       window.open(todoLink,'_blank')
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index edc5686cf0..2f06668218 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -20,6 +20,8 @@ module TodosHelper
   end
 
   def todo_target_path(todo)
+    return unless todo.target.present?
+
     anchor = dom_id(todo.note) if todo.note.present?
 
     if todo.for_commit?

From fd248b0f068ad0239d0d4ddc462f091eecfe981e Mon Sep 17 00:00:00 2001
From: Lee <slee1@aus1m-slee1.rws.ad.ea.com>
Date: Tue, 12 Apr 2016 16:13:31 -0500
Subject: [PATCH 224/283] (doc) fix typo to ssh keys doc url

---
 doc/ci/ssh_keys/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md
index d790015aca..7f825e6a06 100644
--- a/doc/ci/ssh_keys/README.md
+++ b/doc/ci/ssh_keys/README.md
@@ -30,7 +30,7 @@ This is the universal solution which works with any type of executor
 ## SSH keys when using the Docker executor
 
 You will first need to create an SSH key pair. For more information, follow the
-instructions to [generate an SSH key](../ssh/README.md).
+instructions to [generate an SSH key](../../ssh/README.md).
 
 Then, create a new **Secret Variable** in your project settings on GitLab
 following **Settings > Variables**. As **Key** add the name `SSH_PRIVATE_KEY`
@@ -63,7 +63,7 @@ before_script:
 As a final step, add the _public_ key from the one you created earlier to the
 services that you want to have an access to from within the build environment.
 If you are accessing a private GitLab repository you need to add it as a
-[deploy key](../ssh/README.md#deploy-keys).
+[deploy key](../../ssh/README.md#deploy-keys).
 
 That's it! You can now have access to private servers or repositories in your
 build environment.
@@ -79,12 +79,12 @@ on, and use that key for all projects that are run on this machine.
 First, you need to login to the server that runs your builds.
 
 Then from the terminal login as the `gitlab-runner` user and generate the SSH
-key pair as described in the [SSH keys documentation](../ssh/README.md).
+key pair as described in the [SSH keys documentation](../../ssh/README.md).
 
 As a final step, add the _public_ key from the one you created earlier to the
 services that you want to have an access to from within the build environment.
 If you are accessing a private GitLab repository you need to add it as a
-[deploy key](../ssh/README.md#deploy-keys).
+[deploy key](../../ssh/README.md#deploy-keys).
 
 Once done, try to login to the remote server in order to accept the fingerprint:
 

From 2e13f6c326b920f1b78ca592dc1b938b62d5eef3 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 12 Apr 2016 14:39:08 -0400
Subject: [PATCH 225/283] Add `Gitlab.com?` method

To be used as a feature flag for GitLab.com-only features, such as
welcome emails.

We will be careful to only use this to disable features or functionality
that do not make sense for any installations that aren't GitLab.com. We
will not use this to restrict features from other installations or keep
them "exclusive" to GitLab.com.
---
 lib/gitlab.rb           |  3 +++
 spec/lib/gitlab_spec.rb | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 spec/lib/gitlab_spec.rb

diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 6108697bc2..7479e729db 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,4 +1,7 @@
 require 'gitlab/git'
 
 module Gitlab
+  def self.com?
+    Gitlab.config.gitlab.url == 'https://gitlab.com'
+  end
 end
diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb
new file mode 100644
index 0000000000..c59dfea5c5
--- /dev/null
+++ b/spec/lib/gitlab_spec.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+describe Gitlab, lib: true do
+  describe '.com?' do
+    it 'is true when on GitLab.com' do
+      stub_config_setting(url: 'https://gitlab.com')
+
+      expect(described_class.com?).to eq true
+    end
+
+    it 'is false when not on GitLab.com' do
+      stub_config_setting(url: 'http://example.com')
+
+      expect(described_class.com?).to eq false
+    end
+  end
+end

From d8296f873871120b7f4134bdcf8854a09b9e8be8 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Tue, 12 Apr 2016 16:11:58 -0600
Subject: [PATCH 226/283] Remove Bootstrap Carousel

The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component.

Fixes #14670.
---
 app/assets/javascripts/application.js.coffee       | 12 +++++++++++-
 app/assets/stylesheets/framework/tw_bootstrap.scss |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index b05138ac1a..6f435e4c54 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -22,7 +22,17 @@
 #= require cal-heatmap
 #= require turbolinks
 #= require autosave
-#= require bootstrap
+#= require bootstrap/affix
+#= require bootstrap/alert
+#= require bootstrap/button
+#= require bootstrap/collapse
+#= require bootstrap/dropdown
+#= require bootstrap/modal
+#= require bootstrap/scrollspy
+#= require bootstrap/tab
+#= require bootstrap/transition
+#= require bootstrap/tooltip
+#= require bootstrap/popover
 #= require select2
 #= require raphael
 #= require g.raphael
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index dd42db1840..96bab7880c 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -43,7 +43,6 @@
 @import "bootstrap/modals";
 @import "bootstrap/tooltip";
 @import "bootstrap/popovers";
-@import "bootstrap/carousel";
 
 // Utility classes
 .clearfix {

From a0008f2720a1dc1d5ba79dcf2e27c041ed52fb52 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Tue, 12 Apr 2016 23:57:42 +0000
Subject: [PATCH 227/283] improve formatting

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

diff --git a/doc/README.md b/doc/README.md
index 724c7cca0f..d266093065 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -3,7 +3,7 @@
 ## User documentation
 
 - [API](api/README.md) Automate GitLab via a simple and powerful API.
-- [CI](ci/README.md) GitLab Continuous Integration (CI) getting started, .gitlab-ci.yml options, and examples.
+- [CI](ci/README.md) GitLab Continuous Integration (CI) getting started, `.gitlab-ci.yml` options, and examples.
 - [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab.
 - [GitLab Basics](gitlab-basics/README.md) Find step by step how to start working on your commandline and on GitLab.
 - [Importing to GitLab](workflow/importing/README.md).

From 2ce7559d70e228963280df1f50176e9b2fa1e7b8 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 13 Apr 2016 00:00:15 -0700
Subject: [PATCH 228/283] Fix repository cache invalidation issue when project
 is recreated with an empty repo

To reproduce:

1. Create a project with some content
2. Rename the project
3. Create a new project with the same name.
4. Boom - 404.

After step 2, the branch and tag counts were not being cleared. This would
cause `repository.has_visible_content?` to erroneously return `true`
for the newly-created project.

Closes #13384
---
 CHANGELOG                      | 1 +
 app/models/repository.rb       | 2 ++
 spec/models/repository_spec.rb | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 071e35167f..21a4aea91b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.7.0 (unreleased)
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
   - API: Expose 'updated_at' for issue, snippet, and merge request notes (Robert Schilling)
   - API: User can leave a project through the API when not master or owner. !3613
+  - Fix repository cache invalidation issue when project is recreated with an empty repo (Stan Hu)
 
 v 8.6.6
   - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 462b48118e..0b2289cfa3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -253,6 +253,8 @@ class Repository
     # This ensures this particular cache is flushed after the first commit to a
     # new repository.
     expire_emptiness_caches if empty?
+    expire_branch_count_cache
+    expire_tag_count_cache
   end
 
   def expire_branch_cache(branch_name = nil)
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 4e49c413f2..c3a4016fa4 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -393,6 +393,8 @@ describe Repository, models: true do
   describe '#expire_cache' do
     it 'expires all caches' do
       expect(repository).to receive(:expire_branch_cache)
+      expect(repository).to receive(:expire_branch_count_cache)
+      expect(repository).to receive(:expire_tag_count_cache)
 
       repository.expire_cache
     end

From 3ea955a637127e6e11bc9fe270f87f63226b9d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 5 Apr 2016 15:11:31 +0200
Subject: [PATCH 229/283] Improve TeamcityService and its specs
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 +-
 .../project_services/teamcity_service.rb      |   6 +-
 .../project_services/teamcity_service_spec.rb | 255 ++++++++++++++----
 3 files changed, 205 insertions(+), 60 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c6ca0ea3de..df40a1e1b8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.7.0 (unreleased)
   - Expose label description in API (Mariusz Jachimowicz)
   - Allow back dating on issues when created through the API
   - Fix Error 500 after renaming a project path (Stan Hu)
+  - Fix a bug whith trailing slash in teamcity_url (Charles May)
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
   - Allow SAML to handle external users based on user's information !3530
@@ -123,9 +124,6 @@ v 8.6.0
   - Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation (Pat Turner)
   - HTTP error pages work independently from location and config (Artem Sidorenko)
   - Update `omniauth-saml` to 1.5.0 to allow for custom response attributes to be set
-  - Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
-  - Fix a bug whith trailing slash in teamcity_url (Charles May)
-  - Don't load all of GitLab in mail_room
   - Memoize @group in Admin::GroupsController (Yatish Mehta)
   - Indicate how much an MR diverged from the target branch (Pierre de La Morinerie)
   - Added omniauth-auth0 Gem (Daniel Carraro)
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index 246c5eb4a8..8dceee5e2c 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -91,7 +91,7 @@ class TeamcityService < CiService
     ).to_s
     auth = {
       username: username,
-      password: password,
+      password: password
     }
     @response = HTTParty.get(url, verify: false, basic_auth: auth)
   end
@@ -108,7 +108,7 @@ class TeamcityService < CiService
       built_id = @response['build']['id']
       URI.join(
         teamcity_url,
-        "#{teamcity_url}/viewLog.html?buildId=#{built_id}&buildTypeId=#{build_type}"
+        "/viewLog.html?buildId=#{built_id}&buildTypeId=#{build_type}"
       ).to_s
     end
   end
@@ -145,7 +145,7 @@ class TeamcityService < CiService
     branch = Gitlab::Git.ref_name(data[:ref])
 
     self.class.post(
-      URI.join(teamcity_url, "/httpAuth/app/rest/buildQueue").to_s,
+      URI.join(teamcity_url, '/httpAuth/app/rest/buildQueue').to_s,
       body: "<build branchName=\"#{branch}\">"\
             "<buildType id=\"#{build_type}\"/>"\
             '</build>',
diff --git a/spec/models/project_services/teamcity_service_spec.rb b/spec/models/project_services/teamcity_service_spec.rb
index f26b47a856..bc7423cee6 100644
--- a/spec/models/project_services/teamcity_service_spec.rb
+++ b/spec/models/project_services/teamcity_service_spec.rb
@@ -21,73 +21,220 @@
 require 'spec_helper'
 
 describe TeamcityService, models: true do
-  describe "Associations" do
+  describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }
   end
 
-  describe "Execute" do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project) }
+  describe 'Validations' do
+    describe '#teamcity_url' do
+      it 'does not validate the presence of teamcity_url if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
 
-    context "when a password was previously set" do
-      before do
-        @teamcity_service = TeamcityService.create(
-          project: create(:project),
-          properties: {
-            teamcity_url: 'http://gitlab.com',
-            username: 'mic',
-            password: "password"
-          }
-        )
-      end
-  
-      it "reset password if url changed" do
-        @teamcity_service.teamcity_url = 'http://gitlab1.com'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to be_nil
-      end
-  
-      it "does not reset password if username changed" do
-        @teamcity_service.username = "some_name"
-        @teamcity_service.save
-        expect(@teamcity_service.password).to eq("password")
+        expect(teamcity_service).not_to validate_presence_of(:teamcity_url)
       end
 
-      it "does not reset password if new url is set together with password, even if it's the same password" do
-        @teamcity_service.teamcity_url = 'http://gitlab_edited.com'
-        @teamcity_service.password = 'password'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to eq("password")
-        expect(@teamcity_service.teamcity_url).to eq("http://gitlab_edited.com")
-      end
+      it 'validates the presence of teamcity_url if service is active' do
+        teamcity_service = service
+        teamcity_service.active = true
 
-      it "should reset password if url changed, even if setter called multiple times" do
-        @teamcity_service.teamcity_url = 'http://gitlab1.com'
-        @teamcity_service.teamcity_url = 'http://gitlab1.com'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to be_nil
+        expect(teamcity_service).to validate_presence_of(:teamcity_url)
       end
     end
-    
-    context "when no password was previously set" do
-      before do
-        @teamcity_service = TeamcityService.create(
-          project: create(:project),
-          properties: {
-            teamcity_url: 'http://gitlab.com',
-            username: 'mic'
-          }
-        )
+
+    describe '#build_type' do
+      it 'does not validate the presence of build_type if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:build_type)
       end
 
-      it "saves password if new url is set together with password" do
-        @teamcity_service.teamcity_url = 'http://gitlab_edited.com'
-        @teamcity_service.password = 'password'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to eq("password")
-        expect(@teamcity_service.teamcity_url).to eq("http://gitlab_edited.com")
+      it 'validates the presence of build_type if service is active' do
+        teamcity_service = service
+        teamcity_service.active = true
+
+        expect(teamcity_service).to validate_presence_of(:build_type)
+      end
+    end
+
+    describe '#username' do
+      it 'does not validate the presence of username if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:username)
+      end
+
+      it 'does not validate the presence of username if username is nil' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.password = nil
+
+        expect(teamcity_service).not_to validate_presence_of(:username)
+      end
+
+      it 'validates the presence of username if service is active and username is present' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.password = 'secret'
+
+        expect(teamcity_service).to validate_presence_of(:username)
+      end
+    end
+
+    describe '#password' do
+      it 'does not validate the presence of password if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:password)
+      end
+
+      it 'does not validate the presence of password if username is nil' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.username = nil
+
+        expect(teamcity_service).not_to validate_presence_of(:password)
+      end
+
+      it 'validates the presence of password if service is active and username is present' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.username = 'john'
+
+        expect(teamcity_service).to validate_presence_of(:password)
       end
     end
   end
+
+  describe 'Callbacks' do
+    describe 'before_update :reset_password' do
+      context 'when a password was previously set' do
+        it 'resets password if url changed' do
+          teamcity_service = service
+
+          teamcity_service.teamcity_url = 'http://gitlab1.com'
+          teamcity_service.save
+
+          expect(teamcity_service.password).to be_nil
+        end
+
+        it 'does not reset password if username changed' do
+          teamcity_service = service
+
+          teamcity_service.username = 'some_name'
+          teamcity_service.save
+
+          expect(teamcity_service.password).to eq('password')
+        end
+
+        it "does not reset password if new url is set together with password, even if it's the same password" do
+          teamcity_service = service
+
+          teamcity_service.teamcity_url = 'http://gitlab_edited.com'
+          teamcity_service.password = 'password'
+          teamcity_service.save
+
+          expect(teamcity_service.password).to eq('password')
+          expect(teamcity_service.teamcity_url).to eq('http://gitlab_edited.com')
+        end
+      end
+
+      it 'saves password if new url is set together with password when no password was previously set' do
+        teamcity_service = service
+        teamcity_service.password = nil
+
+        teamcity_service.teamcity_url = 'http://gitlab_edited.com'
+        teamcity_service.password = 'password'
+        teamcity_service.save
+
+        expect(teamcity_service.password).to eq('password')
+        expect(teamcity_service.teamcity_url).to eq('http://gitlab_edited.com')
+      end
+    end
+  end
+
+  describe '#build_page' do
+    it 'returns a specific URL when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.build_page('123', 'unused')).to eq('http://gitlab.com/viewLog.html?buildTypeId=foo')
+    end
+
+    it 'returns a build URL when teamcity_url has no trailing slash' do
+      stub_request(body: %Q({"build":{"id":"666"}}))
+
+      expect(service(teamcity_url: 'http://gitlab.com').build_page('123', 'unused')).to eq('http://gitlab.com/viewLog.html?buildId=666&buildTypeId=foo')
+    end
+
+    it 'returns a build URL when teamcity_url has a trailing slash' do
+      stub_request(body: %Q({"build":{"id":"666"}}))
+
+      expect(service(teamcity_url: 'http://gitlab.com/').build_page('123', 'unused')).to eq('http://gitlab.com/viewLog.html?buildId=666&buildTypeId=foo')
+    end
+  end
+
+  describe '#commit_status' do
+    it 'sets commit status to :error when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+
+    it 'sets commit status to "pending" when status is 404' do
+      stub_request(status: 404)
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to "success" when build status contains SUCCESS' do
+      stub_request(build_status: 'YAY SUCCESS!')
+
+      expect(service.commit_status('123', 'unused')).to eq('success')
+    end
+
+    it 'sets commit status to "failed" when build status contains FAILURE' do
+      stub_request(build_status: 'NO FAILURE!')
+
+      expect(service.commit_status('123', 'unused')).to eq('failed')
+    end
+
+    it 'sets commit status to "pending" when build status contains Pending' do
+      stub_request(build_status: 'NO Pending!')
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to :error when build status is unknown' do
+      stub_request(build_status: 'FOO BAR!')
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+  end
+
+  def service(teamcity_url: 'http://gitlab.com')
+    described_class.create(
+      project: build_stubbed(:empty_project),
+      properties: {
+        teamcity_url: teamcity_url,
+        username: 'mic',
+        password: 'password',
+        build_type: 'foo'
+      }
+    )
+  end
+
+  def stub_request(status: 200, body: nil, build_status: 'success')
+    teamcity_full_url = 'http://mic:password@gitlab.com/httpAuth/app/rest/builds/branch:unspecified:any,number:123'
+    body ||= %Q({"build":{"status":"#{build_status}","id":"666"}})
+
+    WebMock.stub_request(:get, teamcity_full_url).to_return(
+      status: status,
+      headers: { 'Content-Type' => 'application/json' },
+      body: body
+    )
+  end
 end

From 4a09a6c6f21c0bcd48123759cd6804276d810929 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 13 Apr 2016 11:31:06 +0300
Subject: [PATCH 230/283] Move 'New branch from issue' feature doc to
 web_editor.md

[ci skip]
---
 doc/gitlab-basics/create-branch.md            |   9 -----
 .../img/new_branch_from_issue.png}            | Bin
 doc/workflow/web_editor.md                    |  32 ++++++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)
 rename doc/{gitlab-basics/basicsimages/new_branch_button.png => workflow/img/new_branch_from_issue.png} (100%)

diff --git a/doc/gitlab-basics/create-branch.md b/doc/gitlab-basics/create-branch.md
index 9d688b9389..7556b0f663 100644
--- a/doc/gitlab-basics/create-branch.md
+++ b/doc/gitlab-basics/create-branch.md
@@ -32,15 +32,6 @@ Fill out the information required:
 
 ![Branch info](basicsimages/branch_info.png)
 
-## From an issue
-When an issue should be resolved one could also create a branch on the issue page. A button is displayed after the description unless there is already a branch or a referenced merge request.
-
-![New Branch Button](basicsimages/new_branch_button.png)
-
-The branch created diverges from the default branch of the project, usually `master`. The branch name will be based on the title of the issue and as suffix its ID. Thus the example screenshot above will yield a branch named `et-cum-et-sed-expedita-repellat-consequatur-ut-assumenda-numquam-rerum-2`.
-After the branch is created the user can edit files in the repository to fix the issue. When a merge request is created the
-description field will display `Closes #2` to use the issue closing pattern. This will close the issue once the merge request is merged.
-
 ### Note:
 
 You will be able to find and select the name of your branch in the white box next to a project's name:
diff --git a/doc/gitlab-basics/basicsimages/new_branch_button.png b/doc/workflow/img/new_branch_from_issue.png
similarity index 100%
rename from doc/gitlab-basics/basicsimages/new_branch_button.png
rename to doc/workflow/img/new_branch_from_issue.png
diff --git a/doc/workflow/web_editor.md b/doc/workflow/web_editor.md
index 4a451d9895..5685a9d89d 100644
--- a/doc/workflow/web_editor.md
+++ b/doc/workflow/web_editor.md
@@ -66,6 +66,35 @@ the target branch. Click **Create directory** to finish.
 
 ## Create a new branch
 
+There are multiple ways to create a branch from GitLab's web interface.
+
+### Create a new branch from an issue
+
+>**Note:**
+This feature was [introduced][ce-2808] in GitLab 8.6.
+
+In case your development workflow dictates to have an issue for every merge
+request, you can quickly create a branch right on the issue page which will be
+tied with the issue itself. You can see a **New Branch** button after the issue
+description, unless there is already a branch with the same name or a referenced
+merge request.
+
+![New Branch Button](img/new_branch_from_issue.png)
+
+Once you click it, a new branch will be created that diverges from the default
+branch of your project, by default `master`. The branch name will be based on
+the title of the issue and as suffix it will have its ID. Thus, the example
+screenshot above will yield a branch named
+`et-cum-et-sed-expedita-repellat-consequatur-ut-assumenda-numquam-rerum-2`.
+
+After the branch is created, you can edit files in the repository to fix
+the issue. When a merge request is created based on the newly created branch,
+the description field will automatically display the [issue closing pattern]
+`Closes #ID`, where `ID` the ID of the issue. This will close the issue once the
+merge request is merged.
+
+### Create a new branch from a project's dashboard
+
 If you want to make changes to several files before creating a new merge
 request, you can create a new branch up front. From a project's files page,
 choose **New branch** from the dropdown.
@@ -118,3 +147,6 @@ appear that is labeled **Start a new merge request with these changes**. After
 you commit the changes you will be taken to a new merge request form.
 
 ![Start a new merge request with these changes](img/web_editor_start_new_merge_request.png)
+
+[ce-2808]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2808
+[issue closing pattern]: ../customization/issue_closing.md

From b2f48d8c46cebcf2a576c18b661c3481b3450f3b Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 21:34:24 +0200
Subject: [PATCH 231/283] API: Return 404 if user does not have access to group

---
 CHANGELOG                        |  1 +
 lib/api/helpers.rb               |  3 +--
 spec/requests/api/groups_spec.rb | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f3fc54219e..77a8871451 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ v 8.7.0 (unreleased)
   - Fix admin/projects when using visibility levels on search (PotHix)
   - Build status notifications
   - API: Expose user location (Robert Schilling)
+  - API: Do not leak group existence via return code (Robert Schilling)
   - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591
   - Update number of Todos in the sidebar when it's marked as "Done". !3600
   - API: Expose 'updated_at' for issue, snippet, and merge request notes (Robert Schilling)
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 4921ae99e7..96af7d7675 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -91,8 +91,7 @@ module API
       if can?(current_user, :read_group, group)
         group
       else
-        forbidden!("#{current_user.username} lacks sufficient "\
-        "access to #{group.name}")
+        not_found!('Group')
       end
     end
 
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 7383c7d11a..083d5c459c 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -61,7 +61,8 @@ describe API::API, api: true  do
 
       it "should not return a group not attached to user1" do
         get api("/groups/#{group2.id}", user1)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
 
@@ -92,7 +93,8 @@ describe API::API, api: true  do
 
       it 'should not return a group not attached to user1' do
         get api("/groups/#{group2.path}", user1)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
   end
@@ -157,7 +159,8 @@ describe API::API, api: true  do
 
       it "should not return a group not attached to user1" do
         get api("/groups/#{group2.id}/projects", user1)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
 
@@ -189,7 +192,8 @@ describe API::API, api: true  do
 
       it 'should not return a group not attached to user1' do
         get api("/groups/#{group2.path}/projects", user1)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
   end
@@ -247,7 +251,8 @@ describe API::API, api: true  do
 
       it "should not remove a group not attached to user1" do
         delete api("/groups/#{group2.id}", user1)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
 

From ca40479c512f327c12adf51b47be46d75e4e333c Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 13 Apr 2016 11:20:45 +0200
Subject: [PATCH 232/283] API: Avoid group leak while updating the group

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

diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 083d5c459c..37ddab83c3 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -135,10 +135,10 @@ describe API::API, api: true  do
     end
 
     context 'when authenticated as an user that cannot see the group' do
-      it 'returns 403 when trying to update the group' do
+      it 'returns 404 when trying to update the group' do
         put api("/groups/#{group2.id}", user1), name: new_group_name
 
-        expect(response.status).to eq(403)
+        expect(response.status).to eq(404)
       end
     end
   end

From 3240ecfbefc7ae5994be6ef01b52c1cbdaa09057 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 12 Apr 2016 12:00:21 +0200
Subject: [PATCH 233/283] Added ability to add custom tags to transactions

One use case for this is manually setting the "action" tag for Grape API
calls. Due to Grape running blocks there are no human readable method
names that can be used for the "action" tag, thus we have to set these
manually on a case by case basis.
---
 CHANGELOG                       |  1 +
 lib/gitlab/metrics.rb           | 10 ++++++++++
 spec/lib/gitlab/metrics_spec.rb | 25 +++++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9b0c6ba460..ac5c10a8a4 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.7.0 (unreleased)
   - All service classes (those residing in app/services) are now instrumented (Yorick Peterse)
+  - Developers can now add custom tags to transactions (Yorick Peterse)
   - Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
   - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index 2a0a5629be..484970c5a1 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -104,6 +104,16 @@ module Gitlab
       retval
     end
 
+    # Adds a tag to the current transaction (if any)
+    #
+    # name - The name of the tag to add.
+    # value - The value of the tag.
+    def self.tag_transaction(name, value)
+      trans = current_transaction
+
+      trans.add_tag(name, value) if trans
+    end
+
     # When enabled this should be set before being used as the usual pattern
     # "@foo ||= bar" is _not_ thread-safe.
     if enabled?
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 3dee13e27f..10177c0e8d 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -98,4 +98,29 @@ describe Gitlab::Metrics do
       end
     end
   end
+
+  describe '.tag_transaction' do
+    context 'without a transaction' do
+      it 'does nothing' do
+        expect_any_instance_of(Gitlab::Metrics::Transaction).
+          not_to receive(:add_tag)
+
+        Gitlab::Metrics.tag_transaction(:foo, 'bar')
+      end
+    end
+
+    context 'with a transaction' do
+      let(:transaction) { Gitlab::Metrics::Transaction.new }
+
+      it 'adds the tag to the transaction' do
+        expect(Gitlab::Metrics).to receive(:current_transaction).
+          and_return(transaction)
+
+        expect(transaction).to receive(:add_tag).
+          with(:foo, 'bar')
+
+        Gitlab::Metrics.tag_transaction(:foo, 'bar')
+      end
+    end
+  end
 end

From 482f67edb46423d4fc567e061d6546d8dfafc7bb Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Thu, 7 Apr 2016 14:07:17 +0200
Subject: [PATCH 234/283] API: Ability to move an issue

---
 CHANGELOG                        |  1 +
 doc/api/issues.md                | 51 ++++++++++++++++++++++++++++++
 lib/api/issues.rb                | 23 ++++++++++++++
 spec/requests/api/issues_spec.rb | 53 +++++++++++++++++++++++++++++++-
 4 files changed, 127 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9b0c6ba460..771d7e4799 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.7.0 (unreleased)
   - Expose label description in API (Mariusz Jachimowicz)
   - Allow back dating on issues when created through the API
   - API: Ability to update a group (Robert Schilling)
+  - API: Ability to move issues
   - Fix Error 500 after renaming a project path (Stan Hu)
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 1c635a6cdc..a540a27ce1 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -351,6 +351,57 @@ DELETE /projects/:id/issues/:issue_id
 curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues/85
 ```
 
+## Move an issue
+
+Moves an issue to a different project. If the operation is successful, a status code `200` together with moved issue is returned. If the project, issue, or target project is not found, error `404` is returned. If the target project equals the source project or the user has insufficient permissions to move an issue, error `400` together with an explaining error message is returned.
+
+```
+POST /projects/:id/issues/:issue_id/move
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `issue_id` | integer | yes | The ID of a project's issue |
+| `new_project_id` | integer | yes | The ID the new project |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues/85/move
+```
+
+Example response:
+
+```json
+{
+  "id": 92,
+  "iid": 11,
+  "project_id": 5,
+  "title": "Sit voluptas tempora quisquam aut doloribus et.",
+  "description": "Repellat voluptas quibusdam voluptatem exercitationem.",
+  "state": "opened",
+  "created_at": "2016-04-05T21:41:45.652Z",
+  "updated_at": "2016-04-07T12:20:17.596Z",
+  "labels": [],
+  "milestone": null,
+  "assignee": {
+    "name": "Miss Monserrate Beier",
+    "username": "axel.block",
+    "id": 12,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/46f6f7dc858ada7be1853f7fb96e81da?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/axel.block"
+  },
+  "author": {
+    "name": "Kris Steuber",
+    "username": "solon.cremin",
+    "id": 10,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/7a190fecbaa68212a4b68aeb6e3acd10?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/solon.cremin"
+  }
+}
+```
+
 ## Comments on issues
 
 Comments are done via the [notes](notes.md) resource.
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index c4ea05ee6c..894d979432 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -195,6 +195,29 @@ module API
         end
       end
 
+      # Move an existing issue
+      #
+      # Parameters:
+      # id (required) - The ID of a project
+      # issue_id (required) - The ID of a project issue
+      # new_project_id (required) - The ID of the new project
+      # Example Request:
+      #   POST /projects/:id/issues/:issue_id/move
+      post ":id/issues/:issue_id/move" do
+        required_attributes! [:new_project_id]
+
+        issue = user_project.issues.find(params[:issue_id])
+        new_project = Project.find(params[:new_project_id])
+
+        begin
+          issue = ::Issues::MoveService.new(user_project, current_user).execute(issue, new_project)
+          present issue, with: Entities::Issue
+        rescue ::Issues::MoveService::MoveError => error
+          render_api_error!(error.message, 400)
+        end
+      end
+
+      #
       # Delete a project issue
       #
       # Parameters:
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 822d3ad301..db4ee46975 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -7,7 +7,7 @@ describe API::API, api: true  do
   let(:author)      { create(:author) }
   let(:assignee)    { create(:assignee) }
   let(:admin)       { create(:user, :admin) }
-  let!(:project)    { create(:project, :public, namespace: user.namespace ) }
+  let!(:project)    { create(:project, :public, creator_id: user.id, namespace: user.namespace ) }
   let!(:closed_issue) do
     create :closed_issue,
            author: user,
@@ -501,4 +501,55 @@ describe API::API, api: true  do
       end
     end
   end
+
+  describe '/projects/:id/issues/:issue_id/move' do
+    let!(:target_project) { create(:project, path: 'project2', creator_id: user.id, namespace: user.namespace ) }
+    let!(:target_project2) { create(:project, creator_id: non_member.id, namespace: non_member.namespace ) }
+
+    it 'moves an issue' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
+               new_project_id: target_project.id
+
+      expect(response.status).to eq(201)
+      expect(json_response['project_id']).to eq(target_project.id)
+    end
+
+    it 'returns an error if target and source project are the same' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
+               new_project_id: project.id
+
+      expect(response.status).to eq(400)
+      expect(json_response['message']).to eq('Cannot move issue to project it originates from!')
+    end
+
+    it "returns an error if I don't have the permission" do
+      post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
+               new_project_id: target_project2.id
+
+      expect(response.status).to eq(400)
+      expect(json_response['message']).to eq('Cannot move issue due to insufficient permissions!')
+    end
+
+    it 'moves the issue to another namespace if I am admin' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/move", admin),
+               new_project_id: target_project2.id
+
+      expect(response.status).to eq(201)
+      expect(json_response['project_id']).to eq(target_project2.id)
+    end
+
+    it 'returns 404 if the source issue is not found' do
+      post api("/projects/#{project.id}/issues/123/move", user),
+               new_project_id: target_project.id
+
+      expect(response.status).to eq(404)
+    end
+
+    it 'returns 404 if the target project is not found' do
+      post api("/projects/1234/issues/#{issue.id}/move", user),
+               new_project_id: target_project.id
+
+      expect(response.status).to eq(404)
+    end
+  end
 end

From 244219376d84f0c78db3b898f0b7a18c88f9a840 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 13 Apr 2016 12:28:07 +0300
Subject: [PATCH 235/283] Tie example config to JIRA screenshot

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
---
 .../img/jira_service_page.png                 | Bin 35496 -> 49122 bytes
 doc/project_services/jira.md                  |  22 ++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/project_services/img/jira_service_page.png b/doc/project_services/img/jira_service_page.png
index 2b37eda35202160a69048732d759435e074f3b82..c225daa81e18d6c7e2ff26e30d7695fe218b2e1e 100644
GIT binary patch
literal 49122
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
ZIR5=FEXbQd)5|!Nw(r;$zh&R4{|o4#Ul{-Z

literal 35496
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
E2S^%+Z~y=R

diff --git a/doc/project_services/jira.md b/doc/project_services/jira.md
index 27170c1eb1..b626c746c7 100644
--- a/doc/project_services/jira.md
+++ b/doc/project_services/jira.md
@@ -1,9 +1,9 @@
 # GitLab JIRA integration
 
-_**Note:**
+>**Note:**
 Full JIRA integration was previously exclusive to GitLab Enterprise Edition.
 With [GitLab 8.3 forward][8_3_post], this feature in now [backported][jira-ce]
-to GitLab Community Edition as well._
+to GitLab Community Edition as well.
 
 ---
 
@@ -88,8 +88,9 @@ password as they will be needed when configuring GitLab in the next section.
 
 ### Configuring GitLab
 
-_**Note:** The currently supported JIRA versions are v6.x and v7.x. and GitLab
-7.8 or higher is required._
+>**Note:**
+The currently supported JIRA versions are v6.x and v7.x. and GitLab
+7.8 or higher is required.
 
 ---
 
@@ -113,13 +114,24 @@ Fill in the required details on the page, as described in the table below.
 | `Api url`     | The base URL of the JIRA API. It may be omitted, in which case GitLab will automatically use API version `2` based on the `project url`. It is of the form: `https://<jira_host_url>/rest/api/2`. |
 | `Username` | The username of the user created in [configuring JIRA step](#configuring-jira). |
 | `Password` |The password of the user created in [configuring JIRA step](#configuring-jira). |
-| `JIRA issue transition` | This setting is very important to set up correctly. It is the ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot](img/jira_issues_workflow.png)). By default, this ID is set to `2` |
+| `JIRA issue transition` | This setting is very important to set up correctly. It is the ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`. |
 
 After saving the configuration, your GitLab project will be able to interact
 with the linked JIRA project.
 
+For example, given the settings below:
+
+- the JIRA URL is `https://jira.example.com`
+- the project is named `GITLAB`
+- the user is named `gitlab`
+- the JIRA issue transition is 151 (based on the [JIRA issue transition][trans])
+
+the following screenshot shows how the JIRA service settings should look like.
+
 ![JIRA service page](img/jira_service_page.png)
 
+[trans]: img/jira_issues_workflow.png
+
 ---
 
 ## JIRA issues

From 2b036025d619c51cff74e4eb430f50d43d1d8cdb Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 18:38:18 +0200
Subject: [PATCH 236/283] Update tests for moving issues via API

---
 CHANGELOG                        |  2 +-
 doc/api/issues.md                |  8 +++--
 lib/api/issues.rb                | 14 ++++----
 spec/requests/api/issues_spec.rb | 57 +++++++++++++++++++++-----------
 4 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 771d7e4799..b86c9d1fa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,7 +14,7 @@ v 8.7.0 (unreleased)
   - Expose label description in API (Mariusz Jachimowicz)
   - Allow back dating on issues when created through the API
   - API: Ability to update a group (Robert Schilling)
-  - API: Ability to move issues
+  - API: Ability to move issues (Robert Schilling)
   - Fix Error 500 after renaming a project path (Stan Hu)
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
diff --git a/doc/api/issues.md b/doc/api/issues.md
index a540a27ce1..a3ac48fba7 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -353,7 +353,11 @@ curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.c
 
 ## Move an issue
 
-Moves an issue to a different project. If the operation is successful, a status code `200` together with moved issue is returned. If the project, issue, or target project is not found, error `404` is returned. If the target project equals the source project or the user has insufficient permissions to move an issue, error `400` together with an explaining error message is returned.
+Moves an issue to a different project. If the operation is successful, a status
+code `201` together with moved issue is returned. If the project, issue, or
+target project is not found, error `404` is returned. If the target project
+equals the source project or the user has insufficient permissions to move an
+issue, error `400` together with an explaining error message is returned.
 
 ```
 POST /projects/:id/issues/:issue_id/move
@@ -363,7 +367,7 @@ POST /projects/:id/issues/:issue_id/move
 | --------- | ---- | -------- | ----------- |
 | `id` | integer | yes | The ID of a project |
 | `issue_id` | integer | yes | The ID of a project's issue |
-| `new_project_id` | integer | yes | The ID the new project |
+| `to_project_id` | integer | yes | The ID the new project |
 
 ```bash
 curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues/85/move
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 894d979432..850e99981f 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -198,20 +198,20 @@ module API
       # Move an existing issue
       #
       # Parameters:
-      # id (required) - The ID of a project
-      # issue_id (required) - The ID of a project issue
-      # new_project_id (required) - The ID of the new project
+      #  id (required)            - The ID of a project
+      #  issue_id (required)      - The ID of a project issue
+      #  to_project_id (required) - The ID of the new project
       # Example Request:
       #   POST /projects/:id/issues/:issue_id/move
-      post ":id/issues/:issue_id/move" do
-        required_attributes! [:new_project_id]
+      post ':id/issues/:issue_id/move' do
+        required_attributes! [:to_project_id]
 
         issue = user_project.issues.find(params[:issue_id])
-        new_project = Project.find(params[:new_project_id])
+        new_project = Project.find(params[:to_project_id])
 
         begin
           issue = ::Issues::MoveService.new(user_project, current_user).execute(issue, new_project)
-          present issue, with: Entities::Issue
+          present issue, with: Entities::Issue, current_user: current_user
         rescue ::Issues::MoveService::MoveError => error
           render_api_error!(error.message, 400)
         end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index db4ee46975..3d7a31cbb6 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -508,48 +508,65 @@ describe API::API, api: true  do
 
     it 'moves an issue' do
       post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
-               new_project_id: target_project.id
+               to_project_id: target_project.id
 
       expect(response.status).to eq(201)
       expect(json_response['project_id']).to eq(target_project.id)
     end
 
-    it 'returns an error if target and source project are the same' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
-               new_project_id: project.id
+    context 'when source and target projects are the same' do
+      it 'returns 400 when trying to move an issue' do
+        post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
+                 to_project_id: project.id
 
-      expect(response.status).to eq(400)
-      expect(json_response['message']).to eq('Cannot move issue to project it originates from!')
+        expect(response.status).to eq(400)
+        expect(json_response['message']).to eq('Cannot move issue to project it originates from!')
+      end
     end
 
-    it "returns an error if I don't have the permission" do
-      post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
-               new_project_id: target_project2.id
+    context 'when the user does not have the permission to move issues' do
+      it 'returns 400 when trying to move an issue' do
+        post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
+                 to_project_id: target_project2.id
 
-      expect(response.status).to eq(400)
-      expect(json_response['message']).to eq('Cannot move issue due to insufficient permissions!')
+        expect(response.status).to eq(400)
+        expect(json_response['message']).to eq('Cannot move issue due to insufficient permissions!')
+      end
     end
 
     it 'moves the issue to another namespace if I am admin' do
       post api("/projects/#{project.id}/issues/#{issue.id}/move", admin),
-               new_project_id: target_project2.id
+               to_project_id: target_project2.id
 
       expect(response.status).to eq(201)
       expect(json_response['project_id']).to eq(target_project2.id)
     end
 
-    it 'returns 404 if the source issue is not found' do
-      post api("/projects/#{project.id}/issues/123/move", user),
-               new_project_id: target_project.id
+    context 'when issue does not exist' do
+      it 'returns 404 when trying to move an issue' do
+        post api("/projects/#{project.id}/issues/123/move", user),
+                 to_project_id: target_project.id
 
-      expect(response.status).to eq(404)
+        expect(response.status).to eq(404)
+      end
     end
 
-    it 'returns 404 if the target project is not found' do
-      post api("/projects/1234/issues/#{issue.id}/move", user),
-               new_project_id: target_project.id
+    context 'when source project does not exist' do
+      it 'returns 404 when trying to move an issue' do
+        post api("/projects/123/issues/#{issue.id}/move", user),
+                 to_project_id: target_project.id
 
-      expect(response.status).to eq(404)
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'when target project does not exist' do
+      it 'returns 404 when trying to move an issue' do
+        post api("/projects/#{project.id}/issues/#{issue.id}/move", user),
+                 to_project_id: 123
+
+        expect(response.status).to eq(404)
+      end
     end
   end
 end

From fdbf3682023a2ed647c625ec0609dac3227218b2 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 13 Apr 2016 12:03:05 +0200
Subject: [PATCH 237/283] Fix doc for moving an issue

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

diff --git a/doc/api/issues.md b/doc/api/issues.md
index a3ac48fba7..f09847aef9 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -367,7 +367,7 @@ POST /projects/:id/issues/:issue_id/move
 | --------- | ---- | -------- | ----------- |
 | `id` | integer | yes | The ID of a project |
 | `issue_id` | integer | yes | The ID of a project's issue |
-| `to_project_id` | integer | yes | The ID the new project |
+| `to_project_id` | integer | yes | The ID of the new project |
 
 ```bash
 curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues/85/move

From 4cd04443f5f69665ce1139726751af678e0e55c3 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 13 Apr 2016 12:10:12 +0200
Subject: [PATCH 238/283] Fix group_member_spec to not leak information

---
 spec/requests/api/group_members_spec.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spec/requests/api/group_members_spec.rb b/spec/requests/api/group_members_spec.rb
index 3e8b4aa1f8..96d89e6920 100644
--- a/spec/requests/api/group_members_spec.rb
+++ b/spec/requests/api/group_members_spec.rb
@@ -42,9 +42,10 @@ describe API::API, api: true  do
         end
       end
 
-      it "users not part of the group should get access error" do
+      it 'users not part of the group should get access error' do
         get api("/groups/#{group_with_members.id}/members", stranger)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
   end
@@ -165,12 +166,13 @@ describe API::API, api: true  do
     end
   end
 
-  describe "DELETE /groups/:id/members/:user_id" do
-    context "when not a member of the group" do
+  describe 'DELETE /groups/:id/members/:user_id' do
+    context 'when not a member of the group' do
       it "should not delete guest's membership of group_with_members" do
         random_user = create(:user)
         delete api("/groups/#{group_with_members.id}/members/#{owner.id}", random_user)
-        expect(response.status).to eq(403)
+
+        expect(response.status).to eq(404)
       end
     end
 

From 33f786b5d32d02a032af9d258167ddd2bb61d44a Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Wed, 13 Apr 2016 13:12:05 +0300
Subject: [PATCH 239/283] clean up ExclusiveLease

---
 lib/gitlab/exclusive_lease.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/gitlab/exclusive_lease.rb b/lib/gitlab/exclusive_lease.rb
index c2260a5f7a..ffe4936437 100644
--- a/lib/gitlab/exclusive_lease.rb
+++ b/lib/gitlab/exclusive_lease.rb
@@ -52,11 +52,6 @@ module Gitlab
 
     private
 
-    def redis
-      # Maybe someday we want to use a connection pool...
-      @redis ||= Redis.new(url: Gitlab::RedisConfig.url)
-    end
-
     def redis_key
       "gitlab:exclusive_lease:#{@key}"
     end

From bd0be13f5b52b8eaee019d722980b29acbc55b05 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Fri, 8 Apr 2016 14:17:42 +0200
Subject: [PATCH 240/283] API: Ability to subscribe and unsubscribe from an
 issue

---
 CHANGELOG                        |   1 +
 doc/api/issues.md                | 108 +++++++++++++++++++++++++++++++
 lib/api/helpers.rb               |   4 ++
 lib/api/issues.rb                |  53 +++++++++++++++
 spec/requests/api/issues_spec.rb |  31 +++++++++
 5 files changed, 197 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c633c4bb35..01fffcc369 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.7.0 (unreleased)
   - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524
   - 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 an issue (Robert Schilling)
   - Expose project badges in project settings
   - Preserve time notes/comments have been updated at when moving issue
   - Make HTTP(s) label consistent on clone bar (Stan Hu)
diff --git a/doc/api/issues.md b/doc/api/issues.md
index f09847aef9..4f7d948eba 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -406,6 +406,114 @@ Example response:
 }
 ```
 
+## Subscribe to an issue
+
+Subscribes to an issue to receive notifications. If the operation is successful,
+status code `201` together with the updated issue is returned. If the user is
+already subscribed to the issue, the status code `304` is returned. If the
+project or issue is not found, status code `404` is returned.
+
+```
+POST /projects/:id/issues/:issue_id/subscribe
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `issue_id` | integer | yes | The ID of a project's issue |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/subscribe
+```
+
+Example response:
+
+```json
+{
+  "id": 92,
+  "iid": 11,
+  "project_id": 5,
+  "title": "Sit voluptas tempora quisquam aut doloribus et.",
+  "description": "Repellat voluptas quibusdam voluptatem exercitationem.",
+  "state": "opened",
+  "created_at": "2016-04-05T21:41:45.652Z",
+  "updated_at": "2016-04-07T12:20:17.596Z",
+  "labels": [],
+  "milestone": null,
+  "assignee": {
+    "name": "Miss Monserrate Beier",
+    "username": "axel.block",
+    "id": 12,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/46f6f7dc858ada7be1853f7fb96e81da?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/axel.block"
+  },
+  "author": {
+    "name": "Kris Steuber",
+    "username": "solon.cremin",
+    "id": 10,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/7a190fecbaa68212a4b68aeb6e3acd10?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/solon.cremin"
+  }
+}
+```
+
+## Unsubscribe from an issue
+
+Unsubscribes from an issue to not receive notifications from that issue. If the
+operation is successful, status code `201` together with the updated issue is
+returned. If the user is not subscribed to the issue, the status code `304`
+is returned. If the project or issue is not found, status code `404` is
+returned.
+
+```
+POST /projects/:id/issues/:issue_id/unsubscribe
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `issue_id` | integer | yes | The ID of a project's issue |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/unsubscribe
+```
+
+Example response:
+
+```json
+{
+  "id": 93,
+  "iid": 12,
+  "project_id": 5,
+  "title": "Incidunt et rerum ea expedita iure quibusdam.",
+  "description": "Et cumque architecto sed aut ipsam.",
+  "state": "opened",
+  "created_at": "2016-04-05T21:41:45.217Z",
+  "updated_at": "2016-04-07T13:02:37.905Z",
+  "labels": [],
+  "milestone": null,
+  "assignee": {
+    "name": "Edwardo Grady",
+    "username": "keyon",
+    "id": 21,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/3e6f06a86cf27fa8b56f3f74f7615987?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/keyon"
+  },
+  "author": {
+    "name": "Vivian Hermann",
+    "username": "orville",
+    "id": 11,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon",
+    "web_url": "http://lgitlab.example.com/u/orville"
+  },
+  "subscribed": false
+}
+```
+
 ## Comments on issues
 
 Comments are done via the [notes](notes.md) resource.
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 4921ae99e7..aa0597564e 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -241,6 +241,10 @@ module API
       render_api_error!('413 Request Entity Too Large', 413)
     end
 
+    def not_modified!
+      render_api_error!('304 Not modified', 304)
+    end
+
     def render_validation_error!(model)
       if model.errors.any?
         render_api_error!(model.errors.messages || '400 Bad Request', 400)
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 850e99981f..49911fa298 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -231,6 +231,59 @@ 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
+      post ":id/issues/:issue_idsubscribe" do
+        issue = user_project.issues.find_by(id: params[:issue_id])
+
+        if !issue.subscribed?(current_user)
+          present issue, with: Entities::Issue, current_user: current_user
+        else
+          not_modified!
+        end
+      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/subscribe
+      post ":id/issues/:issue_id/subscribe" do
+        issue = user_project.issues.find_by(id: params[:issue_id])
+
+        if !issue.subscribed?(current_user)
+          issue.toggle_subscription(current_user)
+          present issue, with: Entities::Issue, current_user: current_user
+        else
+          not_modified!
+        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:
+      #   POST /projects/:id/issues/:issue_id/unsubscribe
+      post ":id/issues/:issue_id/unsubscribe" do
+        issue = user_project.issues.find_by(id: 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/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 3d7a31cbb6..437caf466b 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe API::API, api: true  do
   include ApiHelpers
   let(:user)        { create(:user) }
+  let(:user2)       { create(:user) }
   let(:non_member)  { create(:user) }
   let(:author)      { create(:author) }
   let(:assignee)    { create(:assignee) }
@@ -569,4 +570,34 @@ describe API::API, api: true  do
       end
     end
   end
+
+  describe 'POST :id/issues/:issue_id/subscribe' do
+    it 'subscribes to an issue' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/subscribe", user2)
+
+      expect(response.status).to eq(201)
+      expect(json_response['subscribed']).to eq(true)
+    end
+
+    it 'returns 304 if already subscribed' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/subscribe", user)
+
+      expect(response.status).to eq(304)
+    end
+  end
+
+  describe 'POST :id/issues/:issue_id/unsubscribe' do
+    it 'unsubscribes from an issue' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/unsubscribe", user)
+
+      expect(response.status).to eq(201)
+      expect(json_response['subscribed']).to eq(false)
+    end
+
+    it 'returns 304 if not subscribed' do
+      post api("/projects/#{project.id}/issues/#{issue.id}/unsubscribe", user2)
+
+      expect(response.status).to eq(304)
+    end
+  end
 end

From f875189b3962bde6e4b7b8c4ffdd18af83cbc922 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Fri, 8 Apr 2016 15:03:34 +0200
Subject: [PATCH 241/283] API: Ability to subscribe and unsubscribe from a
 merge request

---
 CHANGELOG                                |   2 +-
 doc/api/merge_requests.md                | 147 +++++++++++++++++++++++
 lib/api/issues.rb                        |   4 +-
 lib/api/merge_requests.rb                |  36 ++++++
 spec/requests/api/merge_requests_spec.rb |  30 +++++
 5 files changed, 216 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 01fffcc369..1184ffce76 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,7 @@ v 8.7.0 (unreleased)
   - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524
   - 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 an issue (Robert Schilling)
+  - API: Ability to subscribe and unsubscribe from issues and merge requests (Robert Schilling)
   - Expose project badges in project settings
   - Preserve time notes/comments have been updated at when moving issue
   - Make HTTP(s) label consistent on clone bar (Stan Hu)
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 20db73ea6c..16cb892626 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -606,3 +606,150 @@ Example response:
    },
 ]
 ```
+
+## Subscribe to a merge request
+
+Subscribes to a merge request to receive notification. If the operation is
+successful, status code `201` together with the updated merge request is
+returned. If the user is already subscribed to the merge request, the status
+code `304` is returned. If the project or merge request is not found, status
+code `404` is returned.
+
+```
+POST /projects/:id/merge_requests/:merge_request_id/subscribe
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `merge_request_id` | integer | yes   | The ID of the merge request |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscribe
+```
+
+Example response:
+
+```json
+{
+  "id": 17,
+  "iid": 1,
+  "project_id": 5,
+  "title": "Et et sequi est impedit nulla ut rem et voluptatem.",
+  "description": "Consequatur velit eos rerum optio autem. Quia id officia quaerat dolorum optio. Illo laudantium aut ipsum dolorem.",
+  "state": "opened",
+  "created_at": "2016-04-05T21:42:23.233Z",
+  "updated_at": "2016-04-05T22:11:52.900Z",
+  "target_branch": "ui-dev-kit",
+  "source_branch": "version-1-9",
+  "upvotes": 0,
+  "downvotes": 0,
+  "author": {
+    "name": "Eileen Skiles",
+    "username": "leila",
+    "id": 19,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/39ce4a2822cc896933ffbd68c1470e55?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/leila"
+  },
+  "assignee": {
+    "name": "Celine Wehner",
+    "username": "carli",
+    "id": 16,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/f4cd5605b769dd2ce405a27c6e6f2684?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/carli"
+  },
+  "source_project_id": 5,
+  "target_project_id": 5,
+  "labels": [],
+  "work_in_progress": false,
+  "milestone": {
+    "id": 7,
+    "iid": 1,
+    "project_id": 5,
+    "title": "v2.0",
+    "description": "Corrupti eveniet et velit occaecati dolorem est rerum aut.",
+    "state": "closed",
+    "created_at": "2016-04-05T21:41:40.905Z",
+    "updated_at": "2016-04-05T21:41:40.905Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": false,
+  "merge_status": "cannot_be_merged",
+  "subscribed": true
+}
+```
+## Unsubscribe from a merge request
+
+Unsubscribes from a merge request to not receive notifications from that merge
+request. If the operation is successful, status code `201` together with the
+updated merge request is returned. If the user is not subscribed to the merge
+request, the status code `304` is returned. If the project or merge request is
+not found, status code `404` is returned.
+
+```
+POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of a project |
+| `merge_request_id` | integer | yes   | The ID of the merge request |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscribe
+```
+
+Example response:
+
+```json
+{
+  "id": 17,
+  "iid": 1,
+  "project_id": 5,
+  "title": "Et et sequi est impedit nulla ut rem et voluptatem.",
+  "description": "Consequatur velit eos rerum optio autem. Quia id officia quaerat dolorum optio. Illo laudantium aut ipsum dolorem.",
+  "state": "opened",
+  "created_at": "2016-04-05T21:42:23.233Z",
+  "updated_at": "2016-04-05T22:11:52.900Z",
+  "target_branch": "ui-dev-kit",
+  "source_branch": "version-1-9",
+  "upvotes": 0,
+  "downvotes": 0,
+  "author": {
+    "name": "Eileen Skiles",
+    "username": "leila",
+    "id": 19,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/39ce4a2822cc896933ffbd68c1470e55?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/leila"
+  },
+  "assignee": {
+    "name": "Celine Wehner",
+    "username": "carli",
+    "id": 16,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/f4cd5605b769dd2ce405a27c6e6f2684?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/u/carli"
+  },
+  "source_project_id": 5,
+  "target_project_id": 5,
+  "labels": [],
+  "work_in_progress": false,
+  "milestone": {
+    "id": 7,
+    "iid": 1,
+    "project_id": 5,
+    "title": "v2.0",
+    "description": "Corrupti eveniet et velit occaecati dolorem est rerum aut.",
+    "state": "closed",
+    "created_at": "2016-04-05T21:41:40.905Z",
+    "updated_at": "2016-04-05T21:41:40.905Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": false,
+  "merge_status": "cannot_be_merged",
+  "subscribed": false
+}
+```
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 49911fa298..049618c00f 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -235,7 +235,7 @@ module API
       # Subscribes to a project issue
       #
       # Parameters:
-      #  id (required) - The ID of a project
+      #  id (required)       - The ID of a project
       #  issue_id (required) - The ID of a project issue
       # Example Request:
       #   POST /projects/:id/issues/:issue_id
@@ -270,7 +270,7 @@ module API
       # Unsubscribes from a project issue
       #
       # Parameters:
-      #  id (required) - The ID of a project
+      #  id (required)       - The ID of a project
       #  issue_id (required) - The ID of a project issue
       # Example Request:
       #   POST /projects/:id/issues/:issue_id/unsubscribe
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 4e7de8867b..d166484ba5 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -327,6 +327,42 @@ 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/subscribe
+        post "#{path}/subscribe" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          if !merge_request.subscribed?(current_user)
+            merge_request.toggle_subscription(current_user)
+            present merge_request, with: Entities::MergeRequest, current_user: current_user
+          else
+            not_modified!
+          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:
+        #   POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
+        post "#{path}/unsubscribe" 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/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 25fa30b2f2..b71c72a382 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -516,6 +516,36 @@ describe API::API, api: true  do
     end
   end
 
+  describe 'POST :id/merge_requests/:merge_request_id/subscribe' do
+    it 'subscribes to a merge request' do
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscribe", admin)
+
+      expect(response.status).to eq(201)
+      expect(json_response['subscribed']).to eq(true)
+    end
+
+    it 'returns 304 if already subscribed' do
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscribe", user)
+
+      expect(response.status).to eq(304)
+    end
+  end
+
+  describe 'POST :id/merge_requests/:merge_request_id/unsubscribe' do
+    it 'unsubscribes from a merge request' do
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/unsubscribe", user)
+
+      expect(response.status).to eq(201)
+      expect(json_response['subscribed']).to eq(false)
+    end
+
+    it 'returns 304 if not subscribed' do
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/unsubscribe", admin)
+
+      expect(response.status).to eq(304)
+    end
+  end
+
   def mr_with_later_created_and_updated_at_time
     merge_request
     merge_request.created_at += 1.hour

From fa3009095fbb995550a20e5d0cbc994f4290fbea Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 14:46:59 +0200
Subject: [PATCH 242/283] Make subscription API more RESTful

---
 doc/api/issues.md                        | 27 +++++++++++-----------
 doc/api/merge_requests.md                | 28 +++++++++++------------
 lib/api/helpers.rb                       |  2 +-
 lib/api/issues.rb                        | 29 +++++-------------------
 lib/api/merge_requests.rb                | 14 ++++++------
 spec/requests/api/issues_spec.rb         | 26 +++++++++++++++------
 spec/requests/api/merge_requests_spec.rb | 14 ++++++------
 7 files changed, 68 insertions(+), 72 deletions(-)

diff --git a/doc/api/issues.md b/doc/api/issues.md
index 4f7d948eba..42024becc3 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -408,13 +408,14 @@ Example response:
 
 ## Subscribe to an issue
 
-Subscribes to an issue to receive notifications. If the operation is successful,
-status code `201` together with the updated issue is returned. If the user is
-already subscribed to the issue, the status code `304` is returned. If the
-project or issue is not found, status code `404` is returned.
+Subscribes the authenticated user to an issue to receive notifications. If the
+operation is successful, status code `201` together with the updated issue is
+returned. If the user is already subscribed to the issue, the status code `304`
+is returned. If the project or issue is not found, status code `404` is
+returned.
 
 ```
-POST /projects/:id/issues/:issue_id/subscribe
+POST /projects/:id/issues/:issue_id/subscription
 ```
 
 | Attribute | Type | Required | Description |
@@ -423,7 +424,7 @@ POST /projects/:id/issues/:issue_id/subscribe
 | `issue_id` | integer | yes | The ID of a project's issue |
 
 ```bash
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/subscribe
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/subscription
 ```
 
 Example response:
@@ -461,14 +462,14 @@ Example response:
 
 ## Unsubscribe from an issue
 
-Unsubscribes from an issue to not receive notifications from that issue. If the
-operation is successful, status code `201` together with the updated issue is
-returned. If the user is not subscribed to the issue, the status code `304`
-is returned. If the project or issue is not found, status code `404` is
-returned.
+Unsubscribes the authenticated user from the issue to not receive notifications
+from it. If the operation is successful, status code `200` together with the
+updated issue is returned. If the user is not subscribed to the issue, the
+status code `304` is returned. If the project or issue is not found, status code
+`404` is returned.
 
 ```
-POST /projects/:id/issues/:issue_id/unsubscribe
+DELETE /projects/:id/issues/:issue_id/subscription
 ```
 
 | Attribute | Type | Required | Description |
@@ -477,7 +478,7 @@ POST /projects/:id/issues/:issue_id/unsubscribe
 | `issue_id` | integer | yes | The ID of a project's issue |
 
 ```bash
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/unsubscribe
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/subscription
 ```
 
 Example response:
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 16cb892626..3c18ebfa31 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -609,14 +609,14 @@ Example response:
 
 ## Subscribe to a merge request
 
-Subscribes to a merge request to receive notification. If the operation is
-successful, status code `201` together with the updated merge request is
-returned. If the user is already subscribed to the merge request, the status
-code `304` is returned. If the project or merge request is not found, status
-code `404` is returned.
+Subscribes the authenticated user to a merge request to receive notification. If
+the operation is successful, status code `201` together with the updated merge
+request is returned. If the user is already subscribed to the merge request, the
+status code `304` is returned. If the project or merge request is not found,
+status code `404` is returned.
 
 ```
-POST /projects/:id/merge_requests/:merge_request_id/subscribe
+POST /projects/:id/merge_requests/:merge_request_id/subscription
 ```
 
 | Attribute | Type | Required | Description |
@@ -625,7 +625,7 @@ POST /projects/:id/merge_requests/:merge_request_id/subscribe
 | `merge_request_id` | integer | yes   | The ID of the merge request |
 
 ```bash
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscribe
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscription
 ```
 
 Example response:
@@ -682,14 +682,14 @@ Example response:
 ```
 ## Unsubscribe from a merge request
 
-Unsubscribes from a merge request to not receive notifications from that merge
-request. If the operation is successful, status code `201` together with the
-updated merge request is returned. If the user is not subscribed to the merge
-request, the status code `304` is returned. If the project or merge request is
-not found, status code `404` is returned.
+Unsubscribes the authenticated user from a merge request to not receive
+notifications from that merge request. If the operation is successful, status
+code `200` together with the updated merge request is returned. If the user is
+not subscribed to the merge request, the status code `304` is returned. If the
+project or merge request is not found, status code `404` is returned.
 
 ```
-POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
+DELETE /projects/:id/merge_requests/:merge_request_id/subscription
 ```
 
 | Attribute | Type | Required | Description |
@@ -698,7 +698,7 @@ POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
 | `merge_request_id` | integer | yes   | The ID of the merge request |
 
 ```bash
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscribe
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscription
 ```
 
 Example response:
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index aa0597564e..54452f763a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -242,7 +242,7 @@ module API
     end
 
     def not_modified!
-      render_api_error!('304 Not modified', 304)
+      render_api_error!('304 Not Modified', 304)
     end
 
     def render_validation_error!(model)
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 049618c00f..37d2507307 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -238,32 +238,15 @@ module API
       #  id (required)       - The ID of a project
       #  issue_id (required) - The ID of a project issue
       # Example Request:
-      #   POST /projects/:id/issues/:issue_id
-      post ":id/issues/:issue_idsubscribe" do
+      #   POST /projects/:id/issues/:issue_id/subscription
+      post ":id/issues/:issue_id/subscription" do
         issue = user_project.issues.find_by(id: params[:issue_id])
 
-        if !issue.subscribed?(current_user)
-          present issue, with: Entities::Issue, current_user: current_user
-        else
+        if issue.subscribed?(current_user)
           not_modified!
-        end
-      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/subscribe
-      post ":id/issues/:issue_id/subscribe" do
-        issue = user_project.issues.find_by(id: params[:issue_id])
-
-        if !issue.subscribed?(current_user)
+        else
           issue.toggle_subscription(current_user)
           present issue, with: Entities::Issue, current_user: current_user
-        else
-          not_modified!
         end
       end
 
@@ -273,8 +256,8 @@ module API
       #  id (required)       - The ID of a project
       #  issue_id (required) - The ID of a project issue
       # Example Request:
-      #   POST /projects/:id/issues/:issue_id/unsubscribe
-      post ":id/issues/:issue_id/unsubscribe" do
+      #   DELETE /projects/:id/issues/:issue_id/subscription
+      delete ":id/issues/:issue_id/subscription" do
         issue = user_project.issues.find_by(id: params[:issue_id])
 
         if issue.subscribed?(current_user)
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index d166484ba5..7e78609ecb 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -334,15 +334,15 @@ module API
         #  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/subscribe
-        post "#{path}/subscribe" do
+        #   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)
+          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
-          else
-            not_modified!
           end
         end
 
@@ -352,8 +352,8 @@ module API
         #  id (required)               - The ID of a project
         #  merge_request_id (required) - The ID of a merge request
         # Example Request:
-        #   POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
-        post "#{path}/unsubscribe" do
+        #   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)
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 437caf466b..8361a1649e 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -571,33 +571,45 @@ describe API::API, api: true  do
     end
   end
 
-  describe 'POST :id/issues/:issue_id/subscribe' do
+  describe 'POST :id/issues/:issue_id/subscription' do
     it 'subscribes to an issue' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/subscribe", user2)
+      post api("/projects/#{project.id}/issues/#{issue.id}/subscription", user2)
 
       expect(response.status).to eq(201)
       expect(json_response['subscribed']).to eq(true)
     end
 
     it 'returns 304 if already subscribed' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/subscribe", user)
+      post api("/projects/#{project.id}/issues/#{issue.id}/subscription", user)
 
       expect(response.status).to eq(304)
     end
+
+    it 'returns 404 if the issue is not found' do
+      post api("/projects/#{project.id}/issues/123/subscription", user)
+
+      expect(response.status).to eq(404)
+    end
   end
 
-  describe 'POST :id/issues/:issue_id/unsubscribe' do
+  describe 'DELETE :id/issues/:issue_id/subscription' do
     it 'unsubscribes from an issue' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/unsubscribe", user)
+      post api("/projects/#{project.id}/issues/#{issue.id}/subscription", user)
 
-      expect(response.status).to eq(201)
+      expect(response.status).to eq(200)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/unsubscribe", user2)
+      post api("/projects/#{project.id}/issues/#{issue.id}/subscription", user2)
 
       expect(response.status).to eq(304)
     end
+
+    it 'returns 404 if the issue is not found' do
+      post api("/projects/#{project.id}/issues/123/subscription", user)
+
+      expect(response.status).to eq(404)
+    end
   end
 end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index b71c72a382..c247fcf9c9 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -516,31 +516,31 @@ describe API::API, api: true  do
     end
   end
 
-  describe 'POST :id/merge_requests/:merge_request_id/subscribe' do
+  describe 'POST :id/merge_requests/:merge_request_id/subscription' do
     it 'subscribes to a merge request' do
-      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscribe", admin)
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", admin)
 
       expect(response.status).to eq(201)
       expect(json_response['subscribed']).to eq(true)
     end
 
     it 'returns 304 if already subscribed' do
-      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscribe", user)
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", user)
 
       expect(response.status).to eq(304)
     end
   end
 
-  describe 'POST :id/merge_requests/:merge_request_id/unsubscribe' do
+  describe 'DELETE :id/merge_requests/:merge_request_id/subscription' do
     it 'unsubscribes from a merge request' do
-      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/unsubscribe", user)
+      delete api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", user)
 
-      expect(response.status).to eq(201)
+      expect(response.status).to eq(200)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
-      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/unsubscribe", admin)
+      delete api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", admin)
 
       expect(response.status).to eq(304)
     end

From ea2193aaeb1127746dc78d2dda7037d998911662 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 6 Apr 2016 15:52:16 +0200
Subject: [PATCH 243/283] API: Star and unstar a project

---
 CHANGELOG                          |   1 +
 doc/api/README.md                  |   1 +
 doc/api/projects.md                | 127 +++++++++++++++++++++++++++++
 lib/api/helpers.rb                 |   4 +
 lib/api/projects.rb                |  33 ++++++++
 spec/requests/api/projects_spec.rb |  50 ++++++++++++
 6 files changed, 216 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c633c4bb35..7a2af5a0eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@ v 8.7.0 (unreleased)
   - Add links to CI setup documentation from project settings and builds pages
   - Handle nil descriptions in Slack issue messages (Stan Hu)
   - API: Expose open_issues_count, closed_issues_count, open_merge_requests_count for labels (Robert Schilling)
+  - API: Ability to star and unstar a project (Robert Schilling)
   - Add default scope to projects to exclude projects pending deletion
   - Allow to close merge requests which source projects(forks) are deleted.
   - Ensure empty recipients are rejected in BuildsEmailService
diff --git a/doc/api/README.md b/doc/api/README.md
index 7629ef294a..3a8fa6cebd 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -108,6 +108,7 @@ The following table shows the possible return codes for API requests.
 | ------------- | ----------- |
 | `200 OK` | The `GET`, `PUT` or `DELETE` request was successful, the resource(s) itself is returned as JSON. |
 | `201 Created` | The `POST` request was successful and the resource is returned as JSON. |
+| `304 Not Modified` | Indicates that the resource has not been modified since the last request. |
 | `400 Bad Request` | A required attribute of the API request is missing, e.g., the title of an issue is not given. |
 | `401 Unauthorized` | The user is not authenticated, a valid [user token](#authentication) is necessary. |
 | `403 Forbidden` | The request is not allowed, e.g., the user is not allowed to delete a project. |
diff --git a/doc/api/projects.md b/doc/api/projects.md
index ab716c229d..c5ffc5514c 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -491,6 +491,133 @@ Parameters:
 
 - `id` (required) - The ID of the project to be forked
 
+### Star a project
+
+Stars a given project. Returns status code 201 and the project on success and
+304 if the project is already starred.
+
+```
+POST /projects/:id/star
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id`      | integer | yes | The ID of the project |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/star"
+```
+
+Example response:
+
+```json
+{
+  "id": 3,
+  "description": null,
+  "default_branch": "master",
+  "public": false,
+  "visibility_level": 10,
+  "ssh_url_to_repo": "git@example.com:diaspora/diaspora-project-site.git",
+  "http_url_to_repo": "http://example.com/diaspora/diaspora-project-site.git",
+  "web_url": "http://example.com/diaspora/diaspora-project-site",
+  "tag_list": [
+    "example",
+    "disapora project"
+  ],
+  "name": "Diaspora Project Site",
+  "name_with_namespace": "Diaspora / Diaspora Project Site",
+  "path": "diaspora-project-site",
+  "path_with_namespace": "diaspora/diaspora-project-site",
+  "issues_enabled": true,
+  "open_issues_count": 1,
+  "merge_requests_enabled": true,
+  "builds_enabled": true,
+  "wiki_enabled": true,
+  "snippets_enabled": false,
+  "created_at": "2013-09-30T13: 46: 02Z",
+  "last_activity_at": "2013-09-30T13: 46: 02Z",
+  "creator_id": 3,
+  "namespace": {
+    "created_at": "2013-09-30T13: 46: 02Z",
+    "description": "",
+    "id": 3,
+    "name": "Diaspora",
+    "owner_id": 1,
+    "path": "diaspora",
+    "updated_at": "2013-09-30T13: 46: 02Z"
+  },
+  "archived": true,
+  "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "shared_runners_enabled": true,
+  "forks_count": 0,
+  "star_count": 1
+}
+```
+
+### Unstar a project
+
+Unstars a given project. Returns status code 201 and the project on success
+and 304 if the project is already unstarred.
+
+```
+POST /projects/:id/unstar
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id`      | integer | yes | The ID of the project |
+
+```bash
+curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/unstar"
+```
+
+Example response:
+
+```json
+{
+  "id": 3,
+  "description": null,
+  "default_branch": "master",
+  "public": false,
+  "visibility_level": 10,
+  "ssh_url_to_repo": "git@example.com:diaspora/diaspora-project-site.git",
+  "http_url_to_repo": "http://example.com/diaspora/diaspora-project-site.git",
+  "web_url": "http://example.com/diaspora/diaspora-project-site",
+  "tag_list": [
+    "example",
+    "disapora project"
+  ],
+  "name": "Diaspora Project Site",
+  "name_with_namespace": "Diaspora / Diaspora Project Site",
+  "path": "diaspora-project-site",
+  "path_with_namespace": "diaspora/diaspora-project-site",
+  "issues_enabled": true,
+  "open_issues_count": 1,
+  "merge_requests_enabled": true,
+  "builds_enabled": true,
+  "wiki_enabled": true,
+  "snippets_enabled": false,
+  "created_at": "2013-09-30T13: 46: 02Z",
+  "last_activity_at": "2013-09-30T13: 46: 02Z",
+  "creator_id": 3,
+  "namespace": {
+    "created_at": "2013-09-30T13: 46: 02Z",
+    "description": "",
+    "id": 3,
+    "name": "Diaspora",
+    "owner_id": 1,
+    "path": "diaspora",
+    "updated_at": "2013-09-30T13: 46: 02Z"
+  },
+  "archived": true,
+  "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "shared_runners_enabled": true,
+  "forks_count": 0,
+  "star_count": 0
+}
+```
+
+
 ### Archive a project
 
 Archives the project if the user is either admin or the project owner of this project. This action is
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 4921ae99e7..aa0597564e 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -241,6 +241,10 @@ module API
       render_api_error!('413 Request Entity Too Large', 413)
     end
 
+    def not_modified!
+      render_api_error!('304 Not modified', 304)
+    end
+
     def render_validation_error!(model)
       if model.errors.any?
         render_api_error!(model.errors.messages || '400 Bad Request', 400)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 24b3100547..ebcf7a4eed 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -272,6 +272,39 @@ module API
         present user_project, with: Entities::Project
       end
 
+      # Star project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      # Example Request:
+      #   POST /projects/:id/star
+      post ':id/star' do
+        if !current_user.starred?(user_project)
+          current_user.toggle_star(user_project)
+          user_project.reload
+          present user_project, with: Entities::Project
+
+        else
+          not_modified!
+        end
+      end
+
+      # Unstar project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      # Example Request:
+      #   POST /projects/:id/unstar
+      post ':id/unstar' do
+        if current_user.starred?(user_project)
+          current_user.toggle_star(user_project)
+          user_project.reload
+          present user_project, with: Entities::Project
+        else
+          not_modified!
+        end
+      end
+
       # Remove project
       #
       # Parameters:
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index be2034e0f3..f05622f77f 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1020,6 +1020,56 @@ describe API::API, api: true  do
     end
   end
 
+  describe 'POST /projects/:id/star' do
+    context 'on an unstarred project' do
+      it 'stars the project' do
+        post api("/projects/#{project.id}/star", user)
+
+        expect(response.status).to eq(201)
+        expect(json_response['star_count']).to eq(1)
+      end
+    end
+
+    context 'on a starred project' do
+      before do
+        user.toggle_star(project)
+        project.reload
+      end
+
+      it 'does not modify the star count' do
+        post api("/projects/#{project.id}/star", user)
+
+        expect(response.status).to eq(304)
+        expect(project.star_count).to eq(1)
+      end
+    end
+  end
+
+  describe 'POST /projects/:id/unstar' do
+    context 'on a starred project' do
+      before do
+        user.toggle_star(project)
+        project.reload
+      end
+
+      it 'unstars the project' do
+        post api("/projects/#{project.id}/unstar", user)
+
+        expect(response.status).to eq(201)
+        expect(json_response['star_count']).to eq(0)
+      end
+    end
+
+    context 'on an unstarred project' do
+      it 'does not modify the star count' do
+        post api("/projects/#{project.id}/unstar", user)
+
+        expect(response.status).to eq(304)
+        expect(project.star_count).to eq(0)
+      end
+    end
+  end
+
   describe 'DELETE /projects/:id' do
     context 'when authenticated as user' do
       it 'should remove project' do

From 3ab9ea8dae1edc6ab8c8563843342890736eb24c Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Tue, 12 Apr 2016 18:52:43 +0200
Subject: [PATCH 244/283] Make staring API more restful

---
 doc/api/projects.md                | 12 ++++++------
 lib/api/projects.rb                | 11 +++++------
 spec/requests/api/projects_spec.rb |  8 ++++----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/doc/api/projects.md b/doc/api/projects.md
index c5ffc5514c..b25c908008 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -493,8 +493,8 @@ Parameters:
 
 ### Star a project
 
-Stars a given project. Returns status code 201 and the project on success and
-304 if the project is already starred.
+Stars a given project. Returns status code `201` and the project on success and
+`304` if the project is already starred.
 
 ```
 POST /projects/:id/star
@@ -556,11 +556,11 @@ Example response:
 
 ### Unstar a project
 
-Unstars a given project. Returns status code 201 and the project on success
-and 304 if the project is already unstarred.
+Unstars a given project. Returns status code `200` and the project on success
+and `304` if the project is not starred.
 
 ```
-POST /projects/:id/unstar
+DELETE /projects/:id/star
 ```
 
 | Attribute | Type | Required | Description |
@@ -568,7 +568,7 @@ POST /projects/:id/unstar
 | `id`      | integer | yes | The ID of the project |
 
 ```bash
-curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/unstar"
+curl -X DELETE -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/star"
 ```
 
 Example response:
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index ebcf7a4eed..c7fdfbfe57 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -279,13 +279,12 @@ module API
       # Example Request:
       #   POST /projects/:id/star
       post ':id/star' do
-        if !current_user.starred?(user_project)
+        if current_user.starred?(user_project)
+          not_modified!
+        else
           current_user.toggle_star(user_project)
           user_project.reload
           present user_project, with: Entities::Project
-
-        else
-          not_modified!
         end
       end
 
@@ -294,8 +293,8 @@ module API
       # Parameters:
       #   id (required) - The ID of a project
       # Example Request:
-      #   POST /projects/:id/unstar
-      post ':id/unstar' do
+      #   DELETE /projects/:id/unstar
+      delete ':id/star' do
         if current_user.starred?(user_project)
           current_user.toggle_star(user_project)
           user_project.reload
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index f05622f77f..2a7c55fe65 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1045,7 +1045,7 @@ describe API::API, api: true  do
     end
   end
 
-  describe 'POST /projects/:id/unstar' do
+  describe 'DELETE /projects/:id/star' do
     context 'on a starred project' do
       before do
         user.toggle_star(project)
@@ -1053,16 +1053,16 @@ describe API::API, api: true  do
       end
 
       it 'unstars the project' do
-        post api("/projects/#{project.id}/unstar", user)
+        delete api("/projects/#{project.id}/star", user)
 
-        expect(response.status).to eq(201)
+        expect(response.status).to eq(200)
         expect(json_response['star_count']).to eq(0)
       end
     end
 
     context 'on an unstarred project' do
       it 'does not modify the star count' do
-        post api("/projects/#{project.id}/unstar", user)
+        delete api("/projects/#{project.id}/star", user)
 
         expect(response.status).to eq(304)
         expect(project.star_count).to eq(0)

From 3b9edce803c91b5f51675291fdf22f1159cea456 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 13 Apr 2016 15:19:50 +0200
Subject: [PATCH 245/283] Instrument the HousekeepingService class

This allows us to track how much time is spent in updating the
"pushes_since_gc" column as well as the time needed to obtain the lease.
---
 CHANGELOG                                     |  1 +
 app/services/projects/housekeeping_service.rb | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5399e3e5b8..ec8db47157 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.7.0 (unreleased)
+  - The Projects::HousekeepingService class has extra instrumentation (Yorick Peterse)
   - All service classes (those residing in app/services) are now instrumented (Yorick Peterse)
   - Developers can now add custom tags to transactions (Yorick Peterse)
   - Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
diff --git a/app/services/projects/housekeeping_service.rb b/app/services/projects/housekeeping_service.rb
index a0973c5d26..3b7c36f090 100644
--- a/app/services/projects/housekeeping_service.rb
+++ b/app/services/projects/housekeeping_service.rb
@@ -26,7 +26,9 @@ module Projects
 
       GitlabShellOneShotWorker.perform_async(:gc, @project.path_with_namespace)
     ensure
-      @project.update_column(:pushes_since_gc, 0)
+      Gitlab::Metrics.measure(:reset_pushes_since_gc) do
+        @project.update_column(:pushes_since_gc, 0)
+      end
     end
 
     def needed?
@@ -34,14 +36,18 @@ module Projects
     end
 
     def increment!
-      @project.increment!(:pushes_since_gc)
+      Gitlab::Metrics.measure(:increment_pushes_since_gc) do
+        @project.increment!(:pushes_since_gc)
+      end
     end
 
     private
 
     def try_obtain_lease
-      lease = ::Gitlab::ExclusiveLease.new("project_housekeeping:#{@project.id}", timeout: LEASE_TIMEOUT)
-      lease.try_obtain
+      Gitlab::Metrics.measure(:obtain_housekeeping_lease) do
+        lease = ::Gitlab::ExclusiveLease.new("project_housekeeping:#{@project.id}", timeout: LEASE_TIMEOUT)
+        lease.try_obtain
+      end
     end
   end
 end

From acf911eeae0e952aec52d0e491efb69c99fb31f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 12 Apr 2016 18:09:52 +0200
Subject: [PATCH 246/283] Fix a bug with trailing slash in bamboo_url
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG                                     |   1 +
 app/models/project_services/bamboo_service.rb |  20 +-
 .../project_services/bamboo_service_spec.rb   | 266 ++++++++++++++----
 3 files changed, 223 insertions(+), 64 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 382318a203..8646d99b64 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.7.0 (unreleased)
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
   - Allow SAML to handle external users based on user's information !3530
   - Add endpoints to archive or unarchive a project !3372
+  - Fix a bug whith trailing slash in bamboo_url
   - Add links to CI setup documentation from project settings and builds pages
   - Handle nil descriptions in Slack issue messages (Stan Hu)
   - API: Expose open_issues_count, closed_issues_count, open_merge_requests_count for labels (Robert Schilling)
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb
index 9e7f642180..060062aaf7 100644
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -82,17 +82,17 @@ class BambooService < CiService
   end
 
   def build_info(sha)
-    url = URI.parse("#{bamboo_url}/rest/api/latest/result?label=#{sha}")
+    url = URI.join(bamboo_url, "/rest/api/latest/result?label=#{sha}").to_s
 
     if username.blank? && password.blank?
-      @response = HTTParty.get(parsed_url.to_s, verify: false)
+      @response = HTTParty.get(url, verify: false)
     else
-      get_url = "#{url}&os_authType=basic"
+      url << '&os_authType=basic'
       auth = {
-          username: username,
-          password: password,
+        username: username,
+        password: password
       }
-      @response = HTTParty.get(get_url, verify: false, basic_auth: auth)
+      @response = HTTParty.get(url, verify: false, basic_auth: auth)
     end
   end
 
@@ -101,11 +101,11 @@ class BambooService < CiService
 
     if @response.code != 200 || @response['results']['results']['size'] == '0'
       # If actual build link can't be determined, send user to build summary page.
-      "#{bamboo_url}/browse/#{build_key}"
+      URI.join(bamboo_url, "/browse/#{build_key}").to_s
     else
       # If actual build link is available, go to build result page.
       result_key = @response['results']['results']['result']['planResultKey']['key']
-      "#{bamboo_url}/browse/#{result_key}"
+      URI.join(bamboo_url, "/browse/#{result_key}").to_s
     end
   end
 
@@ -134,7 +134,7 @@ class BambooService < CiService
     return unless supported_events.include?(data[:object_kind])
 
     # Bamboo requires a GET and does not take any data.
-    self.class.get("#{bamboo_url}/updateAndBuild.action?buildKey=#{build_key}",
-                   verify: false)
+    url = URI.join(bamboo_url, "/updateAndBuild.action?buildKey=#{build_key}").to_s
+    self.class.get(url, verify: false)
   end
 end
diff --git a/spec/models/project_services/bamboo_service_spec.rb b/spec/models/project_services/bamboo_service_spec.rb
index c34b2487ec..31b2c90122 100644
--- a/spec/models/project_services/bamboo_service_spec.rb
+++ b/spec/models/project_services/bamboo_service_spec.rb
@@ -21,74 +21,232 @@
 require 'spec_helper'
 
 describe BambooService, models: true do
-  describe "Associations" do
+  describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }
   end
 
-  describe "Execute" do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project) }
+  describe 'Validations' do
+    describe '#bamboo_url' do
+      it 'does not validate the presence of bamboo_url if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
 
-    context "when a password was previously set" do
-      before do
-        @bamboo_service = BambooService.create(
-          project: create(:project),
-          properties: {
-            bamboo_url: 'http://gitlab.com',
-            username: 'mic',
-            password: "password"
-          }
-        )
-      end
-  
-      it "reset password if url changed" do
-        @bamboo_service.bamboo_url = 'http://gitlab1.com'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to be_nil
-      end
-  
-      it "does not reset password if username changed" do
-        @bamboo_service.username = "some_name"
-        @bamboo_service.save
-        expect(@bamboo_service.password).to eq("password")
+        expect(bamboo_service).not_to validate_presence_of(:bamboo_url)
       end
 
-      it "does not reset password if new url is set together with password, even if it's the same password" do
-        @bamboo_service.bamboo_url = 'http://gitlab_edited.com'
-        @bamboo_service.password = 'password'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to eq("password")
-        expect(@bamboo_service.bamboo_url).to eq("http://gitlab_edited.com")
-      end
+      it 'validates the presence of bamboo_url if service is active' do
+        bamboo_service = service
+        bamboo_service.active = true
 
-      it "should reset password if url changed, even if setter called multiple times" do
-        @bamboo_service.bamboo_url = 'http://gitlab1.com'
-        @bamboo_service.bamboo_url = 'http://gitlab1.com'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to be_nil
+        expect(bamboo_service).to validate_presence_of(:bamboo_url)
       end
     end
-    
-    context "when no password was previously set" do
-      before do
-        @bamboo_service = BambooService.create(
-          project: create(:project),
-          properties: {
-            bamboo_url: 'http://gitlab.com',
-            username: 'mic'
-          }
-        )
+
+    describe '#build_key' do
+      it 'does not validate the presence of build_key if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:build_key)
       end
 
-      it "saves password if new url is set together with password" do
-        @bamboo_service.bamboo_url = 'http://gitlab_edited.com'
-        @bamboo_service.password = 'password'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to eq("password")
-        expect(@bamboo_service.bamboo_url).to eq("http://gitlab_edited.com")
+      it 'validates the presence of build_key if service is active' do
+        bamboo_service = service
+        bamboo_service.active = true
+
+        expect(bamboo_service).to validate_presence_of(:build_key)
+      end
+    end
+
+    describe '#username' do
+      it 'does not validate the presence of username if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:username)
       end
 
+      it 'does not validate the presence of username if username is nil' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.password = nil
+
+        expect(bamboo_service).not_to validate_presence_of(:username)
+      end
+
+      it 'validates the presence of username if service is active and username is present' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.password = 'secret'
+
+        expect(bamboo_service).to validate_presence_of(:username)
+      end
+    end
+
+    describe '#password' do
+      it 'does not validate the presence of password if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:password)
+      end
+
+      it 'does not validate the presence of password if username is nil' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.username = nil
+
+        expect(bamboo_service).not_to validate_presence_of(:password)
+      end
+
+      it 'validates the presence of password if service is active and username is present' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.username = 'john'
+
+        expect(bamboo_service).to validate_presence_of(:password)
+      end
     end
   end
+
+  describe 'Callbacks' do
+    describe 'before_update :reset_password' do
+      context 'when a password was previously set' do
+        it 'resets password if url changed' do
+          bamboo_service = service
+
+          bamboo_service.bamboo_url = 'http://gitlab1.com'
+          bamboo_service.save
+
+          expect(bamboo_service.password).to be_nil
+        end
+
+        it 'does not reset password if username changed' do
+          bamboo_service = service
+
+          bamboo_service.username = 'some_name'
+          bamboo_service.save
+
+          expect(bamboo_service.password).to eq('password')
+        end
+
+        it "does not reset password if new url is set together with password, even if it's the same password" do
+          bamboo_service = service
+
+          bamboo_service.bamboo_url = 'http://gitlab_edited.com'
+          bamboo_service.password = 'password'
+          bamboo_service.save
+
+          expect(bamboo_service.password).to eq('password')
+          expect(bamboo_service.bamboo_url).to eq('http://gitlab_edited.com')
+        end
+      end
+
+      it 'saves password if new url is set together with password when no password was previously set' do
+        bamboo_service = service
+        bamboo_service.password = nil
+
+        bamboo_service.bamboo_url = 'http://gitlab_edited.com'
+        bamboo_service.password = 'password'
+        bamboo_service.save
+
+        expect(bamboo_service.password).to eq('password')
+        expect(bamboo_service.bamboo_url).to eq('http://gitlab_edited.com')
+      end
+    end
+  end
+
+  describe '#build_page' do
+    it 'returns a specific URL when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.build_page('123', 'unused')).to eq('http://gitlab.com/browse/foo')
+    end
+
+    it 'returns a specific URL when response has no results' do
+      stub_request(body: %Q({"results":{"results":{"size":"0"}}}))
+
+      expect(service.build_page('123', 'unused')).to eq('http://gitlab.com/browse/foo')
+    end
+
+    it 'returns a build URL when bamboo_url has no trailing slash' do
+      stub_request(body: %Q({"results":{"results":{"result":{"planResultKey":{"key":"42"}}}}}))
+
+      expect(service(bamboo_url: 'http://gitlab.com').build_page('123', 'unused')).to eq('http://gitlab.com/browse/42')
+    end
+
+    it 'returns a build URL when bamboo_url has a trailing slash' do
+      stub_request(body: %Q({"results":{"results":{"result":{"planResultKey":{"key":"42"}}}}}))
+
+      expect(service(bamboo_url: 'http://gitlab.com/').build_page('123', 'unused')).to eq('http://gitlab.com/browse/42')
+    end
+  end
+
+  describe '#commit_status' do
+    it 'sets commit status to :error when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+
+    it 'sets commit status to "pending" when status is 404' do
+      stub_request(status: 404)
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to "pending" when response has no results' do
+      stub_request(body: %Q({"results":{"results":{"size":"0"}}}))
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to "success" when build state contains Success' do
+      stub_request(build_state: 'YAY Success!')
+
+      expect(service.commit_status('123', 'unused')).to eq('success')
+    end
+
+    it 'sets commit status to "failed" when build state contains Failed' do
+      stub_request(build_state: 'NO Failed!')
+
+      expect(service.commit_status('123', 'unused')).to eq('failed')
+    end
+
+    it 'sets commit status to "pending" when build state contains Pending' do
+      stub_request(build_state: 'NO Pending!')
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to :error when build state is unknown' do
+      stub_request(build_state: 'FOO BAR!')
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+  end
+
+  def service(bamboo_url: 'http://gitlab.com')
+    described_class.create(
+      project: build_stubbed(:empty_project),
+      properties: {
+        bamboo_url: bamboo_url,
+        username: 'mic',
+        password: 'password',
+        build_key: 'foo'
+      }
+    )
+  end
+
+  def stub_request(status: 200, body: nil, build_state: 'success')
+    bamboo_full_url = 'http://mic:password@gitlab.com/rest/api/latest/result?label=123&os_authType=basic'
+    body ||= %Q({"results":{"results":{"result":{"buildState":"#{build_state}"}}}})
+
+    WebMock.stub_request(:get, bamboo_full_url).to_return(
+      status: status,
+      headers: { 'Content-Type' => 'application/json' },
+      body: body
+    )
+  end
 end

From 02cfbf0db5dda8ca86f4811e5d5cb055a8cc5cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 13 Apr 2016 11:25:42 +0200
Subject: [PATCH 247/283] Refactor and expose only
 Gitlab::UrlBuilder.build(record)
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/commit.rb                        |   6 +-
 app/services/issues/base_service.rb         |   2 +-
 app/services/merge_requests/base_service.rb |   3 +-
 app/views/search/results/_note.html.haml    |   2 +-
 lib/gitlab/note_data_builder.rb             |   3 +-
 lib/gitlab/url_builder.rb                   |  74 +++++-----
 spec/factories/commits.rb                   |  12 ++
 spec/lib/gitlab/note_data_builder_spec.rb   |   3 +-
 spec/lib/gitlab/url_builder_spec.rb         | 143 ++++++++++++--------
 9 files changed, 147 insertions(+), 101 deletions(-)
 create mode 100644 spec/factories/commits.rb

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 11ecfcace1..d1f07ccd55 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -154,7 +154,7 @@ class Commit
       id: id,
       message: safe_message,
       timestamp: committed_date.xmlschema,
-      url: commit_url,
+      url: Gitlab::UrlBuilder.build(self),
       author: {
         name: author_name,
         email: author_email
@@ -168,10 +168,6 @@ class Commit
     data
   end
 
-  def commit_url
-    project.present? ? "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{id}" : ""
-  end
-
   # Discover issues should be closed when this commit is pushed to a project's
   # default branch.
   def closes_issues(current_user = self.committer)
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb
index 770f32de94..772f5c5fff 100644
--- a/app/services/issues/base_service.rb
+++ b/app/services/issues/base_service.rb
@@ -3,7 +3,7 @@ module Issues
 
     def hook_data(issue, action)
       issue_data = issue.to_hook_data(current_user)
-      issue_url = Gitlab::UrlBuilder.new(:issue).build(issue.id)
+      issue_url = Gitlab::UrlBuilder.build(issue)
       issue_data[:object_attributes].merge!(url: issue_url, action: action)
       issue_data
     end
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index ac5b58db86..e6837a1869 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -20,8 +20,7 @@ module MergeRequests
 
     def hook_data(merge_request, action)
       hook_data = merge_request.to_hook_data(current_user)
-      merge_request_url = Gitlab::UrlBuilder.new(:merge_request).build(merge_request.id)
-      hook_data[:object_attributes][:url] = merge_request_url
+      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
       hook_data[:object_attributes][:action] = action
       hook_data
     end
diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml
index 9544e3d3e1..d9400b1d9f 100644
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@@ -1,5 +1,5 @@
 - project = note.project
-- note_url = Gitlab::UrlBuilder.new(:note).build(note.id)
+- note_url = Gitlab::UrlBuilder.build(note)
 - noteable_identifier = note.noteable.try(:iid) || note.noteable.id
 .search-result-row
   %h5.note-search-caption.str-truncated
diff --git a/lib/gitlab/note_data_builder.rb b/lib/gitlab/note_data_builder.rb
index 18523e0aef..8bdc89a775 100644
--- a/lib/gitlab/note_data_builder.rb
+++ b/lib/gitlab/note_data_builder.rb
@@ -59,8 +59,7 @@ module Gitlab
           repository: project.hook_attrs.slice(:name, :url, :description, :homepage)
         }
 
-        base_data[:object_attributes][:url] =
-             Gitlab::UrlBuilder.new(:note).build(note.id)
+        base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
         base_data
       end
 
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index f301d42939..f1943222ed 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -4,50 +4,58 @@ module Gitlab
     include GitlabRoutingHelper
     include ActionView::RecordIdentifier
 
-    def initialize(type)
-      @type = type
+    attr_reader :object
+
+    def self.build(object)
+      new(object).url
     end
 
-    def build(id)
-      case @type
-      when :issue
-        build_issue_url(id)
-      when :merge_request
-        build_merge_request_url(id)
-      when :note
-        build_note_url(id)
-
+    def url
+      case object
+      when Commit
+        commit_url
+      when Issue
+        issue_url(object)
+      when MergeRequest
+        merge_request_url(object)
+      when Note
+        note_url
+      else
+        raise NotImplementedError.new("No URL builder defined for #{object.class}")
       end
     end
 
     private
 
-    def build_issue_url(id)
-      issue = Issue.find(id)
-      issue_url(issue)
+    def initialize(object)
+      @object = object
     end
 
-    def build_merge_request_url(id)
-      merge_request = MergeRequest.find(id)
-      merge_request_url(merge_request)
+    def commit_url(opts = {})
+      return '' if object.project.nil?
+
+      namespace_project_commit_url({
+        namespace_id: object.project.namespace,
+        project_id: object.project,
+        id: object.id
+      }.merge!(opts))
     end
 
-    def build_note_url(id)
-      note = Note.find(id)
-      if note.for_commit?
-        namespace_project_commit_url(namespace_id: note.project.namespace,
-                                     id: note.commit_id,
-                                     project_id: note.project,
-                                     anchor: dom_id(note))
-      elsif note.for_issue?
-        issue = Issue.find(note.noteable_id)
-        issue_url(issue, anchor: dom_id(note))
-      elsif note.for_merge_request?
-        merge_request = MergeRequest.find(note.noteable_id)
-        merge_request_url(merge_request, anchor: dom_id(note))
-      elsif note.for_snippet?
-        snippet = Snippet.find(note.noteable_id)
-        project_snippet_url(snippet, anchor: dom_id(note))
+    def note_url
+      if object.for_commit?
+        commit_url(id: object.commit_id, anchor: dom_id(object))
+
+      elsif object.for_issue?
+        issue = Issue.find(object.noteable_id)
+        issue_url(issue, anchor: dom_id(object))
+
+      elsif object.for_merge_request?
+        merge_request = MergeRequest.find(object.noteable_id)
+        merge_request_url(merge_request, anchor: dom_id(object))
+
+      elsif object.for_snippet?
+        snippet = Snippet.find(object.noteable_id)
+        project_snippet_url(snippet, anchor: dom_id(object))
       end
     end
   end
diff --git a/spec/factories/commits.rb b/spec/factories/commits.rb
new file mode 100644
index 0000000000..ac6eb0a789
--- /dev/null
+++ b/spec/factories/commits.rb
@@ -0,0 +1,12 @@
+require_relative '../support/repo_helpers'
+
+FactoryGirl.define do
+  factory :commit do
+    git_commit RepoHelpers.sample_commit
+    project factory: :empty_project
+
+    initialize_with do
+      new(git_commit, project)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/note_data_builder_spec.rb b/spec/lib/gitlab/note_data_builder_spec.rb
index da65267744..f093d0a0d8 100644
--- a/spec/lib/gitlab/note_data_builder_spec.rb
+++ b/spec/lib/gitlab/note_data_builder_spec.rb
@@ -4,13 +4,12 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:data) { Gitlab::NoteDataBuilder.build(note, user) }
-  let(:note_url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
   let(:fixed_time) { Time.at(1425600000) } # Avoid time precision errors
 
   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(note_url)
+    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
diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb
index f023be6ae4..6ffc0d6e65 100644
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
@@ -1,77 +1,110 @@
 require 'spec_helper'
 
 describe Gitlab::UrlBuilder, lib: true do
-  describe 'When asking for an issue' do
-    it 'returns the issue url' do
-      issue = create(:issue)
-      url = Gitlab::UrlBuilder.new(:issue).build(issue.id)
-      expect(url).to eq "#{Settings.gitlab['url']}/#{issue.project.path_with_namespace}/issues/#{issue.iid}"
+  describe '.build' do
+    context 'when passing a Commit' do
+      it 'returns a proper URL' do
+        commit = build_stubbed(:commit)
+
+        url = described_class.build(commit)
+
+        expect(url).to eq "#{Settings.gitlab['url']}/#{commit.project.path_with_namespace}/commit/#{commit.id}"
+      end
     end
-  end
 
-  describe 'When asking for an merge request' do
-    it 'returns the merge request url' do
-      merge_request = create(:merge_request)
-      url = Gitlab::UrlBuilder.new(:merge_request).build(merge_request.id)
-      expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.path_with_namespace}/merge_requests/#{merge_request.iid}"
+    context 'when passing an Issue' do
+      it 'returns a proper URL' do
+        issue = build_stubbed(:issue, iid: 42)
+
+        url = described_class.build(issue)
+
+        expect(url).to eq "#{Settings.gitlab['url']}/#{issue.project.path_with_namespace}/issues/#{issue.iid}"
+      end
     end
-  end
 
-  describe 'When asking for a note on commit' do
-    let(:note) { create(:note_on_commit) }
-    let(:url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
+    context 'when passing a MergeRequest' do
+      it 'returns a proper URL' do
+        merge_request = build_stubbed(:merge_request, iid: 42)
 
-    it 'returns the note url' do
-      expect(url).to eq "#{Settings.gitlab['url']}/#{note.project.path_with_namespace}/commit/#{note.commit_id}#note_#{note.id}"
+        url = described_class.build(merge_request)
+
+        expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.path_with_namespace}/merge_requests/#{merge_request.iid}"
+      end
     end
-  end
 
-  describe 'When asking for a note on commit diff' do
-    let(:note) { create(:note_on_commit_diff) }
-    let(:url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
+    context 'when passing a Note' do
+      context 'on a Commit' do
+        it 'returns a proper URL' do
+          note = build_stubbed(:note_on_commit)
 
-    it 'returns the note url' do
-      expect(url).to eq "#{Settings.gitlab['url']}/#{note.project.path_with_namespace}/commit/#{note.commit_id}#note_#{note.id}"
-    end
-  end
+          url = described_class.build(note)
 
-  describe 'When asking for a note on issue' do
-    let(:issue) { create(:issue) }
-    let(:note) { create(:note_on_issue, noteable_id: issue.id) }
-    let(:url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
+          expect(url).to eq "#{Settings.gitlab['url']}/#{note.project.path_with_namespace}/commit/#{note.commit_id}#note_#{note.id}"
+        end
+      end
 
-    it 'returns the note url' do
-      expect(url).to eq "#{Settings.gitlab['url']}/#{issue.project.path_with_namespace}/issues/#{issue.iid}#note_#{note.id}"
-    end
-  end
+      context 'on a CommitDiff' do
+        it 'returns a proper URL' do
+          note = build_stubbed(:note_on_commit_diff)
 
-  describe 'When asking for a note on merge request' do
-    let(:merge_request) { create(:merge_request) }
-    let(:note) { create(:note_on_merge_request, noteable_id: merge_request.id) }
-    let(:url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
+          url = described_class.build(note)
 
-    it 'returns the note url' do
-      expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.path_with_namespace}/merge_requests/#{merge_request.iid}#note_#{note.id}"
-    end
-  end
+          expect(url).to eq "#{Settings.gitlab['url']}/#{note.project.path_with_namespace}/commit/#{note.commit_id}#note_#{note.id}"
+        end
+      end
 
-  describe 'When asking for a note on merge request diff' do
-    let(:merge_request) { create(:merge_request) }
-    let(:note) { create(:note_on_merge_request_diff, noteable_id: merge_request.id) }
-    let(:url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
+      context 'on an Issue' do
+        it 'returns a proper URL' do
+          issue = create(:issue, iid: 42)
+          note = build_stubbed(:note_on_issue, noteable: issue)
 
-    it 'returns the note url' do
-      expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.path_with_namespace}/merge_requests/#{merge_request.iid}#note_#{note.id}"
-    end
-  end
+          url = described_class.build(note)
 
-  describe 'When asking for a note on project snippet' do
-    let(:snippet) { create(:project_snippet) }
-    let(:note) { create(:note_on_project_snippet, noteable_id: snippet.id) }
-    let(:url) { Gitlab::UrlBuilder.new(:note).build(note.id) }
+          expect(url).to eq "#{Settings.gitlab['url']}/#{issue.project.path_with_namespace}/issues/#{issue.iid}#note_#{note.id}"
+        end
+      end
 
-    it 'returns the note url' do
-      expect(url).to eq "#{Settings.gitlab['url']}/#{snippet.project.path_with_namespace}/snippets/#{note.noteable_id}#note_#{note.id}"
+      context 'on a MergeRequest' do
+        it 'returns a proper URL' do
+          merge_request = create(:merge_request, iid: 42)
+          note = build_stubbed(:note_on_merge_request, noteable: merge_request)
+
+          url = described_class.build(note)
+
+          expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.path_with_namespace}/merge_requests/#{merge_request.iid}#note_#{note.id}"
+        end
+      end
+
+      context 'on a MergeRequestDiff' do
+        it 'returns a proper URL' do
+          merge_request = create(:merge_request, iid: 42)
+          note = build_stubbed(:note_on_merge_request_diff, noteable: merge_request)
+
+          url = described_class.build(note)
+
+          expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.path_with_namespace}/merge_requests/#{merge_request.iid}#note_#{note.id}"
+        end
+      end
+
+      context 'on a ProjectSnippet' do
+        it 'returns a proper URL' do
+          project_snippet = create(:project_snippet)
+          note = build_stubbed(:note_on_project_snippet, noteable: project_snippet)
+
+          url = described_class.build(note)
+
+          expect(url).to eq "#{Settings.gitlab['url']}/#{project_snippet.project.path_with_namespace}/snippets/#{note.noteable_id}#note_#{note.id}"
+        end
+      end
+
+      context 'on another object' do
+        it 'returns a proper URL' do
+          project = build_stubbed(:project)
+
+          expect { described_class.build(project) }.
+            to raise_error(NotImplementedError, 'No URL builder defined for Project')
+        end
+      end
     end
   end
 end

From 54231aa4e036179d035ddd3641bc15a5b31883f2 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 13 Apr 2016 12:50:00 +0200
Subject: [PATCH 248/283] Styling changes to code and docs

---
 doc/api/projects.md                |  1 -
 lib/api/helpers.rb                 |  2 +-
 lib/api/projects.rb                |  4 +++-
 spec/requests/api/projects_spec.rb | 10 ++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/doc/api/projects.md b/doc/api/projects.md
index b25c908008..de1faadebf 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -617,7 +617,6 @@ Example response:
 }
 ```
 
-
 ### Archive a project
 
 Archives the project if the user is either admin or the project owner of this project. This action is
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index aa0597564e..54452f763a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -242,7 +242,7 @@ module API
     end
 
     def not_modified!
-      render_api_error!('304 Not modified', 304)
+      render_api_error!('304 Not Modified', 304)
     end
 
     def render_validation_error!(model)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c7fdfbfe57..cc2c7a0c50 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -284,6 +284,7 @@ module API
         else
           current_user.toggle_star(user_project)
           user_project.reload
+
           present user_project, with: Entities::Project
         end
       end
@@ -293,11 +294,12 @@ module API
       # Parameters:
       #   id (required) - The ID of a project
       # Example Request:
-      #   DELETE /projects/:id/unstar
+      #   DELETE /projects/:id/star
       delete ':id/star' do
         if current_user.starred?(user_project)
           current_user.toggle_star(user_project)
           user_project.reload
+
           present user_project, with: Entities::Project
         else
           not_modified!
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 2a7c55fe65..fccd08bd6d 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1023,7 +1023,7 @@ describe API::API, api: true  do
   describe 'POST /projects/:id/star' do
     context 'on an unstarred project' do
       it 'stars the project' do
-        post api("/projects/#{project.id}/star", user)
+        expect { post api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(1)
 
         expect(response.status).to eq(201)
         expect(json_response['star_count']).to eq(1)
@@ -1037,10 +1037,9 @@ describe API::API, api: true  do
       end
 
       it 'does not modify the star count' do
-        post api("/projects/#{project.id}/star", user)
+        expect { post api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
 
         expect(response.status).to eq(304)
-        expect(project.star_count).to eq(1)
       end
     end
   end
@@ -1053,7 +1052,7 @@ describe API::API, api: true  do
       end
 
       it 'unstars the project' do
-        delete api("/projects/#{project.id}/star", user)
+        expect { delete api("/projects/#{project.id}/star", user) }.to change { project.reload.star_count }.by(-1)
 
         expect(response.status).to eq(200)
         expect(json_response['star_count']).to eq(0)
@@ -1062,10 +1061,9 @@ describe API::API, api: true  do
 
     context 'on an unstarred project' do
       it 'does not modify the star count' do
-        delete api("/projects/#{project.id}/star", user)
+        expect { delete api("/projects/#{project.id}/star", user) }.not_to change { project.reload.star_count }
 
         expect(response.status).to eq(304)
-        expect(project.star_count).to eq(0)
       end
     end
   end

From a9200d93d3e3d586302887fcaa0cf8f5fbd9a613 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 13 Apr 2016 16:30:20 +0200
Subject: [PATCH 249/283] Ensure that issues and merge requests are found

---
 doc/api/merge_requests.md                |  1 +
 lib/api/issues.rb                        |  8 ++++----
 spec/requests/api/issues_spec.rb         |  6 +++---
 spec/requests/api/merge_requests_spec.rb | 12 ++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 3c18ebfa31..2057f9d77a 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -680,6 +680,7 @@ Example response:
   "subscribed": true
 }
 ```
+
 ## Unsubscribe from a merge request
 
 Unsubscribes the authenticated user from a merge request to not receive
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 37d2507307..4cdecadfe0 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -239,8 +239,8 @@ module API
       #  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_by(id: params[:issue_id])
+      post ':id/issues/:issue_id/subscription' do
+        issue = user_project.issues.find(params[:issue_id])
 
         if issue.subscribed?(current_user)
           not_modified!
@@ -257,8 +257,8 @@ module API
       #  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_by(id: params[:issue_id])
+      delete ':id/issues/:issue_id/subscription' do
+        issue = user_project.issues.find(params[:issue_id])
 
         if issue.subscribed?(current_user)
           issue.unsubscribe(current_user)
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 8361a1649e..86ea223f20 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -594,20 +594,20 @@ describe API::API, api: true  do
 
   describe 'DELETE :id/issues/:issue_id/subscription' do
     it 'unsubscribes from an issue' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/subscription", user)
+      delete api("/projects/#{project.id}/issues/#{issue.id}/subscription", user)
 
       expect(response.status).to eq(200)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
-      post api("/projects/#{project.id}/issues/#{issue.id}/subscription", user2)
+      delete api("/projects/#{project.id}/issues/#{issue.id}/subscription", user2)
 
       expect(response.status).to eq(304)
     end
 
     it 'returns 404 if the issue is not found' do
-      post api("/projects/#{project.id}/issues/123/subscription", user)
+      delete api("/projects/#{project.id}/issues/123/subscription", user)
 
       expect(response.status).to eq(404)
     end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index c247fcf9c9..1fa7e76894 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -529,6 +529,12 @@ describe API::API, api: true  do
 
       expect(response.status).to eq(304)
     end
+
+    it 'returns 404 if the merge request is not found' do
+      post api("/projects/#{project.id}/merge_requests/123/subscription", user)
+
+      expect(response.status).to eq(404)
+    end
   end
 
   describe 'DELETE :id/merge_requests/:merge_request_id/subscription' do
@@ -544,6 +550,12 @@ describe API::API, api: true  do
 
       expect(response.status).to eq(304)
     end
+
+    it 'returns 404 if the merge request is not found' do
+      post api("/projects/#{project.id}/merge_requests/123/subscription", user)
+
+      expect(response.status).to eq(404)
+    end
   end
 
   def mr_with_later_created_and_updated_at_time

From 31e28ebcebc054eaeef2eddba64ff2ff7ca3104f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 12 Apr 2016 15:55:54 +0200
Subject: [PATCH 250/283] Load related MRs/branches asynchronously

Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
---
 CHANGELOG                                     |  1 +
 app/assets/javascripts/issue.js.coffee        | 23 +++++++++++
 app/controllers/projects/issues_controller.rb | 40 ++++++++++++++-----
 app/views/projects/issues/show.html.haml      |  8 ++--
 config/routes.rb                              |  2 +
 features/steps/shared/issuable.rb             |  7 +++-
 6 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed59bc1b25..adbcd8f8bc 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.7.0 (unreleased)
   - All service classes (those residing in app/services) are now instrumented (Yorick Peterse)
   - Developers can now add custom tags to transactions (Yorick Peterse)
+  - Loading of an issue's referenced merge requests and related branches is now done asynchronously (Yorick Peterse)
   - Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea)
   - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 946d83b7bd..c7d74a12f9 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -10,6 +10,9 @@ class @Issue
       @initTaskList()
       @initIssueBtnEventListeners()
 
+    @initMergeRequests()
+    @initRelatedBranches()
+
   initTaskList: ->
     $('.detail-page-description .js-task-list-container').taskList('enable')
     $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList
@@ -69,3 +72,23 @@ class @Issue
       type: 'PATCH'
       url: $('form.js-issuable-update').attr('action')
       data: patchData
+
+  initMergeRequests: ->
+    $container = $('#merge-requests')
+
+    $.getJSON($container.data('url'))
+      .error ->
+        new Flash('Failed to load referenced merge requests', 'alert')
+      .success (data) ->
+        if 'html' of data
+          $container.html(data.html)
+
+  initRelatedBranches: ->
+    $container = $('#related-branches')
+
+    $.getJSON($container.data('url'))
+      .error ->
+        new Flash('Failed to load related branches', 'alert')
+      .success (data) ->
+        if 'html' of data
+          $container.html(data.html)
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 6d649e72f8..c26cfeccf1 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -3,7 +3,8 @@ class Projects::IssuesController < Projects::ApplicationController
   include IssuableActions
 
   before_action :module_enabled
-  before_action :issue, only: [:edit, :update, :show]
+  before_action :issue,
+    only: [:edit, :update, :show, :referenced_merge_requests, :related_branches]
 
   # Allow read any issue
   before_action :authorize_read_issue!, only: [:show]
@@ -17,9 +18,6 @@ class Projects::IssuesController < Projects::ApplicationController
   # Allow issues bulk update
   before_action :authorize_admin_issues!, only: [:bulk_update]
 
-  # Cross-reference merge requests
-  before_action :closed_by_merge_requests, only: [:show]
-
   respond_to :html
 
   def index
@@ -65,8 +63,6 @@ class Projects::IssuesController < Projects::ApplicationController
     @note = @project.notes.new(noteable: @issue)
     @notes = @issue.notes.nonawards.with_associations.fresh
     @noteable = @issue
-    @merge_requests = @issue.referenced_merge_requests(current_user)
-    @related_branches = @issue.related_branches - @merge_requests.map(&:source_branch)
 
     respond_to do |format|
       format.html
@@ -118,15 +114,39 @@ class Projects::IssuesController < Projects::ApplicationController
     end
   end
 
+  def referenced_merge_requests
+    @merge_requests = @issue.referenced_merge_requests(current_user)
+    @closed_by_merge_requests = @issue.closed_by_merge_requests(current_user)
+
+    respond_to do |format|
+      format.json do
+        render json: {
+          html: view_to_html_string('projects/issues/_merge_requests')
+        }
+      end
+    end
+  end
+
+  def related_branches
+    merge_requests = @issue.referenced_merge_requests(current_user)
+
+    @related_branches = @issue.related_branches -
+      merge_requests.map(&:source_branch)
+
+    respond_to do |format|
+      format.json do
+        render json: {
+          html: view_to_html_string('projects/issues/_related_branches')
+        }
+      end
+    end
+  end
+
   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" })
   end
 
-  def closed_by_merge_requests
-    @closed_by_merge_requests ||= @issue.closed_by_merge_requests(current_user)
-  end
-
   protected
 
   def issue
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 6fa059cbe6..5fe5ddc081 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -64,9 +64,11 @@
               = @issue.description
       = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago')
 
-      .merge-requests
-        = render 'merge_requests'
-        = render 'related_branches'
+      #merge-requests{'data-url' => referenced_merge_requests_namespace_project_issue_url(@project.namespace, @project, @issue)}
+        // This element is filled in using JavaScript.
+
+      #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'
diff --git a/config/routes.rb b/config/routes.rb
index 48601b7567..688b83d2c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -701,6 +701,8 @@ Rails.application.routes.draw do
         resources :issues, constraints: { id: /\d+/ } do
           member do
             post :toggle_subscription
+            get :referenced_merge_requests
+            get :related_branches
           end
           collection do
             post  :bulk_update
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index b6d70a26c2..24b3fb6eac 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -71,13 +71,16 @@ module SharedIssuable
 
   step 'I should not see any related merge requests' do
     page.within '.issue-details' do
-      expect(page).not_to have_content('.merge-requests')
+      expect(page).not_to have_content('#merge-requests .merge-requests-title')
     end
   end
 
   step 'I should see the "Enterprise fix" related merge request' do
-    page.within '.merge-requests' do
+    page.within '#merge-requests .merge-requests-title' do
       expect(page).to have_content('1 Related Merge Request')
+    end
+
+    page.within '#merge-requests ul' do
       expect(page).to have_content('Enterprise fix')
     end
   end

From 0a37976a4dcc88c7cbb746c89de122d3d10a453d Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 13 Apr 2016 17:29:04 +0200
Subject: [PATCH 251/283] Updated InfluxDB/Grafana setup/import docs

The grafana-dashboards repository now contains _all_ GitLab.com
dashboards and thus requires some extra continuous queries to be set up.
The repository now also provided a way to automatically import/export
dashboards.

[ci skip]
---
 .../performance/grafana_configuration.md      | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/doc/monitoring/performance/grafana_configuration.md b/doc/monitoring/performance/grafana_configuration.md
index 10ef100981..a79c8d48d3 100644
--- a/doc/monitoring/performance/grafana_configuration.md
+++ b/doc/monitoring/performance/grafana_configuration.md
@@ -61,24 +61,32 @@ contents below and paste it in to the interactive session:
 ```
 CREATE RETENTION POLICY gitlab_30d ON gitlab DURATION 30d REPLICATION 1 DEFAULT
 CREATE RETENTION POLICY seven_days ON gitlab DURATION 7d REPLICATION 1
-CREATE CONTINUOUS QUERY rails_transaction_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS "duration_95th", percentile("duration", 99.000) AS "duration_99th", mean("duration") AS "duration_mean", percentile(sql_duration, 95.000) AS "sql_duration_95th", percentile(sql_duration, 99.000) AS "sql_duration_99th", mean(sql_duration) AS "sql_duration_mean", percentile(view_duration, 95.000) AS "view_duration_95th", percentile(view_duration, 99.000) AS "view_duration_99th", mean(view_duration) AS "view_duration_mean" INTO gitlab.seven_days.rails_transaction_timings FROM gitlab.gitlab_30d.rails_transactions GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_transaction_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS "duration_95th", percentile("duration", 99.000) AS "duration_99th", mean("duration") AS "duration_mean", percentile(sql_duration, 95.000) AS "sql_duration_95th", percentile(sql_duration, 99.000) AS "sql_duration_99th", mean(sql_duration) AS "sql_duration_mean", percentile(view_duration, 95.000) AS "view_duration_95th", percentile(view_duration, 99.000) AS "view_duration_99th", mean(view_duration) AS "view_duration_mean" INTO gitlab.seven_days.sidekiq_transaction_timings FROM gitlab.gitlab_30d.sidekiq_transactions GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_transaction_counts_seven_days ON gitlab BEGIN SELECT count("duration") AS "count" INTO gitlab.seven_days.rails_transaction_counts FROM gitlab.gitlab_30d.rails_transactions GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_transaction_counts_seven_days ON gitlab BEGIN SELECT count("duration") AS "count" INTO gitlab.seven_days.sidekiq_transaction_counts FROM gitlab.gitlab_30d.sidekiq_transactions GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_method_call_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS "duration_95th", percentile("duration", 99.000) AS "duration_99th", mean("duration") AS "duration_mean" INTO gitlab.seven_days.rails_method_call_timings FROM gitlab.gitlab_30d.rails_method_calls GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_method_call_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS "duration_95th", percentile("duration", 99.000) AS "duration_99th", mean("duration") AS "duration_mean" INTO gitlab.seven_days.sidekiq_method_call_timings FROM gitlab.gitlab_30d.sidekiq_method_calls GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_method_call_timings_per_method_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean INTO gitlab.seven_days.rails_method_call_timings_per_method FROM gitlab.gitlab_30d.rails_method_calls GROUP BY time(1m), method END
-CREATE CONTINUOUS QUERY sidekiq_method_call_timings_per_method_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean INTO gitlab.seven_days.sidekiq_method_call_timings_per_method FROM gitlab.gitlab_30d.sidekiq_method_calls GROUP BY time(1m), method END
-CREATE CONTINUOUS QUERY rails_memory_usage_per_minute ON gitlab BEGIN SELECT percentile(value, 95.000) AS memory_95th, percentile(value, 99.000) AS memory_99th, mean(value) AS memory_mean INTO gitlab.seven_days.rails_memory_usage_per_minute FROM gitlab.gitlab_30d.rails_memory_usage GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_memory_usage_per_minute ON gitlab BEGIN SELECT percentile(value, 95.000) AS memory_95th, percentile(value, 99.000) AS memory_99th, mean(value) AS memory_mean INTO gitlab.seven_days.sidekiq_memory_usage_per_minute FROM gitlab.gitlab_30d.sidekiq_memory_usage GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_file_descriptors_per_minute ON gitlab BEGIN SELECT sum(value) AS value INTO gitlab.seven_days.sidekiq_file_descriptors_per_minute FROM gitlab.gitlab_30d.sidekiq_file_descriptors GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_file_descriptors_per_minute ON gitlab BEGIN SELECT sum(value) AS value INTO gitlab.seven_days.rails_file_descriptors_per_minute FROM gitlab.gitlab_30d.rails_file_descriptors GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_gc_counts_per_minute ON gitlab BEGIN SELECT sum(count) AS count INTO gitlab.seven_days.rails_gc_counts_per_minute FROM gitlab.gitlab_30d.rails_gc_statistics GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_gc_counts_per_minute ON gitlab BEGIN SELECT sum(count) AS count INTO gitlab.seven_days.sidekiq_gc_counts_per_minute FROM gitlab.gitlab_30d.sidekiq_gc_statistics GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_gc_timings_per_minute ON gitlab BEGIN SELECT percentile(total_time, 95.000) AS duration_95th, percentile(total_time, 99.000) AS duration_99th, mean(total_time) AS duration_mean INTO gitlab.seven_days.rails_gc_timings_per_minute FROM gitlab.gitlab_30d.rails_gc_statistics GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_gc_timings_per_minute ON gitlab BEGIN SELECT percentile(total_time, 95.000) AS duration_95th, percentile(total_time, 99.000) AS duration_99th, mean(total_time) AS duration_mean INTO gitlab.seven_days.sidekiq_gc_timings_per_minute FROM gitlab.gitlab_30d.sidekiq_gc_statistics GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY rails_gc_major_minor_per_minute ON gitlab BEGIN SELECT sum(major_gc_count) AS major, sum(minor_gc_count) AS minor INTO gitlab.seven_days.rails_gc_major_minor_per_minute FROM gitlab.gitlab_30d.rails_gc_statistics GROUP BY time(1m) END
-CREATE CONTINUOUS QUERY sidekiq_gc_major_minor_per_minute ON gitlab BEGIN SELECT sum(major_gc_count) AS major, sum(minor_gc_count) AS minor INTO gitlab.seven_days.sidekiq_gc_major_minor_per_minute FROM gitlab.gitlab_30d.sidekiq_gc_statistics GROUP BY time(1m) END
+CREATE CONTINUOUS QUERY rails_transaction_counts_seven_days ON gitlab BEGIN SELECT count("duration") AS "count" INTO gitlab.seven_days.rails_transaction_counts FROM rails_transactions GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_transaction_counts_seven_days ON gitlab BEGIN SELECT count("duration") AS "count" INTO gitlab.seven_days.sidekiq_transaction_counts FROM sidekiq_transactions GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_method_call_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS "duration_95th", percentile("duration", 99.000) AS "duration_99th", mean("duration") AS "duration_mean" INTO gitlab.seven_days.rails_method_call_timings FROM rails_method_calls GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_method_call_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS "duration_95th", percentile("duration", 99.000) AS "duration_99th", mean("duration") AS "duration_mean" INTO gitlab.seven_days.sidekiq_method_call_timings FROM sidekiq_method_calls GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_method_call_timings_per_method_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean INTO gitlab.seven_days.rails_method_call_timings_per_method FROM rails_method_calls GROUP BY time(1m), method END;
+CREATE CONTINUOUS QUERY sidekiq_method_call_timings_per_method_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean INTO gitlab.seven_days.sidekiq_method_call_timings_per_method FROM sidekiq_method_calls GROUP BY time(1m), method END;
+CREATE CONTINUOUS QUERY rails_memory_usage_per_minute ON gitlab BEGIN SELECT percentile(value, 95.000) AS memory_95th, percentile(value, 99.000) AS memory_99th, mean(value) AS memory_mean INTO gitlab.seven_days.rails_memory_usage_per_minute FROM rails_memory_usage GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_memory_usage_per_minute ON gitlab BEGIN SELECT percentile(value, 95.000) AS memory_95th, percentile(value, 99.000) AS memory_99th, mean(value) AS memory_mean INTO gitlab.seven_days.sidekiq_memory_usage_per_minute FROM sidekiq_memory_usage GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_file_descriptors_per_minute ON gitlab BEGIN SELECT sum(value) AS value INTO gitlab.seven_days.sidekiq_file_descriptors_per_minute FROM sidekiq_file_descriptors GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_file_descriptors_per_minute ON gitlab BEGIN SELECT sum(value) AS value INTO gitlab.seven_days.rails_file_descriptors_per_minute FROM rails_file_descriptors GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_gc_counts_per_minute ON gitlab BEGIN SELECT sum(count) AS count INTO gitlab.seven_days.rails_gc_counts_per_minute FROM rails_gc_statistics GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_gc_counts_per_minute ON gitlab BEGIN SELECT sum(count) AS count INTO gitlab.seven_days.sidekiq_gc_counts_per_minute FROM sidekiq_gc_statistics GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_gc_timings_per_minute ON gitlab BEGIN SELECT percentile(total_time, 95.000) AS duration_95th, percentile(total_time, 99.000) AS duration_99th, mean(total_time) AS duration_mean INTO gitlab.seven_days.rails_gc_timings_per_minute FROM rails_gc_statistics GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_gc_timings_per_minute ON gitlab BEGIN SELECT percentile(total_time, 95.000) AS duration_95th, percentile(total_time, 99.000) AS duration_99th, mean(total_time) AS duration_mean INTO gitlab.seven_days.sidekiq_gc_timings_per_minute FROM sidekiq_gc_statistics GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_gc_major_minor_per_minute ON gitlab BEGIN SELECT sum(major_gc_count) AS major, sum(minor_gc_count) AS minor INTO gitlab.seven_days.rails_gc_major_minor_per_minute FROM rails_gc_statistics GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_gc_major_minor_per_minute ON gitlab BEGIN SELECT sum(major_gc_count) AS major, sum(minor_gc_count) AS minor INTO gitlab.seven_days.sidekiq_gc_major_minor_per_minute FROM sidekiq_gc_statistics GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_internal_allowed_request_counts_per_minute ON gitlab BEGIN SELECT count("duration") AS count INTO gitlab.seven_days.grape_internal_allowed_request_counts_per_minute FROM rails_transactions WHERE request_uri = '/api/v3/internal/allowed' GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_internal_allowed_request_timings_per_minute ON gitlab BEGIN SELECT percentile("duration", 95) AS duration_95th, percentile("duration", 99) AS duration_99th, mean("duration") AS duration_mean INTO gitlab.seven_days.grape_internal_allowed_request_timings_per_minute FROM rails_transactions WHERE request_uri = '/api/v3/internal/allowed' GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_internal_allowed_sql_timings_per_minute ON gitlab BEGIN SELECT percentile(sql_duration, 95) AS duration_95th, percentile(sql_duration, 99) AS duration_99th, mean(sql_duration) AS duration_mean INTO gitlab.seven_days.grape_internal_allowed_sql_timings_per_minute FROM rails_transactions WHERE request_uri = '/api/v3/internal/allowed' GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_internal_authorized_keys_request_counts_per_minute ON gitlab BEGIN SELECT count("duration") AS count INTO gitlab.seven_days.grape_internal_authorized_keys_request_counts_per_minute FROM rails_transactions WHERE request_uri = '/api/v3/internal/authorized_keys' GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_internal_authorized_keys_request_timings_per_minute ON gitlab BEGIN SELECT percentile("duration", 95) AS duration_95th, percentile("duration", 99) AS duration_99th, mean("duration") AS duration_mean INTO gitlab.seven_days.grape_internal_authorized_keys_request_timings_per_minute FROM rails_transactions WHERE request_uri = '/api/v3/internal/authorized_keys' GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_internal_authorized_keys_sql_timings_per_minute ON gitlab BEGIN SELECT percentile(sql_duration, 95) AS duration_95th, percentile(sql_duration, 99) AS duration_99th, mean(sql_duration) AS duration_mean INTO gitlab.seven_days.grape_internal_authorized_keys_sql_timings_per_minute FROM rails_transactions WHERE request_uri = '/api/v3/internal/authorized_keys' GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY rails_transaction_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean, percentile(sql_duration, 95.000) AS sql_duration_95th, percentile(sql_duration, 99.000) AS sql_duration_99th, mean(sql_duration) AS sql_duration_mean, percentile(view_duration, 95.000) AS view_duration_95th, percentile(view_duration, 99.000) AS view_duration_99th, mean(view_duration) AS view_duration_mean, percentile(cache_read_duration, 99) AS cache_read_duration_99th, percentile(cache_read_duration, 95) AS cache_read_duration_95th, mean(cache_read_duration) AS cache_read_duration_mean, percentile(cache_write_duration, 99) AS cache_write_duration_99th, percentile(cache_write_duration, 95) AS cache_write_duration_95th, mean(cache_write_duration) AS cache_write_duration_mean, percentile(cache_delete_duration, 99) AS cache_delete_duration_99th, percentile(cache_delete_duration, 95) AS cache_delete_duration_95th, mean(cache_delete_duration) AS cache_delete_duration_mean, percentile(cache_exists_duration, 99) AS cache_exists_duration_99th, percentile(cache_exists_duration, 95) AS cache_exists_duration_95th, mean(cache_exists_duration) AS cache_exists_duration_mean, percentile(cache_duration, 99) AS cache_duration_99th, percentile(cache_duration, 95) AS cache_duration_95th, mean(cache_duration) AS cache_duration_mean INTO gitlab.seven_days.rails_transaction_timings FROM rails_transactions GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY sidekiq_transaction_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean, percentile(sql_duration, 95.000) AS sql_duration_95th, percentile(sql_duration, 99.000) AS sql_duration_99th, mean(sql_duration) AS sql_duration_mean, percentile(view_duration, 95.000) AS view_duration_95th, percentile(view_duration, 99.000) AS view_duration_99th, mean(view_duration) AS view_duration_mean, percentile(cache_read_duration, 99) AS cache_read_duration_99th, percentile(cache_read_duration, 95) AS cache_read_duration_95th, mean(cache_read_duration) AS cache_read_duration_mean, percentile(cache_write_duration, 99) AS cache_write_duration_99th, percentile(cache_write_duration, 95) AS cache_write_duration_95th, mean(cache_write_duration) AS cache_write_duration_mean, percentile(cache_delete_duration, 99) AS cache_delete_duration_99th, percentile(cache_delete_duration, 95) AS cache_delete_duration_95th, mean(cache_delete_duration) AS cache_delete_duration_mean, percentile(cache_exists_duration, 99) AS cache_exists_duration_99th, percentile(cache_exists_duration, 95) AS cache_exists_duration_95th, mean(cache_exists_duration) AS cache_exists_duration_mean, percentile(cache_duration, 99) AS cache_duration_99th, percentile(cache_duration, 95) AS cache_duration_95th, mean(cache_duration) AS cache_duration_mean INTO gitlab.seven_days.sidekiq_transaction_timings FROM sidekiq_transactions GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_transaction_counts_seven_days ON gitlab BEGIN SELECT count("duration") AS count INTO gitlab.seven_days.grape_transaction_counts FROM rails_transactions WHERE action !~ /.+/ GROUP BY time(1m) END;
+CREATE CONTINUOUS QUERY grape_transaction_timings_seven_days ON gitlab BEGIN SELECT percentile("duration", 95.000) AS duration_95th, percentile("duration", 99.000) AS duration_99th, mean("duration") AS duration_mean, percentile(sql_duration, 95.000) AS sql_duration_95th, percentile(sql_duration, 99.000) AS sql_duration_99th, mean(sql_duration) AS sql_duration_mean, percentile(cache_read_duration, 99) AS cache_read_duration_99th, percentile(cache_read_duration, 95) AS cache_read_duration_95th, mean(cache_read_duration) AS cache_read_duration_mean, percentile(cache_write_duration, 99) AS cache_write_duration_99th, percentile(cache_write_duration, 95) AS cache_write_duration_95th, mean(cache_write_duration) AS cache_write_duration_mean, percentile(cache_delete_duration, 99) AS cache_delete_duration_99th, percentile(cache_delete_duration, 95) AS cache_delete_duration_95th, mean(cache_delete_duration) AS cache_delete_duration_mean, percentile(cache_exists_duration, 99) AS cache_exists_duration_99th, percentile(cache_exists_duration, 95) AS cache_exists_duration_95th, mean(cache_exists_duration) AS cache_exists_duration_mean, percentile(cache_duration, 99) AS cache_duration_99th, percentile(cache_duration, 95) AS cache_duration_95th, mean(cache_duration) AS cache_duration_mean INTO gitlab.seven_days.grape_transaction_timings FROM rails_transactions WHERE action !~ /.+/ GROUP BY time(1m) END;
 ```
 
 ## Import Dashboards
@@ -106,6 +114,10 @@ navigate away.
 
 Repeat this process for each dashboard you wish to import.
 
+Alternatively you can automatically import all the dashboards into your Grafana
+instance. See the README of the [Grafana dashboards][grafana-dashboards]
+repository for more information on this process.
+
 [grafana-dashboards]: https://gitlab.com/gitlab-org/grafana-dashboards
 
 ---

From 28a7fe25fdf28042630282ace35e37310c8f0a12 Mon Sep 17 00:00:00 2001
From: Michael Greene <michael.greene@gmail.com>
Date: Tue, 5 Apr 2016 12:05:55 -0500
Subject: [PATCH 252/283] Allow back dating issues on update

---
 CHANGELOG                        |  2 +-
 doc/api/issues.md                |  1 +
 lib/api/issues.rb                |  7 +++++--
 spec/requests/api/issues_spec.rb | 20 ++++++++++++++++----
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 21f24b5b61..e5b8b9d7ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,11 +18,11 @@ v 8.7.0 (unreleased)
   - Preserve time notes/comments have been updated at when moving issue
   - Make HTTP(s) label consistent on clone bar (Stan Hu)
   - Expose label description in API (Mariusz Jachimowicz)
-  - Allow back dating on issues when created through the API
   - API: Ability to update a group (Robert Schilling)
   - API: Ability to move issues (Robert Schilling)
   - Fix Error 500 after renaming a project path (Stan Hu)
   - Fix a bug whith trailing slash in teamcity_url (Charles May)
+  - Allow back dating on issues when created or updated through the API
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
   - Allow SAML to handle external users based on user's information !3530
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 42024becc3..3e78149f44 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -298,6 +298,7 @@ PUT /projects/:id/issues/:issue_id
 | `milestone_id`  | integer | no  | The ID of a milestone to assign the issue to |
 | `labels`        | string  | no  | Comma-separated label names for an issue  |
 | `state_event`   | string  | no  | The state event of an issue. Set `close` to close the issue and `reopen` to reopen it |
+| `updated_at`    | string  | no  | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` |
 
 ```bash
 curl -X PUT -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/4/issues/85?state_event=close
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 4cdecadfe0..8aa08fd5ac 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -117,7 +117,7 @@ module API
       #   assignee_id (optional)  - The ID of a user to assign issue
       #   milestone_id (optional) - The ID of a milestone to assign issue
       #   labels (optional)       - The labels of an issue
-      #   created_at (optional)   - The date
+      #   created_at (optional)   - Date time string, ISO 8601 formatted
       # Example Request:
       #   POST /projects/:id/issues
       post ":id/issues" do
@@ -166,12 +166,15 @@ module API
       #   milestone_id (optional) - The ID of a milestone to assign issue
       #   labels (optional) - The labels of an issue
       #   state_event (optional) - The state event of an issue (close|reopen)
+      #   updated_at (optional) - Date time string, ISO 8601 formatted
       # Example Request:
       #   PUT /projects/:id/issues/:issue_id
       put ":id/issues/:issue_id" do
         issue = user_project.issues.find(params[:issue_id])
         authorize! :update_issue, issue
-        attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id, :state_event]
+        keys = [:title, :description, :assignee_id, :milestone_id, :state_event]
+        keys << :updated_at if current_user.admin? || user_project.owner == current_user
+        attrs = attributes_for_keys(keys)
 
         # Validate label names in advance
         if (errors = validate_label_params(params)).any?
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 86ea223f20..f88e39cad9 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -321,13 +321,13 @@ describe API::API, api: true  do
     end
 
     context 'when an admin or owner makes the request' do
-      it "accepts the creation date to be set" do
+      it 'accepts the creation date to be set' do
+        creation_time = 2.weeks.ago
         post api("/projects/#{project.id}/issues", user),
-          title: 'new issue', labels: 'label, label2', created_at: 2.weeks.ago
+          title: 'new issue', labels: 'label, label2', created_at: creation_time
 
         expect(response.status).to eq(201)
-        # this take about a second, so probably not equal
-        expect(Time.parse(json_response['created_at'])).to be <= 2.weeks.ago
+        expect(Time.parse(json_response['created_at'])).to be_within(1.second).of(creation_time)
       end
     end
   end
@@ -478,6 +478,18 @@ describe API::API, api: true  do
       expect(json_response['labels']).to include 'label2'
       expect(json_response['state']).to eq "closed"
     end
+
+    context 'when an admin or owner makes the request' do
+      it 'accepts the update date to be set' do
+        update_time = 2.weeks.ago
+        put api("/projects/#{project.id}/issues/#{issue.id}", user),
+          labels: 'label3', state_event: 'close', updated_at: update_time
+        expect(response.status).to eq(200)
+
+        expect(json_response['labels']).to include 'label3'
+        expect(Time.parse(json_response['updated_at'])).to be_within(1.second).of(update_time)
+      end
+    end
   end
 
   describe "DELETE /projects/:id/issues/:issue_id" do

From c1467f5d97c04c22e2119ace084bb016f8f53d48 Mon Sep 17 00:00:00 2001
From: Michael Greene <michael.greene@gmail.com>
Date: Tue, 5 Apr 2016 13:04:11 -0500
Subject: [PATCH 253/283] Allow back dating notes on creation

---
 CHANGELOG                       |  1 +
 doc/api/notes.md                |  1 +
 lib/api/notes.rb                |  5 +++++
 spec/requests/api/notes_spec.rb | 13 +++++++++++++
 4 files changed, 20 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e5b8b9d7ce..9baf6516ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ v 8.7.0 (unreleased)
   - Fix Error 500 after renaming a project path (Stan Hu)
   - Fix a bug whith trailing slash in teamcity_url (Charles May)
   - Allow back dating on issues when created or updated through the API
+  - Allow back dating on issue notes when created through the API
   - Fix avatar stretching by providing a cropping feature
   - API: Expose `subscribed` for issues and merge requests (Robert Schilling)
   - Allow SAML to handle external users based on user's information !3530
diff --git a/doc/api/notes.md b/doc/api/notes.md
index 2e0936f11b..7aa1c2155b 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -89,6 +89,7 @@ Parameters:
 - `id` (required) - The ID of a project
 - `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
 
 ### Modify existing issue note
 
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index a1c98f5e8f..71a53e6f0d 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -61,6 +61,7 @@ module API
         #   id (required) - The ID of a project
         #   noteable_id (required) - The ID of an issue or snippet
         #   body (required) - The content of a note
+        #   created_at (optional) - The date
         # Example Request:
         #   POST /projects/:id/issues/:noteable_id/notes
         #   POST /projects/:id/snippets/:noteable_id/notes
@@ -73,6 +74,10 @@ module API
            noteable_id: params[noteable_id_str]
           }
 
+          if params[:created_at] && (current_user.is_admin? || user_project.owner == current_user)
+            opts[:created_at] = params[:created_at]
+          end
+
           @note = ::Notes::CreateService.new(user_project, current_user, opts).execute
 
           if @note.valid?
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index a467bc935a..ec9eda0a2e 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -158,6 +158,19 @@ describe API::API, api: true  do
         post api("/projects/#{project.id}/issues/#{issue.id}/notes"), body: 'hi!'
         expect(response.status).to eq(401)
       end
+
+      context 'when an admin or owner makes the request' do
+        it 'accepts the creation date to be set' 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)
+          expect(Time.parse(json_response['created_at'])).to be_within(1.second).of(creation_time)
+        end
+      end
+
     end
 
     context "when noteable is a Snippet" do

From 2244aaf98f6c9b68e30febf6b80f2c0d965e541a Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Wed, 13 Apr 2016 13:20:57 +0300
Subject: [PATCH 254/283] Redis configuration consistency

---
 config/initializers/session_store.rb | 2 +-
 config/initializers/sidekiq.rb       | 6 ++----
 lib/gitlab/redis.rb                  | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 7028525587..88cb859871 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -14,7 +14,7 @@ if Rails.env.test?
   Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session"
 else
   redis_config = Gitlab::Redis.redis_store_options
-  redis_config[:namespace] = 'session:gitlab'
+  redis_config[:namespace] = Gitlab::Redis::SESSION_NAMESPACE
   
   Gitlab::Application.config.session_store(
     :redis_store, # Using the cookie_store would enable session replay attacks.
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 9182d92980..f1eec67488 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,9 +1,7 @@
-SIDEKIQ_REDIS_NAMESPACE = 'resque:gitlab'
-
 Sidekiq.configure_server do |config|
   config.redis = {
     url: Gitlab::Redis.url,
-    namespace: SIDEKIQ_REDIS_NAMESPACE
+    namespace: Gitlab::Redis::SIDEKIQ_NAMESPACE
   }
 
   config.server_middleware do |chain|
@@ -30,6 +28,6 @@ end
 Sidekiq.configure_client do |config|
   config.redis = {
     url: Gitlab::Redis.url,
-    namespace: SIDEKIQ_REDIS_NAMESPACE
+    namespace: Gitlab::Redis::SIDEKIQ_NAMESPACE
   }
 end
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb
index 319447669d..5c352c96de 100644
--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -1,6 +1,8 @@
 module Gitlab
   class Redis
     CACHE_NAMESPACE = 'cache:gitlab'
+    SESSION_NAMESPACE = 'session:gitlab'
+    SIDEKIQ_NAMESPACE = 'resque:gitlab'
 
     attr_reader :url
 

From 11f46b459e9d97900cb71f7f6bd313b5e18fbaa6 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 13 Apr 2016 15:28:10 -0300
Subject: [PATCH 255/283] Setup visibility level for project when transfering
 for a group

---
 app/services/projects/transfer_service.rb     | 21 +++++++++++++----
 app/views/projects/edit.html.haml             |  1 +
 .../projects/transfer_service_spec.rb         | 23 +++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 2e73465446..0d8f8c6fbe 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -34,9 +34,12 @@ module Projects
           raise TransferError.new("Project with same path in target namespace already exists")
         end
 
-        # Apply new namespace id
-        project.namespace = new_namespace
-        project.save!
+        # Apply new namespace id and visibility level
+        project.tap do |p|
+          p.namespace = new_namespace
+          setup_visibility_level(p, new_namespace)
+          p.save!
+        end
 
         # Notifications
         project.send_move_instructions(old_path)
@@ -56,7 +59,7 @@ module Projects
         Gitlab::UploadsTransfer.new.move_project(project.path, old_namespace.path, new_namespace.path)
 
         project.old_path_with_namespace = old_path
-        
+
         SystemHooksService.new.execute_hooks_for(project, :transfer)
         true
       end
@@ -68,5 +71,15 @@ module Projects
         namespace.id != project.namespace_id &&
         current_user.can?(:create_projects, namespace)
     end
+
+    private
+
+    def setup_visibility_level(project, new_namespace)
+      return unless new_namespace.is_a?(Group)
+
+      if project.visibility_level > new_namespace.visibility_level
+        project.visibility_level = new_namespace.visibility_level
+      end
+    end
   end
 end
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 6d872cd0b2..76a4f41193 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -210,6 +210,7 @@
                     %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
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index c46259431a..0601731733 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -38,4 +38,27 @@ describe Projects::TransferService, services: true do
   def transfer_project(project, user, new_namespace)
     Projects::TransferService.new(project, user).execute(new_namespace)
   end
+
+  context 'visibility level' do
+    let(:internal_group) { create(:group, :internal) }
+
+    before { internal_group.add_owner(user) }
+
+    context 'when namespace visibility level < project visibility level' do
+      let(:public_project) { create(:project, :public, namespace: user.namespace) }
+
+      before { transfer_project(public_project, user, internal_group) }
+
+      it { expect(public_project.visibility_level).to eq(internal_group.visibility_level) }
+    end
+
+    context 'when namespace visibility level > project visibility level' do
+      let(:private_project) { create(:project, :private, namespace: user.namespace) }
+
+      before { transfer_project(private_project, user, internal_group) }
+
+      it { expect(private_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE) }
+    end
+  end
+
 end

From 6b3a53848c68c8fd0931de9b7c6ab15b53b9475b Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 13 Apr 2016 15:30:50 -0300
Subject: [PATCH 256/283] Add changelog entry

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

diff --git a/CHANGELOG b/CHANGELOG
index 5399e3e5b8..416fffece6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.7.0 (unreleased)
   - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
   - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
   - Add setting for customizing the list of trusted proxies !3524
+  - Allow projects to be transfered to a lower visibility level group
   - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524
   - 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)

From a31c1dccb69e6c5999af31c2be4e6ee71043a5e3 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 13 Apr 2016 16:43:07 -0500
Subject: [PATCH 257/283] Add test to check if top right search form is not
 present

---
 spec/features/search_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 3e6289a46b..029a11ea43 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -10,6 +10,10 @@ describe "Search", feature: true  do
     visit search_path
   end
 
+  it 'top right search form is not present' do
+    expect(page).not_to have_selector('.search')
+  end
+
   describe 'searching for Projects' do
     it 'finds a project' do
       page.within '.search-holder' do

From 897892132334f4004719d2489530898491f4fff6 Mon Sep 17 00:00:00 2001
From: Tom Downes <tpdownes@gmail.com>
Date: Thu, 14 Apr 2016 01:03:50 +0000
Subject: [PATCH 258/283] Update shibboleth configuration for GitLab 8.6 and
 Apache 2.4

---
 doc/integration/shibboleth.md | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index a0be3dd4e5..b6b2d4e5e8 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -76,3 +76,50 @@ sudo gitlab-ctl reconfigure
 ```
 
 On the sign in page there should now be a "Sign in with: Shibboleth" icon below the regular sign in form. Click the icon to begin the authentication process. You will be redirected to IdP server (Depends on your Shibboleth module configuration). If everything goes well the user will be returned to GitLab and will be signed in.
+
+## Apache 2.4 / GitLab 8.6 update
+The order of the first 2 Location directives is important. If they are reversed,
+you will not get a shibboleth session!
+
+```
+  <Location />
+    Require all granted
+    ProxyPassReverse http://127.0.0.1:8181
+    ProxyPassReverse http://YOUR_SERVER_FQDN/
+  </Location>
+
+  <Location /users/auth/shibboleth/callback>
+    AuthType shibboleth
+    ShibRequestSetting requireSession 1
+    ShibUseHeaders On
+    Require shib-session
+  </Location>
+
+  Alias /shibboleth-sp /usr/share/shibboleth
+
+  <Location /shibboleth-sp>
+    Require all granted
+  </Location>
+
+  <Location /Shibboleth.sso>
+    SetHandler shib
+  </Location>
+
+  RewriteEngine on
+
+  #Don't escape encoded characters in api requests
+  RewriteCond %{REQUEST_URI} ^/api/v3/.*
+  RewriteCond %{REQUEST_URI} !/Shibboleth.sso
+  RewriteCond %{REQUEST_URI} !/shibboleth-sp
+  RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
+
+  #Forward all requests to gitlab-workhorse except existing files
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
+  RewriteCond %{REQUEST_URI} ^/uploads/.*
+  RewriteCond %{REQUEST_URI} !/Shibboleth.sso
+  RewriteCond %{REQUEST_URI} !/shibboleth-sp
+  RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA]
+
+  RequestHeader set X_FORWARDED_PROTO 'https'
+  RequestHeader set X-Forwarded-Ssl on
+```
\ No newline at end of file

From 2fd05aed463684203cf21923b54e28888fcad0ea Mon Sep 17 00:00:00 2001
From: Frank Groeneveld <frank@frankgroeneveld.nl>
Date: Thu, 14 Apr 2016 10:24:09 +0200
Subject: [PATCH 259/283] Allow empty recipient list when pusher is added

Closes #13574
---
 CHANGELOG                                     |  1 +
 .../project_services/builds_email_service.rb  | 10 +++--
 .../builds_email_service_spec.rb              | 37 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9baf6516ef..ba98b3b100 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -60,6 +60,7 @@ v 8.7.0 (unreleased)
   - API: Expose 'updated_at' for issue, snippet, and merge request notes (Robert Schilling)
   - API: User can leave a project through the API when not master or owner. !3613
   - Fix repository cache invalidation issue when project is recreated with an empty repo (Stan Hu)
+  - Fix: Allow empty recipients list for builds emails service when pushed is added (Frank Groeneveld)
 
 v 8.6.6
   - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk)
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index f9f0483876..6ab6d7417b 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -23,7 +23,7 @@ class BuildsEmailService < Service
   prop_accessor :recipients
   boolean_accessor :add_pusher
   boolean_accessor :notify_only_broken_builds
-  validates :recipients, presence: true, if: :activated?
+  validates :recipients, presence: true, if: ->(s) { s.activated? && !s.add_pusher? }
 
   def initialize_properties
     if properties.nil?
@@ -87,10 +87,14 @@ class BuildsEmailService < Service
   end
 
   def all_recipients(data)
-    all_recipients = recipients.split(',').compact.reject(&:blank?)
+    all_recipients = []
+
+    unless recipients.blank?
+      all_recipients += recipients.split(',').compact.reject(&:blank?)
+    end
 
     if add_pusher? && data[:user][:email]
-      all_recipients << "#{data[:user][:email]}"
+      all_recipients << data[:user][:email]
     end
 
     all_recipients
diff --git a/spec/models/project_services/builds_email_service_spec.rb b/spec/models/project_services/builds_email_service_spec.rb
index 2ccbff553f..7c23c2efcc 100644
--- a/spec/models/project_services/builds_email_service_spec.rb
+++ b/spec/models/project_services/builds_email_service_spec.rb
@@ -3,9 +3,10 @@ require 'spec_helper'
 describe BuildsEmailService do
   let(:build) { create(:ci_build) }
   let(:data) { Gitlab::BuildDataBuilder.build(build) }
-  let(:service) { BuildsEmailService.new }
+  let!(:project) { create(:project, :public, ci_id: 1) }
+  let(:service) { described_class.new(project: project, active: true) }
 
-  describe :execute do
+  describe '#execute' do
     it 'sends email' do
       service.recipients = 'test@gitlab.com'
       data[:build_status] = 'failed'
@@ -40,4 +41,36 @@ describe BuildsEmailService do
       service.execute(data)
     end
   end
+
+  describe 'validations' do
+
+    context 'when pusher is not added' do
+      before { service.add_pusher = false }
+
+      it 'does not allow empty recipient input' do
+        service.recipients = ''
+        expect(service.valid?).to be false
+      end
+
+      it 'does allow non-empty recipient input' do
+        service.recipients = 'test@example.com'
+        expect(service.valid?).to be true
+      end
+
+    end
+
+    context 'when pusher is added' do
+      before { service.add_pusher = true }
+
+      it 'does allow empty recipient input' do
+        service.recipients = ''
+        expect(service.valid?).to be true
+      end
+
+      it 'does allow non-empty recipient input' do
+        service.recipients = 'test@example.com'
+        expect(service.valid?).to be true
+      end
+    end
+  end
 end

From 82164a9f777f7eee37707b19ae6ec514a588c1ec Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 10:17:00 +0100
Subject: [PATCH 260/283] Notes form JS update Updated the JS to have a
 standard class with standard actions for each form Created ability to have
 toolbar buttons that insert different prefixes dependant upon the data-prefix
 attribute

---
 app/assets/javascripts/gl_form.js.coffee      | 40 +++++++++++++
 .../javascripts/gl_form_actions.js.coffee     | 43 ++++++++++++++
 app/assets/javascripts/notes.js.coffee        | 58 +++----------------
 app/views/projects/notes/_form.html.haml      |  2 +-
 app/views/projects/notes/_hints.html.haml     |  3 +
 5 files changed, 95 insertions(+), 51 deletions(-)
 create mode 100644 app/assets/javascripts/gl_form.js.coffee
 create mode 100644 app/assets/javascripts/gl_form_actions.js.coffee

diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
new file mode 100644
index 0000000000..efa9284ed0
--- /dev/null
+++ b/app/assets/javascripts/gl_form.js.coffee
@@ -0,0 +1,40 @@
+class @GLForm
+  constructor: (@form) ->
+    @textarea = @form.find(".js-note-text")
+
+    @setupForm()
+
+  setupForm: ->
+    isNewForm = @form.is(':not(.gfm-form)')
+
+    @form.removeClass "js-new-note-form"
+
+    if isNewForm
+      @form.find('.div-dropzone').remove()
+      @form.addClass('gfm-form')
+      disableButtonIfEmptyField @form.find(".js-note-text"), @form.find(".js-comment-button")
+
+      # remove notify commit author checkbox for non-commit notes
+      GitLab.GfmAutoComplete.setup()
+      new DropzoneInput(@form)
+
+      autosize(@textarea)
+
+      # Setup action buttons
+      actions = new GLFormActions @form, @textarea
+      @form.data 'form-actions', actions
+
+      # form and textarea event listeners
+      @addEventListeners()
+
+    # hide discard button
+    @form.find('.js-note-discard').hide()
+
+    @form.show()
+
+  addEventListeners: ->
+    @textarea.on 'focus', ->
+      $(@).closest('.md-area').addClass 'is-focused'
+
+    @textarea.on 'blur', ->
+      $(@).closest('.md-area').removeClass 'is-focused'
diff --git a/app/assets/javascripts/gl_form_actions.js.coffee b/app/assets/javascripts/gl_form_actions.js.coffee
new file mode 100644
index 0000000000..d8de63a2be
--- /dev/null
+++ b/app/assets/javascripts/gl_form_actions.js.coffee
@@ -0,0 +1,43 @@
+class @GLFormActions
+  constructor: (@form, @textarea) ->
+    @clearEventListeners()
+    @addEventListeners()
+
+  clearEventListeners: ->
+    @form.off 'click', '.js-toolbar-button'
+
+  addEventListeners: ->
+    @form.on 'click', '.js-toolbar-button', @toolbarButtonClick
+
+  toolbarButtonClick: (e) =>
+    $btn = $(e.currentTarget)
+
+    # Get the prefix from the button
+    prefix = $btn.data('prefix')
+    @addPrefixToTextarea(prefix)
+
+  addPrefixToTextarea: (prefix) ->
+    caretStart = @textarea.get(0).selectionStart
+    caretEnd = @textarea.get(0).selectionEnd
+    textEnd = @textarea.val().length
+
+    beforeSelection = @textarea.val().substring 0, caretStart
+    afterSelection = @textarea.val().substring caretEnd, textEnd
+
+    beforeSelectionSplit = beforeSelection.split ''
+    beforeSelectionLength = beforeSelection.length
+
+    # Get the last character in the before selection
+    beforeSelectionLastChar = beforeSelectionSplit[beforeSelectionLength - 1]
+
+    if beforeSelectionLastChar? and beforeSelectionLastChar isnt ''
+      # Append a white space char to the prefix if the previous char isn't a space
+      prefix = " #{prefix}"
+
+    # Update the textarea
+    @textarea.val beforeSelection + prefix + afterSelection
+    @textarea.get(0).setSelectionRange caretStart + prefix.length, caretEnd + prefix.length
+
+    # Focus the textarea
+    @textarea.focus()
+    @textarea.trigger('keyup')
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index a67890200d..0581774424 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -283,32 +283,10 @@ class @Notes
   show the form
   ###
   setupNoteForm: (form) ->
-    disableButtonIfEmptyField form.find(".js-note-text"), form.find(".js-comment-button")
-    form.removeClass "js-new-note-form"
-    form.find('.div-dropzone').remove()
-
-    # hide discard button
-    form.find('.js-note-discard').hide()
-
-    # setup preview buttons
-    previewButton = form.find(".js-md-preview-button")
+    new GLForm form
 
     textarea = form.find(".js-note-text")
 
-    textarea.on "input", ->
-      if $(this).val().trim() isnt ""
-        previewButton.removeClass("turn-off").addClass "turn-on"
-      else
-        previewButton.removeClass("turn-on").addClass "turn-off"
-
-    textarea.on 'focus', ->
-      $(this).closest('.md-area').addClass 'is-focused'
-
-    textarea.on 'blur', ->
-      $(this).closest('.md-area').removeClass 'is-focused'
-
-    autosize(textarea)
-
     new Autosave textarea, [
       "Note"
       form.find("#note_commit_id").val()
@@ -317,11 +295,6 @@ class @Notes
       form.find("#note_noteable_id").val()
     ]
 
-    # remove notify commit author checkbox for non-commit notes
-    GitLab.GfmAutoComplete.setup()
-    new DropzoneInput(form)
-    form.show()
-
   ###
   Called in response to the new note form being submitted
 
@@ -375,34 +348,15 @@ class @Notes
     note = $(this).closest(".note")
     note.addClass "is-editting"
     form = note.find(".note-edit-form")
-    isNewForm = form.is(':not(.gfm-form)')
-    if isNewForm
-      form.addClass('gfm-form')
+
     form.addClass('current-note-edit-form')
 
     # Show the attachment delete link
     note.find(".js-note-attachment-delete").show()
 
-    # Setup markdown form
-    if isNewForm
-      GitLab.GfmAutoComplete.setup()
-      new DropzoneInput(form)
+    new GLForm form
 
-    textarea = form.find("textarea")
-    textarea.focus()
-
-    if isNewForm
-      autosize(textarea)
-
-    # HACK (rspeicher/DouweM): Work around a Chrome 43 bug(?).
-    # The textarea has the correct value, Chrome just won't show it unless we
-    # modify it, so let's clear it and re-set it!
-    value = textarea.val()
-    textarea.val ""
-    textarea.val value
-
-    if isNewForm
-      disableButtonIfEmptyField textarea, form.find(".js-comment-button")
+    form.find(".js-note-text").focus()
 
   ###
   Called in response to clicking the edit note link
@@ -570,6 +524,10 @@ class @Notes
       # only remove the form
       form.remove()
 
+    # Remove the note actions
+    actions = form.data('form-actions')
+    actions.clearEventListeners()
+    form.data('form-actions', null)
 
   cancelDiscussionForm: (e) =>
     e.preventDefault()
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index c446ecec2c..261eef4df4 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @note], remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form gfm-form" }, authenticity_token: true do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @note], remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form" }, authenticity_token: true do |f|
   = hidden_field_tag :view, diff_view
   = hidden_field_tag :line_type
   = note_target_fields(@note)
diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml
index 0b00204340..0c6758210b 100644
--- a/app/views/projects/notes/_hints.html.haml
+++ b/app/views/projects/notes/_hints.html.haml
@@ -1,4 +1,7 @@
 .comment-toolbar.clearfix
+  %button.toolbar-button.js-toolbar-button{ type: 'button', data: { prefix: ':' }, tabindex: '-1' }
+    = icon('smile-o', class: 'toolbar-button-icon')
+    Emoji
   .toolbar-text
     Styling with
     = link_to 'Markdown', help_page_path('markdown', 'markdown'), target: '_blank', tabindex: -1

From 5dd01f572c9a7504f34c5a3b30792197c856bd6f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 10:28:10 +0100
Subject: [PATCH 261/283] Destroy discussion form

---
 app/assets/javascripts/gl_form.js.coffee | 22 +++++++++++++++++++---
 app/assets/javascripts/notes.js.coffee   |  8 +++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
index efa9284ed0..087a46cbac 100644
--- a/app/assets/javascripts/gl_form.js.coffee
+++ b/app/assets/javascripts/gl_form.js.coffee
@@ -1,18 +1,30 @@
 class @GLForm
   constructor: (@form) ->
-    @textarea = @form.find(".js-note-text")
+    @textarea = @form.find('.js-note-text')
 
     @setupForm()
 
+    @form.data 'gl-form', @
+
+  destroy: ->
+    # Destroy actions
+    actions = @form.data 'form-actions'
+    actions.clearEventListeners()
+    @form.data 'form-actions', null
+
+    # Clean form listeners
+    @clearEventListeners()
+    @form.data 'gl-form', null
+
   setupForm: ->
     isNewForm = @form.is(':not(.gfm-form)')
 
-    @form.removeClass "js-new-note-form"
+    @form.removeClass 'js-new-note-form'
 
     if isNewForm
       @form.find('.div-dropzone').remove()
       @form.addClass('gfm-form')
-      disableButtonIfEmptyField @form.find(".js-note-text"), @form.find(".js-comment-button")
+      disableButtonIfEmptyField @form.find('.js-note-text'), @form.find('.js-comment-button')
 
       # remove notify commit author checkbox for non-commit notes
       GitLab.GfmAutoComplete.setup()
@@ -32,6 +44,10 @@ class @GLForm
 
     @form.show()
 
+  clearEventListeners: ->
+    @textarea.off 'focus'
+    @textarea.off 'blur'
+
   addEventListeners: ->
     @textarea.on 'focus', ->
       $(@).closest('.md-area').addClass 'is-focused'
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 0581774424..fa91baa07c 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -513,6 +513,9 @@ class @Notes
   removeDiscussionNoteForm: (form)->
     row = form.closest("tr")
 
+    glForm = form.data 'gl-form'
+    glForm.destroy()
+
     form.find(".js-note-text").data("autosave").reset()
 
     # show the reply button (will only work for replies)
@@ -524,11 +527,6 @@ class @Notes
       # only remove the form
       form.remove()
 
-    # Remove the note actions
-    actions = form.data('form-actions')
-    actions.clearEventListeners()
-    form.data('form-actions', null)
-
   cancelDiscussionForm: (e) =>
     e.preventDefault()
     form = $(e.target).closest(".js-discussion-note-form")

From ff7fb09ea80036045e6fd17624b894f389de38b9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 10:34:02 +0100
Subject: [PATCH 262/283] Updated issue form to use new GLForm

---
 app/assets/javascripts/dispatcher.js.coffee |  2 +-
 app/assets/javascripts/gl_form.js.coffee    | 12 +++++++++---
 app/views/projects/issues/_form.html.haml   |  2 +-
 app/views/shared/issuable/_form.html.haml   |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 70fd6f50e9..6efbe214aa 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -35,7 +35,7 @@ class Dispatcher
         new Diff()
       when 'projects:issues:new','projects:issues:edit'
         shortcut_handler = new ShortcutsNavigation()
-        new DropzoneInput($('.issue-form'))
+        new GLForm($('.issue-form'))
         new IssuableForm($('.issue-form'))
       when 'projects:merge_requests:new', 'projects:merge_requests:edit'
         new Diff()
diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
index 087a46cbac..aff3e909ce 100644
--- a/app/assets/javascripts/gl_form.js.coffee
+++ b/app/assets/javascripts/gl_form.js.coffee
@@ -1,7 +1,11 @@
 class @GLForm
   constructor: (@form) ->
-    @textarea = @form.find('.js-note-text')
+    @textarea = @form.find('textarea.js-gfm-input')
 
+    # Before we start, we should clean up any previous data for this form
+    @destroy()
+
+    # Setup the form
     @setupForm()
 
     @form.data 'gl-form', @
@@ -9,8 +13,10 @@ class @GLForm
   destroy: ->
     # Destroy actions
     actions = @form.data 'form-actions'
-    actions.clearEventListeners()
-    @form.data 'form-actions', null
+
+    if actions?
+      actions.clearEventListeners()
+      @form.data 'form-actions', null
 
     # Clean form listeners
     @clearEventListeners()
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 33c48199ba..7076f5db01 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'form-horizontal issue-form gfm-form js-quick-submit js-requires-input' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'form-horizontal issue-form common-note-form js-quick-submit js-requires-input' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @issue
 
 :javascript
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 6de07a92cd..d77c74e5d7 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -29,7 +29,7 @@
 
     = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
       = render 'projects/zen', f: f, attr: :description,
-                               classes: 'description form-control'
+                               classes: 'note-textarea'
       = render 'projects/notes/hints'
       .clearfix
       .error-alert

From c45ca936c77eceff367e27e1bf8fd5f11c6a7c39 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 10:39:16 +0100
Subject: [PATCH 263/283] merge request form uses new GLForm

---
 app/assets/javascripts/dispatcher.js.coffee             | 2 +-
 app/views/projects/merge_requests/_form.html.haml       | 2 +-
 app/views/projects/merge_requests/_new_submit.html.haml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 6efbe214aa..d02e113070 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -40,7 +40,7 @@ class Dispatcher
       when 'projects:merge_requests:new', 'projects:merge_requests:edit'
         new Diff()
         shortcut_handler = new ShortcutsNavigation()
-        new DropzoneInput($('.merge-request-form'))
+        new GLForm($('.merge-request-form'))
         new IssuableForm($('.merge-request-form'))
       when 'projects:tags:new'
         new ZenMode()
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 1e6724fc92..88525f4036 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input js-quick-submit' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input js-quick-submit' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request
 
 :javascript
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 9e59f7df71..2f14a91e64 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -10,7 +10,7 @@
   %span.pull-right
     = link_to 'Change branches', mr_change_branches_path(@merge_request)
 %hr
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request
   = f.hidden_field :source_project_id
   = f.hidden_field :source_branch

From d67c3e35c98cff2372db803f93a97a60aa8b4104 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 10:42:38 +0100
Subject: [PATCH 264/283] Milestones use new GLForm class

---
 app/assets/javascripts/dispatcher.js.coffee   | 2 +-
 app/views/groups/milestones/new.html.haml     | 4 ++--
 app/views/projects/milestones/_form.html.haml | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index d02e113070..a56019cd88 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -28,7 +28,7 @@ class Dispatcher
         new Todos()
       when 'projects:milestones:new', 'projects:milestones:edit'
         new ZenMode()
-        new DropzoneInput($('.milestone-form'))
+        new GLForm($('.milestone-form'))
       when 'groups:milestones:new'
         new ZenMode()
       when 'projects:compare:show'
diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml
index 4290e0bf72..caa8c4bc0e 100644
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
@@ -8,7 +8,7 @@
   This will create milestone in every selected project
 %hr
 
-= form_for @milestone, url: group_milestones_path(@group), html: { class: 'form-horizontal milestone-form gfm-form js-quick-submit js-requires-input' }  do |f|
+= form_for @milestone, url: group_milestones_path(@group), html: { class: 'form-horizontal milestone-form common-note-form js-quick-submit js-requires-input' }  do |f|
   .row
     - if @milestone.errors.any?
       #error_explanation
@@ -27,7 +27,7 @@
         = f.label :description, "Description", class: "control-label"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
-            = render 'projects/zen', f: f, attr: :description, classes: 'description form-control'
+            = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea'
             .clearfix
             .error-alert
       .form-group
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index b2dae1c70e..06b2175479 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,6 +1,5 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @milestone], html: {class: 'form-horizontal milestone-form gfm-form js-quick-submit js-requires-input'}  do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @milestone], html: {class: 'form-horizontal milestone-form common-note-form js-quick-submit js-requires-input'}  do |f|
   = form_errors(@milestone)
-
   .row
     .col-md-6
       .form-group
@@ -11,7 +10,7 @@
         = f.label :description, "Description", class: "control-label"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
-            = render 'projects/zen', f: f, attr: :description, classes: 'description form-control'
+            = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea'
             = render 'projects/notes/hints'
           .clearfix
           .error-alert

From 3de09d1475db3d23f839991e57d16e00bff07cb4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 12:33:30 +0100
Subject: [PATCH 265/283] Updated all GFM forms to use new GLForm class

---
 app/assets/javascripts/dispatcher.js.coffee   |  6 +++---
 app/assets/stylesheets/framework/gfm.scss     | 18 ------------------
 app/views/projects/_zen.html.haml             |  4 ++--
 app/views/projects/notes/_edit_form.html.haml |  2 +-
 app/views/projects/notes/_form.html.haml      |  2 +-
 app/views/projects/releases/edit.html.haml    | 12 ++++++------
 app/views/projects/tags/new.html.haml         |  6 +++---
 app/views/projects/wikis/_form.html.haml      |  4 ++--
 app/views/shared/issuable/_form.html.haml     |  3 ++-
 9 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index a56019cd88..0b9110d35f 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -44,10 +44,10 @@ class Dispatcher
         new IssuableForm($('.merge-request-form'))
       when 'projects:tags:new'
         new ZenMode()
-        new DropzoneInput($('.tag-form'))
+        new GLForm($('.tag-form'))
       when 'projects:releases:edit'
         new ZenMode()
-        new DropzoneInput($('.release-form'))
+        new GLForm($('.release-form'))
       when 'projects:merge_requests:show'
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
@@ -137,7 +137,7 @@ class Dispatcher
             new Wikis()
             shortcut_handler = new ShortcutsNavigation()
             new ZenMode()
-            new DropzoneInput($('.wiki-form'))
+            new GLForm($('.wiki-form'))
           when 'snippets'
             shortcut_handler = new ShortcutsNavigation()
             new ZenMode() if path[2] == 'show'
diff --git a/app/assets/stylesheets/framework/gfm.scss b/app/assets/stylesheets/framework/gfm.scss
index 5ae0520fd7..f4d35c4b4b 100644
--- a/app/assets/stylesheets/framework/gfm.scss
+++ b/app/assets/stylesheets/framework/gfm.scss
@@ -1,24 +1,6 @@
 /**
  * Styles that apply to all GFM related forms.
  */
-.issue-form, .merge-request-form, .wiki-form {
-  .description {
-    height: 16em;
-    border-top-left-radius: 0;
-  }
-}
-
-.wiki-form {
-  .description {
-    height: 26em;
-  }
-}
-
-.milestone-form {
-  .description {
-    height: 14em;
-  }
-}
 
 .gfm-commit, .gfm-commit_range {
   font-family: $monospace_font;
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml
index bddff5cdcb..e1e3501396 100644
--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
@@ -1,8 +1,8 @@
 .zen-backdrop
   - classes << ' js-gfm-input js-autosize markdown-area'
   - if defined?(f) && f
-    = f.text_area attr, class: classes, placeholder: "Write a comment or drag your files here..."
+    = f.text_area attr, class: classes, placeholder: placeholder
   - else
-    = text_area_tag attr, nil, class: classes, placeholder: "Write a comment or drag your files here..."
+    = text_area_tag attr, nil, class: classes, placeholder: placeholder
   %a.zen-cotrol.zen-control-leave.js-zen-leave{ href: "#" }
     = icon('compress')
diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml
index 23e4f93eab..c87a3fadf7 100644
--- a/app/views/projects/notes/_edit_form.html.haml
+++ b/app/views/projects/notes/_edit_form.html.haml
@@ -2,7 +2,7 @@
   = form_for note, url: namespace_project_note_path(@project.namespace, @project, note), method: :put, remote: true, authenticity_token: true, html: { class: 'edit-note common-note-form js-quick-submit' } do |f|
     = note_target_fields(note)
     = render layout: 'projects/md_preview', locals: { preview_class: 'md-preview' } do
-      = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text js-task-list-field'
+      = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here..."
       = render 'projects/notes/hints'
 
     .note-form-actions.clearfix
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 261eef4df4..d0ac380f21 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -8,7 +8,7 @@
   = f.hidden_field :noteable_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'
+    = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text', placeholder: "Write a comment or drag your files here..."
     = render 'projects/notes/hints'
     .error-alert
 
diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml
index c4a3f06ee0..6f0b32aa16 100644
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@@ -9,11 +9,11 @@
       %strong #{@tag.name}
 
 .prepend-top-default
-  = form_for(@release, method: :put, url: namespace_project_tag_release_path(@project.namespace, @project, @tag.name), html: { class: 'form-horizontal gfm-form release-form js-quick-submit' }) do |f|
+  = form_for(@release, method: :put, url: namespace_project_tag_release_path(@project.namespace, @project, @tag.name), html: { class: 'form-horizontal common-note-form release-form js-quick-submit' }) do |f|
     = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
-      = render 'projects/zen', f: f, attr: :description, classes: 'description form-control'
+      = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here..."
       = render 'projects/notes/hints'
-      .error-alert
-      .form-actions.prepend-top-default
-        = f.submit 'Save changes', class: 'btn btn-save'
-        = link_to "Cancel", namespace_project_tag_path(@project.namespace, @project, @tag.name), class: "btn btn-default btn-cancel"
+    .error-alert
+    .form-actions.prepend-top-default
+      = f.submit 'Save changes', class: 'btn btn-save'
+      = link_to "Cancel", namespace_project_tag_path(@project.namespace, @project, @tag.name), class: "btn btn-default btn-cancel"
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 77c7c4d23d..b40a6e5cb2 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -10,7 +10,7 @@
   New Tag
 %hr
 
-= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal gfm-form tag-form js-quick-submit js-requires-input" do
+= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal common-note-form tag-form js-quick-submit js-requires-input" do
   .form-group
     = label_tag :tag_name, nil, class: 'control-label'
     .col-sm-10
@@ -30,9 +30,9 @@
     = label_tag :release_description, 'Release notes', class: 'control-label'
     .col-sm-10
       = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
-        = render 'projects/zen', attr: :release_description, classes: 'description form-control'
+        = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here..."
         = render 'projects/notes/hints'
-        .help-block Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page.
+      .help-block Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page.
   .form-actions
     = button_tag 'Create tag', class: 'btn btn-create', tabindex: 3
     = link_to 'Cancel', namespace_project_tags_path(@project.namespace, @project), class: 'btn btn-cancel'
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 812876e283..797a1a59e9 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form gfm-form prepend-top-default js-quick-submit' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form common-note-form prepend-top-default js-quick-submit' } do |f|
   = form_errors(@page)
 
   = f.hidden_field :title, value: @page.title
@@ -11,7 +11,7 @@
     = f.label :content, class: 'control-label'
     .col-sm-10
       = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
-        = render 'projects/zen', f: f, attr: :content, classes: 'description form-control'
+        = render 'projects/zen', f: f, attr: :content, classes: 'note-textarea', placeholder: 'Write your content or drag files here...'
         = render 'projects/notes/hints'
 
       .clearfix
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index d77c74e5d7..aed2622a6d 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -29,7 +29,8 @@
 
     = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
       = render 'projects/zen', f: f, attr: :description,
-                               classes: 'note-textarea'
+                               classes: 'note-textarea',
+                               placeholder: "Write a comment or drag your files here..."
       = render 'projects/notes/hints'
       .clearfix
       .error-alert

From 6e93bd56f0147929006daba6410aa5640403b2c7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 5 Apr 2016 13:23:43 +0100
Subject: [PATCH 266/283] Placeholder on milestone form Updated JS spec to
 include gl_form

---
 app/views/projects/milestones/_form.html.haml | 2 +-
 spec/javascripts/notes_spec.js.coffee         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 06b2175479..687222fa92 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -10,7 +10,7 @@
         = f.label :description, "Description", class: "control-label"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
-            = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea'
+            = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...'
             = render 'projects/notes/hints'
           .clearfix
           .error-alert
diff --git a/spec/javascripts/notes_spec.js.coffee b/spec/javascripts/notes_spec.js.coffee
index 050b6e362c..dd160e821b 100644
--- a/spec/javascripts/notes_spec.js.coffee
+++ b/spec/javascripts/notes_spec.js.coffee
@@ -1,4 +1,5 @@
 #= require notes
+#= require gl_form
 
 window.gon = {}
 window.disableButtonIfEmptyField = -> null

From 7a1800fec87133e9971a83b457c969b5adaf5919 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 09:49:29 +0100
Subject: [PATCH 267/283] Fixed group milestones placeholder bug

---
 app/views/groups/milestones/new.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml
index caa8c4bc0e..7d9d27ae1f 100644
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
@@ -27,7 +27,7 @@
         = f.label :description, "Description", class: "control-label"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
-            = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea'
+            = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...'
             .clearfix
             .error-alert
       .form-group

From 094cafcaa7c135a839a7329ed06fdd5d19a05f4b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 08:46:30 +0100
Subject: [PATCH 268/283] Removed GL Actions class

---
 app/assets/javascripts/gl_form.js.coffee      | 11 -----
 .../javascripts/gl_form_actions.js.coffee     | 43 -------------------
 app/views/projects/notes/_hints.html.haml     |  3 --
 3 files changed, 57 deletions(-)
 delete mode 100644 app/assets/javascripts/gl_form_actions.js.coffee

diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
index aff3e909ce..d540cc4dc4 100644
--- a/app/assets/javascripts/gl_form.js.coffee
+++ b/app/assets/javascripts/gl_form.js.coffee
@@ -11,13 +11,6 @@ class @GLForm
     @form.data 'gl-form', @
 
   destroy: ->
-    # Destroy actions
-    actions = @form.data 'form-actions'
-
-    if actions?
-      actions.clearEventListeners()
-      @form.data 'form-actions', null
-
     # Clean form listeners
     @clearEventListeners()
     @form.data 'gl-form', null
@@ -38,10 +31,6 @@ class @GLForm
 
       autosize(@textarea)
 
-      # Setup action buttons
-      actions = new GLFormActions @form, @textarea
-      @form.data 'form-actions', actions
-
       # form and textarea event listeners
       @addEventListeners()
 
diff --git a/app/assets/javascripts/gl_form_actions.js.coffee b/app/assets/javascripts/gl_form_actions.js.coffee
deleted file mode 100644
index d8de63a2be..0000000000
--- a/app/assets/javascripts/gl_form_actions.js.coffee
+++ /dev/null
@@ -1,43 +0,0 @@
-class @GLFormActions
-  constructor: (@form, @textarea) ->
-    @clearEventListeners()
-    @addEventListeners()
-
-  clearEventListeners: ->
-    @form.off 'click', '.js-toolbar-button'
-
-  addEventListeners: ->
-    @form.on 'click', '.js-toolbar-button', @toolbarButtonClick
-
-  toolbarButtonClick: (e) =>
-    $btn = $(e.currentTarget)
-
-    # Get the prefix from the button
-    prefix = $btn.data('prefix')
-    @addPrefixToTextarea(prefix)
-
-  addPrefixToTextarea: (prefix) ->
-    caretStart = @textarea.get(0).selectionStart
-    caretEnd = @textarea.get(0).selectionEnd
-    textEnd = @textarea.val().length
-
-    beforeSelection = @textarea.val().substring 0, caretStart
-    afterSelection = @textarea.val().substring caretEnd, textEnd
-
-    beforeSelectionSplit = beforeSelection.split ''
-    beforeSelectionLength = beforeSelection.length
-
-    # Get the last character in the before selection
-    beforeSelectionLastChar = beforeSelectionSplit[beforeSelectionLength - 1]
-
-    if beforeSelectionLastChar? and beforeSelectionLastChar isnt ''
-      # Append a white space char to the prefix if the previous char isn't a space
-      prefix = " #{prefix}"
-
-    # Update the textarea
-    @textarea.val beforeSelection + prefix + afterSelection
-    @textarea.get(0).setSelectionRange caretStart + prefix.length, caretEnd + prefix.length
-
-    # Focus the textarea
-    @textarea.focus()
-    @textarea.trigger('keyup')
diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml
index 0c6758210b..0b00204340 100644
--- a/app/views/projects/notes/_hints.html.haml
+++ b/app/views/projects/notes/_hints.html.haml
@@ -1,7 +1,4 @@
 .comment-toolbar.clearfix
-  %button.toolbar-button.js-toolbar-button{ type: 'button', data: { prefix: ':' }, tabindex: '-1' }
-    = icon('smile-o', class: 'toolbar-button-icon')
-    Emoji
   .toolbar-text
     Styling with
     = link_to 'Markdown', help_page_path('markdown', 'markdown'), target: '_blank', tabindex: -1

From c5d7b467ab3c67a71419e314c128d0ab5f371cb5 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 09:08:34 +0100
Subject: [PATCH 269/283] Updated dropzone hover styling

---
 app/assets/javascripts/dropzone_input.js.coffee     |  9 +++++----
 app/assets/stylesheets/framework/markdown_area.scss | 13 +++----------
 app/assets/stylesheets/framework/typography.scss    |  8 --------
 app/assets/stylesheets/pages/note_form.scss         | 12 ++++++++++++
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/dropzone_input.js.coffee b/app/assets/javascripts/dropzone_input.js.coffee
index b502131a99..6eb8d27ee2 100644
--- a/app/assets/javascripts/dropzone_input.js.coffee
+++ b/app/assets/javascripts/dropzone_input.js.coffee
@@ -15,11 +15,13 @@ class @DropzoneInput
     project_uploads_path = window.project_uploads_path or null
     max_file_size = gon.max_file_size or 10
 
-    form_textarea = $(form).find("textarea.markdown-area")
+    form_textarea = $(form).find(".js-gfm-input")
     form_textarea.wrap "<div class=\"div-dropzone\"></div>"
     form_textarea.on 'paste', (event) =>
       handlePaste(event)
 
+    $mdArea = $(form_textarea).closest('.md-area')
+
     $(form).setupMarkdownPreview()
 
     form_dropzone = $(form).find('.div-dropzone')
@@ -49,17 +51,16 @@ class @DropzoneInput
         $(".div-dropzone-alert").alert "close"
 
       dragover: ->
-        form_textarea.addClass "div-dropzone-focus"
+        $mdArea.addClass 'is-dropzone-hover'
         form.find(".div-dropzone-hover").css "opacity", 0.7
         return
 
       dragleave: ->
-        form_textarea.removeClass "div-dropzone-focus"
+        $mdArea.removeClass 'is-dropzone-hover'
         form.find(".div-dropzone-hover").css "opacity", 0
         return
 
       drop: ->
-        form_textarea.removeClass "div-dropzone-focus"
         form.find(".div-dropzone-hover").css "opacity", 0
         form_textarea.focus()
         return
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index c8f86d60e3..0f32d36d59 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -1,22 +1,15 @@
 .div-dropzone-wrapper {
   .div-dropzone {
     position: relative;
-    margin-bottom: -5px;
-
-    .div-dropzone-focus {
-      border-color: #66afe9 !important;
-      box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6) !important;
-      outline: 0 !important;
-    }
 
     .div-dropzone-hover {
       position: absolute;
       top: 50%;
       left: 50%;
-      margin-top: -0.5em;
-      margin-left: -0.6em;
+      margin-top: -11.5px;
+      margin-left: -15px;
       opacity: 0;
-      font-size: 50px;
+      font-size: 30px;
       transition: opacity 200ms ease-in-out;
       pointer-events: none;
     }
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 7b2aada5a0..0a5b4b8834 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -250,14 +250,6 @@ a > code {
  * Textareas intended for GFM
  *
  */
-.js-gfm-input {
-  font-family: $monospace_font;
-  color: $gl-text-color;
-}
-
-.md-preview {
-}
-
 .strikethrough {
   text-decoration: line-through;
 }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index f4da17fada..0d92ebcc8e 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -40,6 +40,7 @@
 }
 
 .note-textarea {
+  display: block;
   padding: 10px 0;
   font-family: $regular_font;
   border: 0;
@@ -72,6 +73,17 @@
       }
     }
 
+    &.is-dropzone-hover {
+      border-color: $gl-success;
+      box-shadow: 0 0 2px rgba(#000, .2),
+                  0 0 4px rgba($gl-success, .4);
+
+      .comment-toolbar,
+      .nav-links {
+        border-color: $gl-success;
+      }
+    }
+
     p {
       code {
         white-space: normal;

From 8ffb02d9f812c001514ff4c67e2eac53e1d9dd57 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 09:09:10 +0100
Subject: [PATCH 270/283] Added CHANGELOG item

---
 CHANGELOG                                   | 1 +
 app/assets/stylesheets/pages/note_form.scss | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ba98b3b100..e5c8620beb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ v 8.7.0 (unreleased)
   - API: User can leave a project through the API when not master or owner. !3613
   - Fix repository cache invalidation issue when project is recreated with an empty repo (Stan Hu)
   - Fix: Allow empty recipients list for builds emails service when pushed is added (Frank Groeneveld)
+  - Improved markdown forms
 
 v 8.6.6
   - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk)
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 0d92ebcc8e..2395de2e17 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -64,7 +64,7 @@
 
     &.is-focused {
       border-color: $focus-border-color;
-      box-shadow: 0 0 2px rgba(#000, .2),
+      box-shadow: 0 0 2px $black-transparent,
                   0 0 4px rgba($focus-border-color, .4);
 
       .comment-toolbar,
@@ -75,7 +75,7 @@
 
     &.is-dropzone-hover {
       border-color: $gl-success;
-      box-shadow: 0 0 2px rgba(#000, .2),
+      box-shadow: 0 0 2px $black-transparent,
                   0 0 4px rgba($gl-success, .4);
 
       .comment-toolbar,

From ca01103dedd1a44937068c6834865881ade3d301 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 18:14:01 +0100
Subject: [PATCH 271/283] Focus variable for dropzone

---
 app/assets/stylesheets/framework/variables.scss | 1 +
 app/assets/stylesheets/pages/note_form.scss     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 0b6be86ce6..fcf1f2193b 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -150,6 +150,7 @@ $light-grey-header: #faf9f9;
  */
 $gl-primary: $blue-normal;
 $gl-success: $green-normal;
+$gl-success-focus: rgba($gl-success, .4)
 $gl-info: $blue-normal;
 $gl-warning: $orange-normal;
 $gl-danger: $red-normal;
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 2395de2e17..07c707e7b7 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -76,7 +76,7 @@
     &.is-dropzone-hover {
       border-color: $gl-success;
       box-shadow: 0 0 2px $black-transparent,
-                  0 0 4px rgba($gl-success, .4);
+                  0 0 4px $gl-success-focus;
 
       .comment-toolbar,
       .nav-links {

From 0d8462b897847ae87b131d5111b8772848ba45ab Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 14 Apr 2016 09:11:38 +0100
Subject: [PATCH 272/283] Fixed scss syntax issue

---
 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 fcf1f2193b..f910cf6181 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -150,7 +150,7 @@ $light-grey-header: #faf9f9;
  */
 $gl-primary: $blue-normal;
 $gl-success: $green-normal;
-$gl-success-focus: rgba($gl-success, .4)
+$gl-success-focus: rgba($gl-success, .4);
 $gl-info: $blue-normal;
 $gl-warning: $orange-normal;
 $gl-danger: $red-normal;

From 8a8d4c9bf27d17939bfce4b53287210d8108da2c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 11 Apr 2016 13:19:55 +0100
Subject: [PATCH 273/283] Diff viewer links to correct part of the file Added
 highlight colours to diff rows

Closes #13852
---
 .../javascripts/merge_request_tabs.js.coffee  | 28 ++++++++++++++++---
 app/assets/stylesheets/highlight/dark.scss    |  6 ++++
 app/assets/stylesheets/highlight/monokai.scss |  6 ++++
 .../stylesheets/highlight/solarized_dark.scss |  6 ++++
 .../highlight/solarized_light.scss            |  6 ++++
 app/assets/stylesheets/highlight/white.scss   |  6 ++++
 .../projects/diffs/_parallel_view.html.haml   |  8 +++---
 7 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index ef0b534a70..d45c772b8d 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -85,8 +85,11 @@ class @MergeRequestTabs
 
   scrollToElement: (container) ->
     if window.location.hash
-      $el = $("div#{container} #{window.location.hash}")
-      $('body').scrollTo($el.offset().top) if $el.length
+      navBarHeight = $('.navbar-gitlab').outerHeight()
+
+      $el = $("#{container} #{window.location.hash}")
+      $('body').scrollTo 0
+      $.scrollTo("#{container} #{window.location.hash}", offset: -navBarHeight) if $el.length
 
   # Activate a tab based on the current action
   activateTab: (action) ->
@@ -152,12 +155,29 @@ class @MergeRequestTabs
     @_get
       url: "#{source}.json" + @_location.search
       success: (data) =>
-        document.querySelector("div#diffs").innerHTML = data.html
+        $('#diffs').html data.html
         gl.utils.localTimeAgo($('.js-timeago', 'div#diffs'))
-        $('div#diffs .js-syntax-highlight').syntaxHighlight()
+        $('#diffs .js-syntax-highlight').syntaxHighlight()
         @expandViewContainer() if @diffViewType() is 'parallel'
         @diffsLoaded = true
         @scrollToElement("#diffs")
+        @highlighSelectedLine()
+
+  highlighSelectedLine: ->
+    locationHash = location.hash
+
+    if locationHash isnt ''
+      hashClassString = ".#{locationHash.replace('#', '')}"
+      $diffLine = $(locationHash)
+
+      if $diffLine.is ':not(tr)'
+        $diffLine = $("td#{locationHash}, td#{hashClassString}")
+      else
+        $diffLine = $('td', $diffLine)
+
+      $diffLine.addClass 'hll'
+      diffLineTop = $diffLine.offset().top
+      navBarHeight = $('.navbar-gitlab').outerHeight()
 
   loadBuilds: (source) ->
     return if @buildsLoaded
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index 4767394489..77a73dc379 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -21,6 +21,12 @@
 
   // Diff line
   .line_holder {
+    td.diff-line-num.hll:not(.empty-cell),
+    td.line_content.hll:not(.empty-cell) {
+      background-color: #557;
+      border-color: darken(#557, 15%);
+    }
+
     .diff-line-num.new, .line_content.new {
       @include diff_background(rgba(51, 255, 51, 0.1), rgba(51, 255, 51, 0.2), #808080);
     }
diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss
index 806401c21a..28253d4ccb 100644
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -21,6 +21,12 @@
 
   // Diff line
   .line_holder {
+    td.diff-line-num.hll:not(.empty-cell),
+    td.line_content.hll:not(.empty-cell) {
+      background-color: #49483e;
+      border-color: darken(#49483e, 15%);
+    }
+
     .diff-line-num.new, .line_content.new {
       @include diff_background(rgba(166, 226, 46, 0.1), rgba(166, 226, 46, 0.15), #808080);
     }
diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss
index 6a809d4dfd..c62bd021ae 100644
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -21,6 +21,12 @@
 
   // Diff line
   .line_holder {
+    td.diff-line-num.hll:not(.empty-cell),
+    td.line_content.hll:not(.empty-cell) {
+      background-color: #174652;
+      border-color: darken(#174652, 15%);
+    }
+
     .diff-line-num.new, .line_content.new {
       @include diff_background(rgba(133, 153, 0, 0.15), rgba(133, 153, 0, 0.25), #113b46);
     }
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index c482a1258f..524cfaf90c 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -21,6 +21,12 @@
 
   // Diff line
   .line_holder {
+    td.diff-line-num.hll:not(.empty-cell),
+    td.line_content.hll:not(.empty-cell) {
+      background-color: #ddd8c5;
+      border-color: darken(#ddd8c5, 15%);
+    }
+
     .diff-line-num.new, .line_content.new {
       @include diff_background(rgba(133, 153, 0, 0.2), rgba(133, 153, 0, 0.25), #c5d0d4);
     }
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss
index 28331f5975..1ff6ad75e0 100644
--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -21,6 +21,12 @@
 
   // Diff line
   .line_holder {
+    td.diff-line-num.hll:not(.empty-cell),
+    td.line_content.hll:not(.empty-cell) {
+      background-color: #f8eec7;
+      border-color: darken(#f8eec7, 15%);
+    }
+
     .diff-line-num {
       &.old {
         background-color: $line-number-old;
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml
index d7c4906874..81948513e4 100644
--- a/app/views/projects/diffs/_parallel_view.html.haml
+++ b/app/views/projects/diffs/_parallel_view.html.haml
@@ -14,11 +14,11 @@
           %td.new_line.diff-line-num
           %td.line_content.parallel.match= left[:text]
         - else
-          %td.old_line.diff-line-num{id: left[:line_code], class: "#{left[:type]}"}
+          %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)
               = link_to_new_diff_note(left[:line_code], 'old')
-          %td.line_content{class: "parallel noteable_line #{left[:type]} #{left[:line_code]}", data: { line_code: left[:line_code] }}= diff_line_content(left[:text])
+          %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])
 
           - if right[:type] == 'new'
             - new_line_class = 'new'
@@ -27,11 +27,11 @@
             - new_line_class = nil
             - new_line_code = left[:line_code]
 
-          %td.new_line.diff-line-num{id: new_line_code, class: "#{new_line_class}", data: { linenumber: right[:number] }}
+          %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')
-          %td.line_content.parallel{class: "noteable_line #{new_line_class} #{new_line_code}", data: { line_code: new_line_code }}= diff_line_content(right[:text])
+          %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])

From f3ed4763f54ee46a50d2e7b3b894f895b4067b61 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 12 Apr 2016 09:07:20 +0100
Subject: [PATCH 274/283] Correctly scrolls to the line when clicking

---
 app/assets/javascripts/merge_request_tabs.js.coffee | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index d45c772b8d..316d1fefa5 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -88,7 +88,6 @@ class @MergeRequestTabs
       navBarHeight = $('.navbar-gitlab').outerHeight()
 
       $el = $("#{container} #{window.location.hash}")
-      $('body').scrollTo 0
       $.scrollTo("#{container} #{window.location.hash}", offset: -navBarHeight) if $el.length
 
   # Activate a tab based on the current action
@@ -163,8 +162,17 @@ class @MergeRequestTabs
         @scrollToElement("#diffs")
         @highlighSelectedLine()
 
+        $(document)
+          .off 'click', '.diff-content a'
+          .on 'click', '.diff-content a', (e) =>
+            e.preventDefault()
+            window.location.hash = $(e.currentTarget).attr 'href'
+            @highlighSelectedLine()
+            @scrollToElement("#diffs")
+
   highlighSelectedLine: ->
-    locationHash = location.hash
+    $('.hll').removeClass 'hll'
+    locationHash = window.location.hash
 
     if locationHash isnt ''
       hashClassString = ".#{locationHash.replace('#', '')}"

From fd9c3b7c7446d9b8513793606aa2ae0d980ad4b7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 12 Apr 2016 10:06:35 +0100
Subject: [PATCH 275/283] Fixed issue with other links being clicked in diffs

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

diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee
index 316d1fefa5..1ab6e5114b 100644
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -163,8 +163,8 @@ class @MergeRequestTabs
         @highlighSelectedLine()
 
         $(document)
-          .off 'click', '.diff-content a'
-          .on 'click', '.diff-content a', (e) =>
+          .off 'click', '.diff-line-num a'
+          .on 'click', '.diff-line-num a', (e) =>
             e.preventDefault()
             window.location.hash = $(e.currentTarget).attr 'href'
             @highlighSelectedLine()

From badb35335086b90e2522ea2da767830f2f3ba9a7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 13 Apr 2016 09:23:28 +0100
Subject: [PATCH 276/283] Added CHANGELOG item

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e5c8620beb..511889b376 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -62,6 +62,8 @@ v 8.7.0 (unreleased)
   - Fix repository cache invalidation issue when project is recreated with an empty repo (Stan Hu)
   - Fix: Allow empty recipients list for builds emails service when pushed is added (Frank Groeneveld)
   - Improved markdown forms
+  - Diffs load at the correct point when linking from from number
+  - Selected diff rows highlight
 
 v 8.6.6
   - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk)

From 072b9c2c8fe466d43834c16bfbb565043a033fdf Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 14 Apr 2016 15:40:05 +0300
Subject: [PATCH 277/283] Add TOC to yaml README and an intro section

[ci skip]
---
 doc/ci/yaml/README.md | 73 +++++++++++++++++++++++++++++++++----------
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 7da9b31e30..abb6e97e5e 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1,5 +1,47 @@
 # Configuration of your builds with .gitlab-ci.yml
 
+This document describes the usage of `.gitlab-ci.yml`, the file that is used by
+GitLab Runner to manage your project's builds.
+
+If you want a quick introduction to GitLab CI, follow our
+[quick start guide](../quick_start/README.md).
+
+---
+
+<!-- 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)*
+
+- [.gitlab-ci.yml](#gitlab-ci-yml)
+    - [image and services](#image-and-services)
+    - [before_script](#before_script)
+    - [stages](#stages)
+    - [types](#types)
+    - [variables](#variables)
+    - [cache](#cache)
+        - [cache:key](#cache-key)
+- [Jobs](#jobs)
+    - [script](#script)
+    - [stage](#stage)
+    - [only and except](#only-and-except)
+    - [tags](#tags)
+    - [when](#when)
+    - [artifacts](#artifacts)
+        - [artifacts:name](#artifacts-name)
+    - [dependencies](#dependencies)
+- [Hidden jobs](#hidden-jobs)
+- [Special YAML features](#special-yaml-features)
+    - [Anchors](#anchors)
+- [Validate the .gitlab-ci.yml](#validate-the-gitlab-ci-yml)
+- [Skipping builds](#skipping-builds)
+- [Examples](#examples)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+---
+
+## .gitlab-ci.yml
+
 From version 7.12, GitLab CI uses a [YAML](https://en.wikipedia.org/wiki/YAML)
 file (`.gitlab-ci.yml`) for the project configuration. It is placed in the root
 of your repository and contains definitions of how your project should be built.
@@ -23,12 +65,10 @@ Of course a command can execute code directly (`./configure;make;make install`)
 or run a script (`test.sh`) in the repository.
 
 Jobs are used to create builds, which are then picked up by
-[runners](../runners/README.md) and executed within the environment of the
-runner. What is important, is that each job is run independently from each
+[Runners](../runners/README.md) and executed within the environment of the
+Runner. What is important, is that each job is run independently from each
 other.
 
-## .gitlab-ci.yml
-
 The YAML syntax allows for using more complex job specifications than in the
 above example:
 
@@ -71,7 +111,7 @@ There are a few reserved `keywords` that **cannot** be used as job names:
 
 This allows to specify a custom Docker image and a list of services that can be
 used for time of the build. The configuration of this feature is covered in
-separate document: [Use Docker](../docker/README.md).
+[a separate document](../docker/README.md).
 
 ### before_script
 
@@ -86,7 +126,8 @@ The specification of `stages` allows for having flexible multi stage pipelines.
 The ordering of elements in `stages` defines the ordering of builds' execution:
 
 1. Builds of the same stage are run in parallel.
-1. Builds of next stage are run after success.
+1. Builds of the next stage are run after the jobs from the previous stage
+   complete successfully.
 
 Let's consider the following example, which defines 3 stages:
 
@@ -98,9 +139,9 @@ stages:
 ```
 
 1. First all jobs of `build` are executed in parallel.
-1. If all jobs of `build` succeeds, the `test` jobs are executed in parallel.
-1. If all jobs of `test` succeeds, the `deploy` jobs are executed in parallel.
-1. If all jobs of `deploy` succeeds, the commit is marked as `success`.
+1. If all jobs of `build` succeed, the `test` jobs are executed in parallel.
+1. If all jobs of `test` succeed, the `deploy` jobs are executed in parallel.
+1. If all jobs of `deploy` succeed, the commit is marked as `success`.
 1. If any of the previous jobs fails, the commit is marked as `failed` and no
    jobs of further stage are executed.
 
@@ -278,14 +319,14 @@ job_name:
 
 | Keyword       | Required | Description |
 |---------------|----------|-------------|
-| script        | yes | Defines a shell script which is executed by runner |
+| script        | yes | Defines a shell script which is executed by Runner |
 | image         | no | Use docker image, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) |
 | services      | no | Use docker services, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) |
 | stage         | no | Defines a build stage (default: `test`) |
 | type          | no | Alias for `stage` |
 | only          | no | Defines a list of git refs for which build is created |
 | except        | no | Defines a list of git refs for which build is not created |
-| tags          | no | Defines a list of tags which are used to select runner |
+| tags          | no | Defines a list of tags which are used to select Runner |
 | 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|
@@ -294,7 +335,7 @@ job_name:
 
 ### script
 
-`script` is a shell script which is executed by the runner. For example:
+`script` is a shell script which is executed by the Runner. For example:
 
 ```yaml
 job:
@@ -375,13 +416,13 @@ except master.
 
 ### tags
 
-`tags` is used to select specific runners from the list of all runners that are
+`tags` is used to select specific Runners from the list of all Runners that are
 allowed to run this project.
 
-During the registration of a runner, you can specify the runner's tags, for
+During the registration of a Runner, you can specify the Runner's tags, for
 example `ruby`, `postgres`, `development`.
 
-`tags` allow you to run builds with runners that have the specified tags
+`tags` allow you to run builds with Runners that have the specified tags
 assigned to them:
 
 ```yaml
@@ -391,7 +432,7 @@ job:
     - postgres
 ```
 
-The specification above, will make sure that `job` is built by a runner that
+The specification above, will make sure that `job` is built by a Runner that
 has both `ruby` AND `postgres` tags defined.
 
 ### when

From 0385cd5a585572be4d3b72797c14cad23efc48f5 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Wed, 13 Apr 2016 21:20:03 +0200
Subject: [PATCH 278/283] Start with iid on branch creation

---
 app/models/issue.rb                          |  4 ++--
 app/services/merge_requests/build_service.rb |  2 +-
 app/services/system_note_service.rb          |  2 +-
 doc/workflow/web_editor.md                   |  2 +-
 spec/models/issue_spec.rb                    | 17 ++++++++++++-----
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index e064b0f8b9..3f188e0477 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -106,7 +106,7 @@ class Issue < ActiveRecord::Base
 
   def related_branches
     project.repository.branch_names.select do |branch|
-      branch.end_with?("-#{iid}")
+      branch =~ /\A#{iid}-(?!\d+-stable)/i
     end
   end
 
@@ -151,7 +151,7 @@ class Issue < ActiveRecord::Base
   end
 
   def to_branch_name
-    "#{title.parameterize}-#{iid}"
+    "#{iid}-#{title.parameterize}"
   end
 
   def can_be_worked_on?(current_user)
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 6e9152e444..fa34753c4f 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -51,7 +51,7 @@ module MergeRequests
       # 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(/-(\d+)\z/)
+      if match = merge_request.source_branch.match(/\A(\d+)-/)
         iid = match[1]
         closes_issue = "Closes ##{iid}"
 
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 658b086496..82a0e2fd1f 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -222,7 +222,7 @@ class SystemNoteService
   # Called when a branch is created from the 'new branch' button on a issue
   # Example note text:
   #
-  #   "Started branch `issue-branch-button-201`"
+  #   "Started branch `201-issue-branch-button`"
   def self.new_issue_branch(issue, project, author, branch)
     h = Gitlab::Routing.url_helpers
     link = h.namespace_project_compare_url(project.namespace, project, from: project.default_branch, to: branch)
diff --git a/doc/workflow/web_editor.md b/doc/workflow/web_editor.md
index 5685a9d89d..1832567a34 100644
--- a/doc/workflow/web_editor.md
+++ b/doc/workflow/web_editor.md
@@ -85,7 +85,7 @@ Once you click it, a new branch will be created that diverges from the default
 branch of your project, by default `master`. The branch name will be based on
 the title of the issue and as suffix it will have its ID. Thus, the example
 screenshot above will yield a branch named
-`et-cum-et-sed-expedita-repellat-consequatur-ut-assumenda-numquam-rerum-2`.
+`2-et-cum-et-sed-expedita-repellat-consequatur-ut-assumenda-numquam-rerum`.
 
 After the branch is created, you can edit files in the repository to fix
 the issue. When a merge request is created based on the newly created branch,
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 15052aaca2..fac516f956 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -191,12 +191,19 @@ describe Issue, models: true do
   end
 
   describe '#related_branches' do
-    it "selects the right branches" do
+    it 'selects the right branches' do
       allow(subject.project.repository).to receive(:branch_names).
-        and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
+        and_return(['mpempe', "#{subject.iid}mepmep", subject.to_branch_name])
 
       expect(subject.related_branches).to eq([subject.to_branch_name])
     end
+
+    it 'excludes stable branches from the related branches' do
+      allow(subject.project.repository).to receive(:branch_names).
+        and_return(["#{subject.iid}-0-stable"])
+
+      expect(subject.related_branches).to eq []
+    end
   end
 
   it_behaves_like 'an editable mentionable' do
@@ -210,11 +217,11 @@ describe Issue, models: true do
     let(:subject) { create :issue }
   end
 
-  describe "#to_branch_name" do
+  describe '#to_branch_name' do
     let(:issue) { create(:issue, title: 'a' * 30) }
 
-    it "starts with the issue iid" do
-      expect(issue.to_branch_name).to match /-#{issue.iid}\z/
+    it 'starts with the issue iid' do
+      expect(issue.to_branch_name).to match /\A#{issue.iid}-a+\z/
     end
   end
 end

From a54af831bae023770bf9b2633cc45ec0d5f5a66a Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 14 Apr 2016 15:53:54 +0200
Subject: [PATCH 279/283] Use rake db:reset instead of db:setup

Using db:reset ensures existing tables are first dropped. This in turn
ensures that we can drop tables regardless of any foreign key
constraints. While CE currently doesn't have any foreign keys EE defines
the following relation:

    remote_mirrors.project_id -> projects.id

MySQL will complain whenever you try to drop the "projects" table first
even when using "DROP TABLE ... CASCADE".
---
 bin/setup                     | 2 +-
 doc/development/rake_tasks.md | 2 +-
 lib/tasks/gitlab/setup.rake   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/setup b/bin/setup
index acdb2c1389..6cb2d7f1e3 100755
--- a/bin/setup
+++ b/bin/setup
@@ -18,7 +18,7 @@ Dir.chdir APP_ROOT do
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system "bin/rake db:reset"
 
   puts "\n== Removing old logs and tempfiles =="
   system "rm -f log/*"
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index 9f3fd69fc4..6d04b9590e 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -9,7 +9,7 @@ bundle exec rake setup
 ```
 
 The `setup` task is a alias for `gitlab:setup`.
-This tasks calls `db:setup` to create the database, calls `add_limits_mysql` that adds limits to the database schema in case of a MySQL database and finally it calls `db:seed_fu` to seed the database.
+This tasks calls `db:reset` to create the database, calls `add_limits_mysql` that adds limits to the database schema in case of a MySQL database and finally it calls `db:seed_fu` to seed the database.
 Note: `db:setup` calls `db:seed` but this does nothing.
 
 ## Run tests
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index 4cbccf2ca8..48baecfd2a 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -14,7 +14,7 @@ namespace :gitlab do
       puts ""
     end
 
-    Rake::Task["db:setup"].invoke
+    Rake::Task["db:reset"].invoke
     Rake::Task["add_limits_mysql"].invoke
     Rake::Task["setup_postgresql"].invoke
     Rake::Task["db:seed_fu"].invoke

From 0c082d5e3a34d787f8b2fea0c22fa4256cf82be3 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Tue, 12 Apr 2016 20:38:14 -0600
Subject: [PATCH 280/283] Fix the improper delete form being rendered for an
 oauth_authorized_application

This fixes the authorized applications not being revoked properly at
`/profile/applications`.

Fixes #14370.
---
 app/views/doorkeeper/applications/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml
index 55f4a6f287..0aff79749e 100644
--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
@@ -68,7 +68,7 @@
                   %td= app.name
                   %td= token.created_at
                   %td= token.scopes
-                  %td= render 'delete_form', application: app
+                  %td= render 'doorkeeper/authorized_applications/delete_form', application: app
               - @authorized_anonymous_tokens.each do |token|
                 %tr
                   %td

From c7e384aab23301ad0ee3559252324fa957d15db3 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 12 Apr 2016 22:39:18 -0700
Subject: [PATCH 281/283] Add spec for deletion of authorized OAuth2
 application

Closes #14370

Move gon function into its own helper
---
 CHANGELOG                                     |  1 +
 app/controllers/application_controller.rb     | 14 -------
 .../oauth/applications_controller.rb          |  1 +
 app/models/oauth_access_token.rb              | 19 +++++++++
 lib/gitlab/current_settings.rb                |  2 +
 lib/gitlab/gon_helper.rb                      | 17 ++++++++
 spec/factories/oauth_access_tokens.rb         | 23 +++++++++++
 spec/factories/oauth_applications.rb          |  9 +++++
 spec/factories/users.rb                       |  2 +-
 .../profiles/oauth_applications_spec.rb       | 39 +++++++++++++++++++
 10 files changed, 112 insertions(+), 15 deletions(-)
 create mode 100644 app/models/oauth_access_token.rb
 create mode 100644 lib/gitlab/gon_helper.rb
 create mode 100644 spec/factories/oauth_access_tokens.rb
 create mode 100644 spec/factories/oauth_applications.rb
 create mode 100644 spec/features/profiles/oauth_applications_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 21f24b5b61..4db4f01bcb 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.7.0 (unreleased)
   - The Projects::HousekeepingService class has extra instrumentation (Yorick Peterse)
+  - Fix revoking of authorized OAuth applications (Connor Shea)
   - All service classes (those residing in app/services) are now instrumented (Yorick Peterse)
   - Developers can now add custom tags to transactions (Yorick Peterse)
   - Loading of an issue's referenced merge requests and related branches is now done asynchronously (Yorick Peterse)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 97d53acde9..bdf2dd6853 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -158,20 +158,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def add_gon_variables
-    gon.api_version            = API::API.version
-    gon.default_avatar_url     = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
-    gon.default_issues_tracker = Project.new.default_issue_tracker.to_param
-    gon.max_file_size          = current_application_settings.max_attachment_size
-    gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
-    gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class
-
-    if current_user
-      gon.current_user_id = current_user.id
-      gon.api_token = current_user.private_token
-    end
-  end
-
   def validate_user_service_ticket!
     return unless signed_in? && session[:service_tickets]
 
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index d1e4ac10f6..377fef65a9 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -4,6 +4,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
 
   before_action :verify_user_oauth_applications_enabled
   before_action :authenticate_user!
+  before_action :add_gon_variables
 
   layout 'profile'
 
diff --git a/app/models/oauth_access_token.rb b/app/models/oauth_access_token.rb
new file mode 100644
index 0000000000..c78c7f4aa0
--- /dev/null
+++ b/app/models/oauth_access_token.rb
@@ -0,0 +1,19 @@
+# == 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'
+end
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 1acc22fe5b..71b53136ed 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -1,5 +1,7 @@
 module Gitlab
   module CurrentSettings
+    include ::Gitlab::GonHelper
+
     def current_application_settings
       key = :current_application_settings
 
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
new file mode 100644
index 0000000000..5ebaad6ca6
--- /dev/null
+++ b/lib/gitlab/gon_helper.rb
@@ -0,0 +1,17 @@
+module Gitlab
+  module GonHelper
+    def add_gon_variables
+      gon.api_version            = API::API.version
+      gon.default_avatar_url     = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
+      gon.default_issues_tracker = Project.new.default_issue_tracker.to_param
+      gon.max_file_size          = current_application_settings.max_attachment_size
+      gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
+      gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class
+
+      if current_user
+        gon.current_user_id = current_user.id
+        gon.api_token = current_user.private_token
+      end
+    end
+  end
+end
diff --git a/spec/factories/oauth_access_tokens.rb b/spec/factories/oauth_access_tokens.rb
new file mode 100644
index 0000000000..4bbc7d3a55
--- /dev/null
+++ b/spec/factories/oauth_access_tokens.rb
@@ -0,0 +1,23 @@
+# == 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
+    application
+    token '123456'
+    created_at :datetime
+  end
+end
diff --git a/spec/factories/oauth_applications.rb b/spec/factories/oauth_applications.rb
new file mode 100644
index 0000000000..d116a57383
--- /dev/null
+++ b/spec/factories/oauth_applications.rb
@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :oauth_application, class: 'Doorkeeper::Application', aliases: [:application] do
+    name { FFaker::Name.name }
+    uid { FFaker::Name.name }
+    redirect_uri { FFaker::Internet.uri('http') }
+    owner
+    owner_type 'User'
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index a5c60c51c5..a9b2148bd2 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   sequence(:name) { FFaker::Name.name }
 
-  factory :user, aliases: [:author, :assignee, :recipient, :owner, :creator] do
+  factory :user, aliases: [:author, :assignee, :recipient, :owner, :creator, :resource_owner] do
     email { FFaker::Internet.email }
     name
     sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
diff --git a/spec/features/profiles/oauth_applications_spec.rb b/spec/features/profiles/oauth_applications_spec.rb
new file mode 100644
index 0000000000..1a5a9059db
--- /dev/null
+++ b/spec/features/profiles/oauth_applications_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe 'Profile > Applications', feature: true do
+  let(:user) { create(:user) }
+
+  before do
+    login_as(user)
+  end
+
+  describe 'User manages applications', js: true do
+    it 'deletes an application' do
+      create(:oauth_application, owner: user)
+      visit oauth_applications_path
+
+      page.within('.oauth-applications') do
+        expect(page).to have_content('Your applications (1)')
+        click_button 'Destroy'
+      end
+
+      expect(page).to have_content('The application was deleted successfully')
+      expect(page).to have_content('Your applications (0)')
+      expect(page).to have_content('Authorized applications (0)')
+    end
+
+    it 'deletes an authorized application' do
+      create(:oauth_access_token, resource_owner: user)
+      visit oauth_applications_path
+
+      page.within('.oauth-authorized-applications') do
+        expect(page).to have_content('Authorized applications (1)')
+        click_button 'Revoke'
+      end
+
+      expect(page).to have_content('The application was revoked access.')
+      expect(page).to have_content('Your applications (0)')
+      expect(page).to have_content('Authorized applications (0)')
+    end
+  end
+end

From e450892f5688529b8a49e3ae7598f00dbdda7161 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 14 Apr 2016 05:28:46 -0700
Subject: [PATCH 282/283] Include GonHelper separately and remove created_at in
 factory

---
 app/controllers/application_controller.rb        | 1 +
 app/controllers/oauth/applications_controller.rb | 1 +
 lib/gitlab/current_settings.rb                   | 2 --
 spec/factories/oauth_access_tokens.rb            | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bdf2dd6853..ce5c84ee9b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,7 @@ require 'fogbugz'
 
 class ApplicationController < ActionController::Base
   include Gitlab::CurrentSettings
+  include Gitlab::GonHelper
   include GitlabRoutingHelper
   include PageLayoutHelper
 
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index 377fef65a9..c6bdd0602c 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -1,5 +1,6 @@
 class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   include Gitlab::CurrentSettings
+  include Gitlab::GonHelper
   include PageLayoutHelper
 
   before_action :verify_user_oauth_applications_enabled
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 71b53136ed..1acc22fe5b 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -1,7 +1,5 @@
 module Gitlab
   module CurrentSettings
-    include ::Gitlab::GonHelper
-
     def current_application_settings
       key = :current_application_settings
 
diff --git a/spec/factories/oauth_access_tokens.rb b/spec/factories/oauth_access_tokens.rb
index 4bbc7d3a55..7700b15d53 100644
--- a/spec/factories/oauth_access_tokens.rb
+++ b/spec/factories/oauth_access_tokens.rb
@@ -18,6 +18,5 @@ FactoryGirl.define do
     resource_owner
     application
     token '123456'
-    created_at :datetime
   end
 end

From a8ea2c18959c700913132d8a2d7ce3a211303c10 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 14 Apr 2016 11:34:42 -0300
Subject: [PATCH 283/283] Change transfer service to use existing methods

---
 app/services/projects/transfer_service.rb | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 0d8f8c6fbe..79a27f4af7 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -35,11 +35,9 @@ module Projects
         end
 
         # Apply new namespace id and visibility level
-        project.tap do |p|
-          p.namespace = new_namespace
-          setup_visibility_level(p, new_namespace)
-          p.save!
-        end
+        project.namespace = new_namespace
+        project.visibility_level = new_namespace.visibility_level unless project.visibility_level_allowed_by_group?
+        project.save!
 
         # Notifications
         project.send_move_instructions(old_path)
@@ -71,15 +69,5 @@ module Projects
         namespace.id != project.namespace_id &&
         current_user.can?(:create_projects, namespace)
     end
-
-    private
-
-    def setup_visibility_level(project, new_namespace)
-      return unless new_namespace.is_a?(Group)
-
-      if project.visibility_level > new_namespace.visibility_level
-        project.visibility_level = new_namespace.visibility_level
-      end
-    end
   end
 end